diff options
Diffstat (limited to '')
| -rw-r--r-- | src/spritetex.S | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/src/spritetex.S b/src/spritetex.S index 504cf5f..7464820 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
@@ -175,6 +185,14 @@ TEX_Gabon: b GetTexFilenameForR5
+.global TEX_GabonRock
+TEX_GabonRock:
+ lwz r5, 4(r29)
+ srwi r5, r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
.global TEX_Podoboo
TEX_Podoboo:
lwz r5, 4(r31)
@@ -193,8 +211,19 @@ TEX_Switch: .global TEX_WiggleShroom
TEX_WiggleShroom:
- lwz r5, 4(r30)
- # This could be r29, or r28 + lwz r5, -0x520(r3)
+ # 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
@@ -246,6 +275,14 @@ TEX_Bomb: srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+ +
+.global TEX_ParaBomb
+TEX_ParaBomb:
+ lwz r5, 4(r29)
+ srwi r5, r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
.global TEX_CheepA
@@ -292,11 +329,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
|