diff options
| -rw-r--r-- | data/battle_anim_scripts.s | 184 | ||||
| -rw-r--r-- | src/battle/anim/ice.c | 108 |
2 files changed, 146 insertions, 146 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f81e52540..42bfad289 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2247,15 +2247,15 @@ Move_ICY_WIND: @ 81CA650 waitbgfadein end _81CA6A8: - createsprite SmallSnowballSpriteTemplate1, 168, 0, 0, 0, 0, 72, 1 + createsprite gSmallSnowballSpriteTemplate1, 168, 0, 0, 0, 0, 72, 1 delay 5 - createsprite SmallSnowballSpriteTemplate1, 168, 0, 10, 0, 10, 72, 1 + createsprite gSmallSnowballSpriteTemplate1, 168, 0, 10, 0, 10, 72, 1 delay 5 - createsprite SmallSnowballSpriteTemplate1, 168, 0, -10, 0, -10, 72, 1 + createsprite gSmallSnowballSpriteTemplate1, 168, 0, -10, 0, -10, 72, 1 delay 5 - createsprite SmallSnowballSpriteTemplate1, 168, 0, 15, 0, 15, 72, 1 + createsprite gSmallSnowballSpriteTemplate1, 168, 0, 15, 0, 15, 72, 1 delay 5 - createsprite SmallSnowballSpriteTemplate1, 168, 0, -5, 0, -5, 72, 1 + createsprite gSmallSnowballSpriteTemplate1, 168, 0, -5, 0, -5, 72, 1 return Move_SMOKESCREEN: @ 81CA710 @@ -3946,7 +3946,7 @@ Move_MIST_BALL: @ 81CCA72 loadspritegfx 10270 delay 0 playsewithpan SE_W081, 192 - createsprite MistBallSpriteTemplate, 128, 0, 0, 0, 0, 30, 0 + createsprite gMistBallSpriteTemplate, 128, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, 63 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_TARGET, 5, 0, 10, 0 @@ -4662,15 +4662,15 @@ Move_ICE_PUNCH: @ 81CDB3E createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 32588 delay 20 playsewithpan SE_W081, 63 - createsprite SmallIcePunchCrystalSpriteTemplate, 2, 0 - createsprite SmallIcePunchCrystalSpriteTemplate, 2, 64 - createsprite SmallIcePunchCrystalSpriteTemplate, 2, 128 - createsprite SmallIcePunchCrystalSpriteTemplate, 2, 192 + createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 0 + createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 64 + createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 128 + createsprite gSmallIcePunchCrystalSpriteTemplate, 2, 192 delay 5 - createsprite LargeIcePunchCrystalSpriteTemplate, 2, 32 - createsprite LargeIcePunchCrystalSpriteTemplate, 2, 96 - createsprite LargeIcePunchCrystalSpriteTemplate, 2, 160 - createsprite LargeIcePunchCrystalSpriteTemplate, 2, 224 + createsprite gLargeIcePunchCrystalSpriteTemplate, 2, 32 + createsprite gLargeIcePunchCrystalSpriteTemplate, 2, 96 + createsprite gLargeIcePunchCrystalSpriteTemplate, 2, 160 + createsprite gLargeIcePunchCrystalSpriteTemplate, 2, 224 delay 17 createsprite gFistFootSpriteTemplate, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 3, 0, -10, 1, 1 @@ -5148,7 +5148,7 @@ Move_SMOG: @ 81CE672 blendoff end _81CE6D7: - createsprite SmogCloudSpriteTemplate, 2, 0, -24, 48, 240, 1, 0 + createsprite gSmogCloudSpriteTemplate, 2, 0, -24, 48, 240, 1, 0 delay 7 return @@ -5355,8 +5355,8 @@ Move_ICE_BEAM: @ 81CEB4D createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, rgb(0, 0, 0) waitforvisualfinish createsoundtask sub_812B058, 183, -64, 63, 4, 4, 0, 10 - createsprite IceBeamOuterParticleSpriteTemplate, 2, 20, 12, 0, 12, 20 - createsprite IceBeamOuterParticleSpriteTemplate, 2, 20, -12, 0, -12, 20 + createsprite gIceBeamOuterParticleSpriteTemplate, 2, 20, 12, 0, 12, 20 + createsprite gIceBeamOuterParticleSpriteTemplate, 2, 20, -12, 0, -12, 20 delay 1 call _81CEC4E call _81CEC4E @@ -5385,8 +5385,8 @@ Move_ICE_BEAM: @ 81CEB4D blendoff end _81CEC4E: - createsprite IceBeamOuterParticleSpriteTemplate, 2, 20, 12, 0, 12, 20 - createsprite IceBeamOuterParticleSpriteTemplate, 2, 20, -12, 0, -12, 20 + createsprite gIceBeamOuterParticleSpriteTemplate, 2, 20, 12, 0, 12, 20 + createsprite gIceBeamOuterParticleSpriteTemplate, 2, 20, -12, 0, -12, 20 createsprite IceBeamCenterParticleSpriteTemplate, 2, 20, 0, 0, 0, 11 delay 1 return @@ -5548,26 +5548,26 @@ _81CEFD0: waitbgfadein end _81CF00A: - createsprite SmallSnowballSpriteTemplate1, 40, 0, -10, 0, -10, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, 0, 0, 0, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -10, 0, -10, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -15, 0, -15, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, -10, 0, -10, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -15, 0, -15, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, -10, 0, -10, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -5, 0, -5, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, 10, 0, 10, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -5, 0, -5, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, 10, 0, 10, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -10, 0, -10, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -10, 0, -10, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -20, 0, -20, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, 15, 0, 15, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -20, 0, -20, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, 15, 0, 15, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -15, 0, -15, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, -20, 0, -20, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -15, 0, -15, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, -20, 0, -20, 80, 0, 0, 1 delay 3 - createsprite SmallSnowballSpriteTemplate1, 40, 0, -25, 0, -25, 72, 1 - createsprite LargeSnowballSpriteTemplate, 40, 0, 20, 0, 20, 80, 0, 0, 1 + createsprite gSmallSnowballSpriteTemplate1, 40, 0, -25, 0, -25, 72, 1 + createsprite gLargeSnowballSpriteTemplate, 40, 0, 20, 0, 20, 80, 0, 0, 1 delay 3 return _81CF13F: @@ -5592,19 +5592,19 @@ Move_POWDER_SNOW: @ 81CF146 createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 3, 0, rgb(0, 0, 0) end _81CF190: - createsprite SmallSnowballSpriteTemplate2, 40, 0, 0, 0, 0, 56, 4, 4, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, -10, 0, -10, 56, 4, 4, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, -10, 0, -10, 56, 4, 4, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, 10, 0, 10, 56, -4, 3, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, 10, 0, 10, 56, -4, 3, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, -20, 0, -20, 56, -4, 5, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, -20, 0, -20, 56, -4, 5, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, 15, 0, 15, 56, 4, 4, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, 15, 0, 15, 56, 4, 4, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, -20, 0, -20, 56, 4, 4, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, -20, 0, -20, 56, 4, 4, 1 delay 3 - createsprite SmallSnowballSpriteTemplate2, 40, 0, 20, 0, 20, 56, 4, 4, 1 + createsprite gSmallSnowballSpriteTemplate2, 40, 0, 20, 0, 20, 56, 4, 4, 1 delay 3 return @@ -6919,7 +6919,7 @@ Move_MIST: @ 81D1073 blendoff end _81D10BE: - createsprite MistCloudSpriteTemplate, 2, 0, -24, 48, 240, 0, 1 + createsprite gMistCloudSpriteTemplate, 2, 0, -24, 48, 240, 0, 1 delay 7 return @@ -7063,22 +7063,22 @@ Move_POISON_GAS: @ 81D1474 setalpha 12, 8 delay 0 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 playsewithpan SE_W054, 192 - createsprite PoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 + createsprite gPoisonGasCloudSpriteTemplate, 128, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 loopsewithpan SE_W054, 63, 28, 6 createvisualtask sub_80E1F8C, 2, 4, 6, 2, 0, 12, 26650 @@ -9738,7 +9738,7 @@ Move_ICE_BALL: @ 81D57BA jumpargeq 0, 4, _81D5831 _81D57D1: playsewithpan SE_W196, 192 - createsprite IceBallSpriteTemplate, 130, 15, 0, -12, -16, 30, -40 + createsprite gIceBallSpriteTemplate, 130, 15, 0, -12, -16, 30, -40 delay 28 playsewithpan SE_W280, 63 createvisualtask AnimTask_CountIceBallThrows, 5, 0 @@ -9818,7 +9818,7 @@ _81D5935: call _81D597D goto _81D581F _81D597D: - createsprite IceBallParticleSpriteTemplate, 132, -12, -16 + createsprite gIceBallParticleSpriteTemplate, 132, -12, -16 return Move_WEATHER_BALL: @ 81D5989 @@ -9900,13 +9900,13 @@ _81D5AF9: _81D5B99: loadspritegfx 10263 loadspritegfx 10141 - createsprite WeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, -40, 20 + createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, 63 delay 10 - createsprite WeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 40, 0 + createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, 63 delay 10 - createsprite WeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 0, 0 + createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 @@ -9928,101 +9928,101 @@ PoundCopy: @ 81D5C05 end Effect_LightIceDamage: @ 81D5C36 - createsprite LargeIceEffectParticleSpriteTemplate, 130, -10, -10, 0 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -10, -10, 0 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 10, 20, 0 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 10, 20, 0 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, -5, 10, 0 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -5, 10, 0 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 17, -12, 0 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 17, -12, 0 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, -15, 15, 0 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, -15, 15, 0 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 0, 0, 0 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 0, 0, 0 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, 20, 2, 0 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, 20, 2, 0 playsewithpan SE_W196, 63 return Effect_HeavyIceDamage: @ 81D5CBA - createsprite LargeIceEffectParticleSpriteTemplate, 130, -10, -10, 1 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -10, -10, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 10, 20, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 10, 20, 1 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, -29, 0, 1 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -29, 0, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 29, -20, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 29, -20, 1 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, -5, 10, 1 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -5, 10, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 17, -12, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 17, -12, 1 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, -20, 0, 1 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, -20, 0, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, -15, 15, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, -15, 15, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 26, -5, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 26, -5, 1 playsewithpan SE_W196, 63 delay 4 - createsprite SmallIceEffectParticleSpriteTemplate, 130, 0, 0, 1 + createsprite gSmallIceEffectParticleSpriteTemplate, 130, 0, 0, 1 playsewithpan SE_W196, 63 delay 4 - createsprite LargeIceEffectParticleSpriteTemplate, 130, 20, 2, 1 + createsprite gLargeIceEffectParticleSpriteTemplate, 130, 20, 2, 1 playsewithpan SE_W196, 63 return Unknown_81D5D8A: @ 81D5D8A loopsewithpan SE_W196, 63, 6, 4 - createsprite IceSpikeSpriteTemplate, 130, 0, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, 0, 24, 0 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 8, 24, 0 - createsprite IceSpikeSpriteTemplate, 130, -8, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, 8, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, -8, 24, 0 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 16, 24, 0 - createsprite IceSpikeSpriteTemplate, 130, -16, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, 16, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, -16, 24, 0 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 24, 24, 0 - createsprite IceSpikeSpriteTemplate, 130, -24, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, 24, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, -24, 24, 0 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 32, 24, 0 - createsprite IceSpikeSpriteTemplate, 130, -32, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, 32, 24, 0 + createsprite gIceSpikeSpriteTemplate, 130, -32, 24, 0 return Unknown_81D5E0E: @ 81D5E0E Icy Wind animates end bit with the wavy shiz loopsewithpan SE_W196, 63, 6, 4 - createsprite IceSpikeSpriteTemplate, 130, 0, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 0, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 8, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -8, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 8, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -8, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 16, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -16, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 16, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -16, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 24, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -24, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 24, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -24, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 32, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -32, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 32, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -32, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 40, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -40, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 40, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -40, 24, 1 delay 4 - createsprite IceSpikeSpriteTemplate, 130, 48, 24, 1 - createsprite IceSpikeSpriteTemplate, 130, -48, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, 48, 24, 1 + createsprite gIceSpikeSpriteTemplate, 130, -48, 24, 1 return Unknown_81D5ECA: @ 81D5ECA diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index c990303f5..0ff236523 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -26,11 +26,10 @@ extern struct INCBIN_U8 gBattleAnimFogTilemap; extern struct INCBIN_U8 gWeatherFog1Tiles; static void sub_80D7704(struct Sprite *sprite); -static void AnimIcePunchSwirlingParticles(struct Sprite *sprite); -static void AnimIceBeamParticles(struct Sprite *sprite); -static void AnimIceEffectParticles(struct Sprite *sprite); -static void AnimFlickerIceEffectParticles(struct Sprite *sprite); -static void AnimSwirlingSnowball1(struct Sprite *sprite); +static void AnimIcePunchSwirlingParticle(struct Sprite *sprite); +static void AnimIceBeamParticle(struct Sprite *sprite); +static void AnimIceEffectParticle(struct Sprite *sprite); +static void AnimFlickerIceEffectParticle(struct Sprite *sprite); static void AnimMoveParticleBeyondTarget(struct Sprite *sprite); static void AnimWaveFromCenterOfTarget(struct Sprite *sprite); static void InitSwirlingFogAnim(struct Sprite *sprite); @@ -39,16 +38,17 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite); static void AnimHailBegin(struct Sprite *sprite); void sub_807A9BC(struct Sprite *sprite); static void InitIceBallAnim(struct Sprite *sprite); -static void InitIceBallParticles(struct Sprite *sprite); -static void AnimSwirlingSnowball2(struct Sprite *sprite); -static void AnimSwirlingSnowball3(struct Sprite *sprite); -static void AnimSwirlingSnowballEnd(struct Sprite *sprite); +static void InitIceBallParticle(struct Sprite *sprite); +static void AnimSwirlingSnowball_Step1(struct Sprite *sprite); +static void AnimSwirlingSnowball_Step2(struct Sprite *sprite); +static void AnimSwirlingSnowball_Step3(struct Sprite *sprite); +static void AnimSwirlingSnowball_End(struct Sprite *sprite); static void AnimWiggleParticleTowardsTarget(struct Sprite *sprite); static void AnimSwirlingFogAnim(struct Sprite *sprite); static void sub_80D8874(struct Sprite *sprite); static void AnimHailContinue(struct Sprite *sprite); static void AnimThrowIceBall(struct Sprite *sprite); -static void AnimIceBallParticles(struct Sprite *sprite); +static void AnimIceBallParticle(struct Sprite *sprite); static void AnimTask_Haze2(u8 taskId); static void AnimTask_OverlayFogTiles(u8 taskId); @@ -157,7 +157,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9BDC[] = gSpriteAffineAnim_83D9BCC, }; -const struct SpriteTemplate LargeIcePunchCrystalSpriteTemplate = +const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -165,10 +165,10 @@ const struct SpriteTemplate LargeIcePunchCrystalSpriteTemplate = .anims = gSpriteAnimTable_83D9BB8, .images = NULL, .affineAnims = gSpriteAffineAnimTable_83D9BDC, - .callback = AnimIcePunchSwirlingParticles, + .callback = AnimIcePunchSwirlingParticle, }; -const struct SpriteTemplate SmallIcePunchCrystalSpriteTemplate = +const struct SpriteTemplate gSmallIcePunchCrystalSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -176,7 +176,7 @@ const struct SpriteTemplate SmallIcePunchCrystalSpriteTemplate = .anims = gSpriteAnimTable_83D9BBC, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimIcePunchSwirlingParticles, + .callback = AnimIcePunchSwirlingParticle, }; const union AffineAnimCmd gSpriteAffineAnim_83D9C10[] = @@ -198,10 +198,10 @@ const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = .anims = gSpriteAnimTable_83D9BB8, .images = NULL, .affineAnims = gSpriteAffineAnimTable_83D9C20, - .callback = AnimIceBeamParticles, + .callback = AnimIceBeamParticle, }; -const struct SpriteTemplate IceBeamOuterParticleSpriteTemplate = +const struct SpriteTemplate gIceBeamOuterParticleSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -209,7 +209,7 @@ const struct SpriteTemplate IceBeamOuterParticleSpriteTemplate = .anims = gSpriteAnimTable_83D9BBC, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimIceBeamParticles, + .callback = AnimIceBeamParticle, }; const union AffineAnimCmd gSpriteAffineAnim_83D9C54[] = @@ -225,7 +225,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C74[] = gSpriteAffineAnim_83D9C54, }; -const struct SpriteTemplate LargeIceEffectParticleSpriteTemplate = +const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -233,10 +233,10 @@ const struct SpriteTemplate LargeIceEffectParticleSpriteTemplate = .anims = gSpriteAnimTable_83D9BB8, .images = NULL, .affineAnims = gSpriteAffineAnimTable_83D9C74, - .callback = AnimIceEffectParticles, + .callback = AnimIceEffectParticle, }; -const struct SpriteTemplate SmallIceEffectParticleSpriteTemplate = +const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -244,10 +244,10 @@ const struct SpriteTemplate SmallIceEffectParticleSpriteTemplate = .anims = gSpriteAnimTable_83D9BBC, .images = NULL, .affineAnims = gSpriteAffineAnimTable_83D9C74, - .callback = AnimIceEffectParticles, + .callback = AnimIceEffectParticle, }; -const struct SpriteTemplate SmallSnowballSpriteTemplate1 = +const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = { .tileTag = 10141, .paletteTag = 10141, @@ -255,10 +255,10 @@ const struct SpriteTemplate SmallSnowballSpriteTemplate1 = .anims = gSpriteAnimTable_83D9BC0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimSwirlingSnowball1, + .callback = AnimSwirlingSnowball_Step1, }; -const struct SpriteTemplate LargeSnowballSpriteTemplate = +const struct SpriteTemplate gLargeSnowballSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -269,7 +269,7 @@ const struct SpriteTemplate LargeSnowballSpriteTemplate = .callback = AnimMoveParticleBeyondTarget, }; -const struct SpriteTemplate SmallSnowballSpriteTemplate2 = +const struct SpriteTemplate gSmallSnowballSpriteTemplate2 = { .tileTag = 10141, .paletteTag = 10141, @@ -297,7 +297,7 @@ const union AnimCmd *const gSpriteAnimTable_83D9D10[] = gSpriteAnim_83D9CF0, }; -const struct SpriteTemplate IceSpikeSpriteTemplate = +const struct SpriteTemplate gIceSpikeSpriteTemplate = { .tileTag = 10142, .paletteTag = 10142, @@ -320,7 +320,7 @@ const union AnimCmd *const gSpriteAnimTable_83D9D38[] = gSpriteAnim_83D9D2C, }; -const struct SpriteTemplate MistCloudSpriteTemplate = +const struct SpriteTemplate gMistCloudSpriteTemplate = { .tileTag = 10144, .paletteTag = 10144, @@ -331,7 +331,7 @@ const struct SpriteTemplate MistCloudSpriteTemplate = .callback = InitSwirlingFogAnim, }; -const struct SpriteTemplate SmogCloudSpriteTemplate = +const struct SpriteTemplate gSmogCloudSpriteTemplate = { .tileTag = 10172, .paletteTag = 10172, @@ -347,7 +347,7 @@ const u8 gUnknown_083D9D6C[] = 0, 1, 2, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 6, 7, 8, 8, 8, 9, }; -const struct SpriteTemplate MistBallSpriteTemplate = +const struct SpriteTemplate gMistBallSpriteTemplate = { .tileTag = 10155, .paletteTag = 10155, @@ -363,7 +363,7 @@ const u8 gUnknown_083D9D98[] = 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, }; -const struct SpriteTemplate PoisonGasCloudSpriteTemplate = +const struct SpriteTemplate gPoisonGasCloudSpriteTemplate = { .tileTag = 10172, .paletteTag = 10172, @@ -424,7 +424,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9E38[] = gSpriteAffineAnim_83D9E1C, }; -const struct SpriteTemplate HailSpriteTemplate = +const struct SpriteTemplate gHailSpriteTemplate = { .tileTag = 10263, .paletteTag = 10263, @@ -435,7 +435,7 @@ const struct SpriteTemplate HailSpriteTemplate = .callback = AnimHailBegin, }; -const struct SpriteTemplate WeatherBallHailSpriteTemplate = +const struct SpriteTemplate gWeatherBallHailSpriteTemplate = { .tileTag = 10263, .paletteTag = 10263, @@ -506,7 +506,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9EE0[] = gSpriteAffineAnim_83D9ED0, }; -const struct SpriteTemplate IceBallSpriteTemplate = +const struct SpriteTemplate gIceBallSpriteTemplate = { .tileTag = 10043, .paletteTag = 10043, @@ -517,7 +517,7 @@ const struct SpriteTemplate IceBallSpriteTemplate = .callback = InitIceBallAnim, }; -const struct SpriteTemplate IceBallParticleSpriteTemplate = +const struct SpriteTemplate gIceBallParticleSpriteTemplate = { .tileTag = 10141, .paletteTag = 10141, @@ -525,7 +525,7 @@ const struct SpriteTemplate IceBallParticleSpriteTemplate = .anims = gSpriteAnimTable_83D9BBC, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = InitIceBallParticles, + .callback = InitIceBallParticle, }; // unknown - potentially used in weather ball @@ -808,7 +808,7 @@ void sub_80D7888(struct Sprite *sprite) // Animates the swirling ice crystals in Ice Punch. // arg 0: initial position angle around circle (0-256) -static void AnimIcePunchSwirlingParticles(struct Sprite *sprite) +static void AnimIcePunchSwirlingParticle(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = 60; @@ -826,7 +826,7 @@ static void AnimIcePunchSwirlingParticles(struct Sprite *sprite) // arg 2: target x offset // arg 3: target y offset // arg 4: duration -static void AnimIceBeamParticles(struct Sprite *sprite) +static void AnimIceBeamParticle(struct Sprite *sprite) { InitAnimSpritePos(sprite, 1); sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); @@ -847,7 +847,7 @@ static void AnimIceBeamParticles(struct Sprite *sprite) // arg 0: target x offset // arg 1: target y offset // arg 2: ??? unknown boolean -static void AnimIceEffectParticles(struct Sprite *sprite) +static void AnimIceEffectParticle(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { @@ -863,11 +863,11 @@ static void AnimIceEffectParticles(struct Sprite *sprite) sprite->pos1.y += gBattleAnimArgs[1]; } - StoreSpriteCallbackInData(sprite, AnimFlickerIceEffectParticles); + StoreSpriteCallbackInData(sprite, AnimFlickerIceEffectParticle); sprite->callback = sub_80785E4; } -static void AnimFlickerIceEffectParticles(struct Sprite *sprite) +static void AnimFlickerIceEffectParticle(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[0] += 1; @@ -882,7 +882,7 @@ static void AnimFlickerIceEffectParticles(struct Sprite *sprite) // arg 3: target y offset // arg 4: particle speed // arg 5: multiple targets? (boolean) -static void AnimSwirlingSnowball1(struct Sprite *sprite) +static void AnimSwirlingSnowball_Step1(struct Sprite *sprite) { int i; s16 tempDataHolder[8]; @@ -935,10 +935,10 @@ static void AnimSwirlingSnowball1(struct Sprite *sprite) sprite->data[i] = tempDataHolder[i]; sprite->callback = sub_8078D8C; - StoreSpriteCallbackInData(sprite, AnimSwirlingSnowball2); + StoreSpriteCallbackInData(sprite, AnimSwirlingSnowball_Step2); } -static void AnimSwirlingSnowball2(struct Sprite *sprite) +static void AnimSwirlingSnowball_Step2(struct Sprite *sprite) { s16 tempVar; @@ -953,11 +953,11 @@ static void AnimSwirlingSnowball2(struct Sprite *sprite) sprite->data[3] = Sin(sprite->data[0], tempVar); sprite->data[4] = Cos(sprite->data[0], 0xF); sprite->data[5] = 0; - sprite->callback = AnimSwirlingSnowball3; - AnimSwirlingSnowball3(sprite); + sprite->callback = AnimSwirlingSnowball_Step3; + AnimSwirlingSnowball_Step3(sprite); } -static void AnimSwirlingSnowball3(struct Sprite *sprite) +static void AnimSwirlingSnowball_Step3(struct Sprite *sprite) { s16 tempVar; tempVar = GetBattlerSide(gAnimBankAttacker) != 0 ? 20 : 65516; @@ -977,11 +977,11 @@ static void AnimSwirlingSnowball3(struct Sprite *sprite) sprite->pos2.x = 0; sprite->data[4] = 0; sprite->data[3] = 0; - sprite->callback = AnimSwirlingSnowballEnd; + sprite->callback = AnimSwirlingSnowball_End; } } -static void AnimSwirlingSnowballEnd(struct Sprite *sprite) +static void AnimSwirlingSnowball_End(struct Sprite *sprite) { sprite->data[0] = 1; sub_8078CE8(sprite); @@ -2174,7 +2174,7 @@ NAKED bool8 sub_80D8BA8(u8 a1, u8 a2, u8 a3, u8 a4) "\tmovs r0, 0x1\n" "\tb _080D8D0A\n" "\t.align 2, 0\n" - "_080D8D00: .4byte HailSpriteTemplate\n" + "_080D8D00: .4byte gHailSpriteTemplate\n" "_080D8D04: .4byte gSprites\n" "_080D8D08:\n" "\tmovs r0, 0\n" @@ -2202,7 +2202,7 @@ static void AnimHailBegin(struct Sprite *sprite) if (sprite->data[0] == 1 && sprite->data[5] == 0) { - spriteId = CreateSprite(&LargeIceEffectParticleSpriteTemplate, + spriteId = CreateSprite(&gLargeIceEffectParticleSpriteTemplate, sprite->data[3], sprite->data[4], sprite->subpriority); sprite->data[0] = spriteId; @@ -2277,7 +2277,7 @@ static void AnimThrowIceBall(struct Sprite *sprite) } // Initializes the particles that scatter at the end of the Ice Ball animation. -static void InitIceBallParticles(struct Sprite *sprite) +static void InitIceBallParticle(struct Sprite *sprite) { s16 randA, randB; @@ -2292,11 +2292,11 @@ static void InitIceBallParticles(struct Sprite *sprite) sprite->data[1] = randA; sprite->data[2] = randB; - sprite->callback = AnimIceBallParticles; + sprite->callback = AnimIceBallParticle; } -// Animates the particles created by InitIceBallParticles. -static void AnimIceBallParticles(struct Sprite *sprite) +// Animates the particles created by InitIceBallParticle. +static void AnimIceBallParticle(struct Sprite *sprite) { sprite->data[3] += sprite->data[1]; sprite->data[4] += sprite->data[2]; |