summaryrefslogtreecommitdiff
path: root/src/spritetex.S
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-05-16 12:22:38 -0500
committerColin Noga <Tempus@Spectrum-Song.local>2011-05-16 12:22:38 -0500
commit7c5d2a4dd2a81282c38a6bbddacb3fe9c12808c4 (patch)
tree401107f34008631843067609eb8ff6c0a2096db7 /src/spritetex.S
parent80688e9e682a1fb354160f729d4caff394831e9e (diff)
downloadkamek-7c5d2a4dd2a81282c38a6bbddacb3fe9c12808c4.tar.gz
kamek-7c5d2a4dd2a81282c38a6bbddacb3fe9c12808c4.zip
Pushed last mostly stable Tempus hacks
Diffstat (limited to 'src/spritetex.S')
-rw-r--r--src/spritetex.S40
1 files changed, 18 insertions, 22 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 920036c..7464820 100644
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -185,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)
@@ -203,7 +211,7 @@ TEX_Switch:
.global TEX_WiggleShroom
TEX_WiggleShroom:
- lwz r5, 4(r4)
+ lwz r5, -0x520(r3)
# This sprite is pretty complex
# The register with THIS is r29
# before the loading function,
@@ -220,26 +228,6 @@ TEX_WiggleShroom:
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:
@@ -287,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
@@ -347,7 +343,7 @@ TEX_Goal:
.global TEX_StretchMush
TEX_StretchMush:
- lwz r5, 4(r27)
+ lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5