diff options
| author | garak <garakmon@gmail.com> | 2018-10-22 10:36:43 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-22 10:36:43 -0400 |
| commit | d267fcbfb10d3bbc4ecc560fb189986351024455 (patch) | |
| tree | 0dfe49e0ac50dbdd2535d6e22fc14dc0ea1b32d8 /data | |
| parent | 2b9fd18dd4a62e872a566b5fc8a8cf178d4a5ca5 (diff) | |
name remaining tags
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_80A9C70.s | 5 | ||||
| -rw-r--r-- | data/battle_anim_80FE840.s | 422 | ||||
| -rw-r--r-- | data/battle_anim_815A0D4.s | 79 | ||||
| -rw-r--r-- | data/battle_anim_8170478.s | 3 | ||||
| -rw-r--r-- | data/battle_anim_scripts.s | 772 |
5 files changed, 642 insertions, 639 deletions
diff --git a/data/battle_anim_80A9C70.s b/data/battle_anim_80A9C70.s index 892984c64..96c94ef39 100644 --- a/data/battle_anim_80A9C70.s +++ b/data/battle_anim_80A9C70.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -26,11 +27,11 @@ gUnknown_0853EE34:: @ 853EE34 .align 2 gUnknown_0853EE38:: @ 853EE38 - spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 + spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30 .align 2 gUnknown_0853EE50:: @ 853EE50 - spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 + spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4 .align 2 gUnknown_0853EE68:: @ 853EE68 diff --git a/data/battle_anim_80FE840.s b/data/battle_anim_80FE840.s index 7b8f63f9e..7dda39e41 100644 --- a/data/battle_anim_80FE840.s +++ b/data/battle_anim_80FE840.s @@ -90,15 +90,15 @@ gUnknown_085921DC:: @ 85921DC .align 2 gUnknown_085921E0:: @ 859216E0 - spr_template 0x27a3, 0x27a3, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_085921DC, sub_80FE8E0 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_085921DC, sub_80FE8E0 .align 2 gUnknown_085921F8:: @ 859216F8 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FE930 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FE930 .align 2 gUnknown_08592210:: @ 8592210 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921C4, NULL, gDummySpriteAffineAnimTable, sub_80FE988 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524904, gUnknown_085921C4, NULL, gDummySpriteAffineAnimTable, sub_80FE988 .align 2 gUnknown_08592228:: @ 8592228 @@ -111,7 +111,7 @@ gUnknown_08592240:: @ 8592240 .align 2 gUnknown_08592244:: @ 85922144 - spr_template 0x27fb, 0x27fb, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08592240, sub_80FE8E0 + spr_template ANIM_TAG_GRAY_ORB, ANIM_TAG_GRAY_ORB, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08592240, sub_80FE8E0 .align 2 gUnknown_0859225C:: @ 859225C @@ -123,11 +123,11 @@ gUnknown_0859226C:: @ 859226C .align 2 gUnknown_08592270:: @ 8592270 - spr_template 0x27a3, 0x27a3, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_0859226C, sub_80FEAD8 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524A8C, gUnknown_085921C8, NULL, gUnknown_0859226C, sub_80FEAD8 .align 2 gUnknown_08592288:: @ 8592288 - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FEB44 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524904, gUnknown_085921A8, NULL, gDummySpriteAffineAnimTable, sub_80FEB44 .align 2 gUnknown_085922A0:: @ 85922A0 @@ -161,7 +161,7 @@ gUnknown_085922E4:: @ 85922E4 .align 2 gUnknown_085922EC:: @ 85922EC - spr_template 0x27ae, 0x27ae, gUnknown_0852490C, gUnknown_085922E4, NULL, gDummySpriteAffineAnimTable, sub_80FED28 + spr_template ANIM_TAG_SPORE, ANIM_TAG_SPORE, gUnknown_0852490C, gUnknown_085922E4, NULL, gDummySpriteAffineAnimTable, sub_80FED28 .align 2 gUnknown_08592304:: @ 8592304 @@ -181,11 +181,11 @@ gUnknown_08592318:: @ 8592318 .align 2 gUnknown_0859231C:: @ 859231C - spr_template 0x27af, 0x27af, gUnknown_0852490C, gUnknown_08592314, NULL, gDummySpriteAffineAnimTable, sub_80FEE78 + spr_template ANIM_TAG_FLOWER, ANIM_TAG_FLOWER, gUnknown_0852490C, gUnknown_08592314, NULL, gDummySpriteAffineAnimTable, sub_80FEE78 .align 2 gUnknown_08592334:: @ 8592334 - spr_template 0x27af, 0x27af, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_80FEF44 + spr_template ANIM_TAG_FLOWER, ANIM_TAG_FLOWER, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_80FEF44 .align 2 gUnknown_0859234C:: @ 859234C @@ -220,7 +220,7 @@ gUnknown_085923D4:: @ 85923D4 .align 2 gUnknown_085923D8:: @ 85923D8 - spr_template 0x27b0, 0x27b0, gUnknown_08524934, gUnknown_085923D4, NULL, gDummySpriteAffineAnimTable, sub_80FF0F4 + spr_template ANIM_TAG_RAZOR_LEAF, ANIM_TAG_RAZOR_LEAF, gUnknown_08524934, gUnknown_085923D4, NULL, gDummySpriteAffineAnimTable, sub_80FF0F4 .align 2 gUnknown_085923F0:: @ 85923F0 @@ -232,7 +232,7 @@ gUnknown_08592400:: @ 8592400 .align 2 gSwiftStarSpriteTemplate:: @ 8592404 - spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4 + spr_template ANIM_TAG_YELLOW_STAR, ANIM_TAG_YELLOW_STAR, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4 .align 2 gUnknown_0859241C:: @ 859241C @@ -262,7 +262,7 @@ gUnknown_0859248C:: @ 859248C .align 2 gUnknown_08592494:: @ 8592494 - spr_template 0x27ca, 0x27ca, gUnknown_0852499C, gUnknown_08592444, NULL, gUnknown_0859248C, sub_80FF374 + spr_template ANIM_TAG_TENDRILS, ANIM_TAG_TENDRILS, gUnknown_0852499C, gUnknown_08592444, NULL, gUnknown_0859248C, sub_80FF374 .align 2 gUnknown_085924AC:: @ 85924AC @@ -279,7 +279,7 @@ gUnknown_085924D4:: @ 85924D4 .align 2 gUnknown_085924DC:: @ 85924DC - spr_template 0x27a3, 0x27a3, gUnknown_085249CC, gUnknown_085921C8, NULL, gUnknown_085924D4, sub_80FF698 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_085249CC, gUnknown_085921C8, NULL, gUnknown_085924D4, sub_80FF698 .align 2 gUnknown_085924F4:: @ 85924F4 @@ -306,11 +306,11 @@ gUnknown_0859253C:: @ 859253C .align 2 gUnknown_0859254C:: @ 859254C - spr_template 0x27ef, 0x27ef, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF768 + spr_template ANIM_TAG_ROOTS, ANIM_TAG_ROOTS, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF768 .align 2 gUnknown_08592564:: @ 8592564 - spr_template 0x27ef, 0x27ef, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF7EC + spr_template ANIM_TAG_ROOTS, ANIM_TAG_ROOTS, gUnknown_08524914, gUnknown_0859253C, NULL, gDummySpriteAffineAnimTable, sub_80FF7EC .align 2 gUnknown_0859257C:: @ 859257C @@ -322,7 +322,7 @@ gUnknown_08592588:: @ 8592588 .align 2 gUnknown_0859258C:: @ 859258C - spr_template 0x27a3, 0x27a3, gUnknown_08524904, gUnknown_08592588, NULL, gDummySpriteAffineAnimTable, sub_80FF934 + spr_template ANIM_TAG_ORBS, ANIM_TAG_ORBS, gUnknown_08524904, gUnknown_08592588, NULL, gDummySpriteAffineAnimTable, sub_80FF934 .align 2 gUnknown_085925A4:: @ 85925A4 @@ -351,11 +351,11 @@ gUnknown_08592608:: @ 8592608 .align 2 gUnknown_08592610:: @ 8592610 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18 + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18 .align 2 gBattleAnimSpriteTemplate_8592628:: @ 8592628 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4 + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4 .align 2 gUnknown_08592640:: @ 8592640 @@ -367,11 +367,11 @@ gUnknown_08592654:: @ 8592654 .align 2 gUnknown_08592658:: @ 8592658 - spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592654, NULL, gDummySpriteAffineAnimTable, sub_80FFC70 + spr_template ANIM_TAG_GREEN_SPARKLE, ANIM_TAG_GREEN_SPARKLE, gUnknown_0852490C, gUnknown_08592654, NULL, gDummySpriteAffineAnimTable, sub_80FFC70 .align 2 gUnknown_08592670:: @ 8592670 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFCB4 + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFCB4 .align 2 gUnknown_08592688:: @ 8592688 @@ -393,7 +393,7 @@ gUnknown_085926D8:: @ 85926D8 .align 2 gUnknown_085926E8:: @ 85926E8 - spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_085926D8, sub_80FFDBC + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_085926D8, sub_80FFDBC .align 2 gUnknown_08592700:: @ 8592700 @@ -454,11 +454,11 @@ gUnknown_085927A8:: @ 85927A8 .align 2 gUnknown_085927AC:: @ 85927AC - spr_template 0x27af, 0x27af, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_8100640 + spr_template ANIM_TAG_FLOWER, ANIM_TAG_FLOWER, gUnknown_08524904, gUnknown_08592318, NULL, gDummySpriteAffineAnimTable, sub_8100640 .align 2 gUnknown_085927C4:: @ 85927C4 - spr_template 0x27af, 0x27af, gUnknown_0852496C, gUnknown_08592314, NULL, gUnknown_085927A8, sub_8100640 + spr_template ANIM_TAG_FLOWER, ANIM_TAG_FLOWER, gUnknown_0852496C, gUnknown_08592314, NULL, gUnknown_085927A8, sub_8100640 .align 2 gUnknown_085927DC:: @ 85927DC @@ -489,15 +489,15 @@ gUnknown_0859282C:: @ 859282C .align 2 gUnknown_08592830:: @ 8592830 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592824, sub_8100640 + spr_template ANIM_TAG_SPARKLE_6, ANIM_TAG_SPARKLE_6, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592824, sub_8100640 .align 2 gUnknown_08592848:: @ 8592848 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592828, sub_8100640 + spr_template ANIM_TAG_SPARKLE_6, ANIM_TAG_SPARKLE_6, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08592828, sub_8100640 .align 2 gUnknown_08592860:: @ 8592860 - spr_template 0x281f, 0x281f, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859282C, sub_8100640 + spr_template ANIM_TAG_SPARKLE_6, ANIM_TAG_SPARKLE_6, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859282C, sub_8100640 .align 2 gUnknown_08592878:: @ 8592878 @@ -505,7 +505,7 @@ gUnknown_08592878:: @ 8592878 .align 2 gUnknown_08592888:: @ 8592888 - spr_template 0x281a, 0x281a, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100898 + spr_template ANIM_TAG_GREEN_SPIKE, ANIM_TAG_GREEN_SPIKE, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100898 .align 2 gUnknown_085928A0:: @ 85928A0 @@ -526,7 +526,7 @@ gUnknown_085928D0:: @ 85928D0 .align 2 gUnknown_085928E8:: @ 85928E8 - spr_template 0x282f, 0x282f, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50 + spr_template ANIM_TAG_WHIP_HIT, ANIM_TAG_WHIP_HIT, gUnknown_08524914, gUnknown_085928C8, NULL, gDummySpriteAffineAnimTable, sub_8100A50 .align 2 gUnknown_08592900:: @ 8592900 @@ -589,7 +589,7 @@ gUnknown_085929CC:: @ 85929CC .align 2 gUnknown_085929EC:: @ 85929EC - spr_template 0x279f, 0x279f, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085929CC, sub_8100A94 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085929CC, sub_8100A94 .align 2 gUnknown_08592A04:: @ 8592A04 @@ -601,11 +601,11 @@ gUnknown_08592A18:: @ 8592A18 .align 2 gCuttingSliceSpriteTemplate:: @ 8592A1C - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0 + spr_template ANIM_TAG_CUT, ANIM_TAG_CUT, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0 .align 2 gUnknown_08592A34:: @ 8592A34 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100B88 + spr_template ANIM_TAG_CUT, ANIM_TAG_CUT, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100B88 .align 2 gUnknown_08592A4C:: @ 8592A4C @@ -666,7 +666,7 @@ gUnknown_08592AC4:: @ 8592AC4 .align 2 gUnknown_08592ADC:: @ 8592ADC - spr_template 0x2828, 0x2828, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100EF0 + spr_template ANIM_TAG_PROTECT, ANIM_TAG_PROTECT, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8100EF0 .align 2 gUnknown_08592AF4:: @ 8592AF4 @@ -753,7 +753,7 @@ gUnknown_08592C80:: @ 8592C80 .align 2 gUnknown_08592C88:: @ 8592C88 - spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_08592C1C, NULL, gUnknown_08592C80, sub_81014F4 + spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_08592C1C, NULL, gUnknown_08592C80, sub_81014F4 .align 2 gUnknown_08592CA0:: @ 8592CA0 @@ -790,15 +790,15 @@ gUnknown_08592D24:: @ 8592D24 .align 2 gUnknown_08592D2C:: @ 8592D2C - spr_template 0x27c7, 0x27c7, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101F40 + spr_template ANIM_TAG_SLASH, ANIM_TAG_SLASH, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101F40 .align 2 gUnknown_08592D44:: @ 8592D44 - spr_template 0x282e, 0x282e, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FA8 + spr_template ANIM_TAG_SLASH_2, ANIM_TAG_SLASH_2, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FA8 .align 2 gUnknown_08592D5C:: @ 8592D5C - spr_template 0x282e, 0x282e, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FF0 + spr_template ANIM_TAG_SLASH_2, ANIM_TAG_SLASH_2, gUnknown_08524914, gUnknown_08592D24, NULL, gDummySpriteAffineAnimTable, sub_8101FF0 .align 2 gUnknown_08592D74:: @ 8592D74 @@ -810,7 +810,7 @@ gUnknown_08592D88:: @ 8592D88 .align 2 gUnknown_08592D8C:: @ 8592D8C - spr_template 0x27c8, 0x27c8, gUnknown_08524954, gUnknown_08592D88, NULL, gDummySpriteAffineAnimTable, sub_81020D8 + spr_template ANIM_TAG_FOCUS_ENERGY, ANIM_TAG_FOCUS_ENERGY, gUnknown_08524954, gUnknown_08592D88, NULL, gDummySpriteAffineAnimTable, sub_81020D8 .align 2 gUnknown_08592DA4:: @ 8592DA4 @@ -825,7 +825,7 @@ gUnknown_08592DE0:: @ 8592DE0 .align 2 gUnknown_08592DE4:: @ 8592DE4 - spr_template 0x27c9, 0x27c9, gUnknown_08524914, gUnknown_08592DE0, NULL, gDummySpriteAffineAnimTable, sub_810217C + spr_template ANIM_TAG_SPHERE_TO_CUBE, ANIM_TAG_SPHERE_TO_CUBE, gUnknown_08524914, gUnknown_08592DE0, NULL, gDummySpriteAffineAnimTable, sub_810217C .align 2 gUnknown_08592DFC:: @ 8592DFC @@ -878,7 +878,7 @@ gUnknown_08592EA4:: @ 8592EA4 .align 2 gUnknown_08592EBC:: @ 8592EBC - spr_template 0x27d2, 0x27d2, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81024E0 + spr_template ANIM_TAG_MOON, ANIM_TAG_MOON, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81024E0 .align 2 gUnknown_08592ED4:: @ 8592ED4 @@ -890,7 +890,7 @@ gUnknown_08592EE8:: @ 8592EE8 .align 2 gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC - spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540 + spr_template ANIM_TAG_GREEN_SPARKLE, ANIM_TAG_GREEN_SPARKLE, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540 .align 2 gUnknown_08592F04:: @ 8592F04 @@ -920,7 +920,7 @@ gUnknown_08592F70:: @ 8592F70 .align 2 gUnknown_08592F74:: @ 8592F74 - spr_template 0x27d0, 0x27d0, gUnknown_08524914, gUnknown_08592F70, NULL, gDummySpriteAffineAnimTable, sub_8102BCC + spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_08524914, gUnknown_08592F70, NULL, gDummySpriteAffineAnimTable, sub_8102BCC .align 2 gUnknown_08592F8C:: @ 8592F8C @@ -990,7 +990,7 @@ gUnknown_08593050:: @ 8593050 .align 2 gUnknown_08593068:: @ 8593068 - spr_template 0x27d1, 0x27d1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8102FB8 + spr_template ANIM_TAG_PURPLE_HAND_OUTLINE, ANIM_TAG_PURPLE_HAND_OUTLINE, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8102FB8 .align 2 gUnknown_08593080:: @ 8593080 @@ -1030,7 +1030,7 @@ gUnknown_08593104:: @ 8593104 .align 2 gUnknown_08593114:: @ 8593114 - spr_template 0x27e1, 0x27e1, gUnknown_08524914, gUnknown_08593104, NULL, gDummySpriteAffineAnimTable, sub_8103164 + spr_template ANIM_TAG_THOUGHT_BUBBLE, ANIM_TAG_THOUGHT_BUBBLE, gUnknown_08524914, gUnknown_08593104, NULL, gDummySpriteAffineAnimTable, sub_8103164 .align 2 gUnknown_0859312C:: @ 859312C @@ -1087,7 +1087,7 @@ gUnknown_0859323C:: @ 859323C .align 2 gUnknown_0859324C:: @ 859324C - spr_template 0x27e6, 0x27e6, gUnknown_08524914, gUnknown_0859323C, NULL, gDummySpriteAffineAnimTable, sub_8103390 + spr_template ANIM_TAG_FINGER_2, ANIM_TAG_FINGER_2, gUnknown_08524914, gUnknown_0859323C, NULL, gDummySpriteAffineAnimTable, sub_8103390 .align 2 gUnknown_08593264:: @ 8593264 @@ -1111,7 +1111,7 @@ gUnknown_085932A0:: @ 85932A0 .align 2 gUnknown_085932B8:: @ 85932B8 - spr_template 0x27a1, 0x27a1, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_8103620 + spr_template ANIM_TAG_CLAMP, ANIM_TAG_CLAMP, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_8103620 .align 2 gUnknown_085932D0:: @ 85932D0 @@ -1191,27 +1191,27 @@ gUnknown_08593424:: @ 8593424 .align 2 gSupersonicWaveSpriteTemplate:: @ 8593428 - spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation + spr_template ANIM_TAG_GOLD_RING, ANIM_TAG_GOLD_RING, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gScreechWaveSpriteTemplate:: @ 8593440 - spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation + spr_template ANIM_TAG_PURPLE_RING, ANIM_TAG_PURPLE_RING, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08593458:: @ 8593458 - spr_template 0x2814, 0x2814, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation + spr_template ANIM_TAG_METAL_SOUND_WAVES, ANIM_TAG_METAL_SOUND_WAVES, gUnknown_08524A1C, gDummySpriteAnimTable, NULL, gUnknown_08593420, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08593470:: @ 8593470 - spr_template 0x2830, 0x2830, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593424, sub_8108C94 + spr_template ANIM_TAG_BLUE_RING_2, ANIM_TAG_BLUE_RING_2, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593424, sub_8108C94 .align 2 gUnknown_08593488:: @ 8593488 - spr_template 0x27bf, 0x27bf, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC + spr_template ANIM_TAG_LARGE_FRESH_EGG, ANIM_TAG_LARGE_FRESH_EGG, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC .align 2 gUnknown_085934A0:: @ 85934A0 - spr_template 0x27c2, 0x27c2, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103FE8 + spr_template ANIM_TAG_UNUSED_VOID_LINES, ANIM_TAG_UNUSED_VOID_LINES, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8103FE8 .align 2 gUnknown_085934B8:: @ 85934B8 @@ -1276,7 +1276,7 @@ gUnknown_08593588:: @ 8593588 .align 2 gUnknown_08593590:: @ 8593590 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08593588, NULL, gDummySpriteAffineAnimTable, sub_8104364 + spr_template ANIM_TAG_CUT, ANIM_TAG_CUT, gUnknown_08524A34, gUnknown_08593588, NULL, gDummySpriteAffineAnimTable, sub_8104364 .align 2 gUnknown_085935A8:: @ 85935A8 @@ -1293,7 +1293,7 @@ gUnknown_085935C8:: @ 85935C8 .align 2 gUnknown_085935D0:: @ 85935D0 - spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_085935C8, NULL, gDummySpriteAffineAnimTable, sub_8104414 + spr_template ANIM_TAG_CUT, ANIM_TAG_CUT, gUnknown_08524A34, gUnknown_085935C8, NULL, gDummySpriteAffineAnimTable, sub_8104414 .align 2 gUnknown_085935E8:: @ 85935E8 @@ -1347,7 +1347,7 @@ gUnknown_085936D4:: @ 85936D4 .align 2 gUnknown_085936EC:: @ 85936EC - spr_template 0x27d5, 0x27d5, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7938 + spr_template ANIM_TAG_SNORE_Z, ANIM_TAG_SNORE_Z, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7938 .align 2 gUnknown_08593704:: @ 8593704 @@ -1359,7 +1359,7 @@ gUnknown_08593718:: @ 8593718 .align 2 gBattleAnimSpriteTemplate_859371C:: @ 859371C - spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_EXPLOSION, ANIM_TAG_EXPLOSION, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_08593734:: @ 8593734 @@ -1385,7 +1385,7 @@ gUnknown_085937A4:: @ 85937A4 .align 2 gUnknown_085937B0:: @ 85937B0 - spr_template 0x27da, 0x27da, gUnknown_08524AF4, gDummySpriteAnimTable, NULL, gUnknown_085937A4, sub_8105538 + spr_template ANIM_TAG_BREAKING_EGG, ANIM_TAG_BREAKING_EGG, gUnknown_08524AF4, gDummySpriteAnimTable, NULL, gUnknown_085937A4, sub_8105538 .align 2 gUnknown_085937C8:: @ 85937C8 @@ -1413,7 +1413,7 @@ gUnknown_08593818:: @ 8593818 .align 2 gUnknown_0859381C:: @ 859381C - spr_template 0x27db, 0x27db, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_80A77C8 + spr_template ANIM_TAG_THIN_RING, ANIM_TAG_THIN_RING, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_80A77C8 .align 2 gUnknown_08593834:: @ 8593834 @@ -1426,19 +1426,19 @@ gUnknown_0859384C:: @ 859384C .align 2 gUnknown_08593850:: @ 8593850 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_0859384C, sub_80A77C8 + spr_template ANIM_TAG_THIN_RING, ANIM_TAG_THIN_RING, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_0859384C, sub_80A77C8 .align 2 gUnknown_08593868:: @ 8593868 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81051C4 + spr_template ANIM_TAG_THIN_RING, ANIM_TAG_THIN_RING, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81051C4 .align 2 gUnknown_08593880:: @ 8593880 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4 + spr_template ANIM_TAG_THIN_RING, ANIM_TAG_THIN_RING, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4 .align 2 gBattleAnimSpriteTemplate_8593898:: @ 8593898 - spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8 + spr_template ANIM_TAG_THIN_RING, ANIM_TAG_THIN_RING, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8 .align 2 gUnknown_085938B0:: @ 85938B0 @@ -1455,7 +1455,7 @@ gUnknown_085938D8:: @ 85938D8 .align 2 gUnknown_085938DC:: @ 85938DC - spr_template 0x27df, 0x27df, gUnknown_0852490C, gUnknown_085938D8, NULL, gDummySpriteAffineAnimTable, sub_8105C48 + spr_template ANIM_TAG_SPEED_DUST, ANIM_TAG_SPEED_DUST, gUnknown_0852490C, gUnknown_085938D8, NULL, gDummySpriteAffineAnimTable, sub_8105C48 .align 2 gUnknown_085938F4:: @ 85938F4 @@ -1474,7 +1474,7 @@ gUnknown_08593934:: @ 8593934 .align 2 gUnknown_08593938:: @ 8593938 - spr_template 0x27dd, 0x27dd, gUnknown_08524914, gUnknown_08593934, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_BELL, ANIM_TAG_BELL, gUnknown_08524914, gUnknown_08593934, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_08593950:: @ 8593950 @@ -1482,11 +1482,11 @@ gUnknown_08593950:: @ 8593950 .align 2 gUnknown_08593958:: @ 8593958 - spr_template 0x27de, 0x27de, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105DE8 + spr_template ANIM_TAG_MUSIC_NOTES_2, ANIM_TAG_MUSIC_NOTES_2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105DE8 .align 2 gUnknown_08593970:: @ 8593970 - spr_template 0x27e2, 0x27e2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105E60 + spr_template ANIM_TAG_MAGENTA_HEART, ANIM_TAG_MAGENTA_HEART, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8105E60 .align 2 gUnknown_08593988:: @ 8593988 @@ -1495,15 +1495,15 @@ gUnknown_08593988:: @ 8593988 .align 2 gUnknown_085939A0:: @ 85939A0 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140 + spr_template ANIM_TAG_RED_HEART, ANIM_TAG_RED_HEART, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140 .align 2 gBattleAnimSpriteTemplate_85939B8:: @ 85939B8 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 + spr_template ANIM_TAG_RED_HEART, ANIM_TAG_RED_HEART, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 .align 2 gUnknown_085939D0:: @ 85939D0 - spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810624C + spr_template ANIM_TAG_RED_HEART, ANIM_TAG_RED_HEART, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810624C .align 2 gUnknown_085939E8:: @ 85939E8 @@ -1516,11 +1516,11 @@ gUnknown_08593A00:: @ 8593A00 .align 2 gHiddenPowerOrbSpriteTemplate:: @ 8593A04 - spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C + spr_template ANIM_TAG_RED_ORB, ANIM_TAG_RED_ORB, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C .align 2 gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C - spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878 + spr_template ANIM_TAG_RED_ORB, ANIM_TAG_RED_ORB, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878 .align 2 gUnknown_08593A34:: @ 8593A34 @@ -1533,7 +1533,7 @@ gUnknown_08593A4C:: @ 8593A4C .align 2 gUnknown_08593A50:: @ 8593A50 - spr_template 0x27fd, 0x27fd, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08593A4C, sub_8106944 + spr_template ANIM_TAG_RED_ORB_2, ANIM_TAG_RED_ORB_2, gUnknown_085249C4, gDummySpriteAnimTable, NULL, gUnknown_08593A4C, sub_8106944 .align 2 gUnknown_08593A68:: @ 8593A68 @@ -1546,7 +1546,7 @@ gUnknown_08593A80:: @ 8593A80 .align 2 gUnknown_08593A84:: @ 8593A84 - spr_template 0x27ea, 0x27ea, gUnknown_0852490C, gUnknown_08593A80, NULL, gDummySpriteAffineAnimTable, sub_81069B8 + spr_template ANIM_TAG_EYE_SPARKLE, ANIM_TAG_EYE_SPARKLE, gUnknown_0852490C, gUnknown_08593A80, NULL, gDummySpriteAffineAnimTable, sub_81069B8 .align 2 gUnknown_08593A9C:: @ 8593A9C @@ -1558,11 +1558,11 @@ gUnknown_08593AA4:: @ 8593AA4 .align 2 gUnknown_08593AA8:: @ 8593AA8 - spr_template 0x27ec, 0x27ec, gUnknown_08524914, gUnknown_08593AA4, NULL, gDummySpriteAffineAnimTable, sub_81069D0 + spr_template ANIM_TAG_ANGEL, ANIM_TAG_ANGEL, gUnknown_08524914, gUnknown_08593AA4, NULL, gDummySpriteAffineAnimTable, sub_81069D0 .align 2 gUnknown_08593AC0:: @ 8593AC0 - spr_template 0x27eb, 0x27eb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106AD0 + spr_template ANIM_TAG_PINK_HEART, ANIM_TAG_PINK_HEART, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106AD0 .align 2 gUnknown_08593AD8:: @ 8593AD8 @@ -1579,7 +1579,7 @@ gUnknown_08593AE8:: @ 8593AE8 .align 2 gUnknown_08593AF0:: @ 8593AF0 - spr_template 0x27ed, 0x27ed, gUnknown_08524914, gUnknown_08593AE8, NULL, gDummySpriteAffineAnimTable, sub_8106B54 + spr_template ANIM_TAG_DEVIL, ANIM_TAG_DEVIL, gUnknown_08524914, gUnknown_08593AE8, NULL, gDummySpriteAffineAnimTable, sub_8106B54 .align 2 gUnknown_08593B08:: @ 8593B08 @@ -1596,7 +1596,7 @@ gUnknown_08593B30:: @ 8593B30 .align 2 gUnknown_08593B38:: @ 8593B38 - spr_template 0x27ee, 0x27ee, gUnknown_08524914, gUnknown_08593B30, NULL, gDummySpriteAffineAnimTable, sub_8106C80 + spr_template ANIM_TAG_SWIPE, ANIM_TAG_SWIPE, gUnknown_08524914, gUnknown_08593B30, NULL, gDummySpriteAffineAnimTable, sub_8106C80 .align 2 gUnknown_08593B50:: @ 8593B50 @@ -1613,7 +1613,7 @@ gUnknown_08593B78:: @ 8593B78 .align 2 gUnknown_08593B80:: @ 8593B80 - spr_template 0x27e7, 0x27e7, gUnknown_08524914, gUnknown_08593B78, NULL, gDummySpriteAffineAnimTable, sub_8106CD0 + spr_template ANIM_TAG_MOVEMENT_WAVES, ANIM_TAG_MOVEMENT_WAVES, gUnknown_08524914, gUnknown_08593B78, NULL, gDummySpriteAffineAnimTable, sub_8106CD0 .align 2 gUnknown_08593B98:: @ 8593B98 @@ -1622,7 +1622,7 @@ gUnknown_08593B98:: @ 8593B98 .align 2 gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8 - spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00 + spr_template ANIM_TAG_JAGGED_MUSIC_NOTE, ANIM_TAG_JAGGED_MUSIC_NOTE, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00 .align 2 gUnknown_08593BD0:: @ 8593BD0 @@ -1644,11 +1644,11 @@ gUnknown_08593C00:: @ 8593C00 .align 2 gUnknown_08593C0C:: @ 8593C0C - spr_template 0x27de, 0x27de, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F60 + spr_template ANIM_TAG_MUSIC_NOTES_2, ANIM_TAG_MUSIC_NOTES_2, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F60 .align 2 gUnknown_08593C24:: @ 8593C24 - spr_template 0x27de, 0x27de, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F00 + spr_template ANIM_TAG_MUSIC_NOTES_2, ANIM_TAG_MUSIC_NOTES_2, gUnknown_0852496C, gUnknown_08592FCC, NULL, gUnknown_08593C00, sub_8106F00 .align 2 gUnknown_08593C3C:: @ 8593C3C @@ -1665,7 +1665,7 @@ gUnknown_08593C5C:: @ 8593C5C .align 2 gUnknown_08593C64:: @ 8593C64 - spr_template 0x2804, 0x2804, gUnknown_08524B1C, gDummySpriteAnimTable, NULL, gUnknown_08593C5C, sub_81070AC + spr_template ANIM_TAG_GUARD_RING, ANIM_TAG_GUARD_RING, gUnknown_08524B1C, gDummySpriteAnimTable, NULL, gUnknown_08593C5C, sub_81070AC .align 2 .incbin "graphics/unknown/unknown_593C80.4bpp" @@ -1684,7 +1684,7 @@ gUnknown_0859501C:: @ 859501C .align 2 gUnknown_08595020:: @ 8595020 - spr_template 0x2783, 0x2783, gUnknown_08524954, gUnknown_0859501C, NULL, gDummySpriteAffineAnimTable, sub_810721C + spr_template ANIM_TAG_RAIN_DROPS, ANIM_TAG_RAIN_DROPS, gUnknown_08524954, gUnknown_0859501C, NULL, gDummySpriteAffineAnimTable, sub_810721C .align 2 gUnknown_08595038:: @ 8595038 @@ -1705,7 +1705,7 @@ gUnknown_08595064:: @ 8595064 .align 2 gBattleAnimSpriteTemplate_8595068:: @ 8595068 - spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260 + spr_template ANIM_TAG_BUBBLE, ANIM_TAG_BUBBLE, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260 .align 2 gUnknown_08595080:: @ 8595080 @@ -1731,7 +1731,7 @@ gUnknown_085950B0:: @ 85950B0 .align 2 gUnknown_085950B4:: @ 85950B4 - spr_template 0x279c, 0x279c, gUnknown_08524A04, gUnknown_08595090, NULL, gUnknown_085950B0, sub_810744C + spr_template ANIM_TAG_RAINBOW_RINGS, ANIM_TAG_RAINBOW_RINGS, gUnknown_08524A04, gUnknown_08595090, NULL, gUnknown_085950B0, sub_810744C .align 2 gUnknown_085950CC:: @ 85950CC @@ -1743,19 +1743,19 @@ gUnknown_085950E0:: @ 85950E0 .align 2 gUnknown_085950E4:: @ 85950E4 - spr_template 0x27a5, 0x27a5, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC + spr_template ANIM_TAG_WATER_ORB, ANIM_TAG_WATER_ORB, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC .align 2 gUnknown_085950FC:: @ 85950FC - spr_template 0x2813, 0x2813, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC + spr_template ANIM_TAG_BROWN_ORB, ANIM_TAG_BROWN_ORB, gUnknown_08524A2C, gUnknown_085950E0, NULL, gDummySpriteAffineAnimTable, sub_81075EC .align 2 gUnknown_08595114:: @ 8595114 - spr_template 0x2818, 0x2818, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC + spr_template ANIM_TAG_GLOWY_RED_ORB, ANIM_TAG_GLOWY_RED_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC .align 2 gUnknown_0859512C:: @ 859512C - spr_template 0x2819, 0x2819, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC + spr_template ANIM_TAG_GLOWY_GREEN_ORB, ANIM_TAG_GLOWY_GREEN_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81075EC .align 2 gUnknown_08595144:: @ 8595144 @@ -1771,7 +1771,7 @@ gUnknown_08595158:: @ 8595158 .align 2 gUnknown_08595170:: @ 8595170 - spr_template 0x27b5, 0x27b5, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_81075EC + spr_template ANIM_TAG_BLUE_RING, ANIM_TAG_BLUE_RING, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_81075EC .align 2 gUnknown_08595188:: @ 8595188 @@ -1792,11 +1792,11 @@ gUnknown_085951BC:: @ 85951BC .align 2 gUnknown_085951C0:: @ 85951C0 - spr_template 0x27a5, 0x27a5, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951B8, sub_8107730 + spr_template ANIM_TAG_WATER_ORB, ANIM_TAG_WATER_ORB, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951B8, sub_8107730 .align 2 gUnknown_085951D8:: @ 85951D8 - spr_template 0x27a5, 0x27a5, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951BC, sub_81077C0 + spr_template ANIM_TAG_WATER_ORB, ANIM_TAG_WATER_ORB, gUnknown_08524AEC, gUnknown_085950E0, NULL, gUnknown_085951BC, sub_81077C0 .align 2 gUnknown_085951F0:: @ 85951F0 @@ -1816,23 +1816,23 @@ gUnknown_08595204:: @ 8595204 .align 2 gUnknown_08595208:: @ 8595208 - spr_template 0x27ab, 0x27ab, gUnknown_08524A2C, gUnknown_08595200, NULL, gDummySpriteAffineAnimTable, sub_80A78AC + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524A2C, gUnknown_08595200, NULL, gDummySpriteAffineAnimTable, sub_80A78AC .align 2 gUnknown_08595220:: @ 8595220 - spr_template 0x27ab, 0x27ab, gUnknown_08524AEC, gUnknown_08595204, NULL, gUnknown_08596208, sub_8107894 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524AEC, gUnknown_08595204, NULL, gUnknown_08596208, sub_8107894 .align 2 gUnknown_08595238:: @ 8595238 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB8, NULL, gDummySpriteAffineAnimTable, sub_81078D0 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524904, gUnknown_08595AB8, NULL, gDummySpriteAffineAnimTable, sub_81078D0 .align 2 gUnknown_08595250:: @ 8595250 - spr_template 0x27ab, 0x27ab, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8108034 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8108034 .align 2 gUnknown_08595268:: @ 8595268 - spr_template 0x281c, 0x281c, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810851C + spr_template ANIM_TAG_GLOWY_BLUE_ORB, ANIM_TAG_GLOWY_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810851C .align 2 gUnknown_08595280:: @ 8595280 @@ -1881,15 +1881,15 @@ gUnknown_085952F4:: @ 85952F4 .align 2 gUnknown_085952F8:: @ 85952F8 - spr_template 0x27ab, 0x27ab, gUnknown_08524904, gUnknown_08595298, NULL, gDummySpriteAffineAnimTable, sub_8108BE0 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524904, gUnknown_08595298, NULL, gDummySpriteAffineAnimTable, sub_8108BE0 .align 2 gUnknown_08595310:: @ 8595310 - spr_template 0x27ab, 0x27ab, gUnknown_08524964, gUnknown_08595298, NULL, gUnknown_085952EC, sub_8108C54 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524964, gUnknown_08595298, NULL, gUnknown_085952EC, sub_8108C54 .align 2 gUnknown_08595328:: @ 8595328 - spr_template 0x27ab, 0x27ab, gUnknown_0852496C, gUnknown_085952A0, NULL, gUnknown_085952F4, sub_80A8EE4 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_0852496C, gUnknown_085952A0, NULL, gUnknown_085952F4, sub_80A8EE4 .align 2 gUnknown_08595340:: @ 8595340 @@ -1979,7 +1979,7 @@ gUnknown_0859549C:: @ 859549C .align 2 gUnknown_085954A0:: @ 85954A0 - spr_template 0x27ad, 0x27ad, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_0859549C, sub_810916C + spr_template ANIM_TAG_SUNLIGHT, ANIM_TAG_SUNLIGHT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_0859549C, sub_810916C .align 2 gUnknown_085954B8:: @ 85954B8 @@ -2041,7 +2041,7 @@ gUnknown_0859559C:: @ 859559C .align 2 gUnknown_085955B4:: @ 85955B4 - spr_template 0x27d9, 0x27d9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81098EC + spr_template ANIM_TAG_WARM_ROCK, ANIM_TAG_WARM_ROCK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81098EC .align 2 gUnknown_085955CC:: @ 85955CC @@ -2050,7 +2050,7 @@ gUnknown_085955CC:: @ 85955CC .align 2 gUnknown_085955E8:: @ 85955E8 - spr_template 0x27d9, 0x27d9, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8109A10 + spr_template ANIM_TAG_WARM_ROCK, ANIM_TAG_WARM_ROCK, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8109A10 .align 2 gUnknown_08595600:: @ 8595600 @@ -2077,7 +2077,7 @@ gUnknown_0859562C:: @ 859562C .align 2 gUnknown_0859563C:: @ 859563C - spr_template 0x27f7, 0x27f7, gUnknown_0852490C, gUnknown_0859562C, NULL, gDummySpriteAffineAnimTable, sub_8109AFC + spr_template ANIM_TAG_WISP_ORB, ANIM_TAG_WISP_ORB, gUnknown_0852490C, gUnknown_0859562C, NULL, gDummySpriteAffineAnimTable, sub_8109AFC .align 2 gUnknown_08595654:: @ 8595654 @@ -2089,7 +2089,7 @@ gUnknown_08595668:: @ 8595668 .align 2 gUnknown_0859566C:: @ 859566C - spr_template 0x27f8, 0x27f8, gUnknown_08524914, gUnknown_08595668, NULL, gDummySpriteAffineAnimTable, sub_8109CB0 + spr_template ANIM_TAG_WISP_FIRE, ANIM_TAG_WISP_FIRE, gUnknown_08524914, gUnknown_08595668, NULL, gDummySpriteAffineAnimTable, sub_8109CB0 .align 2 gUnknown_08595684:: @ 8595684 @@ -2123,7 +2123,7 @@ gUnknown_085956F8:: @ 85956F8 .align 2 gUnknown_085956FC:: @ 85956FC - spr_template 0x279f, 0x279f, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085956F8, sub_810A214 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085956F8, sub_810A214 .align 2 gUnknown_08595714:: @ 8595714 @@ -2144,7 +2144,7 @@ gBattleAnimSpriteTemplate_859574C:: @ 859574C .align 2 gUnknown_08595764:: @ 8595764 - spr_template 0x27bb, 0x27bb, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation + spr_template ANIM_TAG_BLACK_BALL_2, ANIM_TAG_BLACK_BALL_2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_0859577C:: @ 859577C @@ -2177,7 +2177,7 @@ gUnknown_085957DC:: @ 85957DC .align 2 gBattleAnimSpriteTemplate_85957E0:: @ 85957E0 - spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC + spr_template ANIM_TAG_SHOCK_3, ANIM_TAG_SHOCK_3, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC .align 2 gBattleAnimSpriteTemplate_85957F8:: @ 85957F8 @@ -2217,7 +2217,7 @@ gUnknown_085958A0:: @ 85958A0 .align 2 gUnknown_085958A8:: @ 85958A8 - spr_template 0x27e3, 0x27e3, gUnknown_08524904, gUnknown_085958A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template ANIM_TAG_ELECTRIC_ORBS, ANIM_TAG_ELECTRIC_ORBS, gUnknown_08524904, gUnknown_085958A0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_085958C0:: @ 85958C0 @@ -2245,7 +2245,7 @@ gUnknown_08595950:: @ 8595950 .align 2 gUnknown_0859595C:: @ 859595C - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810ACD8 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810ACD8 .align 2 gUnknown_08595974:: @ 8595974 @@ -2257,11 +2257,11 @@ gUnknown_08595988:: @ 8595988 .align 2 gUnknown_0859598C:: @ 859598C - spr_template 0x27e5, 0x27e5, gUnknown_08524914, gUnknown_08595988, NULL, gDummySpriteAffineAnimTable, sub_810AD30 + spr_template ANIM_TAG_ELECTRICITY, ANIM_TAG_ELECTRICITY, gUnknown_08524914, gUnknown_08595988, NULL, gDummySpriteAffineAnimTable, sub_810AD30 .align 2 gUnknown_085959A4:: @ 85959A4 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810AD98 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810AD98 .align 2 gUnknown_085959BC:: @ 85959BC @@ -2300,7 +2300,7 @@ gUnknown_08595A00:: @ 8595A00 .align 2 gUnknown_08595A18:: @ 8595A18 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810B23C + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08595950, sub_810B23C .align 2 gUnknown_08595A30:: @ 8595A30 @@ -2316,7 +2316,7 @@ gUnknown_08595A54:: @ 8595A54 .align 2 gUnknown_08595A58:: @ 8595A58 - spr_template 0x279d, 0x279d, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810B6C4 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810B6C4 .align 2 gUnknown_08595A70:: @ 8595A70 @@ -2376,11 +2376,11 @@ gUnknown_08595ACC:: @ 8595ACC .align 2 gUnknown_08595AD0:: @ 8595AD0 - spr_template 0x279d, 0x279d, gUnknown_08524B24, gUnknown_08595AA8, NULL, gUnknown_08595ACC, sub_810B8AC + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524B24, gUnknown_08595AA8, NULL, gUnknown_08595ACC, sub_810B8AC .align 2 gUnknown_08595AE8:: @ 8595AE8 - spr_template 0x279d, 0x279d, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8AC + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8AC .align 2 gUnknown_08595B00:: @ 8595B00 @@ -2392,11 +2392,11 @@ gUnknown_08595B10:: @ 8595B10 .align 2 gUnknown_08595B14:: @ 8595B14 - spr_template 0x279d, 0x279d, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B10, sub_810B8EC + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B10, sub_810B8EC .align 2 gUnknown_08595B2C:: @ 8595B2C - spr_template 0x279d, 0x279d, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8EC + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524A24, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810B8EC .align 2 gUnknown_08595B44:: @ 8595B44 @@ -2409,23 +2409,23 @@ gUnknown_08595B64:: @ 8595B64 .align 2 gUnknown_08595B68:: @ 8595B68 - spr_template 0x279d, 0x279d, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B64, sub_810B974 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524AC4, gUnknown_08595AA8, NULL, gUnknown_08595B64, sub_810B974 .align 2 gUnknown_08595B80:: @ 8595B80 - spr_template 0x279d, 0x279d, gUnknown_08524A84, gUnknown_08595AAC, NULL, gUnknown_08595B64, sub_810B974 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524A84, gUnknown_08595AAC, NULL, gUnknown_08595B64, sub_810B974 .align 2 gUnknown_08595B98:: @ 8595B98 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BA24 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BA24 .align 2 gUnknown_08595BB0:: @ 8595BB0 - spr_template 0x279d, 0x279d, gUnknown_0852490C, gUnknown_08595AB4, NULL, gDummySpriteAffineAnimTable, sub_810BC94 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_0852490C, gUnknown_08595AB4, NULL, gDummySpriteAffineAnimTable, sub_810BC94 .align 2 gUnknown_08595BC8:: @ 8595BC8 - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BC94 + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524904, gUnknown_08595AB0, NULL, gDummySpriteAffineAnimTable, sub_810BC94 .align 2 gUnknown_08595BE0:: @ 8595BE0 @@ -2438,7 +2438,7 @@ gUnknown_08595C00:: @ 8595C00 .align 2 gUnknown_08595C04:: @ 8595C04 - spr_template 0x279e, 0x279e, gUnknown_08524A64, gUnknown_08595C00, NULL, gDummySpriteAffineAnimTable, sub_810BE48 + spr_template ANIM_TAG_ICE_SPIKES, ANIM_TAG_ICE_SPIKES, gUnknown_08524A64, gUnknown_08595C00, NULL, gDummySpriteAffineAnimTable, sub_810BE48 .align 2 gUnknown_08595C1C:: @ 8595C1C @@ -2450,11 +2450,11 @@ gUnknown_08595C28:: @ 8595C28 .align 2 gUnknown_08595C2C:: @ 8595C2C - spr_template 0x27a0, 0x27a0, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 + spr_template ANIM_TAG_MIST_CLOUD, ANIM_TAG_MIST_CLOUD, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 .align 2 gUnknown_08595C44:: @ 8595C44 - spr_template 0x27bc, 0x27bc, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 + spr_template ANIM_TAG_PURPLE_GAS_CLOUD, ANIM_TAG_PURPLE_GAS_CLOUD, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810BED0 .align 2 gUnknown_08595C5C:: @ 8595C5C @@ -2464,7 +2464,7 @@ gUnknown_08595C5C:: @ 8595C5C .align 2 gUnknown_08595C70:: @ 8595C70 - spr_template 0x27ab, 0x27ab, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810C2F0 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810C2F0 .align 2 gUnknown_08595C88:: @ 8595C88 @@ -2474,7 +2474,7 @@ gUnknown_08595C88:: @ 8595C88 .align 2 gUnknown_08595C9C:: @ 8595C9C - spr_template 0x27bc, 0x27bc, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810C560 + spr_template ANIM_TAG_PURPLE_GAS_CLOUD, ANIM_TAG_PURPLE_GAS_CLOUD, gUnknown_08524A54, gUnknown_08595C28, NULL, gDummySpriteAffineAnimTable, sub_810C560 .align 2 gUnknown_08595CB4:: @ 8595CB4 @@ -2512,11 +2512,11 @@ gUnknown_08595D28:: @ 8595D28 .align 2 gUnknown_08595D2C:: @ 8595D2C - spr_template 0x2817, 0x2817, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D1C, sub_810CB58 + spr_template ANIM_TAG_HAIL, ANIM_TAG_HAIL, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D1C, sub_810CB58 .align 2 gUnknown_08595D44:: @ 8595D44 - spr_template 0x2817, 0x2817, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D28, sub_80A8EE4 + spr_template ANIM_TAG_HAIL, ANIM_TAG_HAIL, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08595D28, sub_80A8EE4 .align 2 gUnknown_08595D5C:: @ 8595D5C @@ -2565,7 +2565,7 @@ gUnknown_08595DE4:: @ 8595DE4 .align 2 gUnknown_08595DFC:: @ 8595DFC - spr_template 0x279d, 0x279d, gUnknown_08524904, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810CD4C + spr_template ANIM_TAG_ICE_CRYSTALS, ANIM_TAG_ICE_CRYSTALS, gUnknown_08524904, gUnknown_08595AAC, NULL, gDummySpriteAffineAnimTable, sub_810CD4C .align 2 gUnknown_08595E14:: @ 8595E14 @@ -2607,27 +2607,27 @@ gUnknown_08595E60:: @ 8595E60 .align 2 gUnknown_08595E68:: @ 8595E68 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CE68 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CE68 .align 2 gUnknown_08595E80:: @ 8595E80 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4 .align 2 gFistFootSpriteTemplate:: @ 8595E98 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0 .align 2 gUnknown_08595EB0:: @ 8595EB0 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CF30 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CF30 .align 2 gUnknown_08595EC8:: @ 8595EC8 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E60, NULL, gDummySpriteAffineAnimTable, sub_810D10C + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E60, NULL, gDummySpriteAffineAnimTable, sub_810D10C .align 2 gUnknown_08595EE0:: @ 8595EE0 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D1B4 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D1B4 .align 2 gUnknown_08595EF8:: @ 8595EF8 @@ -2640,7 +2640,7 @@ gUnknown_08595F10:: @ 8595F10 .align 2 gUnknown_08595F14:: @ 8595F14 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F10, sub_810D278 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F10, sub_810D278 .align 2 gUnknown_08595F2C:: @ 8595F2C @@ -2653,11 +2653,11 @@ gUnknown_08595F44:: @ 8595F44 .align 2 gMegaPunchKickSpriteTemplate:: @ 8595F48 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278 .align 2 gUnknown_08595F60:: @ 8595F60 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D2E4 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E58, NULL, gDummySpriteAffineAnimTable, sub_810D2E4 .align 2 gUnknown_08595F78:: @ 8595F78 @@ -2665,11 +2665,11 @@ gUnknown_08595F78:: @ 8595F78 .align 2 gUnknown_08595F90:: @ 8595F90 - spr_template 0x27b7, 0x27b7, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D40C + spr_template ANIM_TAG_BLUE_LIGHT_WALL, ANIM_TAG_BLUE_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D40C .align 2 gUnknown_08595FA8:: @ 8595FA8 - spr_template 0x27e0, 0x27e0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D4F4 + spr_template ANIM_TAG_TORN_METAL, ANIM_TAG_TORN_METAL, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D4F4 .align 2 gUnknown_08595FC0:: @ 8595FC0 @@ -2683,19 +2683,19 @@ gUnknown_08595FE8:: @ 8595FE8 .align 2 gUnknown_08595FEC:: @ 8595FEC - spr_template 0x27e4, 0x27e4, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08595FE8, sub_810D608 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08595FE8, sub_810D608 .align 2 gUnknown_08596004:: @ 8596004 - spr_template 0x2811, 0x2811, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D714 + spr_template ANIM_TAG_FLAT_ROCK, ANIM_TAG_FLAT_ROCK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D714 .align 2 gUnknown_0859601C:: @ 859601C - spr_template 0x2810, 0x2810, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D874 + spr_template ANIM_TAG_METEOR, ANIM_TAG_METEOR, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810D874 .align 2 gUnknown_08596034:: @ 8596034 - spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810D984 + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810D984 .align 2 gUnknown_0859604C:: @ 859604C @@ -2717,7 +2717,7 @@ gUnknown_0859607C:: @ 859607C .align 2 gUnknown_08596088:: @ 8596088 - spr_template 0x2805, 0x2805, gUnknown_08524914, gUnknown_0859607C, NULL, gDummySpriteAffineAnimTable, sub_810DA10 + spr_template ANIM_TAG_PURPLE_SCRATCH, ANIM_TAG_PURPLE_SCRATCH, gUnknown_08524914, gUnknown_0859607C, NULL, gDummySpriteAffineAnimTable, sub_810DA10 .align 2 gUnknown_085960A0:: @ 85960A0 @@ -2739,7 +2739,7 @@ gUnknown_085960C4:: @ 85960C4 .align 2 gUnknown_085960D0:: @ 85960D0 - spr_template 0x2806, 0x2806, gUnknown_0852491C, gUnknown_085960C4, NULL, gDummySpriteAffineAnimTable, sub_810DA10 + spr_template ANIM_TAG_PURPLE_SWIPE, ANIM_TAG_PURPLE_SWIPE, gUnknown_0852491C, gUnknown_085960C4, NULL, gDummySpriteAffineAnimTable, sub_810DA10 .align 2 gUnknown_085960E8:: @ 85960E8 @@ -2752,7 +2752,7 @@ gUnknown_08596100:: @ 8596100 .align 2 gUnknown_08596104:: @ 8596104 - spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08596100, sub_810DA7C + spr_template ANIM_TAG_HANDS_AND_FEET, ANIM_TAG_HANDS_AND_FEET, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08596100, sub_810DA7C .align 2 gUnknown_0859611C:: @ 859611C @@ -2764,7 +2764,7 @@ gUnknown_08596130:: @ 8596130 .align 2 gUnknown_08596134:: @ 8596134 - spr_template 0x27a7, 0x27a7, gUnknown_08524954, gUnknown_08596130, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_TOXIC_BUBBLE, ANIM_TAG_TOXIC_BUBBLE, gUnknown_08524954, gUnknown_08596130, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_0859614C:: @ 859614C @@ -2809,15 +2809,15 @@ gUnknown_085961A4:: @ 85961A4 .align 2 gUnknown_085961A8:: @ 85961A8 - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DBAC + spr_template ANIM_TAG_POISON_BUBBLE, ANIM_TAG_POISON_BUBBLE, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DBAC .align 2 gUnknown_085961C0:: @ 85961C0 - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DC2C + spr_template ANIM_TAG_POISON_BUBBLE, ANIM_TAG_POISON_BUBBLE, gUnknown_085249CC, gUnknown_08596164, NULL, gUnknown_085961A0, sub_810DC2C .align 2 gUnknown_085961D8:: @ 85961D8 - spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_0859616C, NULL, gUnknown_085961A4, sub_810DCD0 + spr_template ANIM_TAG_POISON_BUBBLE, ANIM_TAG_POISON_BUBBLE, gUnknown_0852496C, gUnknown_0859616C, NULL, gUnknown_085961A4, sub_810DCD0 .align 2 gUnknown_085961F0:: @ 85961F0 @@ -2830,7 +2830,7 @@ gUnknown_08596208:: @ 8596208 .align 2 gUnknown_0859620C:: @ 859620C - spr_template 0x27a6, 0x27a6, gUnknown_085249CC, gUnknown_08596168, NULL, gUnknown_08596208, sub_810DD50 + spr_template ANIM_TAG_POISON_BUBBLE, ANIM_TAG_POISON_BUBBLE, gUnknown_085249CC, gUnknown_08596168, NULL, gUnknown_08596208, sub_810DD50 .align 2 gUnknown_08596224:: @ 8596224 @@ -2843,11 +2843,11 @@ gUnknown_0859623C:: @ 859623C .align 2 gPoisonBubbleSpriteTemplate:: @ 8596240 - spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4 + spr_template ANIM_TAG_POISON_BUBBLE, ANIM_TAG_POISON_BUBBLE, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 gWaterBubbleSpriteTemplate:: @ 8596258 - spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4 .align 2 gUnknown_08596270:: @ 8596270 @@ -2876,7 +2876,7 @@ gUnknown_085962D0:: @ 85962D0 .align 2 gUnknown_085962D4:: @ 85962D4 - spr_template 0x27aa, 0x27aa, gUnknown_08524934, gUnknown_085962D0, NULL, gDummySpriteAffineAnimTable, sub_810E044 + spr_template ANIM_TAG_AIR_WAVE_2, ANIM_TAG_AIR_WAVE_2, gUnknown_08524934, gUnknown_085962D0, NULL, gDummySpriteAffineAnimTable, sub_810E044 .align 2 gUnknown_085962EC:: @ 85962EC @@ -2903,11 +2903,11 @@ gUnknown_08596338:: @ 8596338 .align 2 gUnknown_08596340:: @ 8596340 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596314, sub_810E13C + spr_template ANIM_TAG_ROUND_SHADOW, ANIM_TAG_ROUND_SHADOW, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596314, sub_810E13C .align 2 gUnknown_08596358:: @ 8596358 - spr_template 0x27ac, 0x27ac, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gUnknown_08596338, sub_810E1C8 + spr_template ANIM_TAG_ROUND_SHADOW, ANIM_TAG_ROUND_SHADOW, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gUnknown_08596338, sub_810E1C8 .align 2 gUnknown_08596370:: @ 8596370 @@ -2924,11 +2924,11 @@ gUnknown_08596380:: @ 8596380 .align 2 gUnknown_08596388:: @ 8596388 - spr_template 0x281e, 0x281e, gUnknown_08524974, gUnknown_08596380, NULL, gDummySpriteAffineAnimTable, sub_810E314 + spr_template ANIM_TAG_WHITE_FEATHER, ANIM_TAG_WHITE_FEATHER, gUnknown_08524974, gUnknown_08596380, NULL, gDummySpriteAffineAnimTable, sub_810E314 .align 2 gUnknown_085963A0:: @ 85963A0 - spr_template 0x27ab, 0x27ab, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EA4C + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EA4C .align 2 gUnknown_085963B8:: @ 85963B8 @@ -2941,7 +2941,7 @@ gUnknown_085963D0:: @ 85963D0 .align 2 gUnknown_085963D4:: @ 85963D4 - spr_template 0x27b2, 0x27b2, gUnknown_08524934, gUnknown_085963D0, NULL, gDummySpriteAffineAnimTable, sub_810EAA0 + spr_template ANIM_TAG_WHIRLWIND_LINES, ANIM_TAG_WHIRLWIND_LINES, gUnknown_08524934, gUnknown_085963D0, NULL, gDummySpriteAffineAnimTable, sub_810EAA0 .align 2 gUnknown_085963EC:: @ 85963EC @@ -2955,7 +2955,7 @@ gUnknown_0859641C:: @ 859641C .align 2 gUnknown_08596420:: @ 8596420 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859641C, sub_810EC34 + spr_template ANIM_TAG_ROUND_SHADOW, ANIM_TAG_ROUND_SHADOW, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859641C, sub_810EC34 .align 2 gUnknown_08596438:: @ 8596438 @@ -2967,7 +2967,7 @@ gUnknown_08596448:: @ 8596448 .align 2 gUnknown_0859644C:: @ 859644C - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596448, sub_810EC94 + spr_template ANIM_TAG_ROUND_SHADOW, ANIM_TAG_ROUND_SHADOW, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_08596448, sub_810EC94 .align 2 gUnknown_08596464:: @ 8596464 @@ -2981,7 +2981,7 @@ gUnknown_0859648C:: @ 859648C .align 2 gUnknown_08596490:: @ 8596490 - spr_template 0x27ac, 0x27ac, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859648C, sub_810ED28 + spr_template ANIM_TAG_ROUND_SHADOW, ANIM_TAG_ROUND_SHADOW, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_0859648C, sub_810ED28 .align 2 gUnknown_085964A8:: @ 85964A8 @@ -2994,19 +2994,19 @@ gUnknown_085964C8:: @ 85964C8 .align 2 gUnknown_085964CC:: @ 85964CC - spr_template 0x2820, 0x2820, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EE14 + spr_template ANIM_TAG_SPLASH, ANIM_TAG_SPLASH, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EE14 .align 2 gUnknown_085964E4:: @ 85964E4 - spr_template 0x2821, 0x2821, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EEF8 + spr_template ANIM_TAG_SWEAT_BEAD, ANIM_TAG_SWEAT_BEAD, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810EEF8 .align 2 gUnknown_085964FC:: @ 85964FC - spr_template 0x27e4, 0x27e4, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F004 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F004 .align 2 gUnknown_08596514:: @ 8596514 - spr_template 0x282c, 0x282c, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F084 + spr_template ANIM_TAG_BIRD, ANIM_TAG_BIRD, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F084 .align 2 gUnknown_0859652C:: @ 859652C @@ -3019,27 +3019,27 @@ gUnknown_08596544:: @ 8596544 .align 2 gUnknown_08596548:: @ 8596548 - spr_template 0x27d4, 0x27d4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596544, sub_80A77C8 + spr_template ANIM_TAG_SPIRAL, ANIM_TAG_SPIRAL, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596544, sub_80A77C8 .align 2 gUnknown_08596560:: @ 8596560 - spr_template 0x27b6, 0x27b6, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC + spr_template ANIM_TAG_GREEN_LIGHT_WALL, ANIM_TAG_GREEN_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC .align 2 gUnknown_08596578:: @ 8596578 - spr_template 0x27b7, 0x27b7, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC + spr_template ANIM_TAG_BLUE_LIGHT_WALL, ANIM_TAG_BLUE_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC .align 2 gUnknown_08596590:: @ 8596590 - spr_template 0x27b8, 0x27b8, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC + spr_template ANIM_TAG_RED_LIGHT_WALL, ANIM_TAG_RED_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC .align 2 gUnknown_085965A8:: @ 85965A8 - spr_template 0x27b9, 0x27b9, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC + spr_template ANIM_TAG_GRAY_LIGHT_WALL, ANIM_TAG_GRAY_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC .align 2 gUnknown_085965C0:: @ 85965C0 - spr_template 0x27ba, 0x27ba, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC + spr_template ANIM_TAG_ORANGE_LIGHT_WALL, ANIM_TAG_ORANGE_LIGHT_WALL, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810F1EC .align 2 gUnknown_085965D8:: @ 85965D8 @@ -3068,7 +3068,7 @@ gUnknown_08596624:: @ 8596624 .align 2 gUnknown_0859663C:: @ 859663C - spr_template 0x27b3, 0x27b3, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation + spr_template ANIM_TAG_GOLD_RING, ANIM_TAG_GOLD_RING, gUnknown_08524954, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation .align 2 gUnknown_08596654:: @ 8596654 @@ -3128,11 +3128,11 @@ gUnknown_0859677C:: @ 859677C .align 2 gUnknown_08596794:: @ 8596794 - spr_template 0x2809, 0x2809, gUnknown_08524A2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template ANIM_TAG_HOLLOW_ORB, ANIM_TAG_HOLLOW_ORB, gUnknown_08524A2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 gUnknown_085967AC:: @ 85967AC - spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810FBA8 + spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810FBA8 .align 2 gUnknown_085967C4:: @ 85967C4 @@ -3166,7 +3166,7 @@ gUnknown_08596854:: @ 8596854 .align 2 gUnknown_08596864:: @ 8596864 - spr_template 0x280b, 0x280b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08596854, sub_810FDF0 + spr_template ANIM_TAG_BLUEGREEN_ORB, ANIM_TAG_BLUEGREEN_ORB, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08596854, sub_810FDF0 .align 2 gUnknown_0859687C:: @ 859687C @@ -3179,7 +3179,7 @@ gUnknown_08596894:: @ 8596894 .align 2 gUnknown_08596898:: @ 8596898 - spr_template 0x281b, 0x281b, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596894, sub_80A77C8 + spr_template ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596894, sub_80A77C8 .align 2 gUnknown_085968B0:: @ 85968B0 @@ -3201,7 +3201,7 @@ gUnknown_08596918:: @ 8596918 .align 2 gUnknown_08596920:: @ 8596920 - spr_template 0x27e4, 0x27e4, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596918, sub_8110240 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596918, sub_8110240 .align 2 gUnknown_08596938:: @ 8596938 @@ -3223,7 +3223,7 @@ gUnknown_08596968:: @ 8596968 .align 2 gUnknown_08596974:: @ 8596974 - spr_template 0x27a9, 0x27a9, gUnknown_085249F4, gDummySpriteAnimTable, NULL, gUnknown_08596968, sub_8110368 + spr_template ANIM_TAG_HORN_HIT_2, ANIM_TAG_HORN_HIT_2, gUnknown_085249F4, gDummySpriteAnimTable, NULL, gUnknown_08596968, sub_8110368 .align 2 gUnknown_0859698C:: @ 859698C @@ -3245,15 +3245,15 @@ gUnknown_085969BC:: @ 85969BC .align 2 gUnknown_085969C8:: @ 85969C8 - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085969BC, sub_8110438 + spr_template ANIM_TAG_NEEDLE, ANIM_TAG_NEEDLE, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085969BC, sub_8110438 .align 2 gUnknown_085969E0:: @ 85969E0 - spr_template 0x27c4, 0x27c4, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81104E4 + spr_template ANIM_TAG_WEB_THREAD, ANIM_TAG_WEB_THREAD, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81104E4 .align 2 gUnknown_085969F8:: @ 85969F8 - spr_template 0x27c3, 0x27c3, gUnknown_0852493C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81105B4 + spr_template ANIM_TAG_STRING, ANIM_TAG_STRING, gUnknown_0852493C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81105B4 .align 2 gUnknown_08596A10:: @ 8596A10 @@ -3266,19 +3266,19 @@ gUnknown_08596A28:: @ 8596A28 .align 2 gUnknown_08596A2C:: @ 8596A2C - spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C + spr_template ANIM_TAG_SPIDER_WEB, ANIM_TAG_SPIDER_WEB, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C .align 2 gLinearStingerSpriteTemplate:: @ 8596A44 - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720 + spr_template ANIM_TAG_NEEDLE, ANIM_TAG_NEEDLE, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720 .align 2 gPinMissileSpriteTemplate:: @ 8596A5C - spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 + spr_template ANIM_TAG_NEEDLE, ANIM_TAG_NEEDLE, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 gIcicleSpearSpriteTemplate:: @ 8596A74 - spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 + spr_template ANIM_TAG_ICICLE_SPEAR, ANIM_TAG_ICICLE_SPEAR, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850 .align 2 gUnknown_08596A8C:: @ 8596A8C @@ -3293,7 +3293,7 @@ gUnknown_08596AC4:: @ 8596AC4 .align 2 gUnknown_08596AC8:: @ 8596AC8 - spr_template 0x27e4, 0x27e4, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596AC4, sub_8110994 + spr_template ANIM_TAG_CIRCLE_OF_LIGHT, ANIM_TAG_CIRCLE_OF_LIGHT, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08596AC4, sub_8110994 .align 2 gUnknown_08596AE0:: @ 8596AE0 @@ -3336,7 +3336,7 @@ gUnknown_08596B6C:: @ 8596B6C .align 2 gUnknown_08596B70:: @ 8596B70 - spr_template 0x27a5, 0x27a5, gUnknown_08524A8C, gUnknown_085950E0, NULL, gUnknown_08596B6C, sub_8110B38 + spr_template ANIM_TAG_WATER_ORB, ANIM_TAG_WATER_ORB, gUnknown_08524A8C, gUnknown_085950E0, NULL, gUnknown_08596B6C, sub_8110B38 .align 2 gUnknown_08596B88:: @ 8596B88 @@ -3344,7 +3344,7 @@ gUnknown_08596B88:: @ 8596B88 .align 2 gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0 - spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C + spr_template ANIM_TAG_FLYING_DIRT, ANIM_TAG_FLYING_DIRT, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C .align 2 gUnknown_08596BB8:: @ 8596BB8 @@ -3469,7 +3469,7 @@ gUnknown_08596D54:: @ 8596D54 .align 2 gUnknown_08596D58:: @ 8596D58 - spr_template 0x27c0, 0x27c0, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08596D54, sub_81119E0 + spr_template ANIM_TAG_SHADOW_BALL, ANIM_TAG_SHADOW_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08596D54, sub_81119E0 .align 2 gUnknown_08596D70:: @ 8596D70 @@ -3482,7 +3482,7 @@ gUnknown_08596D88:: @ 8596D88 .align 2 gUnknown_08596D8C:: @ 8596D8C - spr_template 0x27c1, 0x27c1, gUnknown_08524954, gUnknown_08596D88, NULL, gDummySpriteAffineAnimTable, sub_8111B9C + spr_template ANIM_TAG_LICK, ANIM_TAG_LICK, gUnknown_08524954, gUnknown_08596D88, NULL, gDummySpriteAffineAnimTable, sub_8111B9C .align 2 gUnknown_08596DA4:: @ 8596DA4 @@ -3494,19 +3494,19 @@ gUnknown_08596DB4:: @ 8596DB4 .align 2 gUnknown_08596DB8:: @ 8596DB8 - spr_template 0x27cc, 0x27cc, gUnknown_08524A5C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112264 + spr_template ANIM_TAG_WHITE_SHADOW, ANIM_TAG_WHITE_SHADOW, gUnknown_08524A5C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112264 .align 2 gUnknown_08596DD0:: @ 8596DD0 - spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0 + spr_template ANIM_TAG_NAIL, ANIM_TAG_NAIL, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0 .align 2 gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8 - spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 + spr_template ANIM_TAG_GHOSTLY_SPIRIT, ANIM_TAG_GHOSTLY_SPIRIT, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 gBattleAnimSpriteTemplate_8596E00:: @ 8596E00 - spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 + spr_template ANIM_TAG_DEVIL, ANIM_TAG_DEVIL, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78 .align 2 gUnknown_08596E18:: @ 8596E18 @@ -3518,7 +3518,7 @@ gUnknown_08596E2C:: @ 8596E2C .align 2 gUnknown_08596E30:: @ 8596E30 - spr_template 0x280d, 0x280d, gUnknown_08524A74, gUnknown_08596E2C, NULL, gDummySpriteAffineAnimTable, sub_8112E9C + spr_template ANIM_TAG_PURPLE_FLAME, ANIM_TAG_PURPLE_FLAME, gUnknown_08524A74, gUnknown_08596E2C, NULL, gDummySpriteAffineAnimTable, sub_8112E9C .align 2 gUnknown_08596E48:: @ 8596E48 @@ -3610,7 +3610,7 @@ gUnknown_08596F80:: @ 8596F80 .align 2 gUnknown_08596F98:: @ 8596F98 - spr_template 0x2809, 0x2809, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8113250 + spr_template ANIM_TAG_HOLLOW_ORB, ANIM_TAG_HOLLOW_ORB, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8113250 .align 2 gUnknown_08596FB0:: @ 8596FB0 @@ -3665,11 +3665,11 @@ gUnknown_08597060:: @ 8597060 .align 2 gUnknown_08597080:: @ 8597080 - spr_template 0x279b, 0x279b, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC + spr_template ANIM_TAG_SHARP_TEETH, ANIM_TAG_SHARP_TEETH, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC .align 2 gUnknown_08597098:: @ 8597098 - spr_template 0x27a1, 0x27a1, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC + spr_template ANIM_TAG_CLAMP, ANIM_TAG_CLAMP, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_08597060, sub_81139DC .align 2 gUnknown_085970B0:: @ 85970B0 @@ -3688,7 +3688,7 @@ gUnknown_085970E0:: @ 85970E0 .align 2 gUnknown_085970E8:: @ 85970E8 - spr_template 0x27ab, 0x27ab, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085970E0, sub_8113A90 + spr_template ANIM_TAG_SMALL_BUBBLES, ANIM_TAG_SMALL_BUBBLES, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_085970E0, sub_8113A90 .align 2 gUnknown_08597100:: @ 8597100 @@ -3759,7 +3759,7 @@ gUnknown_085971FC:: @ 85971FC .align 2 gUnknown_08597214:: @ 8597214 - spr_template 0x2829, 0x2829, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8115244 + spr_template ANIM_TAG_DIRT_MOUND, ANIM_TAG_DIRT_MOUND, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8115244 .align 2 gUnknown_0859722C:: @ 859722C @@ -3831,35 +3831,35 @@ gUnknown_08597348:: @ 8597348 .align 2 gBasicHitSplatSpriteTemplate:: @ 8597358 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 .align 2 gBattleAnimSpriteTemplate_8597370:: @ 8597370 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420 .align 2 gUnknown_08597388:: @ 8597388 - spr_template 0x27a4, 0x27a4, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 + spr_template ANIM_TAG_WATER_IMPACT, ANIM_TAG_WATER_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388 .align 2 gUnknown_085973A0:: @ 85973A0 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458 .align 2 gBattleAnimSpriteTemplate_85973B8:: @ 85973B8 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0 .align 2 gUnknown_085973D0:: @ 85973D0 - spr_template 0x282d, 0x282d, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8116560 + spr_template ANIM_TAG_CROSS_IMPACT, ANIM_TAG_CROSS_IMPACT, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8116560 .align 2 gUnknown_085973E8:: @ 85973E8 - spr_template 0x2797, 0x2797, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81165A8 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81165A8 .align 2 gUnknown_08597400:: @ 8597400 - spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81163D0 + spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81163D0 gUnknown_08597418:: @ 8597418 .2byte 0x7fff diff --git a/data/battle_anim_815A0D4.s b/data/battle_anim_815A0D4.s index 660e5774b..a031cb9cb 100644 --- a/data/battle_anim_815A0D4.s +++ b/data/battle_anim_815A0D4.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -36,15 +37,15 @@ gUnknown_085CE078:: @ 85CE078 .align 2 gUnknown_085CE07C:: @ 85CE07C - spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_OPENING_EYE, ANIM_TAG_OPENING_EYE, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_085CE094:: - spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0 + spr_template ANIM_TAG_ROUND_WHITE_HALO, ANIM_TAG_ROUND_WHITE_HALO, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0 .align 2 gUnknown_085CE0AC:: - spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254 + spr_template ANIM_TAG_TEAL_ALERT, ANIM_TAG_TEAL_ALERT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254 .align 2 gUnknown_085CE0C4:: @ 85CE0C4 @@ -66,11 +67,11 @@ gUnknown_085CE0FC:: @ 85CE0FC .align 2 gUnknown_085CE104:: @ 85CE104 - spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0 + spr_template ANIM_TAG_EYE, ANIM_TAG_EYE, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0 .align 2 gUnknown_085CE11C:: @ 85CE11C - spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4 + spr_template ANIM_TAG_SPIKES, ANIM_TAG_SPIKES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4 .align 2 gUnknown_085CE134:: @ 85CE134 @@ -106,7 +107,7 @@ gUnknown_085CE18C:: @ 85CE18C .align 2 gUnknown_085CE190:: @ 85CE190 - spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC + spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC .align 2 gUnknown_085CE1A8:: @ 85CE1A8 @@ -128,7 +129,7 @@ gUnknown_085CE1D8:: @ 85CE1D8 .align 2 gUnknown_085CE1DC:: @ 85CE1DC - spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC + spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC .align 2 gUnknown_085CE1F4:: @ 85CE1F4 @@ -149,15 +150,15 @@ gUnknown_085CE224:: @ 85CE224 .align 2 gUnknown_085CE22C:: @ 85CE22C - spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934 + spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934 .align 2 gUnknown_085CE244:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4 .align 2 gUnknown_085CE25C:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0 .align 2 gUnknown_085CE274:: @ 85CE274 @@ -170,7 +171,7 @@ gUnknown_085CE284:: @ 85CE284 .align 2 gUnknown_085CE288:: @ 85CE288 - spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 + spr_template ANIM_TAG_RAPID_SPIN, ANIM_TAG_RAPID_SPIN, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0 .align 2 gUnknown_085CE2A0:: @ 85CE2A0 @@ -195,7 +196,7 @@ gUnknown_085CE2F4:: @ 85CE2F4 .align 2 gUnknown_085CE2F8:: @ 85CE2F8 - spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C + spr_template ANIM_TAG_TRI_FORCE_TRIANGLE, ANIM_TAG_TRI_FORCE_TRIANGLE, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C .align 2 gUnknown_085CE310:: @ 85CE310 @@ -208,7 +209,7 @@ gUnknown_085CE334:: @ 85CE334 .align 2 gUnknown_085CE338:: @ 85CE338 - spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 + spr_template ANIM_TAG_ECLIPSING_ORB, ANIM_TAG_ECLIPSING_ORB, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8 .align 2 gUnknown_085CE350:: @ 85CE350 @@ -216,15 +217,15 @@ gUnknown_085CE350:: @ 85CE350 .align 2 gUnknown_085CE370:: @ 85CE370 - spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 + spr_template ANIM_TAG_POKEBALL, ANIM_TAG_POKEBALL, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394 .align 2 gUnknown_085CE388:: @ 85CE388 - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C .align 2 gUnknown_085CE3A0:: @ 85CE3A0 - spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570 .align 2 gUnknown_085CE3B8:: @ 85CE3B8 @@ -238,7 +239,7 @@ gUnknown_085CE3E0:: @ 85CE3E0 .align 2 gUnknown_085CE418:: @ 85CE418 - spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C + spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C .align 2 gUnknown_085CE430:: @ 85CE430 @@ -269,7 +270,7 @@ gUnknown_085CE480:: @ 85CE480 .align 2 gUnknown_085CE48C:: @ 85CE48C - spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 + spr_template ANIM_TAG_GREEN_STAR, ANIM_TAG_GREEN_STAR, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04 .align 2 gUnknown_085CE4A4:: @ 85CE4A4 @@ -309,7 +310,7 @@ gUnknown_085CE538:: @ 85CE538 .align 2 gUnknown_085CE544:: @ 85CE544 - spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 + spr_template ANIM_TAG_PINK_PETAL, ANIM_TAG_PINK_PETAL, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0 .align 2 gUnknown_085CE55C:: @ 85CE55C @@ -325,13 +326,13 @@ gUnknown_085CE58C:: @ 85CE58C .align 2 gUnknown_085CE590:: @ 85CE590 - spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C + spr_template ANIM_TAG_PAIN_SPLIT, ANIM_TAG_PAIN_SPLIT, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C gUnknown_085CE5A8:: - spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 + spr_template ANIM_TAG_CONFETTI, ANIM_TAG_CONFETTI, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88 gUnknown_085CE5C0:: - spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 + spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94 gBattleAnimSpriteTemplate_85CE5D8:: - spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 + spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4 .align 2 gUnknown_085CE5F0:: @ 85CE5F0 @@ -358,7 +359,7 @@ gUnknown_085CE680:: @ 85CE680 .align 2 gUnknown_085CE68C:: @ 85CE68C - spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 + spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4 .align 2 gUnknown_085CE6A4:: @ 85CE6A4 @@ -385,7 +386,7 @@ gUnknown_085CE724:: @ 85CE724 .align 2 gUnknown_085CE734:: @ 85CE734 - spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 + spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870 .align 2 gUnknown_085CE74C:: @ 85CE74C @@ -393,7 +394,7 @@ gUnknown_085CE74C:: @ 85CE74C .align 2 gUnknown_085CE76C:: @ 85CE76C - spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC + spr_template ANIM_TAG_SWEAT_DROP, ANIM_TAG_SWEAT_DROP, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC .align 2 gUnknown_085CE784:: @ 85CE784 @@ -419,9 +420,9 @@ gUnknown_085CE7D4:: @ 85CE7D4 .align 2 gUnknown_085CE7EC:: @ 85CE7EC - spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 + spr_template ANIM_TAG_SMALL_RED_EYE, ANIM_TAG_SMALL_RED_EYE, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404 gUnknown_085CE804:: - spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 + spr_template ANIM_TAG_PAW_PRINT, ANIM_TAG_PAW_PRINT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444 .align 2 gUnknown_085CE81C:: @ 85CE81C @@ -439,11 +440,11 @@ gUnknown_085CE844:: @ 85CE844 .align 2 gUnknown_085CE84C:: @ 85CE84C - spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy + spr_template ANIM_TAG_RED_BALL, ANIM_TAG_RED_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy .align 2 gUnknown_085CE864:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8 .align 2 gUnknown_085CE87C:: @ 85CE87C @@ -451,19 +452,19 @@ gUnknown_085CE87C:: @ 85CE87C .align 2 gUnknown_085CE894:: @ 85CE894 - spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 + spr_template ANIM_TAG_SMELLINGSALT_EFFECT, ANIM_TAG_SMELLINGSALT_EFFECT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954 gUnknown_085CE8AC:: - spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 + spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14 gUnknown_085CE8C4:: - spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 + spr_template ANIM_TAG_MAGNIFYING_GLASS, ANIM_TAG_MAGNIFYING_GLASS, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84 gUnknown_085CE8DC:: - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C gUnknown_085CE8F4:: - spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 + spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4 gUnknown_085CE90C:: - spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C + spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C gUnknown_085CE924:: - spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 + spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80 .align 2 gUnknown_085CE93C:: @ 85CE93C @@ -488,7 +489,7 @@ gUnknown_085CE97C:: @ 85CE97C .align 2 gUnknown_085CE984:: @ 85CE984 - spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 + spr_template ANIM_TAG_SLAM_HIT_2, ANIM_TAG_SLAM_HIT_2, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338 .align 2 gUnknown_085CE99C:: @ 85CE99C @@ -500,7 +501,7 @@ gUnknown_085CE9AC:: @ 85CE9AC .align 2 gUnknown_085CE9B0:: @ 85CE9B0 - spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 + spr_template ANIM_TAG_RECYCLE, ANIM_TAG_RECYCLE, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8 .align 2 gUnknown_085CE9C8:: @ 85CE9C8 diff --git a/data/battle_anim_8170478.s b/data/battle_anim_8170478.s index 5ccf37c54..43ea12d80 100644 --- a/data/battle_anim_8170478.s +++ b/data/battle_anim_8170478.s @@ -1,3 +1,4 @@ +#include "constants/battle_anim.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -141,7 +142,7 @@ gUnknown_085E5310:: @ 85E5310 .align 2 gBattleAnimSpriteTemplate_85E5338:: @ 85E5338 - spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C + spr_template ANIM_TAG_UNUSED_RED_BRICK, ANIM_TAG_UNUSED_RED_BRICK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C .align 2 gUnknown_085E5350:: @ 8535350 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f0030c4ac..e86c7b784 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -423,7 +423,7 @@ gBattleAnims_Special:: Move_NONE: Move_MIRROR_MOVE: Move_POUND: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -435,7 +435,7 @@ Move_POUND: end Move_DOUBLE_SLAP: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight @@ -527,8 +527,8 @@ Move_SLEEP_POWDER: end Move_SWIFT: - loadspritegfx ANIM_TAG_174 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W129, SOUND_PAN_ATTACKER @@ -554,7 +554,7 @@ Move_SWIFT: end Move_STRENGTH: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -580,7 +580,7 @@ Move_STRENGTH: end Move_TACKLE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -594,7 +594,7 @@ Move_TACKLE: end Move_BODY_SLAM: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -620,7 +620,7 @@ Move_BODY_SLAM: end Move_SUPERSONIC: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER monbgprio_2A ANIM_ATTACKER setalpha 12, 8 @@ -642,7 +642,7 @@ Supersonic1: return Move_SCREECH: - loadspritegfx ANIM_TAG_164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 2, 1 call Screech1 call Screech1 @@ -699,8 +699,8 @@ FlameWheel1: @ Unused return Move_PIN_MISSILE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -728,8 +728,8 @@ Move_PIN_MISSILE: end Move_ICICLE_SPEAR: - loadspritegfx ANIM_TAG_262 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -757,7 +757,7 @@ Move_ICICLE_SPEAR: end Move_TAKE_DOWN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10 @@ -780,7 +780,7 @@ Move_TAKE_DOWN: end Move_DOUBLE_EDGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish @@ -813,8 +813,8 @@ Move_DOUBLE_EDGE: end Move_POISON_STING: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_TARGET monbgprio_28 ANIM_TARGET @@ -833,8 +833,8 @@ Move_POISON_STING: end Move_TWINEEDLE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -936,8 +936,8 @@ Ember1: return Move_MEGA_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -979,8 +979,8 @@ SetImpactContestsBG: goto SetImpactBackgroundRet Move_MEGA_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET delay 2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 0, 0, 16, RGB_BLACK @@ -1004,8 +1004,8 @@ Move_MEGA_KICK: end Move_COMET_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight @@ -1027,7 +1027,7 @@ CometPunchRight: Move_SONIC_BOOM: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1073,7 +1073,7 @@ Move_THUNDER_SHOCK: Move_THUNDERBOLT: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_282 + loadspritegfx ANIM_TAG_SHOCK_3 loadspritegfx ANIM_TAG_SPARK_2 createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish @@ -1123,7 +1123,7 @@ Move_THUNDERBOLT: Move_THUNDER_WAVE: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 - loadspritegfx ANIM_TAG_173 + loadspritegfx ANIM_TAG_SPARK_H createvisualtask sub_8116620, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 @@ -1142,8 +1142,8 @@ Move_THUNDER_WAVE: end Move_BEAT_UP: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_TARGET setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight @@ -1176,8 +1176,8 @@ BeatUpRight: goto BeatUpContinue Move_STOMP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_TARGET @@ -1198,7 +1198,7 @@ Move_TAIL_WHIP: end Move_CUT: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W015, SOUND_PAN_TARGET @@ -1212,7 +1212,7 @@ Move_CUT: end Move_HIDDEN_POWER: - loadspritegfx ANIM_TAG_217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0 waitforvisualfinish @@ -1242,9 +1242,9 @@ Move_HIDDEN_POWER: end Move_REVERSAL: - 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, SOUND_PAN_ATTACKER createsprite gComplexPaletteBlendSpriteTemplate, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish @@ -1270,7 +1270,7 @@ Move_REVERSAL: end Move_PURSUIT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -1297,8 +1297,8 @@ PursuitOnSwitchout: goto PursuitContinue Move_SPIKE_CANNON: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1336,7 +1336,7 @@ Move_SWORDS_DANCE: end Move_PSYCH_UP: - loadspritegfx ANIM_TAG_196 + loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_ATK_PARTNER createvisualtask sub_8115B0C, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1356,8 +1356,8 @@ Move_PSYCH_UP: Move_DIZZY_PUNCH: loadspritegfx ANIM_TAG_DUCK - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 call DizzyPunch1 @@ -1417,7 +1417,7 @@ FireSpinEffect: return Move_FURY_CUTTER: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013, SOUND_PAN_TARGET @@ -1487,7 +1487,7 @@ SelfDestruct1: Move_SLAM: loadspritegfx ANIM_TAG_SLAM_HIT - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W004, SOUND_PAN_ATTACKER @@ -1510,7 +1510,7 @@ Move_SLAM: end Move_VINE_WHIP: - loadspritegfx ANIM_TAG_287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 6 @@ -1521,8 +1521,8 @@ Move_VINE_WHIP: end Move_DRILL_PECK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -1540,9 +1540,9 @@ Move_DRILL_PECK: end Move_WATERFALL: - 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_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1 @@ -1654,7 +1654,7 @@ Explosion1: return Move_DEFENSE_CURL: - loadspritegfx ANIM_TAG_234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 createvisualtask sub_811489C, 5, 0, 0 createvisualtask sub_815B338, 5 @@ -1691,7 +1691,7 @@ Move_DETECT: end Move_FRUSTRATION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -1796,7 +1796,7 @@ Frustration_Weak: goto Frustration_Continue Move_SAFEGUARD: - loadspritegfx ANIM_TAG_244 + loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_W208, SOUND_PAN_ATTACKER @@ -1814,7 +1814,7 @@ Move_SAFEGUARD: end Move_PAIN_SPLIT: - loadspritegfx ANIM_TAG_239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gUnknown_085CE590, 2, -8, -42, 0 createsprite gUnknown_085CE590, 130, -8, -42, 1 delay 10 @@ -1838,8 +1838,8 @@ Move_PAIN_SPLIT: end Move_VICE_GRIP: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -1854,8 +1854,8 @@ Move_VICE_GRIP: end Move_GUILLOTINE: - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS @@ -1880,7 +1880,7 @@ Move_GUILLOTINE: Move_PAY_DAY: loadspritegfx ANIM_TAG_COIN - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -1942,7 +1942,7 @@ Outrage1: return Move_SPARK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask sub_8115A04, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22) @@ -1988,7 +1988,7 @@ Move_SPARK: end Move_ATTRACT: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER delay 15 @@ -2029,7 +2029,7 @@ Growth1: return Move_WHIRLWIND: - loadspritegfx ANIM_TAG_162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_085963D4, 2, 0, -8, 1, 60, 0 createsprite gUnknown_085963D4, 2, 0, 0, 1, 60, 1 createsprite gUnknown_085963D4, 2, 0, 8, 1, 60, 2 @@ -2167,7 +2167,7 @@ RockSlide1: return Move_THIEF: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET delay 1 fadetobg BG_DARK @@ -2187,8 +2187,8 @@ Move_THIEF: end Move_BUBBLE_BEAM: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -2225,8 +2225,8 @@ Bulbblebeam1: return Move_ICY_WIND: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_DEF_PARTNER createvisualtask sub_8116620, 10, 11, 4, 0, 4, RGB_BLACK fadetobg BG_ICE @@ -2382,8 +2382,8 @@ Move_CONVERSION_2: end Move_ROLLING_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -2404,7 +2404,7 @@ Move_ROLLING_KICK: end Move_HEADBUTT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2420,7 +2420,7 @@ Move_HEADBUTT: end Move_HORN_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gUnknown_08592CD8, 2, 0 playsewithpan SE_W029, SOUND_PAN_ATTACKER @@ -2438,7 +2438,7 @@ Move_HORN_ATTACK: end Move_FURY_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_80D6134, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft @@ -2462,7 +2462,7 @@ FuryAttackLeft: goto FuryAttackContinue Move_HORN_DRILL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg BG_DRILL @@ -2529,8 +2529,8 @@ HornDrillInContest: goto HornDrillContinue Move_THRASH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask sub_8104C38, 2 createvisualtask sub_8104CA4, 2 createsprite gUnknown_08595EB0, 131, 1, 10, 0 @@ -2583,8 +2583,8 @@ Move_SING: end Move_LOW_KICK: - 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 gUnknown_08595EE0, 130, -24, 28, 40, 8, 160, 0 delay 4 @@ -2654,7 +2654,7 @@ DigEnd: end DigSetUp: loadspritegfx ANIM_TAG_MUD_SAND - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gUnknown_08597214, 1, 0, 0, 180 createsprite gUnknown_08597214, 1, 0, 1, 180 monbg_22 ANIM_ATTACKER @@ -2672,8 +2672,8 @@ DigSetUp: createvisualtask sub_8114CBC, 2, 1 goto DigEnd DigUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_8114F14, 2, 0 waitforvisualfinish monbg ANIM_ATTACKER @@ -2728,7 +2728,7 @@ Move_AGILITY: end Move_QUICK_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -2745,7 +2745,7 @@ Move_QUICK_ATTACK: end Move_RAGE: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_TARGET setalpha 12, 8 @@ -2811,7 +2811,7 @@ Move_MINIMIZE: Move_METRONOME: loadspritegfx ANIM_TAG_FINGER - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gUnknown_08593114, 11, 0, 100 playsewithpan SE_W118, SOUND_PAN_ATTACKER delay 6 @@ -2840,7 +2840,7 @@ SkullBashSetUp1: waitforvisualfinish return SkullBashAttack: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_8101C94, 2, 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2886,8 +2886,8 @@ Move_KINESIS: end Move_GLARE: - loadspritegfx ANIM_TAG_248 - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask sub_815E114, 5, 0 playsewithpan SE_W060B, SOUND_PAN_ATTACKER waitforvisualfinish @@ -2904,7 +2904,7 @@ Move_GLARE: end Move_BARRAGE: - loadspritegfx ANIM_TAG_254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask sub_815E47C, 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER delay 24 @@ -2958,8 +2958,8 @@ SkyAttackSetUpAgainstPartner: blendoff goto SkyAttackEnd SkyAttackUnleash: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call SetFlyingBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE @@ -3005,13 +3005,13 @@ Move_ACID_ARMOR: end Move_SHARPEN: - loadspritegfx ANIM_TAG_185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gUnknown_08592DE4, 2 waitforvisualfinish end Move_SUPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1 playsewithpan SE_W082, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3031,7 +3031,7 @@ Move_SUPER_FANG: end Move_SLASH: - loadspritegfx ANIM_TAG_183 + loadspritegfx ANIM_TAG_SLASH createsprite gUnknown_08592D2C, 130, 1, -8, 0 playsewithpan SE_W013, SOUND_PAN_TARGET delay 4 @@ -3042,8 +3042,8 @@ Move_SLASH: end Move_STRUGGLE: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4 @@ -3093,7 +3093,7 @@ NightmareInContest: end Move_FLAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 createvisualtask sub_815C770, 2, 0 @@ -3122,8 +3122,8 @@ Move_SPITE: end Move_MACH_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue MachPunchAgainstPlayer @@ -3173,7 +3173,7 @@ Move_FORESIGHT: end Move_DESTINY_BOND: - loadspritegfx ANIM_TAG_188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg BG_GHOST playsewithpan SE_W060, SOUND_PAN_ATTACKER waitbgfadein @@ -3193,7 +3193,7 @@ Move_DESTINY_BOND: end Move_ENDURE: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -3218,7 +3218,7 @@ EndureEffect: return Move_CHARM: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 playsewithpan SE_W204, SOUND_PAN_ATTACKER @@ -3232,7 +3232,7 @@ Move_CHARM: end Move_ROLLOUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER @@ -3249,8 +3249,8 @@ Move_ROLLOUT: end Move_FALSE_SWIPE: - loadspritegfx ANIM_TAG_286 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_08592D44, 130 playsewithpan SE_W233, SOUND_PAN_TARGET delay 16 @@ -3295,7 +3295,7 @@ Move_SWAGGER: Move_MILK_DRINK: loadspritegfx ANIM_TAG_MILK_BOTTLE - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_TARGET createsprite gUnknown_08592B3C, 2 @@ -3337,8 +3337,8 @@ MagnitudeIntense: goto MagnitudeEnd Move_RAPID_SPIN: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_ATTACKER createsprite gUnknown_085CE288, 2, 0, 0, 32, -32, 40, -2 createvisualtask sub_815ADB0, 2, 0, 2, 0 @@ -3383,8 +3383,8 @@ Move_MOONLIGHT: end Move_EXTREME_SPEED: - loadspritegfx ANIM_TAG_207 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue ExtremeSpeedAgainstPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3431,8 +3431,8 @@ ExtremeSpeedAgainstPlayer: goto ExtremeSpeedContinue Move_UPROAR: - loadspritegfx ANIM_TAG_225 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER createvisualtask sub_8106D90, 2, 0 createsprite gBattleAnimSpriteTemplate_8593898, 3, 0, 0, 0, 0, 31, 8 @@ -3456,8 +3456,8 @@ Move_UPROAR: end Move_HEAT_WAVE: - loadspritegfx ANIM_TAG_261 - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_261, 0, 6, 6, RGB_RED + loadspritegfx ANIM_TAG_FLYING_DIRT + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 @@ -3480,8 +3480,8 @@ Move_HEAT_WAVE: end Move_HAIL: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask sub_8116620, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask sub_810C918, 5 @@ -3492,7 +3492,7 @@ Move_HAIL: Move_TORMENT: loadspritegfx ANIM_TAG_ANGER - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask sub_815AFF0, 2 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 @@ -3528,15 +3528,15 @@ Move_MEMENTO: end Move_FACADE: - loadspritegfx ANIM_TAG_243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask sub_815DF0C, 2, 0, 72 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 end Move_SMELLING_SALT: - loadspritegfx ANIM_TAG_HAND - loadspritegfx ANIM_TAG_255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gUnknown_085CE864, 130, 1, 0, 2 createsprite gUnknown_085CE864, 130, 1, 1, 2 delay 32 @@ -3560,9 +3560,9 @@ Move_FOLLOW_ME: end Move_CHARGE: - 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_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3595,8 +3595,8 @@ Move_CHARGE: end Move_TAUNT: - loadspritegfx ANIM_TAG_214 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gUnknown_08593114, 11, 0, 45 playsewithpan SE_W118, SOUND_PAN_ATTACKER @@ -3615,7 +3615,7 @@ Move_TAUNT: end Move_HELPING_HAND: - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815EC48, 5 createsprite gUnknown_085CE8AC, 40, 0 createsprite gUnknown_085CE8AC, 40, 1 @@ -3632,7 +3632,7 @@ Move_HELPING_HAND: end Move_ASSIST: - loadspritegfx ANIM_TAG_252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gUnknown_085CE804, 50, 112, -16, 140, 128, 36 delay 2 createsprite gUnknown_085CE804, 50, 208, 128, -16, 48, 36 @@ -3649,9 +3649,9 @@ Move_ASSIST: end Move_SUPERPOWER: - 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_ATK_PARTNER monbgprio_28 ANIM_ATTACKER setalpha 12, 8 @@ -3699,10 +3699,10 @@ Move_RECYCLE: end Move_BRICK_BREAK: - 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 BrickBreakNormal, BrickBreakShatteredWall BrickBreakNormal: monbg ANIM_TARGET @@ -3763,7 +3763,7 @@ BrickBreakShatteredWall: end Move_YAWN: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask sub_815D64C, 2, 0 playsewithpan SE_W281, SOUND_PAN_ATTACKER waitforvisualfinish @@ -3779,8 +3779,8 @@ Move_YAWN: end Move_ENDEAVOR: - loadspritegfx ANIM_TAG_243 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask sub_815DCA4, 2, 0, 2 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 @@ -3795,7 +3795,7 @@ Move_ENDEAVOR: end Move_ERUPTION: - loadspritegfx ANIM_TAG_201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 2, 0, 4, RGB_RED waitforvisualfinish createvisualtask sub_8109460, 2 @@ -3820,7 +3820,7 @@ Move_ERUPTION: end Move_SKILL_SWAP: - loadspritegfx ANIM_TAG_251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask sub_810FBF0, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1 @@ -3833,7 +3833,7 @@ Move_SKILL_SWAP: end Move_IMPRISON: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground monbg ANIM_DEF_PARTNER @@ -3850,7 +3850,7 @@ Move_IMPRISON: end Move_GRUDGE: - loadspritegfx ANIM_TAG_253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER monbgprio_29 fadetobg BG_GHOST @@ -3886,7 +3886,7 @@ Move_CAMOUFLAGE: end Move_TAIL_GLOW: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 0, 4, RGB_BLACK @@ -3902,8 +3902,8 @@ Move_TAIL_GLOW: end Move_LUSTER_PURGE: - 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_815A5C8, 5 @@ -3914,9 +3914,9 @@ Move_LUSTER_PURGE: createsprite gUnknown_08596898, 41, 0, 0, 0, 0 delay 20 createvisualtask sub_8116664, 5, 5, 2, 0, 16, RGB_WHITEALPHA - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_267, 2, 0, 16, RGB_WHITEALPHA + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, RGB_WHITEALPHA waitforvisualfinish - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_135, 0, 12, 12, RGB(0, 0, 23) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) waitforvisualfinish createsprite gUnknown_085973A0, 131, 1, 2 createvisualtask sub_8159210, 5, 215, SOUND_PAN_TARGET @@ -3945,8 +3945,8 @@ Move_LUSTER_PURGE: end Move_MIST_BALL: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, SOUND_PAN_ATTACKER createsprite gUnknown_08595C70, 128, 0, 0, 0, 0, 30, 0 @@ -3965,7 +3965,7 @@ Move_MIST_BALL: end Move_FEATHER_DANCE: - loadspritegfx ANIM_TAG_270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 playsewithpan SE_W080, SOUND_PAN_TARGET @@ -4054,9 +4054,9 @@ Move_MUD_SPORT: end Move_NEEDLE_ARM: - 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, SOUND_PAN_TARGET, 2, 16 createsprite gUnknown_08592888, 130, 1, 0, 0, -32, 16 delay 2 @@ -4106,9 +4106,9 @@ Move_SLACK_OFF: end Move_CRUSH_CLAW: - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH - loadspritegfx ANIM_TAG_208 + loadspritegfx ANIM_TAG_TORN_METAL monbg ANIM_TARGET setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 6, 4 @@ -4128,8 +4128,8 @@ Move_CRUSH_CLAW: Move_AROMATHERAPY: playsewithpan SE_W080, 0 - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_203 + 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 @@ -4166,10 +4166,10 @@ Move_AROMATHERAPY: end Move_FAKE_TEARS: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_209 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_MUSIC_NOTES - createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_155, 0, 4, 4, RGB(12, 11, 31) + createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) waitforvisualfinish createvisualtask sub_815C478, 5, 0, 2, 1 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 @@ -4190,8 +4190,8 @@ Move_FAKE_TEARS: Move_AIR_CUTTER: loadspritegfx ANIM_TAG_AIR_WAVE - loadspritegfx ANIM_TAG_138 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -4263,7 +4263,7 @@ Move_GRASS_WHISTLE: end Move_TICKLE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 2, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gUnknown_08593A84, 0, -16, -8 @@ -4281,8 +4281,8 @@ Move_TICKLE: end Move_WATER_SPOUT: - loadspritegfx ANIM_TAG_268 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_81080E4, 5 @@ -4298,8 +4298,8 @@ Move_WATER_SPOUT: end Move_SHADOW_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg BG_GHOST waitbgfadein monbg ANIM_ATK_PARTNER @@ -4340,7 +4340,7 @@ Move_EXTRASENSORY: end Move_AERIAL_ACE: - loadspritegfx ANIM_TAG_138 + loadspritegfx ANIM_TAG_CUT monbg ANIM_TARGET setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5 @@ -4390,7 +4390,7 @@ Move_BULK_UP: end Move_COVET: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_815C478, 5, 0, 2, 0 createsprite gUnknown_08593970, 3, 0, 20 @@ -4408,8 +4408,8 @@ Move_COVET: Move_VOLT_TACKLE: loadspritegfx ANIM_TAG_SPARK - loadspritegfx ANIM_TAG_212 - loadspritegfx ANIM_TAG_213 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg ANIM_ATTACKER setalpha 12, 8 createvisualtask sub_8116620, 10, 1, 0, 0, 8, RGB_BLACK @@ -4454,7 +4454,7 @@ Move_VOLT_TACKLE: end Move_WATER_SPORT: - loadspritegfx ANIM_TAG_268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_81088E4, 5 delay 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -4467,7 +4467,7 @@ Move_WATER_SPORT: end Move_CALM_MIND: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER createvisualtask sub_8116664, 5, 0, 0, 0, 16, RGB_BLACK waitforvisualfinish @@ -4491,7 +4491,7 @@ Move_CALM_MIND: Move_LEAF_BLADE: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask sub_80FFFC0, 5 delay 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1 @@ -4515,7 +4515,7 @@ Move_LEAF_BLADE: end Move_DRAGON_DANCE: - loadspritegfx ANIM_TAG_249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER delay 1 @@ -4539,8 +4539,8 @@ Move_DRAGON_DANCE: end Move_SHOCK_WAVE: - loadspritegfx ANIM_TAG_211 - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_ATTACKER @@ -4576,7 +4576,7 @@ Move_HARDEN: Move_BELLY_DRUM: loadspritegfx ANIM_TAG_MUSIC_NOTES - loadspritegfx ANIM_TAG_193 + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask sub_8102BE8, 2 waitforvisualfinish call BellyDrum1 @@ -4618,9 +4618,9 @@ BellyDrum1: return Move_MIND_READER: - loadspritegfx ANIM_TAG_189 + loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE - loadspritegfx ANIM_TAG_191 + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg ANIM_DEF_PARTNER playsewithpan SE_W109, SOUND_PAN_TARGET createsprite gUnknown_085CE07C, 5, 0, 0, 1, 0 @@ -4660,9 +4660,9 @@ MindReaderEffect: Move_ICE_PUNCH: monbg ANIM_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_BLACK createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 @@ -4818,8 +4818,8 @@ Move_THUNDER: end Move_THUNDER_PUNCH: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING monbg ANIM_TARGET setalpha 12, 8 @@ -4908,7 +4908,7 @@ Move_SACRED_FIRE: end Move_SCRATCH: - loadspritegfx ANIM_TAG_137 + loadspritegfx ANIM_TAG_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -4995,7 +4995,7 @@ Move_GROWL: end Move_SNORE: - loadspritegfx ANIM_TAG_197 + loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 call Snore1 @@ -5017,7 +5017,7 @@ Snore1: Move_LIGHT_SCREEN: loadspritegfx ANIM_TAG_SPARKLE_3 - loadspritegfx ANIM_TAG_166 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596560, 1, 40, 0, 10166 @@ -5044,7 +5044,7 @@ SpecialScreenEffect: Move_MIRROR_COAT: loadspritegfx ANIM_TAG_SPARKLE_3 - loadspritegfx ANIM_TAG_168 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gUnknown_08596590, 1, 40, 0, 10168 delay 10 @@ -5057,7 +5057,7 @@ Move_MIRROR_COAT: Move_REFLECT: loadspritegfx ANIM_TAG_SPARKLE_4 - loadspritegfx ANIM_TAG_167 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_08596578, 1, 40, 0, 10167 @@ -5073,7 +5073,7 @@ Move_REFLECT: end Move_BARRIER: - loadspritegfx ANIM_TAG_169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965A8, 3, 40, 0, 10169 @@ -5083,8 +5083,8 @@ Move_BARRIER: end Move_BUBBLE: - loadspritegfx ANIM_TAG_146 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_TARGET setalpha 12, 8 delay 1 @@ -5119,7 +5119,7 @@ Move_BUBBLE: end Move_SMOG: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 @@ -5146,7 +5146,7 @@ Smog1: return Move_FAINT_ATTACK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg BG_DARK waitbgfadein @@ -5265,7 +5265,7 @@ Move_DRAGON_RAGE: end Move_RAIN_DANCE: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -5279,8 +5279,8 @@ Move_RAIN_DANCE: end Move_BITE: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W044, SOUND_PAN_TARGET @@ -5296,8 +5296,8 @@ Move_BITE: end Move_CRUNCH: - loadspritegfx ANIM_TAG_139 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK waitbgfadein @@ -5324,8 +5324,8 @@ Move_CRUNCH: end Move_CLAMP: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -5344,7 +5344,7 @@ Move_ICE_BEAM: monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 7, RGB_BLACK waitforvisualfinish createsoundtask sub_8158C58, 183, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10 @@ -5391,7 +5391,7 @@ Move_WITHDRAW: end Move_AURORA_BEAM: - loadspritegfx ANIM_TAG_140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg BG_AURORABEAM waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER @@ -5427,7 +5427,7 @@ AuroraBeam1: return Move_SOLAR_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash SolarBeamEnd: waitforvisualfinish @@ -5516,7 +5516,7 @@ SolarBeamUnleash1: return Move_BLIZZARD: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createvisualtask AnimTask_IsAttackerOpponentSide, 2 jumprettrue BlizzardAgainstPlayer @@ -5568,7 +5568,7 @@ BlizzardAgainstPlayer: goto BlizzardContinue Move_POWDER_SNOW: - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, 2, 31, 1, 0, 3, RGB_BLACK waitforvisualfinish @@ -5602,8 +5602,8 @@ PowderSnow1: return Move_HYDRO_PUMP: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -5649,8 +5649,8 @@ HydroPump2: return Move_SIGNAL_BEAM: - loadspritegfx ANIM_TAG_264 - loadspritegfx ANIM_TAG_265 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1 delay 6 @@ -5690,9 +5690,9 @@ SignalBeam1: return Move_ABSORB: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5743,9 +5743,9 @@ AbsorbEffect: return Move_MEGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5804,9 +5804,9 @@ MegaDrainEffect: return Move_GIGA_DRAIN: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -5873,11 +5873,11 @@ GigaDrainEffect: return Move_LEECH_LIFE: - loadspritegfx ANIM_TAG_161 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 loadspritegfx ANIM_TAG_BLUE_STAR - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET setalpha 12, 8 @@ -6029,7 +6029,7 @@ Move_ACID: Move_BONEMERANG: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6049,7 +6049,7 @@ Move_BONEMERANG: Move_BONE_CLUB: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6067,7 +6067,7 @@ Move_BONE_CLUB: Move_BONE_RUSH: loadspritegfx ANIM_TAG_BONE - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W155, SOUND_PAN_TARGET @@ -6082,7 +6082,7 @@ Move_BONE_RUSH: end Move_SPIKES: - loadspritegfx ANIM_TAG_152 + loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER playsewithpan SE_W026, SOUND_PAN_ATTACKER waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 @@ -6099,8 +6099,8 @@ Move_SPIKES: end Move_MEGAHORN: - loadspritegfx ANIM_TAG_153 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER playsewithpan SE_W082, SOUND_PAN_ATTACKER jumpifcontest MegahornInContest @@ -6143,7 +6143,7 @@ MegahornInContest: Move_GUST: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6161,7 +6161,7 @@ Move_GUST: Move_WING_ATTACK: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6184,7 +6184,7 @@ Move_WING_ATTACK: end Move_PECK: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, SOUND_PAN_TARGET createvisualtask sub_80D622C, 2, 3, -768, 1, 2 createsprite gUnknown_085973E8, 131, -12, 0, 1, 3 @@ -6192,8 +6192,8 @@ Move_PECK: end Move_AEROBLAST: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER call SetFlyingBg monbgprio_28 ANIM_TARGET @@ -6233,8 +6233,8 @@ Aeroblast1: return Move_WATER_GUN: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6257,8 +6257,8 @@ Move_WATER_GUN: end Move_CRABHAMMER: - loadspritegfx ANIM_TAG_141 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08597388, 4, 0, 0, 1, 0 @@ -6334,7 +6334,7 @@ Flamethrower1: return Move_SANDSTORM: - loadspritegfx ANIM_TAG_261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE delay 16 @@ -6354,7 +6354,7 @@ Move_SANDSTORM: end Move_WHIRLPOOL: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6387,8 +6387,8 @@ WhirlpoolEffect: return Move_FLY: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim FlySetUp, FlyUnleash FlyEnd: waitforvisualfinish @@ -6414,8 +6414,8 @@ FlyUnleash: goto FlyEnd Move_BOUNCE: - loadspritegfx ANIM_TAG_156 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim BounceSetUp, BounceUnleash BounceEnd: end @@ -6440,8 +6440,8 @@ BounceUnleash: goto BounceEnd Move_KARATE_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -6457,8 +6457,8 @@ Move_KARATE_CHOP: end Move_CROSS_CHOP: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W025, SOUND_PAN_TARGET @@ -6475,8 +6475,8 @@ Move_CROSS_CHOP: end Move_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, 2, 4, 4 @@ -6493,8 +6493,8 @@ Move_JUMP_KICK: end Move_HI_JUMP_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, 2, 0, -24, 0, 0, 8 @@ -6519,8 +6519,8 @@ Move_HI_JUMP_KICK: end Move_DOUBLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gUnknown_08595EB0, 3, 1, 20, 1 @@ -6532,8 +6532,8 @@ Move_DOUBLE_KICK: end Move_TRIPLE_KICK: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -6565,8 +6565,8 @@ TripleKickCenter: goto TripleKickContinue Move_DYNAMIC_PUNCH: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_UNUSED_EXPLOSION delay 1 @@ -6599,8 +6599,8 @@ Move_DYNAMIC_PUNCH: end Move_COUNTER: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4 @@ -6631,7 +6631,7 @@ Move_COUNTER: end Move_VITAL_THROW: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W233, SOUND_PAN_ATTACKER @@ -6655,8 +6655,8 @@ Move_VITAL_THROW: Move_ROCK_SMASH: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6681,7 +6681,7 @@ Move_ROCK_SMASH: end Move_SUBMISSION: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W104, SOUND_PAN_ATTACKER @@ -6714,7 +6714,7 @@ Submission1: return Move_SUNNY_DAY: - loadspritegfx ANIM_TAG_157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 createvisualtask sub_8116620, 10, 0x781, 1, 0, 6, RGB_WHITE @@ -6737,7 +6737,7 @@ SunnyDay1: return Move_COTTON_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10 @@ -6758,7 +6758,7 @@ CottonSpore1: return Move_SPORE: - loadspritegfx ANIM_TAG_158 + loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_80FEE1C, 2 @@ -6782,8 +6782,8 @@ Spore1: return Move_PETAL_DANCE: - loadspritegfx ANIM_TAG_159 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W080, SOUND_PAN_ATTACKER @@ -6821,8 +6821,8 @@ Move_PETAL_DANCE: Move_RAZOR_LEAF: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -6862,7 +6862,7 @@ Move_RAZOR_LEAF: Move_NATURE_POWER: Move_ANCIENT_POWER: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gBattleAnimSpriteTemplate_85972D8, 2, 4, 1, 10, 1 @@ -6911,7 +6911,7 @@ Move_OCTAZOOKA: end Move_MIST: - loadspritegfx ANIM_TAG_144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15 @@ -6945,9 +6945,9 @@ Move_HAZE: end Move_FIRE_PUNCH: - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask sub_8116620, 10, 4, 2, 0, 9, RGB_RED @@ -7000,7 +7000,7 @@ Move_LEER: end Move_DREAM_EATER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET @@ -7067,7 +7067,7 @@ DreamEaterEffect: return Move_POISON_GAS: - loadspritegfx ANIM_TAG_172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg ANIM_DEF_PARTNER @@ -7120,7 +7120,7 @@ Move_WRAP: goto BindWrap Move_PSYBEAM: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createsoundtask sub_8158C58, 200, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15 @@ -7147,7 +7147,7 @@ Psybeam1: return Move_HYPNOSIS: - loadspritegfx ANIM_TAG_163 + loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call Hypnosis1 call Hypnosis1 @@ -7165,7 +7165,7 @@ Hypnosis1: return Move_PSYWAVE: - loadspritegfx ANIM_TAG_165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, SOUND_PAN_ATTACKER call SetPsychicBackground createvisualtask sub_81076C8, 5, 100 @@ -7189,7 +7189,7 @@ Psywave1: return Move_ZAP_CANNON: - loadspritegfx ANIM_TAG_171 + loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, SOUND_PAN_ATTACKER createsprite gUnknown_08595764, 131, 10, 0, 0, 0, 30, 0 @@ -7211,7 +7211,7 @@ Move_ZAP_CANNON: Move_STEEL_WING: loadspritegfx ANIM_TAG_GUST - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 0, 0, 0 waitforvisualfinish @@ -7237,7 +7237,7 @@ Move_STEEL_WING: end Move_IRON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 0, 0 waitforvisualfinish @@ -7256,7 +7256,7 @@ Move_IRON_TAIL: end Move_POISON_TAIL: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2 createvisualtask sub_81144F8, 5, 1, 1, RGB(24, 6, 23) @@ -7318,7 +7318,7 @@ Move_NIGHT_SHADE: Move_EGG_BOMB: loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_175 + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, SOUND_PAN_ATTACKER createsprite gUnknown_08593488, 130, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7342,7 +7342,7 @@ Move_EGG_BOMB: end Move_SHADOW_BALL: - loadspritegfx ANIM_TAG_176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg BG_GHOST waitbgfadein delay 15 @@ -7357,7 +7357,7 @@ Move_SHADOW_BALL: end Move_LICK: - loadspritegfx ANIM_TAG_177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, SOUND_PAN_TARGET createsprite gUnknown_08596D8C, 130, 0, 0 @@ -7366,7 +7366,7 @@ Move_LICK: end Move_FOCUS_ENERGY: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -7389,7 +7389,7 @@ BideSetUp: end BideUnleash: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2 @@ -7419,7 +7419,7 @@ BideUnleash: end Move_STRING_SHOT: - loadspritegfx ANIM_TAG_179 + loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER delay 0 @@ -7517,8 +7517,8 @@ RazorWindSetUp: goto RazorWindContinue RazorWindUnleash: - loadspritegfx ANIM_TAG_154 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W013B, SOUND_PAN_ATTACKER @@ -7555,7 +7555,7 @@ Move_DISABLE: end Move_RECOVER: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -7590,7 +7590,7 @@ Recover1: return Move_MIMIC: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS setalpha 11, 5 monbg_22 ANIM_DEF_PARTNER monbgprio_29 @@ -7609,7 +7609,7 @@ Move_MIMIC: end Move_CONSTRICT: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4 createsprite gUnknown_08592494, 132, 0, 16, 0, 2 delay 7 @@ -7629,7 +7629,7 @@ Move_CURSE: choosetwoturnanim CurseGhost, CurseStats CurseGhost: loadspritegfx ANIM_TAG_NAIL - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_ATK_PARTNER createvisualtask sub_8112758, 5 waitforvisualfinish @@ -7672,7 +7672,7 @@ CurseStats1: Move_SOFT_BOILED: loadspritegfx ANIM_TAG_BREAKING_EGG - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER playsewithpan SE_W039, SOUND_PAN_ATTACKER @@ -7696,7 +7696,7 @@ Move_SOFT_BOILED: Move_HEAL_BELL: loadspritegfx ANIM_TAG_BELL loadspritegfx ANIM_TAG_MUSIC_NOTES_2 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_8116620, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_8105CB4, 5 @@ -7724,7 +7724,7 @@ Move_HEAL_BELL: waitforvisualfinish unloadspritegfx ANIM_TAG_BELL unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 - unloadspritegfx ANIM_TAG_203 + unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, SOUND_PAN_ATTACKER createsprite gUnknown_08592B94, 16, -15, 0, 0, 0, 32, 60, 1 @@ -7732,7 +7732,7 @@ Move_HEAL_BELL: createsprite gUnknown_08592B94, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER createvisualtask sub_8116664, 10, 4, 3, 10, 0, RGB(12, 24, 30) createvisualtask sub_8116620, 10, 10, 3, 10, 0, RGB_WHITE @@ -7757,7 +7757,7 @@ Move_FAKE_OUT: end Move_SCARY_FACE: - loadspritegfx ANIM_TAG_218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, 2, 27, 3, 0, 16, RGB_BLACK playsewithpan SE_W060, SOUND_PAN_ATTACKER waitforvisualfinish @@ -7775,7 +7775,7 @@ Move_SCARY_FACE: end Move_SWEET_KISS: - loadspritegfx ANIM_TAG_216 + loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gUnknown_08593AA8, 130, 16, -48 playsewithpan SE_W215, SOUND_PAN_TARGET @@ -7794,8 +7794,8 @@ Move_SWEET_KISS: end Move_LOVELY_KISS: - loadspritegfx ANIM_TAG_219 - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gUnknown_08593AF0, 130, 0, -24 playsewithpan SE_W060B, SOUND_PAN_TARGET waitforvisualfinish @@ -7807,7 +7807,7 @@ Move_LOVELY_KISS: end Move_FURY_SWIPES: - loadspritegfx ANIM_TAG_222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, 2, 5, 5 delay 4 playsewithpan SE_W010, SOUND_PAN_TARGET @@ -7822,8 +7822,8 @@ Move_FURY_SWIPES: end Move_INGRAIN: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gUnknown_0859254C, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, SOUND_PAN_ATTACKER delay 10 @@ -7912,7 +7912,7 @@ PresentHeal: end Move_BATON_PASS: - loadspritegfx ANIM_TAG_226 + loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createsprite gUnknown_085CE370, 2 @@ -7982,7 +7982,7 @@ Move_SLEEP_TALK: end Move_HYPER_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, SOUND_PAN_TARGET delay 1 delay 2 @@ -8055,15 +8055,15 @@ Move_TRI_ATTACK: delay 2 createvisualtask sub_8115F10, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call FreezeEffect1 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 2, 16, 0, RGB_BLACK waitforvisualfinish end Move_WILL_O_WISP: - loadspritegfx ANIM_TAG_232 - loadspritegfx ANIM_TAG_231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET playsewithpan SE_W052, SOUND_PAN_ATTACKER @@ -8093,8 +8093,8 @@ Move_WILL_O_WISP: end Move_ENCORE: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_HAND + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 waitforvisualfinish @@ -8114,7 +8114,7 @@ Move_ENCORE: Move_TRICK: loadspritegfx ANIM_TAG_ITEM_BAG - loadspritegfx ANIM_TAG_207 + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gUnknown_085926E8, 2, -40, 80 createsprite gUnknown_085926E8, 2, -40, 208 delay 16 @@ -8141,7 +8141,7 @@ Move_TRICK: end Move_WISH: - loadspritegfx ANIM_TAG_233 + loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 3, 0, 10, RGB_BLACK waitforvisualfinish @@ -8157,7 +8157,7 @@ Move_WISH: end Move_STOCKPILE: - loadspritegfx ANIM_TAG_235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, SOUND_PAN_ATTACKER createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_815B65C, 5 @@ -8186,8 +8186,8 @@ Stockpile1: return Move_SPIT_UP: - loadspritegfx ANIM_TAG_237 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 @@ -8233,7 +8233,7 @@ SpitUpStrongest: goto SpitUpContinue Move_SWALLOW: - loadspritegfx ANIM_TAG_236 + loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, SOUND_PAN_ATTACKER createvisualtask sub_815B778, 5 @@ -8310,7 +8310,7 @@ MorningSun1: return Move_SWEET_SCENT: - loadspritegfx ANIM_TAG_238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, SOUND_PAN_ATTACKER createsprite gUnknown_085CE544, 2, 100, 0, 100 delay 25 @@ -8348,7 +8348,7 @@ SweetScentEffect: return Move_HYPER_BEAM: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 4, 0, 16, RGB_BLACK waitforvisualfinish delay 10 @@ -8358,7 +8358,7 @@ Move_HYPER_BEAM: delay 30 createsoundtask sub_8158C58, 247, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 - createvisualtask sub_8115D94, 2, ANIM_TAG_147, 1, 12, 31, 16, 0, 0 + createvisualtask sub_8115D94, 2, ANIM_TAG_ORBS, 1, 12, 31, 16, 0, 0 call HyperBeam1 call HyperBeam1 call HyperBeam1 @@ -8398,8 +8398,8 @@ HyperBeam1: return Move_FLATTER: - loadspritegfx ANIM_TAG_227 - loadspritegfx ANIM_TAG_240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask sub_815ABEC, 2 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 @@ -8458,7 +8458,7 @@ Move_ROLE_PLAY: end Move_REFRESH: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, SOUND_PAN_ATTACKER createvisualtask sub_815DFCC, 2, 0 @@ -8472,8 +8472,8 @@ Move_REFRESH: end Move_BLAZE_KICK: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_TARGET setalpha 12, 8 @@ -8493,7 +8493,7 @@ Move_BLAZE_KICK: end Move_HYPER_VOICE: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING createvisualtask sub_81590B8, 5, 0 call HyperVoiceEffect waitforvisualfinish @@ -8559,8 +8559,8 @@ Move_SHEER_COLD: end Move_ARM_THRUST: - loadspritegfx ANIM_TAG_143 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 ANIM_TARGET setalpha 12, 8 createvisualtask sub_80D6134, 5, 8, 5, 0, 0 @@ -8679,7 +8679,7 @@ End: end Move_MUD_SHOT: - loadspritegfx ANIM_TAG_259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8711,9 +8711,9 @@ MudShot1: return Move_METEOR_MASH: - 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, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0 fadetobg BG_COSMIC waitbgfadein @@ -8736,7 +8736,7 @@ Move_METEOR_MASH: end Move_REVENGE: - loadspritegfx ANIM_TAG_245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -8744,15 +8744,15 @@ Move_REVENGE: waitforvisualfinish createvisualtask sub_8115A04, 2, 2, 0, 4, 2, 8, RGB_RED 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, SOUND_PAN_TARGET createsprite gUnknown_085960D0, 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_TARGET, 3, 0, 10, 1 createsprite gUnknown_08597400, 131, -10, -8, 1, 1, 8 playsewithpan SE_W233B, SOUND_PAN_TARGET @@ -8765,7 +8765,7 @@ Move_REVENGE: end Move_POISON_FANG: - loadspritegfx ANIM_TAG_192 + loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, SOUND_PAN_TARGET createsprite gUnknown_085CE1DC, 130 @@ -8783,8 +8783,8 @@ Move_SUBSTITUTE: end Move_FRENZY_PLANT: - loadspritegfx ANIM_TAG_223 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -8843,7 +8843,7 @@ Move_FRENZY_PLANT: end Move_METAL_SOUND: - loadspritegfx ANIM_TAG_260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER monbgprio_2A ANIM_TARGET createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1 @@ -8868,8 +8868,8 @@ FocusPunchEnd: waitforvisualfinish end FocusPunch: - loadspritegfx ANIM_TAG_135 - loadspritegfx ANIM_TAG_143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask AnimTask_IsContest, 2 jumprettrue FocusPunchInContest @@ -8911,7 +8911,7 @@ FocusPunchInContest: goto FocusPunchContinue Move_RETURN: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2 @@ -9074,7 +9074,7 @@ Move_COSMIC_POWER: Move_BLAST_BURN: loadspritegfx ANIM_TAG_FIRE_PLUME - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W221, SOUND_PAN_ATTACKER @@ -9150,7 +9150,7 @@ Move_ROCK_TOMB: end Move_SILVER_WIND: - loadspritegfx ANIM_TAG_271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 playsewithpan SE_W234, 0 delay 0 @@ -9212,11 +9212,11 @@ Move_SNATCH: end Move_DIVE: - loadspritegfx ANIM_TAG_272 - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim DiveSetUp, DiveAttack DiveSetUp: - loadspritegfx ANIM_TAG_156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, SOUND_PAN_ATTACKER createsprite gUnknown_08596490, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9233,8 +9233,8 @@ DiveSetUp1: createsprite gUnknown_085964E4, 5, 1, 0 return DiveAttack: - loadspritegfx ANIM_TAG_148 - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W153, SOUND_PAN_TARGET @@ -9258,7 +9258,7 @@ DiveAttack1: Move_ROCK_BLAST: loadspritegfx ANIM_TAG_ROCKS - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 3 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9276,7 +9276,7 @@ Move_ROCK_BLAST: Move_OVERHEAT: loadspritegfx ANIM_TAG_SMALL_EMBER - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, 2, 1, 1, 0, 5, RGB(28, 0, 0) @@ -9356,8 +9356,8 @@ Move_OVERHEAT: end Move_HYDRO_CANNON: - loadspritegfx ANIM_TAG_149 - loadspritegfx ANIM_TAG_148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_W057, SOUND_PAN_ATTACKER @@ -9398,7 +9398,7 @@ HydroCannon1: return Move_ASTONISH: - loadspritegfx ANIM_TAG_273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, SOUND_PAN_ATTACKER createsprite gHorizontalLungeSpriteTemplate, 2, 4, 6 delay 25 @@ -9411,7 +9411,7 @@ Move_ASTONISH: end Move_SEISMIC_TOSS: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg ANIM_DEF_PARTNER @@ -9478,7 +9478,7 @@ SeismicToss2: return Move_MAGIC_COAT: - loadspritegfx ANIM_TAG_170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15 createsprite gUnknown_085965C0, 3, 40, 0, 10170 @@ -9488,8 +9488,8 @@ Move_MAGIC_COAT: end Move_WATER_PULSE: - loadspritegfx ANIM_TAG_155 - loadspritegfx ANIM_TAG_288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg ANIM_TARGET monbgprio_28 ANIM_TARGET playsewithpan SE_W145C, SOUND_PAN_ATTACKER @@ -9519,7 +9519,7 @@ Move_WATER_PULSE: end Move_PSYCHO_BOOST: - loadspritegfx ANIM_TAG_212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg BG_PSYCHIC waitbgfadeout @@ -9546,8 +9546,8 @@ Move_PSYCHO_BOOST: end Move_KNOCK_OFF: - 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, SOUND_PAN_TARGET @@ -9586,7 +9586,7 @@ Move_DOOM_DESIRE: end Move_SKY_UPPERCUT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET fadetobg BG_SEISMICTOSS_SKUUPPERCUT @@ -9644,7 +9644,7 @@ Move_SECRET_POWER: Move_TWISTER: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET @@ -9690,8 +9690,8 @@ Move_TWISTER: Move_MAGICAL_LEAF: loadspritegfx ANIM_TAG_LEAF - loadspritegfx ANIM_TAG_160 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 @@ -9734,7 +9734,7 @@ Move_MAGICAL_LEAF: Move_ICE_BALL: loadspritegfx ANIM_TAG_ICE_CHUNK - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue: @@ -9823,7 +9823,7 @@ IceBall1: return Move_WEATHER_BALL: - loadspritegfx ANIM_TAG_283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, 2, 8, 1, ANIM_ATTACKER delay 8 playsewithpan SE_W207, SOUND_PAN_ATTACKER @@ -9841,7 +9841,7 @@ Move_WEATHER_BALL: jumpreteq ANIM_WEATHER_SANDSTORM, WeatherBallSandstorm jumpreteq ANIM_WEATHER_HAIL, WeatherBallIce WeatherBallNormal: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT createsprite gUnknown_0853EE50, 130, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, SOUND_PAN_TARGET @@ -9865,7 +9865,7 @@ WeatherBallFire: waitforvisualfinish end WeatherBallWater: - loadspritegfx ANIM_TAG_155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gUnknown_08595328, 130, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, SOUND_PAN_TARGET delay 8 @@ -9899,8 +9899,8 @@ WeatherBallSandstorm: waitforvisualfinish end WeatherBallIce: - loadspritegfx ANIM_TAG_263 - loadspritegfx ANIM_TAG_141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gUnknown_08595D44, 130, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, SOUND_PAN_TARGET delay 10 @@ -9917,7 +9917,7 @@ WeatherBallIce: end Move_COUNT: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10235,7 +10235,7 @@ Burn1: return Status_Infatuation: - loadspritegfx ANIM_TAG_PURPLE_HEART + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, SOUND_PAN_ATTACKER createsprite gUnknown_08593970, 3, 0, 20 delay 15 @@ -10272,7 +10272,7 @@ Status_Freeze: end Status_Curse: - loadspritegfx ANIM_TAG_200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596DE8, 130 @@ -10282,7 +10282,7 @@ Status_Curse: end Status_Nightmare: - loadspritegfx ANIM_TAG_EVIL_ANGEL + loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER playsewithpan SE_W171, SOUND_PAN_TARGET createsprite gBattleAnimSpriteTemplate_8596E00, 130 @@ -10355,7 +10355,7 @@ General_TurnTrap: jumpargeq 0, TRAP_ANIM_SAND_TOMB, Status_SandTomb goto Status_BindWrap Status_BindWrap: - loadspritegfx ANIM_TAG_186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2 createsprite gUnknown_08592494, 132, 0, 16, 0, 1 delay 7 @@ -10377,7 +10377,7 @@ Status_FireSpin: stopsound end Status_Whrilpool: - loadspritegfx ANIM_TAG_149 + loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET setalpha 12, 8 @@ -10394,8 +10394,8 @@ Status_Whrilpool: clearmonbg ANIM_DEF_PARTNER end Status_Clamp: - loadspritegfx ANIM_TAG_145 - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W011, SOUND_PAN_TARGET @@ -10423,7 +10423,7 @@ Status_SandTomb: end General_ItemEffect: - loadspritegfx ANIM_TAG_203 + loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, SOUND_PAN_ATTACKER @@ -10445,7 +10445,7 @@ General_ItemEffect: end General_SmokeballEscape: - loadspritegfx ANIM_TAG_242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER setalpha 12, 4 delay 0 @@ -10494,7 +10494,7 @@ General_HangedOn: end General_Rain: - loadspritegfx ANIM_TAG_115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, SOUND_PAN_ATTACKER createvisualtask sub_8116620, 10, 0x781, 2, 0, 4, RGB_BLACK waitforvisualfinish @@ -10521,7 +10521,7 @@ General_LeechSeedDrain: goto Move_ABSORB General_MonHit: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET setalpha 12, 8 playsewithpan SE_W003, SOUND_PAN_TARGET @@ -10618,7 +10618,7 @@ General_DoomDesireHit: end General_FocusPunchSetUp: - loadspritegfx ANIM_TAG_184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, SOUND_PAN_ATTACKER call EndureEffect delay 8 @@ -10631,7 +10631,7 @@ General_FocusPunchSetUp: end General_IngrainHeal: - loadspritegfx ANIM_TAG_147 + loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -10718,7 +10718,7 @@ BallThrowEnd: createvisualtask sub_8170D24, 2 end BallThrowTrainerBlock: - loadspritegfx ANIM_TAG_135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_DEF_PARTNER setalpha 12, 8 |