diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 16:08:54 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-09-23 16:08:54 -0500 |
| commit | 9df87851bac473d72f8c061af719e2b0a0116dec (patch) | |
| tree | dbea9530ad6dfbfc606b60d4c5e8af7de558a103 /src/spritetex.S | |
| parent | b9d6e55d5823ec18050ba2bd3c9c968c219dec92 (diff) | |
| download | kamek-9df87851bac473d72f8c061af719e2b0a0116dec.tar.gz kamek-9df87851bac473d72f8c061af719e2b0a0116dec.zip | |
fixed up the level select yaml, fixed snowman pokey and commented out cheep cheep textures
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: |