1 files changed, 114 insertions, 105 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index d8caf94..504cf5f 100644
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -63,242 +63,251 @@ TEX_Bush:
 	b GetTexFilenameForR5
 
 
-# The below was added by Tempus
-
-
+# The below was added by Tempus
+
+
 .global TEX_Goomba
 TEX_Goomba:
 	lwz r5, 4(r3)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Barrel
 TEX_Barrel:
 	lwz r5, 4(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Blooper
 TEX_Blooper:
 	lwz r5, 4(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_BigBlock
 TEX_BigBlock:
 	lwz r5, 4(r28)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Thwomp
 TEX_Thwomp:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_GiantBuzzy
 TEX_GiantBuzzy:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Buzzy
 TEX_Buzzy:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_SpikeTop
 TEX_SpikeTop:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Spiny
 TEX_Spiny:
 	lwz r5, 4(r27)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_SpringBlock
 TEX_SpringBlock:
 	lwz r5, 4(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Coaster
 TEX_Coaster:
 	lwz r5, 4(r31)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .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(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Podoboo
 TEX_Podoboo:
 	lwz r5, 4(r31)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Switch
 TEX_Switch:
 	lwz r5, 4(r29)
 	srwi r5, r5, 16
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_WiggleShroom
 TEX_WiggleShroom:
 	lwz r5, 4(r30)
 	# This could be r29, or r28
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Bramball
 TEX_Bramball:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Monty
 TEX_Monty:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_ChainChomp
 TEX_ChainChomp:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Manta
 TEX_Manta:
 	lwz r5, 4(r28)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Parabeetle
 TEX_Parabeetle:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Bomb
 TEX_Bomb:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_CheepA
 TEX_CheepA:
 	lwz r5, 4(r27)
 	srwi r5, r5, 20
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_CheepB
 TEX_CheepB:
 	lwz r5, 4(r28)
 	srwi r5, r5, 20
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_CheepC
 TEX_CheepC:
 	lwz r5, 4(r28)
 	srwi r5, r5, 20
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_CheepChomp
 TEX_CheepChomp:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Boo
 TEX_Boo:
 	lwz r5, 4(r27)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Midway
 TEX_Midway:
 	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(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_StretchMush
 TEX_StretchMush:
 	lwz r5, 4(r30)
@@ -311,43 +320,43 @@ TEX_StretchMush:
 TEX_BlockSlide:
 	lwz r5, 4(r28)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Spinner
 TEX_Spinner:
 	lwz r5, 4(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_Platforms
 TEX_Platforms:
 	lwz r5, 4(r29)
 	srwi r5, r5, 4
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_PokeyA
 TEX_PokeyA:
 	lwz r5, 4(r30)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
+
+
 .global TEX_PokeyB
 TEX_PokeyB:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-	andi. r5, r5, 0xF
+	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
-
-
-
+
+
+
 
 
 .data
@@ -355,5 +364,5 @@ TexFilenameBuffer:
 	.long 0,0,0,0
 
 TexFormatString:
-	.string "g3d/t02d.brres"
+	.string "g3d/t%02d.brres"