summaryrefslogtreecommitdiff
path: root/src/randomcrap.S
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-10-07 23:06:58 +0200
committerTreeki <treeki@gmail.com>2012-10-07 23:06:58 +0200
commitb27b28693d38c0834faf121889a6990547a11f14 (patch)
treead28693900aff62002c193b221503c0b4081ac34 /src/randomcrap.S
parent9ae897e419916b5cb8ec8977ae37196297f1adef (diff)
downloadkamek-b27b28693d38c0834faf121889a6990547a11f14.tar.gz
kamek-b27b28693d38c0834faf121889a6990547a11f14.zip
more climb sound fixes shit
Diffstat (limited to 'src/randomcrap.S')
-rw-r--r--src/randomcrap.S29
1 files changed, 27 insertions, 2 deletions
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