1 files changed, 50 insertions, 13 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 504cf5f..920036c 100644
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -121,6 +121,13 @@ TEX_Buzzy:
 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
 
+.global TEX_BuzzyShell
+TEX_BuzzyShell:
+	lwz r5, 4(r3)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
 
 .global TEX_SpikeTop
 TEX_SpikeTop:
@@ -132,7 +139,15 @@ TEX_SpikeTop:
 
 .global TEX_Spiny
 TEX_Spiny:
-	lwz r5, 4(r27)
+	lwz r5, 4(r30)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
+
+.global TEX_SpinyShell
+TEX_SpinyShell:
+	lwz r5, 4(r3)
 	srwi r5, r5, 24
 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
@@ -156,14 +171,9 @@ 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
 
 
@@ -193,12 +203,43 @@ TEX_Switch:
 
 .global TEX_WiggleShroom
 TEX_WiggleShroom:
-	lwz r5, 4(r30)
-	# This could be r29, or r28
+	lwz r5, 4(r4)
+	# This sprite is pretty complex
+	# The register with THIS is r29
+	# before the loading function,
+	# it passes it into r3, and then mr's
+	# it into r30. r3 is then overwritten.
+	# Then, it puts r31 into r5, r30 partly
+	# into r3 and partly into r4. Why?
+	# So, the possibilities for THIS are
+	# r30, r3, and r4, no? In the next function,
+	# r30 is stored over before our getFile, as
+	# are r29/r28.
+	
 	srwi r5, r5, 24
 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5
 
+	lwz r5, 4(r3)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
+	lwz r5, 4(r29)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
+	lwz r5, 4(r30)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
+	lwz r5, 4(r31)
+	srwi r5, r5, 24
+	andi. r5, r5, 0xF
+	b GetTexFilenameForR5
+
 
 .global TEX_Bramball
 TEX_Bramball:
@@ -292,11 +333,7 @@ TEX_Boo:
 TEX_Midway:
 	lwz r5, 4(r29)
 	srwi r5, r5, 24
-<<<<<<< HEAD
 	andi. r5, r5, 0xFF
-=======
-	andi. r5, r5, 0xF
->>>>>>> 6e93a3612c2d4ce6e11ab53d2490eb30c0e262bf
 	b GetTexFilenameForR5
 
 
@@ -310,7 +347,7 @@ TEX_Goal:
 
 .global TEX_StretchMush
 TEX_StretchMush:
-	lwz r5, 4(r30)
+	lwz r5, 4(r27)
 	srwi r5, r5, 24
 	andi. r5, r5, 0xF
 	b GetTexFilenameForR5