From 6f20c424220d32dcbbcd66cbf58ac93e9de7054c Mon Sep 17 00:00:00 2001 From: Treeki Date: Sun, 7 Oct 2012 00:22:45 +0200 Subject: a failed attempt to fix net climb sounds --- bugfixes.yaml | 6 ++++++ src/randomcrap.S | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/bugfixes.yaml b/bugfixes.yaml index 2d7721b..ce2efc1 100644 --- a/bugfixes.yaml +++ b/bugfixes.yaml @@ -8,6 +8,12 @@ hooks: addr_pal: 0x800E53E0 data: '4E800020' + - name: ClimbSounds + type: branch_insn + branch_type: bl + src_addr_pal: 0x80132EFC + target_func: 'newClimbSounds' + - name: MusicHax type: branch_insn src_addr_pal: 0x8008E5E4 diff --git a/src/randomcrap.S b/src/randomcrap.S index ea2b301..0b76ad8 100644 --- a/src/randomcrap.S +++ b/src/randomcrap.S @@ -1,4 +1,27 @@ .text +.global newClimbSounds +.extern StagePtr +newClimbSounds: + lis r6, StagePtr@h + ori r6, r6, StagePtr@l + lwz r6, 0(r6) + lhz r6, 0x120C(r6) + + cmpwi r6, 14 + beq pngn + cmpwi r6, 0x903 + beq pngn + cmpwi r6, 0x40E + beq climb + li r4, 0x134 + blr +pngn: + li r4, 0xE1 + blr +climb: + li r4, 0xC9 + blr + .global TextWriterCrap .extern TextWriterCrapContinue TextWriterCrap: -- cgit v1.2.3