summaryrefslogtreecommitdiff
path: root/src/spritetex.S
diff options
context:
space:
mode:
authorColin Noga <Tempus@chronometry.ca>2012-07-07 23:34:18 -0500
committerColin Noga <Tempus@chronometry.ca>2012-07-07 23:34:18 -0500
commitc6ad18e5f0cf1b627d850fa3101a8c78648ff452 (patch)
treef18ac75de2e867c055b07a6c88ae7f920faa2e3a /src/spritetex.S
parent1c3e5a0b1c62829d78960c4d99e4928ccf73625f (diff)
downloadkamek-c6ad18e5f0cf1b627d850fa3101a8c78648ff452.tar.gz
kamek-c6ad18e5f0cf1b627d850fa3101a8c78648ff452.zip
Lots of fixes
Diffstat (limited to 'src/spritetex.S')
-rwxr-xr-xsrc/spritetex.S10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 51e4cb7..563d81a 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -417,9 +417,15 @@ TEX_Midway:
.global TEX_ColorBlock
TEX_ColorBlock:
- lwz r5, 4(r30)
+
+ cmpwi r0, 0xB0
+ bnelr
+
+ subi r9, r29, 0x4E0
+
+ lwz r5, 4(r9)
srwi r5, r5, 28
- andi. r5, r5, 0xFF
+ andi. r5, r5, 0xF
b GetTexFilenameForR5