summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-02-05 20:45:59 +0100
committerTreeki <treeki@gmail.com>2012-02-05 20:45:59 +0100
commitfef04074604c7bda05cbb61dadb1600527121ed2 (patch)
tree8e7f45e9458bb46b80f69de907e9f50e3b8a1d74 /src
parent0b44984de3c0113c05cdbe3db38eaa3578965fde (diff)
downloadkamek-fef04074604c7bda05cbb61dadb1600527121ed2.tar.gz
kamek-fef04074604c7bda05cbb61dadb1600527121ed2.zip
I ... didn't check which nybbles were used. oops
Diffstat (limited to '')
-rwxr-xr-xsrc/spritetex.S16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 2a69a94..dedfbab 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -300,8 +300,6 @@ TEX_SpikeBall:
TEX_HuckitBalls:
.global HammerColour
HammerColour:
-.global TEX_RollingHills
-TEX_RollingHills:
lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
@@ -317,6 +315,20 @@ TEX_Podoboo:
# All these vary
+.global TEX_RollingHills
+TEX_RollingHills:
+ lwz r5, 4(r30)
+
+ # Get style
+ extrwi. r9, r5, 4, 8
+ beq JustUseZero
+
+ extrwi r5, r5, 8, 16
+ b GetTexFilenameForR5
+
+JustUseZero:
+ li r5, 0
+ b GetTexFilenameForR5
.global TEX_Gabon_Spike
TEX_Gabon_Spike: