diff options
| author | garak <garakmon@gmail.com> | 2018-10-15 23:49:09 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-15 23:49:09 -0400 |
| commit | b6fa61a59a063f99b14ecf8311e87130efed61a3 (patch) | |
| tree | fdfb0e8910cd4735607f4c6b789ea767405fc150 | |
| parent | 281824e3c4f3e678fa947290182ee91e85c8b568 (diff) | |
finish naming anim tags
102 files changed, 2162 insertions, 2174 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f6f52aad2..70ce40b04 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -424,7 +424,7 @@ gBattleAnims_Special:: @ 81C7778 .4byte Special_MonToSubstitute Move_POUND: @ 81C7794 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W003, 63 @@ -436,7 +436,7 @@ Move_POUND: @ 81C7794 end Move_DOUBLE_SLAP: @ 81C77C5 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_DOUBLE_SLAP_FirstHit, Move_DOUBLE_SLAP_SecondHit @@ -455,8 +455,8 @@ Move_DOUBLE_SLAP_SecondHit: goto Move_DOUBLE_SLAP_End Move_POISON_POWDER: @ 81C7818 - loadspritegfx ANIM_TAG_065 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_POWDER + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, 63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -480,7 +480,7 @@ Move_POISON_POWDER: @ 81C7818 end Move_STUN_SPORE: @ 81C7949 - loadspritegfx ANIM_TAG_068 + loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -504,7 +504,7 @@ Move_STUN_SPORE: @ 81C7949 end Move_SLEEP_POWDER: @ 81C7A77 - loadspritegfx ANIM_TAG_067 + loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, 130, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, 130, 10, -22, 117, 80, -5, 1 @@ -528,8 +528,8 @@ Move_SLEEP_POWDER: @ 81C7A77 end Move_SWIFT: @ 81C7BA5 - loadspritegfx ANIM_TAG_174 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, 192 @@ -555,7 +555,7 @@ Move_SWIFT: @ 81C7BA5 end Move_STRENGTH: @ 81C7C5E - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, 192 @@ -581,7 +581,7 @@ Move_STRENGTH: @ 81C7C5E end Move_TACKLE: @ 81C7CF2 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -595,7 +595,7 @@ Move_TACKLE: @ 81C7CF2 end Move_BODY_SLAM: @ 81C7D30 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, 192 @@ -621,7 +621,7 @@ Move_BODY_SLAM: @ 81C7D30 end Move_SUPERSONIC: @ 81C7DBD - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_BANK_ATK_PARTNER monbgprio_2A ANIM_BANK_ATTACKER setalpha 12, 8 @@ -643,7 +643,7 @@ Move_SUPERSONIC_CreateWaveSprite: return Move_SCREECH: @ 81C7E15 - loadspritegfx ANIM_TAG_164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 3, 0, 2, 1 call Move_SCREECH_CreateWaveSprite call Move_SCREECH_CreateWaveSprite @@ -658,7 +658,7 @@ Move_SCREECH_CreateWaveSprite: return Move_FLAME_WHEEL: @ 81C7E62 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET createsprite gBattleAnimSpriteTemplate_83D9694, 3, 0, 0, 56, 0 @@ -700,8 +700,8 @@ Unknown_81C7F4C: @ 81C7F4C return Move_PIN_MISSILE: @ 81C7F5C - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -729,8 +729,8 @@ Move_PIN_MISSILE: @ 81C7F5C end Move_ICICLE_SPEAR: @ 81C8021 - loadspritegfx ANIM_TAG_262 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -758,7 +758,7 @@ Move_ICICLE_SPEAR: @ 81C8021 end Move_TAKE_DOWN: @ 81C80E6 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, 192 @@ -782,7 +782,7 @@ Move_TAKE_DOWN: @ 81C80E6 end Move_DOUBLE_EDGE: @ 81C817A - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, 192 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 2, 4, 2, 32767, 10, 0, 0 waitforvisualfinish @@ -815,9 +815,9 @@ Move_DOUBLE_EDGE: @ 81C817A end Move_POISON_STING: @ 81C828D - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -835,8 +835,8 @@ Move_POISON_STING: @ 81C828D end Move_TWINEEDLE: @ 81C82E2 - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -855,7 +855,7 @@ Move_TWINEEDLE: @ 81C82E2 end Move_FIRE_BLAST: @ 81C8355 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_812AF30, 144, 145 call Move_FIRE_BLAST_CreateFireRing call Move_FIRE_BLAST_CreateFireRing @@ -903,7 +903,7 @@ Move_FIRE_BLAST_CreateFireCross: return Move_LEECH_SEED: @ 81C8483 - loadspritegfx ANIM_TAG_006 + loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, 192 createsprite gLeechSeedSpriteTemplate, 130, 15, 0, 0, 24, 35, -32 delay 8 @@ -918,7 +918,7 @@ Move_LEECH_SEED: @ 81C8483 end Move_EMBER: @ 81C84D9 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, 192, 5, 2 createsprite gEmberSpriteTemplate, 130, 20, 0, -16, 24, 20, 1 delay 4 @@ -937,8 +937,8 @@ Move_EMBER_CreateFlare: return Move_MEGA_PUNCH: @ 81C854D - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, rgb(0, 0, 0) @@ -980,8 +980,8 @@ _81C8620: goto _81C8611 Move_MEGA_KICK: @ 81C8627 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, rgb(0, 0, 0) @@ -1005,8 +1005,8 @@ Move_MEGA_KICK: @ 81C8627 end Move_COMET_PUNCH: @ 81C86C3 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_COMET_PUNCH_Even, Move_COMET_PUNCH_Odd @@ -1027,8 +1027,8 @@ Move_COMET_PUNCH_Odd: goto Move_COMET_PUNCH_End Move_SONIC_BOOM: @ 81C873B - loadspritegfx ANIM_TAG_003 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -1052,8 +1052,8 @@ Move_SONIC_BOOM_CreateHitSplat: return Move_THUNDER_SHOCK: @ 81C879C - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 @@ -1073,9 +1073,9 @@ Move_THUNDER_SHOCK: @ 81C879C end Move_THUNDERBOLT: @ 81C880A - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_282 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SHOCK_3 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 @@ -1122,9 +1122,9 @@ Move_THUNDERBOLT: @ 81C880A end Move_THUNDER_WAVE: @ 81C89C0 - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_011 - loadspritegfx ANIM_TAG_173 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + loadspritegfx ANIM_TAG_SPARK_H createvisualtask sub_80E2A38, 10, 1, 0, 0, 6, 0 waitforvisualfinish delay 10 @@ -1143,8 +1143,8 @@ Move_THUNDER_WAVE: @ 81C89C0 end Move_BEAT_UP: @ 81C8A2F - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_TARGET setalpha 12, 8 choosetwoturnanim Move_BEAT_UP_Even, Move_BEAT_UP_Odd @@ -1177,8 +1177,8 @@ Move_BEAT_UP_Odd: goto Move_BEAT_UP_End Move_STOMP: @ 81C8B2A - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W104, 63 @@ -1199,7 +1199,7 @@ Move_TAIL_WHIP: @ 81C8B71 end Move_CUT: @ 81C8B8A - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W015, 63 @@ -1213,7 +1213,7 @@ Move_CUT: @ 81C8B8A end Move_HIDDEN_POWER: @ 81C8BBC - loadspritegfx ANIM_TAG_217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_BANK_ATTACKER, 0 waitforvisualfinish @@ -1243,9 +1243,9 @@ Move_HIDDEN_POWER: @ 81C8BBC end Move_REVERSAL: @ 81C8CA5 - loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, 192 createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 31, 3, 3, 32767, 8, 0, 0 waitforvisualfinish @@ -1271,7 +1271,7 @@ Move_REVERSAL: @ 81C8CA5 end Move_PURSUIT: @ 81C8D80 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET fadetobg BG_DARK waitbgfadein @@ -1298,8 +1298,8 @@ _81C8DC8: goto _81C8D96 Move_SPIKE_CANNON: @ 81C8DF1 - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -1322,7 +1322,7 @@ Move_SPIKE_CANNON: @ 81C8DF1 end Move_SWORDS_DANCE: @ 81C8EA4 - loadspritegfx ANIM_TAG_005 + loadspritegfx ANIM_TAG_SWORD monbg ANIM_BANK_ATTACKER setalpha 12, 8 playsewithpan SE_W014, 192 @@ -1337,7 +1337,7 @@ Move_SWORDS_DANCE: @ 81C8EA4 end Move_PSYCH_UP: @ 81C8EEA - loadspritegfx ANIM_TAG_196 + loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E1F8C, 2, 25, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1356,9 +1356,9 @@ Move_PSYCH_UP: @ 81C8EEA end Move_DIZZY_PUNCH: @ 81C8F5C - loadspritegfx ANIM_TAG_073 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_DUCK + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 call _81C9077 @@ -1393,7 +1393,7 @@ _81C9077: return Move_FIRE_SPIN: @ 81C9096 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call _81C90BF @@ -1417,7 +1417,7 @@ _81C90BF: return Move_FURY_CUTTER: @ 81C914A - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W013, 63 @@ -1455,7 +1455,7 @@ _81C91FF: goto _81C918E Move_SELF_DESTRUCT: @ 81C9219 - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 31 createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 @@ -1486,8 +1486,8 @@ _81C929F: return Move_SLAM: @ 81C9309 - loadspritegfx ANIM_TAG_056 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLAM_HIT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W004, 192 @@ -1510,7 +1510,7 @@ Move_SLAM: @ 81C9309 end Move_VINE_WHIP: @ 81C9391 - loadspritegfx ANIM_TAG_287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, 192 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 @@ -1521,8 +1521,8 @@ Move_VINE_WHIP: @ 81C9391 end Move_DRILL_PECK: @ 81C93C8 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -1540,9 +1540,9 @@ Move_DRILL_PECK: @ 81C93C8 end Move_WATERFALL: @ 81C9421 - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 @@ -1620,7 +1620,7 @@ _81C9502: return Move_EXPLOSION: @ 81C9675 - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gBattleAnimSpriteTemplate_83DB3DC, 2, 1, 8, 9, 8474, 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 @@ -1653,7 +1653,7 @@ _81C9712: return Move_DEFENSE_CURL: @ 81C977C - loadspritegfx ANIM_TAG_234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, 192, 18, 3 createvisualtask sub_80E0E24, 5, 0, 0 createvisualtask sub_812D350, 5 @@ -1665,7 +1665,7 @@ Move_DEFENSE_CURL: @ 81C977C end Move_PROTECT: @ 81C97B5 - loadspritegfx ANIM_TAG_280 + loadspritegfx ANIM_TAG_PROTECT monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 waitplaysewithpan SE_W115, 192, 16 @@ -1675,7 +1675,7 @@ Move_PROTECT: @ 81C97B5 end Move_DETECT: @ 81C97D2 - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 9, rgb(0, 0, 0) waitforvisualfinish createvisualtask sub_80E2A38, 10, 2, 1, 0, 9, 32767 @@ -1690,8 +1690,8 @@ Move_DETECT: @ 81C97D2 end Move_FRUSTRATION: @ 81C9830 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8079CEC, 1 @@ -1795,7 +1795,7 @@ _81C9AB3: goto _81C985F Move_SAFEGUARD: @ 81C9AF7 - loadspritegfx ANIM_TAG_244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_BANK_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, 192 @@ -1813,7 +1813,7 @@ Move_SAFEGUARD: @ 81C9AF7 end Move_PAIN_SPLIT: @ 81C9B39 - loadspritegfx ANIM_TAG_239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gBattleAnimSpriteTemplate_84026F0, 2, -8, -42, 0 createsprite gBattleAnimSpriteTemplate_84026F0, 130, -8, -42, 1 delay 10 @@ -1837,8 +1837,8 @@ Move_PAIN_SPLIT: @ 81C9B39 end Move_VICE_GRIP: @ 81C9BE1 - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, 63 @@ -1853,8 +1853,8 @@ Move_VICE_GRIP: @ 81C9BE1 end Move_GUILLOTINE: @ 81C9C29 - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 fadetobgfromset 12, 13, 14 @@ -1878,8 +1878,8 @@ Move_GUILLOTINE: @ 81C9C29 end Move_PAY_DAY: @ 81C9CB5 - loadspritegfx ANIM_TAG_100 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_COIN + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -1896,7 +1896,7 @@ Move_PAY_DAY: @ 81C9CB5 end Move_OUTRAGE: @ 81C9D08 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, 192, 8, 3 createvisualtask sub_80E1F8C, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 12, 6, 5, 4 @@ -1941,8 +1941,8 @@ _81C9E0F: return Move_SPARK: @ 81C9EA3 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_80E1F8C, 2, 3, -31, 1, 5, 5, 23551 playsewithpan SE_W085B, 192 @@ -1987,7 +1987,7 @@ Move_SPARK: @ 81C9EA3 end Move_ATTRACT: @ 81CA0BA - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 @@ -2028,7 +2028,7 @@ _81CA1C0: return Move_WHIRLWIND: @ 81CA1E9 - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, -8, 1, 60, 0 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 0, 1, 60, 1 createsprite gBattleAnimSpriteTemplate_83DA51C, 2, 0, 8, 1, 60, 2 @@ -2047,7 +2047,7 @@ Move_WHIRLWIND: @ 81CA1E9 end Move_CONFUSE_RAY: @ 81CA291 - loadspritegfx ANIM_TAG_013 + loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_BANK_DEF_PARTNER fadetobg BG_GHOST waitbgfadein @@ -2067,7 +2067,7 @@ Move_CONFUSE_RAY: @ 81CA291 end Move_LOCK_ON: @ 81CA2E4 - loadspritegfx ANIM_TAG_014 + loadspritegfx ANIM_TAG_LOCK_ON createsprite gBattleAnimSpriteTemplate_83D6DAC, 40 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 1 createsprite gBattleAnimSpriteTemplate_83D6DC4, 40, 2 @@ -2079,7 +2079,7 @@ Move_LOCK_ON: @ 81CA2E4 end Move_MEAN_LOOK: @ 81CA31A - loadspritegfx ANIM_TAG_187 + loadspritegfx ANIM_TAG_EYE monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W060, 192 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, rgb(0, 0, 0) @@ -2094,7 +2094,7 @@ Move_MEAN_LOOK: @ 81CA31A end Move_ROCK_THROW: @ 81CA35F - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DB428, 130, 6, 1, 15, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, 0, 1, 0, 0 playsewithpan SE_W088, 63 @@ -2115,7 +2115,7 @@ Move_ROCK_THROW: @ 81CA35F end Move_ROCK_SLIDE: @ 81CA3EB - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DB428, 2, 7, 1, 11, 1 createsprite gBattleAnimSpriteTemplate_83DAC4C, 130, -5, 1, -5, 1 @@ -2165,7 +2165,7 @@ _81CA483: return Move_THIEF: @ 81CA52C - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET delay 1 fadetobg BG_DARK @@ -2185,8 +2185,8 @@ Move_THIEF: @ 81CA52C end Move_BUBBLE_BEAM: @ 81CA573 - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -2223,8 +2223,8 @@ _81CA5AD: return Move_ICY_WIND: @ 81CA650 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80E2A38, 10, 11, 4, 0, 4, 0 fadetobg BG_ICE @@ -2259,8 +2259,8 @@ _81CA6A8: return Move_SMOKESCREEN: @ 81CA710 - loadspritegfx ANIM_TAG_016 - loadspritegfx ANIM_TAG_017 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, 192 createsprite gBattleAnimSpriteTemplate_84021B0, 130, 20, 0, 0, 0, 35, -25 waitforvisualfinish @@ -2283,7 +2283,7 @@ Move_SMOKESCREEN: @ 81CA710 end Move_CONVERSION: @ 81CA809 - loadspritegfx ANIM_TAG_018 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 16, 0 @@ -2335,7 +2335,7 @@ Move_CONVERSION: @ 81CA809 end Move_CONVERSION_2: @ 81CA91E - loadspritegfx ANIM_TAG_018 + loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 0, 16 @@ -2380,8 +2380,8 @@ Move_CONVERSION_2: @ 81CA91E end Move_ROLLING_KICK: @ 81CAA3A - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 @@ -2402,7 +2402,7 @@ Move_ROLLING_KICK: @ 81CAA3A end Move_HEADBUTT: @ 81CAABD - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2418,8 +2418,8 @@ Move_HEADBUTT: @ 81CAABD end Move_HORN_ATTACK: @ 81CAB1A - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createsprite gBattleAnimSpriteTemplate_83D6DE4, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2436,8 +2436,8 @@ Move_HORN_ATTACK: @ 81CAB1A end Move_FURY_ATTACK: @ 81CAB87 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80A8E04, 2, 4, 256, 0, 2 choosetwoturnanim _81CABB8, _81CABDE _81CABA5: @@ -2458,8 +2458,8 @@ _81CABDE: goto _81CABA5 Move_HORN_DRILL: @ 81CAC04 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest _81CAD6A fadetobg BG_DRILL waitbgfadeout @@ -2524,8 +2524,8 @@ _81CAD6A: goto _81CAC21 Move_THRASH: @ 81CAD81 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_80D0A4C, 2 createvisualtask sub_80D0AB8, 2 createsprite gBattleAnimSpriteTemplate_83D9FC0, 131, 1, 10, 0 @@ -2542,7 +2542,7 @@ Move_THRASH: @ 81CAD81 end Move_SING: @ 81CAE00 - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80CEA20, 2 waitforvisualfinish @@ -2578,8 +2578,8 @@ Move_SING: @ 81CAE00 end Move_LOW_KICK: @ 81CAED4 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, 20, 0, 0, 4 createsprite gBattleAnimSpriteTemplate_83D9FF0, 130, -24, 28, 40, 8, 160, 0 delay 4 @@ -2601,7 +2601,7 @@ Move_EARTHQUAKE: @ 81CAF31 end Move_FISSURE: @ 81CAF7E - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80E1864, 3, 5, 10, 50 createvisualtask sub_80E1864, 3, 1, 10, 50 playsewithpan SE_W089, 63 @@ -2646,8 +2646,8 @@ Move_DIG: @ 81CB0A1 _81CB0AA: end _81CB0AB: - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gDigDirtMoundSpriteTemplate, 1, 0, 0, 180 createsprite gDigDirtMoundSpriteTemplate, 1, 0, 1, 180 monbg_22 0 @@ -2665,8 +2665,8 @@ _81CB0AB: createvisualtask sub_80E1244, 2, 1 goto _81CB0AA _81CB106: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_80E149C, 2, 0 waitforvisualfinish monbg ANIM_BANK_ATTACKER @@ -2721,7 +2721,7 @@ Move_AGILITY: @ 81CB1DA end Move_QUICK_ATTACK: @ 81CB224 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 @@ -2738,8 +2738,8 @@ Move_QUICK_ATTACK: @ 81CB224 end Move_RAGE: @ 81CB27C - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_BANK_ATTACKER, 31, 10, 0, 2 @@ -2803,8 +2803,8 @@ Move_MINIMIZE: @ 81CB352 end Move_METRONOME: @ 81CB365 - loadspritegfx ANIM_TAG_064 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 100 playsewithpan SE_W118, 192 delay 6 @@ -2833,7 +2833,7 @@ _81CB3A9: waitforvisualfinish return _81CB3E6: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80CDAC8, 2, 0 playsewithpan SE_W036, 192 waitforvisualfinish @@ -2848,7 +2848,7 @@ _81CB3E6: goto _81CB398 Move_AMNESIA: @ 81CB455 - loadspritegfx ANIM_TAG_093 + loadspritegfx ANIM_TAG_AMNESIA call Unknown_81D61E7 delay 8 createsprite gBattleAnimSpriteTemplate_83DA88C, 20 @@ -2860,8 +2860,8 @@ Move_AMNESIA: @ 81CB455 end Move_KINESIS: @ 81CB479 - loadspritegfx ANIM_TAG_075 - loadspritegfx ANIM_TAG_097 + loadspritegfx ANIM_TAG_ALERT + loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, 192 call Unknown_81D61E7 createsprite gBattleAnimSpriteTemplate_83DA824, 20 @@ -2879,8 +2879,8 @@ Move_KINESIS: @ 81CB479 end Move_GLARE: @ 81CB4CA - loadspritegfx ANIM_TAG_248 - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_81301EC, 5, 0 playsewithpan SE_W060B, 192 waitforvisualfinish @@ -2897,7 +2897,7 @@ Move_GLARE: @ 81CB4CA end Move_BARRAGE: @ 81CB533 - loadspritegfx ANIM_TAG_254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_8130554, 3 playsewithpan SE_W207, 192 delay 24 @@ -2951,8 +2951,8 @@ _81CB617: blendoff goto _81CB584 _81CB68E: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call Unknown_81D61FB monbg ANIM_BANK_ATTACKER createvisualtask sub_80E2A38, 10, 2, 0, 0, 16, 32767 @@ -2998,13 +2998,13 @@ Move_ACID_ARMOR: @ 81CB735 end Move_SHARPEN: @ 81CB74E - loadspritegfx ANIM_TAG_185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gBattleAnimSpriteTemplate_83D6EF0, 2 waitforvisualfinish end Move_SUPER_FANG: @ 81CB75A - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, 192 waitforvisualfinish @@ -3024,7 +3024,7 @@ Move_SUPER_FANG: @ 81CB75A end Move_SLASH: @ 81CB7DB - loadspritegfx ANIM_TAG_183 + loadspritegfx ANIM_TAG_SLASH createsprite gBattleAnimSpriteTemplate_83D6E38, 130, 1, -8, 0 playsewithpan SE_W013, 63 delay 4 @@ -3035,8 +3035,8 @@ Move_SLASH: @ 81CB7DB end Move_STRUGGLE: @ 81CB815 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_BANK_ATTACKER, 3, 0, 12, 4 @@ -3053,7 +3053,7 @@ Move_STRUGGLE: @ 81CB815 end Move_SKETCH: @ 81CB87B - loadspritegfx ANIM_TAG_002 + loadspritegfx ANIM_TAG_PENCIL monbg ANIM_BANK_TARGET createvisualtask sub_80D0C88, 2 createsprite gBattleAnimSpriteTemplate_83D77E0, 130 @@ -3086,7 +3086,7 @@ _81CB8CF: end Move_FLAIL: @ 81CB8F9 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask sub_812E860, 2, 0 @@ -3115,8 +3115,8 @@ Move_SPITE: @ 81CB936 end Move_MACH_PUNCH: @ 81CB965 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CB9E6 @@ -3147,7 +3147,7 @@ _81CB9E6: goto _81CB97E Move_FORESIGHT: @ 81CB9ED - loadspritegfx ANIM_TAG_258 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 16, 0 @@ -3166,7 +3166,7 @@ Move_FORESIGHT: @ 81CB9ED end Move_DESTINY_BOND: @ 81CBA2C - loadspritegfx ANIM_TAG_188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST playsewithpan SE_W060, 192 waitbgfadein @@ -3186,7 +3186,7 @@ Move_DESTINY_BOND: @ 81CBA2C end Move_ENDURE: @ 81CBA87 - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call EndureFlamesAnim delay 8 @@ -3211,7 +3211,7 @@ EndureFlamesAnim: return Move_CHARM: @ 81CBB1B - loadspritegfx ANIM_TAG_210 + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 playsewithpan SE_W204, 192 @@ -3225,9 +3225,9 @@ Move_CHARM: @ 81CBB1B end Move_ROLLOUT: @ 81CBB5E - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_074 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -3242,8 +3242,8 @@ Move_ROLLOUT: @ 81CBB5E end Move_FALSE_SWIPE: @ 81CBB9F - loadspritegfx ANIM_TAG_286 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83D6E50, 130 playsewithpan SE_W233, 63 delay 16 @@ -3269,8 +3269,8 @@ Move_FALSE_SWIPE: @ 81CBB9F end Move_SWAGGER: @ 81CBC26 - loadspritegfx ANIM_TAG_086 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_BREATH + loadspritegfx ANIM_TAG_ANGER createvisualtask sub_80D08C8, 2 playsewithpan SE_W207, 192 waitforvisualfinish @@ -3287,9 +3287,9 @@ Move_SWAGGER: @ 81CBC26 end Move_MILK_DRINK: @ 81CBC6E - loadspritegfx ANIM_TAG_099 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_MILK_BOTTLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_TARGET createsprite gBattleAnimSpriteTemplate_83D6C48, 2 delay 40 @@ -3330,8 +3330,8 @@ _81CBCEE: goto _81CBCC8 Move_RAPID_SPIN: @ 81CBD41 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_BANK_ATTACKER createsprite gBattleAnimSpriteTemplate_84023E8, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_812CDC8, 2, 0, 2, 0 @@ -3349,9 +3349,9 @@ Move_RAPID_SPIN: @ 81CBD41 end Move_MOONLIGHT: @ 81CBDAE - loadspritegfx ANIM_TAG_194 - loadspritegfx ANIM_TAG_195 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_SPARKLE_5 + loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 16, rgb(0, 0, 0) waitforvisualfinish @@ -3376,8 +3376,8 @@ Move_MOONLIGHT: @ 81CBDAE end Move_EXTREME_SPEED: @ 81CBE3E - loadspritegfx ANIM_TAG_207 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CBEF5 fadetobg BG_HIGHSPEED_OPPONENT @@ -3424,8 +3424,8 @@ _81CBEF5: goto _81CBE55 Move_UPROAR: @ 81CBEFC - loadspritegfx ANIM_TAG_225 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80D2CF8, 2, 0 createsprite gBattleAnimSpriteTemplate_83D79A4, 3, 0, 0, 0, 0, 31, 8 @@ -3449,9 +3449,7 @@ Move_UPROAR: @ 81CBEFC end Move_HEAT_WAVE: @ 81CBFC6 - loadspritegfx ANIM_TAG_261 - createvisualtask sub_80E2C60, 5, 10261, 0, 6, 6, 31 - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendSpriteColor, 5, 10261, 0, 6, 6, rgb(31, 0, 0) createvisualtask do_boulder_dust, 5, 1 createvisualtask AnimTask_BlendInterfaceColor, 6, 6, 31 @@ -3475,8 +3473,8 @@ Move_HEAT_WAVE: @ 81CBFC6 end Move_HAIL: @ 81CC076 - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_80E2A38, 10, 1, 3, 0, 6, 0 waitforvisualfinish createvisualtask AnimTask_Hail1, 5 @@ -3486,8 +3484,8 @@ Move_HAIL: @ 81CC076 end Move_TORMENT: @ 81CC0AE - loadspritegfx ANIM_TAG_087 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_ANGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_812D008, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_BANK_TARGET, 31, 10, 1, 1 @@ -3523,15 +3521,15 @@ Move_MEMENTO: @ 81CC0F2 end Move_FACADE: @ 81CC136 - loadspritegfx ANIM_TAG_243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_812FD7C, 2, 0, 3 createvisualtask sub_812FFE4, 2, 0, 72 loopsewithpan SE_W207, 192, 24, 3 end Move_SMELLING_SALT: @ 81CC156 - loadspritegfx ANIM_TAG_247 - loadspritegfx ANIM_TAG_255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 0, 2 createsprite gBattleAnimSpriteTemplate_84029C4, 130, 1, 1, 2 delay 32 @@ -3545,7 +3543,7 @@ Move_SMELLING_SALT: @ 81CC156 end Move_FOLLOW_ME: @ 81CC1B1 - loadspritegfx ANIM_TAG_064 + loadspritegfx ANIM_TAG_FINGER createsprite gBattleAnimSpriteTemplate_83D72E0, 2, 0 playsewithpan SE_W039, 192 delay 18 @@ -3555,9 +3553,9 @@ Move_FOLLOW_ME: @ 81CC1B1 end Move_CHARGE: @ 81CC1D0 - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) @@ -3590,9 +3588,9 @@ Move_CHARGE: @ 81CC1D0 end Move_TAUNT: @ 81CC26B - loadspritegfx ANIM_TAG_214 - loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_087 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_ANGER createsprite gBattleAnimSpriteTemplate_83D7220, 11, 0, 45 playsewithpan SE_W118, 192 delay 6 @@ -3610,7 +3608,7 @@ Move_TAUNT: @ 81CC26B end Move_HELPING_HAND: @ 81CC2BF - loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_8130D20, 5 createsprite gBattleAnimSpriteTemplate_8402A0C, 40, 0 createsprite gBattleAnimSpriteTemplate_8402A0C, 40, 1 @@ -3627,7 +3625,7 @@ Move_HELPING_HAND: @ 81CC2BF end Move_ASSIST: @ 81CC332 - loadspritegfx ANIM_TAG_252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gBattleAnimSpriteTemplate_8402964, 50, 112, -16, 140, 128, 36 delay 2 createsprite gBattleAnimSpriteTemplate_8402964, 50, 208, 128, -16, 48, 36 @@ -3644,9 +3642,9 @@ Move_ASSIST: @ 81CC332 end Move_SUPERPOWER: @ 81CC3A3 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_256 - loadspritegfx ANIM_TAG_257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 @@ -3678,7 +3676,7 @@ Move_SUPERPOWER: @ 81CC3A3 end Move_RECYCLE: @ 81CC45E - loadspritegfx ANIM_TAG_278 + loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_BANK_ATTACKER setalpha 0, 16 delay 1 @@ -3694,10 +3692,10 @@ Move_RECYCLE: @ 81CC45E end Move_BRICK_BREAK: @ 81CC492 - loadspritegfx ANIM_TAG_167 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim _81CC4A7, _81CC576 _81CC4A7: monbg ANIM_BANK_TARGET @@ -3762,7 +3760,7 @@ _81CC576: end Move_YAWN: @ 81CC697 - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_812F724, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -3778,8 +3776,8 @@ Move_YAWN: @ 81CC697 end Move_ENDEAVOR: @ 81CC6DA - loadspritegfx ANIM_TAG_243 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_812FD7C, 2, 0, 2 loopsewithpan SE_W039, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_ATTACKER, 703, 12, 1, 2 @@ -3794,7 +3792,7 @@ Move_ENDEAVOR: @ 81CC6DA end Move_ERUPTION: @ 81CC74F - loadspritegfx ANIM_TAG_201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, rgb(31, 0, 0) waitforvisualfinish createvisualtask sub_80D5470, 2 @@ -3819,7 +3817,7 @@ Move_ERUPTION: @ 81CC74F end Move_SKILL_SWAP: @ 81CC81C - loadspritegfx ANIM_TAG_251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call Unknown_81D61E7 createvisualtask sub_80DC0B0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_BANK_TARGET, 32767, 12, 3, 1 @@ -3832,8 +3830,8 @@ Move_SKILL_SWAP: @ 81CC81C end Move_IMPRISON: @ 81CC867 - loadspritegfx ANIM_TAG_249 - loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_HOLLOW_ORB + loadspritegfx ANIM_TAG_X_SIGN call Unknown_81D61E7 monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80DBE00, 5 @@ -3849,7 +3847,7 @@ Move_IMPRISON: @ 81CC867 end Move_GRUDGE: @ 81CC8AA - loadspritegfx ANIM_TAG_253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_BANK_ATTACKER monbgprio_29 fadetobg BG_GHOST @@ -3885,7 +3883,7 @@ Move_CAMOUFLAGE: @ 81CC8D2 end Move_TAIL_GLOW: @ 81CC918 - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) @@ -3901,8 +3899,8 @@ Move_TAIL_GLOW: @ 81CC918 end Move_LUSTER_PURGE: @ 81CC95B - loadspritegfx ANIM_TAG_267 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT fadetobg BG_PSYCHIC waitbgfadeout createvisualtask sub_812C624, 5 @@ -3944,8 +3942,8 @@ Move_LUSTER_PURGE: @ 81CC95B end Move_MIST_BALL: @ 81CCA72 - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, 192 createsprite gMistBallSpriteTemplate, 128, 0, 0, 0, 0, 30, 0 @@ -3964,7 +3962,7 @@ Move_MIST_BALL: @ 81CCA72 end Move_FEATHER_DANCE: @ 81CCB01 - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_BANK_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, 63 @@ -3986,8 +3984,8 @@ Move_FEATHER_DANCE: @ 81CCB01 end Move_TEETER_DANCE: @ 81CCBD1 - loadspritegfx ANIM_TAG_072 - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_DUCK createvisualtask sub_813219C, 5 createsprite gBattleAnimSpriteTemplate_83D715C, 2, 0, 16, -2 playsewithpan SE_W298, 192 @@ -4006,7 +4004,7 @@ Move_TEETER_DANCE: @ 81CCBD1 end Move_MUD_SPORT: @ 81CCC3C - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gMudSportDirtSpriteTemplate, 130, 0, -4, -16 @@ -4053,9 +4051,9 @@ Move_MUD_SPORT: @ 81CCC3C end Move_NEEDLE_ARM: @ 81CCD73 - loadspritegfx ANIM_TAG_266 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GREEN_SPIKE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, 63, 2, 16 createsprite gBattleAnimSpriteTemplate_83D6994, 130, 1, 0, 0, -32, 16 delay 2 @@ -4096,7 +4094,7 @@ Move_NEEDLE_ARM: @ 81CCD73 end Move_SLACK_OFF: @ 81CCF23 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_813257C, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -4105,9 +4103,9 @@ Move_SLACK_OFF: @ 81CCF23 end Move_CRUSH_CLAW: @ 81CCF3B - loadspritegfx ANIM_TAG_167 - loadspritegfx ANIM_TAG_039 - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_CLAW_SLASH + loadspritegfx ANIM_TAG_TORN_METAL monbg ANIM_BANK_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -4128,9 +4126,9 @@ Move_CRUSH_CLAW: @ 81CCF3B Move_AROMATHERAPY: @ 81CCFAB playsewithpan SE_W080, 0 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 0, 1, 0, 0, 7, rgb(13, 31, 12) delay 1 monbg ANIM_BANK_ATTACKER @@ -4166,9 +4164,9 @@ Move_AROMATHERAPY: @ 81CCFAB end Move_FAKE_TEARS: @ 81CD10D - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_209 - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_BlendSpriteColor, 5, 10155, 0, 4, 4, rgb(12, 11, 31) waitforvisualfinish createvisualtask sub_812E568, 5, 0, 2, 1 @@ -4189,9 +4187,9 @@ Move_FAKE_TEARS: @ 81CD10D end Move_AIR_CUTTER: @ 81CD19D - loadspritegfx ANIM_TAG_003 - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 @@ -4226,7 +4224,7 @@ Move_ODOR_SLEUTH: @ 81CD1FF end Move_GRASS_WHISTLE: @ 81CD249 - loadspritegfx ANIM_TAG_072 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(18, 31, 12) waitforvisualfinish createvisualtask sub_80CEA20, 2 @@ -4263,7 +4261,7 @@ Move_GRASS_WHISTLE: @ 81CD249 end Move_TICKLE: @ 81CD33C - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, rgb(0, 0, 0) waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83D7B94, 0, -16, -8 @@ -4281,8 +4279,8 @@ Move_TICKLE: @ 81CD33C end Move_WATER_SPOUT: @ 81CD3A8 - loadspritegfx ANIM_TAG_268 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80D40F4, 5 @@ -4298,8 +4296,8 @@ Move_WATER_SPOUT: @ 81CD3A8 end Move_SHADOW_PUNCH: @ 81CD3D6 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein monbg ANIM_BANK_ATK_PARTNER @@ -4340,7 +4338,7 @@ Move_EXTRASENSORY: @ 81CD431 end Move_AERIAL_ACE: @ 81CD499 - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_BANK_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 24, 6, 1, 5 @@ -4364,13 +4362,13 @@ Move_IRON_DEFENSE: @ 81CD503 end Move_BLOCK: @ 81CD52D - loadspritegfx ANIM_TAG_250 + loadspritegfx ANIM_TAG_X_SIGN createsprite gBattleAnimSpriteTemplate_8402A6C, 194 playsewithpan SE_W207, 63 end Move_HOWL: @ 81CD53C - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_812F724, 2, 0 delay 12 call _81CE35E @@ -4380,7 +4378,7 @@ Move_HOWL: @ 81CD53C end Move_BULK_UP: @ 81CD55E - loadspritegfx ANIM_TAG_086 + loadspritegfx ANIM_TAG_BREATH createvisualtask sub_80D08C8, 2 playsewithpan SE_W207, 192 waitforvisualfinish @@ -4390,8 +4388,8 @@ Move_BULK_UP: @ 81CD55E end Move_COVET: @ 81CD57C - loadspritegfx ANIM_TAG_210 - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_MAGENTA_HEART + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812E568, 5, 0, 2, 0 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 playsewithpan SE_W204, 192 @@ -4407,9 +4405,9 @@ Move_COVET: @ 81CD57C end Move_VOLT_TACKLE: @ 81CD5D9 - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_BANK_ATTACKER setalpha 12, 8 createvisualtask sub_80E2A38, 10, 1, 0, 0, 8, 0 @@ -4454,7 +4452,7 @@ Move_VOLT_TACKLE: @ 81CD5D9 end Move_WATER_SPORT: @ 81CD6D1 - loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80D48F4, 5 delay 8 playsewithpan SE_W057, 192 @@ -4467,7 +4465,7 @@ Move_WATER_SPORT: @ 81CD6D1 end Move_CALM_MIND: @ 81CD6F7 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80E2A7C, 5, 0, 0, 0, 16, 0 waitforvisualfinish @@ -4490,8 +4488,8 @@ Move_CALM_MIND: @ 81CD6F7 end Move_LEAF_BLADE: @ 81CD775 - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80CBDF4, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 2, 0, 8, 1 @@ -4515,7 +4513,7 @@ Move_LEAF_BLADE: @ 81CD775 end Move_DRAGON_DANCE: @ 81CD7F8 - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_BANK_ATTACKER monbgprio_28 0 delay 1 @@ -4539,10 +4537,10 @@ Move_DRAGON_DANCE: @ 81CD7F8 end Move_SHOCK_WAVE: @ 81CD867 - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_001 - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_BANK_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, rgb(0, 0, 0) @@ -4575,8 +4573,8 @@ Move_HARDEN: @ 81CD909 end Move_BELLY_DRUM: @ 81CD91E - loadspritegfx ANIM_TAG_072 - loadspritegfx ANIM_TAG_193 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask sub_80CEA20, 2 waitforvisualfinish call _81CD9EB @@ -4616,9 +4614,9 @@ _81CD9EB: return Move_MIND_READER: @ 81CDA06 - loadspritegfx ANIM_TAG_189 - loadspritegfx ANIM_TAG_190 - loadspritegfx ANIM_TAG_191 + loadspritegfx ANIM_TAG_TEAL_ALERT + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 playsewithpan SE_W109, 63 createsprite gBattleAnimSpriteTemplate_84021DC, 5, 0, 0, 1, 0 @@ -4657,9 +4655,9 @@ _81CDA4D: Move_ICE_PUNCH: @ 81CDB3E monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, rgb(0, 0, 0) createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 32588 delay 20 @@ -4693,7 +4691,7 @@ Move_ICE_PUNCH: @ 81CDB3E Move_REST: @ 81CDC29 playsewithpan SE_W173, 192 - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 delay 20 createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 @@ -4773,7 +4771,7 @@ Unknown_81CDD7A: @ 81CDD7A goto _81CDD32 Move_THUNDER: @ 81CDDCE - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_LIGHTNING fadetobg BG_THUNDER waitbgfadeout createvisualtask sub_80E3A58, 5, -256, 0, 1, -1 @@ -4831,9 +4829,9 @@ Move_THUNDER: @ 81CDDCE end Move_THUNDER_PUNCH: @ 81CDF28 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_BANK_TARGET setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, rgb(0, 0, 0) @@ -4864,8 +4862,8 @@ Move_THUNDER_PUNCH: @ 81CDF28 end Move_SACRED_FIRE: @ 81CDFF1 - loadspritegfx ANIM_TAG_033 - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_FIRE + loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, 192, 7, 5 createsprite gBattleAnimSpriteTemplate_83D9538, 2, -32, 0, 50, 5, -2, 0 delay 1 @@ -4921,7 +4919,7 @@ Move_SACRED_FIRE: @ 81CDFF1 end Move_SCRATCH: @ 81CE1D8 - loadspritegfx ANIM_TAG_137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W010, 63 @@ -4934,7 +4932,7 @@ Move_SCRATCH: @ 81CE1D8 end Move_DRAGON_BREATH: @ 81CE20A - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 loopsewithpan SE_W172, 192, 7, 7 @@ -4968,7 +4966,7 @@ Move_DRAGON_BREATH: @ 81CE20A end Move_ROAR: @ 81CE31E - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_BANK_ATTACKER monbgprio_28 0 setalpha 8, 8 @@ -4994,7 +4992,7 @@ _81CE35E: return Move_GROWL: @ 81CE3AF - loadspritegfx ANIM_TAG_053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_812B18C, 2, 0, 255 call _81CE35E delay 10 @@ -5005,7 +5003,7 @@ Move_GROWL: @ 81CE3AF end Move_SNORE: @ 81CE3EA - loadspritegfx ANIM_TAG_197 + loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_BANK_ATK_PARTNER setalpha 8, 8 call _81CE403 @@ -5026,8 +5024,8 @@ _81CE403: return Move_LIGHT_SCREEN: @ 81CE47A - loadspritegfx ANIM_TAG_070 - loadspritegfx ANIM_TAG_166 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gBattleAnimSpriteTemplate_83DA6A8, 1, 40, 0, 10166 @@ -5052,8 +5050,8 @@ _81CE4A1: return Move_MIRROR_COAT: @ 81CE506 - loadspritegfx ANIM_TAG_070 - loadspritegfx ANIM_TAG_168 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gBattleAnimSpriteTemplate_83DA6D8, 1, 40, 0, 10168 delay 10 @@ -5065,8 +5063,8 @@ Move_MIRROR_COAT: @ 81CE506 end Move_REFLECT: @ 81CE52C - loadspritegfx ANIM_TAG_071 - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_SPARKLE_4 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gBattleAnimSpriteTemplate_83DA6C0, 1, 40, 0, 10167 @@ -5082,7 +5080,7 @@ Move_REFLECT: @ 81CE52C end Move_BARRIER: @ 81CE57F - loadspritegfx ANIM_TAG_169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gBattleAnimSpriteTemplate_83DA6F0, 3, 40, 0, 10169 @@ -5092,8 +5090,8 @@ Move_BARRIER: @ 81CE57F end Move_BUBBLE: @ 81CE59C - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_TARGET setalpha 12, 8 delay 1 @@ -5128,7 +5126,7 @@ Move_BUBBLE: @ 81CE59C end Move_SMOG: @ 81CE672 - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_BANK_DEF_PARTNER monbgprio_29 setalpha 12, 8 @@ -5155,7 +5153,7 @@ _81CE6D7: return Move_FAINT_ATTACK: @ 81CE6ED - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_ATTACKER fadetobg BG_DARK waitbgfadein @@ -5191,7 +5189,7 @@ Move_FAINT_ATTACK: @ 81CE6ED end Move_SAND_ATTACK: @ 81CE774 - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_BANK_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 @@ -5219,7 +5217,7 @@ Move_SAND_ATTACK_CreateDirtSpray: return Move_MUD_SLAP: @ 81CE81C - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, 192 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -10, 0, 0, 3 waitforvisualfinish @@ -5242,8 +5240,8 @@ Move_MUD_SLAP_CreateMudSpray: return Move_DRAGON_RAGE: @ 81CE8BA - loadspritegfx ANIM_TAG_029 - loadspritegfx ANIM_TAG_035 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish @@ -5274,7 +5272,7 @@ Move_DRAGON_RAGE: @ 81CE8BA end Move_RAIN_DANCE: @ 81CE997 - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish @@ -5288,8 +5286,8 @@ Move_RAIN_DANCE: @ 81CE997 end Move_BITE: @ 81CE9E2 - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W044, 63 @@ -5305,8 +5303,8 @@ Move_BITE: @ 81CE9E2 end Move_CRUNCH: @ 81CEA40 - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET fadetobg BG_DARK waitbgfadein @@ -5333,8 +5331,8 @@ Move_CRUNCH: @ 81CEA40 end Move_CLAMP: @ 81CEAF0 - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W011, 63 @@ -5353,7 +5351,7 @@ Move_ICE_BEAM: @ 81CEB4D monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, rgb(0, 0, 0) waitforvisualfinish createsoundtask sub_812B058, 183, -64, 63, 4, 4, 0, 10 @@ -5400,7 +5398,7 @@ Move_WITHDRAW: @ 81CEC84 end Move_AURORA_BEAM: @ 81CEC91 - loadspritegfx ANIM_TAG_140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, 192 @@ -5436,7 +5434,7 @@ _81CED18: return Move_SOLAR_BEAM: @ 81CED65 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim _81CED73, _81CEE70 _81CED71: waitforvisualfinish @@ -5525,7 +5523,7 @@ _81CEF42: return Move_BLIZZARD: @ 81CEFBA - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER createvisualtask sub_80E3B4C, 2 jumpargeq 7, 1, _81CF13F @@ -5577,7 +5575,7 @@ _81CF13F: goto _81CEFD0 Move_POWDER_SNOW: @ 81CF146 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_BANK_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, rgb(0, 0, 0) waitforvisualfinish @@ -5611,8 +5609,8 @@ _81CF190: return Move_HYDRO_PUMP: @ 81CF240 - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -5658,9 +5656,9 @@ _81CF320: return Move_SIGNAL_BEAM: @ 81CF33F - loadspritegfx ANIM_TAG_264 - loadspritegfx ANIM_TAG_265 - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 panse_1B SE_W062, 192, 63, 1, 0 @@ -5699,9 +5697,9 @@ _81CF406: return Move_ABSORB: @ 81CF427 - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 @@ -5751,9 +5749,9 @@ _81CF496: return Move_MEGA_DRAIN: @ 81CF53F - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 @@ -5811,9 +5809,9 @@ _81CF5AE: return Move_GIGA_DRAIN: @ 81CF6CF - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 @@ -5879,11 +5877,11 @@ _81CF73E: return Move_LEECH_LIFE: @ 81CF8D7 - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET setalpha 12, 8 @@ -5909,8 +5907,8 @@ Move_LEECH_LIFE: @ 81CF8D7 end Move_SYNTHESIS: @ 81CF959 - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E1F8C, 2, 2, 2, 2, 0, 16, 19451 playsewithpan SE_W025, 192 call Unknown_81D5ECA @@ -5920,8 +5918,8 @@ Move_SYNTHESIS: @ 81CF959 end Move_TOXIC: @ 81CF983 - loadspritegfx ANIM_TAG_151 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE call _81CF99D call _81CF99D waitforvisualfinish @@ -5945,7 +5943,7 @@ _81CF99D: return Move_SLUDGE: @ 81CF9F2 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, 192 createsprite gBattleAnimSpriteTemplate_83DA2B8, 130, 20, 0, 40, 0 waitforvisualfinish @@ -5956,7 +5954,7 @@ Move_SLUDGE: @ 81CF9F2 end Move_SLUDGE_BOMB: @ 81CFA34 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE call _81CFB44 call _81CFB44 call _81CFB44 @@ -5999,7 +5997,7 @@ _81CFB44: return Move_ACID: @ 81CFB5A - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_BANK_DEF_PARTNER createsprite gBattleAnimSpriteTemplate_83DA2D0, 130, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, 192 @@ -6032,8 +6030,8 @@ Move_ACID: @ 81CFB5A end Move_BONEMERANG: @ 81CFC54 - loadspritegfx ANIM_TAG_000 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6052,8 +6050,8 @@ Move_BONEMERANG: @ 81CFC54 end Move_BONE_CLUB: @ 81CFCA8 - loadspritegfx ANIM_TAG_000 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6070,8 +6068,8 @@ Move_BONE_CLUB: @ 81CFCA8 end Move_BONE_RUSH: @ 81CFD0A - loadspritegfx ANIM_TAG_000 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, 63 @@ -6086,7 +6084,7 @@ Move_BONE_RUSH: @ 81CFD0A end Move_SPIKES: @ 81CFD55 - loadspritegfx ANIM_TAG_152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W026, 192 waitplaysewithpan SE_W030, 63, 28 @@ -6103,8 +6101,8 @@ Move_SPIKES: @ 81CFD55 end Move_MEGAHORN: @ 81CFDAC - loadspritegfx ANIM_TAG_153 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W082, 192 jumpifcontest _81CFE83 @@ -6147,8 +6145,8 @@ _81CFE83: goto _81CFDCF Move_GUST: @ 81CFE9A - loadspritegfx ANIM_TAG_009 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6165,8 +6163,8 @@ Move_GUST: @ 81CFE9A end Move_WING_ATTACK: @ 81CFEEB - loadspritegfx ANIM_TAG_009 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6189,7 +6187,7 @@ Move_WING_ATTACK: @ 81CFEEB end Move_PECK: @ 81CFF88 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, 63 createvisualtask sub_80A8EFC, 2, 3, -768, 1, 2 createsprite gBattleAnimSpriteTemplate_83DB538, 131, -12, 0, 1, 3 @@ -6197,8 +6195,8 @@ Move_PECK: @ 81CFF88 end Move_AEROBLAST: @ 81CFFAF - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER call Unknown_81D61FB monbgprio_28 1 @@ -6238,8 +6236,8 @@ _81D000B: return Move_WATER_GUN: @ 81D00CC - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6262,8 +6260,8 @@ Move_WATER_GUN: @ 81D00CC end Move_CRABHAMMER: @ 81D0159 - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB4D8, 4, 0, 0, 1, 0 @@ -6306,7 +6304,7 @@ Move_SURF: @ 81D0253 end Move_FLAMETHROWER: @ 81D0267 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6338,7 +6336,7 @@ _81D02E1: return Move_SANDSTORM: @ 81D0304 - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask do_boulder_dust, 5, 0 delay 16 @@ -6358,7 +6356,7 @@ Move_SANDSTORM: @ 81D0304 end Move_WHIRLPOOL: @ 81D038C - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6390,8 +6388,8 @@ _81D03E4: return Move_FLY: @ 81D046F - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim _81D0480, _81D0498 _81D047E: waitforvisualfinish @@ -6415,8 +6413,8 @@ _81D0498: goto _81D047E Move_BOUNCE: @ 81D04D9 - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim _81D04E9, _81D04FD _81D04E8: end @@ -6439,8 +6437,8 @@ _81D04FD: goto _81D04E8 Move_KARATE_CHOP: @ 81D053C - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -6456,8 +6454,8 @@ Move_KARATE_CHOP: @ 81D053C end Move_CROSS_CHOP: @ 81D058E - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, 63 @@ -6474,8 +6472,8 @@ Move_CROSS_CHOP: @ 81D058E end Move_JUMP_KICK: @ 81D05F7 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -6492,8 +6490,8 @@ Move_JUMP_KICK: @ 81D05F7 end Move_HI_JUMP_KICK: @ 81D0654 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 @@ -6518,8 +6516,8 @@ Move_HI_JUMP_KICK: @ 81D0654 end Move_DOUBLE_KICK: @ 81D06EA - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83D9FC0, 3, 1, 20, 1 @@ -6532,8 +6530,8 @@ Move_DOUBLE_KICK: @ 81D06EA end Move_TRIPLE_KICK: @ 81D071D - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, 63 @@ -6562,10 +6560,10 @@ _81D07AE: goto _81D073D Move_DYNAMIC_PUNCH: @ 81D07E4 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_198 - loadspritegfx ANIM_TAG_007 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 @@ -6596,8 +6594,8 @@ Move_DYNAMIC_PUNCH: @ 81D07E4 end Move_COUNTER: @ 81D08AC - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_BANK_ATTACKER, 18, 6, 1, 4 @@ -6628,7 +6626,7 @@ Move_COUNTER: @ 81D08AC end Move_VITAL_THROW: @ 81D097B - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, 192 @@ -6651,9 +6649,9 @@ Move_VITAL_THROW: @ 81D097B end Move_ROCK_SMASH: @ 81D09F6 - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6678,7 +6676,7 @@ Move_ROCK_SMASH: @ 81D09F6 end Move_SUBMISSION: @ 81D0AEE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, 192 @@ -6710,7 +6708,7 @@ _81D0B5D: return Move_SUNNY_DAY: @ 81D0B91 - loadspritegfx ANIM_TAG_157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_BANK_ATK_PARTNER setalpha 13, 3 createvisualtask sub_80E2A38, 10, 1921, 1, 0, 6, 32767 @@ -6732,7 +6730,7 @@ _81D0BDD: return Move_COTTON_SPORE: @ 81D0BE7 - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 loopsewithpan SE_W077, 63, 18, 10 @@ -6752,7 +6750,7 @@ _81D0C07: return Move_SPORE: @ 81D0C41 - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80CACEC, 2 @@ -6775,8 +6773,8 @@ _81D0C6C: return Move_PETAL_DANCE: @ 81D0CA6 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, 192 @@ -6813,9 +6811,9 @@ Move_PETAL_DANCE: @ 81D0CA6 end Move_RAZOR_LEAF: @ 81D0DDE - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6853,8 +6851,8 @@ Move_RAZOR_LEAF: @ 81D0DDE end Move_ANCIENT_POWER: @ 81D0EE5 - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_83DB428, 2, 4, 1, 10, 1 @@ -6886,8 +6884,8 @@ Move_ANCIENT_POWER: @ 81D0EE5 end Move_OCTAZOOKA: @ 81D100D - loadspritegfx ANIM_TAG_030 - loadspritegfx ANIM_TAG_017 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, 192 createsprite gBattleAnimSpriteTemplate_83D6F08, 130, 20, 0, 0, 0, 20, 0 waitforvisualfinish @@ -6903,7 +6901,7 @@ Move_OCTAZOOKA: @ 81D100D end Move_MIST: @ 81D1073 - loadspritegfx ANIM_TAG_144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, 192, 20, 15 @@ -6936,9 +6934,9 @@ Move_HAZE: @ 81D10D4 end Move_FIRE_PUNCH: @ 81D1107 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_029 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80E2A38, 10, 4, 2, 0, 9, 31 @@ -6971,7 +6969,7 @@ _81D11A2: return Move_LEER: @ 81D121A - loadspritegfx ANIM_TAG_027 + loadspritegfx ANIM_TAG_LEER monbg ANIM_BANK_ATTACKER monbgprio_28 0 setalpha 8, 8 @@ -6990,8 +6988,8 @@ Move_LEER: @ 81D121A end Move_DREAM_EATER: @ 81D1271 - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET playsewithpan SE_W060, 192 @@ -7057,8 +7055,8 @@ _81D12DB: return Move_POISON_GAS: @ 81D1474 - loadspritegfx ANIM_TAG_172 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD + loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_BANK_DEF_PARTNER monbgprio_29 @@ -7109,7 +7107,7 @@ Move_WRAP: @ 81D158C goto _81D1568 Move_PSYBEAM: @ 81D15A2 - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, 192 call Unknown_81D61E7 createsoundtask sub_812B058, 200, -64, 63, 3, 4, 0, 15 @@ -7136,7 +7134,7 @@ _81D1626: return Move_HYPNOSIS: @ 81D163C - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING call Unknown_81D61E7 call _81D166F call _81D166F @@ -7154,7 +7152,7 @@ _81D166F: return Move_PSYWAVE: @ 81D169C - loadspritegfx ANIM_TAG_165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, 192 call Unknown_81D61E7 createvisualtask sub_80D3630, 5, 100 @@ -7178,8 +7176,8 @@ _81D16FF: return Move_ZAP_CANNON: @ 81D1722 - loadspritegfx ANIM_TAG_171 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_BLACK_BALL_2 + loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, 192 createsprite gBattleAnimSpriteTemplate_83D9874, 131, 10, 0, 0, 0, 30, 0 createsprite gBattleAnimSpriteTemplate_83D98A0, 132, 10, 0, 16, 30, 0, 40, 0 @@ -7199,8 +7197,8 @@ Move_ZAP_CANNON: @ 81D1722 end Move_STEEL_WING: @ 81D1807 - loadspritegfx ANIM_TAG_009 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish @@ -7226,7 +7224,7 @@ Move_STEEL_WING: @ 81D1807 end Move_IRON_TAIL: @ 81D18B6 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 0, 0 waitforvisualfinish @@ -7245,8 +7243,8 @@ Move_IRON_TAIL: @ 81D18B6 end Move_POISON_TAIL: @ 81D1914 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, 192, 28, 2 createvisualtask sub_80E0A4C, 5, 1, 1, 23768 waitforvisualfinish @@ -7266,7 +7264,7 @@ Move_POISON_TAIL: @ 81D1914 end Move_METAL_CLAW: @ 81D197A - loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_W231, 192, 28, 2 createvisualtask sub_80E0A4C, 5, 0, 0, 0 waitforvisualfinish @@ -7306,8 +7304,8 @@ Move_NIGHT_SHADE: @ 81D1A0D end Move_EGG_BOMB: @ 81D1A55 - loadspritegfx ANIM_TAG_198 - loadspritegfx ANIM_TAG_175 + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, 192 createsprite gBattleAnimSpriteTemplate_83D7594, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7331,7 +7329,7 @@ Move_EGG_BOMB: @ 81D1A55 end Move_SHADOW_BALL: @ 81D1AEF - loadspritegfx ANIM_TAG_176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein delay 15 @@ -7346,7 +7344,7 @@ Move_SHADOW_BALL: @ 81D1AEF end Move_LICK: @ 81D1B32 - loadspritegfx ANIM_TAG_177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, 63 createsprite gBattleAnimSpriteTemplate_83DAEDC, 130, 0, 0 @@ -7355,7 +7353,7 @@ Move_LICK: @ 81D1B32 end Move_FOCUS_ENERGY: @ 81D1B59 - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call EndureFlamesAnim delay 8 @@ -7377,7 +7375,7 @@ _81D1BA3: waitforvisualfinish end _81D1BCF: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, 192, 9, 2 @@ -7407,8 +7405,8 @@ _81D1BCF: end Move_STRING_SHOT: @ 81D1C98 - loadspritegfx ANIM_TAG_179 - loadspritegfx ANIM_TAG_180 + loadspritegfx ANIM_TAG_STRING + loadspritegfx ANIM_TAG_STRING_DOT monbg ANIM_BANK_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, rgb(0, 0, 0) @@ -7451,8 +7449,8 @@ _81D1D56: return Move_SPIDER_WEB: @ 81D1D6A - loadspritegfx ANIM_TAG_181 - loadspritegfx ANIM_TAG_180 + loadspritegfx ANIM_TAG_WEB + loadspritegfx ANIM_TAG_STRING_DOT monbg ANIM_BANK_DEF_PARTNER delay 0 createsprite gSimplePaletteBlendSpriteTemplate, 5, 1, 2, 0, 9, rgb(0, 0, 0) @@ -7492,7 +7490,7 @@ _81D1E14: waitforvisualfinish end _81D1E16: - loadspritegfx ANIM_TAG_009 + loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, 192 createsprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gBattleAnimSpriteTemplate_83D765C, 2, 32, 0, 16, 16, 85, 7, 40 @@ -7501,8 +7499,8 @@ _81D1E16: playsewithpan SE_W016B, 192 goto _81D1E14 _81D1E66: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W013B, 192 @@ -7523,7 +7521,7 @@ _81D1E66: goto _81D1E14 Move_DISABLE: @ 81D1EF1 - loadspritegfx ANIM_TAG_071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 8, 8 @@ -7539,8 +7537,8 @@ Move_DISABLE: @ 81D1EF1 end Move_RECOVER: @ 81D1F1F - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W025, 192, 13, 3 @@ -7573,7 +7571,7 @@ _81D1F5F: return Move_MIMIC: @ 81D1FC9 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 panse_1B SE_W107, 63, 192, 253, 0 @@ -7591,7 +7589,7 @@ Move_MIMIC: @ 81D1FC9 end Move_CONSTRICT: @ 81D2013 - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 4 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 2 delay 7 @@ -7610,8 +7608,8 @@ Move_CONSTRICT: @ 81D2013 Move_CURSE: @ 81D207B choosetwoturnanim _81D2084, _81D2101 _81D2084: - loadspritegfx ANIM_TAG_199 - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_NAIL + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BANK_ATK_PARTNER createvisualtask sub_80DECB0, 5 waitforvisualfinish @@ -7653,9 +7651,9 @@ _81D211C: return Move_SOFT_BOILED: @ 81D213B - loadspritegfx ANIM_TAG_202 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BREAKING_EGG + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_ATK_PARTNER playsewithpan SE_W039, 192 createvisualtask AnimTask_ShakeMon, 2, ANIM_BANK_ATTACKER, 0, 2, 6, 1 @@ -7676,10 +7674,10 @@ Move_SOFT_BOILED: @ 81D213B end Move_HEAL_BELL: @ 81D21BD - loadspritegfx ANIM_TAG_205 - loadspritegfx ANIM_TAG_206 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80E2A38, 10, 10, 0, 0, 10, 32767 waitforvisualfinish createvisualtask sub_80D1ADC, 5 @@ -7734,7 +7732,7 @@ Move_FAKE_OUT: @ 81D23A8 end Move_SCARY_FACE: @ 81D23E3 - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, rgb(0, 0, 0) playsewithpan SE_W060, 192 waitforvisualfinish @@ -7752,8 +7750,8 @@ Move_SCARY_FACE: @ 81D23E3 end Move_SWEET_KISS: @ 81D2446 - loadspritegfx ANIM_TAG_216 - loadspritegfx ANIM_TAG_220 + loadspritegfx ANIM_TAG_RED_HEART + loadspritegfx ANIM_TAG_ANGEL createsprite gBattleAnimSpriteTemplate_83D7BB8, 130, 16, -48 playsewithpan SE_W215, 63 delay 23 @@ -7771,8 +7769,8 @@ Move_SWEET_KISS: @ 81D2446 end Move_LOVELY_KISS: @ 81D24AF - loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_221 + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gBattleAnimSpriteTemplate_83D7C00, 130, 0, -24 playsewithpan SE_W060B, 63 waitforvisualfinish @@ -7784,7 +7782,7 @@ Move_LOVELY_KISS: @ 81D24AF end Move_FURY_SWIPES: @ 81D24F6 - loadspritegfx ANIM_TAG_222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 @@ -7799,8 +7797,8 @@ Move_FURY_SWIPES: @ 81D24F6 end Move_INGRAIN: @ 81D255A - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gBattleAnimSpriteTemplate_83D6658, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, 192 delay 10 @@ -7829,7 +7827,7 @@ Move_INGRAIN: @ 81D255A end Move_PRESENT: @ 81D260B - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_812C960, 2 createsprite gBattleAnimSpriteTemplate_83D671C, 130, 0, -5, 10, 2, -1 playsewithpan SE_W039, 192 @@ -7844,7 +7842,7 @@ Move_PRESENT: @ 81D260B jumpargeq 7, 1, _81D26B9 end _81D264E: - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, 63 createsprite gBattleAnimSpriteTemplate_83D7828, 131, 0, 0, 1, 1 delay 6 @@ -7861,8 +7859,8 @@ _81D264E: createsprite gBattleAnimSpriteTemplate_83D7828, 131, 16, 16, 1, 1 end _81D26B9: - loadspritegfx ANIM_TAG_195 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_SPARKLE_5 + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, 63 createsprite gBattleAnimSpriteTemplate_83D6764, 132, -16, 32, -3, 1 delay 3 @@ -7887,14 +7885,14 @@ _81D26B9: end Move_BATON_PASS: @ 81D2762 - loadspritegfx ANIM_TAG_226 + loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, 192 createvisualtask sub_80E1F8C, 2, 31, 1, 2, 0, 11, 31455 createsprite gBattleAnimSpriteTemplate_84024D0, 2 end Move_PERISH_SONG: @ 81D2784 - loadspritegfx ANIM_TAG_206 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 0, 0, 0 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 1, 1, 16 createsprite gBattleAnimSpriteTemplate_83D7D1C, 4, 2, 1, 32 @@ -7930,7 +7928,7 @@ Move_PERISH_SONG: @ 81D2784 end Move_SLEEP_TALK: @ 81D28ED - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gBattleAnimSpriteTemplate_84022F0, 130, 0, 20, 5, -1 @@ -7957,7 +7955,7 @@ Move_SLEEP_TALK: @ 81D28ED end Move_HYPER_FANG: @ 81D29A8 - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, 63 delay 1 delay 2 @@ -7988,7 +7986,7 @@ _81D2A08: goto _81D29D6 Move_TRI_ATTACK: @ 81D2A0F - loadspritegfx ANIM_TAG_230 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gBattleAnimSpriteTemplate_8402458, 130, 16, 0 playsewithpan SE_W161, 192 delay 20 @@ -7998,7 +7996,7 @@ Move_TRI_ATTACK: @ 81D2A0F waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 16, rgb(0, 0, 0) delay 16 - loadspritegfx ANIM_TAG_033 + loadspritegfx ANIM_TAG_FIRE createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, 63 createsprite gBattleAnimSpriteTemplate_83D9520, 130, 0, 0, 30, 30, 0, 1 @@ -8017,7 +8015,7 @@ Move_TRI_ATTACK: @ 81D2A0F delay 2 createvisualtask sub_80D60B4, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx ANIM_TAG_037 + loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80E2324, 2, 257, 257, 257 playsewithpan SE_W161B, 63 createsprite gBattleAnimSpriteTemplate_83D97D0, 130, 0, -48 @@ -8030,15 +8028,15 @@ Move_TRI_ATTACK: @ 81D2A0F delay 2 createvisualtask sub_80E2324, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call Effect_LightIceDamage createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, rgb(0, 0, 0) waitforvisualfinish end Move_WILL_O_WISP: @ 81D2B83 - loadspritegfx ANIM_TAG_232 - loadspritegfx ANIM_TAG_231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET playsewithpan SE_W052, 192 @@ -8068,8 +8066,8 @@ Move_WILL_O_WISP: @ 81D2B83 end Move_ENCORE: @ 81D2C41 - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_247 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_812CC44, 2 createvisualtask sub_80E2D78, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8088,8 +8086,8 @@ Move_ENCORE: @ 81D2C41 end Move_TRICK: @ 81D2CE8 - loadspritegfx ANIM_TAG_224 - loadspritegfx ANIM_TAG_207 + loadspritegfx ANIM_TAG_ITEM_BAG + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 80 createsprite gBattleAnimSpriteTemplate_83D67F4, 2, -40, 208 delay 16 @@ -8116,8 +8114,8 @@ Move_TRICK: @ 81D2CE8 end Move_WISH: @ 81D2D66 - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish panse_27 SE_W115, 63, 192, 253, 0 @@ -8132,7 +8130,7 @@ Move_WISH: @ 81D2D66 end Move_STOCKPILE: @ 81D2DAE - loadspritegfx ANIM_TAG_235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, 192 createvisualtask sub_80E1F8C, 2, 2, 8, 1, 0, 12, 32767 createvisualtask sub_812D674, 5 @@ -8161,8 +8159,8 @@ _81D2DEC: return Move_SPIT_UP: @ 81D2E65 - loadspritegfx ANIM_TAG_237 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, 192 createvisualtask sub_812D6CC, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 @@ -8208,8 +8206,8 @@ _81D2F5B: goto _81D2EF5 Move_SWALLOW: @ 81D2FA8 - loadspritegfx ANIM_TAG_236 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, 192 createvisualtask sub_812D790, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 8, 2 @@ -8253,8 +8251,8 @@ Move_TRANSFORM: @ 81D3054 end Move_MORNING_SUN: @ 81D306C - loadspritegfx ANIM_TAG_241 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_GREEN_STAR + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask sub_812DB84, 5 delay 8 createvisualtask sub_80E2A38, 10, 1921, 8, 0, 12, 32767 @@ -8285,7 +8283,7 @@ _81D30F2: return Move_SWEET_SCENT: @ 81D3100 - loadspritegfx ANIM_TAG_238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, 192 createsprite gBattleAnimSpriteTemplate_84026A4, 2, 100, 0, 100 delay 25 @@ -8323,7 +8321,7 @@ _81D3144: return Move_HYPER_BEAM: @ 81D31EA - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, rgb(0, 0, 0) waitforvisualfinish delay 10 @@ -8373,8 +8371,8 @@ _81D331B: return Move_FLATTER: @ 81D332C - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_812B340, 5, 223, 63 createvisualtask sub_812CC44, 2 createvisualtask sub_80E2D78, 2, 248, 3, 0, 10, 0 @@ -8433,8 +8431,8 @@ Move_ROLE_PLAY: @ 81D3428 end Move_REFRESH: @ 81D3485 - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, 192 createvisualtask sub_81300A4, 2, 0 waitforvisualfinish @@ -8447,9 +8445,9 @@ Move_REFRESH: @ 81D3485 end Move_BLAZE_KICK: @ 81D34C8 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W172, 63 @@ -8468,7 +8466,7 @@ Move_BLAZE_KICK: @ 81D34C8 end Move_HYPER_VOICE: @ 81D3550 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING call _81D3562 waitforvisualfinish delay 8 @@ -8486,7 +8484,7 @@ _81D3562: return Move_SAND_TOMB: @ 81D35D2 - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 playsewithpan SE_W328, 63 @@ -8517,7 +8515,7 @@ Move_SHEER_COLD: @ 81D36AA waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx ANIM_TAG_010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -8531,8 +8529,8 @@ Move_SHEER_COLD: @ 81D36AA end Move_ARM_THRUST: @ 81D36CF - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 1 setalpha 12, 8 createvisualtask sub_80A8E04, 5, 8, 5, 0, 0 @@ -8564,7 +8562,7 @@ Move_MUDDY_WATER: @ 81D3764 end Move_BULLET_SEED: @ 81D3776 - loadspritegfx ANIM_TAG_006 + loadspritegfx ANIM_TAG_SEED createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 delay 5 createsprite gBattleAnimSpriteTemplate_83D7628, 130, 20, 0 @@ -8589,8 +8587,8 @@ Move_BULLET_SEED: @ 81D3776 end Move_DRAGON_CLAW: @ 81D380C - loadspritegfx ANIM_TAG_029 - loadspritegfx ANIM_TAG_039 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, 192 createvisualtask sub_80E2A38, 10, 2, 4, 0, 8, 639 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 @@ -8651,7 +8649,7 @@ Unknown_81D3A74: @ 81D3A74 end Move_MUD_SHOT: @ 81D3A75 - loadspritegfx ANIM_TAG_259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -8683,9 +8681,9 @@ _81D3AEF: return Move_METEOR_MASH: @ 81D3B12 - loadspritegfx ANIM_TAG_233 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET panse_1B SE_W112, 192, 63, 3, 0 fadetobg BG_COSMIC waitbgfadein @@ -8708,7 +8706,7 @@ Move_METEOR_MASH: @ 81D3B12 end Move_REVENGE: @ 81D3B99 - loadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W036, 192 @@ -8716,15 +8714,15 @@ Move_REVENGE: @ 81D3B99 waitforvisualfinish createvisualtask sub_80E1F8C, 2, 2, 0, 4, 2, 8, 31 waitforvisualfinish - unloadspritegfx ANIM_TAG_245 - loadspritegfx ANIM_TAG_246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 delay 4 playsewithpan SE_W207, 63 createsprite gBattleAnimSpriteTemplate_83DA1E0, 130, 10, -10 waitforvisualfinish - unloadspritegfx ANIM_TAG_246 - loadspritegfx ANIM_TAG_135 + unloadspritegfx ANIM_TAG_PURPLE_SWIPE + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_TARGET, 3, 0, 10, 1 createsprite gBattleAnimSpriteTemplate_83DB550, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, 63 @@ -8737,8 +8735,8 @@ Move_REVENGE: @ 81D3B99 end Move_POISON_FANG: @ 81D3C30 - loadspritegfx ANIM_TAG_192 - loadspritegfx ANIM_TAG_150 + loadspritegfx ANIM_TAG_FANG_ATTACK + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, 63 createsprite gBattleAnimSpriteTemplate_840233C, 130 delay 10 @@ -8755,8 +8753,8 @@ Move_SUBSTITUTE: @ 81D3C6F end Move_FRENZY_PLANT: @ 81D3C7B - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET monbgprio_28 1 setalpha 12, 8 @@ -8815,7 +8813,7 @@ Move_FRENZY_PLANT: @ 81D3C7B end Move_METAL_SOUND: @ 81D3E1F - loadspritegfx ANIM_TAG_260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_BANK_DEF_PARTNER monbgprio_2A ANIM_BANK_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 2, 0, 8, 1 @@ -8840,8 +8838,8 @@ _81D3E74: waitforvisualfinish end _81D3E76: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask sub_80E4200, 2 jumpargeq 7, 1, _81D3F2F @@ -8883,7 +8881,7 @@ _81D3F2F: goto _81D3EA4 Move_RETURN: @ 81D3F36 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81318F0, 2 @@ -9020,7 +9018,7 @@ _81D4371: return Move_COSMIC_POWER: @ 81D43C5 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_812B340, 5, 243, 0 playsewithpan SE_W322, 0 createvisualtask sub_80E3A08, 2, 0, 0, 15, 0 @@ -9045,8 +9043,8 @@ Move_COSMIC_POWER: @ 81D43C5 end Move_BLAST_BURN: @ 81D444A - loadspritegfx ANIM_TAG_035 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FIRE_PLUME + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, 192 @@ -9090,8 +9088,8 @@ Move_BLAST_BURN: @ 81D444A end Move_ROCK_TOMB: @ 81D468C - loadspritegfx ANIM_TAG_250 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_X_SIGN + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_80E26BC, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gBattleAnimSpriteTemplate_83DADA8, 130, 20, 12, 64, 114, 0 @@ -9122,7 +9120,7 @@ Move_ROCK_TOMB: @ 81D468C end Move_SILVER_WIND: @ 81D4773 - loadspritegfx ANIM_TAG_271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, 192, 63, 2, 0 playsewithpan SE_W234, 0 delay 0 @@ -9184,11 +9182,11 @@ Move_SNATCH: @ 81D498B end Move_DIVE: @ 81D49A5 - loadspritegfx ANIM_TAG_272 - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim _81D49B4, _81D4A09 _81D49B4: - loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, 192 createsprite gBattleAnimSpriteTemplate_83DA5D8, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9205,8 +9203,8 @@ _81D49F2: createsprite gBattleAnimSpriteTemplate_83DA62C, 5, 1, 0 return _81D4A09: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, 63 @@ -9229,8 +9227,8 @@ _81D4A48: return Move_ROCK_BLAST: @ 81D4A5F - loadspritegfx ANIM_TAG_058 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 playsewithpan SE_W207, 192 @@ -9247,8 +9245,8 @@ Move_ROCK_BLAST: @ 81D4A5F end Move_OVERHEAT: @ 81D4AFC - loadspritegfx ANIM_TAG_029 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, rgb(28, 0, 0) @@ -9324,8 +9322,8 @@ Move_OVERHEAT: @ 81D4AFC end Move_HYDRO_CANNON: @ 81D4DDE - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, 192 @@ -9366,7 +9364,7 @@ _81D4EA8: return Move_ASTONISH: @ 81D4F10 - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, 192 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 @@ -9379,8 +9377,8 @@ Move_ASTONISH: @ 81D4F10 end Move_SEISMIC_TOSS: @ 81D4F58 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 @@ -9446,7 +9444,7 @@ _81D5054: return Move_MAGIC_COAT: @ 81D50B5 - loadspritegfx ANIM_TAG_170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gBattleAnimSpriteTemplate_83DA708, 3, 40, 0, 10170 @@ -9456,8 +9454,8 @@ Move_MAGIC_COAT: @ 81D50B5 end Move_WATER_PULSE: @ 81D50D2 - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_BANK_TARGET monbgprio_28 1 playsewithpan SE_W145C, 192 @@ -9487,7 +9485,7 @@ Move_WATER_PULSE: @ 81D50D2 end Move_PSYCHO_BOOST: @ 81D51C7 - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_BANK_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9514,8 +9512,8 @@ Move_PSYCHO_BOOST: @ 81D51C7 end Move_KNOCK_OFF: @ 81D523B - loadspritegfx ANIM_TAG_277 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 4 playsewithpan SE_W233, 63 @@ -9554,7 +9552,7 @@ Move_DOOM_DESIRE: @ 81D52CB end Move_DOOM_DESIRE_Activate: @ 81D532F - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(31, 31, 31) waitforvisualfinish delay 10 @@ -9587,7 +9585,7 @@ Move_DOOM_DESIRE_Activate: @ 81D532F end Move_SKY_UPPERCUT: @ 81D53ED - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 fadetobg BG_SEISMICTOSS_SKUUPPERCUT @@ -9644,9 +9642,9 @@ Move_SECRET_POWER: @ 81D54E6 goto Move_SLAM Move_TWISTER: @ 81D553A - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 playsewithpan SE_W239, 63 @@ -9690,9 +9688,9 @@ Move_TWISTER: @ 81D553A end Move_MAGICAL_LEAF: @ 81D5699 - loadspritegfx ANIM_TAG_063 - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 delay 1 @@ -9734,8 +9732,8 @@ Move_MAGICAL_LEAF: @ 81D5699 end Move_ICE_BALL: @ 81D57BA - loadspritegfx ANIM_TAG_043 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CHUNK + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_CountIceBallThrows, 5, 0 jumpargeq 0, 4, _81D5831 _81D57D1: @@ -9824,7 +9822,7 @@ _81D597D: return Move_WEATHER_BALL: @ 81D5989 - loadspritegfx ANIM_TAG_283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_BANK_ATTACKER delay 8 playsewithpan SE_W207, 192 @@ -9842,7 +9840,7 @@ Move_WEATHER_BALL: @ 81D5989 jumpargeq 7, 3, _81D5AF9 jumpargeq 7, 4, _81D5B99 _81D59F4: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBattleAnimSpriteTemplate_83930C0, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, 63 @@ -9851,7 +9849,7 @@ _81D59F4: waitforvisualfinish end _81D5A31: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gBattleAnimSpriteTemplate_83D96AC, 130, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, 63 delay 10 @@ -9866,7 +9864,7 @@ _81D5A31: waitforvisualfinish end _81D5A95: - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gBattleAnimSpriteTemplate_83D9438, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, 63 delay 8 @@ -9881,7 +9879,7 @@ _81D5A95: waitforvisualfinish end _81D5AF9: - loadspritegfx ANIM_TAG_058 + loadspritegfx ANIM_TAG_ROCKS createsprite gBattleAnimSpriteTemplate_83DAE30, 130, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, 63 delay 5 @@ -9900,8 +9898,8 @@ _81D5AF9: waitforvisualfinish end _81D5B99: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallHailSpriteTemplate, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, 63 delay 10 @@ -9918,7 +9916,7 @@ _81D5B99: end PoundCopy: @ 81D5C05 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10222,12 +10220,12 @@ StatusCondition_Poison: @ 81D6270 end StatusCondition_Confusion: @ 81D629B - loadspritegfx ANIM_TAG_073 + loadspritegfx ANIM_TAG_DUCK call ConfusionEffect end StatusCondition_Burn: @ 81D62A4 - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, 63 call _81D62BC call _81D62BC @@ -10240,7 +10238,7 @@ _81D62BC: return StatusCondition_Love: @ 81D62D4 - loadspritegfx ANIM_TAG_210 + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, 192 createsprite gBattleAnimSpriteTemplate_83D7A80, 3, 0, 20 delay 15 @@ -10252,7 +10250,7 @@ StatusCondition_Love: @ 81D62D4 end StatusCondition_Sleep: @ 81D6309 - loadspritegfx ANIM_TAG_228 + loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, 192 createsprite gBattleAnimSpriteTemplate_83D6D94, 2, 4, -10, 16, 0, 0 delay 30 @@ -10260,14 +10258,14 @@ StatusCondition_Sleep: @ 81D6309 end StatusCondition_Paralysis: @ 81D6335 - loadspritegfx ANIM_TAG_011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_BANK_ATTACKER, 1, 0, 10, 1 call ElectricityEffect end StatusCondition_Ice: @ 81D634F playsewithpan SE_W196, 0 - loadspritegfx ANIM_TAG_010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 waitplaysewithpan SE_W258, 63, 17 @@ -10277,7 +10275,7 @@ StatusCondition_Ice: @ 81D634F end StatusCondition_Curse: @ 81D636A - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W171, 63 createsprite gBattleAnimSpriteTemplate_83DAF38, 130 @@ -10287,7 +10285,7 @@ StatusCondition_Curse: @ 81D636A end StatusCondition_Nightmare: @ 81D638F - loadspritegfx ANIM_TAG_221 + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_BANK_DEF_PARTNER playsewithpan SE_W171, 63 createsprite gBattleAnimSpriteTemplate_83DAF50, 130 @@ -10348,7 +10346,7 @@ General_PokeblockThrow: @ 81D6438 end General_ItemKnockoff: @ 81D647E - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createsprite gBattleAnimSpriteTemplate_83D6734, 130 end @@ -10360,7 +10358,7 @@ General_TurnTrap: @ 81D6489 jumpargeq 0, 4, _81D65D3 goto _81D64B5 _81D64B5: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 2 createsprite gBattleAnimSpriteTemplate_83D65A0, 132, 0, 16, 0, 1 delay 7 @@ -10373,7 +10371,7 @@ _81D64B5: waitforvisualfinish end _81D64FD: - loadspritegfx ANIM_TAG_029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call _81C90BF @@ -10382,7 +10380,7 @@ _81D64FD: stopsound end _81D6522: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_BANK_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 @@ -10399,8 +10397,8 @@ _81D6522: clearmonbg ANIM_BANK_DEF_PARTNER end _81D6576: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W011, 63 @@ -10415,7 +10413,7 @@ _81D6576: waitforvisualfinish end _81D65D3: - loadspritegfx ANIM_TAG_074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, 0, 4, 2, 0, 7, rgb(19, 17, 0) createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 playsewithpan SE_W328, 63 @@ -10428,8 +10426,8 @@ _81D65D3: end General_ItemEffect: @ 81D661C - loadspritegfx ANIM_TAG_203 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, 192 createvisualtask sub_80A8EFC, 2, 16, 128, 0, 2 @@ -10450,7 +10448,7 @@ General_ItemEffect: @ 81D661C end General_SmokeballEscape: @ 81D6690 - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_BANK_ATTACKER setalpha 12, 4 delay 0 @@ -10500,7 +10498,7 @@ General_HangedOn: @ 81D676E end General_Rain: @ 81D67BB - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 createvisualtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 waitforvisualfinish @@ -10527,7 +10525,7 @@ General_LeechSeedDrain: @ 81D6813 goto Move_ABSORB General_MonHit: @ 81D6821 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_BANK_TARGET setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10539,7 +10537,7 @@ General_MonHit: @ 81D6821 end General_ItemSteal: @ 81D6852 - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80E42D0, 2 createvisualtask sub_8141808, 2 delay 1 @@ -10547,7 +10545,7 @@ General_ItemSteal: @ 81D6852 end General_SnatchMove: @ 81D6877 - loadspritegfx ANIM_TAG_224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80E4234, 2 call Unknown_81D6AB6 delay 1 @@ -10591,7 +10589,7 @@ General_FutureSightHit: @ 81D68D5 General_DoomDesireHit: @ 81D6934 createvisualtask sub_80E42B0, 2 - loadspritegfx ANIM_TAG_198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 16, rgb(31, 31, 31) waitforvisualfinish delay 10 @@ -10624,7 +10622,7 @@ General_DoomDesireHit: @ 81D6934 end General_FocusPunchSetUp: @ 81D69F9 - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call EndureFlamesAnim delay 8 @@ -10637,8 +10635,8 @@ General_FocusPunchSetUp: @ 81D69F9 end General_IngrainHeal: @ 81D6A39 - loadspritegfx ANIM_TAG_147 - loadspritegfx ANIM_TAG_031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 4, rgb(13, 31, 12) @@ -10656,8 +10654,8 @@ General_IngrainHeal: @ 81D6A39 end General_WishHeal: @ 81D6A7C - loadspritegfx ANIM_TAG_031 - loadspritegfx ANIM_TAG_049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, rgb(0, 0, 0) waitforvisualfinish playsewithpan SE_W025, 192 @@ -10723,7 +10721,7 @@ _81D6B5C: createvisualtask sub_813F9B8, 2 end _81D6B65: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_BANK_DEF_PARTNER setalpha 12, 8 diff --git a/include/battle_anim.h b/include/battle_anim.h index e3a3bd7b1..d355d9954 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLEANIM_H #define GUARD_BATTLEANIM_H +#include "constants/battle_anim.h" + #include "sprite.h" #define REG_BGnCNT_BITFIELD(n) (*(vBgCnt *)REG_ADDR_BG##n##CNT) diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 1eff19bc2..687ff15d5 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -10,307 +10,295 @@ // Particle ids. #define ANIM_SPRITES_START 10000 -#define ANIM_TAG_000 (ANIM_SPRITES_START + 0) -#define ANIM_TAG_001 (ANIM_SPRITES_START + 1) -#define ANIM_TAG_002 (ANIM_SPRITES_START + 2) -#define ANIM_TAG_003 (ANIM_SPRITES_START + 3) -#define ANIM_TAG_004 (ANIM_SPRITES_START + 4) -#define ANIM_TAG_005 (ANIM_SPRITES_START + 5) -#define ANIM_TAG_006 (ANIM_SPRITES_START + 6) -#define ANIM_TAG_007 (ANIM_SPRITES_START + 7) -#define ANIM_TAG_008 (ANIM_SPRITES_START + 8) -#define ANIM_TAG_009 (ANIM_SPRITES_START + 9) -#define ANIM_TAG_010 (ANIM_SPRITES_START + 10) -#define ANIM_TAG_011 (ANIM_SPRITES_START + 11) -#define ANIM_TAG_012 (ANIM_SPRITES_START + 12) -#define ANIM_TAG_013 (ANIM_SPRITES_START + 13) -#define ANIM_TAG_014 (ANIM_SPRITES_START + 14) -#define ANIM_TAG_015 (ANIM_SPRITES_START + 15) -#define ANIM_TAG_016 (ANIM_SPRITES_START + 16) -#define ANIM_TAG_017 (ANIM_SPRITES_START + 17) -#define ANIM_TAG_018 (ANIM_SPRITES_START + 18) -#define ANIM_TAG_019 (ANIM_SPRITES_START + 19) -#define ANIM_TAG_020 (ANIM_SPRITES_START + 20) -#define ANIM_TAG_021 (ANIM_SPRITES_START + 21) -#define ANIM_TAG_022 (ANIM_SPRITES_START + 22) -#define ANIM_TAG_023 (ANIM_SPRITES_START + 23) -#define ANIM_TAG_024 (ANIM_SPRITES_START + 24) -#define ANIM_TAG_025 (ANIM_SPRITES_START + 25) -#define ANIM_TAG_026 (ANIM_SPRITES_START + 26) -#define ANIM_TAG_027 (ANIM_SPRITES_START + 27) -#define ANIM_TAG_028 (ANIM_SPRITES_START + 28) -#define ANIM_TAG_029 (ANIM_SPRITES_START + 29) -#define ANIM_TAG_030 (ANIM_SPRITES_START + 30) -#define ANIM_TAG_031 (ANIM_SPRITES_START + 31) -#define ANIM_TAG_032 (ANIM_SPRITES_START + 32) -#define ANIM_TAG_033 (ANIM_SPRITES_START + 33) -#define ANIM_TAG_034 (ANIM_SPRITES_START + 34) -#define ANIM_TAG_035 (ANIM_SPRITES_START + 35) -#define ANIM_TAG_036 (ANIM_SPRITES_START + 36) -#define ANIM_TAG_037 (ANIM_SPRITES_START + 37) -#define ANIM_TAG_038 (ANIM_SPRITES_START + 38) -#define ANIM_TAG_039 (ANIM_SPRITES_START + 39) -#define ANIM_TAG_040 (ANIM_SPRITES_START + 40) -#define ANIM_TAG_041 (ANIM_SPRITES_START + 41) -#define ANIM_TAG_042 (ANIM_SPRITES_START + 42) -#define ANIM_TAG_043 (ANIM_SPRITES_START + 43) -#define ANIM_TAG_044 (ANIM_SPRITES_START + 44) -#define ANIM_TAG_045 (ANIM_SPRITES_START + 45) -#define ANIM_TAG_046 (ANIM_SPRITES_START + 46) -#define ANIM_TAG_047 (ANIM_SPRITES_START + 47) -#define ANIM_TAG_048 (ANIM_SPRITES_START + 48) -#define ANIM_TAG_049 (ANIM_SPRITES_START + 49) -#define ANIM_TAG_050 (ANIM_SPRITES_START + 50) -#define ANIM_TAG_051 (ANIM_SPRITES_START + 51) -#define ANIM_TAG_052 (ANIM_SPRITES_START + 52) -#define ANIM_TAG_053 (ANIM_SPRITES_START + 53) -#define ANIM_TAG_054 (ANIM_SPRITES_START + 54) -#define ANIM_TAG_055 (ANIM_SPRITES_START + 55) -#define ANIM_TAG_056 (ANIM_SPRITES_START + 56) -#define ANIM_TAG_057 (ANIM_SPRITES_START + 57) -#define ANIM_TAG_058 (ANIM_SPRITES_START + 58) -#define ANIM_TAG_059 (ANIM_SPRITES_START + 59) -#define ANIM_TAG_060 (ANIM_SPRITES_START + 60) -#define ANIM_TAG_061 (ANIM_SPRITES_START + 61) -#define ANIM_TAG_062 (ANIM_SPRITES_START + 62) -#define ANIM_TAG_063 (ANIM_SPRITES_START + 63) -#define ANIM_TAG_064 (ANIM_SPRITES_START + 64) -#define ANIM_TAG_065 (ANIM_SPRITES_START + 65) -#define ANIM_TAG_066 (ANIM_SPRITES_START + 66) -#define ANIM_TAG_067 (ANIM_SPRITES_START + 67) -#define ANIM_TAG_068 (ANIM_SPRITES_START + 68) -#define ANIM_TAG_069 (ANIM_SPRITES_START + 69) -#define ANIM_TAG_070 (ANIM_SPRITES_START + 70) -#define ANIM_TAG_071 (ANIM_SPRITES_START + 71) -#define ANIM_TAG_072 (ANIM_SPRITES_START + 72) -#define ANIM_TAG_073 (ANIM_SPRITES_START + 73) -#define ANIM_TAG_074 (ANIM_SPRITES_START + 74) -#define ANIM_TAG_075 (ANIM_SPRITES_START + 75) -#define ANIM_TAG_076 (ANIM_SPRITES_START + 76) -#define ANIM_TAG_077 (ANIM_SPRITES_START + 77) -#define ANIM_TAG_078 (ANIM_SPRITES_START + 78) -#define ANIM_TAG_079 (ANIM_SPRITES_START + 79) -#define ANIM_TAG_080 (ANIM_SPRITES_START + 80) -#define ANIM_TAG_081 (ANIM_SPRITES_START + 81) -#define ANIM_TAG_082 (ANIM_SPRITES_START + 82) -#define ANIM_TAG_083 (ANIM_SPRITES_START + 83) -#define ANIM_TAG_084 (ANIM_SPRITES_START + 84) -#define ANIM_TAG_085 (ANIM_SPRITES_START + 85) -#define ANIM_TAG_086 (ANIM_SPRITES_START + 86) -#define ANIM_TAG_087 (ANIM_SPRITES_START + 87) -#define ANIM_TAG_088 (ANIM_SPRITES_START + 88) -#define ANIM_TAG_089 (ANIM_SPRITES_START + 89) -#define ANIM_TAG_090 (ANIM_SPRITES_START + 90) -#define ANIM_TAG_091 (ANIM_SPRITES_START + 91) -#define ANIM_TAG_092 (ANIM_SPRITES_START + 92) -#define ANIM_TAG_093 (ANIM_SPRITES_START + 93) -#define ANIM_TAG_094 (ANIM_SPRITES_START + 94) -#define ANIM_TAG_095 (ANIM_SPRITES_START + 95) -#define ANIM_TAG_096 (ANIM_SPRITES_START + 96) -#define ANIM_TAG_097 (ANIM_SPRITES_START + 97) -#define ANIM_TAG_098 (ANIM_SPRITES_START + 98) -#define ANIM_TAG_099 (ANIM_SPRITES_START + 99) -#define ANIM_TAG_100 (ANIM_SPRITES_START + 100) -#define ANIM_TAG_101 (ANIM_SPRITES_START + 101) -#define ANIM_TAG_102 (ANIM_SPRITES_START + 102) -#define ANIM_TAG_103 (ANIM_SPRITES_START + 103) -#define ANIM_TAG_104 (ANIM_SPRITES_START + 104) -#define ANIM_TAG_105 (ANIM_SPRITES_START + 105) -#define ANIM_TAG_106 (ANIM_SPRITES_START + 106) -#define ANIM_TAG_107 (ANIM_SPRITES_START + 107) -#define ANIM_TAG_108 (ANIM_SPRITES_START + 108) -#define ANIM_TAG_109 (ANIM_SPRITES_START + 109) -#define ANIM_TAG_110 (ANIM_SPRITES_START + 110) -#define ANIM_TAG_111 (ANIM_SPRITES_START + 111) -#define ANIM_TAG_112 (ANIM_SPRITES_START + 112) -#define ANIM_TAG_113 (ANIM_SPRITES_START + 113) -#define ANIM_TAG_114 (ANIM_SPRITES_START + 114) -#define ANIM_TAG_115 (ANIM_SPRITES_START + 115) -#define ANIM_TAG_116 (ANIM_SPRITES_START + 116) -#define ANIM_TAG_117 (ANIM_SPRITES_START + 117) -#define ANIM_TAG_118 (ANIM_SPRITES_START + 118) -#define ANIM_TAG_119 (ANIM_SPRITES_START + 119) -#define ANIM_TAG_120 (ANIM_SPRITES_START + 120) -#define ANIM_TAG_121 (ANIM_SPRITES_START + 121) -#define ANIM_TAG_122 (ANIM_SPRITES_START + 122) -#define ANIM_TAG_123 (ANIM_SPRITES_START + 123) -#define ANIM_TAG_124 (ANIM_SPRITES_START + 124) -#define ANIM_TAG_125 (ANIM_SPRITES_START + 125) -#define ANIM_TAG_126 (ANIM_SPRITES_START + 126) -#define ANIM_TAG_127 (ANIM_SPRITES_START + 127) -#define ANIM_TAG_128 (ANIM_SPRITES_START + 128) -#define ANIM_TAG_129 (ANIM_SPRITES_START + 129) -#define ANIM_TAG_130 (ANIM_SPRITES_START + 130) -#define ANIM_TAG_131 (ANIM_SPRITES_START + 131) -#define ANIM_TAG_132 (ANIM_SPRITES_START + 132) -#define ANIM_TAG_133 (ANIM_SPRITES_START + 133) -#define ANIM_TAG_134 (ANIM_SPRITES_START + 134) -#define ANIM_TAG_135 (ANIM_SPRITES_START + 135) -#define ANIM_TAG_136 (ANIM_SPRITES_START + 136) -#define ANIM_TAG_137 (ANIM_SPRITES_START + 137) -#define ANIM_TAG_138 (ANIM_SPRITES_START + 138) -#define ANIM_TAG_139 (ANIM_SPRITES_START + 139) -#define ANIM_TAG_140 (ANIM_SPRITES_START + 140) -#define ANIM_TAG_141 (ANIM_SPRITES_START + 141) -#define ANIM_TAG_142 (ANIM_SPRITES_START + 142) -#define ANIM_TAG_143 (ANIM_SPRITES_START + 143) -#define ANIM_TAG_144 (ANIM_SPRITES_START + 144) -#define ANIM_TAG_145 (ANIM_SPRITES_START + 145) -#define ANIM_TAG_146 (ANIM_SPRITES_START + 146) -#define ANIM_TAG_147 (ANIM_SPRITES_START + 147) -#define ANIM_TAG_148 (ANIM_SPRITES_START + 148) -#define ANIM_TAG_149 (ANIM_SPRITES_START + 149) -#define ANIM_TAG_150 (ANIM_SPRITES_START + 150) -#define ANIM_TAG_151 (ANIM_SPRITES_START + 151) -#define ANIM_TAG_152 (ANIM_SPRITES_START + 152) -#define ANIM_TAG_153 (ANIM_SPRITES_START + 153) -#define ANIM_TAG_154 (ANIM_SPRITES_START + 154) -#define ANIM_TAG_155 (ANIM_SPRITES_START + 155) -#define ANIM_TAG_156 (ANIM_SPRITES_START + 156) -#define ANIM_TAG_157 (ANIM_SPRITES_START + 157) -#define ANIM_TAG_158 (ANIM_SPRITES_START + 158) -#define ANIM_TAG_159 (ANIM_SPRITES_START + 159) -#define ANIM_TAG_160 (ANIM_SPRITES_START + 160) -#define ANIM_TAG_161 (ANIM_SPRITES_START + 161) -#define ANIM_TAG_162 (ANIM_SPRITES_START + 162) -#define ANIM_TAG_163 (ANIM_SPRITES_START + 163) -#define ANIM_TAG_164 (ANIM_SPRITES_START + 164) -#define ANIM_TAG_165 (ANIM_SPRITES_START + 165) -#define ANIM_TAG_166 (ANIM_SPRITES_START + 166) -#define ANIM_TAG_167 (ANIM_SPRITES_START + 167) -#define ANIM_TAG_168 (ANIM_SPRITES_START + 168) -#define ANIM_TAG_169 (ANIM_SPRITES_START + 169) -#define ANIM_TAG_170 (ANIM_SPRITES_START + 170) -#define ANIM_TAG_171 (ANIM_SPRITES_START + 171) -#define ANIM_TAG_172 (ANIM_SPRITES_START + 172) -#define ANIM_TAG_173 (ANIM_SPRITES_START + 173) -#define ANIM_TAG_174 (ANIM_SPRITES_START + 174) -#define ANIM_TAG_175 (ANIM_SPRITES_START + 175) -#define ANIM_TAG_176 (ANIM_SPRITES_START + 176) -#define ANIM_TAG_177 (ANIM_SPRITES_START + 177) -#define ANIM_TAG_178 (ANIM_SPRITES_START + 178) -#define ANIM_TAG_179 (ANIM_SPRITES_START + 179) -#define ANIM_TAG_180 (ANIM_SPRITES_START + 180) -#define ANIM_TAG_181 (ANIM_SPRITES_START + 181) -#define ANIM_TAG_182 (ANIM_SPRITES_START + 182) -#define ANIM_TAG_183 (ANIM_SPRITES_START + 183) -#define ANIM_TAG_184 (ANIM_SPRITES_START + 184) -#define ANIM_TAG_185 (ANIM_SPRITES_START + 185) -#define ANIM_TAG_186 (ANIM_SPRITES_START + 186) -#define ANIM_TAG_187 (ANIM_SPRITES_START + 187) -#define ANIM_TAG_188 (ANIM_SPRITES_START + 188) -#define ANIM_TAG_189 (ANIM_SPRITES_START + 189) -#define ANIM_TAG_190 (ANIM_SPRITES_START + 190) -#define ANIM_TAG_191 (ANIM_SPRITES_START + 191) -#define ANIM_TAG_192 (ANIM_SPRITES_START + 192) -#define ANIM_TAG_193 (ANIM_SPRITES_START + 193) -#define ANIM_TAG_194 (ANIM_SPRITES_START + 194) -#define ANIM_TAG_195 (ANIM_SPRITES_START + 195) -#define ANIM_TAG_196 (ANIM_SPRITES_START + 196) -#define ANIM_TAG_197 (ANIM_SPRITES_START + 197) -#define ANIM_TAG_198 (ANIM_SPRITES_START + 198) -#define ANIM_TAG_199 (ANIM_SPRITES_START + 199) -#define ANIM_TAG_200 (ANIM_SPRITES_START + 200) -#define ANIM_TAG_201 (ANIM_SPRITES_START + 201) -#define ANIM_TAG_202 (ANIM_SPRITES_START + 202) -#define ANIM_TAG_203 (ANIM_SPRITES_START + 203) -#define ANIM_TAG_204 (ANIM_SPRITES_START + 204) -#define ANIM_TAG_205 (ANIM_SPRITES_START + 205) -#define ANIM_TAG_206 (ANIM_SPRITES_START + 206) -#define ANIM_TAG_207 (ANIM_SPRITES_START + 207) -#define ANIM_TAG_208 (ANIM_SPRITES_START + 208) -#define ANIM_TAG_209 (ANIM_SPRITES_START + 209) -#define ANIM_TAG_210 (ANIM_SPRITES_START + 210) -#define ANIM_TAG_211 (ANIM_SPRITES_START + 211) -#define ANIM_TAG_212 (ANIM_SPRITES_START + 212) -#define ANIM_TAG_213 (ANIM_SPRITES_START + 213) -#define ANIM_TAG_214 (ANIM_SPRITES_START + 214) -#define ANIM_TAG_215 (ANIM_SPRITES_START + 215) -#define ANIM_TAG_216 (ANIM_SPRITES_START + 216) -#define ANIM_TAG_217 (ANIM_SPRITES_START + 217) -#define ANIM_TAG_218 (ANIM_SPRITES_START + 218) -#define ANIM_TAG_219 (ANIM_SPRITES_START + 219) -#define ANIM_TAG_220 (ANIM_SPRITES_START + 220) -#define ANIM_TAG_221 (ANIM_SPRITES_START + 221) -#define ANIM_TAG_222 (ANIM_SPRITES_START + 222) -#define ANIM_TAG_223 (ANIM_SPRITES_START + 223) -#define ANIM_TAG_224 (ANIM_SPRITES_START + 224) -#define ANIM_TAG_225 (ANIM_SPRITES_START + 225) -#define ANIM_TAG_226 (ANIM_SPRITES_START + 226) -#define ANIM_TAG_227 (ANIM_SPRITES_START + 227) -#define ANIM_TAG_228 (ANIM_SPRITES_START + 228) -#define ANIM_TAG_229 (ANIM_SPRITES_START + 229) -#define ANIM_TAG_230 (ANIM_SPRITES_START + 230) -#define ANIM_TAG_231 (ANIM_SPRITES_START + 231) -#define ANIM_TAG_232 (ANIM_SPRITES_START + 232) -#define ANIM_TAG_233 (ANIM_SPRITES_START + 233) -#define ANIM_TAG_234 (ANIM_SPRITES_START + 234) -#define ANIM_TAG_235 (ANIM_SPRITES_START + 235) -#define ANIM_TAG_236 (ANIM_SPRITES_START + 236) -#define ANIM_TAG_237 (ANIM_SPRITES_START + 237) -#define ANIM_TAG_238 (ANIM_SPRITES_START + 238) -#define ANIM_TAG_239 (ANIM_SPRITES_START + 239) -#define ANIM_TAG_240 (ANIM_SPRITES_START + 240) -#define ANIM_TAG_241 (ANIM_SPRITES_START + 241) -#define ANIM_TAG_242 (ANIM_SPRITES_START + 242) -#define ANIM_TAG_243 (ANIM_SPRITES_START + 243) -#define ANIM_TAG_244 (ANIM_SPRITES_START + 244) -#define ANIM_TAG_245 (ANIM_SPRITES_START + 245) -#define ANIM_TAG_246 (ANIM_SPRITES_START + 246) -#define ANIM_TAG_247 (ANIM_SPRITES_START + 247) -#define ANIM_TAG_248 (ANIM_SPRITES_START + 248) -#define ANIM_TAG_249 (ANIM_SPRITES_START + 249) -#define ANIM_TAG_250 (ANIM_SPRITES_START + 250) -#define ANIM_TAG_251 (ANIM_SPRITES_START + 251) -#define ANIM_TAG_252 (ANIM_SPRITES_START + 252) -#define ANIM_TAG_253 (ANIM_SPRITES_START + 253) -#define ANIM_TAG_254 (ANIM_SPRITES_START + 254) -#define ANIM_TAG_255 (ANIM_SPRITES_START + 255) -#define ANIM_TAG_256 (ANIM_SPRITES_START + 256) -#define ANIM_TAG_257 (ANIM_SPRITES_START + 257) -#define ANIM_TAG_258 (ANIM_SPRITES_START + 258) -#define ANIM_TAG_259 (ANIM_SPRITES_START + 259) -#define ANIM_TAG_260 (ANIM_SPRITES_START + 260) -#define ANIM_TAG_261 (ANIM_SPRITES_START + 261) -#define ANIM_TAG_262 (ANIM_SPRITES_START + 262) -#define ANIM_TAG_263 (ANIM_SPRITES_START + 263) -#define ANIM_TAG_264 (ANIM_SPRITES_START + 264) -#define ANIM_TAG_265 (ANIM_SPRITES_START + 265) -#define ANIM_TAG_266 (ANIM_SPRITES_START + 266) -#define ANIM_TAG_267 (ANIM_SPRITES_START + 267) -#define ANIM_TAG_268 (ANIM_SPRITES_START + 268) -#define ANIM_TAG_269 (ANIM_SPRITES_START + 269) -#define ANIM_TAG_270 (ANIM_SPRITES_START + 270) -#define ANIM_TAG_271 (ANIM_SPRITES_START + 271) -#define ANIM_TAG_272 (ANIM_SPRITES_START + 272) -#define ANIM_TAG_273 (ANIM_SPRITES_START + 273) -#define ANIM_TAG_274 (ANIM_SPRITES_START + 274) -#define ANIM_TAG_275 (ANIM_SPRITES_START + 275) -#define ANIM_TAG_276 (ANIM_SPRITES_START + 276) -#define ANIM_TAG_277 (ANIM_SPRITES_START + 277) -#define ANIM_TAG_278 (ANIM_SPRITES_START + 278) -#define ANIM_TAG_279 (ANIM_SPRITES_START + 279) -#define ANIM_TAG_280 (ANIM_SPRITES_START + 280) -#define ANIM_TAG_281 (ANIM_SPRITES_START + 281) -#define ANIM_TAG_282 (ANIM_SPRITES_START + 282) -#define ANIM_TAG_283 (ANIM_SPRITES_START + 283) -#define ANIM_TAG_284 (ANIM_SPRITES_START + 284) -#define ANIM_TAG_285 (ANIM_SPRITES_START + 285) -#define ANIM_TAG_286 (ANIM_SPRITES_START + 286) -#define ANIM_TAG_287 (ANIM_SPRITES_START + 287) -#define ANIM_TAG_288 (ANIM_SPRITES_START + 288) - -// nothing beyond here? -#define ANIM_TAG_289 (ANIM_SPRITES_START + 289) -#define ANIM_TAG_290 (ANIM_SPRITES_START + 290) -#define ANIM_TAG_291 (ANIM_SPRITES_START + 291) -#define ANIM_TAG_292 (ANIM_SPRITES_START + 292) -#define ANIM_TAG_293 (ANIM_SPRITES_START + 293) -#define ANIM_TAG_294 (ANIM_SPRITES_START + 294) -#define ANIM_TAG_295 (ANIM_SPRITES_START + 295) -#define ANIM_TAG_296 (ANIM_SPRITES_START + 296) -#define ANIM_TAG_297 (ANIM_SPRITES_START + 297) -#define ANIM_TAG_298 (ANIM_SPRITES_START + 298) +#define ANIM_TAG_BONE (ANIM_SPRITES_START + 0) +#define ANIM_TAG_SPARK (ANIM_SPRITES_START + 1) +#define ANIM_TAG_PENCIL (ANIM_SPRITES_START + 2) +#define ANIM_TAG_AIR_WAVE (ANIM_SPRITES_START + 3) +#define ANIM_TAG_UNUSED_ORB (ANIM_SPRITES_START + 4) +#define ANIM_TAG_SWORD (ANIM_SPRITES_START + 5) +#define ANIM_TAG_SEED (ANIM_SPRITES_START + 6) +#define ANIM_TAG_UNUSED_EXPLOSION (ANIM_SPRITES_START + 7) +#define ANIM_TAG_UNUSED_PINK_ORB (ANIM_SPRITES_START + 8) +#define ANIM_TAG_GUST (ANIM_SPRITES_START + 9) +#define ANIM_TAG_ICE_CUBE (ANIM_SPRITES_START + 10) +#define ANIM_TAG_SPARK_2 (ANIM_SPRITES_START + 11) +#define ANIM_TAG_UNUSED_ORANGE (ANIM_SPRITES_START + 12) +#define ANIM_TAG_YELLOW_BALL (ANIM_SPRITES_START + 13) +#define ANIM_TAG_LOCK_ON (ANIM_SPRITES_START + 14) +#define ANIM_TAG_TIED_BAG (ANIM_SPRITES_START + 15) +#define ANIM_TAG_BLACK_SMOKE (ANIM_SPRITES_START + 16) +#define ANIM_TAG_BLACK_BALL (ANIM_SPRITES_START + 17) +#define ANIM_TAG_CONVERSION (ANIM_SPRITES_START + 18) +#define ANIM_TAG_UNUSED_GLASS (ANIM_SPRITES_START + 19) +#define ANIM_TAG_HORN_HIT (ANIM_SPRITES_START + 20) +#define ANIM_TAG_UNUSED_HIT (ANIM_SPRITES_START + 21) +#define ANIM_TAG_UNUSED_HIT_2 (ANIM_SPRITES_START + 22) +#define ANIM_TAG_UNUSED_BLUE_SHARDS (ANIM_SPRITES_START + 23) +#define ANIM_TAG_UNUSED_CLOSING_EYE (ANIM_SPRITES_START + 24) +#define ANIM_TAG_UNUSED_WAVING_HAND (ANIM_SPRITES_START + 25) +#define ANIM_TAG_UNUSED_HIT_DUPLICATE (ANIM_SPRITES_START + 26) +#define ANIM_TAG_LEER (ANIM_SPRITES_START + 27) +#define ANIM_TAG_UNUSED_BLUE_BURST (ANIM_SPRITES_START + 28) +#define ANIM_TAG_SMALL_EMBER (ANIM_SPRITES_START + 29) +#define ANIM_TAG_GRAY_SMOKE (ANIM_SPRITES_START + 30) +#define ANIM_TAG_BLUE_STAR (ANIM_SPRITES_START + 31) +#define ANIM_TAG_UNUSED_BUBBLE_BURST (ANIM_SPRITES_START + 32) +#define ANIM_TAG_FIRE (ANIM_SPRITES_START + 33) +#define ANIM_TAG_UNUSED_SPINNING_FIRE (ANIM_SPRITES_START + 34) +#define ANIM_TAG_FIRE_PLUME (ANIM_SPRITES_START + 35) +#define ANIM_TAG_UNUSED_LIGHTNING (ANIM_SPRITES_START + 36) +#define ANIM_TAG_LIGHTNING (ANIM_SPRITES_START + 37) +#define ANIM_TAG_UNUSED_CLAW_SLASH (ANIM_SPRITES_START + 38) +#define ANIM_TAG_CLAW_SLASH (ANIM_SPRITES_START + 39) +#define ANIM_TAG_UNUSED_SCRATCH (ANIM_SPRITES_START + 40) +#define ANIM_TAG_UNUSED_SCRATCH_2 (ANIM_SPRITES_START + 41) +#define ANIM_TAG_UNUSED_BUBBLE_BURST_2 (ANIM_SPRITES_START + 42) +#define ANIM_TAG_ICE_CHUNK (ANIM_SPRITES_START + 43) +#define ANIM_TAG_UNUSED_GLASS_2 (ANIM_SPRITES_START + 44) +#define ANIM_TAG_UNUSED_PINK_HEART (ANIM_SPRITES_START + 45) +#define ANIM_TAG_UNUSED_SAP_DRIP (ANIM_SPRITES_START + 46) +#define ANIM_TAG_UNUSED_SAP_DRIP_2 (ANIM_SPRITES_START + 47) +#define ANIM_TAG_SPARKLE_1 (ANIM_SPRITES_START + 48) +#define ANIM_TAG_SPARKLE_2 (ANIM_SPRITES_START + 49) +#define ANIM_TAG_HUMANOID_FOOT (ANIM_SPRITES_START + 50) +#define ANIM_TAG_UNUSED_MONSTER_FOOT (ANIM_SPRITES_START + 51) +#define ANIM_TAG_UNUSED_HUMANOID_HAND (ANIM_SPRITES_START + 52) +#define ANIM_TAG_NOISE_LINE (ANIM_SPRITES_START + 53) +#define ANIM_TAG_UNUSED_YELLOW_UNK (ANIM_SPRITES_START + 54) +#define ANIM_TAG_UNUSED_RED_FIST (ANIM_SPRITES_START + 55) +#define ANIM_TAG_SLAM_HIT (ANIM_SPRITES_START + 56) +#define ANIM_TAG_UNUSED_RING (ANIM_SPRITES_START + 57) +#define ANIM_TAG_ROCKS (ANIM_SPRITES_START + 58) +#define ANIM_TAG_UNUSED_Z (ANIM_SPRITES_START + 59) +#define ANIM_TAG_UNUSED_YELLOW_UNK_2 (ANIM_SPRITES_START + 60) +#define ANIM_TAG_UNUSED_AIR_SLASH (ANIM_SPRITES_START + 61) +#define ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS (ANIM_SPRITES_START + 62) +#define ANIM_TAG_LEAF (ANIM_SPRITES_START + 63) +#define ANIM_TAG_FINGER (ANIM_SPRITES_START + 64) +#define ANIM_TAG_POISON_POWDER (ANIM_SPRITES_START + 65) +#define ANIM_TAG_UNUSED_BROWN_TRIANGLE (ANIM_SPRITES_START + 66) +#define ANIM_TAG_SLEEP_POWDER (ANIM_SPRITES_START + 67) +#define ANIM_TAG_STUN_SPORE (ANIM_SPRITES_START + 68) +#define ANIM_TAG_UNUSED_POWDER (ANIM_SPRITES_START + 69) +#define ANIM_TAG_SPARKLE_3 (ANIM_SPRITES_START + 70) +#define ANIM_TAG_SPARKLE_4 (ANIM_SPRITES_START + 71) +#define ANIM_TAG_MUSIC_NOTES (ANIM_SPRITES_START + 72) +#define ANIM_TAG_DUCK (ANIM_SPRITES_START + 73) +#define ANIM_TAG_MUD_SAND (ANIM_SPRITES_START + 74) +#define ANIM_TAG_ALERT (ANIM_SPRITES_START + 75) +#define ANIM_TAG_UNUSED_BLUE_FLAMES (ANIM_SPRITES_START + 76) +#define ANIM_TAG_UNUSED_BLUE_FLAMES_2 (ANIM_SPRITES_START + 77) +#define ANIM_TAG_UNUSED_SHOCK (ANIM_SPRITES_START + 78) +#define ANIM_TAG_SHOCK (ANIM_SPRITES_START + 79) +#define ANIM_TAG_UNUSED_BELL (ANIM_SPRITES_START + 80) +#define ANIM_TAG_UNUSED_PINK_GLOVE (ANIM_SPRITES_START + 81) +#define ANIM_TAG_UNUSED_BLUE_LINES (ANIM_SPRITES_START + 82) +#define ANIM_TAG_UNUSED_IMPACT (ANIM_SPRITES_START + 83) +#define ANIM_TAG_UNUSED_IMPACT_2 (ANIM_SPRITES_START + 84) +#define ANIM_TAG_UNUSED_RETICLE (ANIM_SPRITES_START + 85) +#define ANIM_TAG_BREATH (ANIM_SPRITES_START + 86) +#define ANIM_TAG_ANGER (ANIM_SPRITES_START + 87) +#define ANIM_TAG_UNUSED_SNOWBALL (ANIM_SPRITES_START + 88) +#define ANIM_TAG_UNUSED_VINE (ANIM_SPRITES_START + 89) +#define ANIM_TAG_UNUSED_SWORD (ANIM_SPRITES_START + 90) +#define ANIM_TAG_UNUSED_CLAPPING (ANIM_SPRITES_START + 91) +#define ANIM_TAG_UNUSED_RED_TUBE (ANIM_SPRITES_START + 92) +#define ANIM_TAG_AMNESIA (ANIM_SPRITES_START + 93) +#define ANIM_TAG_UNUSED_STRING (ANIM_SPRITES_START + 94) +#define ANIM_TAG_UNUSED_PENCIL (ANIM_SPRITES_START + 95) +#define ANIM_TAG_UNUSED_PETAL (ANIM_SPRITES_START + 96) +#define ANIM_TAG_BENT_SPOON (ANIM_SPRITES_START + 97) +#define ANIM_TAG_UNUSED_WEB (ANIM_SPRITES_START + 98) +#define ANIM_TAG_MILK_BOTTLE (ANIM_SPRITES_START + 99) +#define ANIM_TAG_COIN (ANIM_SPRITES_START + 100) +#define ANIM_TAG_UNUSED_CRACKED_EGG (ANIM_SPRITES_START + 101) +#define ANIM_TAG_UNUSED_HATCHED_EGG (ANIM_SPRITES_START + 102) +#define ANIM_TAG_UNUSED_FRESH_EGG (ANIM_SPRITES_START + 103) +#define ANIM_TAG_UNUSED_FANGS (ANIM_SPRITES_START + 104) +#define ANIM_TAG_UNUSED_EXPLOSION_2 (ANIM_SPRITES_START + 105) +#define ANIM_TAG_UNUSED_EXPLOSION_3 (ANIM_SPRITES_START + 106) +#define ANIM_TAG_UNUSED_WATER_DROPLET (ANIM_SPRITES_START + 107) +#define ANIM_TAG_UNUSED_WATER_DROPLET_2 (ANIM_SPRITES_START + 108) +#define ANIM_TAG_UNUSED_SEED (ANIM_SPRITES_START + 109) +#define ANIM_TAG_UNUSED_SPROUT (ANIM_SPRITES_START + 110) +#define ANIM_TAG_UNUSED_RED_WAND (ANIM_SPRITES_START + 111) +#define ANIM_TAG_UNUSED_PURPLE_GREEN_UNK (ANIM_SPRITES_START + 112) +#define ANIM_TAG_UNUSED_WATER_COLUMN (ANIM_SPRITES_START + 113) +#define ANIM_TAG_UNUSED_MUD_UNK (ANIM_SPRITES_START + 114) +#define ANIM_TAG_RAIN_DROPS (ANIM_SPRITES_START + 115) +#define ANIM_TAG_UNUSED_FURY_SWIPES (ANIM_SPRITES_START + 116) +#define ANIM_TAG_UNUSED_VINE_2 (ANIM_SPRITES_START + 117) +#define ANIM_TAG_UNUSED_TEETH (ANIM_SPRITES_START + 118) +#define ANIM_TAG_UNUSED_BONE (ANIM_SPRITES_START + 119) +#define ANIM_TAG_UNUSED_WHITE_BAG (ANIM_SPRITES_START + 120) +#define ANIM_TAG_UNUSED_UNKNOWN (ANIM_SPRITES_START + 121) +#define ANIM_TAG_UNUSED_PURPLE_CORAL (ANIM_SPRITES_START + 122) +#define ANIM_TAG_UNUSED_PURPLE_DROPLET (ANIM_SPRITES_START + 123) +#define ANIM_TAG_UNUSED_SHOCK_2 (ANIM_SPRITES_START + 124) +#define ANIM_TAG_UNUSED_CLOSING_EYE_2 (ANIM_SPRITES_START + 125) +#define ANIM_TAG_UNUSED_METAL_BALL (ANIM_SPRITES_START + 126) +#define ANIM_TAG_UNUSED_MONSTER_DOLL (ANIM_SPRITES_START + 127) +#define ANIM_TAG_UNUSED_WHIRLWIND (ANIM_SPRITES_START + 128) +#define ANIM_TAG_UNUSED_WHIRLWIND_2 (ANIM_SPRITES_START + 129) +#define ANIM_TAG_UNUSED_EXPLOSION_4 (ANIM_SPRITES_START + 130) +#define ANIM_TAG_UNUSED_EXPLOSION_5 (ANIM_SPRITES_START + 131) +#define ANIM_TAG_UNUSED_TONGUE (ANIM_SPRITES_START + 132) +#define ANIM_TAG_UNUSED_SMOKE (ANIM_SPRITES_START + 133) +#define ANIM_TAG_UNUSED_SMOKE_2 (ANIM_SPRITES_START + 134) +#define ANIM_TAG_IMPACT (ANIM_SPRITES_START + 135) +#define ANIM_TAG_CIRCLE_IMPACT (ANIM_SPRITES_START + 136) +#define ANIM_TAG_SCRATCH (ANIM_SPRITES_START + 137) +#define ANIM_TAG_CUT (ANIM_SPRITES_START + 138) +#define ANIM_TAG_SHARP_TEETH (ANIM_SPRITES_START + 139) +#define ANIM_TAG_RAINBOW_RINGS (ANIM_SPRITES_START + 140) +#define ANIM_TAG_ICE_CRYSTALS (ANIM_SPRITES_START + 141) +#define ANIM_TAG_ICE_SPIKES (ANIM_SPRITES_START + 142) +#define ANIM_TAG_HANDS_AND_FEET (ANIM_SPRITES_START + 143) +#define ANIM_TAG_MIST_CLOUD (ANIM_SPRITES_START + 144) +#define ANIM_TAG_CLAMP (ANIM_SPRITES_START + 145) +#define ANIM_TAG_BUBBLE (ANIM_SPRITES_START + 146) +#define ANIM_TAG_ORBS (ANIM_SPRITES_START + 147) +#define ANIM_TAG_WATER_IMPACT (ANIM_SPRITES_START + 148) +#define ANIM_TAG_WATER_ORB (ANIM_SPRITES_START + 149) +#define ANIM_TAG_POISON_BUBBLE (ANIM_SPRITES_START + 150) +#define ANIM_TAG_TOXIC_BUBBLE (ANIM_SPRITES_START + 151) +#define ANIM_TAG_SPIKES (ANIM_SPRITES_START + 152) +#define ANIM_TAG_HORN_HIT_2 (ANIM_SPRITES_START + 153) +#define ANIM_TAG_AIR_WAVE_2 (ANIM_SPRITES_START + 154) +#define ANIM_TAG_SMALL_BUBBLES (ANIM_SPRITES_START + 155) +#define ANIM_TAG_ROUND_SHADOW (ANIM_SPRITES_START + 156) +#define ANIM_TAG_SUNLIGHT (ANIM_SPRITES_START + 157) +#define ANIM_TAG_SPORE (ANIM_SPRITES_START + 158) +#define ANIM_TAG_FLOWER (ANIM_SPRITES_START + 159) +#define ANIM_TAG_RAZOR_LEAF (ANIM_SPRITES_START + 160) +#define ANIM_TAG_NEEDLE (ANIM_SPRITES_START + 161) +#define ANIM_TAG_WHIRLWIND_LINES (ANIM_SPRITES_START + 162) +#define ANIM_TAG_GOLD_RING (ANIM_SPRITES_START + 163) +#define ANIM_TAG_PURPLE_RING (ANIM_SPRITES_START + 164) +#define ANIM_TAG_BLUE_RING (ANIM_SPRITES_START + 165) +#define ANIM_TAG_GREEN_LIGHT_WALL (ANIM_SPRITES_START + 166) +#define ANIM_TAG_BLUE_LIGHT_WALL (ANIM_SPRITES_START + 167) +#define ANIM_TAG_RED_LIGHT_WALL (ANIM_SPRITES_START + 168) +#define ANIM_TAG_GRAY_LIGHT_WALL (ANIM_SPRITES_START + 169) +#define ANIM_TAG_ORANGE_LIGHT_WALL (ANIM_SPRITES_START + 170) +#define ANIM_TAG_BLACK_BALL_2 (ANIM_SPRITES_START + 171) +#define ANIM_TAG_PURPLE_GAS_CLOUD (ANIM_SPRITES_START + 172) +#define ANIM_TAG_SPARK_H (ANIM_SPRITES_START + 173) +#define ANIM_TAG_YELLOW_STAR (ANIM_SPRITES_START + 174) +#define ANIM_TAG_LARGE_FRESH_EGG (ANIM_SPRITES_START + 175) +#define ANIM_TAG_SHADOW_BALL (ANIM_SPRITES_START + 176) +#define ANIM_TAG_LICK (ANIM_SPRITES_START + 177) +#define ANIM_TAG_UNUSED_VOID_LINES (ANIM_SPRITES_START + 178) +#define ANIM_TAG_STRING (ANIM_SPRITES_START + 179) +#define ANIM_TAG_STRING_DOT (ANIM_SPRITES_START + 180) +#define ANIM_TAG_WEB (ANIM_SPRITES_START + 181) +#define ANIM_TAG_UNUSED_LIGHTBULB (ANIM_SPRITES_START + 182) +#define ANIM_TAG_SLASH (ANIM_SPRITES_START + 183) +#define ANIM_TAG_FOCUS_ENERGY (ANIM_SPRITES_START + 184) +#define ANIM_TAG_SPHERE_TO_CUBE (ANIM_SPRITES_START + 185) +#define ANIM_TAG_TENDRILS (ANIM_SPRITES_START + 186) +#define ANIM_TAG_EYE (ANIM_SPRITES_START + 187) +#define ANIM_TAG_WHITE_SHADOW (ANIM_SPRITES_START + 188) +#define ANIM_TAG_TEAL_ALERT (ANIM_SPRITES_START + 189) +#define ANIM_TAG_OPENING_EYE (ANIM_SPRITES_START + 190) +#define ANIM_TAG_ROUND_WHITE_HALO (ANIM_SPRITES_START + 191) +#define ANIM_TAG_FANG_ATTACK (ANIM_SPRITES_START + 192) +#define ANIM_TAG_PURPLE_HAND_OUTLINE (ANIM_SPRITES_START + 193) +#define ANIM_TAG_MOON (ANIM_SPRITES_START + 194) +#define ANIM_TAG_SPARKLE_5 (ANIM_SPRITES_START + 195) +#define ANIM_TAG_SPIRAL (ANIM_SPRITES_START + 196) +#define ANIM_TAG_SNORE_Z (ANIM_SPRITES_START + 197) +#define ANIM_TAG_EXPLOSION (ANIM_SPRITES_START + 198) +#define ANIM_TAG_NAIL (ANIM_SPRITES_START + 199) +#define ANIM_TAG_GHOSTLY_SPIRIT (ANIM_SPRITES_START + 200) +#define ANIM_TAG_WARM_ROCK (ANIM_SPRITES_START + 201) +#define ANIM_TAG_BREAKING_EGG (ANIM_SPRITES_START + 202) +#define ANIM_TAG_THIN_RING (ANIM_SPRITES_START + 203) +#define ANIM_TAG_UNUSED_PUNCH_IMPACT (ANIM_SPRITES_START + 204) +#define ANIM_TAG_BELL (ANIM_SPRITES_START + 205) +#define ANIM_TAG_MUSIC_NOTES_2 (ANIM_SPRITES_START + 206) +#define ANIM_TAG_SPEED_DUST (ANIM_SPRITES_START + 207) +#define ANIM_TAG_TORN_METAL (ANIM_SPRITES_START + 208) +#define ANIM_TAG_THOUGHT_BUBBLE (ANIM_SPRITES_START + 209) +#define ANIM_TAG_MAGENTA_HEART (ANIM_SPRITES_START + 210) +#define ANIM_TAG_ELECTRIC_ORBS (ANIM_SPRITES_START + 211) +#define ANIM_TAG_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 212) +#define ANIM_TAG_ELECTRICITY (ANIM_SPRITES_START + 213) +#define ANIM_TAG_FINGER_2 (ANIM_SPRITES_START + 214) +#define ANIM_TAG_MOVEMENT_WAVES (ANIM_SPRITES_START + 215) +#define ANIM_TAG_RED_HEART (ANIM_SPRITES_START + 216) +#define ANIM_TAG_RED_ORB (ANIM_SPRITES_START + 217) +#define ANIM_TAG_EYE_SPARKLE (ANIM_SPRITES_START + 218) +#define ANIM_TAG_PINK_HEART (ANIM_SPRITES_START + 219) +#define ANIM_TAG_ANGEL (ANIM_SPRITES_START + 220) +#define ANIM_TAG_DEVIL (ANIM_SPRITES_START + 221) +#define ANIM_TAG_SWIPE (ANIM_SPRITES_START + 222) +#define ANIM_TAG_ROOTS (ANIM_SPRITES_START + 223) +#define ANIM_TAG_ITEM_BAG (ANIM_SPRITES_START + 224) +#define ANIM_TAG_JAGGED_MUSIC_NOTE (ANIM_SPRITES_START + 225) +#define ANIM_TAG_POKEBALL (ANIM_SPRITES_START + 226) +#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) +#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) +#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) +#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) +#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) +#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) +#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) +#define ANIM_TAG_ECLIPSING_ORB (ANIM_SPRITES_START + 234) +#define ANIM_TAG_GRAY_ORB (ANIM_SPRITES_START + 235) +#define ANIM_TAG_BLUE_ORB (ANIM_SPRITES_START + 236) +#define ANIM_TAG_RED_ORB_2 (ANIM_SPRITES_START + 237) +#define ANIM_TAG_PINK_PETAL (ANIM_SPRITES_START + 238) +#define ANIM_TAG_PAIN_SPLIT (ANIM_SPRITES_START + 239) +#define ANIM_TAG_CONFETTI (ANIM_SPRITES_START + 240) +#define ANIM_TAG_GREEN_STAR (ANIM_SPRITES_START + 241) +#define ANIM_TAG_PINK_CLOUD (ANIM_SPRITES_START + 242) +#define ANIM_TAG_SWEAT_DROP (ANIM_SPRITES_START + 243) +#define ANIM_TAG_GUARD_RING (ANIM_SPRITES_START + 244) +#define ANIM_TAG_PURPLE_SCRATCH (ANIM_SPRITES_START + 245) +#define ANIM_TAG_PURPLE_SWIPE (ANIM_SPRITES_START + 246) +#define ANIM_TAG_TAG_HAND (ANIM_SPRITES_START + 247) +#define ANIM_TAG_SMALL_RED_EYE (ANIM_SPRITES_START + 248) +#define ANIM_TAG_HOLLOW_ORB (ANIM_SPRITES_START + 249) +#define ANIM_TAG_X_SIGN (ANIM_SPRITES_START + 250) +#define ANIM_TAG_BLUEGREEN_ORB (ANIM_SPRITES_START + 251) +#define ANIM_TAG_PAW_PRINT (ANIM_SPRITES_START + 252) +#define ANIM_TAG_PURPLE_FLAME (ANIM_SPRITES_START + 253) +#define ANIM_TAG_RED_BALL (ANIM_SPRITES_START + 254) +#define ANIM_TAG_SMELLINGSALT_EFFECT (ANIM_SPRITES_START + 255) +#define ANIM_TAG_METEOR (ANIM_SPRITES_START + 256) +#define ANIM_TAG_FLAT_ROCK (ANIM_SPRITES_START + 257) +#define ANIM_TAG_MAGNIFYING_GLASS (ANIM_SPRITES_START + 258) +#define ANIM_TAG_BROWN_ORB (ANIM_SPRITES_START + 259) +#define ANIM_TAG_METAL_SOUND_WAVES (ANIM_SPRITES_START + 260) +#define ANIM_TAG_FLYING_DIRT (ANIM_SPRITES_START + 261) +#define ANIM_TAG_ICICLE_SPEAR (ANIM_SPRITES_START + 262) +#define ANIM_TAG_HAIL (ANIM_SPRITES_START + 263) +#define ANIM_TAG_GLOWY_RED_ORB (ANIM_SPRITES_START + 264) +#define ANIM_TAG_GLOWY_GREEN_ORB (ANIM_SPRITES_START + 265) +#define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) +#define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) +#define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) +#define ANIM_TAG_UNUSED_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) +#define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) +#define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) +#define ANIM_TAG_SWEAT_BEAD (ANIM_SPRITES_START + 273) +#define ANIM_TAG_UNUSED_GEM_1 (ANIM_SPRITES_START + 274) +#define ANIM_TAG_UNUSED_GEM_2 (ANIM_SPRITES_START + 275) +#define ANIM_TAG_UNUSED_GEM_3 (ANIM_SPRITES_START + 276) +#define ANIM_TAG_SLAM_HIT_2 (ANIM_SPRITES_START + 277) +#define ANIM_TAG_RECYCLE (ANIM_SPRITES_START + 278) +#define ANIM_TAG_UNUSED_RED_PARTICLES (ANIM_SPRITES_START + 279) +#define ANIM_TAG_PROTECT (ANIM_SPRITES_START + 280) +#define ANIM_TAG_DIRT_MOUND (ANIM_SPRITES_START + 281) +#define ANIM_TAG_SHOCK_3 (ANIM_SPRITES_START + 282) +#define ANIM_TAG_WEATHER_BALL (ANIM_SPRITES_START + 283) +#define ANIM_TAG_BIRD (ANIM_SPRITES_START + 284) +#define ANIM_TAG_CROSS_IMPACT (ANIM_SPRITES_START + 285) +#define ANIM_TAG_SLASH_2 (ANIM_SPRITES_START + 286) +#define ANIM_TAG_WHIP_HIT (ANIM_SPRITES_START + 287) +#define ANIM_TAG_BLUE_RING_2 (ANIM_SPRITES_START + 288) // battlers #define ANIM_BANK_ATTACKER 0 diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 04ae15a5e..f0d437627 100644 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D744C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7450 = { - .tileTag = 10075, - .paletteTag = 10075, + .tileTag = ANIM_TAG_ALERT, + .paletteTag = ANIM_TAG_ALERT, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D744C, .images = NULL, diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index be5b82ea1..4121e3c70 100644 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BB8 = { - .tileTag = 10220, - .paletteTag = 10220, + .tileTag = ANIM_TAG_ANGEL, + .paletteTag = ANIM_TAG_ANGEL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BB4, .images = NULL, diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 64abff6cf..1b395fded 100644 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -16,8 +16,8 @@ void sub_80D2A38(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BD0 = { - .tileTag = 10219, - .paletteTag = 10219, + .tileTag = ANIM_TAG_PINK_HEART, + .paletteTag = ANIM_TAG_PINK_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index a50404ddf..7abe53ab8 100644 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7794[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7798 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 3564da811..ed41e9e79 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -46,8 +46,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D91C0[] = // Multi-colored rings used in Aurora Beam. const struct SpriteTemplate RainbowRingSpriteTemplate = { - .tileTag = 10140, - .paletteTag = 10140, + .tileTag = ANIM_TAG_RAINBOW_RINGS, + .paletteTag = ANIM_TAG_RAINBOW_RINGS, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D91A0, .images = NULL, diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index 166782362..bc70b705c 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9808[] = const struct SpriteTemplate gSpriteTemplate_83D980C = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index 80056614f..d66e4aade 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -16,8 +16,8 @@ static void sub_80D1FA4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AB0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index 83a539f89..c5b43d7bc 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 = { - .tileTag = 10099, - .paletteTag = 10099, + .tileTag = ANIM_TAG_MILK_BOTTLE, + .paletteTag = ANIM_TAG_MILK_BOTTLE, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index 89330788c..acf31e121 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E94[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_EndureFlame = { - .tileTag = 10184, - .paletteTag = 10184, + .tileTag = ANIM_TAG_FOCUS_ENERGY, + .paletteTag = ANIM_TAG_FOCUS_ENERGY, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83D6E94, .images = NULL, diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 87c737fac..b55ff729e 100644 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -39,8 +39,8 @@ const union AnimCmd *const gSpriteAnimTable_83D775C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7764 = { - .tileTag = 10086, - .paletteTag = 10086, + .tileTag = ANIM_TAG_BREATH, + .paletteTag = ANIM_TAG_BREATH, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D775C, .images = NULL, diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index ceefd82cf..9caf4d918 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9174[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9178 = { - .tileTag = 10146, - .paletteTag = 10146, + .tileTag = ANIM_TAG_BUBBLE, + .paletteTag = ANIM_TAG_BUBBLE, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9174, .images = NULL, diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index e4ea01f5c..b9429a75a 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -49,8 +49,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAAB0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAABC = { - .tileTag = 10153, - .paletteTag = 10153, + .tileTag = ANIM_TAG_HORN_HIT_2, + .paletteTag = ANIM_TAG_HORN_HIT_2, .oam = &gOamData_837E014, .anims = gDummySpriteAnimTable, .images = NULL, @@ -85,8 +85,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB04[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = { - .tileTag = 10180, - .paletteTag = 10180, + .tileTag = ANIM_TAG_STRING_DOT, + .paletteTag = ANIM_TAG_STRING_DOT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -107,8 +107,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB40 = { - .tileTag = 10179, - .paletteTag = 10179, + .tileTag = ANIM_TAG_STRING, + .paletteTag = ANIM_TAG_STRING, .oam = &gOamData_837DF5C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = { - .tileTag = 10181, - .paletteTag = 10181, + .tileTag = ANIM_TAG_WEB, + .paletteTag = ANIM_TAG_WEB, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = const struct SpriteTemplate gLinearStingerSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -152,8 +152,8 @@ const struct SpriteTemplate gLinearStingerSpriteTemplate = const struct SpriteTemplate gPinMissileSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -163,8 +163,8 @@ const struct SpriteTemplate gPinMissileSpriteTemplate = const struct SpriteTemplate gIcicleSpearSpriteTemplate = { - .tileTag = 10262, - .paletteTag = 10262, + .tileTag = ANIM_TAG_ICICLE_SPEAR, + .paletteTag = ANIM_TAG_ICICLE_SPEAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -190,8 +190,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAC0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC10 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 60c001853..096023e9a 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7624[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7628 = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index d554a7e26..da42814fa 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -32,8 +32,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D65E0[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65E8 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 9d713ba46..8e78e8d0b 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6EEC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 = { - .tileTag = 10185, - .paletteTag = 10185, + .tileTag = ANIM_TAG_SPHERE_TO_CUBE, + .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6EEC, .images = NULL, diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index ea73b0116..41b7dda42 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -51,8 +51,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D989C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98A0 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -88,8 +88,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D98EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = { - .tileTag = 10282, - .paletteTag = 10282, + .tileTag = ANIM_TAG_SHOCK_3, + .paletteTag = ANIM_TAG_SHOCK_3, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D98C8, .images = NULL, @@ -99,8 +99,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -110,8 +110,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = const struct SpriteTemplate gElectricitySpriteTemplate = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -121,8 +121,8 @@ const struct SpriteTemplate gElectricitySpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D9938 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -132,8 +132,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9938 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9950 = { - .tileTag = 10173, - .paletteTag = 10173, + .tileTag = ANIM_TAG_SPARK_H, + .paletteTag = ANIM_TAG_SPARK_H, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const union AnimCmd *const gSpriteAnimTable_83D99B0[] = const struct SpriteTemplate gSpriteTemplate_83D99B8 = { - .tileTag = 10211, - .paletteTag = 10211, + .tileTag = ANIM_TAG_ELECTRIC_ORBS, + .paletteTag = ANIM_TAG_ELECTRIC_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D99B0, .images = NULL, @@ -235,8 +235,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9A60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A6C = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -260,8 +260,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9A98[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = { - .tileTag = 10213, - .paletteTag = 10213, + .tileTag = ANIM_TAG_ELECTRICITY, + .paletteTag = ANIM_TAG_ELECTRICITY, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9A98, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9AB4 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -325,8 +325,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9B0C[] = const struct SpriteTemplate gSpriteTemplate_83D9B10 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D9AEC, .images = NULL, @@ -336,8 +336,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9B10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -347,8 +347,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = const struct SpriteTemplate gSpriteTemplate_83D9B40 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index 8b868a436..8a7f34d5d 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7658[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 09e16b8fe..fcbced40e 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -46,8 +46,8 @@ static void sub_80E0CD0(u8 taskId); const struct SpriteTemplate gSpriteTemplate_83DB118 = { - .tileTag = 10015, - .paletteTag = 10015, + .tileTag = ANIM_TAG_TIED_BAG, + .paletteTag = ANIM_TAG_TIED_BAG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB1B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = { - .tileTag = 10139, - .paletteTag = 10139, + .tileTag = ANIM_TAG_SHARP_TEETH, + .paletteTag = ANIM_TAG_SHARP_TEETH, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1E8 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB230[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB238 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -196,8 +196,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB280[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB288 = { - .tileTag = 10039, - .paletteTag = 10039, + .tileTag = ANIM_TAG_CLAW_SLASH, + .paletteTag = ANIM_TAG_CLAW_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB280, .images = NULL, diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 8183be2ba..ebec1f58e 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BF8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C00 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BF8, .images = NULL, diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 0b5b1b88b..c9a1d1539 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAFC8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAFCC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, @@ -95,8 +95,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB03C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB044 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB004, .images = NULL, @@ -121,8 +121,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB074[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB078 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB074, .images = NULL, @@ -164,8 +164,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB0C8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB0A0, .images = NULL, @@ -175,8 +175,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -186,8 +186,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 08b09337f..4e570be6b 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -21,8 +21,8 @@ static void sub_80D0E8C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77E0 = { - .tileTag = 10002, - .paletteTag = 10002, + .tileTag = ANIM_TAG_PENCIL, + .paletteTag = ANIM_TAG_PENCIL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c index 5b6d56dac..c47d223bf 100644 --- a/src/battle/anim/egg.c +++ b/src/battle/anim/egg.c @@ -6,8 +6,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7594 = { - .tileTag = 10175, - .paletteTag = 10175, + .tileTag = ANIM_TAG_LARGE_FRESH_EGG, + .paletteTag = ANIM_TAG_LARGE_FRESH_EGG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index cbca5338c..7118b5acc 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -37,8 +37,8 @@ const union AnimCmd *const gSpriteAnimTable_83D91F0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -48,8 +48,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = { - .tileTag = 10259, - .paletteTag = 10259, + .tileTag = ANIM_TAG_BROWN_ORB, + .paletteTag = ANIM_TAG_BROWN_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = { - .tileTag = 10264, - .paletteTag = 10264, + .tileTag = ANIM_TAG_GLOWY_RED_ORB, + .paletteTag = ANIM_TAG_GLOWY_RED_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D923C = { - .tileTag = 10265, - .paletteTag = 10265, + .tileTag = ANIM_TAG_GLOWY_GREEN_ORB, + .paletteTag = ANIM_TAG_GLOWY_GREEN_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9264[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9264, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9280 = { - .tileTag = 10165, - .paletteTag = 10165, + .tileTag = ANIM_TAG_BLUE_RING, + .paletteTag = ANIM_TAG_BLUE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D92CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92E8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index a4f11c823..17d0b383f 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D79E4[] = const struct SpriteTemplate gSpriteTemplate_83D79E8 = { - .tileTag = 10207, - .paletteTag = 10207, + .tileTag = ANIM_TAG_SPEED_DUST, + .paletteTag = ANIM_TAG_SPEED_DUST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D79E4, .images = NULL, diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index c35898eea..74de16b56 100644 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D707C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7080 = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D707C, .images = NULL, diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 505356a57..76a8f2e7c 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -59,8 +59,8 @@ static void sub_80D99F4(struct Sprite *sprite); const struct SpriteTemplate gSpriteTemplate_83D9F24 = { - .tileTag = 10050, - .paletteTag = 10050, + .tileTag = ANIM_TAG_HUMANOID_FOOT, + .paletteTag = ANIM_TAG_HUMANOID_FOOT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9F70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -139,8 +139,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = const struct SpriteTemplate gFistFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -150,8 +150,8 @@ const struct SpriteTemplate gFistFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -161,8 +161,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F70, .images = NULL, @@ -172,8 +172,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FF0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -195,8 +195,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA020[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA024 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -218,8 +218,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA054[] = const struct SpriteTemplate gMegaPunchKickSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -229,8 +229,8 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate = const struct SpriteTemplate gStompFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -240,8 +240,8 @@ const struct SpriteTemplate gStompFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -251,8 +251,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -262,8 +262,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0B8 = { - .tileTag = 10208, - .paletteTag = 10208, + .tileTag = ANIM_TAG_TORN_METAL, + .paletteTag = ANIM_TAG_TORN_METAL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -287,8 +287,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA0F8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = { - .tileTag = 10257, - .paletteTag = 10257, + .tileTag = ANIM_TAG_FLAT_ROCK, + .paletteTag = ANIM_TAG_FLAT_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = { - .tileTag = 10256, - .paletteTag = 10256, + .tileTag = ANIM_TAG_METEOR, + .paletteTag = ANIM_TAG_METEOR, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -320,8 +320,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA144 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -362,8 +362,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA18C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA198 = { - .tileTag = 10245, - .paletteTag = 10245, + .tileTag = ANIM_TAG_PURPLE_SCRATCH, + .paletteTag = ANIM_TAG_PURPLE_SCRATCH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA18C, .images = NULL, @@ -401,8 +401,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA1D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA1E0 = { - .tileTag = 10246, - .paletteTag = 10246, + .tileTag = ANIM_TAG_PURPLE_SWIPE, + .paletteTag = ANIM_TAG_PURPLE_SWIPE, .oam = &gOamData_837DF3C, .anims = gSpriteAnimTable_83DA1D4, .images = NULL, @@ -424,8 +424,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA214 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c index 66ca4ca06..fd4be79a9 100644 --- a/src/battle/anim/finger.c +++ b/src/battle/anim/finger.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D72C0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72E0 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -125,8 +125,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7348[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7358 = { - .tileTag = 10214, - .paletteTag = 10214, + .tileTag = ANIM_TAG_FINGER_2, + .paletteTag = ANIM_TAG_FINGER_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7348, .images = NULL, diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 929828ed4..c5d75d9a5 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9470[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -49,8 +49,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9490 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -105,8 +105,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9504[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -116,8 +116,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = const struct SpriteTemplate gSpriteTemplate_83D9550 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -162,8 +162,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9578[] = const struct SpriteTemplate gSpriteTemplate_83D957C = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9578, .images = NULL, diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 68e13e1c1..9db989aac 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -45,8 +45,8 @@ const union AnimCmd *const gSpriteAnimTable_83D95E0[] = const struct SpriteTemplate gEmberSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -56,8 +56,8 @@ const struct SpriteTemplate gEmberSpriteTemplate = const struct SpriteTemplate gEmberFlareSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -67,8 +67,8 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = const struct SpriteTemplate gFireRingSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -119,8 +119,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9674[] = const struct SpriteTemplate gFireCrossSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9650, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gFireCrossSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -153,8 +153,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = const struct SpriteTemplate gSpriteTemplate_83D96C4 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -175,8 +175,8 @@ const s16 gHeatedRockCoords[][2] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96F8 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 646c80c53..3e3e7dc6b 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -49,8 +49,8 @@ void sub_80DA0DC(u8 taskId); const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA380 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DF7C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA3B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3B4 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -97,8 +97,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA3E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3E4 = { - .tileTag = 10154, - .paletteTag = 10154, + .tileTag = ANIM_TAG_AIR_WAVE_2, + .paletteTag = ANIM_TAG_AIR_WAVE_2, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA3E0, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA448[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA468 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DF9C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -180,8 +180,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA490[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA498 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -193,8 +193,8 @@ const u16 gUnknownPalette_83DA4B0[] = INCBIN_U16("graphics/unknown/unknown_3DA4B const struct SpriteTemplate gSpriteTemplate_83DA4D0 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -204,8 +204,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA4D0 = const struct SpriteTemplate gSpriteTemplate_83DA4E8 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -230,8 +230,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA518[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA51C = { - .tileTag = 10162, - .paletteTag = 10162, + .tileTag = ANIM_TAG_WHIRLWIND_LINES, + .paletteTag = ANIM_TAG_WHIRLWIND_LINES, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA518, .images = NULL, @@ -256,8 +256,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA564[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA568 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -278,8 +278,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA590[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA594 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -303,8 +303,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA5D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA5D8 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -327,8 +327,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = { - .tileTag = 10272, - .paletteTag = 10272, + .tileTag = ANIM_TAG_SPLASH, + .paletteTag = ANIM_TAG_SPLASH, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -338,8 +338,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = { - .tileTag = 10273, - .paletteTag = 10273, + .tileTag = ANIM_TAG_SWEAT_BEAD, + .paletteTag = ANIM_TAG_SWEAT_BEAD, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -349,8 +349,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = const struct SpriteTemplate gSpriteTemplate_83DA644 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -360,8 +360,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA644 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = { - .tileTag = 10284, - .paletteTag = 10284, + .tileTag = ANIM_TAG_BIRD, + .paletteTag = ANIM_TAG_BIRD, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 2bba6c4cb..855b3b8a3 100644 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -16,8 +16,8 @@ static void sub_80D2094(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AE0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index 4696cbc6c..7135f4380 100644 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -28,8 +28,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D68B4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68D0 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -80,8 +80,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6938[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -91,8 +91,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -102,8 +102,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D696C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index cba7b2b82..cd2b4eb0c 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -63,8 +63,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAE60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -74,8 +74,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE7C = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAEA4[] = const struct SpriteTemplate gShadowBallSpriteTemplate = { - .tileTag = 10176, - .paletteTag = 10176, + .tileTag = ANIM_TAG_SHADOW_BALL, + .paletteTag = ANIM_TAG_SHADOW_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -122,8 +122,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAED8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAEDC = { - .tileTag = 10177, - .paletteTag = 10177, + .tileTag = ANIM_TAG_LICK, + .paletteTag = ANIM_TAG_LICK, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DAED8, .images = NULL, @@ -144,8 +144,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAF04[] = const struct SpriteTemplate gSpriteTemplate_83DAF08 = { - .tileTag = 10188, - .paletteTag = 10188, + .tileTag = ANIM_TAG_WHITE_SHADOW, + .paletteTag = ANIM_TAG_WHITE_SHADOW, .oam = &gOamData_837E07C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -155,8 +155,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAF08 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = { - .tileTag = 10199, - .paletteTag = 10199, + .tileTag = ANIM_TAG_NAIL, + .paletteTag = ANIM_TAG_NAIL, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = { - .tileTag = 10200, - .paletteTag = 10200, + .tileTag = ANIM_TAG_GHOSTLY_SPIRIT, + .paletteTag = ANIM_TAG_GHOSTLY_SPIRIT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF50 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -202,8 +202,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAF7C[] = const struct SpriteTemplate gSpriteTemplate_83DAF80 = { - .tileTag = 10253, - .paletteTag = 10253, + .tileTag = ANIM_TAG_PURPLE_FLAME, + .paletteTag = ANIM_TAG_PURPLE_FLAME, .oam = &gOamData_837E094, .anims = gSpriteAnimTable_83DAF7C, .images = NULL, diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index fb7443575..e0ef150ad 100644 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6C84[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6CA0 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index b5c191449..8cf4e4bf9 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D769C = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D7694, .images = NULL, diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 407abeddc..9f72cd73e 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -64,8 +64,8 @@ const union AffineAnimCmd *const gBoneHitSpriteAffineAnimTable[] = const struct SpriteTemplate gBonemerangSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -75,8 +75,8 @@ const struct SpriteTemplate gBonemerangSpriteTemplate = const struct SpriteTemplate gBoneHitSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -86,8 +86,8 @@ const struct SpriteTemplate gBoneHitSpriteTemplate = const struct SpriteTemplate gSandAttackDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -108,8 +108,8 @@ const union AnimCmd *const gMudSlapDirtSpriteAnimTable[] = const struct SpriteTemplate gMudSlapDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gMudSlapDirtSpriteAnimTable, .images = NULL, @@ -119,8 +119,8 @@ const struct SpriteTemplate gMudSlapDirtSpriteTemplate = const struct SpriteTemplate gMudSportDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gMudSportDirtSpriteTemplate = const struct SpriteTemplate gDirtPlumeSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gDirtPlumeSpriteTemplate = const struct SpriteTemplate gDigDirtMoundSpriteTemplate = { - .tileTag = 10281, - .paletteTag = 10281, + .tileTag = ANIM_TAG_DIRT_MOUND, + .paletteTag = ANIM_TAG_DIRT_MOUND, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index b1f194ef5..779895831 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -33,8 +33,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D6C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 = { - .tileTag = 10244, - .paletteTag = 10244, + .tileTag = ANIM_TAG_GUARD_RING, + .paletteTag = ANIM_TAG_GUARD_RING, .oam = &gOamData_837E13C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index bc0fce4dd..cfad4837b 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D76D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D76DC = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D76D4, .images = NULL, diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index e0b8f9b9e..c44dd4ba4 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6760[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6764 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6760, .images = NULL, diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index c9f26b093..25b1ccc51 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7A40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A44 = { - .tileTag = 10205, - .paletteTag = 10205, + .tileTag = ANIM_TAG_BELL, + .paletteTag = ANIM_TAG_BELL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7A40, .images = NULL, @@ -63,8 +63,8 @@ const u16 gUnknown_083D7A5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A68 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 5522d4551..523e0082d 100644 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -15,8 +15,8 @@ void sub_80D1C80(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A80 = { - .tileTag = 10210, - .paletteTag = 10210, + .tileTag = ANIM_TAG_MAGENTA_HEART, + .paletteTag = ANIM_TAG_MAGENTA_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index ed680b2bd..2fce2da37 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B10[] = const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -38,8 +38,8 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index 5cd2a3ddb..4b2365542 100644 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -16,8 +16,8 @@ static void sub_80CC7D4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6994 = { - .tileTag = 10266, - .paletteTag = 10266, + .tileTag = ANIM_TAG_GREEN_SPIKE, + .paletteTag = ANIM_TAG_GREEN_SPIKE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 3aba79511..dcf8ed702 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -48,8 +48,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6714[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 108b06c60..6ecf6b392 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -22,8 +22,8 @@ static void sub_80CBB60(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D677C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index e2288e704..5ad79051f 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9B64[] = // unknown sprite template const struct SpriteTemplate gSpriteTemplate_83D9B68 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9BDC[] = const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E144, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = const struct SpriteTemplate gSmallIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -192,8 +192,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C20[] = const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -203,8 +203,8 @@ const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = const struct SpriteTemplate gIceBeamOuterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -227,8 +227,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C74[] = const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -238,8 +238,8 @@ const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0A4, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -249,8 +249,8 @@ const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -260,8 +260,8 @@ const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = const struct SpriteTemplate gLargeSnowballSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D9BC4, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gLargeSnowballSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate2 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -299,8 +299,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D10[] = const struct SpriteTemplate gIceSpikeSpriteTemplate = { - .tileTag = 10142, - .paletteTag = 10142, + .tileTag = ANIM_TAG_ICE_SPIKES, + .paletteTag = ANIM_TAG_ICE_SPIKES, .oam = &gOamData_837E084, .anims = gSpriteAnimTable_83D9D10, .images = NULL, @@ -322,8 +322,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D38[] = const struct SpriteTemplate gMistCloudSpriteTemplate = { - .tileTag = 10144, - .paletteTag = 10144, + .tileTag = ANIM_TAG_MIST_CLOUD, + .paletteTag = ANIM_TAG_MIST_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -333,8 +333,8 @@ const struct SpriteTemplate gMistCloudSpriteTemplate = const struct SpriteTemplate gSmogCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -349,8 +349,8 @@ const u8 gUnknown_083D9D6C[] = const struct SpriteTemplate gMistBallSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -365,8 +365,8 @@ const u8 gUnknown_083D9D98[] = const struct SpriteTemplate gPoisonGasCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -426,8 +426,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9E38[] = const struct SpriteTemplate gHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -437,8 +437,8 @@ const struct SpriteTemplate gHailSpriteTemplate = const struct SpriteTemplate gWeatherBallHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -508,8 +508,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9EE0[] = const struct SpriteTemplate gIceBallSpriteTemplate = { - .tileTag = 10043, - .paletteTag = 10043, + .tileTag = ANIM_TAG_ICE_CHUNK, + .paletteTag = ANIM_TAG_ICE_CHUNK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9E88, .images = NULL, @@ -519,8 +519,8 @@ const struct SpriteTemplate gIceBallSpriteTemplate = const struct SpriteTemplate gIceBallParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 8ab3fcded..4fc340e63 100644 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -15,8 +15,8 @@ void sub_80D1FDC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AC8 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 2d36d7360..a60390dc5 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -50,8 +50,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64B4 = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -86,8 +86,8 @@ const union AnimCmd *const gSpriteAnimTable_83D64E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64E4 = { - .tileTag = 10160, - .paletteTag = 10160, + .tileTag = ANIM_TAG_RAZOR_LEAF, + .paletteTag = ANIM_TAG_RAZOR_LEAF, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D64E0, .images = NULL, @@ -106,8 +106,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D650C[] = { const struct SpriteTemplate gSwiftStarSpriteTemplate = { - .tileTag = 10174, - .paletteTag = 10174, + .tileTag = ANIM_TAG_YELLOW_STAR, + .paletteTag = ANIM_TAG_YELLOW_STAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 3960b5e1a..e23b38012 100644 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D75E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, @@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75FC = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index 6e889008e..fe2e7a849 100644 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -16,8 +16,8 @@ static void sub_80CE354(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8 = { - .tileTag = 10194, - .paletteTag = 10194, + .tileTag = ANIM_TAG_MOON, + .paletteTag = ANIM_TAG_MOON, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index b67cd17b8..c0269a379 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -92,8 +92,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7110[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7114 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -111,8 +111,8 @@ const u16 gUnknown_083D712C[][6] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -122,8 +122,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7174 = { - .tileTag = 10193, - .paletteTag = 10193, + .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, + .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -145,8 +145,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D71A4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D71A8 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 6a6f6c10a..f4ea10bf9 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -14,8 +14,8 @@ static void sub_80D2E30(struct Sprite *); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 = { - .tileTag = 10225, - .paletteTag = 10225, + .tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE, + .paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 54524f2ef..7fa3ea265 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -109,8 +109,8 @@ const union AnimCmd *const gConfusionDuckSpriteAnimTable[] = const struct SpriteTemplate gConfusionDuckSpriteTemplate = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gConfusionDuckSpriteAnimTable, .images = NULL, @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB40C[] = const struct SpriteTemplate gSpriteTemplate_83DB410 = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB40C, .images = NULL, @@ -214,8 +214,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB498[] = const struct SpriteTemplate gBasicHitSplatSpriteTemplate = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = { - .tileTag = 10148, - .paletteTag = 10148, + .tileTag = ANIM_TAG_WATER_IMPACT, + .paletteTag = ANIM_TAG_WATER_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -258,8 +258,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -269,8 +269,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = { - .tileTag = 10285, - .paletteTag = 10285, + .tileTag = ANIM_TAG_CROSS_IMPACT, + .paletteTag = ANIM_TAG_CROSS_IMPACT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -280,8 +280,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -291,8 +291,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB550 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index c3d6bdf52..899357310 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -44,8 +44,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D10[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D34 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 5d82b2842..1c5ba144d 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -67,8 +67,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6424[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6440 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index d4886d1f8..e78d8f974 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -103,8 +103,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D62E8[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -114,8 +114,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, @@ -125,8 +125,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = const struct SpriteTemplate gSpriteTemplate_83D631C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62D0, .images = NULL, @@ -146,8 +146,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D634C[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6350 = { - .tileTag = 10235, - .paletteTag = 10235, + .tileTag = ANIM_TAG_GRAY_ORB, + .paletteTag = ANIM_TAG_GRAY_ORB, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6378[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6394 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index dad5605f7..36949b3c5 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6698 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6694, .images = NULL, diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index ceca55141..0679dc617 100644 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7B90[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B94 = { - .tileTag = 10218, - .paletteTag = 10218, + .tileTag = ANIM_TAG_EYE_SPARKLE, + .paletteTag = ANIM_TAG_EYE_SPARKLE, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D7B90, .images = NULL, diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 99f534e1c..6559e1b2e 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA240[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA244 = { - .tileTag = 10151, - .paletteTag = 10151, + .tileTag = ANIM_TAG_TOXIC_BUBBLE, + .paletteTag = ANIM_TAG_TOXIC_BUBBLE, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA240, .images = NULL, @@ -104,8 +104,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA2B4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -115,8 +115,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -126,8 +126,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2E8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA27C, .images = NULL, @@ -149,8 +149,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA318[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA31C = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA278, .images = NULL, @@ -172,8 +172,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA34C[] = const struct SpriteTemplate gPoisonBubbleSpriteTemplate = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -183,8 +183,8 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate = const struct SpriteTemplate gWaterBubbleSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9310, .images = NULL, diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 046d3c20c..447f31866 100644 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6220[] = const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = { - .tileTag = 10067, - .paletteTag = 10067, + .tileTag = ANIM_TAG_SLEEP_POWDER, + .paletteTag = ANIM_TAG_SLEEP_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -40,8 +40,8 @@ const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = const struct SpriteTemplate gStunSporeParticleSpriteTemplate = { - .tileTag = 10068, - .paletteTag = 10068, + .tileTag = ANIM_TAG_STUN_SPORE, + .paletteTag = ANIM_TAG_STUN_SPORE, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -51,8 +51,8 @@ const struct SpriteTemplate gStunSporeParticleSpriteTemplate = const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = { - .tileTag = 10065, - .paletteTag = 10065, + .tileTag = ANIM_TAG_POISON_POWDER, + .paletteTag = ANIM_TAG_POISON_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index ef263b971..9a4c211b7 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -50,8 +50,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA68C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = { - .tileTag = 10196, - .paletteTag = 10196, + .tileTag = ANIM_TAG_SPIRAL, + .paletteTag = ANIM_TAG_SPIRAL, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = { - .tileTag = 10166, - .paletteTag = 10166, + .tileTag = ANIM_TAG_GREEN_LIGHT_WALL, + .paletteTag = ANIM_TAG_GREEN_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -83,8 +83,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = { - .tileTag = 10168, - .paletteTag = 10168, + .tileTag = ANIM_TAG_RED_LIGHT_WALL, + .paletteTag = ANIM_TAG_RED_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = { - .tileTag = 10169, - .paletteTag = 10169, + .tileTag = ANIM_TAG_GRAY_LIGHT_WALL, + .paletteTag = ANIM_TAG_GRAY_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA708 = { - .tileTag = 10170, - .paletteTag = 10170, + .tileTag = ANIM_TAG_ORANGE_LIGHT_WALL, + .paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -131,8 +131,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA738[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA73C = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA738, .images = NULL, @@ -156,8 +156,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA768[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = { - .tileTag = 10070, - .paletteTag = 10070, + .tileTag = ANIM_TAG_SPARKLE_3, + .paletteTag = ANIM_TAG_SPARKLE_3, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83DA768, .images = NULL, @@ -167,8 +167,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA784 = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837DF74, .anims = gDummySpriteAnimTable, .images = NULL, @@ -224,8 +224,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA81C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA824 = { - .tileTag = 10097, - .paletteTag = 10097, + .tileTag = ANIM_TAG_BENT_SPOON, + .paletteTag = ANIM_TAG_BENT_SPOON, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA81C, .images = NULL, @@ -266,8 +266,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_083DA888[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA88C = { - .tileTag = 10093, - .paletteTag = 10093, + .tileTag = ANIM_TAG_AMNESIA, + .paletteTag = ANIM_TAG_AMNESIA, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA85C, .images = NULL, @@ -292,8 +292,8 @@ const union AffineAnimCmd gSpriteAffineAnim_083DA8C4[] = const struct SpriteTemplate gSpriteTemplate_83DA8DC = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -356,8 +356,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA99C[] = const struct SpriteTemplate gSpriteTemplate_83DA9AC = { - .tileTag = 10251, - .paletteTag = 10251, + .tileTag = ANIM_TAG_BLUEGREEN_ORB, + .paletteTag = ANIM_TAG_BLUEGREEN_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -379,8 +379,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA9DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA9E0 = { - .tileTag = 10267, - .paletteTag = 10267, + .tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -417,8 +417,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAA60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAA68 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index a2cf618a6..f3d18c89a 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -30,8 +30,8 @@ static void sub_80D158C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77F8 = { - .tileTag = 10197, - .paletteTag = 10197, + .tileTag = ANIM_TAG_SNORE_Z, + .paletteTag = ANIM_TAG_SNORE_Z, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7824[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7828 = { - .tileTag = 10198, - .paletteTag = 10198, + .tileTag = ANIM_TAG_EXPLOSION, + .paletteTag = ANIM_TAG_EXPLOSION, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7824, .images = NULL, @@ -99,8 +99,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D78B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D78BC = { - .tileTag = 10202, - .paletteTag = 10202, + .tileTag = ANIM_TAG_BREAKING_EGG, + .paletteTag = ANIM_TAG_BREAKING_EGG, .oam = &gOamData_837E114, .anims = gDummySpriteAnimTable, .images = NULL, @@ -142,8 +142,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7924[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7928 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -165,8 +165,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7958[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -176,8 +176,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -198,8 +198,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D79A4 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index fa53df5b8..4d9401854 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAC40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC7C = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -116,8 +116,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DACB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = const struct SpriteTemplate gFlyingDirtSpriteTemplate = { - .tileTag = 10261, - .paletteTag = 10261, + .tileTag = ANIM_TAG_FLYING_DIRT, + .paletteTag = ANIM_TAG_FLYING_DIRT, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -214,8 +214,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAD58[] = const struct SpriteTemplate gAncientPowerRockSpriteTemplate = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gAncientPowerRockSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83DAD78 = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD78 = const struct SpriteTemplate gSpriteTemplate_83DAD90 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD90 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADA8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -276,8 +276,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DADE0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -287,8 +287,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD58, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD50, .images = NULL, diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index b9b76c584..085d678d6 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -59,8 +59,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6648[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6670 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 409acf549..8a87d4eb4 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -23,8 +23,8 @@ static void sub_80CD67C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -34,8 +34,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DC4 = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index bf8142a49..8065c9a38 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D63C0[] = const struct SpriteTemplate gLeechSeedSpriteTemplate = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D63C0, .images = NULL, diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index d858f5100..d71baacc9 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -17,8 +17,8 @@ static void sub_80CCE0C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6BE8 = { - .tileTag = 10280, - .paletteTag = 10280, + .tileTag = ANIM_TAG_PROTECT, + .paletteTag = ANIM_TAG_PROTECT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 5b82d9319..fac415ade 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9840[] = const struct SpriteTemplate gSpriteTemplate_83D9844 = { - .tileTag = 10079, - .paletteTag = 10079, + .tileTag = ANIM_TAG_SHOCK, + .paletteTag = ANIM_TAG_SHOCK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9840, .images = NULL, @@ -44,8 +44,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9844 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 = { - .tileTag = 10171, - .paletteTag = 10171, + .tileTag = ANIM_TAG_BLACK_BALL_2, + .paletteTag = ANIM_TAG_BLACK_BALL_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index f71bc6eaa..c2c1fcb16 100644 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E30[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = { - .tileTag = 10183, - .paletteTag = 10183, + .tileTag = ANIM_TAG_SLASH, + .paletteTag = ANIM_TAG_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -63,8 +63,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E68 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 40b984be7..6963624ee 100644 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -61,8 +61,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6D8C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6D94 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D6D28, .images = NULL, diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 4da414cbf..329f267d6 100644 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6B24[] = const struct SpriteTemplate gCuttingSliceSpriteTemplate = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gCuttingSliceSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 4a9ade286..d1e7f2e6b 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -19,8 +19,8 @@ void sub_80CF8B8(struct Sprite* sprite); const struct SpriteTemplate gSonicBoomSpriteTemplate = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E134, .anims = gDummySpriteAnimTable, .images = NULL, @@ -30,8 +30,8 @@ const struct SpriteTemplate gSonicBoomSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D74BC = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7530[] = const struct SpriteTemplate gSupersonicWaveSpriteTemplate = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gSupersonicWaveSpriteTemplate = const struct SpriteTemplate gScreechWaveSpriteTemplate = { - .tileTag = 10164, - .paletteTag = 10164, + .tileTag = ANIM_TAG_PURPLE_RING, + .paletteTag = ANIM_TAG_PURPLE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gScreechWaveSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = { - .tileTag = 10260, - .paletteTag = 10260, + .tileTag = ANIM_TAG_METAL_SOUND_WAVES, + .paletteTag = ANIM_TAG_METAL_SOUND_WAVES, .oam = &gOamData_837E03C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -103,8 +103,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D757C = { - .tileTag = 10288, - .paletteTag = 10288, + .tileTag = ANIM_TAG_BLUE_RING_2, + .paletteTag = ANIM_TAG_BLUE_RING_2, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index 792d7e0eb..ee21135ac 100644 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B60 = { - .tileTag = 10237, - .paletteTag = 10237, + .tileTag = ANIM_TAG_RED_ORB_2, + .paletteTag = ANIM_TAG_RED_ORB_2, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index 79dd833a9..0eba290a9 100644 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7034[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = { - .tileTag = 10031, - .paletteTag = 10031, + .tileTag = ANIM_TAG_BLUE_STAR, + .paletteTag = ANIM_TAG_BLUE_STAR, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7034, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7050 = { - .tileTag = 10020, - .paletteTag = 10020, + .tileTag = ANIM_TAG_HORN_HIT, + .paletteTag = ANIM_TAG_HORN_HIT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 2bcf3727e..609673fa0 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C88[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C90 = { - .tileTag = 10215, - .paletteTag = 10215, + .tileTag = ANIM_TAG_MOVEMENT_WAVES, + .paletteTag = ANIM_TAG_MOVEMENT_WAVES, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C88, .images = NULL, diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index 5edb9afea..c10f561ae 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -21,8 +21,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D95AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D95B0 = { - .tileTag = 10157, - .paletteTag = 10157, + .tileTag = ANIM_TAG_SUNLIGHT, + .paletteTag = ANIM_TAG_SUNLIGHT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index df7a0e91f..09f9adbd6 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C48 = { - .tileTag = 10222, - .paletteTag = 10222, + .tileTag = ANIM_TAG_SWIPE, + .paletteTag = ANIM_TAG_SWIPE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C40, .images = NULL, diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index fcb1d9fc3..2b8a87d3d 100644 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -45,8 +45,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D67E4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D67F4 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index fcb85a794..8b15288b9 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7488[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D748C = { - .tileTag = 10005, - .paletteTag = 10005, + .tileTag = ANIM_TAG_SWORD, + .paletteTag = ANIM_TAG_SWORD, .oam = &gOamData_837E0FC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index cee45b648..de50fc419 100644 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6598[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65A0 = { - .tileTag = 10186, - .paletteTag = 10186, + .tileTag = ANIM_TAG_TENDRILS, + .paletteTag = ANIM_TAG_TENDRILS, .oam = &gOamData_837DFBC, .anims = gSpriteAnimTable_83D6550, .images = NULL, diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index d39520dac..fcaf6a9a8 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -60,8 +60,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220 = { - .tileTag = 10209, - .paletteTag = 10209, + .tileTag = ANIM_TAG_THOUGHT_BUBBLE, + .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7210, .images = NULL, diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 9cd04e61f..862f0f7a8 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D97CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 = { - .tileTag = 10037, - .paletteTag = 10037, + .tileTag = ANIM_TAG_LIGHTNING, + .paletteTag = ANIM_TAG_LIGHTNING, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D97CC, .images = NULL, diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 0442321d6..de89b80a7 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -20,8 +20,8 @@ static void sub_80CE1AC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F08 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -46,8 +46,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6F38[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F3C = { - .tileTag = 10030, - .paletteTag = 10030, + .tileTag = ANIM_TAG_GRAY_SMOKE, + .paletteTag = ANIM_TAG_GRAY_SMOKE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6F38, .images = NULL, @@ -82,8 +82,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6F7C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F80 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6F68, .images = NULL, @@ -107,8 +107,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FAC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FB0 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6FAC, .images = NULL, diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index bfe0c8da2..0180d5be1 100644 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FF4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6FF4, .images = NULL, diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index 15050b54c..ee775a0ed 100644 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -66,8 +66,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6AD8[] = { const struct SpriteTemplate gSpriteTemplate_83D6AF8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f4ebe0e74..4c12f609d 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -90,8 +90,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6BA8[] = const struct SpriteTemplate gSpriteTemplate_83D6BD0 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6BA8, .images = NULL, diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 1c3ab978e..e222cd512 100644 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -47,8 +47,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6D00[] = const struct SpriteTemplate gSpriteTemplate_83D6D08 = { - .tileTag = 10032, - .paletteTag = 10032, + .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST, + .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6D00, .images = NULL, diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index af9a8a037..e6b2f47f4 100644 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -14,8 +14,8 @@ void sub_80CF280(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D7370 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index 5b37d32c9..ab5678641 100644 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7390[] = const struct SpriteTemplate gSpriteTemplate_83D7394 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index 92f5973db..586725f33 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -17,8 +17,8 @@ static void sub_80CF4B8(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D73C4 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index d8dda35b3..75d236714 100644 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -17,8 +17,8 @@ static void sub_80CFE2C(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D75AC = { - .tileTag = 10178, - .paletteTag = 10178, + .tileTag = ANIM_TAG_UNUSED_VOID_LINES, + .paletteTag = ANIM_TAG_UNUSED_VOID_LINES, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 487624224..af38ecd7a 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9314[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D9310, .images = NULL, @@ -54,8 +54,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D9314, .images = NULL, @@ -65,8 +65,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC8, .images = NULL, @@ -76,8 +76,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -87,8 +87,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = const struct SpriteTemplate gSpriteTemplate_83D9378 = { - .tileTag = 10268, - .paletteTag = 10268, + .tileTag = ANIM_TAG_GLOWY_BLUE_ORB, + .paletteTag = ANIM_TAG_GLOWY_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9404[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = const struct SpriteTemplate gSpriteTemplate_83D9420 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF84, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -181,8 +181,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9420 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9438 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D93B0, .images = NULL, diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index e6e004932..91a937d41 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -51,8 +51,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69F4 = { - .tileTag = 10287, - .paletteTag = 10287, + .tileTag = ANIM_TAG_WHIP_HIT, + .paletteTag = ANIM_TAG_WHIP_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D69D4, .images = NULL, @@ -77,8 +77,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6A24[] = const struct SpriteTemplate gSpriteTemplate_83D6A28 = { - .tileTag = 10021, - .paletteTag = 10021, + .tileTag = ANIM_TAG_UNUSED_HIT, + .paletteTag = ANIM_TAG_UNUSED_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, @@ -88,8 +88,8 @@ const struct SpriteTemplate gSpriteTemplate_83D6A28 = const struct SpriteTemplate gSpriteTemplate_83D6A40 = { - .tileTag = 10022, - .paletteTag = 10022, + .tileTag = ANIM_TAG_UNUSED_HIT_2, + .paletteTag = ANIM_TAG_UNUSED_HIT_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index a8ced992a..afcfaa832 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9778[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D977C = { - .tileTag = 10232, - .paletteTag = 10232, + .tileTag = ANIM_TAG_WISP_FIRE, + .paletteTag = ANIM_TAG_WISP_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9778, .images = NULL, diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index f9e21d704..891d86ee1 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -54,8 +54,8 @@ const union AnimCmd *const gSpriteAnimTable_83D973C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D974C = { - .tileTag = 10231, - .paletteTag = 10231, + .tileTag = ANIM_TAG_WISP_ORB, + .paletteTag = ANIM_TAG_WISP_ORB, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D973C, .images = NULL, diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index a0187e3d4..1df920e2a 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -666,588 +666,588 @@ const struct OamData gOamData_837E15C = const struct CompressedSpriteSheet gBattleAnimPicTable[] = { - { gBattleAnimSpriteSheet_000, 0x200, 10000 }, - { gBattleAnimSpriteSheet_001, 0x300, 10001 }, - { gBattleAnimSpriteSheet_002, 0x200, 10002 }, - { gBattleAnimSpriteSheet_003, 0x100, 10003 }, - { gBattleAnimSpriteSheet_004, 0x200, 10004 }, - { gBattleAnimSpriteSheet_005, 0x400, 10005 }, - { gBattleAnimSpriteSheet_006, 0x180, 10006 }, - { gBattleAnimSpriteSheet_007, 0x800, 10007 }, - { gBattleAnimSpriteSheet_008, 0x20, 10008 }, - { gBattleAnimSpriteSheet_009, 0x400, 10009 }, - { gBattleAnimSpriteSheet_010, 0x1200, 10010 }, - { gBattleAnimSpriteSheet_011, 0x180, 10011 }, - { gBattleAnimSpriteSheet_012, 0x80, 10012 }, - { gBattleAnimSpriteSheet_013, 0x80, 10013 }, - { gBattleAnimSpriteSheet_014, 0x280, 10014 }, - { gBattleAnimSpriteSheet_015, 0x80, 10015 }, - { gBattleAnimSpriteSheet_016, 0x100, 10016 }, - { gBattleAnimSpriteSheet_017, 0x20, 10017 }, - { gBattleAnimSpriteSheet_018, 0x80, 10018 }, - { gBattleAnimSpriteSheet_019, 0x400, 10019 }, - { gBattleAnimSpriteSheet_020, 0x200, 10020 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10021 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10022 }, - { gBattleAnimSpriteSheet_023, 0x380, 10023 }, - { gBattleAnimSpriteSheet_024, 0x300, 10024 }, - { gBattleAnimSpriteSheet_025, 0xA00, 10025 }, - { gBattleAnimSpriteSheet_026, 0xA00, 10026 }, - { gBattleAnimSpriteSheet_027, 0xA00, 10027 }, - { gBattleAnimSpriteSheet_028, 0xA00, 10028 }, - { gBattleAnimSpriteSheet_029, 0xA00, 10029 }, - { gBattleAnimSpriteSheet_030, 0xA00, 10030 }, - { gBattleAnimSpriteSheet_031, 0xE00, 10031 }, - { gBattleAnimSpriteSheet_032, 0x380, 10032 }, - { gBattleAnimSpriteSheet_033, 0x1000, 10033 }, - { gBattleAnimSpriteSheet_034, 0x800, 10034 }, - { gBattleAnimSpriteSheet_035, 0xA00, 10035 }, - { gBattleAnimSpriteSheet_036, 0x800, 10036 }, - { gBattleAnimSpriteSheet_037, 0xA00, 10037 }, - { gBattleAnimSpriteSheet_038, 0xA00, 10038 }, - { gBattleAnimSpriteSheet_039, 0xA00, 10039 }, - { gBattleAnimSpriteSheet_040, 0xA00, 10040 }, - { gBattleAnimSpriteSheet_041, 0xA00, 10041 }, - { gBattleAnimSpriteSheet_042, 0xA00, 10042 }, - { gBattleAnimSpriteSheet_043, 0xA00, 10043 }, - { gBattleAnimSpriteSheet_044, 0xA00, 10044 }, - { gBattleAnimSpriteSheet_045, 0xA00, 10045 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10046 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10047 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10048 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10049 }, - { gBattleAnimSpriteSheet_050, 0x200, 10050 }, - { gBattleAnimSpriteSheet_051, 0x200, 10051 }, - { gBattleAnimSpriteSheet_052, 0x200, 10052 }, - { gBattleAnimSpriteSheet_053, 0x800, 10053 }, - { gBattleAnimSpriteSheet_054, 0x80, 10054 }, - { gBattleAnimSpriteSheet_055, 0x200, 10055 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10056 }, - { gBattleAnimSpriteSheet_057, 0x180, 10057 }, - { gBattleAnimSpriteSheet_058, 0xC00, 10058 }, - { gBattleAnimSpriteSheet_059, 0x100, 10059 }, - { gBattleAnimSpriteSheet_060, 0x40, 10060 }, - { gBattleAnimSpriteSheet_061, 0x180, 10061 }, - { gBattleAnimSpriteSheet_062, 0x800, 10062 }, - { gBattleAnimSpriteSheet_063, 0x480, 10063 }, - { gBattleAnimSpriteSheet_064, 0x200, 10064 }, - { gBattleAnimSpriteSheet_065, 0x200, 10065 }, - { gBattleAnimSpriteSheet_066, 0x100, 10066 }, - { gBattleAnimSpriteSheet_065, 0x200, 10067 }, - { gBattleAnimSpriteSheet_065, 0x200, 10068 }, - { gBattleAnimSpriteSheet_065, 0x200, 10069 }, - { gBattleAnimSpriteSheet_070, 0x200, 10070 }, - { gBattleAnimSpriteSheet_071, 0xA00, 10071 }, - { gBattleAnimSpriteSheet_072, 0x300, 10072 }, - { gBattleAnimSpriteSheet_073, 0x180, 10073 }, - { gBattleAnimSpriteSheet_074, 0xA0, 10074 }, - { gBattleAnimSpriteSheet_075, 0x700, 10075 }, - { gBattleAnimSpriteSheet_076, 0x400, 10076 }, - { gBattleAnimSpriteSheet_077, 0x200, 10077 }, - { gBattleAnimSpriteSheet_078, 0x300, 10078 }, - { gBattleAnimSpriteSheet_079, 0xC00, 10079 }, - { gBattleAnimSpriteSheet_080, 0xA00, 10080 }, - { gBattleAnimSpriteSheet_081, 0x80, 10081 }, - { gBattleAnimSpriteSheet_082, 0x40, 10082 }, - { gBattleAnimSpriteSheet_083, 0xE00, 10083 }, - { gBattleAnimSpriteSheet_084, 0xE00, 10084 }, - { gBattleAnimSpriteSheet_085, 0x280, 10085 }, - { gBattleAnimSpriteSheet_086, 0x200, 10086 }, - { gBattleAnimSpriteSheet_087, 0x80, 10087 }, - { gBattleAnimSpriteSheet_088, 0xC0, 10088 }, - { gBattleAnimSpriteSheet_089, 0xA00, 10089 }, - { gBattleAnimSpriteSheet_090, 0x200, 10090 }, - { gBattleAnimSpriteSheet_091, 0x180, 10091 }, - { gBattleAnimSpriteSheet_092, 0x80, 10092 }, - { gBattleAnimSpriteSheet_093, 0x1000, 10093 }, - { gBattleAnimSpriteSheet_094, 0xA00, 10094 }, - { gBattleAnimSpriteSheet_095, 0x180, 10095 }, - { gBattleAnimSpriteSheet_096, 0x380, 10096 }, - { gBattleAnimSpriteSheet_097, 0xC00, 10097 }, - { gBattleAnimSpriteSheet_098, 0x200, 10098 }, - { gBattleAnimSpriteSheet_099, 0x200, 10099 }, - { gBattleAnimSpriteSheet_100, 0x200, 10100 }, - { gBattleAnimSpriteSheet_101, 0x200, 10101 }, - { gBattleAnimSpriteSheet_102, 0x400, 10102 }, - { gBattleAnimSpriteSheet_103, 0x80, 10103 }, - { gBattleAnimSpriteSheet_104, 0x400, 10104 }, - { gBattleAnimSpriteSheet_105, 0xC00, 10105 }, - { gBattleAnimSpriteSheet_106, 0x200, 10106 }, - { gBattleAnimSpriteSheet_107, 0x1000, 10107 }, - { gBattleAnimSpriteSheet_108, 0xA00, 10108 }, - { gBattleAnimSpriteSheet_109, 0x20, 10109 }, - { gBattleAnimSpriteSheet_110, 0xE00, 10110 }, - { gBattleAnimSpriteSheet_111, 0x80, 10111 }, - { gBattleAnimSpriteSheet_112, 0xA00, 10112 }, - { gBattleAnimSpriteSheet_113, 0x400, 10113 }, - { gBattleAnimSpriteSheet_114, 0x200, 10114 }, - { gBattleAnimSpriteSheet_115, 0x700, 10115 }, - { gBattleAnimSpriteSheet_116, 0x800, 10116 }, - { gBattleAnimSpriteSheet_117, 0xA00, 10117 }, - { gBattleAnimSpriteSheet_118, 0x600, 10118 }, - { gBattleAnimSpriteSheet_119, 0x800, 10119 }, - { gBattleAnimSpriteSheet_120, 0x200, 10120 }, - { gBattleAnimSpriteSheet_121, 0x40, 10121 }, - { gBattleAnimSpriteSheet_122, 0x180, 10122 }, - { gBattleAnimSpriteSheet_123, 0x600, 10123 }, - { gBattleAnimSpriteSheet_124, 0x600, 10124 }, - { gBattleAnimSpriteSheet_125, 0x200, 10125 }, - { gBattleAnimSpriteSheet_126, 0x80, 10126 }, - { gBattleAnimSpriteSheet_127, 0x200, 10127 }, - { gBattleAnimSpriteSheet_128, 0x800, 10128 }, - { gBattleAnimSpriteSheet_129, 0x80, 10129 }, - { gBattleAnimSpriteSheet_130, 0xA00, 10130 }, - { gBattleAnimSpriteSheet_131, 0x280, 10131 }, - { gBattleAnimSpriteSheet_132, 0x280, 10132 }, - { gBattleAnimSpriteSheet_133, 0x100, 10133 }, - { gBattleAnimSpriteSheet_134, 0x200, 10134 }, - { gBattleAnimSpriteSheet_135, 0x200, 10135 }, - { gBattleAnimSpriteSheet_136, 0x20, 10136 }, - { gBattleAnimSpriteSheet_137, 0xA00, 10137 }, - { gBattleAnimSpriteSheet_138, 0x800, 10138 }, - { gBattleAnimSpriteSheet_139, 0x800, 10139 }, - { gBattleAnimSpriteSheet_140, 0xC0, 10140 }, - { gBattleAnimSpriteSheet_141, 0x1C0, 10141 }, - { gBattleAnimSpriteSheet_142, 0x100, 10142 }, - { gBattleAnimSpriteSheet_143, 0x800, 10143 }, - { gBattleAnimSpriteSheet_144, 0x200, 10144 }, - { gBattleAnimSpriteSheet_145, 0x800, 10145 }, - { gBattleAnimSpriteSheet_146, 0x180, 10146 }, - { gBattleAnimSpriteSheet_147, 0x180, 10147 }, - { gBattleAnimSpriteSheet_148, 0x200, 10148 }, - { gBattleAnimSpriteSheet_149, 0x200, 10149 }, - { gBattleAnimSpriteSheet_150, 0x180, 10150 }, - { gBattleAnimSpriteSheet_151, 0x400, 10151 }, - { gBattleAnimSpriteSheet_152, 0x80, 10152 }, - { gBattleAnimSpriteSheet_153, 0x100, 10153 }, - { gBattleAnimSpriteSheet_154, 0x100, 10154 }, - { gBattleAnimSpriteSheet_155, 0x140, 10155 }, - { gBattleAnimSpriteSheet_156, 0x800, 10156 }, - { gBattleAnimSpriteSheet_157, 0x200, 10157 }, - { gBattleAnimSpriteSheet_158, 0x100, 10158 }, - { gBattleAnimSpriteSheet_159, 0xA0, 10159 }, - { gBattleAnimSpriteSheet_160, 0x100, 10160 }, - { gBattleAnimSpriteSheet_161, 0x80, 10161 }, - { gBattleAnimSpriteSheet_162, 0x300, 10162 }, - { gBattleAnimSpriteSheet_163, 0x100, 10163 }, - { gBattleAnimSpriteSheet_163, 0x100, 10164 }, - { gBattleAnimSpriteSheet_163, 0x100, 10165 }, - { gBattleAnimSpriteSheet_166, 0x800, 10166 }, - { gBattleAnimSpriteSheet_166, 0x800, 10167 }, - { gBattleAnimSpriteSheet_166, 0x800, 10168 }, - { gBattleAnimSpriteSheet_166, 0x800, 10169 }, - { gBattleAnimSpriteSheet_166, 0x800, 10170 }, - { gBattleAnimSpriteSheet_171, 0x80, 10171 }, - { gBattleAnimSpriteSheet_144, 0x200, 10172 }, - { gBattleAnimSpriteSheet_173, 0x200, 10173 }, - { gBattleAnimSpriteSheet_174, 0x200, 10174 }, - { gBattleAnimSpriteSheet_175, 0x80, 10175 }, - { gBattleAnimSpriteSheet_176, 0x200, 10176 }, - { gBattleAnimSpriteSheet_177, 0x500, 10177 }, - { gBattleAnimSpriteSheet_178, 0x800, 10178 }, - { gBattleAnimSpriteSheet_179, 0x400, 10179 }, - { gBattleAnimSpriteSheet_180, 0x20, 10180 }, - { gBattleAnimSpriteSheet_181, 0x800, 10181 }, - { gBattleAnimSpriteSheet_182, 0x100, 10182 }, - { gBattleAnimSpriteSheet_183, 0x800, 10183 }, - { gBattleAnimSpriteSheet_184, 0x400, 10184 }, - { gBattleAnimSpriteSheet_185, 0xA00, 10185 }, - { gBattleAnimSpriteSheet_186, 0x1000, 10186 }, - { gBattleAnimSpriteSheet_187, 0x800, 10187 }, - { gBattleAnimSpriteSheet_188, 0x400, 10188 }, - { gBattleAnimSpriteSheet_189, 0x200, 10189 }, - { gBattleAnimSpriteSheet_190, 0x800, 10190 }, - { gBattleAnimSpriteSheet_191, 0x800, 10191 }, - { gBattleAnimSpriteSheet_192, 0x800, 10192 }, - { gBattleAnimSpriteSheet_193, 0x200, 10193 }, - { gBattleAnimSpriteSheet_194, 0x800, 10194 }, - { gBattleAnimSpriteSheet_195, 0x200, 10195 }, - { gBattleAnimSpriteSheet_196, 0x800, 10196 }, - { gBattleAnimSpriteSheet_197, 0x200, 10197 }, - { gBattleAnimSpriteSheet_198, 0x800, 10198 }, - { gBattleAnimSpriteSheet_199, 0x400, 10199 }, - { gBattleAnimSpriteSheet_200, 0x200, 10200 }, - { gBattleAnimSpriteSheet_201, 0xA80, 10201 }, - { gBattleAnimSpriteSheet_202, 0x600, 10202 }, - { gBattleAnimSpriteSheet_203, 0x800, 10203 }, - { gBattleAnimSpriteSheet_204, 0x200, 10204 }, - { gBattleAnimSpriteSheet_205, 0x600, 10205 }, - { gBattleAnimSpriteSheet_206, 0x800, 10206 }, - { gBattleAnimSpriteSheet_207, 0x180, 10207 }, - { gBattleAnimSpriteSheet_208, 0x800, 10208 }, - { gBattleAnimSpriteSheet_209, 0x800, 10209 }, - { gBattleAnimSpriteSheet_210, 0x80, 10210 }, - { gBattleAnimSpriteSheet_211, 0x80, 10211 }, - { gBattleAnimSpriteSheet_212, 0x800, 10212 }, - { gBattleAnimSpriteSheet_213, 0x800, 10213 }, - { gBattleAnimSpriteSheet_214, 0x600, 10214 }, - { gBattleAnimSpriteSheet_215, 0x600, 10215 }, - { gBattleAnimSpriteSheet_210, 0x80, 10216 }, - { gBattleAnimSpriteSheet_217, 0x80, 10217 }, - { gBattleAnimSpriteSheet_218, 0x180, 10218 }, - { gBattleAnimSpriteSheet_210, 0x80, 10219 }, - { gBattleAnimSpriteSheet_220, 0x200, 10220 }, - { gBattleAnimSpriteSheet_221, 0x400, 10221 }, - { gBattleAnimSpriteSheet_222, 0xA00, 10222 }, - { gBattleAnimSpriteSheet_223, 0x800, 10223 }, - { gBattleAnimSpriteSheet_224, 0x200, 10224 }, - { gBattleAnimSpriteSheet_225, 0x400, 10225 }, - { gBattleAnimSpriteSheet_226, 0x80, 10226 }, - { gBattleAnimSpriteSheet_227, 0x800, 10227 }, - { gBattleAnimSpriteSheet_228, 0x200, 10228 }, - { gBattleAnimSpriteSheet_229, 0x300, 10229 }, - { gBattleAnimSpriteSheet_230, 0x800, 10230 }, - { gBattleAnimSpriteSheet_231, 0x380, 10231 }, - { gBattleAnimSpriteSheet_232, 0x800, 10232 }, - { gBattleAnimSpriteSheet_233, 0xC0, 10233 }, - { gBattleAnimSpriteSheet_234, 0x800, 10234 }, - { gBattleAnimSpriteSheet_235, 0x60, 10235 }, - { gBattleAnimSpriteSheet_235, 0x60, 10236 }, - { gBattleAnimSpriteSheet_235, 0x60, 10237 }, - { gBattleAnimSpriteSheet_238, 0x80, 10238 }, - { gBattleAnimSpriteSheet_239, 0x180, 10239 }, - { gBattleAnimSpriteSheet_240, 0x180, 10240 }, - { gBattleAnimSpriteSheet_241, 0x200, 10241 }, - { gBattleAnimSpriteSheet_242, 0x200, 10242 }, - { gBattleAnimSpriteSheet_243, 0x20, 10243 }, - { gBattleAnimSpriteSheet_244, 0x400, 10244 }, - { gBattleAnimSpriteSheet_245, 0x600, 10245 }, - { gBattleAnimSpriteSheet_246, 0x1000, 10246 }, - { gBattleAnimSpriteSheet_247, 0x400, 10247 }, - { gBattleAnimSpriteSheet_248, 0x20, 10248 }, - { gBattleAnimSpriteSheet_249, 0x80, 10249 }, - { gBattleAnimSpriteSheet_250, 0x800, 10250 }, - { gBattleAnimSpriteSheet_251, 0x80, 10251 }, - { gBattleAnimSpriteSheet_252, 0x200, 10252 }, - { gBattleAnimSpriteSheet_253, 0x400, 10253 }, - { gBattleAnimSpriteSheet_254, 0x200, 10254 }, - { gBattleAnimSpriteSheet_255, 0x200, 10255 }, - { gBattleAnimSpriteSheet_256, 0x800, 10256 }, - { gBattleAnimSpriteSheet_257, 0x280, 10257 }, - { gBattleAnimSpriteSheet_258, 0x200, 10258 }, - { gBattleAnimSpriteSheet_149, 0x200, 10259 }, - { gBattleAnimSpriteSheet_260, 0x400, 10260 }, - { gBattleAnimSpriteSheet_261, 0x200, 10261 }, - { gBattleAnimSpriteSheet_262, 0x200, 10262 }, - { gBattleAnimSpriteSheet_263, 0x80, 10263 }, - { gBattleAnimSpriteSheet_264, 0x20, 10264 }, - { gBattleAnimSpriteSheet_264, 0x20, 10265 }, - { gBattleAnimSpriteSheet_266, 0x80, 10266 }, - { gBattleAnimSpriteSheet_212, 0x800, 10267 }, - { gBattleAnimSpriteSheet_264, 0x20, 10268 }, - { gBattleAnimSpriteSheet_269, 0x80, 10269 }, - { gBattleAnimSpriteSheet_270, 0x400, 10270 }, - { gBattleAnimSpriteSheet_271, 0x80, 10271 }, - { gBattleAnimSpriteSheet_272, 0x800, 10272 }, - { gBattleAnimSpriteSheet_273, 0x20, 10273 }, - { gBattleAnimSpriteSheet_274, 0x800, 10274 }, - { gBattleAnimSpriteSheet_275, 0x800, 10275 }, - { gBattleAnimSpriteSheet_276, 0x800, 10276 }, - { gBattleAnimSpriteSheet_277, 0x1000, 10277 }, - { gBattleAnimSpriteSheet_278, 0x800, 10278 }, - { gBattleAnimSpriteSheet_279, 0xA0, 10279 }, - { gBattleAnimSpriteSheet_280, 0x800, 10280 }, - { gBattleAnimSpriteSheet_281, 0x200, 10281 }, - { gBattleAnimSpriteSheet_282, 0x600, 10282 }, - { gBattleAnimSpriteSheet_283, 0x200, 10283 }, - { gBattleAnimSpriteSheet_284, 0x800, 10284 }, - { gBattleAnimSpriteSheet_285, 0x200, 10285 }, - { gBattleAnimSpriteSheet_183, 0x800, 10286 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10287 }, - { gBattleAnimSpriteSheet_163, 0x100, 10288 }, + { gBattleAnimSpriteSheet_000, 0x200, ANIM_TAG_BONE }, + { gBattleAnimSpriteSheet_001, 0x300, ANIM_TAG_SPARK }, + { gBattleAnimSpriteSheet_002, 0x200, ANIM_TAG_PENCIL }, + { gBattleAnimSpriteSheet_003, 0x100, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpriteSheet_004, 0x200, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpriteSheet_005, 0x400, ANIM_TAG_SWORD }, + { gBattleAnimSpriteSheet_006, 0x180, ANIM_TAG_SEED }, + { gBattleAnimSpriteSheet_007, 0x800, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpriteSheet_008, 0x20, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpriteSheet_009, 0x400, ANIM_TAG_GUST }, + { gBattleAnimSpriteSheet_010, 0x1200, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpriteSheet_011, 0x180, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpriteSheet_012, 0x80, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpriteSheet_013, 0x80, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpriteSheet_014, 0x280, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpriteSheet_015, 0x80, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpriteSheet_016, 0x100, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpriteSheet_017, 0x20, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpriteSheet_018, 0x80, ANIM_TAG_CONVERSION }, + { gBattleAnimSpriteSheet_019, 0x400, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpriteSheet_020, 0x200, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpriteSheet_023, 0x380, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpriteSheet_024, 0x300, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpriteSheet_025, 0xA00, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpriteSheet_026, 0xA00, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpriteSheet_027, 0xA00, ANIM_TAG_LEER }, + { gBattleAnimSpriteSheet_028, 0xA00, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpriteSheet_029, 0xA00, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpriteSheet_030, 0xA00, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpriteSheet_031, 0xE00, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpriteSheet_032, 0x380, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpriteSheet_033, 0x1000, ANIM_TAG_FIRE }, + { gBattleAnimSpriteSheet_034, 0x800, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpriteSheet_035, 0xA00, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpriteSheet_036, 0x800, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpriteSheet_037, 0xA00, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpriteSheet_038, 0xA00, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpriteSheet_039, 0xA00, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpriteSheet_040, 0xA00, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpriteSheet_041, 0xA00, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpriteSheet_042, 0xA00, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpriteSheet_043, 0xA00, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpriteSheet_044, 0xA00, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpriteSheet_045, 0xA00, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP_2 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpriteSheet_050, 0x200, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpriteSheet_051, 0x200, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpriteSheet_052, 0x200, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpriteSheet_053, 0x800, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpriteSheet_054, 0x80, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpriteSheet_055, 0x200, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpriteSheet_057, 0x180, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpriteSheet_058, 0xC00, ANIM_TAG_ROCKS }, + { gBattleAnimSpriteSheet_059, 0x100, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpriteSheet_060, 0x40, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpriteSheet_061, 0x180, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpriteSheet_062, 0x800, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpriteSheet_063, 0x480, ANIM_TAG_LEAF }, + { gBattleAnimSpriteSheet_064, 0x200, ANIM_TAG_FINGER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpriteSheet_066, 0x100, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpriteSheet_070, 0x200, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpriteSheet_071, 0xA00, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpriteSheet_072, 0x300, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpriteSheet_073, 0x180, ANIM_TAG_DUCK }, + { gBattleAnimSpriteSheet_074, 0xA0, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpriteSheet_075, 0x700, ANIM_TAG_ALERT }, + { gBattleAnimSpriteSheet_076, 0x400, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpriteSheet_077, 0x200, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpriteSheet_078, 0x300, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpriteSheet_079, 0xC00, ANIM_TAG_SHOCK }, + { gBattleAnimSpriteSheet_080, 0xA00, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpriteSheet_081, 0x80, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpriteSheet_082, 0x40, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpriteSheet_083, 0xE00, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpriteSheet_084, 0xE00, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpriteSheet_085, 0x280, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpriteSheet_086, 0x200, ANIM_TAG_BREATH }, + { gBattleAnimSpriteSheet_087, 0x80, ANIM_TAG_ANGER }, + { gBattleAnimSpriteSheet_088, 0xC0, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpriteSheet_089, 0xA00, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpriteSheet_090, 0x200, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpriteSheet_091, 0x180, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpriteSheet_092, 0x80, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpriteSheet_093, 0x1000, ANIM_TAG_AMNESIA }, + { gBattleAnimSpriteSheet_094, 0xA00, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpriteSheet_095, 0x180, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpriteSheet_096, 0x380, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpriteSheet_097, 0xC00, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpriteSheet_098, 0x200, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpriteSheet_099, 0x200, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpriteSheet_100, 0x200, ANIM_TAG_COIN }, + { gBattleAnimSpriteSheet_101, 0x200, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpriteSheet_102, 0x400, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpriteSheet_103, 0x80, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpriteSheet_104, 0x400, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpriteSheet_105, 0xC00, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpriteSheet_106, 0x200, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpriteSheet_108, 0xA00, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpriteSheet_109, 0x20, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpriteSheet_110, 0xE00, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpriteSheet_111, 0x80, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpriteSheet_112, 0xA00, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpriteSheet_113, 0x400, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpriteSheet_114, 0x200, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpriteSheet_115, 0x700, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpriteSheet_116, 0x800, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpriteSheet_117, 0xA00, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpriteSheet_118, 0x600, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpriteSheet_119, 0x800, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpriteSheet_120, 0x200, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpriteSheet_121, 0x40, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpriteSheet_122, 0x180, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpriteSheet_123, 0x600, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpriteSheet_124, 0x600, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpriteSheet_125, 0x200, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpriteSheet_126, 0x80, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpriteSheet_127, 0x200, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpriteSheet_128, 0x800, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpriteSheet_129, 0x80, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpriteSheet_130, 0xA00, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpriteSheet_131, 0x280, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpriteSheet_132, 0x280, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpriteSheet_133, 0x100, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpriteSheet_134, 0x200, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpriteSheet_135, 0x200, ANIM_TAG_IMPACT }, + { gBattleAnimSpriteSheet_136, 0x20, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpriteSheet_137, 0xA00, ANIM_TAG_SCRATCH }, + { gBattleAnimSpriteSheet_138, 0x800, ANIM_TAG_CUT }, + { gBattleAnimSpriteSheet_139, 0x800, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpriteSheet_140, 0xC0, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpriteSheet_141, 0x1C0, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpriteSheet_142, 0x100, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpriteSheet_143, 0x800, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpriteSheet_145, 0x800, ANIM_TAG_CLAMP }, + { gBattleAnimSpriteSheet_146, 0x180, ANIM_TAG_BUBBLE }, + { gBattleAnimSpriteSheet_147, 0x180, ANIM_TAG_ORBS }, + { gBattleAnimSpriteSheet_148, 0x200, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpriteSheet_150, 0x180, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpriteSheet_151, 0x400, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpriteSheet_152, 0x80, ANIM_TAG_SPIKES }, + { gBattleAnimSpriteSheet_153, 0x100, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpriteSheet_154, 0x100, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpriteSheet_155, 0x140, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpriteSheet_156, 0x800, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpriteSheet_157, 0x200, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpriteSheet_158, 0x100, ANIM_TAG_SPORE }, + { gBattleAnimSpriteSheet_159, 0xA0, ANIM_TAG_FLOWER }, + { gBattleAnimSpriteSheet_160, 0x100, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpriteSheet_161, 0x80, ANIM_TAG_NEEDLE }, + { gBattleAnimSpriteSheet_162, 0x300, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_171, 0x80, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpriteSheet_173, 0x200, ANIM_TAG_SPARK_H }, + { gBattleAnimSpriteSheet_174, 0x200, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpriteSheet_175, 0x80, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpriteSheet_176, 0x200, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpriteSheet_177, 0x500, ANIM_TAG_LICK }, + { gBattleAnimSpriteSheet_178, 0x800, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpriteSheet_179, 0x400, ANIM_TAG_STRING }, + { gBattleAnimSpriteSheet_180, 0x20, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpriteSheet_181, 0x800, ANIM_TAG_WEB }, + { gBattleAnimSpriteSheet_182, 0x100, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH }, + { gBattleAnimSpriteSheet_184, 0x400, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpriteSheet_185, 0xA00, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpriteSheet_186, 0x1000, ANIM_TAG_TENDRILS }, + { gBattleAnimSpriteSheet_187, 0x800, ANIM_TAG_EYE }, + { gBattleAnimSpriteSheet_188, 0x400, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpriteSheet_189, 0x200, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpriteSheet_190, 0x800, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpriteSheet_191, 0x800, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpriteSheet_192, 0x800, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpriteSheet_193, 0x200, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpriteSheet_194, 0x800, ANIM_TAG_MOON }, + { gBattleAnimSpriteSheet_195, 0x200, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpriteSheet_196, 0x800, ANIM_TAG_SPIRAL }, + { gBattleAnimSpriteSheet_197, 0x200, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpriteSheet_198, 0x800, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpriteSheet_199, 0x400, ANIM_TAG_NAIL }, + { gBattleAnimSpriteSheet_200, 0x200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpriteSheet_201, 0xA80, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpriteSheet_202, 0x600, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpriteSheet_203, 0x800, ANIM_TAG_THIN_RING }, + { gBattleAnimSpriteSheet_204, 0x200, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpriteSheet_205, 0x600, ANIM_TAG_BELL }, + { gBattleAnimSpriteSheet_206, 0x800, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpriteSheet_207, 0x180, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpriteSheet_208, 0x800, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpriteSheet_209, 0x800, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpriteSheet_211, 0x80, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_213, 0x800, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpriteSheet_214, 0x600, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpriteSheet_215, 0x600, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_RED_HEART }, + { gBattleAnimSpriteSheet_217, 0x80, ANIM_TAG_RED_ORB }, + { gBattleAnimSpriteSheet_218, 0x180, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpriteSheet_220, 0x200, ANIM_TAG_ANGEL }, + { gBattleAnimSpriteSheet_221, 0x400, ANIM_TAG_DEVIL }, + { gBattleAnimSpriteSheet_222, 0xA00, ANIM_TAG_SWIPE }, + { gBattleAnimSpriteSheet_223, 0x800, ANIM_TAG_ROOTS }, + { gBattleAnimSpriteSheet_224, 0x200, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpriteSheet_225, 0x400, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpriteSheet_226, 0x80, ANIM_TAG_POKEBALL }, + { gBattleAnimSpriteSheet_227, 0x800, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpriteSheet_228, 0x200, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpriteSheet_229, 0x300, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpriteSheet_230, 0x800, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpriteSheet_231, 0x380, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpriteSheet_232, 0x800, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpriteSheet_233, 0xC0, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpriteSheet_234, 0x800, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpriteSheet_238, 0x80, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpriteSheet_239, 0x180, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpriteSheet_240, 0x180, ANIM_TAG_CONFETTI }, + { gBattleAnimSpriteSheet_241, 0x200, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpriteSheet_242, 0x200, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpriteSheet_243, 0x20, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpriteSheet_244, 0x400, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpriteSheet_245, 0x600, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpriteSheet_246, 0x1000, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpriteSheet_247, 0x400, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpriteSheet_248, 0x20, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpriteSheet_249, 0x80, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpriteSheet_250, 0x800, ANIM_TAG_X_SIGN }, + { gBattleAnimSpriteSheet_251, 0x80, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpriteSheet_252, 0x200, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpriteSheet_253, 0x400, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpriteSheet_254, 0x200, ANIM_TAG_RED_BALL }, + { gBattleAnimSpriteSheet_255, 0x200, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpriteSheet_256, 0x800, ANIM_TAG_METEOR }, + { gBattleAnimSpriteSheet_257, 0x280, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpriteSheet_258, 0x200, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpriteSheet_260, 0x400, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpriteSheet_261, 0x200, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpriteSheet_262, 0x200, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpriteSheet_263, 0x80, ANIM_TAG_HAIL }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpriteSheet_266, 0x80, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpriteSheet_269, 0x80, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpriteSheet_270, 0x400, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpriteSheet_271, 0x80, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpriteSheet_272, 0x800, ANIM_TAG_SPLASH }, + { gBattleAnimSpriteSheet_273, 0x20, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpriteSheet_274, 0x800, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpriteSheet_275, 0x800, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpriteSheet_276, 0x800, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpriteSheet_277, 0x1000, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpriteSheet_278, 0x800, ANIM_TAG_RECYCLE }, + { gBattleAnimSpriteSheet_279, 0xA0, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpriteSheet_280, 0x800, ANIM_TAG_PROTECT }, + { gBattleAnimSpriteSheet_281, 0x200, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpriteSheet_282, 0x600, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpriteSheet_283, 0x200, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpriteSheet_284, 0x800, ANIM_TAG_BIRD }, + { gBattleAnimSpriteSheet_285, 0x200, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING_2 }, }; const struct CompressedSpritePalette gBattleAnimPaletteTable[] = { - { gBattleAnimSpritePalette_000, 10000 }, - { gBattleAnimSpritePalette_001, 10001 }, - { gBattleAnimSpritePalette_002, 10002 }, - { gBattleAnimSpritePalette_003, 10003 }, - { gBattleAnimSpritePalette_004, 10004 }, - { gBattleAnimSpritePalette_005, 10005 }, - { gBattleAnimSpritePalette_006, 10006 }, - { gBattleAnimSpritePalette_007, 10007 }, - { gBattleAnimSpritePalette_008, 10008 }, - { gBattleAnimSpritePalette_009, 10009 }, - { gBattleAnimSpritePalette_010, 10010 }, - { gBattleAnimSpritePalette_011, 10011 }, - { gBattleAnimSpritePalette_012, 10012 }, - { gBattleAnimSpritePalette_013, 10013 }, - { gBattleAnimSpritePalette_014, 10014 }, - { gBattleAnimSpritePalette_015, 10015 }, - { gBattleAnimSpritePalette_016, 10016 }, - { gBattleAnimSpritePalette_016, 10017 }, - { gBattleAnimSpritePalette_018, 10018 }, - { gBattleAnimSpritePalette_019, 10019 }, - { gBattleAnimSpritePalette_020, 10020 }, - { gBattleAnimSpritePalette_021, 10021 }, - { gBattleAnimSpritePalette_022, 10022 }, - { gBattleAnimSpritePalette_023, 10023 }, - { gBattleAnimSpritePalette_024, 10024 }, - { gBattleAnimSpritePalette_025, 10025 }, - { gBattleAnimSpritePalette_026, 10026 }, - { gBattleAnimSpritePalette_027, 10027 }, - { gBattleAnimSpritePalette_028, 10028 }, - { gBattleAnimSpritePalette_029, 10029 }, - { gBattleAnimSpritePalette_030, 10030 }, - { gBattleAnimSpritePalette_031, 10031 }, - { gBattleAnimSpritePalette_032, 10032 }, - { gBattleAnimSpritePalette_033, 10033 }, - { gBattleAnimSpritePalette_033, 10034 }, - { gBattleAnimSpritePalette_033, 10035 }, - { gBattleAnimSpritePalette_036, 10036 }, - { gBattleAnimSpritePalette_036, 10037 }, - { gBattleAnimSpritePalette_038, 10038 }, - { gBattleAnimSpritePalette_039, 10039 }, - { gBattleAnimSpritePalette_038, 10040 }, - { gBattleAnimSpritePalette_038, 10041 }, - { gBattleAnimSpritePalette_042, 10042 }, - { gBattleAnimSpritePalette_043, 10043 }, - { gBattleAnimSpritePalette_044, 10044 }, - { gBattleAnimSpritePalette_045, 10045 }, - { gBattleAnimSpritePalette_046, 10046 }, - { gBattleAnimSpritePalette_047, 10046 }, - { gBattleAnimSpritePalette_048, 10048 }, - { gBattleAnimSpritePalette_049, 10049 }, - { gBattleAnimSpritePalette_050, 10050 }, - { gBattleAnimSpritePalette_050, 10051 }, - { gBattleAnimSpritePalette_050, 10052 }, - { gBattleAnimSpritePalette_026, 10053 }, - { gBattleAnimSpritePalette_054, 10054 }, - { gBattleAnimSpritePalette_050, 10055 }, - { gBattleAnimSpritePalette_056, 10056 }, - { gBattleAnimSpritePalette_057, 10057 }, - { gBattleAnimSpritePalette_058, 10058 }, - { gBattleAnimSpritePalette_059, 10059 }, - { gBattleAnimSpritePalette_060, 10060 }, - { gBattleAnimSpritePalette_061, 10061 }, - { gBattleAnimSpritePalette_062, 10062 }, - { gBattleAnimSpritePalette_063, 10063 }, - { gBattleAnimSpritePalette_064, 10064 }, - { gBattleAnimSpritePalette_065, 10065 }, - { gBattleAnimSpritePalette_066, 10066 }, - { gBattleAnimSpritePalette_067, 10067 }, - { gBattleAnimSpritePalette_068, 10068 }, - { gBattleAnimSpritePalette_065, 10069 }, - { gBattleAnimSpritePalette_070, 10070 }, - { gBattleAnimSpritePalette_070, 10071 }, - { gBattleAnimSpritePalette_072, 10072 }, - { gBattleAnimSpritePalette_073, 10073 }, - { gBattleAnimSpritePalette_074, 10074 }, - { gBattleAnimSpritePalette_075, 10075 }, - { gBattleAnimSpritePalette_076, 10076 }, - { gBattleAnimSpritePalette_076, 10077 }, - { gBattleAnimSpritePalette_078, 10078 }, - { gBattleAnimSpritePalette_078, 10079 }, - { gBattleAnimSpritePalette_080, 10080 }, - { gBattleAnimSpritePalette_081, 10081 }, - { gBattleAnimSpritePalette_082, 10082 }, - { gBattleAnimSpritePalette_083, 10083 }, - { gBattleAnimSpritePalette_084, 10084 }, - { gBattleAnimSpritePalette_085, 10085 }, - { gBattleAnimSpritePalette_086, 10086 }, - { gBattleAnimSpritePalette_087, 10087 }, - { gBattleAnimSpritePalette_088, 10088 }, - { gBattleAnimSpritePalette_089, 10089 }, - { gBattleAnimSpritePalette_090, 10090 }, - { gBattleAnimSpritePalette_091, 10091 }, - { gBattleAnimSpritePalette_092, 10092 }, - { gBattleAnimSpritePalette_093, 10093 }, - { gBattleAnimSpritePalette_094, 10094 }, - { gBattleAnimSpritePalette_095, 10095 }, - { gBattleAnimSpritePalette_096, 10096 }, - { gBattleAnimSpritePalette_097, 10097 }, - { gBattleAnimSpritePalette_094, 10098 }, - { gBattleAnimSpritePalette_099, 10099 }, - { gBattleAnimSpritePalette_100, 10100 }, - { gBattleAnimSpritePalette_101, 10101 }, - { gBattleAnimSpritePalette_101, 10102 }, - { gBattleAnimSpritePalette_103, 10103 }, - { gBattleAnimSpritePalette_104, 10104 }, - { gBattleAnimSpritePalette_105, 10105 }, - { gBattleAnimSpritePalette_105, 10106 }, - { gBattleAnimSpritePalette_107, 10107 }, - { gBattleAnimSpritePalette_107, 10108 }, - { gBattleAnimSpritePalette_109, 10109 }, - { gBattleAnimSpritePalette_109, 10110 }, - { gBattleAnimSpritePalette_111, 10111 }, - { gBattleAnimSpritePalette_112, 10112 }, - { gBattleAnimSpritePalette_113, 10113 }, - { gBattleAnimSpritePalette_114, 10114 }, - { gBattleAnimSpritePalette_115, 10115 }, - { gBattleAnimSpritePalette_116, 10116 }, - { gBattleAnimSpritePalette_117, 10117 }, - { gBattleAnimSpritePalette_118, 10118 }, - { gBattleAnimSpritePalette_119, 10119 }, - { gBattleAnimSpritePalette_120, 10120 }, - { gBattleAnimSpritePalette_121, 10121 }, - { gBattleAnimSpritePalette_122, 10122 }, - { gBattleAnimSpritePalette_122, 10123 }, - { gBattleAnimSpritePalette_124, 10124 }, - { gBattleAnimSpritePalette_125, 10125 }, - { gBattleAnimSpritePalette_126, 10126 }, - { gBattleAnimSpritePalette_127, 10127 }, - { gBattleAnimSpritePalette_128, 10128 }, - { gBattleAnimSpritePalette_128, 10129 }, - { gBattleAnimSpritePalette_130, 10130 }, - { gBattleAnimSpritePalette_130, 10131 }, - { gBattleAnimSpritePalette_132, 10132 }, - { gBattleAnimSpritePalette_133, 10133 }, - { gBattleAnimSpritePalette_133, 10134 }, - { gBattleAnimSpritePalette_135, 10135 }, - { gBattleAnimSpritePalette_136, 10136 }, - { gBattleAnimSpritePalette_135, 10137 }, - { gBattleAnimSpritePalette_135, 10138 }, - { gBattleAnimSpritePalette_139, 10139 }, - { gBattleAnimSpritePalette_140, 10140 }, - { gBattleAnimSpritePalette_141, 10141 }, - { gBattleAnimSpritePalette_141, 10142 }, - { gBattleAnimSpritePalette_143, 10143 }, - { gBattleAnimSpritePalette_144, 10144 }, - { gBattleAnimSpritePalette_139, 10145 }, - { gBattleAnimSpritePalette_115, 10146 }, - { gBattleAnimSpritePalette_147, 10147 }, - { gBattleAnimSpritePalette_148, 10148 }, - { gBattleAnimSpritePalette_148, 10149 }, - { gBattleAnimSpritePalette_150, 10150 }, - { gBattleAnimSpritePalette_150, 10151 }, - { gBattleAnimSpritePalette_152, 10152 }, - { gBattleAnimSpritePalette_153, 10153 }, - { gBattleAnimSpritePalette_154, 10154 }, - { gBattleAnimSpritePalette_155, 10155 }, - { gBattleAnimSpritePalette_156, 10156 }, - { gBattleAnimSpritePalette_157, 10157 }, - { gBattleAnimSpritePalette_158, 10158 }, - { gBattleAnimSpritePalette_159, 10159 }, - { gBattleAnimSpritePalette_160, 10160 }, - { gBattleAnimSpritePalette_161, 10161 }, - { gBattleAnimSpritePalette_162, 10162 }, - { gBattleAnimSpritePalette_163, 10163 }, - { gBattleAnimSpritePalette_164, 10164 }, - { gBattleAnimSpritePalette_165, 10165 }, - { gBattleAnimSpritePalette_166, 10166 }, - { gBattleAnimSpritePalette_167, 10167 }, - { gBattleAnimSpritePalette_168, 10168 }, - { gBattleAnimSpritePalette_169, 10169 }, - { gBattleAnimSpritePalette_170, 10170 }, - { gBattleAnimSpritePalette_171, 10171 }, - { gBattleAnimSpritePalette_172, 10172 }, - { gBattleAnimSpritePalette_001, 10173 }, - { gBattleAnimSpritePalette_174, 10174 }, - { gBattleAnimSpritePalette_175, 10175 }, - { gBattleAnimSpritePalette_176, 10176 }, - { gBattleAnimSpritePalette_177, 10177 }, - { gBattleAnimSpritePalette_178, 10178 }, - { gBattleAnimSpritePalette_179, 10179 }, - { gBattleAnimSpritePalette_179, 10180 }, - { gBattleAnimSpritePalette_179, 10181 }, - { gBattleAnimSpritePalette_182, 10182 }, - { gBattleAnimSpritePalette_183, 10183 }, - { gBattleAnimSpritePalette_184, 10184 }, - { gBattleAnimSpritePalette_185, 10185 }, - { gBattleAnimSpritePalette_186, 10186 }, - { gBattleAnimSpritePalette_187, 10187 }, - { gBattleAnimSpritePalette_188, 10188 }, - { gBattleAnimSpritePalette_189, 10189 }, - { gBattleAnimSpritePalette_190, 10190 }, - { gBattleAnimSpritePalette_191, 10191 }, - { gBattleAnimSpritePalette_192, 10192 }, - { gBattleAnimSpritePalette_193, 10193 }, - { gBattleAnimSpritePalette_194, 10194 }, - { gBattleAnimSpritePalette_195, 10195 }, - { gBattleAnimSpritePalette_196, 10196 }, - { gBattleAnimSpritePalette_197, 10197 }, - { gBattleAnimSpritePalette_198, 10198 }, - { gBattleAnimSpritePalette_199, 10199 }, - { gBattleAnimSpritePalette_200, 10200 }, - { gBattleAnimSpritePalette_201, 10201 }, - { gBattleAnimSpritePalette_202, 10202 }, - { gBattleAnimSpritePalette_203, 10203 }, - { gBattleAnimSpritePalette_204, 10204 }, - { gBattleAnimSpritePalette_205, 10205 }, - { gBattleAnimSpritePalette_206, 10206 }, - { gBattleAnimSpritePalette_207, 10207 }, - { gBattleAnimSpritePalette_167, 10208 }, - { gBattleAnimSpritePalette_209, 10209 }, - { gBattleAnimSpritePalette_210, 10210 }, - { gBattleAnimSpritePalette_211, 10211 }, - { gBattleAnimSpritePalette_211, 10212 }, - { gBattleAnimSpritePalette_211, 10213 }, - { gBattleAnimSpritePalette_064, 10214 }, - { gBattleAnimSpritePalette_215, 10215 }, - { gBattleAnimSpritePalette_216, 10216 }, - { gBattleAnimSpritePalette_217, 10217 }, - { gBattleAnimSpritePalette_218, 10218 }, - { gBattleAnimSpritePalette_219, 10219 }, - { gBattleAnimSpritePalette_220, 10220 }, - { gBattleAnimSpritePalette_221, 10221 }, - { gBattleAnimSpritePalette_222, 10222 }, - { gBattleAnimSpritePalette_223, 10223 }, - { gBattleAnimSpritePalette_224, 10224 }, - { gBattleAnimSpritePalette_225, 10225 }, - { gBattleAnimSpritePalette_226, 10226 }, - { gBattleAnimSpritePalette_226, 10227 }, - { gBattleAnimSpritePalette_228, 10228 }, - { gBattleAnimSpritePalette_229, 10229 }, - { gBattleAnimSpritePalette_230, 10230 }, - { gBattleAnimSpritePalette_231, 10231 }, - { gBattleAnimSpritePalette_231, 10232 }, - { gBattleAnimSpritePalette_233, 10233 }, - { gBattleAnimSpritePalette_234, 10234 }, - { gBattleAnimSpritePalette_235, 10235 }, - { gBattleAnimSpritePalette_236, 10236 }, - { gBattleAnimSpritePalette_237, 10237 }, - { gBattleAnimSpritePalette_238, 10238 }, - { gBattleAnimSpritePalette_239, 10239 }, - { gBattleAnimSpritePalette_240, 10240 }, - { gBattleAnimSpritePalette_241, 10241 }, - { gBattleAnimSpritePalette_242, 10242 }, - { gBattleAnimSpritePalette_243, 10243 }, - { gBattleAnimSpritePalette_244, 10244 }, - { gBattleAnimSpritePalette_245, 10245 }, - { gBattleAnimSpritePalette_245, 10246 }, - { gBattleAnimSpritePalette_064, 10247 }, - { gBattleAnimSpritePalette_248, 10248 }, - { gBattleAnimSpritePalette_249, 10249 }, - { gBattleAnimSpritePalette_249, 10250 }, - { gBattleAnimSpritePalette_251, 10251 }, - { gBattleAnimSpritePalette_252, 10252 }, - { gBattleAnimSpritePalette_253, 10253 }, - { gBattleAnimSpritePalette_254, 10254 }, - { gBattleAnimSpritePalette_255, 10255 }, - { gBattleAnimSpritePalette_256, 10256 }, - { gBattleAnimSpritePalette_257, 10257 }, - { gBattleAnimSpritePalette_258, 10258 }, - { gBattleAnimSpritePalette_259, 10259 }, - { gBattleAnimSpritePalette_260, 10260 }, - { gBattleAnimSpritePalette_261, 10261 }, - { gBattleAnimSpritePalette_262, 10262 }, - { gBattleAnimSpritePalette_263, 10263 }, - { gBattleAnimSpritePalette_264, 10264 }, - { gBattleAnimSpritePalette_265, 10265 }, - { gBattleAnimSpritePalette_266, 10266 }, - { gBattleAnimSpritePalette_267, 10267 }, - { gBattleAnimSpritePalette_268, 10268 }, - { gBattleAnimSpritePalette_269, 10269 }, - { gBattleAnimSpritePalette_270, 10270 }, - { gBattleAnimSpritePalette_271, 10271 }, - { gBattleAnimSpritePalette_272, 10272 }, - { gBattleAnimSpritePalette_272, 10273 }, - { gBattleAnimSpritePalette_274, 10274 }, - { gBattleAnimSpritePalette_274, 10275 }, - { gBattleAnimSpritePalette_274, 10276 }, - { gBattleAnimSpritePalette_277, 10277 }, - { gBattleAnimSpritePalette_278, 10278 }, - { gBattleAnimSpritePalette_279, 10279 }, - { gBattleAnimSpritePalette_280, 10280 }, - { gBattleAnimSpritePalette_281, 10281 }, - { gBattleAnimSpritePalette_282, 10282 }, - { gBattleAnimSpritePalette_283, 10283 }, - { gBattleAnimSpritePalette_284, 10284 }, - { gBattleAnimSpritePalette_285, 10285 }, - { gBattleAnimSpritePalette_286, 10286 }, - { gBattleAnimSpritePalette_287, 10287 }, - { gBattleAnimSpritePalette_288, 10288 }, + { gBattleAnimSpritePalette_000, ANIM_TAG_BONE }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK }, + { gBattleAnimSpritePalette_002, ANIM_TAG_PENCIL }, + { gBattleAnimSpritePalette_003, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpritePalette_004, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpritePalette_005, ANIM_TAG_SWORD }, + { gBattleAnimSpritePalette_006, ANIM_TAG_SEED }, + { gBattleAnimSpritePalette_007, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpritePalette_008, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpritePalette_009, ANIM_TAG_GUST }, + { gBattleAnimSpritePalette_010, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpritePalette_011, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpritePalette_012, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpritePalette_013, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpritePalette_014, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpritePalette_015, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpritePalette_018, ANIM_TAG_CONVERSION }, + { gBattleAnimSpritePalette_019, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpritePalette_020, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpritePalette_021, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpritePalette_022, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpritePalette_023, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpritePalette_024, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpritePalette_025, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpritePalette_027, ANIM_TAG_LEER }, + { gBattleAnimSpritePalette_028, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpritePalette_029, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpritePalette_030, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpritePalette_031, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpritePalette_032, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpritePalette_036, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpritePalette_039, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpritePalette_042, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpritePalette_043, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpritePalette_044, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpritePalette_045, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpritePalette_046, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_047, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_048, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpritePalette_049, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpritePalette_054, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpritePalette_056, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpritePalette_057, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpritePalette_058, ANIM_TAG_ROCKS }, + { gBattleAnimSpritePalette_059, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpritePalette_060, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpritePalette_061, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpritePalette_062, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpritePalette_063, ANIM_TAG_LEAF }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER }, + { gBattleAnimSpritePalette_065, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpritePalette_066, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpritePalette_067, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpritePalette_068, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpritePalette_065, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpritePalette_072, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpritePalette_073, ANIM_TAG_DUCK }, + { gBattleAnimSpritePalette_074, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpritePalette_075, ANIM_TAG_ALERT }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpritePalette_078, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK }, + { gBattleAnimSpritePalette_080, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpritePalette_081, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpritePalette_082, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpritePalette_083, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpritePalette_084, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpritePalette_085, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpritePalette_086, ANIM_TAG_BREATH }, + { gBattleAnimSpritePalette_087, ANIM_TAG_ANGER }, + { gBattleAnimSpritePalette_088, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpritePalette_089, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpritePalette_090, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpritePalette_091, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpritePalette_092, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpritePalette_093, ANIM_TAG_AMNESIA }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpritePalette_095, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpritePalette_096, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpritePalette_097, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpritePalette_099, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpritePalette_100, ANIM_TAG_COIN }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpritePalette_103, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpritePalette_104, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpritePalette_111, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpritePalette_112, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpritePalette_113, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpritePalette_114, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpritePalette_115, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpritePalette_116, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpritePalette_117, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpritePalette_118, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpritePalette_119, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpritePalette_120, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpritePalette_121, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpritePalette_124, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpritePalette_125, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpritePalette_126, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpritePalette_127, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpritePalette_132, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpritePalette_135, ANIM_TAG_IMPACT }, + { gBattleAnimSpritePalette_136, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpritePalette_135, ANIM_TAG_SCRATCH }, + { gBattleAnimSpritePalette_135, ANIM_TAG_CUT }, + { gBattleAnimSpritePalette_139, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpritePalette_140, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpritePalette_143, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpritePalette_144, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpritePalette_139, ANIM_TAG_CLAMP }, + { gBattleAnimSpritePalette_115, ANIM_TAG_BUBBLE }, + { gBattleAnimSpritePalette_147, ANIM_TAG_ORBS }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpritePalette_150, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpritePalette_150, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpritePalette_152, ANIM_TAG_SPIKES }, + { gBattleAnimSpritePalette_153, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpritePalette_154, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpritePalette_155, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpritePalette_156, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpritePalette_157, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpritePalette_158, ANIM_TAG_SPORE }, + { gBattleAnimSpritePalette_159, ANIM_TAG_FLOWER }, + { gBattleAnimSpritePalette_160, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpritePalette_161, ANIM_TAG_NEEDLE }, + { gBattleAnimSpritePalette_162, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpritePalette_163, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpritePalette_164, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpritePalette_165, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpritePalette_166, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpritePalette_167, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpritePalette_168, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpritePalette_169, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpritePalette_170, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpritePalette_171, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpritePalette_172, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK_H }, + { gBattleAnimSpritePalette_174, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpritePalette_175, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpritePalette_176, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpritePalette_177, ANIM_TAG_LICK }, + { gBattleAnimSpritePalette_178, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpritePalette_179, ANIM_TAG_WEB }, + { gBattleAnimSpritePalette_182, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpritePalette_183, ANIM_TAG_SLASH }, + { gBattleAnimSpritePalette_184, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpritePalette_185, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpritePalette_186, ANIM_TAG_TENDRILS }, + { gBattleAnimSpritePalette_187, ANIM_TAG_EYE }, + { gBattleAnimSpritePalette_188, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpritePalette_189, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpritePalette_190, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpritePalette_191, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpritePalette_192, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpritePalette_193, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpritePalette_194, ANIM_TAG_MOON }, + { gBattleAnimSpritePalette_195, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpritePalette_196, ANIM_TAG_SPIRAL }, + { gBattleAnimSpritePalette_197, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpritePalette_198, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpritePalette_199, ANIM_TAG_NAIL }, + { gBattleAnimSpritePalette_200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpritePalette_201, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpritePalette_202, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpritePalette_203, ANIM_TAG_THIN_RING }, + { gBattleAnimSpritePalette_204, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpritePalette_205, ANIM_TAG_BELL }, + { gBattleAnimSpritePalette_206, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpritePalette_207, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpritePalette_167, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpritePalette_209, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpritePalette_210, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpritePalette_211, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpritePalette_215, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpritePalette_216, ANIM_TAG_RED_HEART }, + { gBattleAnimSpritePalette_217, ANIM_TAG_RED_ORB }, + { gBattleAnimSpritePalette_218, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpritePalette_219, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpritePalette_220, ANIM_TAG_ANGEL }, + { gBattleAnimSpritePalette_221, ANIM_TAG_DEVIL }, + { gBattleAnimSpritePalette_222, ANIM_TAG_SWIPE }, + { gBattleAnimSpritePalette_223, ANIM_TAG_ROOTS }, + { gBattleAnimSpritePalette_224, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpritePalette_225, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpritePalette_226, ANIM_TAG_POKEBALL }, + { gBattleAnimSpritePalette_226, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpritePalette_228, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpritePalette_229, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpritePalette_230, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpritePalette_233, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpritePalette_234, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpritePalette_235, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpritePalette_236, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpritePalette_237, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpritePalette_238, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpritePalette_239, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpritePalette_240, ANIM_TAG_CONFETTI }, + { gBattleAnimSpritePalette_241, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpritePalette_242, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpritePalette_243, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpritePalette_244, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpritePalette_064, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpritePalette_248, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpritePalette_249, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpritePalette_249, ANIM_TAG_X_SIGN }, + { gBattleAnimSpritePalette_251, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpritePalette_252, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpritePalette_253, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpritePalette_254, ANIM_TAG_RED_BALL }, + { gBattleAnimSpritePalette_255, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpritePalette_256, ANIM_TAG_METEOR }, + { gBattleAnimSpritePalette_257, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpritePalette_258, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpritePalette_259, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpritePalette_260, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpritePalette_261, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpritePalette_262, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpritePalette_263, ANIM_TAG_HAIL }, + { gBattleAnimSpritePalette_264, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpritePalette_265, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpritePalette_266, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpritePalette_267, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_268, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpritePalette_269, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpritePalette_270, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpritePalette_271, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SPLASH }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpritePalette_277, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpritePalette_278, ANIM_TAG_RECYCLE }, + { gBattleAnimSpritePalette_279, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpritePalette_280, ANIM_TAG_PROTECT }, + { gBattleAnimSpritePalette_281, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpritePalette_282, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpritePalette_283, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpritePalette_284, ANIM_TAG_BIRD }, + { gBattleAnimSpritePalette_285, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpritePalette_286, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpritePalette_287, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpritePalette_288, ANIM_TAG_BLUE_RING_2 }, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 92099c495..5daf7bb50 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -41,8 +41,8 @@ static const struct SubspriteTable gSubspriteTables_83931D8[] = static const struct SpriteTemplate gSpriteTemplate_83931E0 = { - .tileTag = 10010, - .paletteTag = 10010, + .tileTag = ANIM_TAG_ICE_CUBE, + .paletteTag = ANIM_TAG_ICE_CUBE, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -53,8 +53,8 @@ static const struct SpriteTemplate gSpriteTemplate_83931E0 = static void sub_807B870(struct Sprite *); static const struct SpriteTemplate gSpriteTemplate_83931F8 = { - .tileTag = 10136, - .paletteTag = 10136, + .tileTag = ANIM_TAG_CIRCLE_IMPACT, + .paletteTag = ANIM_TAG_CIRCLE_IMPACT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 4614f9aa9..af7397c23 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_840217C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = { - .tileTag = 10137, - .paletteTag = 10137, + .tileTag = ANIM_TAG_SCRATCH, + .paletteTag = ANIM_TAG_SCRATCH, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_840217C, .images = NULL, @@ -168,8 +168,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = { - .tileTag = 10016, - .paletteTag = 10016, + .tileTag = ANIM_TAG_BLACK_SMOKE, + .paletteTag = ANIM_TAG_BLACK_SMOKE, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -179,8 +179,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021B0 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -203,8 +203,8 @@ const union AnimCmd *const gSpriteAnimTable_84021D8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = { - .tileTag = 10190, - .paletteTag = 10190, + .tileTag = ANIM_TAG_OPENING_EYE, + .paletteTag = ANIM_TAG_OPENING_EYE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84021D8, .images = NULL, @@ -214,8 +214,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = { - .tileTag = 10191, - .paletteTag = 10191, + .tileTag = ANIM_TAG_ROUND_WHITE_HALO, + .paletteTag = ANIM_TAG_ROUND_WHITE_HALO, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840220C = { - .tileTag = 10189, - .paletteTag = 10189, + .tileTag = ANIM_TAG_TEAL_ALERT, + .paletteTag = ANIM_TAG_TEAL_ALERT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -257,8 +257,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_840225C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = { - .tileTag = 10187, - .paletteTag = 10187, + .tileTag = ANIM_TAG_EYE, + .paletteTag = ANIM_TAG_EYE, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -268,8 +268,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840227C = { - .tileTag = 10152, - .paletteTag = 10152, + .tileTag = ANIM_TAG_SPIKES, + .paletteTag = ANIM_TAG_SPIKES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -294,8 +294,8 @@ const union AnimCmd *const gSpriteAnimTable_84022AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022B0 = { - .tileTag = 10027, - .paletteTag = 10027, + .tileTag = ANIM_TAG_LEER, + .paletteTag = ANIM_TAG_LEER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84022AC, .images = NULL, @@ -328,8 +328,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84022EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022F0 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_84022D0, .images = NULL, @@ -365,8 +365,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402338[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840233C = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_840231C, .images = NULL, @@ -396,8 +396,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402384[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -407,8 +407,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -418,8 +418,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023BC = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -442,8 +442,8 @@ const union AnimCmd *const gSpriteAnimTable_84023E4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023E8 = { - .tileTag = 10229, - .paletteTag = 10229, + .tileTag = ANIM_TAG_RAPID_SPIN, + .paletteTag = ANIM_TAG_RAPID_SPIN, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_84023E4, .images = NULL, @@ -486,8 +486,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402454[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402458 = { - .tileTag = 10230, - .paletteTag = 10230, + .tileTag = ANIM_TAG_TRI_FORCE_TRIANGLE, + .paletteTag = ANIM_TAG_TRI_FORCE_TRIANGLE, .oam = &gOamData_837DFFC, .anims = gSpriteAnimTable_8402428, .images = NULL, @@ -515,8 +515,8 @@ const union AnimCmd *const gSpriteAnimTable_8402494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402498 = { - .tileTag = 10234, - .paletteTag = 10234, + .tileTag = ANIM_TAG_ECLIPSING_ORB, + .paletteTag = ANIM_TAG_ECLIPSING_ORB, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_8402494, .images = NULL, @@ -534,8 +534,8 @@ const union AffineAnimCmd gUnknown_084024B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = { - .tileTag = 10226, - .paletteTag = 10226, + .tileTag = ANIM_TAG_POKEBALL, + .paletteTag = ANIM_TAG_POKEBALL, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -545,8 +545,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -556,8 +556,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = const struct SpriteTemplate gSpriteTemplate_8402500 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -587,8 +587,8 @@ const union AffineAnimCmd gUnknown_08402540[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402578 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -642,8 +642,8 @@ const union AnimCmd *const gSpriteAnimTable_84025E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC = { - .tileTag = 10241, - .paletteTag = 10241, + .tileTag = ANIM_TAG_GREEN_STAR, + .paletteTag = ANIM_TAG_GREEN_STAR, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84025E0, .images = NULL, @@ -678,8 +678,8 @@ const union AffineAnimCmd gUnknown_08402610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402630 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -728,8 +728,8 @@ const union AnimCmd *const gSpriteAnimTable_8402698[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026A4 = { - .tileTag = 10238, - .paletteTag = 10238, + .tileTag = ANIM_TAG_PINK_PETAL, + .paletteTag = ANIM_TAG_PINK_PETAL, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_8402698, .images = NULL, @@ -754,8 +754,8 @@ const union AnimCmd *const gSpriteAnimTable_84026EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = { - .tileTag = 10239, - .paletteTag = 10239, + .tileTag = ANIM_TAG_PAIN_SPLIT, + .paletteTag = ANIM_TAG_PAIN_SPLIT, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84026EC, .images = NULL, @@ -765,8 +765,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = { - .tileTag = 10240, - .paletteTag = 10240, + .tileTag = ANIM_TAG_CONFETTI, + .paletteTag = ANIM_TAG_CONFETTI, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -776,8 +776,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -787,8 +787,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402738 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -839,8 +839,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84027E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84027EC = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -890,8 +890,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -909,8 +909,8 @@ const union AffineAnimCmd gUnknown_084028AC[] = const struct SpriteTemplate gSpriteTemplate_84028CC = { - .tileTag = 10243, - .paletteTag = 10243, + .tileTag = ANIM_TAG_SWEAT_DROP, + .paletteTag = ANIM_TAG_SWEAT_DROP, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -942,8 +942,8 @@ const union AnimCmd *const gSpriteAnimTable_840292C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = { - .tileTag = 10053, - .paletteTag = 10053, + .tileTag = ANIM_TAG_NOISE_LINE, + .paletteTag = ANIM_TAG_NOISE_LINE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_840292C, .images = NULL, @@ -953,8 +953,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = const struct SpriteTemplate gSpriteTemplate_840294C = { - .tileTag = 10248, - .paletteTag = 10248, + .tileTag = ANIM_TAG_SMALL_RED_EYE, + .paletteTag = ANIM_TAG_SMALL_RED_EYE, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -964,8 +964,8 @@ const struct SpriteTemplate gSpriteTemplate_840294C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402964 = { - .tileTag = 10252, - .paletteTag = 10252, + .tileTag = ANIM_TAG_PAW_PRINT, + .paletteTag = ANIM_TAG_PAW_PRINT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -994,8 +994,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84029A4[] = const struct SpriteTemplate gSpriteTemplate_84029AC = { - .tileTag = 10254, - .paletteTag = 10254, + .tileTag = ANIM_TAG_RED_BALL, + .paletteTag = ANIM_TAG_RED_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1005,8 +1005,8 @@ const struct SpriteTemplate gSpriteTemplate_84029AC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029C4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1023,8 +1023,8 @@ const union AffineAnimCmd gUnknown_084029DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = { - .tileTag = 10255, - .paletteTag = 10255, + .tileTag = ANIM_TAG_SMELLINGSALT_EFFECT, + .paletteTag = ANIM_TAG_SMELLINGSALT_EFFECT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1034,8 +1034,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1045,8 +1045,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = { - .tileTag = 10258, - .paletteTag = 10258, + .tileTag = ANIM_TAG_MAGNIFYING_GLASS, + .paletteTag = ANIM_TAG_MAGNIFYING_GLASS, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1056,8 +1056,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1067,8 +1067,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = const struct SpriteTemplate gSpriteTemplate_8402A54 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1078,8 +1078,8 @@ const struct SpriteTemplate gSpriteTemplate_8402A54 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = { - .tileTag = 10250, - .paletteTag = 10250, + .tileTag = ANIM_TAG_X_SIGN, + .paletteTag = ANIM_TAG_X_SIGN, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1089,8 +1089,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = const struct SpriteTemplate gSpriteTemplate_8402A84 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1132,8 +1132,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402ADC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402AE4 = { - .tileTag = 10277, - .paletteTag = 10277, + .tileTag = ANIM_TAG_SLAM_HIT_2, + .paletteTag = ANIM_TAG_SLAM_HIT_2, .oam = &gOamData_837DF9C, .anims = gSpriteAnimTable_8402AA8, .images = NULL, @@ -1154,8 +1154,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402B0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402B10 = { - .tileTag = 10278, - .paletteTag = 10278, + .tileTag = ANIM_TAG_RECYCLE, + .paletteTag = ANIM_TAG_RECYCLE, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 312cdf8c9..2ad17c3b2 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -351,8 +351,8 @@ const u16 gUnknown_0840B4D4[] = static void sub_8141C30(struct Sprite *sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_840B4FC = { - .tileTag = 10269, - .paletteTag = 10269, + .tileTag = ANIM_TAG_UNUSED_RED_BRICK, + .paletteTag = ANIM_TAG_UNUSED_RED_BRICK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, |