From fb93fa93f2c756a5254f1b418abbc179fca4e59d Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Mon, 8 Apr 2013 00:21:42 +0200
Subject: a couple of behaviour fixes to retextured sprites

---
 kamek_pal.x     |  1 +
 spritetex.yaml  | 15 +++++++++++++++
 src/spritetex.S | 38 +++++++++++++++++++++++++++++++++++---
 3 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/kamek_pal.x b/kamek_pal.x
index e371fb7..ca8f4bd 100644
--- a/kamek_pal.x
+++ b/kamek_pal.x
@@ -1,4 +1,5 @@
 SECTIONS {
+	TogeTekkyuIceballCollision = 0x80AB6DA0;
 	PlayerAnimStates = 0x802F1650;
 	ContinueFromFixFireballSensorSetup = 0x8011A830;
 	GetPosForLayoutEffect__FP7Point3db = 0x800B37E0;
diff --git a/spritetex.yaml b/spritetex.yaml
index c03afa4..f1ada03 100644
--- a/spritetex.yaml
+++ b/spritetex.yaml
@@ -126,6 +126,16 @@ hooks:
     src_addr_pal: 0x80B0B9DC
     target_func: 'TogeMetPowFix'
 
+  - name: TogeMetHammerFix
+    type: add_func_pointer
+    src_addr_pal: 0x80B0B9D0
+    target_func: 'TogeMetHammerFix'
+
+  - name: TogeMetIceFix
+    type: add_func_pointer
+    src_addr_pal: 0x80B0B9CC
+    target_func: 'TogeMetIceFix'
+
 
   - name: TEX_SpinyShell
     type: branch_insn
@@ -343,6 +353,11 @@ hooks:
     src_addr_pal: 0x807E54AC
     target_func: 'TEX_BlockSlide'
 
+  - name: TEX_BigIcicle
+    type: branch_insn
+    branch_type: bl
+    src_addr_pal: 0x809B4BC8
+    target_func: 'TEX_BigIcicle'
 
 #  - name: TEX_Spinner
 #    type: branch_insn
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
-- 
cgit v1.2.3