Think Im supposed to update other branches too...?

1 files changed, 49 insertions, 30 deletions

diff --git a/src/spritetex.S b/src/spritetex.S
index 723fcb5..504cf5f 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,20 @@ TEX_Coaster:
 

 .global TEX_Koopa

 TEX_Koopa:

+<<<<<<< HEAD
+	lwz r5, 4(r29)

+	srwi r5, r5, 24

+	andi. r5, r5, 0xF
+=======
 	lwz r5, 4(r30)

 	andi. r5, r5, 0xF

+>>>>>>> 6e93a3612c2d4ce6e11ab53d2490eb30c0e262bf
 	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 +177,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 +185,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 +193,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 +202,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 +210,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 +218,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 +226,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 +234,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 +242,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 +250,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 +258,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 +266,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 +274,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 +282,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,15 +290,19 @@ TEX_Boo:
 

 .global TEX_Midway

 TEX_Midway:

-	lwz r5, 4(r30)

+	lwz r5, 4(r29)

 	srwi r5, r5, 24

+<<<<<<< HEAD
+	andi. r5, r5, 0xFF
+=======
 	andi. r5, r5, 0xF

+>>>>>>> 6e93a3612c2d4ce6e11ab53d2490eb30c0e262bf
 	b GetTexFilenameForR5

 

 

 .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 +310,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 +326,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 +334,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 +342,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 +350,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