diff options
Diffstat (limited to 'src/spritetex.S')
| -rwxr-xr-x | src/spritetex.S | 38 |
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 |