diff options
| author | Treeki <treeki@gmail.com> | 2011-05-09 00:06:22 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2011-05-09 00:06:22 +0200 |
| commit | dfba90ee568e88aa05915ac7af9c81c45daac1a4 (patch) | |
| tree | e4dc5c99ba93fb50fc3f41887ffabd125c2799b0 /src/spritetex.S | |
| parent | 2e2aceac86ede364c5a5c98190b82ca70a96c660 (diff) | |
| download | kamek-dfba90ee568e88aa05915ac7af9c81c45daac1a4.tar.gz kamek-dfba90ee568e88aa05915ac7af9c81c45daac1a4.zip | |
adding Tempus's current sprite textures
Diffstat (limited to 'src/spritetex.S')
| -rw-r--r-- | src/spritetex.S | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/src/spritetex.S b/src/spritetex.S index 504cf5f..7bb1636 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,8 +203,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
@@ -292,11 +313,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
|