summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bugfixes.yaml6
-rw-r--r--src/randomcrap.S10
2 files changed, 16 insertions, 0 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml
index 4b47df8..9f5a48c 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -3,6 +3,12 @@
# yaml, hasn't it...
source_files: [../src/randomcrap.S, ../src/music.cpp, ../src/fix38.S, ../src/nullsub.S, ../src/newer.cpp]
hooks:
+ - name: RedRingEventControl
+ type: branch_insn
+ branch_type: b
+ src_addr_pal: 0x80A93038
+ target_func: 'RedRingEventControl'
+
- name: DisableTerrainShading
type: patch
addr_pal: 0x8008E6F8
diff --git a/src/randomcrap.S b/src/randomcrap.S
index 29bf758..fff6c98 100644
--- a/src/randomcrap.S
+++ b/src/randomcrap.S
@@ -384,6 +384,16 @@ llaReturn:
sfsdfsdf: .float 512.0
.text
+
+.global RedRingEventControl
+RedRingEventControl:
+ lwz r10, 4(r31)
+ srwi. r10, r10, 28
+ beq dontResetRREDelay
+ li r5, 0
+dontResetRREDelay:
+ b set__10dFlagMgr_cFUcibbbUi
+
.global EFB_Crap
.extern EFBMagic2__Fv
.extern ContinueFromEFBMagic2