diff options
| author | Treeki <treeki@gmail.com> | 2012-09-24 05:40:39 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-09-24 05:40:39 +0200 |
| commit | 245bb3325f613f81973866100e86ee681b0fde9d (patch) | |
| tree | 7837866a91fc6c422ffb9b730c2fdbbb6577ea53 /src/spritetex.S | |
| parent | aafa2a57c88c01067266244eae2a906d8771c065 (diff) | |
| parent | 4f567256d015cf7a835ac03b9e5abb8a2a7eb12a (diff) | |
| download | kamek-245bb3325f613f81973866100e86ee681b0fde9d.tar.gz kamek-245bb3325f613f81973866100e86ee681b0fde9d.zip | |
Merge branch 'level-select' into new-hud
Diffstat (limited to 'src/spritetex.S')
| -rwxr-xr-x | src/spritetex.S | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/spritetex.S b/src/spritetex.S index 692a381..7c9f505 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -638,13 +638,10 @@ SnowmanSandToSnowB: - SnowmanPokeyRotate: - - lha r3, 0x102(r30) + li r5, 0x100 blr - .global TEX_PokeySnowmanRotate TEX_PokeySnowmanRotate: @@ -655,10 +652,29 @@ TEX_PokeySnowmanRotate: cmpwi r10, 0x2 bne SnowmanPokeyRotate + li r5, 0 + blr + + +PokeySnowmanImmuneToIce: + lwz r31, 4(r5) + blr + +.global TEX_PokeySnowmanImmuneToIce +TEX_PokeySnowmanImmuneToIce: + lwz r10, 4(r3) + srwi r10, r10, 24 + andi. r10, r10, 0xF + + cmpwi r10, 0x2 + bne PokeySnowmanImmuneToIce + li r3, 0 - sth r3, 0x102(r30) + mtlr r0 blr + + .global TEX_PokeySnowman TEX_PokeySnowman: |