Fixed spring block among others, updated some addresses for stuff I didn't know.

2 files changed, 50 insertions, 34 deletions

diff --git a/spritetex.yaml b/spritetex.yaml
index b3a1e50..89e6ae1 100644
--- a/spritetex.yaml
+++ b/spritetex.yaml
@@ -80,7 +80,7 @@ hooks:
   - name: TEX_Spiny

     type: branch_insn

     branch_type: bl

-    src_addr_pal: 0x8003DBF8

+    src_addr_pal: 0x80038208

     target_func: 'TEX_Spiny'

 
 
@@ -227,10 +227,17 @@ hooks:
 #  - name: TEX_StretchMush

 #    type: branch_insn

 #    branch_type: bl

-#    src_addr_pal: 0x807E54AC

+#    src_addr_pal: 0x8084AD10

 #    target_func: 'TEX_StretchMush'

 
 
+#  - name: TEX_BlockSlide

+#    type: branch_insn

+#    branch_type: bl

+#    src_addr_pal: 0x807E54AC

+#    target_func: 'TEX_BlockSlide'

+
+
 #  - name: TEX_Spinner

 #    type: branch_insn

 #    branch_type: bl

@@ -241,7 +248,7 @@ hooks:
 #  - name: TEX_Platforms

 #    type: branch_insn

 #    branch_type: bl

-#    src_addr_pal: 0x800C037C

+#    src_addr_pal: 0x800C03A0

 #    target_func: 'TEX_Platforms'

 
 
diff --git a/src/spritetex.S b/src/spritetex.S
index f423600..ebc22f1 100644
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -92,7 +92,7 @@ TEX_Blooper:
 
 .global TEX_BigBlock

 TEX_BigBlock:

-	lwz r5, 4(r30)

+	lwz r5, 4(r28)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -100,7 +100,7 @@ TEX_BigBlock:
 
 .global TEX_Thwomp

 TEX_Thwomp:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -108,7 +108,7 @@ TEX_Thwomp:
 
 .global TEX_GiantBuzzy

 TEX_GiantBuzzy:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -116,7 +116,7 @@ TEX_GiantBuzzy:
 
 .global TEX_Buzzy

 TEX_Buzzy:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -124,7 +124,7 @@ TEX_Buzzy:
 
 .global TEX_SpikeTop

 TEX_SpikeTop:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -132,7 +132,7 @@ TEX_SpikeTop:
 
 .global TEX_Spiny

 TEX_Spiny:

-	lwz r5, 4(r31)

+	lwz r5, 4(r27)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -140,7 +140,7 @@ TEX_Spiny:
 
 .global TEX_SpringBlock

 TEX_SpringBlock:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -148,7 +148,7 @@ TEX_SpringBlock:
 
 .global TEX_Coaster

 TEX_Coaster:

-	lwz r5, 4(r5)

+	lwz r5, 4(r31)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -156,14 +156,14 @@ TEX_Coaster:
 
 .global TEX_Koopa

 TEX_Koopa:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

 
 
 .global TEX_Gabon

 TEX_Gabon:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -171,7 +171,7 @@ TEX_Gabon:
 
 .global TEX_Podoboo

 TEX_Podoboo:

-	lwz r5, 4(r27)

+	lwz r5, 4(r31)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -179,7 +179,7 @@ TEX_Podoboo:
 
 .global TEX_Switch

 TEX_Switch:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 16

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -187,7 +187,8 @@ TEX_Switch:
 
 .global TEX_WiggleShroom

 TEX_WiggleShroom:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

+	# This could be r29, or r28
 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -195,7 +196,7 @@ TEX_WiggleShroom:
 
 .global TEX_Bramball

 TEX_Bramball:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -203,7 +204,7 @@ TEX_Bramball:
 
 .global TEX_Monty

 TEX_Monty:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -211,7 +212,7 @@ TEX_Monty:
 
 .global TEX_ChainChomp

 TEX_ChainChomp:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -219,7 +220,7 @@ TEX_ChainChomp:
 
 .global TEX_Manta

 TEX_Manta:

-	lwz r5, 4(r29)

+	lwz r5, 4(r28)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -227,7 +228,7 @@ TEX_Manta:
 
 .global TEX_Parabeetle

 TEX_Parabeetle:

-	lwz r5, 4(r31)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -235,7 +236,7 @@ TEX_Parabeetle:
 
 .global TEX_Bomb

 TEX_Bomb:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -243,7 +244,7 @@ TEX_Bomb:
 
 .global TEX_CheepA

 TEX_CheepA:

-	lwz r5, 4(r28)

+	lwz r5, 4(r27)

 	srwi r5, r5, 20

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -251,7 +252,7 @@ TEX_CheepA:
 
 .global TEX_CheepB

 TEX_CheepB:

-	lwz r5, 4(r29)

+	lwz r5, 4(r28)

 	srwi r5, r5, 20

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -259,7 +260,7 @@ TEX_CheepB:
 
 .global TEX_CheepC

 TEX_CheepC:

-	lwz r5, 4(r29)

+	lwz r5, 4(r28)

 	srwi r5, r5, 20

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -267,7 +268,7 @@ TEX_CheepC:
 
 .global TEX_CheepChomp

 TEX_CheepChomp:

-	lwz r5, 4(r31)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -275,7 +276,7 @@ TEX_CheepChomp:
 
 .global TEX_Boo

 TEX_Boo:

-	lwz r5, 4(r28)

+	lwz r5, 4(r27)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -283,7 +284,7 @@ TEX_Boo:
 
 .global TEX_Midway

 TEX_Midway:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -291,7 +292,7 @@ TEX_Midway:
 
 .global TEX_Goal

 TEX_Goal:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -299,7 +300,15 @@ TEX_Goal:
 
 .global TEX_StretchMush

 TEX_StretchMush:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

+	srwi r5, r5, 24

+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5

+
+
+.global TEX_BlockSlide

+TEX_BlockSlide:

+	lwz r5, 4(r28)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -307,7 +316,7 @@ TEX_StretchMush:
 
 .global TEX_Spinner

 TEX_Spinner:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -315,7 +324,7 @@ TEX_Spinner:
 
 .global TEX_Platforms

 TEX_Platforms:

-	lwz r5, 4(r31)

+	lwz r5, 4(r29)

 	srwi r5, r5, 4

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -323,7 +332,7 @@ TEX_Platforms:
 
 .global TEX_PokeyA

 TEX_PokeyA:

-	lwz r5, 4(r31)

+	lwz r5, 4(r30)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5

@@ -331,7 +340,7 @@ TEX_PokeyA:
 
 .global TEX_PokeyB

 TEX_PokeyB:

-	lwz r5, 4(r31)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5