summaryrefslogtreecommitdiff
path: root/src/poweruphax.S
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-08-09 14:51:06 -0500
committerColin Noga <Tempus@Spectrum-Song.local>2011-08-09 14:51:06 -0500
commit16ddd9a408d1a02f99b9a9851d412dcebf2a8483 (patch)
tree0ac42790b776c211dd2c1efb5e58011c73467782 /src/poweruphax.S
parent0602cf4a1cdf9d8692ad6ed5da301749f6fee0ea (diff)
downloadkamek-16ddd9a408d1a02f99b9a9851d412dcebf2a8483.tar.gz
kamek-16ddd9a408d1a02f99b9a9851d412dcebf2a8483.zip
Merged multiplayer hammer fixes in
Diffstat (limited to '')
-rw-r--r--src/poweruphax.S39
1 files changed, 39 insertions, 0 deletions
diff --git a/src/poweruphax.S b/src/poweruphax.S
index 3db06c7..9274b78 100644
--- a/src/poweruphax.S
+++ b/src/poweruphax.S
@@ -366,6 +366,19 @@ DontSetHammer:
addi sp, sp, 0x10
blr
+.global SetHammerToEnItemDCASpecial
+SetHammerToEnItemDCASpecial:
+ cmplwi r4, 0x19
+ b _not19
+ li r0, 0xD
+ sth r0, 0xDCA(r3)
+_not19:
+ cmplwi r4, 6
+ bnelr
+ li r0, 5
+ sth r0, 0xDCA(r3)
+ blr
+
#.global EnItem_BindAnimation_Fix
#EnItem_BindAnimation_Fix:
@@ -376,6 +389,28 @@ DontSetHammer:
# b EnItem_BindAnimation_Continued
+.global FixPowerupSound
+FixPowerupSound:
+ # WARNING! This is a bad, bad, bad hack.
+ # I was too lazy to add anything to the linker script, so...
+
+ # We branch at 80141334, so our LR is 80141338
+ # We need to jump to 80141384
+ mflr r3
+ addi r3, r3, 0x4C
+ mtlr r3
+
+ lwz r0, 0x1090(r29)
+ lis r3, PowerupSounds@h
+ ori r3, r3, PowerupSounds@l
+ slwi r4, r0, 2
+ lwzx r4, r3, r4
+ mr r3, r29
+ li r5, 0
+
+ blr
+
+
.global WeirdAnimLoadHack
WeirdAnimLoadHack:
cmplwi r4, 5 #hammersuit
@@ -598,6 +633,10 @@ gotHammerStatus:
.data
+PowerupSounds:
+ .long 273, 274, 274, 275, 276, 277, 274, 274
+
+
SomeTable:
.long SomeTable_802F5580
.long SomeTable_802F56C0