summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bugfixes.yaml28
-rw-r--r--src/randomcrap.S29
2 files changed, 55 insertions, 2 deletions
diff --git a/bugfixes.yaml b/bugfixes.yaml
index a979a19..39cfe49 100644
--- a/bugfixes.yaml
+++ b/bugfixes.yaml
@@ -28,6 +28,34 @@ hooks:
src_addr_pal: 0x80132EFC
target_func: 'newClimbSounds'
+ - name: ClimbSoundsJumpS
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80133120
+ target_func: 'newClimbSoundsJumpS'
+ - name: ClimbSoundsJumpSS
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80133134
+ target_func: 'newClimbSoundsJumpSS'
+ - name: ClimbSoundsJump
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80133148
+ target_func: 'newClimbSoundsJump'
+
+ - name: ClimbSoundsLand
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80132AE8
+ target_func: 'newClimbSoundsLand'
+
+ - name: ClimbSoundsAttack
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x801334E4
+ target_func: 'newClimbSoundsAttack'
+
- name: MusicHax
type: branch_insn
src_addr_pal: 0x8008E5E4
diff --git a/src/randomcrap.S b/src/randomcrap.S
index 64e98c1..1653ce7 100644
--- a/src/randomcrap.S
+++ b/src/randomcrap.S
@@ -41,8 +41,33 @@ DontDoThis:
blr
.global newClimbSounds
-.extern StagePtr
newClimbSounds:
+ li r7, 0x134
+ b effectNewClimbSounds
+.global newClimbSoundsJump
+newClimbSoundsJump:
+ li r7, 0x136
+ b effectNewClimbSounds
+.global newClimbSoundsJumpS
+newClimbSoundsJumpS:
+ li r7, 0x137
+ b effectNewClimbSounds
+.global newClimbSoundsJumpSS
+newClimbSoundsJumpSS:
+ li r7, 0x138
+ b effectNewClimbSounds
+.global newClimbSoundsLand
+newClimbSoundsLand:
+ li r7, 0x139
+ b effectNewClimbSounds
+.global newClimbSoundsAttack
+newClimbSoundsAttack:
+ li r7, 0x13A
+ b effectNewClimbSounds
+
+
+.extern StagePtr
+effectNewClimbSounds:
lis r6, StagePtr@h
ori r6, r6, StagePtr@l
lwz r6, 0(r6)
@@ -54,7 +79,7 @@ newClimbSounds:
beq pngn
cmpwi r6, 0x40E
beq climb
- li r4, 0x134
+ mr r4, r7
blr
pngn:
li r4, 0xE1