diff options
| author | Treeki <treeki@gmail.com> | 2013-05-22 21:18:44 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-05-22 21:18:44 +0200 |
| commit | 483ebc6f00a35e972ef90fd81dbda39d114960e4 (patch) | |
| tree | d7978030ff688c0f722819c60b1495a7c0492a97 | |
| parent | b8cd00c15b3e576921dc0b0da6cbe6b832baa722 (diff) | |
| download | kamek-483ebc6f00a35e972ef90fd81dbda39d114960e4.tar.gz kamek-483ebc6f00a35e972ef90fd81dbda39d114960e4.zip | |
added red ring event control
| -rw-r--r-- | bugfixes.yaml | 6 | ||||
| -rw-r--r-- | src/randomcrap.S | 10 |
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 |