diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-06-24 19:34:56 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-06-24 19:34:56 -0500 |
| commit | 10fa535e98f3e1043b04895aaab2e916549fcf69 (patch) | |
| tree | 7dda2c5658961801414f2eef9e9137efadd26d78 /src/spritetex.S | |
| parent | fd286ae035b52d3d78e234d9f91b6610ae30def6 (diff) | |
| download | kamek-10fa535e98f3e1043b04895aaab2e916549fcf69.tar.gz kamek-10fa535e98f3e1043b04895aaab2e916549fcf69.zip | |
Lots of bug fixes, bowser improvements, summer sun hacks, JPN support, etc.
Diffstat (limited to '')
| -rwxr-xr-x | src/spritetex.S | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/spritetex.S b/src/spritetex.S index 18a09e1..51e4cb7 100755 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -415,6 +415,13 @@ TEX_Midway: b GetTexFilenameForR5 +.global TEX_ColorBlock +TEX_ColorBlock: + lwz r5, 4(r30) + srwi r5, r5, 28 + andi. r5, r5, 0xFF + b GetTexFilenameForR5 + .global TEX_Platforms @@ -503,6 +510,45 @@ TEX_Platform_ShifterSL: +# The small sand pieces that fall from the snowman +.global TEX_SnowmanSandToSnow +TEX_SnowmanSandToSnow: + + lwz r10, 4(r29) + srwi r10, r10, 24 + andi. r10, r10, 0xF + + cmpwi r10, 0x2 + bne SnowmanSandToSnow + + lis r4, snoweffectC@h + ori r4, r4, snoweffectC@l + blr + +SnowmanSandToSnow: + addi r4, r4, 0x792C + blr + + +# The small sand puffs that occur when it moves +.global TEX_SnowmanSandToSnowB +TEX_SnowmanSandToSnowB: + + lwz r10, 4(r30) + srwi r10, r10, 24 + andi. r10, r10, 0xF + + cmpwi r10, 0x2 + bne SnowmanSandToSnowB + + lis r4, snoweffectD@h + ori r4, r4, snoweffectD@l + blr + +SnowmanSandToSnowB: + addi r4, r4, 0x7944 + blr + .global TEX_PokeySnowman TEX_PokeySnowman: @@ -1192,6 +1238,14 @@ rockeffectB: .string "Wm_ob_cmnrockpiece" .align 4 +snoweffectD: + .string "Wm_ob_icebreaksmk" +.align 4 + +snoweffectC: + .string "Wm_ob_icewait" +.align 4 + ConvertFloat: |