From 483ebc6f00a35e972ef90fd81dbda39d114960e4 Mon Sep 17 00:00:00 2001 From: Treeki Date: Wed, 22 May 2013 21:18:44 +0200 Subject: added red ring event control --- bugfixes.yaml | 6 ++++++ src/randomcrap.S | 10 ++++++++++ 2 files changed, 16 insertions(+) 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 -- cgit v1.2.3