summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-04-29 17:32:31 +0200
committerTreeki <treeki@gmail.com>2012-04-29 17:32:31 +0200
commit5cd35287bb3ccbc7ca243112f0fa8f20668d00a2 (patch)
tree2ec715674c5920aedf7c225da3400eb9a2c9974a
parentc10deba2e5c0ee0131021036b6bf489bd3b13c87 (diff)
downloadkamek-5cd35287bb3ccbc7ca243112f0fa8f20668d00a2.tar.gz
kamek-5cd35287bb3ccbc7ca243112f0fa8f20668d00a2.zip
fixed toad textures?
-rw-r--r--src/poweruphax.S13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/poweruphax.S b/src/poweruphax.S
index cf6ecb6..22b34a4 100644
--- a/src/poweruphax.S
+++ b/src/poweruphax.S
@@ -615,6 +615,9 @@ gotHammerStatus:
.extern continueToadPowerupSet
.global ToadPowerupFix
ToadPowerupFix:
+ cmpwi r4, 3
+ beq isHammerForToad
+
lis r8, PowerupTextures@h
ori r8, r8, PowerupTextures@l
slwi r9, r4, 2
@@ -622,6 +625,13 @@ ToadPowerupFix:
fadds f31, f31, f1
b continueToadPowerupSet
+isHammerForToad:
+ lis r8, ToadTextures@h
+ ori r8, r8, ToadTextures@l
+ slwi r9, r0, 2
+ lfsx f31, f31, f1
+ b continueToadPowerupSet
+
.data
@@ -689,6 +699,9 @@ PowerupTextures:
.float 1.0
.float 2.0
.float 3.0
+ToadTextures:
+ .long 0xDEADBEEF, 0xDEADBEEF
+ .float 7.0, 8.0, 6.0
.global BrosArcFileName
BrosArcFileName: