summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-04-08 00:21:42 +0200
committerTreeki <treeki@gmail.com>2013-04-08 00:34:35 +0200
commitfb93fa93f2c756a5254f1b418abbc179fca4e59d (patch)
treef2a6c576f8e4d1f0f4673b713f05b07107591336 /src
parent8060001eea4b431a687609d8f4eaab0e43683d7b (diff)
downloadkamek-fb93fa93f2c756a5254f1b418abbc179fca4e59d.tar.gz
kamek-fb93fa93f2c756a5254f1b418abbc179fca4e59d.zip
a couple of behaviour fixes to retextured sprites
Diffstat (limited to '')
-rwxr-xr-xsrc/spritetex.S38
1 files changed, 35 insertions, 3 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 2831b31..ec2b6b4 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -458,6 +458,13 @@ TEX_Podoboo:
# All these vary
+.global TEX_BigIcicle
+TEX_BigIcicle:
+ lwz r5, 4(r28)
+ srwi r5, r5, 20
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
.global TEX_MushroomPlatform
TEX_MushroomPlatform:
lwz r5, 4(r30)
@@ -1600,12 +1607,37 @@ BigMetPowFix:
.global TogeMetPowFix
TogeMetPowFix:
- lwz r5, 4(r3)
- extrwi r5, r5, 4,4
- cmpwi r5, 5
+ lwz r6, 4(r3)
+ extrwi r6, r6, 4,4
+ cmpwi r6, 5
beqlr
b OriginalPowBlockActivated
+.extern collisionCat13_Hammer__5dEn_cFP13ActivePhysicsP13ActivePhysics
+.global TogeMetHammerFix
+TogeMetHammerFix:
+ lwz r6, 4(r3)
+ extrwi r6, r6, 4,4
+ cmpwi r6, 5
+ beq TogeMetHammerSpecial
+ b collisionCat13_Hammer__5dEn_cFP13ActivePhysicsP13ActivePhysics
+TogeMetHammerSpecial:
+ li r3, 1
+ blr
+
+.extern collisionCat2_IceBall_15_YoshiIce__5dEn_cFP13ActivePhysicsP13ActivePhysics
+.extern TogeTekkyuIceballCollision
+.global TogeMetIceFix
+TogeMetIceFix:
+ lwz r6, 4(r3)
+ extrwi r6, r6, 4,4
+ cmpwi r6, 5
+ beq TogeMetIceSpecial
+ b collisionCat2_IceBall_15_YoshiIce__5dEn_cFP13ActivePhysicsP13ActivePhysics
+TogeMetIceSpecial:
+ li r3, 1
+ blr
+
.data
BomombDir:
.word 0x0400FC00