summaryrefslogtreecommitdiff
path: root/src/spritetex.S
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-09-11 06:13:25 -0500
committerColin Noga <Tempus@Spectrum-Song.local>2011-09-11 06:13:25 -0500
commit0e5f20a6dc5f179cc38692b79a233ff2c1d86450 (patch)
tree3d5957e1fc5eae2fc62db0016c48b8d1d0ae3faf /src/spritetex.S
parentdd486705285fa58fe8a292203329b9a35ff1d77d (diff)
downloadkamek-0e5f20a6dc5f179cc38692b79a233ff2c1d86450.tar.gz
kamek-0e5f20a6dc5f179cc38692b79a233ff2c1d86450.zip
MrSun prototype and some fixes
Diffstat (limited to '')
-rwxr-xr-xsrc/spritetex.S20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index fa4d6e8..431d29f 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -403,6 +403,15 @@ TEX_Manta:
andi. r5, r5, 0xF
b GetTexFilenameForR5
+.global TEX_MantaInherit
+TEX_MantaInherit:
+ lwz r5, 4(r28)
+ andis. r5, r5, 0x0F00
+
+ or r5, r5, r0
+ oris r5, r5, 0x8000
+ blr
+
.global TEX_Parabeetle
TEX_Parabeetle:
@@ -1241,11 +1250,9 @@ FlakeyStardust:
.global TEX_Flakes
TEX_Flakes:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
+ lis r5, snowstring@h
+ ori r5, r5, snowstring@l
+ blr
.data
@@ -1258,6 +1265,9 @@ TexFilenameBuffer:
TexFormatString:
.string "g3d/t%02d.brres"
+snowstring:
+ .string "g3d/t00.brres"
+
ConvertFloat:
.word 0x43300000,0x0,0x43300000,0x80000000