diff options
| -rw-r--r-- | data/battle_anim_scripts.s | 446 | ||||
| -rw-r--r-- | include/battle_anim.h | 5 | ||||
| -rwxr-xr-x | src/battle_anim_effects_2.c | 6 | ||||
| -rw-r--r-- | src/battle_anim_mons.c | 4 | ||||
| -rw-r--r-- | src/battle_anim_status_effects.c | 8 | ||||
| -rw-r--r-- | src/battle_anim_utility_funcs.c | 2 | ||||
| -rw-r--r-- | src/bug.c | 19 | ||||
| -rw-r--r-- | src/dragon.c | 1 | ||||
| -rw-r--r-- | src/electric.c | 76 | ||||
| -rw-r--r-- | src/fight.c | 31 | ||||
| -rw-r--r-- | src/fire.c | 32 | ||||
| -rw-r--r-- | src/flying.c | 14 | ||||
| -rw-r--r-- | src/ghost.c | 3 | ||||
| -rw-r--r-- | src/ice.c | 6 | ||||
| -rw-r--r-- | src/normal.c | 6 | ||||
| -rw-r--r-- | src/poison.c | 30 | ||||
| -rw-r--r-- | src/psychic.c | 2 | ||||
| -rw-r--r-- | src/rock.c | 12 | ||||
| -rw-r--r-- | src/water.c | 29 |
19 files changed, 370 insertions, 362 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 1cba58261..fde742432 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -845,10 +845,10 @@ Move_TWINEEDLE: createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1 - createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, -4, 1, 3 + createsprite gSpikeHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2 delay 1 - createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 10, 12, 1, 3 + createsprite gSpikeHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1033,21 +1033,21 @@ Move_SONIC_BOOM: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - call SonicBoom1 - call SonicBoom1 - call SonicBoom1 + call SonicBoomProjectile + call SonicBoomProjectile + call SonicBoomProjectile createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1 - call SonicBoom2 + call SonicBoomHit waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -SonicBoom1: +SonicBoomProjectile: playsewithpan SE_W013B, SOUND_PAN_ATTACKER createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return -SonicBoom2: +SonicBoomHit: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 2 delay 4 return @@ -1058,7 +1058,7 @@ Move_THUNDER_SHOCK: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 - createvisualtask sub_810A7DC, 5, 0, -44, 0 + createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0 playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK @@ -1080,13 +1080,13 @@ Move_THUNDERBOLT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 - createvisualtask sub_810A7DC, 5, 24, -52, 0 + createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0 playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 - createvisualtask sub_810A7DC, 5, -24, -52, 0 + createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0 playsewithpan SE_W085, SOUND_PAN_TARGET delay 7 - createvisualtask sub_810A7DC, 5, 0, -60, 1 + createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1 playsewithpan SE_W085, SOUND_PAN_TARGET delay 9 createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK @@ -1094,15 +1094,15 @@ Move_THUNDERBOLT: createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 - createsprite gBattleAnimSpriteTemplate_85957E0, ANIM_TARGET, 3, 44, 0, 0, 3 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 + createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 44, 0, 0, 3 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, SOUND_PAN_TARGET delay 0 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 2, 2, RGB_BLACK @@ -1129,15 +1129,15 @@ Move_THUNDER_WAVE: createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 - createvisualtask sub_810A7DC, 5, 0, -48, 0 + createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0 playsewithpan SE_W086, SOUND_PAN_TARGET delay 20 loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4 - createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, -16 + createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 4 - createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 0 + createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0 delay 4 - createsprite gUnknown_08595840, ANIM_TARGET, 2, -16, 16 + createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 16 waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish @@ -1183,7 +1183,7 @@ Move_STOMP: monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET - createsprite gUnknown_08595F60, ANIM_ATTACKER, 3, 0, -32, 15 + createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1 @@ -1312,9 +1312,9 @@ Move_SPIKE_CANNON: createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 8, 8, 20 waitforvisualfinish - createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, -8, -8, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 0, 0, 1, 2 - createsprite gBattleAnimSpriteTemplate_8597370, ANIM_ATTACKER, 3, 8, 8, 1, 2 + createsprite gSpikeHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 + createsprite gSpikeHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 + createsprite gSpikeHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1 loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3 waitforvisualfinish @@ -1330,7 +1330,7 @@ Move_SWORDS_DANCE: createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4 createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 - createvisualtask sub_8115D94, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 + createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff @@ -1949,32 +1949,32 @@ Move_SPARK: delay 0 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 24, 121, 13, ANIM_ATTACKER, 1, 1 delay 0 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 10 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1 delay 0 - createsprite gBattleAnimSpriteTemplate_859574C, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 + createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 24, 165, 10, ANIM_ATTACKER, 1, 1 delay 0 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) delay 20 createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22) playsewithpan SE_W085B, SOUND_PAN_ATTACKER - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 - createsprite gBattleAnimSpriteTemplate_85957F8, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0 + createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22) @@ -2032,12 +2032,12 @@ GrowthEffect: Move_WHIRLWIND: loadspritegfx ANIM_TAG_WHIRLWIND_LINES - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 8, 1, 60, 2 - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 16, 1, 60, 3 - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 24, 1, 60, 4 - createsprite gUnknown_085963D4, ANIM_ATTACKER, 2, 0, 32, 1, 60, 0 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 60, 0 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 60, 1 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, ANIM_TARGET, 60, 2 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, ANIM_TARGET, 60, 3 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, ANIM_TARGET, 60, 4 + createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, ANIM_TARGET, 60, 0 delay 5 loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1 @@ -2329,7 +2329,7 @@ Move_CONVERSION: createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 playsewithpan SE_W112, SOUND_PAN_ATTACKER - createvisualtask sub_8115D94, 2, ANIM_TAG_CONVERSION, 1, 1, 14335, 12, 0, 0 + createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_CONVERSION, 1, 1, RGB(31, 31, 13), 12, 0, 0 delay 6 createvisualtask AnimTask_ConversionAlphaBlend, 5 waitforvisualfinish @@ -2769,7 +2769,7 @@ Move_RAGE: Move_TELEPORT: call SetPsychicBackground - createvisualtask sub_810F83C, 2 + createvisualtask AnimTask_Teleport, 2 playsewithpan SE_W100, SOUND_PAN_ATTACKER delay 15 call UnsetPsychicBackground @@ -3115,7 +3115,7 @@ Move_SPITE: waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 6, 0, 8, RGB_WHITE - createvisualtask sub_8111E50, 2 + createvisualtask AnimTask_SpiteTargetShadow, 2 loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3 waitforvisualfinish restorebg @@ -3657,23 +3657,23 @@ Move_SUPERPOWER: monbg ANIM_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 - createsprite gUnknown_08595FEC, ANIM_TARGET, 2, 0 + createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER playsewithpan SE_W025, SOUND_PAN_ATTACKER delay 20 createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 4, 1, 180, 1 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W089, 0 delay 40 - createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 200, 96, 1, 120 + createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120 delay 8 - createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 20, 248, 4, 112 + createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 20, 248, 4, 112 delay 8 - createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 130, 160, 2, 104 + createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 130, 160, 2, 104 delay 8 - createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 160, 192, 0, 96 + createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 160, 192, 0, 96 delay 8 - createsprite gUnknown_08596004, ANIM_ATTACKER, 41, 60, 288, 3, 88 + createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 - createsprite gUnknown_0859601C, ANIM_TARGET, 3, 0 + createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, ANIM_ATTACKER playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 16 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1 @@ -3893,7 +3893,7 @@ Move_TAIL_GLOW: setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK waitforvisualfinish - createsprite gUnknown_08596AC8, ANIM_ATTACKER, 66, 0 + createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, ANIM_ATTACKER delay 18 loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6 waitforvisualfinish @@ -4287,13 +4287,13 @@ Move_WATER_SPOUT: loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask sub_81080E4, 5 + createvisualtask AnimTask_WaterSpoutLaunch, 5 playsewithpan SE_W029, SOUND_PAN_ATTACKER delay 44 playsewithpan SE_W291, SOUND_PAN_ATTACKER waitforvisualfinish delay 16 - createvisualtask sub_81085C8, 5 + createvisualtask AnimTask_WaterSpoutRain, 5 playsewithpan SE_W057, SOUND_PAN_TARGET clearmonbg ANIM_DEF_PARTNER blendoff @@ -4416,25 +4416,25 @@ Move_VOLT_TACKLE: setalpha 12, 8 createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish - createsprite gUnknown_085959A4, ANIM_ATTACKER, 1 + createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 playsewithpan SE_W268, SOUND_PAN_ATTACKER waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 - createvisualtask sub_810AFCC, 5, 0 + createvisualtask AnimTask_VoltTackleBolt, 5, 0 playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_810AFCC, 5, 1 + createvisualtask AnimTask_VoltTackleBolt, 5, 1 playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_810AFCC, 5, 2 + createvisualtask AnimTask_VoltTackleBolt, 5, 2 playsewithpan SE_W085, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask sub_810AFCC, 5, 3 + createvisualtask AnimTask_VoltTackleBolt, 5, 3 playsewithpan SE_W085, SOUND_PAN_TARGET waitforvisualfinish - createvisualtask sub_810AFCC, 5, 4 + createvisualtask AnimTask_VoltTackleBolt, 5, 4 playsewithpan SE_W085, SOUND_PAN_ATTACKER delay 8 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1 @@ -4443,7 +4443,7 @@ Move_VOLT_TACKLE: delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 delay 8 - createvisualtask sub_810AE5C, 5 + createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1 playsewithpan SE_W085B, SOUND_PAN_ATTACKER @@ -4457,7 +4457,7 @@ Move_VOLT_TACKLE: Move_WATER_SPORT: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB - createvisualtask sub_81088E4, 5 + createvisualtask AnimTask_WaterSport, 5 delay 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER delay 44 @@ -4473,7 +4473,7 @@ Move_CALM_MIND: monbg ANIM_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish - createvisualtask AnimTask_SetAllBattlersButAttackerInvisiblity, 5, TRUE + createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, TRUE waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER @@ -4484,7 +4484,7 @@ Move_CALM_MIND: createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 playsewithpan SE_W048, SOUND_PAN_ATTACKER waitforvisualfinish - createvisualtask AnimTask_SetAllBattlersButAttackerInvisiblity, 5, FALSE + createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, FALSE waitforvisualfinish createvisualtask sub_8116664, 5, 0, 0, 16, 0, RGB_BLACK waitforvisualfinish @@ -5000,14 +5000,14 @@ Move_SNORE: loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 - call Snore1 + call SnoreEffect delay 30 - call Snore1 + call SnoreEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff end -Snore1: +SnoreEffect: playsewithpan SE_W173, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1 @@ -5126,13 +5126,13 @@ Move_SMOG: monbgprio_29 setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10 - call Smog1 - call Smog1 - call Smog1 - call Smog1 - call Smog1 - call Smog1 - call Smog1 + call SmogCloud + call SmogCloud + call SmogCloud + call SmogCloud + call SmogCloud + call SmogCloud + call SmogCloud delay 120 loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2 createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26) @@ -5142,8 +5142,8 @@ Move_SMOG: clearmonbg ANIM_DEF_PARTNER blendoff end -Smog1: - createsprite gUnknown_08595C44, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 +SmogCloud: + createsprite gSmogCloudSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return @@ -5439,12 +5439,12 @@ SolarBeamSetUp: setalpha 12, 8 createvisualtask AnimTask_BlendColorCycle, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11) playsewithpan SE_W025, SOUND_PAN_ATTACKER - call SolarBeamSetUp1 + call SolarBeamAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff goto SolarBeamEnd -SolarBeamSetUp1: +SolarBeamAbsorbEffect: createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16 @@ -5920,24 +5920,24 @@ Move_SYNTHESIS: Move_TOXIC: loadspritegfx ANIM_TAG_TOXIC_BUBBLE loadspritegfx ANIM_TAG_POISON_BUBBLE - call Toxic1 - call Toxic1 + call ToxicBubbles + call ToxicBubbles waitforvisualfinish delay 15 call PoisonBubblesEffect waitforvisualfinish end -Toxic1: - createsprite gUnknown_08596134, ANIM_TARGET, 2, -24, 16, 1, 1 +ToxicBubbles: + createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, ANIM_TARGET, 2, 8, 16, 1, 1 + createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, ANIM_TARGET, 2, -8, 16, 1, 1 + createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 - createsprite gUnknown_08596134, ANIM_TARGET, 2, 24, 16, 1, 1 + createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1 playsewithpan SE_W092, SOUND_PAN_TARGET delay 15 return @@ -5945,7 +5945,7 @@ Toxic1: Move_SLUDGE: loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 + createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1 createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) @@ -5955,34 +5955,34 @@ Move_SLUDGE: Move_SLUDGE_BOMB: loadspritegfx ANIM_TAG_POISON_BUBBLE - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 - call SludgeBomb1 + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile + call SludgeBombProjectile createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1 createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 2, 0, 12, RGB(30, 0, 31) - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 27, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -27, 44, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 39, -28, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -42, -42, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 0, 40, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -8, -44, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -46, -28, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 46, 9, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 42, 0, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -43, -12, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, 16, -46, 20 - createsprite gUnknown_085961D8, ANIM_TARGET, 2, -16, 44, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 0, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20 + createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20 playsewithpan SE_W091, SOUND_PAN_TARGET delay 0 waitsound @@ -5990,9 +5990,9 @@ Move_SLUDGE_BOMB: call PoisonBubblesEffect waitforvisualfinish end -SludgeBomb1: +SludgeBombProjectile: playsewithpan SE_W145C, SOUND_PAN_ATTACKER - createsprite gUnknown_085961A8, ANIM_TARGET, 2, 20, 0, 40, 0 + createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -6240,18 +6240,18 @@ Move_WATER_GUN: monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 - createsprite gUnknown_08595208, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 + createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 playsewithpan SE_W145, SOUND_PAN_ATTACKER waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2 - createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 + createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 + createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 playsewithpan SE_W152, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595220, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 + createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6698,15 +6698,15 @@ Move_SUBMISSION: waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 - call Submission1 - call Submission1 - call Submission1 + call SubmissionHit + call SubmissionHit + call SubmissionHit waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Submission1: +SubmissionHit: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -12, ANIM_TARGET, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, 8, ANIM_TARGET, 1 @@ -6722,10 +6722,10 @@ Move_SUNNY_DAY: createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE waitforvisualfinish panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0 - call SunnyDay1 - call SunnyDay1 - call SunnyDay1 - call SunnyDay1 + call SunnyDayLightRay + call SunnyDayLightRay + call SunnyDayLightRay + call SunnyDayLightRay waitforvisualfinish createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 6, 0, RGB_WHITE waitforvisualfinish @@ -6733,8 +6733,8 @@ Move_SUNNY_DAY: blendoff end -SunnyDay1: - createsprite gUnknown_085954A0, ANIM_ATTACKER, 40 +SunnyDayLightRay: + createsprite gSunnyDayLightRaySpriteTemplate, ANIM_ATTACKER, 40 delay 6 return @@ -6765,16 +6765,16 @@ Move_SPORE: setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2 loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11 - call Spore1 - call Spore1 - call Spore1 + call CreateSpore + call CreateSpore + call CreateSpore waitforvisualfinish delay 1 clearmonbg ANIM_DEF_PARTNER blendoff end -Spore1: +CreateSpore: createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1 @@ -7110,11 +7110,11 @@ Move_BIND: BindWrap: playsewithpan SE_W020, SOUND_PAN_TARGET - call BindWrap1 - call BindWrap1 + call BindWrapSqueezeTarget + call BindWrapSqueezeTarget waitforvisualfinish end -BindWrap1: +BindWrapSqueezeTarget: createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, ANIM_TARGET, 0 delay 16 return @@ -7196,15 +7196,15 @@ Move_ZAP_CANNON: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER - createsprite gUnknown_08595764, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 - createsprite gUnknown_08595790, ANIM_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 + createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 128, 40, 0 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 192, 40, 2 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 32, 40, 0 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 96, 40, 1 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 160, 40, 0 + createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 224, 40, 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1 delay 15 @@ -7430,31 +7430,31 @@ Move_STRING_SHOT: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK waitforvisualfinish loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 - call StringShot1 + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread + call StringShotThread waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET - createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 10 + createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10 delay 4 - createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, -2 + createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2 delay 4 - createsprite gUnknown_085969F8, ANIM_TARGET, 2, 0, 22 + createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 22 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 1 @@ -7462,7 +7462,7 @@ Move_STRING_SHOT: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end -StringShot1: +StringShotThread: createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1 delay 1 return @@ -7476,20 +7476,20 @@ Move_SPIDER_WEB: waitforvisualfinish monbgprio_28 ANIM_TARGET loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 - call SpiderWeb1 + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread + call SpiderWebThread waitforvisualfinish playsewithpan SE_W081B, SOUND_PAN_TARGET createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2 @@ -7499,7 +7499,7 @@ Move_SPIDER_WEB: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK end -SpiderWeb1: +SpiderWebThread: createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0 delay 1 return @@ -8073,25 +8073,25 @@ Move_WILL_O_WISP: playsewithpan SE_W052, SOUND_PAN_ATTACKER waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0 - createsprite gUnknown_0859563C, ANIM_ATTACKER, 2, 0, 0, 0 + createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 - createsprite gUnknown_0859563C, ANIM_ATTACKER, 3, 0, 0, 1 + createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1 delay 3 - createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 2 + createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 2 delay 3 - createsprite gUnknown_0859563C, ANIM_ATTACKER, 4, 0, 0, 3 + createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 3 delay 40 createvisualtask sub_8159278, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0 waitforvisualfinish monbgprio_29 playsewithpan SE_W172B, SOUND_PAN_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 0 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 42 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 84 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 126 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 168 - createsprite gUnknown_0859566C, ANIM_ATTACKER, 2, 210 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 84 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 126 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 168 + createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 210 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -8124,7 +8124,7 @@ Move_TRICK: delay 16 playsewithpan SE_W166, 0 createvisualtask AnimTask_StretchTargetUp, 3 - createvisualtask sub_81060B0, 3 + createvisualtask AnimTask_StretchAttackerUp, 3 delay 30 playsewithpan SE_W104, 0 delay 24 @@ -8165,12 +8165,12 @@ Move_STOCKPILE: playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask AnimTask_BlendColorCycle, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5 - call Stockpile1 - call Stockpile1 + call StockpileAbsorb + call StockpileAbsorb waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end -Stockpile1: +StockpileAbsorb: createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13 @@ -8362,7 +8362,7 @@ Move_HYPER_BEAM: delay 30 createsoundtask sub_8158C58, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 - createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 + createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 call HyperBeamOrbs call HyperBeamOrbs call HyperBeamOrbs @@ -9497,11 +9497,11 @@ Move_WATER_PULSE: playsewithpan SE_W145C, SOUND_PAN_ATTACKER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28) delay 10 - createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 - createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 - createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 - createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 - createsprite gUnknown_085952F8, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 + createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 + createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 20, 100, 16, 2, 10, 35, 1 + createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 + createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 + createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 playsewithpan SE_W145C, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W202, SOUND_PAN_ATTACKER @@ -9658,16 +9658,16 @@ Move_TWISTER: createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 60, 7, 60, 30 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 100, 50, 4, 50, 26 + createsprite gTwisterRockParticleSpriteTemplate, ANIM_TARGET, 2, 100, 50, 4, 50, 26 delay 1 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 105, 25, 8, 60, 20 delay 1 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 40, 10, 48, 30 delay 3 - createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 120, 30, 6, 45, 25 + createsprite gTwisterRockParticleSpriteTemplate, ANIM_TARGET, 2, 120, 30, 6, 45, 25 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 35, 10, 60, 30 delay 3 - createsprite gUnknown_08596CC8, ANIM_TARGET, 2, 105, 20, 8, 40, 0 + createsprite gTwisterRockParticleSpriteTemplate, ANIM_TARGET, 2, 105, 20, 8, 40, 0 delay 3 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 20, 255, 15, 32, 0 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 @@ -9829,7 +9829,7 @@ Move_WEATHER_BALL: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER - createsprite gUnknown_0853EE38, ANIM_ATTACKER, 2 + createsprite gWeatherBallUpSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 playsewithpan SE_W197, 0 @@ -9844,7 +9844,7 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: loadspritegfx ANIM_TAG_IMPACT - createsprite gUnknown_0853EE50, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 2 @@ -9853,13 +9853,13 @@ WeatherBallNormal: end WeatherBallFire: loadspritegfx ANIM_TAG_SMALL_EMBER - createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 + createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 + createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W172, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_0859559C, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W172, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W172B, SOUND_PAN_TARGET @@ -9868,13 +9868,13 @@ WeatherBallFire: end WeatherBallWater: loadspritegfx ANIM_TAG_SMALL_BUBBLES - createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 + createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 - createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 + createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 playsewithpan SE_W152, SOUND_PAN_TARGET delay 13 - createsprite gUnknown_08595328, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W152, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1 @@ -9883,13 +9883,13 @@ WeatherBallWater: end WeatherBallSandstorm: loadspritegfx ANIM_TAG_ROCKS - createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 + createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, SOUND_PAN_TARGET delay 5 - createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 + createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 playsewithpan SE_W088, SOUND_PAN_TARGET delay 14 - createsprite gUnknown_08596CE0, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 + createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 playsewithpan SE_W088, SOUND_PAN_TARGET waitforvisualfinish playsewithpan SE_W070, SOUND_PAN_TARGET @@ -9903,13 +9903,13 @@ WeatherBallSandstorm: WeatherBallIce: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS - createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 + createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 + createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 - createsprite gUnknown_08595D44, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 + createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 playsewithpan SE_W258, SOUND_PAN_TARGET waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 diff --git a/include/battle_anim.h b/include/battle_anim.h index 3eab8e62b..4ffed529d 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -77,7 +77,8 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId); void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); void sub_80A8AEC(struct Sprite *sprite); void sub_80A8A6C(struct Sprite *sprite); -void sub_80A8E30(struct Sprite *sprite); +void AnimWeatherBallUp(struct Sprite *sprite); +void AnimWeatherBallDown(struct Sprite *sprite); void AnimSpinningSparkle(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); void DestroySpriteAndMatrix(struct Sprite *sprite); @@ -88,7 +89,6 @@ void StartAnimLinearTranslation(struct Sprite *sprite); void InitAnimArcTranslation(struct Sprite *sprite); bool8 AnimTranslateLinear(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); -void sub_80A8EE4(struct Sprite *sprite); u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId); void sub_80A6FD4(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); @@ -133,7 +133,6 @@ void sub_80A653C(struct Sprite *); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_80A80C8(struct Task *task); -void sub_80A8EE4(struct Sprite *); void DestroyAnimSpriteAndDisableBlend(struct Sprite *); void AnimLoadCompressedBgTilemap(u32 bgId, const void *src); void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index deeb30540..af24483fa 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -3122,7 +3122,7 @@ void AnimTask_StretchTargetUp(u8 taskId) u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); if (++gTasks[taskId].data[0] == 1) { - PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(1), gUnknown_08593988); + PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_TARGET), gUnknown_08593988); gSprites[spriteId].pos2.x = 4; } else @@ -3137,12 +3137,12 @@ void AnimTask_StretchTargetUp(u8 taskId) } } -void sub_81060B0(u8 taskId) +void AnimTask_StretchAttackerUp(u8 taskId) { u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); if (++gTasks[taskId].data[0] == 1) { - PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(0), gUnknown_08593988); + PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), gUnknown_08593988); gSprites[spriteId].pos2.x = 4; } else diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index 6fc1a3f96..47264d152 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -2416,7 +2416,7 @@ static void sub_80A8DFC(struct Sprite *sprite) } } -void sub_80A8E30(struct Sprite *sprite) +void AnimWeatherBallUp(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); @@ -2440,7 +2440,7 @@ static void sub_80A8E88(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_80A8EE4(struct Sprite *sprite) +void AnimWeatherBallDown(struct Sprite *sprite) { int x; sprite->data[0] = gBattleAnimArgs[2]; diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 0165956d1..2e1077656 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -75,7 +75,7 @@ static const union AnimCmd *const sSpriteAnimTable_853EE34[] = sSpriteAnim_853EE2C }; -const struct SpriteTemplate gUnknown_0853EE38 = +const struct SpriteTemplate gWeatherBallUpSpriteTemplate = { .tileTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL, @@ -83,10 +83,10 @@ const struct SpriteTemplate gUnknown_0853EE38 = .anims = sSpriteAnimTable_853EE34, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8E30, + .callback = AnimWeatherBallUp, }; -const struct SpriteTemplate gUnknown_0853EE50 = +const struct SpriteTemplate gWeatherBallNormalDownSpriteTemplate = { .tileTag = ANIM_TAG_WEATHER_BALL, .paletteTag = ANIM_TAG_WEATHER_BALL, @@ -94,7 +94,7 @@ const struct SpriteTemplate gUnknown_0853EE50 = .anims = sSpriteAnimTable_853EE34, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8EE4, + .callback = AnimWeatherBallDown, }; static const union AnimCmd sSpriteAnim_853EE68[] = diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index cf788b3e3..c8529851b 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -759,7 +759,7 @@ void AnimTask_GetTargetIsAttackerPartner(u8 taskId) #define tInvisible gBattleAnimArgs[0]; // For hiding or subsequently revealing all other battlers -void AnimTask_SetAllBattlersButAttackerInvisiblity(u8 taskId) +void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId) { u16 battler; @@ -7,11 +7,11 @@ static void AnimMegahornHorn(struct Sprite *); static void AnimLeechLifeNeedle(struct Sprite *); void AnimTranslateWebThread(struct Sprite *); -void sub_81105B4(struct Sprite *); +static void AnimStringWrap(struct Sprite *); void sub_811067C(struct Sprite *); void AnimTranslateStinger(struct Sprite *); void AnimMissileArc(struct Sprite *); -void sub_8110994(struct Sprite *); +static void AnimTailGlowOrb(struct Sprite *); static void sub_811057C(struct Sprite *); static void sub_8110630(struct Sprite *); static void sub_81106A4(struct Sprite *); @@ -101,7 +101,7 @@ const struct SpriteTemplate gWebThreadSpriteTemplate = .callback = AnimTranslateWebThread, }; -const struct SpriteTemplate gUnknown_085969F8 = +const struct SpriteTemplate gStringWrapSpriteTemplate = { .tileTag = ANIM_TAG_STRING, .paletteTag = ANIM_TAG_STRING, @@ -109,7 +109,7 @@ const struct SpriteTemplate gUnknown_085969F8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_81105B4, + .callback = AnimStringWrap, }; const union AffineAnimCmd gUnknown_08596A10[] = @@ -184,7 +184,7 @@ const union AffineAnimCmd *const gUnknown_08596AC4[] = gUnknown_08596A8C, }; -const struct SpriteTemplate gUnknown_08596AC8 = +const struct SpriteTemplate gTailGlowOrbSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -192,7 +192,7 @@ const struct SpriteTemplate gUnknown_08596AC8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08596AC4, - .callback = sub_8110994, + .callback = AnimTailGlowOrb, }; static void AnimMegahornHorn(struct Sprite *sprite) @@ -291,7 +291,8 @@ static void sub_811057C(struct Sprite *sprite) sprite->data[6] = (sprite->data[6] + 13) & 0xFF; } -void sub_81105B4(struct Sprite *sprite) +// Second stage of String Shot +static void AnimStringWrap(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y); if (GetBattlerSide(gBattleAnimAttacker)) @@ -473,9 +474,9 @@ static void AnimMissileArcStep(struct Sprite *sprite) } } -void sub_8110994(struct Sprite *sprite) +static void AnimTailGlowOrb(struct Sprite *sprite) { - if (gBattleAnimArgs[0] == 0) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18; diff --git a/src/dragon.c b/src/dragon.c index c7f4f52b9..00ea4bd1a 100644 --- a/src/dragon.c +++ b/src/dragon.c @@ -257,6 +257,7 @@ static void AnimDragonRageFirePlume(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); } +// For Dragon Breath and Dragon Rage static void AnimDragonFireToTarget(struct Sprite *sprite) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) diff --git a/src/electric.c b/src/electric.c index 6082ebeaf..010654940 100644 --- a/src/electric.c +++ b/src/electric.c @@ -10,24 +10,24 @@ static void sub_810A1F8(struct Sprite *); static void sub_810A214(struct Sprite *); static void sub_810A258(struct Sprite *); static void sub_810A274(struct Sprite *); -static void sub_810A308(struct Sprite *); -static void sub_810A46C(struct Sprite *); +static void AnimSparkElectricity(struct Sprite *); +static void AnimZapCannonSpark(struct Sprite *); static void sub_810A4F4(struct Sprite *); static void sub_810A56C(struct Sprite *); -static void sub_810A5BC(struct Sprite *); -static void sub_810A628(struct Sprite *); +static void AnimThunderboltOrbSpriteTemplate(struct Sprite *); +static void AnimSparkElectricityFlashing(struct Sprite *); static void sub_810A6EC(struct Sprite *); static void sub_810A75C(struct Sprite *); static void sub_810A834(u8 taskId); static void sub_810A9DC(struct Sprite *); -static void sub_810AA2C(struct Sprite *); +static void AnimThunderWave(struct Sprite *); static void sub_810AAB0(struct Sprite *); static void sub_810AB78(u8 taskId); static void sub_810AC8C(struct Sprite *); static void sub_810ACC0(struct Sprite *); static void AnimGrowingChargeOrb(struct Sprite *); static void AnimElectricPuff(struct Sprite *); -static void sub_810AD98(struct Sprite *); +static void AnimVoltTackleOrbSlide(struct Sprite *); static void sub_810ADF8(struct Sprite *); static bool8 sub_810B154(struct Task *task, u8 taskId); static void sub_810B1F0(struct Sprite *); @@ -114,7 +114,7 @@ const struct SpriteTemplate gUnknown_08595734 = .callback = sub_810A274, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_859574C = +const struct SpriteTemplate gSparkElectricitySpriteTemplate = { .tileTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2, @@ -122,10 +122,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_859574C = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810A308, + .callback = AnimSparkElectricity, }; -const struct SpriteTemplate gUnknown_08595764 = +const struct SpriteTemplate gZapCannonBallSpriteTemplate = { .tileTag = ANIM_TAG_BLACK_BALL_2, .paletteTag = ANIM_TAG_BLACK_BALL_2, @@ -147,7 +147,7 @@ const union AffineAnimCmd *const gUnknown_0859578C[] = gUnknown_0859577C, }; -const struct SpriteTemplate gUnknown_08595790 = +const struct SpriteTemplate gZapCannonSparkSpriteTemplate = { .tileTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2, @@ -155,7 +155,7 @@ const struct SpriteTemplate gUnknown_08595790 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_0859578C, - .callback = sub_810A46C, + .callback = AnimZapCannonSpark, }; const union AnimCmd gUnknown_085957A8[] = @@ -184,7 +184,7 @@ const union AffineAnimCmd *const gUnknown_085957DC[] = gUnknown_085957BC, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_85957E0 = +const struct SpriteTemplate gThunderboltOrbSpriteTemplate = { .tileTag = ANIM_TAG_SHOCK_3, .paletteTag = ANIM_TAG_SHOCK_3, @@ -192,10 +192,10 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85957E0 = .anims = gUnknown_085957B8, .images = NULL, .affineAnims = gUnknown_085957DC, - .callback = sub_810A5BC, + .callback = AnimThunderboltOrbSpriteTemplate, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_85957F8 = +const struct SpriteTemplate gSparkElectricityFlashingSpriteTemplate = { .tileTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_SPARK_2, @@ -203,7 +203,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_85957F8 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_0859578C, - .callback = sub_810A628, + .callback = AnimSparkElectricityFlashing, }; const struct SpriteTemplate gElectricitySpriteTemplate = @@ -228,7 +228,7 @@ const struct SpriteTemplate gUnknown_08595828 = .callback = sub_810A9DC, }; -const struct SpriteTemplate gUnknown_08595840 = +const struct SpriteTemplate gThunderWaveSpriteTemplate = { .tileTag = ANIM_TAG_SPARK_H, .paletteTag = ANIM_TAG_SPARK_H, @@ -236,7 +236,7 @@ const struct SpriteTemplate gUnknown_08595840 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810AA2C, + .callback = AnimThunderWave, }; const s8 gUnknown_08595858[][2] = @@ -367,7 +367,7 @@ const struct SpriteTemplate gElectricPuffSpriteTemplate = .callback = AnimElectricPuff, }; -const struct SpriteTemplate gUnknown_085959A4 = +const struct SpriteTemplate gVoltTackleOrbSlideSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -375,7 +375,7 @@ const struct SpriteTemplate gUnknown_085959A4 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08595950, - .callback = sub_810AD98, + .callback = AnimVoltTackleOrbSlide, }; const union AnimCmd gUnknown_085959BC[] = @@ -510,7 +510,7 @@ static void sub_810A274(struct Sprite *sprite) sprite->callback = TranslateSpriteInCircleOverDuration; } -static void sub_810A308(struct Sprite *sprite) +static void AnimSparkElectricity(struct Sprite *sprite) { u8 battler; u32 matrixNum; @@ -518,20 +518,20 @@ static void sub_810A308(struct Sprite *sprite) switch (gBattleAnimArgs[4]) { - case 0: + case ANIM_ATTACKER: battler = gBattleAnimAttacker; break; - case 1: + case ANIM_TARGET: default: battler = gBattleAnimTarget; break; - case 2: + case ANIM_ATK_PARTNER: if (!IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) battler = gBattleAnimAttacker; else battler = BATTLE_PARTNER(gBattleAnimAttacker); break; - case 3: + case ANIM_DEF_PARTNER: if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) battler = BATTLE_PARTNER(gBattleAnimTarget); else @@ -567,7 +567,7 @@ static void sub_810A308(struct Sprite *sprite) sprite->callback = sub_810E2C8; } -static void sub_810A46C(struct Sprite *sprite) +static void AnimZapCannonSpark(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, 1); sprite->data[0] = gBattleAnimArgs[3]; @@ -609,7 +609,7 @@ static void sub_810A56C(struct Sprite *sprite) DestroyAnimSprite(sprite); } -static void sub_810A5BC(struct Sprite *sprite) +static void AnimThunderboltOrbSpriteTemplate(struct Sprite *sprite) { if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -622,7 +622,7 @@ static void sub_810A5BC(struct Sprite *sprite) sprite->callback = sub_810A56C; } -static void sub_810A628(struct Sprite *sprite) +static void AnimSparkElectricityFlashing(struct Sprite *sprite) { u8 battler; @@ -655,7 +655,7 @@ static void sub_810A6EC(struct Sprite *sprite) sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF; if (sprite->data[7] % sprite->data[4] == 0) - sprite->invisible ^= 1; + sprite->invisible ^= TRUE; if (sprite->data[0]-- <= 0) DestroyAnimSprite(sprite); @@ -676,7 +676,8 @@ static void sub_810A75C(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_810A7DC(u8 taskId) +// The vertical falling thunder bolt used in Thunder Wave/Shock/Bolt +void AnimTask_ElectricBolt(u8 taskId) { gTasks[taskId].data[0] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[0]; gTasks[taskId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[1]; @@ -769,13 +770,14 @@ static void sub_810A9DC(struct Sprite *sprite) DestroySprite(sprite); } -static void sub_810AA2C(struct Sprite *sprite) +// The horizontal bands of electricity used in Thunder Wave +static void AnimThunderWave(struct Sprite *sprite) { u8 spriteId; sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; - spriteId = CreateSprite(&gUnknown_08595840, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority); + spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority); gSprites[spriteId].oam.tileNum += 8; gAnimVisualTaskCount++; gSprites[spriteId].callback = sub_810AAB0; @@ -920,12 +922,13 @@ static void AnimElectricPuff(struct Sprite *sprite) sprite->callback = RunStoredCallbackWhenAnimEnds; } -static void sub_810AD98(struct Sprite *sprite) +// Creates an orb of electricity that grwos then slides off-screen. The attacker slides with it +static void AnimVoltTackleOrbSlide(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - sprite->data[6] = GetAnimBattlerSpriteId(0); + sprite->data[6] = GetAnimBattlerSpriteId(ANIM_ATTACKER); sprite->data[7] = 16; if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) @@ -950,14 +953,14 @@ static void sub_810ADF8(struct Sprite *sprite) } } -void sub_810AE5C(u8 taskId) +void AnimTask_VoltTackleAttackerReappear(u8 taskId) { struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: - task->data[15] = GetAnimBattlerSpriteId(0); + task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) { @@ -1005,7 +1008,8 @@ void sub_810AE5C(u8 taskId) } } -void sub_810AFCC(u8 taskId) +// The horizontal bolts of electricity for Volt Tackle +void AnimTask_VoltTackleBolt(u8 taskId) { struct Task *task = &gTasks[taskId]; diff --git a/src/fight.c b/src/fight.c index f5da49741..96b654ecc 100644 --- a/src/fight.c +++ b/src/fight.c @@ -18,9 +18,9 @@ static void AnimStompFoot(struct Sprite *); static void AnimDizzyPunchDuck(struct Sprite *); void sub_810D40C(struct Sprite *); void sub_810D4F4(struct Sprite *); -void sub_810D608(struct Sprite *); -void sub_810D714(struct Sprite *); -void sub_810D874(struct Sprite *); +static void AnimSuperpowerOrb(struct Sprite *); +static void AnimSuperpowerRock(struct Sprite *); +static void AnimSuperpowerFireball(struct Sprite *); static void AnimArmThrustHit(struct Sprite *); void sub_810DA10(struct Sprite *); static void AnimFocusPunchFist(struct Sprite *); @@ -209,7 +209,7 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate = .callback = AnimSpinningKickOrPunch, }; -const struct SpriteTemplate gUnknown_08595F60 = +const struct SpriteTemplate gStompFootSpriteTemplate = { .tileTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -267,7 +267,7 @@ const union AffineAnimCmd *const gUnknown_08595FE8[] = gUnknown_08595FC0, }; -const struct SpriteTemplate gUnknown_08595FEC = +const struct SpriteTemplate gSuperpowerOrbSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -275,10 +275,10 @@ const struct SpriteTemplate gUnknown_08595FEC = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08595FE8, - .callback = sub_810D608, + .callback = AnimSuperpowerOrb, }; -const struct SpriteTemplate gUnknown_08596004 = +const struct SpriteTemplate gSuperpowerRockSpriteTemplate = { .tileTag = ANIM_TAG_FLAT_ROCK, .paletteTag = ANIM_TAG_FLAT_ROCK, @@ -286,10 +286,10 @@ const struct SpriteTemplate gUnknown_08596004 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810D714, + .callback = AnimSuperpowerRock, }; -const struct SpriteTemplate gUnknown_0859601C = +const struct SpriteTemplate gSuperpowerFireballSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_METEOR, @@ -297,7 +297,7 @@ const struct SpriteTemplate gUnknown_0859601C = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810D874, + .callback = AnimSuperpowerFireball, }; const struct SpriteTemplate gArmThrustHandSpriteTemplate = @@ -795,9 +795,9 @@ static void sub_810D5DC(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_810D608(struct Sprite *sprite) +static void AnimSuperpowerOrb(struct Sprite *sprite) { - if (gBattleAnimArgs[0] == 0) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) { sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); @@ -834,7 +834,8 @@ static void sub_810D6A8(struct Sprite *sprite) } } -void sub_810D714(struct Sprite *sprite) +// Floating rock that flies off to hit the target. Used by Superpower +static void AnimSuperpowerRock(struct Sprite *sprite) { sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.y = 120; @@ -895,11 +896,11 @@ static void sub_810D830(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_810D874(struct Sprite *sprite) +static void AnimSuperpowerFireball(struct Sprite *sprite) { u8 battler; - if (gBattleAnimArgs[0] == 0) + if (gBattleAnimArgs[0] == ANIM_ATTACKER) { sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3); diff --git a/src/fire.c b/src/fire.c index 21d17898d..93eabe8ea 100644 --- a/src/fire.c +++ b/src/fire.c @@ -14,7 +14,7 @@ static void sub_8108FBC(struct Sprite *); static void sub_8109028(struct Sprite *); static void sub_8109064(struct Sprite *); static void sub_81090D8(struct Sprite *); -static void sub_810916C(struct Sprite *); +static void AnimSunlight(struct Sprite *); static void AnimEmberFlare(struct Sprite *); static void sub_8109200(struct Sprite *); static void AnimFireRing(struct Sprite *); @@ -34,9 +34,9 @@ static void sub_8109984(struct Sprite *sprite, s16 x, s16 y); static void sub_81099A0(struct Sprite *); static void AnimEruptionFallingRock(struct Sprite *); static void sub_8109A64(struct Sprite *); -static void sub_8109AFC(struct Sprite *); +static void AnimWillOWispOrb(struct Sprite *); static void sub_8109C4C(struct Sprite *); -static void sub_8109CB0(struct Sprite *); +static void AnimWillOWispFire(struct Sprite *); static void sub_8109E2C(u8 taskId); const union AnimCmd gUnknown_08595340[] = @@ -208,7 +208,7 @@ const union AffineAnimCmd *const gUnknown_0859549C[] = gUnknown_08595484, }; -const struct SpriteTemplate gUnknown_085954A0 = +const struct SpriteTemplate gSunnyDayLightRaySpriteTemplate = { .tileTag = ANIM_TAG_SUNLIGHT, .paletteTag = ANIM_TAG_SUNLIGHT, @@ -216,7 +216,7 @@ const struct SpriteTemplate gUnknown_085954A0 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_0859549C, - .callback = sub_810916C, + .callback = AnimSunlight, }; const union AnimCmd gUnknown_085954B8[] = @@ -330,7 +330,7 @@ const struct SpriteTemplate gFireSpiralOutwardSpriteTemplate = .callback = AnimFireSpiralOutward, }; -const struct SpriteTemplate gUnknown_0859559C = +const struct SpriteTemplate gWeatherBallFireDownSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_SMALL_EMBER, @@ -338,7 +338,7 @@ const struct SpriteTemplate gUnknown_0859559C = .anims = gUnknown_085954D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_80A8EE4, + .callback = AnimWeatherBallDown, }; const struct SpriteTemplate gUnknown_085955B4 = @@ -410,7 +410,7 @@ const union AnimCmd *const gUnknown_0859562C[] = gUnknown_08595624, }; -const struct SpriteTemplate gUnknown_0859563C = +const struct SpriteTemplate gWillOWispOrbSpriteTemplate = { .tileTag = ANIM_TAG_WISP_ORB, .paletteTag = ANIM_TAG_WISP_ORB, @@ -418,7 +418,7 @@ const struct SpriteTemplate gUnknown_0859563C = .anims = gUnknown_0859562C, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109AFC, + .callback = AnimWillOWispOrb, }; const union AnimCmd gUnknown_08595654[] = @@ -435,7 +435,7 @@ const union AnimCmd *const gUnknown_08595668[] = gUnknown_08595654, }; -const struct SpriteTemplate gUnknown_0859566C = +const struct SpriteTemplate gWillOWispFireSpriteTemplate = { .tileTag = ANIM_TAG_WISP_FIRE, .paletteTag = ANIM_TAG_WISP_FIRE, @@ -443,7 +443,7 @@ const struct SpriteTemplate gUnknown_0859566C = .anims = gUnknown_08595668, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8109CB0, + .callback = AnimWillOWispFire, }; const s8 gUnknown_08595684[16] = @@ -594,8 +594,8 @@ static void sub_81090D8(struct Sprite *sprite) } } -//sunlight -static void sub_810916C(struct Sprite *sprite) +// Sunlight from Sunny Day +static void AnimSunlight(struct Sprite *sprite) { sprite->pos1.x = 0; sprite->pos1.y = 0; @@ -1052,8 +1052,7 @@ static void sub_8109A64(struct Sprite *sprite) } } -//wisp orb -static void sub_8109AFC(struct Sprite *sprite) +static void AnimWillOWispOrb(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -1141,8 +1140,7 @@ static void sub_8109C4C(struct Sprite *sprite) } } -//wisp fire -void sub_8109CB0(struct Sprite *sprite) +static void AnimWillOWispFire(struct Sprite *sprite) { if (!sprite->data[0]) { diff --git a/src/flying.c b/src/flying.c index 21af5d835..7c641f99d 100644 --- a/src/flying.c +++ b/src/flying.c @@ -17,7 +17,7 @@ static void AnimFallingFeather(struct Sprite *); void sub_810E520(struct Sprite *); void sub_810EB40(struct Sprite *); void sub_810EA4C(struct Sprite *); -void sub_810EAA0(struct Sprite *); +static void AnimWhirlwindLine(struct Sprite *); void sub_810EC34(struct Sprite *); void sub_810EC94(struct Sprite *); static void AnimDiveBall(struct Sprite *); @@ -205,7 +205,7 @@ const union AnimCmd *const gUnknown_085963D0[] = gUnknown_085963B8, }; -const struct SpriteTemplate gUnknown_085963D4 = +const struct SpriteTemplate gWhirlwindLineSpriteTemplate = { .tileTag = ANIM_TAG_WHIRLWIND_LINES, .paletteTag = ANIM_TAG_WHIRLWIND_LINES, @@ -213,7 +213,7 @@ const struct SpriteTemplate gUnknown_085963D4 = .anims = gUnknown_085963D0, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_810EAA0, + .callback = AnimWhirlwindLine, }; const union AffineAnimCmd gUnknown_085963EC[] = @@ -911,18 +911,18 @@ void sub_810EA4C(struct Sprite *sprite) sprite->callback = TranslateAnimSpriteToTargetMonLocation; } -void sub_810EAA0(struct Sprite * sprite) +static void AnimWhirlwindLine(struct Sprite * sprite) { u16 arg; u8 mult; - if (!gBattleAnimArgs[2]) + if (gBattleAnimArgs[2] == ANIM_ATTACKER) InitSpritePosToAnimAttacker(sprite, 0); else InitSpritePosToAnimTarget(sprite, FALSE); - if ((!gBattleAnimArgs[2] && !GetBattlerSide(gBattleAnimAttacker)) - || (gBattleAnimArgs[2] == 1 && !GetBattlerSide(gBattleAnimTarget))) + if ((gBattleAnimArgs[2] == ANIM_ATTACKER && !GetBattlerSide(gBattleAnimAttacker)) + || (gBattleAnimArgs[2] == ANIM_TARGET && !GetBattlerSide(gBattleAnimTarget))) { sprite->pos1.x += 8; } diff --git a/src/ghost.c b/src/ghost.c index fa6679926..32fd427ed 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -586,7 +586,8 @@ static void sub_8111D78(u8 taskId) } } -void sub_8111E50(u8 taskId) +// Creates a blended copy of the target that wavers in front of them +void AnimTask_SpiteTargetShadow(u8 taskId) { struct Task *task; @@ -325,7 +325,7 @@ const struct SpriteTemplate gMistCloudSpriteTemplate = .callback = InitSwirlingFogAnim, }; -const struct SpriteTemplate gUnknown_08595C44 = +const struct SpriteTemplate gSmogCloudSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, @@ -429,7 +429,7 @@ const struct SpriteTemplate gUnknown_08595D2C = .callback = AnimHailBegin, }; -const struct SpriteTemplate gUnknown_08595D44 = +const struct SpriteTemplate gWeatherBallIceDownSpriteTemplate = { .tileTag = ANIM_TAG_HAIL, .paletteTag = ANIM_TAG_HAIL, @@ -437,7 +437,7 @@ const struct SpriteTemplate gUnknown_08595D44 = .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gUnknown_08595D28, - .callback = sub_80A8EE4, + .callback = AnimWeatherBallDown, }; const union AnimCmd gUnknown_08595D5C[] = diff --git a/src/normal.c b/src/normal.c index 02f5d92a2..1bc0287d9 100644 --- a/src/normal.c +++ b/src/normal.c @@ -176,7 +176,8 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate = .callback = AnimBasicHitSplat, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8597370 = +// TODO: Needs generic descriptive name, what distinguishes this hit splat +const struct SpriteTemplate gSpikeHitSplatSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_IMPACT, @@ -625,7 +626,8 @@ static void sub_8115D2C(u8 taskId) } } -void sub_8115D94(u8 taskId) +// Flashes the specified anim tag with given color. Used e.g. to flash the particles in Hyper Beam red +void AnimTask_FlashAnimTagWithColor(u8 taskId) { u8 paletteIndex; diff --git a/src/poison.c b/src/poison.c index 3e7d20c41..7b882c029 100644 --- a/src/poison.c +++ b/src/poison.c @@ -3,11 +3,11 @@ #include "trig.h" #include "constants/rgb.h" -void sub_810DBAC(struct Sprite *); -void AnimAcidPoisonBubble(struct Sprite *); -void sub_810DCD0(struct Sprite *); -void AnimAcidPoisonDroplet(struct Sprite *); -void AnimBubbleEffect(struct Sprite *); +static void AnimSludgeProjectile(struct Sprite *); +static void AnimAcidPoisonBubble(struct Sprite *); +static void AnimSludgeBombHitParticle(struct Sprite *); +static void AnimAcidPoisonDroplet(struct Sprite *); +static void AnimBubbleEffect(struct Sprite *); static void sub_810DC10(struct Sprite *); static void sub_810DCB4(struct Sprite *); static void sub_810DD24(struct Sprite *); @@ -29,7 +29,7 @@ const union AnimCmd *const gUnknown_08596130[] = gUnknown_0859611C, }; -const struct SpriteTemplate gUnknown_08596134 = +const struct SpriteTemplate gToxicBubbleSpriteTemplate = { .tileTag = ANIM_TAG_TOXIC_BUBBLE, .paletteTag = ANIM_TAG_TOXIC_BUBBLE, @@ -97,7 +97,7 @@ const union AffineAnimCmd *const gUnknown_085961A4[] = gUnknown_08596190, }; -const struct SpriteTemplate gUnknown_085961A8 = +const struct SpriteTemplate gSludgeProjectileSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -105,7 +105,7 @@ const struct SpriteTemplate gUnknown_085961A8 = .anims = gUnknown_08596164, .images = NULL, .affineAnims = gUnknown_085961A0, - .callback = sub_810DBAC, + .callback = AnimSludgeProjectile, }; const struct SpriteTemplate gAcidPoisonBubbleSpriteTemplate = @@ -119,7 +119,7 @@ const struct SpriteTemplate gAcidPoisonBubbleSpriteTemplate = .callback = AnimAcidPoisonBubble, }; -const struct SpriteTemplate gUnknown_085961D8 = +const struct SpriteTemplate gSludgeBombHitParticleSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -127,7 +127,7 @@ const struct SpriteTemplate gUnknown_085961D8 = .anims = gUnknown_0859616C, .images = NULL, .affineAnims = gUnknown_085961A4, - .callback = sub_810DCD0, + .callback = AnimSludgeBombHitParticle, }; const union AffineAnimCmd gUnknown_085961F0[] = @@ -187,7 +187,7 @@ const struct SpriteTemplate gWaterBubbleSpriteTemplate = .callback = AnimBubbleEffect, }; -void sub_810DBAC(struct Sprite *sprite) +static void AnimSludgeProjectile(struct Sprite *sprite) { if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); @@ -210,7 +210,7 @@ static void sub_810DC10(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void AnimAcidPoisonBubble(struct Sprite *sprite) +static void AnimAcidPoisonBubble(struct Sprite *sprite) { s16 l1, l2; if (!gBattleAnimArgs[3]) @@ -238,7 +238,7 @@ static void sub_810DCB4(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_810DCD0(struct Sprite *sprite) +static void AnimSludgeBombHitParticle(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = sprite->pos1.x; @@ -265,7 +265,7 @@ static void sub_810DD24(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void AnimAcidPoisonDroplet(struct Sprite *sprite) +static void AnimAcidPoisonDroplet(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y); @@ -289,7 +289,7 @@ void AnimAcidPoisonDroplet(struct Sprite *sprite) // arg 0: initial x pixel offset // arg 1: initial y pixel offset // arg 2: 0 = single-target, 1 = multi-target -void AnimBubbleEffect(struct Sprite *sprite) +static void AnimBubbleEffect(struct Sprite *sprite) { if (!gBattleAnimArgs[2]) { diff --git a/src/psychic.c b/src/psychic.c index 38e6bdd32..2615e62aa 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -703,7 +703,7 @@ static void sub_810F810(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_810F83C(u8 taskId) +void AnimTask_Teleport(u8 taskId) { struct Task *task = &gTasks[taskId]; u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); diff --git a/src/rock.c b/src/rock.c index ee31beb5c..e2a870a98 100644 --- a/src/rock.c +++ b/src/rock.c @@ -20,7 +20,7 @@ void sub_81110A4(u8 taskId); static void AnimRolloutParticle(struct Sprite *); static void AnimRockTomb(struct Sprite *); static void AnimRockBlastRock(struct Sprite *); -void sub_8111444(struct Sprite *); +static void AnimRockScatter(struct Sprite *); static void AnimParticleInVortex(struct Sprite *); static void sub_8110A70(struct Sprite *); static void sub_8110B80(struct Sprite *sprite); @@ -280,10 +280,10 @@ const struct SpriteTemplate gRockScatterSpriteTemplate = .anims = gUnknown_08596BF8, .images = NULL, .affineAnims = gUnknown_08596C90, - .callback = sub_8111444, + .callback = AnimRockScatter, }; -const struct SpriteTemplate gUnknown_08596CC8 = +const struct SpriteTemplate gTwisterRockParticleSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, @@ -294,7 +294,7 @@ const struct SpriteTemplate gUnknown_08596CC8 = .callback = AnimMoveTwisterParticle, }; -const struct SpriteTemplate gUnknown_08596CE0 = +const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, @@ -302,7 +302,7 @@ const struct SpriteTemplate gUnknown_08596CE0 = .anims = gUnknown_08596C00, .images = NULL, .affineAnims = gUnknown_08596C90, - .callback = sub_80A8EE4, + .callback = AnimWeatherBallDown, }; static void AnimFallingRock(struct Sprite *sprite) @@ -796,7 +796,7 @@ static void AnimRockBlastRock(struct Sprite *sprite) TranslateAnimSpriteToTargetMonLocation(sprite); } -void sub_8111444(struct Sprite *sprite) +static void AnimRockScatter(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1); diff --git a/src/water.c b/src/water.c index b9befad10..59a998b95 100644 --- a/src/water.c +++ b/src/water.c @@ -26,7 +26,7 @@ void sub_8107674(struct Sprite *); static void AnimHydroCannonCharge(struct Sprite *); static void AnimWaitForHydroCannonChargeEnd(struct Sprite *); static void AnimHydroCannonBeam(struct Sprite *); -void sub_8107894(struct Sprite *); +static void AnimWaterGunDroplet(struct Sprite *); static void AnimSmallBubblePair(struct Sprite *); void sub_810790C(struct Sprite *); void sub_8108034(struct Sprite *); @@ -36,7 +36,7 @@ void sub_81087C0(struct Sprite *); void sub_810886C(struct Sprite *); void sub_8108B2C(struct Sprite *); void sub_8108B94(struct Sprite *); -void sub_8108BE0(struct Sprite *); +static void AnimWaterPulseBubble(struct Sprite *); void sub_8108C08(struct Sprite *); void sub_8108C54(struct Sprite *); void AnimWaterPulseRing_Step(struct Sprite *); @@ -328,7 +328,7 @@ const union AnimCmd *const gUnknown_08595204[] = gUnknown_085951F8, }; -const struct SpriteTemplate gUnknown_08595208 = +const struct SpriteTemplate gWaterGunProjectileSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES, @@ -339,7 +339,7 @@ const struct SpriteTemplate gUnknown_08595208 = .callback = AnimThrowProjectile, }; -const struct SpriteTemplate gUnknown_08595220 = +const struct SpriteTemplate gWaterGunDropletSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES, @@ -347,7 +347,7 @@ const struct SpriteTemplate gUnknown_08595220 = .anims = gUnknown_08595204, .images = NULL, .affineAnims = gUnknown_08596208, - .callback = sub_8107894, + .callback = AnimWaterGunDroplet, }; const struct SpriteTemplate gSmallBubblePairSpriteTemplate = @@ -444,7 +444,7 @@ const union AffineAnimCmd *const gUnknown_085952F4[] = gUnknown_085952D4, }; -const struct SpriteTemplate gUnknown_085952F8 = +const struct SpriteTemplate gWaterPulseBubbleSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES, @@ -452,7 +452,7 @@ const struct SpriteTemplate gUnknown_085952F8 = .anims = gUnknown_08595298, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8108BE0, + .callback = AnimWaterPulseBubble, }; const struct SpriteTemplate gUnknown_08595310 = @@ -466,7 +466,7 @@ const struct SpriteTemplate gUnknown_08595310 = .callback = sub_8108C54, }; -const struct SpriteTemplate gUnknown_08595328 = +const struct SpriteTemplate gWeatherBallWaterDownSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_BUBBLES, .paletteTag = ANIM_TAG_SMALL_BUBBLES, @@ -474,7 +474,7 @@ const struct SpriteTemplate gUnknown_08595328 = .anims = gUnknown_085952A0, .images = NULL, .affineAnims = gUnknown_085952F4, - .callback = sub_80A8EE4, + .callback = AnimWeatherBallDown, }; extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; @@ -844,7 +844,8 @@ static void AnimHydroCannonBeam(struct Sprite *sprite) StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); } -void sub_8107894(struct Sprite *sprite) +// Water droplet appears and drips down. Used by Water Gun on impact +static void AnimWaterGunDroplet(struct Sprite *sprite) { InitSpritePosToAnimTarget(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; @@ -1503,7 +1504,7 @@ void sub_8108098(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_81080E4(u8 taskId) +void AnimTask_WaterSpoutLaunch(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -1686,7 +1687,7 @@ void sub_810851C(struct Sprite *sprite) } } -void sub_81085C8(u8 taskId) +void AnimTask_WaterSpoutRain(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -1804,7 +1805,7 @@ void sub_810886C(struct Sprite *sprite) } } -void sub_81088E4(u8 taskId) +void AnimTask_WaterSport(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -1944,7 +1945,7 @@ void sub_8108B94(struct Sprite *sprite) } } -void sub_8108BE0(struct Sprite *sprite) +static void AnimWaterPulseBubble(struct Sprite *sprite) { sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; |