diff options
| author | Treeki <treeki@gmail.com> | 2012-08-17 22:50:19 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-08-17 22:50:19 +0200 |
| commit | 4f12cb6a6165362acb84b9991a1c4dd291e30eea (patch) | |
| tree | 06f3f58cb81627eee6b69b43fcc07e550b785a99 | |
| parent | 9b59d66c9f7b11aa926fd33df316def74afa76c8 (diff) | |
| download | kamek-4f12cb6a6165362acb84b9991a1c4dd291e30eea.tar.gz kamek-4f12cb6a6165362acb84b9991a1c4dd291e30eea.zip | |
nonzero nybble 11 on OBJ_SNOW now forces snow colours
| -rw-r--r-- | spritetex.yaml | 9 | ||||
| -rwxr-xr-x | src/spritetex.S | 15 |
2 files changed, 24 insertions, 0 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index 2af5db3..d6d7ebf 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -632,3 +632,12 @@ hooks: branch_type: bl src_addr_pal: 0x80A40C88 target_func: 'TEX_CrabBallSmoke' + + + + - name: ChangeWindyColour + type: branch_insn + branch_type: bl + src_addr_pal: 0x80887FB4 + target_func: 'ChangeWindyColour' + diff --git a/src/spritetex.S b/src/spritetex.S index 1aeea74..d5f7ed0 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -1215,6 +1215,21 @@ huckitRockBallEffectsB: +.global ChangeWindyColour +ChangeWindyColour: + lwz r3, 4(r23) + andi. r3, r3, 0xF0 + stb r0, 0x5BB(r23) + beqlr + lis r3, r3, 0xFFFF + ori r3, r3, 0xFF64 + stw r3, 0x5B4(r23) + lis r3, r3, 0x87E6 + ori r3, r3, 0xFFFF + stw r3, 0x5B8(r23) + blr + + .data BomombDir: .word 0x0400FC00 |