diff options
Diffstat (limited to 'src')
99 files changed, 1296 insertions, 1296 deletions
diff --git a/src/battle/anim/alert.c b/src/battle/anim/alert.c index 04ae15a5e..f0d437627 100644 --- a/src/battle/anim/alert.c +++ b/src/battle/anim/alert.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D744C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7450 = { - .tileTag = 10075, - .paletteTag = 10075, + .tileTag = ANIM_TAG_ALERT, + .paletteTag = ANIM_TAG_ALERT, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D744C, .images = NULL, diff --git a/src/battle/anim/angel.c b/src/battle/anim/angel.c index be5b82ea1..4121e3c70 100644 --- a/src/battle/anim/angel.c +++ b/src/battle/anim/angel.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BB8 = { - .tileTag = 10220, - .paletteTag = 10220, + .tileTag = ANIM_TAG_ANGEL, + .paletteTag = ANIM_TAG_ANGEL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BB4, .images = NULL, diff --git a/src/battle/anim/angel_kiss.c b/src/battle/anim/angel_kiss.c index 64abff6cf..1b395fded 100644 --- a/src/battle/anim/angel_kiss.c +++ b/src/battle/anim/angel_kiss.c @@ -16,8 +16,8 @@ void sub_80D2A38(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7BD0 = { - .tileTag = 10219, - .paletteTag = 10219, + .tileTag = ANIM_TAG_PINK_HEART, + .paletteTag = ANIM_TAG_PINK_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/anger.c b/src/battle/anim/anger.c index a50404ddf..7abe53ab8 100644 --- a/src/battle/anim/anger.c +++ b/src/battle/anim/anger.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7794[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7798 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/aurora.c b/src/battle/anim/aurora.c index 3564da811..ed41e9e79 100644 --- a/src/battle/anim/aurora.c +++ b/src/battle/anim/aurora.c @@ -46,8 +46,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D91C0[] = // Multi-colored rings used in Aurora Beam. const struct SpriteTemplate RainbowRingSpriteTemplate = { - .tileTag = 10140, - .paletteTag = 10140, + .tileTag = ANIM_TAG_RAINBOW_RINGS, + .paletteTag = ANIM_TAG_RAINBOW_RINGS, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D91A0, .images = NULL, diff --git a/src/battle/anim/beta_beat_up.c b/src/battle/anim/beta_beat_up.c index 166782362..bc70b705c 100644 --- a/src/battle/anim/beta_beat_up.c +++ b/src/battle/anim/beta_beat_up.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9808[] = const struct SpriteTemplate gSpriteTemplate_83D980C = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/blow_kiss.c b/src/battle/anim/blow_kiss.c index 80056614f..d66e4aade 100644 --- a/src/battle/anim/blow_kiss.c +++ b/src/battle/anim/blow_kiss.c @@ -16,8 +16,8 @@ static void sub_80D1FA4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AB0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bottle.c b/src/battle/anim/bottle.c index 83a539f89..c5b43d7bc 100644 --- a/src/battle/anim/bottle.c +++ b/src/battle/anim/bottle.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C48 = { - .tileTag = 10099, - .paletteTag = 10099, + .tileTag = ANIM_TAG_MILK_BOTTLE, + .paletteTag = ANIM_TAG_MILK_BOTTLE, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index 89330788c..acf31e121 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E94[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_EndureFlame = { - .tileTag = 10184, - .paletteTag = 10184, + .tileTag = ANIM_TAG_FOCUS_ENERGY, + .paletteTag = ANIM_TAG_FOCUS_ENERGY, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83D6E94, .images = NULL, diff --git a/src/battle/anim/breath.c b/src/battle/anim/breath.c index 87c737fac..b55ff729e 100644 --- a/src/battle/anim/breath.c +++ b/src/battle/anim/breath.c @@ -39,8 +39,8 @@ const union AnimCmd *const gSpriteAnimTable_83D775C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7764 = { - .tileTag = 10086, - .paletteTag = 10086, + .tileTag = ANIM_TAG_BREATH, + .paletteTag = ANIM_TAG_BREATH, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D775C, .images = NULL, diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index ceefd82cf..9caf4d918 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9174[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9178 = { - .tileTag = 10146, - .paletteTag = 10146, + .tileTag = ANIM_TAG_BUBBLE, + .paletteTag = ANIM_TAG_BUBBLE, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9174, .images = NULL, diff --git a/src/battle/anim/bug.c b/src/battle/anim/bug.c index e4ea01f5c..b9429a75a 100644 --- a/src/battle/anim/bug.c +++ b/src/battle/anim/bug.c @@ -49,8 +49,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAAB0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAABC = { - .tileTag = 10153, - .paletteTag = 10153, + .tileTag = ANIM_TAG_HORN_HIT_2, + .paletteTag = ANIM_TAG_HORN_HIT_2, .oam = &gOamData_837E014, .anims = gDummySpriteAnimTable, .images = NULL, @@ -85,8 +85,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB04[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = { - .tileTag = 10180, - .paletteTag = 10180, + .tileTag = ANIM_TAG_STRING_DOT, + .paletteTag = ANIM_TAG_STRING_DOT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -107,8 +107,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB28 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB40 = { - .tileTag = 10179, - .paletteTag = 10179, + .tileTag = ANIM_TAG_STRING, + .paletteTag = ANIM_TAG_STRING, .oam = &gOamData_837DF5C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAB70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = { - .tileTag = 10181, - .paletteTag = 10181, + .tileTag = ANIM_TAG_WEB, + .paletteTag = ANIM_TAG_WEB, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAB74 = const struct SpriteTemplate gLinearStingerSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -152,8 +152,8 @@ const struct SpriteTemplate gLinearStingerSpriteTemplate = const struct SpriteTemplate gPinMissileSpriteTemplate = { - .tileTag = 10161, - .paletteTag = 10161, + .tileTag = ANIM_TAG_NEEDLE, + .paletteTag = ANIM_TAG_NEEDLE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -163,8 +163,8 @@ const struct SpriteTemplate gPinMissileSpriteTemplate = const struct SpriteTemplate gIcicleSpearSpriteTemplate = { - .tileTag = 10262, - .paletteTag = 10262, + .tileTag = ANIM_TAG_ICICLE_SPEAR, + .paletteTag = ANIM_TAG_ICICLE_SPEAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -190,8 +190,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAC0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC10 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/bullet.c b/src/battle/anim/bullet.c index 60c001853..096023e9a 100644 --- a/src/battle/anim/bullet.c +++ b/src/battle/anim/bullet.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7624[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7628 = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/copy_orb.c b/src/battle/anim/copy_orb.c index d554a7e26..da42814fa 100644 --- a/src/battle/anim/copy_orb.c +++ b/src/battle/anim/copy_orb.c @@ -32,8 +32,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D65E0[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65E8 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c index 9d713ba46..8e78e8d0b 100644 --- a/src/battle/anim/cube.c +++ b/src/battle/anim/cube.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6EEC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6EF0 = { - .tileTag = 10185, - .paletteTag = 10185, + .tileTag = ANIM_TAG_SPHERE_TO_CUBE, + .paletteTag = ANIM_TAG_SPHERE_TO_CUBE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6EEC, .images = NULL, diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index ea73b0116..41b7dda42 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -51,8 +51,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D989C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98A0 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -88,8 +88,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D98EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = { - .tileTag = 10282, - .paletteTag = 10282, + .tileTag = ANIM_TAG_SHOCK_3, + .paletteTag = ANIM_TAG_SHOCK_3, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D98C8, .images = NULL, @@ -99,8 +99,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D98F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -110,8 +110,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9908 = const struct SpriteTemplate gElectricitySpriteTemplate = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -121,8 +121,8 @@ const struct SpriteTemplate gElectricitySpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D9938 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -132,8 +132,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9938 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9950 = { - .tileTag = 10173, - .paletteTag = 10173, + .tileTag = ANIM_TAG_SPARK_H, + .paletteTag = ANIM_TAG_SPARK_H, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const union AnimCmd *const gSpriteAnimTable_83D99B0[] = const struct SpriteTemplate gSpriteTemplate_83D99B8 = { - .tileTag = 10211, - .paletteTag = 10211, + .tileTag = ANIM_TAG_ELECTRIC_ORBS, + .paletteTag = ANIM_TAG_ELECTRIC_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D99B0, .images = NULL, @@ -235,8 +235,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9A60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A6C = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -260,8 +260,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9A98[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = { - .tileTag = 10213, - .paletteTag = 10213, + .tileTag = ANIM_TAG_ELECTRICITY, + .paletteTag = ANIM_TAG_ELECTRICITY, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9A98, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9A9C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9AB4 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -325,8 +325,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9B0C[] = const struct SpriteTemplate gSpriteTemplate_83D9B10 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837E024, .anims = gSpriteAnimTable_83D9AEC, .images = NULL, @@ -336,8 +336,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9B10 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -347,8 +347,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9B28 = const struct SpriteTemplate gSpriteTemplate_83D9B40 = { - .tileTag = 10001, - .paletteTag = 10001, + .tileTag = ANIM_TAG_SPARK, + .paletteTag = ANIM_TAG_SPARK, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/cyclone.c b/src/battle/anim/cyclone.c index 8b868a436..8a7f34d5d 100644 --- a/src/battle/anim/cyclone.c +++ b/src/battle/anim/cyclone.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7658[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D765C = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c index 09e16b8fe..fcbced40e 100644 --- a/src/battle/anim/dark.c +++ b/src/battle/anim/dark.c @@ -46,8 +46,8 @@ static void sub_80E0CD0(u8 taskId); const struct SpriteTemplate gSpriteTemplate_83DB118 = { - .tileTag = 10015, - .paletteTag = 10015, + .tileTag = ANIM_TAG_TIED_BAG, + .paletteTag = ANIM_TAG_TIED_BAG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB1B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = { - .tileTag = 10139, - .paletteTag = 10139, + .tileTag = ANIM_TAG_SHARP_TEETH, + .paletteTag = ANIM_TAG_SHARP_TEETH, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB1E8 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB230[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB238 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -196,8 +196,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB280[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB288 = { - .tileTag = 10039, - .paletteTag = 10039, + .tileTag = ANIM_TAG_CLAW_SLASH, + .paletteTag = ANIM_TAG_CLAW_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB280, .images = NULL, diff --git a/src/battle/anim/devil.c b/src/battle/anim/devil.c index 8183be2ba..ebec1f58e 100644 --- a/src/battle/anim/devil.c +++ b/src/battle/anim/devil.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7BF8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C00 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7BF8, .images = NULL, diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index 0b5b1b88b..c9a1d1539 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAFC8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAFCC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, @@ -95,8 +95,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB03C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB044 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB004, .images = NULL, @@ -121,8 +121,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB074[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB078 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB074, .images = NULL, @@ -164,8 +164,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB0C8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83DB0A0, .images = NULL, @@ -175,8 +175,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -186,8 +186,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB0E8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB100 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAFC8, .images = NULL, diff --git a/src/battle/anim/draw.c b/src/battle/anim/draw.c index 08b09337f..4e570be6b 100644 --- a/src/battle/anim/draw.c +++ b/src/battle/anim/draw.c @@ -21,8 +21,8 @@ static void sub_80D0E8C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77E0 = { - .tileTag = 10002, - .paletteTag = 10002, + .tileTag = ANIM_TAG_PENCIL, + .paletteTag = ANIM_TAG_PENCIL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/egg.c b/src/battle/anim/egg.c index 5b6d56dac..c47d223bf 100644 --- a/src/battle/anim/egg.c +++ b/src/battle/anim/egg.c @@ -6,8 +6,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7594 = { - .tileTag = 10175, - .paletteTag = 10175, + .tileTag = ANIM_TAG_LARGE_FRESH_EGG, + .paletteTag = ANIM_TAG_LARGE_FRESH_EGG, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/energy_wave.c b/src/battle/anim/energy_wave.c index cbca5338c..7118b5acc 100644 --- a/src/battle/anim/energy_wave.c +++ b/src/battle/anim/energy_wave.c @@ -37,8 +37,8 @@ const union AnimCmd *const gSpriteAnimTable_83D91F0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -48,8 +48,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D91F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = { - .tileTag = 10259, - .paletteTag = 10259, + .tileTag = ANIM_TAG_BROWN_ORB, + .paletteTag = ANIM_TAG_BROWN_ORB, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D920C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = { - .tileTag = 10264, - .paletteTag = 10264, + .tileTag = ANIM_TAG_GLOWY_RED_ORB, + .paletteTag = ANIM_TAG_GLOWY_RED_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9224 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D923C = { - .tileTag = 10265, - .paletteTag = 10265, + .tileTag = ANIM_TAG_GLOWY_GREEN_ORB, + .paletteTag = ANIM_TAG_GLOWY_GREEN_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9264[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9264, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9268 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9280 = { - .tileTag = 10165, - .paletteTag = 10165, + .tileTag = ANIM_TAG_BLUE_RING, + .paletteTag = ANIM_TAG_BLUE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D92CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D92E8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D91F0, .images = NULL, diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index a4f11c823..17d0b383f 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D79E4[] = const struct SpriteTemplate gSpriteTemplate_83D79E8 = { - .tileTag = 10207, - .paletteTag = 10207, + .tileTag = ANIM_TAG_SPEED_DUST, + .paletteTag = ANIM_TAG_SPEED_DUST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D79E4, .images = NULL, diff --git a/src/battle/anim/fang.c b/src/battle/anim/fang.c index c35898eea..74de16b56 100644 --- a/src/battle/anim/fang.c +++ b/src/battle/anim/fang.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D707C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7080 = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D707C, .images = NULL, diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 505356a57..76a8f2e7c 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -59,8 +59,8 @@ static void sub_80D99F4(struct Sprite *sprite); const struct SpriteTemplate gSpriteTemplate_83D9F24 = { - .tileTag = 10050, - .paletteTag = 10050, + .tileTag = ANIM_TAG_HUMANOID_FOOT, + .paletteTag = ANIM_TAG_HUMANOID_FOOT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -117,8 +117,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9F70[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -128,8 +128,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F78 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -139,8 +139,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9F90 = const struct SpriteTemplate gFistFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -150,8 +150,8 @@ const struct SpriteTemplate gFistFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -161,8 +161,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FC0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F70, .images = NULL, @@ -172,8 +172,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FD8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9FF0 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -195,8 +195,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA020[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA024 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -218,8 +218,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA054[] = const struct SpriteTemplate gMegaPunchKickSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -229,8 +229,8 @@ const struct SpriteTemplate gMegaPunchKickSpriteTemplate = const struct SpriteTemplate gStompFootSpriteTemplate = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F68, .images = NULL, @@ -240,8 +240,8 @@ const struct SpriteTemplate gStompFootSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -251,8 +251,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA088 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -262,8 +262,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0A0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0B8 = { - .tileTag = 10208, - .paletteTag = 10208, + .tileTag = ANIM_TAG_TORN_METAL, + .paletteTag = ANIM_TAG_TORN_METAL, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -287,8 +287,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA0F8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA0FC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = { - .tileTag = 10257, - .paletteTag = 10257, + .tileTag = ANIM_TAG_FLAT_ROCK, + .paletteTag = ANIM_TAG_FLAT_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA114 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = { - .tileTag = 10256, - .paletteTag = 10256, + .tileTag = ANIM_TAG_METEOR, + .paletteTag = ANIM_TAG_METEOR, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -320,8 +320,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA12C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA144 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9F64, .images = NULL, @@ -362,8 +362,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA18C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA198 = { - .tileTag = 10245, - .paletteTag = 10245, + .tileTag = ANIM_TAG_PURPLE_SCRATCH, + .paletteTag = ANIM_TAG_PURPLE_SCRATCH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA18C, .images = NULL, @@ -401,8 +401,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA1D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA1E0 = { - .tileTag = 10246, - .paletteTag = 10246, + .tileTag = ANIM_TAG_PURPLE_SWIPE, + .paletteTag = ANIM_TAG_PURPLE_SWIPE, .oam = &gOamData_837DF3C, .anims = gSpriteAnimTable_83DA1D4, .images = NULL, @@ -424,8 +424,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA214 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9F64, .images = NULL, diff --git a/src/battle/anim/finger.c b/src/battle/anim/finger.c index 66ca4ca06..fd4be79a9 100644 --- a/src/battle/anim/finger.c +++ b/src/battle/anim/finger.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D72C0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72C8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D72E0 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -125,8 +125,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7348[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7358 = { - .tileTag = 10214, - .paletteTag = 10214, + .tileTag = ANIM_TAG_FINGER_2, + .paletteTag = ANIM_TAG_FINGER_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7348, .images = NULL, diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c index 929828ed4..c5d75d9a5 100644 --- a/src/battle/anim/fire.c +++ b/src/battle/anim/fire.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9470[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -49,8 +49,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9478 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9490 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9470, .images = NULL, @@ -105,8 +105,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9504[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -116,8 +116,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = { - .tileTag = 10033, - .paletteTag = 10033, + .tileTag = ANIM_TAG_FIRE, + .paletteTag = ANIM_TAG_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94CC, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = { - .tileTag = 10035, - .paletteTag = 10035, + .tileTag = ANIM_TAG_FIRE_PLUME, + .paletteTag = ANIM_TAG_FIRE_PLUME, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9538 = const struct SpriteTemplate gSpriteTemplate_83D9550 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D94E8, .images = NULL, @@ -162,8 +162,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9578[] = const struct SpriteTemplate gSpriteTemplate_83D957C = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9578, .images = NULL, diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 68e13e1c1..9db989aac 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -45,8 +45,8 @@ const union AnimCmd *const gSpriteAnimTable_83D95E0[] = const struct SpriteTemplate gEmberSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -56,8 +56,8 @@ const struct SpriteTemplate gEmberSpriteTemplate = const struct SpriteTemplate gEmberFlareSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -67,8 +67,8 @@ const struct SpriteTemplate gEmberFlareSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9614 = const struct SpriteTemplate gFireRingSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -119,8 +119,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9674[] = const struct SpriteTemplate gFireCrossSpriteTemplate = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9650, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gFireCrossSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9694 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -153,8 +153,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96AC = const struct SpriteTemplate gSpriteTemplate_83D96C4 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -175,8 +175,8 @@ const s16 gHeatedRockCoords[][2] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D96F8 = { - .tileTag = 10201, - .paletteTag = 10201, + .tileTag = ANIM_TAG_WARM_ROCK, + .paletteTag = ANIM_TAG_WARM_ROCK, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 646c80c53..3e3e7dc6b 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -49,8 +49,8 @@ void sub_80DA0DC(u8 taskId); const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA380 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DF7C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA3B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3B4 = { - .tileTag = 10009, - .paletteTag = 10009, + .tileTag = ANIM_TAG_GUST, + .paletteTag = ANIM_TAG_GUST, .oam = &gOamData_837DFDC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -97,8 +97,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA3E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA3E4 = { - .tileTag = 10154, - .paletteTag = 10154, + .tileTag = ANIM_TAG_AIR_WAVE_2, + .paletteTag = ANIM_TAG_AIR_WAVE_2, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA3E0, .images = NULL, @@ -140,8 +140,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA448[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -151,8 +151,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA450 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA468 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DF9C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -180,8 +180,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA490[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA498 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -193,8 +193,8 @@ const u16 gUnknownPalette_83DA4B0[] = INCBIN_U16("graphics/unknown/unknown_3DA4B const struct SpriteTemplate gSpriteTemplate_83DA4D0 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -204,8 +204,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA4D0 = const struct SpriteTemplate gSpriteTemplate_83DA4E8 = { - .tileTag = 10270, - .paletteTag = 10270, + .tileTag = ANIM_TAG_WHITE_FEATHER, + .paletteTag = ANIM_TAG_WHITE_FEATHER, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DA490, .images = NULL, @@ -230,8 +230,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA518[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA51C = { - .tileTag = 10162, - .paletteTag = 10162, + .tileTag = ANIM_TAG_WHIRLWIND_LINES, + .paletteTag = ANIM_TAG_WHIRLWIND_LINES, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83DA518, .images = NULL, @@ -256,8 +256,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA564[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA568 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -278,8 +278,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA590[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA594 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -303,8 +303,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA5D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA5D8 = { - .tileTag = 10156, - .paletteTag = 10156, + .tileTag = ANIM_TAG_ROUND_SHADOW, + .paletteTag = ANIM_TAG_ROUND_SHADOW, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -327,8 +327,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = { - .tileTag = 10272, - .paletteTag = 10272, + .tileTag = ANIM_TAG_SPLASH, + .paletteTag = ANIM_TAG_SPLASH, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -338,8 +338,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA614 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = { - .tileTag = 10273, - .paletteTag = 10273, + .tileTag = ANIM_TAG_SWEAT_BEAD, + .paletteTag = ANIM_TAG_SWEAT_BEAD, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -349,8 +349,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA62C = const struct SpriteTemplate gSpriteTemplate_83DA644 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -360,8 +360,8 @@ const struct SpriteTemplate gSpriteTemplate_83DA644 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = { - .tileTag = 10284, - .paletteTag = 10284, + .tileTag = ANIM_TAG_BIRD, + .paletteTag = ANIM_TAG_BIRD, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_hearts.c b/src/battle/anim/flying_hearts.c index 2bba6c4cb..855b3b8a3 100644 --- a/src/battle/anim/flying_hearts.c +++ b/src/battle/anim/flying_hearts.c @@ -16,8 +16,8 @@ static void sub_80D2094(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AE0 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/flying_petals.c b/src/battle/anim/flying_petals.c index 4696cbc6c..7135f4380 100644 --- a/src/battle/anim/flying_petals.c +++ b/src/battle/anim/flying_petals.c @@ -28,8 +28,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D68B4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D68D0 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -80,8 +80,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6938[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -91,8 +91,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D693C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -102,8 +102,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6954 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D696C = { - .tileTag = 10271, - .paletteTag = 10271, + .tileTag = ANIM_TAG_SPARKLE_6, + .paletteTag = ANIM_TAG_SPARKLE_6, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index cba7b2b82..cd2b4eb0c 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -63,8 +63,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAE60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -74,8 +74,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE7C = { - .tileTag = 10013, - .paletteTag = 10013, + .tileTag = ANIM_TAG_YELLOW_BALL, + .paletteTag = ANIM_TAG_YELLOW_BALL, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -96,8 +96,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAEA4[] = const struct SpriteTemplate gShadowBallSpriteTemplate = { - .tileTag = 10176, - .paletteTag = 10176, + .tileTag = ANIM_TAG_SHADOW_BALL, + .paletteTag = ANIM_TAG_SHADOW_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -122,8 +122,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAED8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAEDC = { - .tileTag = 10177, - .paletteTag = 10177, + .tileTag = ANIM_TAG_LICK, + .paletteTag = ANIM_TAG_LICK, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DAED8, .images = NULL, @@ -144,8 +144,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAF04[] = const struct SpriteTemplate gSpriteTemplate_83DAF08 = { - .tileTag = 10188, - .paletteTag = 10188, + .tileTag = ANIM_TAG_WHITE_SHADOW, + .paletteTag = ANIM_TAG_WHITE_SHADOW, .oam = &gOamData_837E07C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -155,8 +155,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAF08 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = { - .tileTag = 10199, - .paletteTag = 10199, + .tileTag = ANIM_TAG_NAIL, + .paletteTag = ANIM_TAG_NAIL, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF20 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = { - .tileTag = 10200, - .paletteTag = 10200, + .tileTag = ANIM_TAG_GHOSTLY_SPIRIT, + .paletteTag = ANIM_TAG_GHOSTLY_SPIRIT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAF50 = { - .tileTag = 10221, - .paletteTag = 10221, + .tileTag = ANIM_TAG_DEVIL, + .paletteTag = ANIM_TAG_DEVIL, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -202,8 +202,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAF7C[] = const struct SpriteTemplate gSpriteTemplate_83DAF80 = { - .tileTag = 10253, - .paletteTag = 10253, + .tileTag = ANIM_TAG_PURPLE_FLAME, + .paletteTag = ANIM_TAG_PURPLE_FLAME, .oam = &gOamData_837E094, .anims = gSpriteAnimTable_83DAF7C, .images = NULL, diff --git a/src/battle/anim/glitter.c b/src/battle/anim/glitter.c index fb7443575..e0ef150ad 100644 --- a/src/battle/anim/glitter.c +++ b/src/battle/anim/glitter.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6C84[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6C88 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6CA0 = { - .tileTag = 10049, - .paletteTag = 10049, + .tileTag = ANIM_TAG_SPARKLE_2, + .paletteTag = ANIM_TAG_SPARKLE_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6C84, .images = NULL, diff --git a/src/battle/anim/grip.c b/src/battle/anim/grip.c index b5c191449..8cf4e4bf9 100644 --- a/src/battle/anim/grip.c +++ b/src/battle/anim/grip.c @@ -38,8 +38,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D769C = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D7694, .images = NULL, diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 407abeddc..9f72cd73e 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -64,8 +64,8 @@ const union AffineAnimCmd *const gBoneHitSpriteAffineAnimTable[] = const struct SpriteTemplate gBonemerangSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -75,8 +75,8 @@ const struct SpriteTemplate gBonemerangSpriteTemplate = const struct SpriteTemplate gBoneHitSpriteTemplate = { - .tileTag = 10000, - .paletteTag = 10000, + .tileTag = ANIM_TAG_BONE, + .paletteTag = ANIM_TAG_BONE, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -86,8 +86,8 @@ const struct SpriteTemplate gBoneHitSpriteTemplate = const struct SpriteTemplate gSandAttackDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -108,8 +108,8 @@ const union AnimCmd *const gMudSlapDirtSpriteAnimTable[] = const struct SpriteTemplate gMudSlapDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gMudSlapDirtSpriteAnimTable, .images = NULL, @@ -119,8 +119,8 @@ const struct SpriteTemplate gMudSlapDirtSpriteTemplate = const struct SpriteTemplate gMudSportDirtSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -130,8 +130,8 @@ const struct SpriteTemplate gMudSportDirtSpriteTemplate = const struct SpriteTemplate gDirtPlumeSpriteTemplate = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -141,8 +141,8 @@ const struct SpriteTemplate gDirtPlumeSpriteTemplate = const struct SpriteTemplate gDigDirtMoundSpriteTemplate = { - .tileTag = 10281, - .paletteTag = 10281, + .tileTag = ANIM_TAG_DIRT_MOUND, + .paletteTag = ANIM_TAG_DIRT_MOUND, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index b1f194ef5..779895831 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -33,8 +33,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D6C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 = { - .tileTag = 10244, - .paletteTag = 10244, + .tileTag = ANIM_TAG_GUARD_RING, + .paletteTag = ANIM_TAG_GUARD_RING, .oam = &gOamData_837E13C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/guillotine.c b/src/battle/anim/guillotine.c index bc0fce4dd..cfad4837b 100644 --- a/src/battle/anim/guillotine.c +++ b/src/battle/anim/guillotine.c @@ -40,8 +40,8 @@ const union AnimCmd *const gSpriteAnimTable_83D76D4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D76DC = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D76D4, .images = NULL, diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index e0b8f9b9e..c44dd4ba4 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6760[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6764 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6760, .images = NULL, diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index c9f26b093..25b1ccc51 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -42,8 +42,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7A40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A44 = { - .tileTag = 10205, - .paletteTag = 10205, + .tileTag = ANIM_TAG_BELL, + .paletteTag = ANIM_TAG_BELL, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7A40, .images = NULL, @@ -63,8 +63,8 @@ const u16 gUnknown_083D7A5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A68 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/heart_1.c b/src/battle/anim/heart_1.c index 5522d4551..523e0082d 100644 --- a/src/battle/anim/heart_1.c +++ b/src/battle/anim/heart_1.c @@ -15,8 +15,8 @@ void sub_80D1C80(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7A80 = { - .tileTag = 10210, - .paletteTag = 10210, + .tileTag = ANIM_TAG_MAGENTA_HEART, + .paletteTag = ANIM_TAG_MAGENTA_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hidden_power_orbit.c b/src/battle/anim/hidden_power_orbit.c index ed680b2bd..2fce2da37 100644 --- a/src/battle/anim/hidden_power_orbit.c +++ b/src/battle/anim/hidden_power_orbit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B10[] = const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -38,8 +38,8 @@ const struct SpriteTemplate gHiddenPowerOrbSpriteTemplate = const struct SpriteTemplate gHiddenPowerOrbScatterSpriteTemplate = { - .tileTag = 10217, - .paletteTag = 10217, + .tileTag = ANIM_TAG_RED_ORB, + .paletteTag = ANIM_TAG_RED_ORB, .oam = &gOamData_837DFEC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/homing.c b/src/battle/anim/homing.c index 5cd2a3ddb..4b2365542 100644 --- a/src/battle/anim/homing.c +++ b/src/battle/anim/homing.c @@ -16,8 +16,8 @@ static void sub_80CC7D4(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6994 = { - .tileTag = 10266, - .paletteTag = 10266, + .tileTag = ANIM_TAG_GREEN_SPIKE, + .paletteTag = ANIM_TAG_GREEN_SPIKE, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 3aba79511..dcf8ed702 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -48,8 +48,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6714[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, @@ -59,8 +59,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index 108b06c60..6ecf6b392 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -22,8 +22,8 @@ static void sub_80CBB60(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D677C = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index e2288e704..5ad79051f 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9B64[] = // unknown sprite template const struct SpriteTemplate gSpriteTemplate_83D9B68 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9BDC[] = const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E144, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gLargeIcePunchCrystalSpriteTemplate = const struct SpriteTemplate gSmallIcePunchCrystalSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -192,8 +192,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C20[] = const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -203,8 +203,8 @@ const struct SpriteTemplate IceBeamCenterParticleSpriteTemplate = const struct SpriteTemplate gIceBeamOuterParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E044, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -227,8 +227,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9C74[] = const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0E4, .anims = gSpriteAnimTable_83D9BB8, .images = NULL, @@ -238,8 +238,8 @@ const struct SpriteTemplate gLargeIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837E0A4, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, @@ -249,8 +249,8 @@ const struct SpriteTemplate gSmallIceEffectParticleSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -260,8 +260,8 @@ const struct SpriteTemplate gSmallSnowballSpriteTemplate1 = const struct SpriteTemplate gLargeSnowballSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D9BC4, .images = NULL, @@ -271,8 +271,8 @@ const struct SpriteTemplate gLargeSnowballSpriteTemplate = const struct SpriteTemplate gSmallSnowballSpriteTemplate2 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC0, .images = NULL, @@ -299,8 +299,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D10[] = const struct SpriteTemplate gIceSpikeSpriteTemplate = { - .tileTag = 10142, - .paletteTag = 10142, + .tileTag = ANIM_TAG_ICE_SPIKES, + .paletteTag = ANIM_TAG_ICE_SPIKES, .oam = &gOamData_837E084, .anims = gSpriteAnimTable_83D9D10, .images = NULL, @@ -322,8 +322,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9D38[] = const struct SpriteTemplate gMistCloudSpriteTemplate = { - .tileTag = 10144, - .paletteTag = 10144, + .tileTag = ANIM_TAG_MIST_CLOUD, + .paletteTag = ANIM_TAG_MIST_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -333,8 +333,8 @@ const struct SpriteTemplate gMistCloudSpriteTemplate = const struct SpriteTemplate gSmogCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -349,8 +349,8 @@ const u8 gUnknown_083D9D6C[] = const struct SpriteTemplate gMistBallSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -365,8 +365,8 @@ const u8 gUnknown_083D9D98[] = const struct SpriteTemplate gPoisonGasCloudSpriteTemplate = { - .tileTag = 10172, - .paletteTag = 10172, + .tileTag = ANIM_TAG_PURPLE_GAS_CLOUD, + .paletteTag = ANIM_TAG_PURPLE_GAS_CLOUD, .oam = &gOamData_837E074, .anims = gSpriteAnimTable_83D9D38, .images = NULL, @@ -426,8 +426,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9E38[] = const struct SpriteTemplate gHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -437,8 +437,8 @@ const struct SpriteTemplate gHailSpriteTemplate = const struct SpriteTemplate gWeatherBallHailSpriteTemplate = { - .tileTag = 10263, - .paletteTag = 10263, + .tileTag = ANIM_TAG_HAIL, + .paletteTag = ANIM_TAG_HAIL, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -508,8 +508,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9EE0[] = const struct SpriteTemplate gIceBallSpriteTemplate = { - .tileTag = 10043, - .paletteTag = 10043, + .tileTag = ANIM_TAG_ICE_CHUNK, + .paletteTag = ANIM_TAG_ICE_CHUNK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_83D9E88, .images = NULL, @@ -519,8 +519,8 @@ const struct SpriteTemplate gIceBallSpriteTemplate = const struct SpriteTemplate gIceBallParticleSpriteTemplate = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BBC, .images = NULL, diff --git a/src/battle/anim/kiss_fountain.c b/src/battle/anim/kiss_fountain.c index 8ab3fcded..4fc340e63 100644 --- a/src/battle/anim/kiss_fountain.c +++ b/src/battle/anim/kiss_fountain.c @@ -15,8 +15,8 @@ void sub_80D1FDC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7AC8 = { - .tileTag = 10216, - .paletteTag = 10216, + .tileTag = ANIM_TAG_RED_HEART, + .paletteTag = ANIM_TAG_RED_HEART, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 2d36d7360..a60390dc5 100644 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -50,8 +50,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D649C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64B4 = { - .tileTag = 10063, - .paletteTag = 10063, + .tileTag = ANIM_TAG_LEAF, + .paletteTag = ANIM_TAG_LEAF, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6494, .images = NULL, @@ -86,8 +86,8 @@ const union AnimCmd *const gSpriteAnimTable_83D64E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D64E4 = { - .tileTag = 10160, - .paletteTag = 10160, + .tileTag = ANIM_TAG_RAZOR_LEAF, + .paletteTag = ANIM_TAG_RAZOR_LEAF, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_83D64E0, .images = NULL, @@ -106,8 +106,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D650C[] = { const struct SpriteTemplate gSwiftStarSpriteTemplate = { - .tileTag = 10174, - .paletteTag = 10174, + .tileTag = ANIM_TAG_YELLOW_STAR, + .paletteTag = ANIM_TAG_YELLOW_STAR, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/money.c b/src/battle/anim/money.c index 3960b5e1a..e23b38012 100644 --- a/src/battle/anim/money.c +++ b/src/battle/anim/money.c @@ -39,8 +39,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D75E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, @@ -50,8 +50,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75E4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D75FC = { - .tileTag = 10100, - .paletteTag = 10100, + .tileTag = ANIM_TAG_COIN, + .paletteTag = ANIM_TAG_COIN, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D75CC, .images = NULL, diff --git a/src/battle/anim/moon.c b/src/battle/anim/moon.c index 6e889008e..fe2e7a849 100644 --- a/src/battle/anim/moon.c +++ b/src/battle/anim/moon.c @@ -16,8 +16,8 @@ static void sub_80CE354(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FC8 = { - .tileTag = 10194, - .paletteTag = 10194, + .tileTag = ANIM_TAG_MOON, + .paletteTag = ANIM_TAG_MOON, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index b67cd17b8..c0269a379 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -92,8 +92,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7110[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7114 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -111,8 +111,8 @@ const u16 gUnknown_083D712C[][6] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -122,8 +122,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D715C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7174 = { - .tileTag = 10193, - .paletteTag = 10193, + .tileTag = ANIM_TAG_PURPLE_HAND_OUTLINE, + .paletteTag = ANIM_TAG_PURPLE_HAND_OUTLINE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -145,8 +145,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D71A4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D71A8 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index 6a6f6c10a..f4ea10bf9 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -14,8 +14,8 @@ static void sub_80D2E30(struct Sprite *); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 = { - .tileTag = 10225, - .paletteTag = 10225, + .tileTag = ANIM_TAG_JAGGED_MUSIC_NOTE, + .paletteTag = ANIM_TAG_JAGGED_MUSIC_NOTE, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 54524f2ef..7fa3ea265 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -109,8 +109,8 @@ const union AnimCmd *const gConfusionDuckSpriteAnimTable[] = const struct SpriteTemplate gConfusionDuckSpriteTemplate = { - .tileTag = 10073, - .paletteTag = 10073, + .tileTag = ANIM_TAG_DUCK, + .paletteTag = ANIM_TAG_DUCK, .oam = &gOamData_837DF2C, .anims = gConfusionDuckSpriteAnimTable, .images = NULL, @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_83DB40C[] = const struct SpriteTemplate gSpriteTemplate_83DB410 = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DB40C, .images = NULL, @@ -214,8 +214,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DB498[] = const struct SpriteTemplate gBasicHitSplatSpriteTemplate = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBasicHitSplatSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = { - .tileTag = 10148, - .paletteTag = 10148, + .tileTag = ANIM_TAG_WATER_IMPACT, + .paletteTag = ANIM_TAG_WATER_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -258,8 +258,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB4F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -269,8 +269,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB508 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = { - .tileTag = 10285, - .paletteTag = 10285, + .tileTag = ANIM_TAG_CROSS_IMPACT, + .paletteTag = ANIM_TAG_CROSS_IMPACT, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -280,8 +280,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB520 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -291,8 +291,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB538 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DB550 = { - .tileTag = 10135, - .paletteTag = 10135, + .tileTag = ANIM_TAG_IMPACT, + .paletteTag = ANIM_TAG_IMPACT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/note_spin.c b/src/battle/anim/note_spin.c index c3d6bdf52..899357310 100644 --- a/src/battle/anim/note_spin.c +++ b/src/battle/anim/note_spin.c @@ -44,8 +44,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7D10[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D1C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D34 = { - .tileTag = 10206, - .paletteTag = 10206, + .tileTag = ANIM_TAG_MUSIC_NOTES_2, + .paletteTag = ANIM_TAG_MUSIC_NOTES_2, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D70D8, .images = NULL, diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index 5d82b2842..1c5ba144d 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -67,8 +67,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6424[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6420, .images = NULL, @@ -78,8 +78,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6428 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6440 = { - .tileTag = 10159, - .paletteTag = 10159, + .tileTag = ANIM_TAG_FLOWER, + .paletteTag = ANIM_TAG_FLOWER, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6424, .images = NULL, diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index d4886d1f8..e78d8f974 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -103,8 +103,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D62E8[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -114,8 +114,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D62EC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, @@ -125,8 +125,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6304 = const struct SpriteTemplate gSpriteTemplate_83D631C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62D0, .images = NULL, @@ -146,8 +146,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D634C[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6350 = { - .tileTag = 10235, - .paletteTag = 10235, + .tileTag = ANIM_TAG_GRAY_ORB, + .paletteTag = ANIM_TAG_GRAY_ORB, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -166,8 +166,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6378[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D62D4, .images = NULL, @@ -177,8 +177,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D637C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6394 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D62B4, .images = NULL, diff --git a/src/battle/anim/osmose.c b/src/battle/anim/osmose.c index dad5605f7..36949b3c5 100644 --- a/src/battle/anim/osmose.c +++ b/src/battle/anim/osmose.c @@ -26,8 +26,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6694[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6698 = { - .tileTag = 10147, - .paletteTag = 10147, + .tileTag = ANIM_TAG_ORBS, + .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D6694, .images = NULL, diff --git a/src/battle/anim/perceive.c b/src/battle/anim/perceive.c index ceca55141..0679dc617 100644 --- a/src/battle/anim/perceive.c +++ b/src/battle/anim/perceive.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7B90[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B94 = { - .tileTag = 10218, - .paletteTag = 10218, + .tileTag = ANIM_TAG_EYE_SPARKLE, + .paletteTag = ANIM_TAG_EYE_SPARKLE, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D7B90, .images = NULL, diff --git a/src/battle/anim/poison.c b/src/battle/anim/poison.c index 99f534e1c..6559e1b2e 100644 --- a/src/battle/anim/poison.c +++ b/src/battle/anim/poison.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA240[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA244 = { - .tileTag = 10151, - .paletteTag = 10151, + .tileTag = ANIM_TAG_TOXIC_BUBBLE, + .paletteTag = ANIM_TAG_TOXIC_BUBBLE, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA240, .images = NULL, @@ -104,8 +104,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA2B4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -115,8 +115,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2B8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -126,8 +126,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA2E8 = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA27C, .images = NULL, @@ -149,8 +149,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA318[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA31C = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DFEC, .anims = gSpriteAnimTable_83DA278, .images = NULL, @@ -172,8 +172,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA34C[] = const struct SpriteTemplate gPoisonBubbleSpriteTemplate = { - .tileTag = 10150, - .paletteTag = 10150, + .tileTag = ANIM_TAG_POISON_BUBBLE, + .paletteTag = ANIM_TAG_POISON_BUBBLE, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83DA274, .images = NULL, @@ -183,8 +183,8 @@ const struct SpriteTemplate gPoisonBubbleSpriteTemplate = const struct SpriteTemplate gWaterBubbleSpriteTemplate = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D9310, .images = NULL, diff --git a/src/battle/anim/powder.c b/src/battle/anim/powder.c index 046d3c20c..447f31866 100644 --- a/src/battle/anim/powder.c +++ b/src/battle/anim/powder.c @@ -29,8 +29,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6220[] = const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = { - .tileTag = 10067, - .paletteTag = 10067, + .tileTag = ANIM_TAG_SLEEP_POWDER, + .paletteTag = ANIM_TAG_SLEEP_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -40,8 +40,8 @@ const struct SpriteTemplate gSleepPowderParticleSpriteTemplate = const struct SpriteTemplate gStunSporeParticleSpriteTemplate = { - .tileTag = 10068, - .paletteTag = 10068, + .tileTag = ANIM_TAG_STUN_SPORE, + .paletteTag = ANIM_TAG_STUN_SPORE, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, @@ -51,8 +51,8 @@ const struct SpriteTemplate gStunSporeParticleSpriteTemplate = const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = { - .tileTag = 10065, - .paletteTag = 10065, + .tileTag = ANIM_TAG_POISON_POWDER, + .paletteTag = ANIM_TAG_POISON_POWDER, .oam = &gOamData_837DF64, .anims = gSpriteAnimTable_83D6220, .images = NULL, diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index ef263b971..9a4c211b7 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -50,8 +50,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA68C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = { - .tileTag = 10196, - .paletteTag = 10196, + .tileTag = ANIM_TAG_SPIRAL, + .paletteTag = ANIM_TAG_SPIRAL, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -61,8 +61,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA690 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = { - .tileTag = 10166, - .paletteTag = 10166, + .tileTag = ANIM_TAG_GREEN_LIGHT_WALL, + .paletteTag = ANIM_TAG_GREEN_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -72,8 +72,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6A8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = { - .tileTag = 10167, - .paletteTag = 10167, + .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, + .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -83,8 +83,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6C0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = { - .tileTag = 10168, - .paletteTag = 10168, + .tileTag = ANIM_TAG_RED_LIGHT_WALL, + .paletteTag = ANIM_TAG_RED_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -94,8 +94,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6D8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = { - .tileTag = 10169, - .paletteTag = 10169, + .tileTag = ANIM_TAG_GRAY_LIGHT_WALL, + .paletteTag = ANIM_TAG_GRAY_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -105,8 +105,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA6F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA708 = { - .tileTag = 10170, - .paletteTag = 10170, + .tileTag = ANIM_TAG_ORANGE_LIGHT_WALL, + .paletteTag = ANIM_TAG_ORANGE_LIGHT_WALL, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -131,8 +131,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA738[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA73C = { - .tileTag = 10071, - .paletteTag = 10071, + .tileTag = ANIM_TAG_SPARKLE_4, + .paletteTag = ANIM_TAG_SPARKLE_4, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA738, .images = NULL, @@ -156,8 +156,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA768[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = { - .tileTag = 10070, - .paletteTag = 10070, + .tileTag = ANIM_TAG_SPARKLE_3, + .paletteTag = ANIM_TAG_SPARKLE_3, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83DA768, .images = NULL, @@ -167,8 +167,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA76C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA784 = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837DF74, .anims = gDummySpriteAnimTable, .images = NULL, @@ -224,8 +224,8 @@ const union AnimCmd *const gSpriteAnimTable_83DA81C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA824 = { - .tileTag = 10097, - .paletteTag = 10097, + .tileTag = ANIM_TAG_BENT_SPOON, + .paletteTag = ANIM_TAG_BENT_SPOON, .oam = &gOamData_837DF74, .anims = gSpriteAnimTable_83DA81C, .images = NULL, @@ -266,8 +266,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_083DA888[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA88C = { - .tileTag = 10093, - .paletteTag = 10093, + .tileTag = ANIM_TAG_AMNESIA, + .paletteTag = ANIM_TAG_AMNESIA, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DA85C, .images = NULL, @@ -292,8 +292,8 @@ const union AffineAnimCmd gSpriteAffineAnim_083DA8C4[] = const struct SpriteTemplate gSpriteTemplate_83DA8DC = { - .tileTag = 10249, - .paletteTag = 10249, + .tileTag = ANIM_TAG_HOLLOW_ORB, + .paletteTag = ANIM_TAG_HOLLOW_ORB, .oam = &gOamData_837E04C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -356,8 +356,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA99C[] = const struct SpriteTemplate gSpriteTemplate_83DA9AC = { - .tileTag = 10251, - .paletteTag = 10251, + .tileTag = ANIM_TAG_BLUEGREEN_ORB, + .paletteTag = ANIM_TAG_BLUEGREEN_ORB, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -379,8 +379,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DA9DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA9E0 = { - .tileTag = 10267, - .paletteTag = 10267, + .tileTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -417,8 +417,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DAA60[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAA68 = { - .tileTag = 10212, - .paletteTag = 10212, + .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, + .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/ring.c b/src/battle/anim/ring.c index a2cf618a6..f3d18c89a 100644 --- a/src/battle/anim/ring.c +++ b/src/battle/anim/ring.c @@ -30,8 +30,8 @@ static void sub_80D158C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D77F8 = { - .tileTag = 10197, - .paletteTag = 10197, + .tileTag = ANIM_TAG_SNORE_Z, + .paletteTag = ANIM_TAG_SNORE_Z, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7824[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7828 = { - .tileTag = 10198, - .paletteTag = 10198, + .tileTag = ANIM_TAG_EXPLOSION, + .paletteTag = ANIM_TAG_EXPLOSION, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7824, .images = NULL, @@ -99,8 +99,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D78B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D78BC = { - .tileTag = 10202, - .paletteTag = 10202, + .tileTag = ANIM_TAG_BREAKING_EGG, + .paletteTag = ANIM_TAG_BREAKING_EGG, .oam = &gOamData_837E114, .anims = gDummySpriteAnimTable, .images = NULL, @@ -142,8 +142,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7924[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7928 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -165,8 +165,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7958[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -176,8 +176,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D795C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -187,8 +187,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7974 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -198,8 +198,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D798C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D79A4 = { - .tileTag = 10203, - .paletteTag = 10203, + .tileTag = ANIM_TAG_THIN_RING, + .paletteTag = ANIM_TAG_THIN_RING, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index fa53df5b8..4d9401854 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -70,8 +70,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAC40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC4C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAC40, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC64 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAC7C = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -116,8 +116,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DACB4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = { - .tileTag = 10149, - .paletteTag = 10149, + .tileTag = ANIM_TAG_WATER_ORB, + .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_837E0AC, .anims = gSpriteAnimTable_83D91F0, .images = NULL, @@ -127,8 +127,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACB8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = { - .tileTag = 10029, - .paletteTag = 10029, + .tileTag = ANIM_TAG_SMALL_EMBER, + .paletteTag = ANIM_TAG_SMALL_EMBER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D95E0, .images = NULL, @@ -138,8 +138,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DACD0 = const struct SpriteTemplate gFlyingDirtSpriteTemplate = { - .tileTag = 10261, - .paletteTag = 10261, + .tileTag = ANIM_TAG_FLYING_DIRT, + .paletteTag = ANIM_TAG_FLYING_DIRT, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -214,8 +214,8 @@ const union AnimCmd *const gSpriteAnimTable_83DAD58[] = const struct SpriteTemplate gAncientPowerRockSpriteTemplate = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gAncientPowerRockSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83DAD78 = { - .tileTag = 10074, - .paletteTag = 10074, + .tileTag = ANIM_TAG_MUD_SAND, + .paletteTag = ANIM_TAG_MUD_SAND, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -236,8 +236,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD78 = const struct SpriteTemplate gSpriteTemplate_83DAD90 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -247,8 +247,8 @@ const struct SpriteTemplate gSpriteTemplate_83DAD90 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADA8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -276,8 +276,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83DADE0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -287,8 +287,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DADE8 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD48, .images = NULL, @@ -298,8 +298,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE00 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83DAD58, .images = NULL, @@ -309,8 +309,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE18 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83DAE30 = { - .tileTag = 10058, - .paletteTag = 10058, + .tileTag = ANIM_TAG_ROCKS, + .paletteTag = ANIM_TAG_ROCKS, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83DAD50, .images = NULL, diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index b9b76c584..085d678d6 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -59,8 +59,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6648[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, @@ -70,8 +70,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6658 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6670 = { - .tileTag = 10223, - .paletteTag = 10223, + .tileTag = ANIM_TAG_ROOTS, + .paletteTag = ANIM_TAG_ROOTS, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6648, .images = NULL, diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 409acf549..8a87d4eb4 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -23,8 +23,8 @@ static void sub_80CD67C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -34,8 +34,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DAC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6DC4 = { - .tileTag = 10014, - .paletteTag = 10014, + .tileTag = ANIM_TAG_LOCK_ON, + .paletteTag = ANIM_TAG_LOCK_ON, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index bf8142a49..8065c9a38 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D63C0[] = const struct SpriteTemplate gLeechSeedSpriteTemplate = { - .tileTag = 10006, - .paletteTag = 10006, + .tileTag = ANIM_TAG_SEED, + .paletteTag = ANIM_TAG_SEED, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D63C0, .images = NULL, diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index d858f5100..d71baacc9 100644 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -17,8 +17,8 @@ static void sub_80CCE0C(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6BE8 = { - .tileTag = 10280, - .paletteTag = 10280, + .tileTag = ANIM_TAG_PROTECT, + .paletteTag = ANIM_TAG_PROTECT, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/shock.c b/src/battle/anim/shock.c index 5b82d9319..fac415ade 100644 --- a/src/battle/anim/shock.c +++ b/src/battle/anim/shock.c @@ -33,8 +33,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9840[] = const struct SpriteTemplate gSpriteTemplate_83D9844 = { - .tileTag = 10079, - .paletteTag = 10079, + .tileTag = ANIM_TAG_SHOCK, + .paletteTag = ANIM_TAG_SHOCK, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9840, .images = NULL, @@ -44,8 +44,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9844 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = { - .tileTag = 10011, - .paletteTag = 10011, + .tileTag = ANIM_TAG_SPARK_2, + .paletteTag = ANIM_TAG_SPARK_2, .oam = &gOamData_837DF8C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -55,8 +55,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D985C = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9874 = { - .tileTag = 10171, - .paletteTag = 10171, + .tileTag = ANIM_TAG_BLACK_BALL_2, + .paletteTag = ANIM_TAG_BLACK_BALL_2, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/slash.c b/src/battle/anim/slash.c index f71bc6eaa..c2c1fcb16 100644 --- a/src/battle/anim/slash.c +++ b/src/battle/anim/slash.c @@ -41,8 +41,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6E30[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = { - .tileTag = 10183, - .paletteTag = 10183, + .tileTag = ANIM_TAG_SLASH, + .paletteTag = ANIM_TAG_SLASH, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -52,8 +52,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E38 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, @@ -63,8 +63,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E50 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6E68 = { - .tileTag = 10286, - .paletteTag = 10286, + .tileTag = ANIM_TAG_SLASH_2, + .paletteTag = ANIM_TAG_SLASH_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6E30, .images = NULL, diff --git a/src/battle/anim/sleep.c b/src/battle/anim/sleep.c index 40b984be7..6963624ee 100644 --- a/src/battle/anim/sleep.c +++ b/src/battle/anim/sleep.c @@ -61,8 +61,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6D8C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6D94 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D6D28, .images = NULL, diff --git a/src/battle/anim/slice.c b/src/battle/anim/slice.c index 4da414cbf..329f267d6 100644 --- a/src/battle/anim/slice.c +++ b/src/battle/anim/slice.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6B24[] = const struct SpriteTemplate gCuttingSliceSpriteTemplate = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, @@ -39,8 +39,8 @@ const struct SpriteTemplate gCuttingSliceSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6B40 = { - .tileTag = 10138, - .paletteTag = 10138, + .tileTag = ANIM_TAG_CUT, + .paletteTag = ANIM_TAG_CUT, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_83D6B24, .images = NULL, diff --git a/src/battle/anim/sonic.c b/src/battle/anim/sonic.c index 4a9ade286..d1e7f2e6b 100644 --- a/src/battle/anim/sonic.c +++ b/src/battle/anim/sonic.c @@ -19,8 +19,8 @@ void sub_80CF8B8(struct Sprite* sprite); const struct SpriteTemplate gSonicBoomSpriteTemplate = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E134, .anims = gDummySpriteAnimTable, .images = NULL, @@ -30,8 +30,8 @@ const struct SpriteTemplate gSonicBoomSpriteTemplate = const struct SpriteTemplate gSpriteTemplate_83D74BC = { - .tileTag = 10003, - .paletteTag = 10003, + .tileTag = ANIM_TAG_AIR_WAVE, + .paletteTag = ANIM_TAG_AIR_WAVE, .oam = &gOamData_837E074, .anims = gDummySpriteAnimTable, .images = NULL, @@ -70,8 +70,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7530[] = const struct SpriteTemplate gSupersonicWaveSpriteTemplate = { - .tileTag = 10163, - .paletteTag = 10163, + .tileTag = ANIM_TAG_GOLD_RING, + .paletteTag = ANIM_TAG_GOLD_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -81,8 +81,8 @@ const struct SpriteTemplate gSupersonicWaveSpriteTemplate = const struct SpriteTemplate gScreechWaveSpriteTemplate = { - .tileTag = 10164, - .paletteTag = 10164, + .tileTag = ANIM_TAG_PURPLE_RING, + .paletteTag = ANIM_TAG_PURPLE_RING, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, @@ -92,8 +92,8 @@ const struct SpriteTemplate gScreechWaveSpriteTemplate = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = { - .tileTag = 10260, - .paletteTag = 10260, + .tileTag = ANIM_TAG_METAL_SOUND_WAVES, + .paletteTag = ANIM_TAG_METAL_SOUND_WAVES, .oam = &gOamData_837E03C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -103,8 +103,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7564 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D757C = { - .tileTag = 10288, - .paletteTag = 10288, + .tileTag = ANIM_TAG_BLUE_RING_2, + .paletteTag = ANIM_TAG_BLUE_RING_2, .oam = &gOamData_837E034, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/spit.c b/src/battle/anim/spit.c index 792d7e0eb..ee21135ac 100644 --- a/src/battle/anim/spit.c +++ b/src/battle/anim/spit.c @@ -27,8 +27,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7B5C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7B60 = { - .tileTag = 10237, - .paletteTag = 10237, + .tileTag = ANIM_TAG_RED_ORB_2, + .paletteTag = ANIM_TAG_RED_ORB_2, .oam = &gOamData_837DFE4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/strike.c b/src/battle/anim/strike.c index 79dd833a9..0eba290a9 100644 --- a/src/battle/anim/strike.c +++ b/src/battle/anim/strike.c @@ -34,8 +34,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7034[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = { - .tileTag = 10031, - .paletteTag = 10031, + .tileTag = ANIM_TAG_BLUE_STAR, + .paletteTag = ANIM_TAG_BLUE_STAR, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7034, .images = NULL, @@ -45,8 +45,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7038 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7050 = { - .tileTag = 10020, - .paletteTag = 10020, + .tileTag = ANIM_TAG_HORN_HIT, + .paletteTag = ANIM_TAG_HORN_HIT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/struggle.c b/src/battle/anim/struggle.c index 2bcf3727e..609673fa0 100644 --- a/src/battle/anim/struggle.c +++ b/src/battle/anim/struggle.c @@ -36,8 +36,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C88[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C90 = { - .tileTag = 10215, - .paletteTag = 10215, + .tileTag = ANIM_TAG_MOVEMENT_WAVES, + .paletteTag = ANIM_TAG_MOVEMENT_WAVES, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C88, .images = NULL, diff --git a/src/battle/anim/sunlight.c b/src/battle/anim/sunlight.c index 5edb9afea..c10f561ae 100644 --- a/src/battle/anim/sunlight.c +++ b/src/battle/anim/sunlight.c @@ -21,8 +21,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D95AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D95B0 = { - .tileTag = 10157, - .paletteTag = 10157, + .tileTag = ANIM_TAG_SUNLIGHT, + .paletteTag = ANIM_TAG_SUNLIGHT, .oam = &gOamData_837E0B4, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/swipe.c b/src/battle/anim/swipe.c index df7a0e91f..09f9adbd6 100644 --- a/src/battle/anim/swipe.c +++ b/src/battle/anim/swipe.c @@ -32,8 +32,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7C40[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7C48 = { - .tileTag = 10222, - .paletteTag = 10222, + .tileTag = ANIM_TAG_SWIPE, + .paletteTag = ANIM_TAG_SWIPE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7C40, .images = NULL, diff --git a/src/battle/anim/switch.c b/src/battle/anim/switch.c index fcb1d9fc3..2b8a87d3d 100644 --- a/src/battle/anim/switch.c +++ b/src/battle/anim/switch.c @@ -45,8 +45,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D67E4[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D67F4 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_83D66B8, .images = NULL, diff --git a/src/battle/anim/sword.c b/src/battle/anim/sword.c index fcb85a794..8b15288b9 100644 --- a/src/battle/anim/sword.c +++ b/src/battle/anim/sword.c @@ -29,8 +29,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D7488[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D748C = { - .tileTag = 10005, - .paletteTag = 10005, + .tileTag = ANIM_TAG_SWORD, + .paletteTag = ANIM_TAG_SWORD, .oam = &gOamData_837E0FC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index cee45b648..de50fc419 100644 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -59,8 +59,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6598[] = { const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65A0 = { - .tileTag = 10186, - .paletteTag = 10186, + .tileTag = ANIM_TAG_TENDRILS, + .paletteTag = ANIM_TAG_TENDRILS, .oam = &gOamData_837DFBC, .anims = gSpriteAnimTable_83D6550, .images = NULL, diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index d39520dac..fcaf6a9a8 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.c @@ -60,8 +60,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7210[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220 = { - .tileTag = 10209, - .paletteTag = 10209, + .tileTag = ANIM_TAG_THOUGHT_BUBBLE, + .paletteTag = ANIM_TAG_THOUGHT_BUBBLE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D7210, .images = NULL, diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 9cd04e61f..862f0f7a8 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D97CC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D97D0 = { - .tileTag = 10037, - .paletteTag = 10037, + .tileTag = ANIM_TAG_LIGHTNING, + .paletteTag = ANIM_TAG_LIGHTNING, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D97CC, .images = NULL, diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 0442321d6..de89b80a7 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -20,8 +20,8 @@ static void sub_80CE1AC(struct Sprite* sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F08 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -46,8 +46,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6F38[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F3C = { - .tileTag = 10030, - .paletteTag = 10030, + .tileTag = ANIM_TAG_GRAY_SMOKE, + .paletteTag = ANIM_TAG_GRAY_SMOKE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6F38, .images = NULL, @@ -82,8 +82,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6F7C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6F80 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6F68, .images = NULL, @@ -107,8 +107,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FAC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FB0 = { - .tileTag = 10018, - .paletteTag = 10018, + .tileTag = ANIM_TAG_CONVERSION, + .paletteTag = ANIM_TAG_CONVERSION, .oam = &gOamData_837E104, .anims = gSpriteAnimTable_83D6FAC, .images = NULL, diff --git a/src/battle/anim/twinkle.c b/src/battle/anim/twinkle.c index bfe0c8da2..0180d5be1 100644 --- a/src/battle/anim/twinkle.c +++ b/src/battle/anim/twinkle.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6FF4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6FF8 = { - .tileTag = 10195, - .paletteTag = 10195, + .tileTag = ANIM_TAG_SPARKLE_5, + .paletteTag = ANIM_TAG_SPARKLE_5, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6FF4, .images = NULL, diff --git a/src/battle/anim/unused_1.c b/src/battle/anim/unused_1.c index 15050b54c..ee775a0ed 100644 --- a/src/battle/anim/unused_1.c +++ b/src/battle/anim/unused_1.c @@ -66,8 +66,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D6AD8[] = { const struct SpriteTemplate gSpriteTemplate_83D6AF8 = { - .tileTag = 10143, - .paletteTag = 10143, + .tileTag = ANIM_TAG_HANDS_AND_FEET, + .paletteTag = ANIM_TAG_HANDS_AND_FEET, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_2.c b/src/battle/anim/unused_2.c index f4ebe0e74..4c12f609d 100644 --- a/src/battle/anim/unused_2.c +++ b/src/battle/anim/unused_2.c @@ -90,8 +90,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6BA8[] = const struct SpriteTemplate gSpriteTemplate_83D6BD0 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6BA8, .images = NULL, diff --git a/src/battle/anim/unused_3.c b/src/battle/anim/unused_3.c index 1c3ab978e..e222cd512 100644 --- a/src/battle/anim/unused_3.c +++ b/src/battle/anim/unused_3.c @@ -47,8 +47,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6D00[] = const struct SpriteTemplate gSpriteTemplate_83D6D08 = { - .tileTag = 10032, - .paletteTag = 10032, + .tileTag = ANIM_TAG_UNUSED_BUBBLE_BURST, + .paletteTag = ANIM_TAG_UNUSED_BUBBLE_BURST, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D6D00, .images = NULL, diff --git a/src/battle/anim/unused_5.c b/src/battle/anim/unused_5.c index af9a8a037..e6b2f47f4 100644 --- a/src/battle/anim/unused_5.c +++ b/src/battle/anim/unused_5.c @@ -14,8 +14,8 @@ void sub_80CF280(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D7370 = { - .tileTag = 10064, - .paletteTag = 10064, + .tileTag = ANIM_TAG_FINGER, + .paletteTag = ANIM_TAG_FINGER, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_6.c b/src/battle/anim/unused_6.c index 5b37d32c9..ab5678641 100644 --- a/src/battle/anim/unused_6.c +++ b/src/battle/anim/unused_6.c @@ -28,8 +28,8 @@ const union AnimCmd *const gSpriteAnimTable_83D7390[] = const struct SpriteTemplate gSpriteTemplate_83D7394 = { - .tileTag = 10072, - .paletteTag = 10072, + .tileTag = ANIM_TAG_MUSIC_NOTES, + .paletteTag = ANIM_TAG_MUSIC_NOTES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_8.c b/src/battle/anim/unused_8.c index 92f5973db..586725f33 100644 --- a/src/battle/anim/unused_8.c +++ b/src/battle/anim/unused_8.c @@ -17,8 +17,8 @@ static void sub_80CF4B8(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D73C4 = { - .tileTag = 10145, - .paletteTag = 10145, + .tileTag = ANIM_TAG_CLAMP, + .paletteTag = ANIM_TAG_CLAMP, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c index d8dda35b3..75d236714 100644 --- a/src/battle/anim/unused_9.c +++ b/src/battle/anim/unused_9.c @@ -17,8 +17,8 @@ static void sub_80CFE2C(struct Sprite* sprite); const struct SpriteTemplate gSpriteTemplate_83D75AC = { - .tileTag = 10178, - .paletteTag = 10178, + .tileTag = ANIM_TAG_UNUSED_VOID_LINES, + .paletteTag = ANIM_TAG_UNUSED_VOID_LINES, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 487624224..af38ecd7a 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -43,8 +43,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9314[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E04C, .anims = gSpriteAnimTable_83D9310, .images = NULL, @@ -54,8 +54,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9318 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837E10C, .anims = gSpriteAnimTable_83D9314, .images = NULL, @@ -65,8 +65,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9330 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = { - .tileTag = 10141, - .paletteTag = 10141, + .tileTag = ANIM_TAG_ICE_CRYSTALS, + .paletteTag = ANIM_TAG_ICE_CRYSTALS, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D9BC8, .images = NULL, @@ -76,8 +76,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9348 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -87,8 +87,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9360 = const struct SpriteTemplate gSpriteTemplate_83D9378 = { - .tileTag = 10268, - .paletteTag = 10268, + .tileTag = ANIM_TAG_GLOWY_BLUE_ORB, + .paletteTag = ANIM_TAG_GLOWY_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -159,8 +159,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83D9404[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -170,8 +170,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9408 = const struct SpriteTemplate gSpriteTemplate_83D9420 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF84, .anims = gSpriteAnimTable_83D93A8, .images = NULL, @@ -181,8 +181,8 @@ const struct SpriteTemplate gSpriteTemplate_83D9420 = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9438 = { - .tileTag = 10155, - .paletteTag = 10155, + .tileTag = ANIM_TAG_SMALL_BUBBLES, + .paletteTag = ANIM_TAG_SMALL_BUBBLES, .oam = &gOamData_837DF8C, .anims = gSpriteAnimTable_83D93B0, .images = NULL, diff --git a/src/battle/anim/whip.c b/src/battle/anim/whip.c index e6e004932..91a937d41 100644 --- a/src/battle/anim/whip.c +++ b/src/battle/anim/whip.c @@ -51,8 +51,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D69F4 = { - .tileTag = 10287, - .paletteTag = 10287, + .tileTag = ANIM_TAG_WHIP_HIT, + .paletteTag = ANIM_TAG_WHIP_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D69D4, .images = NULL, @@ -77,8 +77,8 @@ const union AnimCmd *const gSpriteAnimTable_83D6A24[] = const struct SpriteTemplate gSpriteTemplate_83D6A28 = { - .tileTag = 10021, - .paletteTag = 10021, + .tileTag = ANIM_TAG_UNUSED_HIT, + .paletteTag = ANIM_TAG_UNUSED_HIT, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, @@ -88,8 +88,8 @@ const struct SpriteTemplate gSpriteTemplate_83D6A28 = const struct SpriteTemplate gSpriteTemplate_83D6A40 = { - .tileTag = 10022, - .paletteTag = 10022, + .tileTag = ANIM_TAG_UNUSED_HIT_2, + .paletteTag = ANIM_TAG_UNUSED_HIT_2, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D6A24, .images = NULL, diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index a8ced992a..afcfaa832 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -30,8 +30,8 @@ const union AnimCmd *const gSpriteAnimTable_83D9778[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D977C = { - .tileTag = 10232, - .paletteTag = 10232, + .tileTag = ANIM_TAG_WISP_FIRE, + .paletteTag = ANIM_TAG_WISP_FIRE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_83D9778, .images = NULL, diff --git a/src/battle/anim/wisp_orb.c b/src/battle/anim/wisp_orb.c index f9e21d704..891d86ee1 100644 --- a/src/battle/anim/wisp_orb.c +++ b/src/battle/anim/wisp_orb.c @@ -54,8 +54,8 @@ const union AnimCmd *const gSpriteAnimTable_83D973C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_83D974C = { - .tileTag = 10231, - .paletteTag = 10231, + .tileTag = ANIM_TAG_WISP_ORB, + .paletteTag = ANIM_TAG_WISP_ORB, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_83D973C, .images = NULL, diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c index a0187e3d4..1df920e2a 100644 --- a/src/battle/battle_anim.c +++ b/src/battle/battle_anim.c @@ -666,588 +666,588 @@ const struct OamData gOamData_837E15C = const struct CompressedSpriteSheet gBattleAnimPicTable[] = { - { gBattleAnimSpriteSheet_000, 0x200, 10000 }, - { gBattleAnimSpriteSheet_001, 0x300, 10001 }, - { gBattleAnimSpriteSheet_002, 0x200, 10002 }, - { gBattleAnimSpriteSheet_003, 0x100, 10003 }, - { gBattleAnimSpriteSheet_004, 0x200, 10004 }, - { gBattleAnimSpriteSheet_005, 0x400, 10005 }, - { gBattleAnimSpriteSheet_006, 0x180, 10006 }, - { gBattleAnimSpriteSheet_007, 0x800, 10007 }, - { gBattleAnimSpriteSheet_008, 0x20, 10008 }, - { gBattleAnimSpriteSheet_009, 0x400, 10009 }, - { gBattleAnimSpriteSheet_010, 0x1200, 10010 }, - { gBattleAnimSpriteSheet_011, 0x180, 10011 }, - { gBattleAnimSpriteSheet_012, 0x80, 10012 }, - { gBattleAnimSpriteSheet_013, 0x80, 10013 }, - { gBattleAnimSpriteSheet_014, 0x280, 10014 }, - { gBattleAnimSpriteSheet_015, 0x80, 10015 }, - { gBattleAnimSpriteSheet_016, 0x100, 10016 }, - { gBattleAnimSpriteSheet_017, 0x20, 10017 }, - { gBattleAnimSpriteSheet_018, 0x80, 10018 }, - { gBattleAnimSpriteSheet_019, 0x400, 10019 }, - { gBattleAnimSpriteSheet_020, 0x200, 10020 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10021 }, - { gBattleAnimSpriteSheet_021, 0xA00, 10022 }, - { gBattleAnimSpriteSheet_023, 0x380, 10023 }, - { gBattleAnimSpriteSheet_024, 0x300, 10024 }, - { gBattleAnimSpriteSheet_025, 0xA00, 10025 }, - { gBattleAnimSpriteSheet_026, 0xA00, 10026 }, - { gBattleAnimSpriteSheet_027, 0xA00, 10027 }, - { gBattleAnimSpriteSheet_028, 0xA00, 10028 }, - { gBattleAnimSpriteSheet_029, 0xA00, 10029 }, - { gBattleAnimSpriteSheet_030, 0xA00, 10030 }, - { gBattleAnimSpriteSheet_031, 0xE00, 10031 }, - { gBattleAnimSpriteSheet_032, 0x380, 10032 }, - { gBattleAnimSpriteSheet_033, 0x1000, 10033 }, - { gBattleAnimSpriteSheet_034, 0x800, 10034 }, - { gBattleAnimSpriteSheet_035, 0xA00, 10035 }, - { gBattleAnimSpriteSheet_036, 0x800, 10036 }, - { gBattleAnimSpriteSheet_037, 0xA00, 10037 }, - { gBattleAnimSpriteSheet_038, 0xA00, 10038 }, - { gBattleAnimSpriteSheet_039, 0xA00, 10039 }, - { gBattleAnimSpriteSheet_040, 0xA00, 10040 }, - { gBattleAnimSpriteSheet_041, 0xA00, 10041 }, - { gBattleAnimSpriteSheet_042, 0xA00, 10042 }, - { gBattleAnimSpriteSheet_043, 0xA00, 10043 }, - { gBattleAnimSpriteSheet_044, 0xA00, 10044 }, - { gBattleAnimSpriteSheet_045, 0xA00, 10045 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10046 }, - { gBattleAnimSpriteSheet_046, 0x1000, 10047 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10048 }, - { gBattleAnimSpriteSheet_048, 0x1000, 10049 }, - { gBattleAnimSpriteSheet_050, 0x200, 10050 }, - { gBattleAnimSpriteSheet_051, 0x200, 10051 }, - { gBattleAnimSpriteSheet_052, 0x200, 10052 }, - { gBattleAnimSpriteSheet_053, 0x800, 10053 }, - { gBattleAnimSpriteSheet_054, 0x80, 10054 }, - { gBattleAnimSpriteSheet_055, 0x200, 10055 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10056 }, - { gBattleAnimSpriteSheet_057, 0x180, 10057 }, - { gBattleAnimSpriteSheet_058, 0xC00, 10058 }, - { gBattleAnimSpriteSheet_059, 0x100, 10059 }, - { gBattleAnimSpriteSheet_060, 0x40, 10060 }, - { gBattleAnimSpriteSheet_061, 0x180, 10061 }, - { gBattleAnimSpriteSheet_062, 0x800, 10062 }, - { gBattleAnimSpriteSheet_063, 0x480, 10063 }, - { gBattleAnimSpriteSheet_064, 0x200, 10064 }, - { gBattleAnimSpriteSheet_065, 0x200, 10065 }, - { gBattleAnimSpriteSheet_066, 0x100, 10066 }, - { gBattleAnimSpriteSheet_065, 0x200, 10067 }, - { gBattleAnimSpriteSheet_065, 0x200, 10068 }, - { gBattleAnimSpriteSheet_065, 0x200, 10069 }, - { gBattleAnimSpriteSheet_070, 0x200, 10070 }, - { gBattleAnimSpriteSheet_071, 0xA00, 10071 }, - { gBattleAnimSpriteSheet_072, 0x300, 10072 }, - { gBattleAnimSpriteSheet_073, 0x180, 10073 }, - { gBattleAnimSpriteSheet_074, 0xA0, 10074 }, - { gBattleAnimSpriteSheet_075, 0x700, 10075 }, - { gBattleAnimSpriteSheet_076, 0x400, 10076 }, - { gBattleAnimSpriteSheet_077, 0x200, 10077 }, - { gBattleAnimSpriteSheet_078, 0x300, 10078 }, - { gBattleAnimSpriteSheet_079, 0xC00, 10079 }, - { gBattleAnimSpriteSheet_080, 0xA00, 10080 }, - { gBattleAnimSpriteSheet_081, 0x80, 10081 }, - { gBattleAnimSpriteSheet_082, 0x40, 10082 }, - { gBattleAnimSpriteSheet_083, 0xE00, 10083 }, - { gBattleAnimSpriteSheet_084, 0xE00, 10084 }, - { gBattleAnimSpriteSheet_085, 0x280, 10085 }, - { gBattleAnimSpriteSheet_086, 0x200, 10086 }, - { gBattleAnimSpriteSheet_087, 0x80, 10087 }, - { gBattleAnimSpriteSheet_088, 0xC0, 10088 }, - { gBattleAnimSpriteSheet_089, 0xA00, 10089 }, - { gBattleAnimSpriteSheet_090, 0x200, 10090 }, - { gBattleAnimSpriteSheet_091, 0x180, 10091 }, - { gBattleAnimSpriteSheet_092, 0x80, 10092 }, - { gBattleAnimSpriteSheet_093, 0x1000, 10093 }, - { gBattleAnimSpriteSheet_094, 0xA00, 10094 }, - { gBattleAnimSpriteSheet_095, 0x180, 10095 }, - { gBattleAnimSpriteSheet_096, 0x380, 10096 }, - { gBattleAnimSpriteSheet_097, 0xC00, 10097 }, - { gBattleAnimSpriteSheet_098, 0x200, 10098 }, - { gBattleAnimSpriteSheet_099, 0x200, 10099 }, - { gBattleAnimSpriteSheet_100, 0x200, 10100 }, - { gBattleAnimSpriteSheet_101, 0x200, 10101 }, - { gBattleAnimSpriteSheet_102, 0x400, 10102 }, - { gBattleAnimSpriteSheet_103, 0x80, 10103 }, - { gBattleAnimSpriteSheet_104, 0x400, 10104 }, - { gBattleAnimSpriteSheet_105, 0xC00, 10105 }, - { gBattleAnimSpriteSheet_106, 0x200, 10106 }, - { gBattleAnimSpriteSheet_107, 0x1000, 10107 }, - { gBattleAnimSpriteSheet_108, 0xA00, 10108 }, - { gBattleAnimSpriteSheet_109, 0x20, 10109 }, - { gBattleAnimSpriteSheet_110, 0xE00, 10110 }, - { gBattleAnimSpriteSheet_111, 0x80, 10111 }, - { gBattleAnimSpriteSheet_112, 0xA00, 10112 }, - { gBattleAnimSpriteSheet_113, 0x400, 10113 }, - { gBattleAnimSpriteSheet_114, 0x200, 10114 }, - { gBattleAnimSpriteSheet_115, 0x700, 10115 }, - { gBattleAnimSpriteSheet_116, 0x800, 10116 }, - { gBattleAnimSpriteSheet_117, 0xA00, 10117 }, - { gBattleAnimSpriteSheet_118, 0x600, 10118 }, - { gBattleAnimSpriteSheet_119, 0x800, 10119 }, - { gBattleAnimSpriteSheet_120, 0x200, 10120 }, - { gBattleAnimSpriteSheet_121, 0x40, 10121 }, - { gBattleAnimSpriteSheet_122, 0x180, 10122 }, - { gBattleAnimSpriteSheet_123, 0x600, 10123 }, - { gBattleAnimSpriteSheet_124, 0x600, 10124 }, - { gBattleAnimSpriteSheet_125, 0x200, 10125 }, - { gBattleAnimSpriteSheet_126, 0x80, 10126 }, - { gBattleAnimSpriteSheet_127, 0x200, 10127 }, - { gBattleAnimSpriteSheet_128, 0x800, 10128 }, - { gBattleAnimSpriteSheet_129, 0x80, 10129 }, - { gBattleAnimSpriteSheet_130, 0xA00, 10130 }, - { gBattleAnimSpriteSheet_131, 0x280, 10131 }, - { gBattleAnimSpriteSheet_132, 0x280, 10132 }, - { gBattleAnimSpriteSheet_133, 0x100, 10133 }, - { gBattleAnimSpriteSheet_134, 0x200, 10134 }, - { gBattleAnimSpriteSheet_135, 0x200, 10135 }, - { gBattleAnimSpriteSheet_136, 0x20, 10136 }, - { gBattleAnimSpriteSheet_137, 0xA00, 10137 }, - { gBattleAnimSpriteSheet_138, 0x800, 10138 }, - { gBattleAnimSpriteSheet_139, 0x800, 10139 }, - { gBattleAnimSpriteSheet_140, 0xC0, 10140 }, - { gBattleAnimSpriteSheet_141, 0x1C0, 10141 }, - { gBattleAnimSpriteSheet_142, 0x100, 10142 }, - { gBattleAnimSpriteSheet_143, 0x800, 10143 }, - { gBattleAnimSpriteSheet_144, 0x200, 10144 }, - { gBattleAnimSpriteSheet_145, 0x800, 10145 }, - { gBattleAnimSpriteSheet_146, 0x180, 10146 }, - { gBattleAnimSpriteSheet_147, 0x180, 10147 }, - { gBattleAnimSpriteSheet_148, 0x200, 10148 }, - { gBattleAnimSpriteSheet_149, 0x200, 10149 }, - { gBattleAnimSpriteSheet_150, 0x180, 10150 }, - { gBattleAnimSpriteSheet_151, 0x400, 10151 }, - { gBattleAnimSpriteSheet_152, 0x80, 10152 }, - { gBattleAnimSpriteSheet_153, 0x100, 10153 }, - { gBattleAnimSpriteSheet_154, 0x100, 10154 }, - { gBattleAnimSpriteSheet_155, 0x140, 10155 }, - { gBattleAnimSpriteSheet_156, 0x800, 10156 }, - { gBattleAnimSpriteSheet_157, 0x200, 10157 }, - { gBattleAnimSpriteSheet_158, 0x100, 10158 }, - { gBattleAnimSpriteSheet_159, 0xA0, 10159 }, - { gBattleAnimSpriteSheet_160, 0x100, 10160 }, - { gBattleAnimSpriteSheet_161, 0x80, 10161 }, - { gBattleAnimSpriteSheet_162, 0x300, 10162 }, - { gBattleAnimSpriteSheet_163, 0x100, 10163 }, - { gBattleAnimSpriteSheet_163, 0x100, 10164 }, - { gBattleAnimSpriteSheet_163, 0x100, 10165 }, - { gBattleAnimSpriteSheet_166, 0x800, 10166 }, - { gBattleAnimSpriteSheet_166, 0x800, 10167 }, - { gBattleAnimSpriteSheet_166, 0x800, 10168 }, - { gBattleAnimSpriteSheet_166, 0x800, 10169 }, - { gBattleAnimSpriteSheet_166, 0x800, 10170 }, - { gBattleAnimSpriteSheet_171, 0x80, 10171 }, - { gBattleAnimSpriteSheet_144, 0x200, 10172 }, - { gBattleAnimSpriteSheet_173, 0x200, 10173 }, - { gBattleAnimSpriteSheet_174, 0x200, 10174 }, - { gBattleAnimSpriteSheet_175, 0x80, 10175 }, - { gBattleAnimSpriteSheet_176, 0x200, 10176 }, - { gBattleAnimSpriteSheet_177, 0x500, 10177 }, - { gBattleAnimSpriteSheet_178, 0x800, 10178 }, - { gBattleAnimSpriteSheet_179, 0x400, 10179 }, - { gBattleAnimSpriteSheet_180, 0x20, 10180 }, - { gBattleAnimSpriteSheet_181, 0x800, 10181 }, - { gBattleAnimSpriteSheet_182, 0x100, 10182 }, - { gBattleAnimSpriteSheet_183, 0x800, 10183 }, - { gBattleAnimSpriteSheet_184, 0x400, 10184 }, - { gBattleAnimSpriteSheet_185, 0xA00, 10185 }, - { gBattleAnimSpriteSheet_186, 0x1000, 10186 }, - { gBattleAnimSpriteSheet_187, 0x800, 10187 }, - { gBattleAnimSpriteSheet_188, 0x400, 10188 }, - { gBattleAnimSpriteSheet_189, 0x200, 10189 }, - { gBattleAnimSpriteSheet_190, 0x800, 10190 }, - { gBattleAnimSpriteSheet_191, 0x800, 10191 }, - { gBattleAnimSpriteSheet_192, 0x800, 10192 }, - { gBattleAnimSpriteSheet_193, 0x200, 10193 }, - { gBattleAnimSpriteSheet_194, 0x800, 10194 }, - { gBattleAnimSpriteSheet_195, 0x200, 10195 }, - { gBattleAnimSpriteSheet_196, 0x800, 10196 }, - { gBattleAnimSpriteSheet_197, 0x200, 10197 }, - { gBattleAnimSpriteSheet_198, 0x800, 10198 }, - { gBattleAnimSpriteSheet_199, 0x400, 10199 }, - { gBattleAnimSpriteSheet_200, 0x200, 10200 }, - { gBattleAnimSpriteSheet_201, 0xA80, 10201 }, - { gBattleAnimSpriteSheet_202, 0x600, 10202 }, - { gBattleAnimSpriteSheet_203, 0x800, 10203 }, - { gBattleAnimSpriteSheet_204, 0x200, 10204 }, - { gBattleAnimSpriteSheet_205, 0x600, 10205 }, - { gBattleAnimSpriteSheet_206, 0x800, 10206 }, - { gBattleAnimSpriteSheet_207, 0x180, 10207 }, - { gBattleAnimSpriteSheet_208, 0x800, 10208 }, - { gBattleAnimSpriteSheet_209, 0x800, 10209 }, - { gBattleAnimSpriteSheet_210, 0x80, 10210 }, - { gBattleAnimSpriteSheet_211, 0x80, 10211 }, - { gBattleAnimSpriteSheet_212, 0x800, 10212 }, - { gBattleAnimSpriteSheet_213, 0x800, 10213 }, - { gBattleAnimSpriteSheet_214, 0x600, 10214 }, - { gBattleAnimSpriteSheet_215, 0x600, 10215 }, - { gBattleAnimSpriteSheet_210, 0x80, 10216 }, - { gBattleAnimSpriteSheet_217, 0x80, 10217 }, - { gBattleAnimSpriteSheet_218, 0x180, 10218 }, - { gBattleAnimSpriteSheet_210, 0x80, 10219 }, - { gBattleAnimSpriteSheet_220, 0x200, 10220 }, - { gBattleAnimSpriteSheet_221, 0x400, 10221 }, - { gBattleAnimSpriteSheet_222, 0xA00, 10222 }, - { gBattleAnimSpriteSheet_223, 0x800, 10223 }, - { gBattleAnimSpriteSheet_224, 0x200, 10224 }, - { gBattleAnimSpriteSheet_225, 0x400, 10225 }, - { gBattleAnimSpriteSheet_226, 0x80, 10226 }, - { gBattleAnimSpriteSheet_227, 0x800, 10227 }, - { gBattleAnimSpriteSheet_228, 0x200, 10228 }, - { gBattleAnimSpriteSheet_229, 0x300, 10229 }, - { gBattleAnimSpriteSheet_230, 0x800, 10230 }, - { gBattleAnimSpriteSheet_231, 0x380, 10231 }, - { gBattleAnimSpriteSheet_232, 0x800, 10232 }, - { gBattleAnimSpriteSheet_233, 0xC0, 10233 }, - { gBattleAnimSpriteSheet_234, 0x800, 10234 }, - { gBattleAnimSpriteSheet_235, 0x60, 10235 }, - { gBattleAnimSpriteSheet_235, 0x60, 10236 }, - { gBattleAnimSpriteSheet_235, 0x60, 10237 }, - { gBattleAnimSpriteSheet_238, 0x80, 10238 }, - { gBattleAnimSpriteSheet_239, 0x180, 10239 }, - { gBattleAnimSpriteSheet_240, 0x180, 10240 }, - { gBattleAnimSpriteSheet_241, 0x200, 10241 }, - { gBattleAnimSpriteSheet_242, 0x200, 10242 }, - { gBattleAnimSpriteSheet_243, 0x20, 10243 }, - { gBattleAnimSpriteSheet_244, 0x400, 10244 }, - { gBattleAnimSpriteSheet_245, 0x600, 10245 }, - { gBattleAnimSpriteSheet_246, 0x1000, 10246 }, - { gBattleAnimSpriteSheet_247, 0x400, 10247 }, - { gBattleAnimSpriteSheet_248, 0x20, 10248 }, - { gBattleAnimSpriteSheet_249, 0x80, 10249 }, - { gBattleAnimSpriteSheet_250, 0x800, 10250 }, - { gBattleAnimSpriteSheet_251, 0x80, 10251 }, - { gBattleAnimSpriteSheet_252, 0x200, 10252 }, - { gBattleAnimSpriteSheet_253, 0x400, 10253 }, - { gBattleAnimSpriteSheet_254, 0x200, 10254 }, - { gBattleAnimSpriteSheet_255, 0x200, 10255 }, - { gBattleAnimSpriteSheet_256, 0x800, 10256 }, - { gBattleAnimSpriteSheet_257, 0x280, 10257 }, - { gBattleAnimSpriteSheet_258, 0x200, 10258 }, - { gBattleAnimSpriteSheet_149, 0x200, 10259 }, - { gBattleAnimSpriteSheet_260, 0x400, 10260 }, - { gBattleAnimSpriteSheet_261, 0x200, 10261 }, - { gBattleAnimSpriteSheet_262, 0x200, 10262 }, - { gBattleAnimSpriteSheet_263, 0x80, 10263 }, - { gBattleAnimSpriteSheet_264, 0x20, 10264 }, - { gBattleAnimSpriteSheet_264, 0x20, 10265 }, - { gBattleAnimSpriteSheet_266, 0x80, 10266 }, - { gBattleAnimSpriteSheet_212, 0x800, 10267 }, - { gBattleAnimSpriteSheet_264, 0x20, 10268 }, - { gBattleAnimSpriteSheet_269, 0x80, 10269 }, - { gBattleAnimSpriteSheet_270, 0x400, 10270 }, - { gBattleAnimSpriteSheet_271, 0x80, 10271 }, - { gBattleAnimSpriteSheet_272, 0x800, 10272 }, - { gBattleAnimSpriteSheet_273, 0x20, 10273 }, - { gBattleAnimSpriteSheet_274, 0x800, 10274 }, - { gBattleAnimSpriteSheet_275, 0x800, 10275 }, - { gBattleAnimSpriteSheet_276, 0x800, 10276 }, - { gBattleAnimSpriteSheet_277, 0x1000, 10277 }, - { gBattleAnimSpriteSheet_278, 0x800, 10278 }, - { gBattleAnimSpriteSheet_279, 0xA0, 10279 }, - { gBattleAnimSpriteSheet_280, 0x800, 10280 }, - { gBattleAnimSpriteSheet_281, 0x200, 10281 }, - { gBattleAnimSpriteSheet_282, 0x600, 10282 }, - { gBattleAnimSpriteSheet_283, 0x200, 10283 }, - { gBattleAnimSpriteSheet_284, 0x800, 10284 }, - { gBattleAnimSpriteSheet_285, 0x200, 10285 }, - { gBattleAnimSpriteSheet_183, 0x800, 10286 }, - { gBattleAnimSpriteSheet_056, 0x1000, 10287 }, - { gBattleAnimSpriteSheet_163, 0x100, 10288 }, + { gBattleAnimSpriteSheet_000, 0x200, ANIM_TAG_BONE }, + { gBattleAnimSpriteSheet_001, 0x300, ANIM_TAG_SPARK }, + { gBattleAnimSpriteSheet_002, 0x200, ANIM_TAG_PENCIL }, + { gBattleAnimSpriteSheet_003, 0x100, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpriteSheet_004, 0x200, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpriteSheet_005, 0x400, ANIM_TAG_SWORD }, + { gBattleAnimSpriteSheet_006, 0x180, ANIM_TAG_SEED }, + { gBattleAnimSpriteSheet_007, 0x800, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpriteSheet_008, 0x20, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpriteSheet_009, 0x400, ANIM_TAG_GUST }, + { gBattleAnimSpriteSheet_010, 0x1200, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpriteSheet_011, 0x180, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpriteSheet_012, 0x80, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpriteSheet_013, 0x80, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpriteSheet_014, 0x280, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpriteSheet_015, 0x80, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpriteSheet_016, 0x100, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpriteSheet_017, 0x20, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpriteSheet_018, 0x80, ANIM_TAG_CONVERSION }, + { gBattleAnimSpriteSheet_019, 0x400, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpriteSheet_020, 0x200, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpriteSheet_021, 0xA00, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpriteSheet_023, 0x380, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpriteSheet_024, 0x300, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpriteSheet_025, 0xA00, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpriteSheet_026, 0xA00, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpriteSheet_027, 0xA00, ANIM_TAG_LEER }, + { gBattleAnimSpriteSheet_028, 0xA00, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpriteSheet_029, 0xA00, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpriteSheet_030, 0xA00, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpriteSheet_031, 0xE00, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpriteSheet_032, 0x380, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpriteSheet_033, 0x1000, ANIM_TAG_FIRE }, + { gBattleAnimSpriteSheet_034, 0x800, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpriteSheet_035, 0xA00, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpriteSheet_036, 0x800, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpriteSheet_037, 0xA00, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpriteSheet_038, 0xA00, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpriteSheet_039, 0xA00, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpriteSheet_040, 0xA00, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpriteSheet_041, 0xA00, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpriteSheet_042, 0xA00, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpriteSheet_043, 0xA00, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpriteSheet_044, 0xA00, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpriteSheet_045, 0xA00, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpriteSheet_046, 0x1000, ANIM_TAG_UNUSED_SAP_DRIP_2 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpriteSheet_048, 0x1000, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpriteSheet_050, 0x200, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpriteSheet_051, 0x200, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpriteSheet_052, 0x200, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpriteSheet_053, 0x800, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpriteSheet_054, 0x80, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpriteSheet_055, 0x200, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpriteSheet_057, 0x180, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpriteSheet_058, 0xC00, ANIM_TAG_ROCKS }, + { gBattleAnimSpriteSheet_059, 0x100, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpriteSheet_060, 0x40, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpriteSheet_061, 0x180, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpriteSheet_062, 0x800, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpriteSheet_063, 0x480, ANIM_TAG_LEAF }, + { gBattleAnimSpriteSheet_064, 0x200, ANIM_TAG_FINGER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpriteSheet_066, 0x100, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpriteSheet_065, 0x200, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpriteSheet_070, 0x200, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpriteSheet_071, 0xA00, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpriteSheet_072, 0x300, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpriteSheet_073, 0x180, ANIM_TAG_DUCK }, + { gBattleAnimSpriteSheet_074, 0xA0, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpriteSheet_075, 0x700, ANIM_TAG_ALERT }, + { gBattleAnimSpriteSheet_076, 0x400, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpriteSheet_077, 0x200, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpriteSheet_078, 0x300, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpriteSheet_079, 0xC00, ANIM_TAG_SHOCK }, + { gBattleAnimSpriteSheet_080, 0xA00, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpriteSheet_081, 0x80, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpriteSheet_082, 0x40, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpriteSheet_083, 0xE00, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpriteSheet_084, 0xE00, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpriteSheet_085, 0x280, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpriteSheet_086, 0x200, ANIM_TAG_BREATH }, + { gBattleAnimSpriteSheet_087, 0x80, ANIM_TAG_ANGER }, + { gBattleAnimSpriteSheet_088, 0xC0, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpriteSheet_089, 0xA00, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpriteSheet_090, 0x200, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpriteSheet_091, 0x180, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpriteSheet_092, 0x80, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpriteSheet_093, 0x1000, ANIM_TAG_AMNESIA }, + { gBattleAnimSpriteSheet_094, 0xA00, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpriteSheet_095, 0x180, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpriteSheet_096, 0x380, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpriteSheet_097, 0xC00, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpriteSheet_098, 0x200, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpriteSheet_099, 0x200, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpriteSheet_100, 0x200, ANIM_TAG_COIN }, + { gBattleAnimSpriteSheet_101, 0x200, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpriteSheet_102, 0x400, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpriteSheet_103, 0x80, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpriteSheet_104, 0x400, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpriteSheet_105, 0xC00, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpriteSheet_106, 0x200, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpriteSheet_107, 0x1000, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpriteSheet_108, 0xA00, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpriteSheet_109, 0x20, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpriteSheet_110, 0xE00, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpriteSheet_111, 0x80, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpriteSheet_112, 0xA00, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpriteSheet_113, 0x400, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpriteSheet_114, 0x200, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpriteSheet_115, 0x700, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpriteSheet_116, 0x800, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpriteSheet_117, 0xA00, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpriteSheet_118, 0x600, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpriteSheet_119, 0x800, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpriteSheet_120, 0x200, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpriteSheet_121, 0x40, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpriteSheet_122, 0x180, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpriteSheet_123, 0x600, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpriteSheet_124, 0x600, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpriteSheet_125, 0x200, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpriteSheet_126, 0x80, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpriteSheet_127, 0x200, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpriteSheet_128, 0x800, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpriteSheet_129, 0x80, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpriteSheet_130, 0xA00, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpriteSheet_131, 0x280, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpriteSheet_132, 0x280, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpriteSheet_133, 0x100, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpriteSheet_134, 0x200, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpriteSheet_135, 0x200, ANIM_TAG_IMPACT }, + { gBattleAnimSpriteSheet_136, 0x20, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpriteSheet_137, 0xA00, ANIM_TAG_SCRATCH }, + { gBattleAnimSpriteSheet_138, 0x800, ANIM_TAG_CUT }, + { gBattleAnimSpriteSheet_139, 0x800, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpriteSheet_140, 0xC0, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpriteSheet_141, 0x1C0, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpriteSheet_142, 0x100, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpriteSheet_143, 0x800, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpriteSheet_145, 0x800, ANIM_TAG_CLAMP }, + { gBattleAnimSpriteSheet_146, 0x180, ANIM_TAG_BUBBLE }, + { gBattleAnimSpriteSheet_147, 0x180, ANIM_TAG_ORBS }, + { gBattleAnimSpriteSheet_148, 0x200, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpriteSheet_150, 0x180, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpriteSheet_151, 0x400, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpriteSheet_152, 0x80, ANIM_TAG_SPIKES }, + { gBattleAnimSpriteSheet_153, 0x100, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpriteSheet_154, 0x100, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpriteSheet_155, 0x140, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpriteSheet_156, 0x800, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpriteSheet_157, 0x200, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpriteSheet_158, 0x100, ANIM_TAG_SPORE }, + { gBattleAnimSpriteSheet_159, 0xA0, ANIM_TAG_FLOWER }, + { gBattleAnimSpriteSheet_160, 0x100, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpriteSheet_161, 0x80, ANIM_TAG_NEEDLE }, + { gBattleAnimSpriteSheet_162, 0x300, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpriteSheet_166, 0x800, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpriteSheet_171, 0x80, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpriteSheet_144, 0x200, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpriteSheet_173, 0x200, ANIM_TAG_SPARK_H }, + { gBattleAnimSpriteSheet_174, 0x200, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpriteSheet_175, 0x80, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpriteSheet_176, 0x200, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpriteSheet_177, 0x500, ANIM_TAG_LICK }, + { gBattleAnimSpriteSheet_178, 0x800, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpriteSheet_179, 0x400, ANIM_TAG_STRING }, + { gBattleAnimSpriteSheet_180, 0x20, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpriteSheet_181, 0x800, ANIM_TAG_WEB }, + { gBattleAnimSpriteSheet_182, 0x100, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH }, + { gBattleAnimSpriteSheet_184, 0x400, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpriteSheet_185, 0xA00, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpriteSheet_186, 0x1000, ANIM_TAG_TENDRILS }, + { gBattleAnimSpriteSheet_187, 0x800, ANIM_TAG_EYE }, + { gBattleAnimSpriteSheet_188, 0x400, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpriteSheet_189, 0x200, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpriteSheet_190, 0x800, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpriteSheet_191, 0x800, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpriteSheet_192, 0x800, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpriteSheet_193, 0x200, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpriteSheet_194, 0x800, ANIM_TAG_MOON }, + { gBattleAnimSpriteSheet_195, 0x200, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpriteSheet_196, 0x800, ANIM_TAG_SPIRAL }, + { gBattleAnimSpriteSheet_197, 0x200, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpriteSheet_198, 0x800, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpriteSheet_199, 0x400, ANIM_TAG_NAIL }, + { gBattleAnimSpriteSheet_200, 0x200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpriteSheet_201, 0xA80, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpriteSheet_202, 0x600, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpriteSheet_203, 0x800, ANIM_TAG_THIN_RING }, + { gBattleAnimSpriteSheet_204, 0x200, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpriteSheet_205, 0x600, ANIM_TAG_BELL }, + { gBattleAnimSpriteSheet_206, 0x800, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpriteSheet_207, 0x180, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpriteSheet_208, 0x800, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpriteSheet_209, 0x800, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpriteSheet_211, 0x80, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_213, 0x800, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpriteSheet_214, 0x600, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpriteSheet_215, 0x600, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_RED_HEART }, + { gBattleAnimSpriteSheet_217, 0x80, ANIM_TAG_RED_ORB }, + { gBattleAnimSpriteSheet_218, 0x180, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpriteSheet_210, 0x80, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpriteSheet_220, 0x200, ANIM_TAG_ANGEL }, + { gBattleAnimSpriteSheet_221, 0x400, ANIM_TAG_DEVIL }, + { gBattleAnimSpriteSheet_222, 0xA00, ANIM_TAG_SWIPE }, + { gBattleAnimSpriteSheet_223, 0x800, ANIM_TAG_ROOTS }, + { gBattleAnimSpriteSheet_224, 0x200, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpriteSheet_225, 0x400, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpriteSheet_226, 0x80, ANIM_TAG_POKEBALL }, + { gBattleAnimSpriteSheet_227, 0x800, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpriteSheet_228, 0x200, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpriteSheet_229, 0x300, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpriteSheet_230, 0x800, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpriteSheet_231, 0x380, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpriteSheet_232, 0x800, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpriteSheet_233, 0xC0, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpriteSheet_234, 0x800, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpriteSheet_235, 0x60, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpriteSheet_238, 0x80, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpriteSheet_239, 0x180, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpriteSheet_240, 0x180, ANIM_TAG_CONFETTI }, + { gBattleAnimSpriteSheet_241, 0x200, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpriteSheet_242, 0x200, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpriteSheet_243, 0x20, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpriteSheet_244, 0x400, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpriteSheet_245, 0x600, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpriteSheet_246, 0x1000, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpriteSheet_247, 0x400, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpriteSheet_248, 0x20, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpriteSheet_249, 0x80, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpriteSheet_250, 0x800, ANIM_TAG_X_SIGN }, + { gBattleAnimSpriteSheet_251, 0x80, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpriteSheet_252, 0x200, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpriteSheet_253, 0x400, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpriteSheet_254, 0x200, ANIM_TAG_RED_BALL }, + { gBattleAnimSpriteSheet_255, 0x200, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpriteSheet_256, 0x800, ANIM_TAG_METEOR }, + { gBattleAnimSpriteSheet_257, 0x280, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpriteSheet_258, 0x200, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpriteSheet_149, 0x200, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpriteSheet_260, 0x400, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpriteSheet_261, 0x200, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpriteSheet_262, 0x200, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpriteSheet_263, 0x80, ANIM_TAG_HAIL }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpriteSheet_266, 0x80, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpriteSheet_212, 0x800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpriteSheet_264, 0x20, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpriteSheet_269, 0x80, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpriteSheet_270, 0x400, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpriteSheet_271, 0x80, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpriteSheet_272, 0x800, ANIM_TAG_SPLASH }, + { gBattleAnimSpriteSheet_273, 0x20, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpriteSheet_274, 0x800, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpriteSheet_275, 0x800, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpriteSheet_276, 0x800, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpriteSheet_277, 0x1000, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpriteSheet_278, 0x800, ANIM_TAG_RECYCLE }, + { gBattleAnimSpriteSheet_279, 0xA0, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpriteSheet_280, 0x800, ANIM_TAG_PROTECT }, + { gBattleAnimSpriteSheet_281, 0x200, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpriteSheet_282, 0x600, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpriteSheet_283, 0x200, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpriteSheet_284, 0x800, ANIM_TAG_BIRD }, + { gBattleAnimSpriteSheet_285, 0x200, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpriteSheet_183, 0x800, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpriteSheet_056, 0x1000, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpriteSheet_163, 0x100, ANIM_TAG_BLUE_RING_2 }, }; const struct CompressedSpritePalette gBattleAnimPaletteTable[] = { - { gBattleAnimSpritePalette_000, 10000 }, - { gBattleAnimSpritePalette_001, 10001 }, - { gBattleAnimSpritePalette_002, 10002 }, - { gBattleAnimSpritePalette_003, 10003 }, - { gBattleAnimSpritePalette_004, 10004 }, - { gBattleAnimSpritePalette_005, 10005 }, - { gBattleAnimSpritePalette_006, 10006 }, - { gBattleAnimSpritePalette_007, 10007 }, - { gBattleAnimSpritePalette_008, 10008 }, - { gBattleAnimSpritePalette_009, 10009 }, - { gBattleAnimSpritePalette_010, 10010 }, - { gBattleAnimSpritePalette_011, 10011 }, - { gBattleAnimSpritePalette_012, 10012 }, - { gBattleAnimSpritePalette_013, 10013 }, - { gBattleAnimSpritePalette_014, 10014 }, - { gBattleAnimSpritePalette_015, 10015 }, - { gBattleAnimSpritePalette_016, 10016 }, - { gBattleAnimSpritePalette_016, 10017 }, - { gBattleAnimSpritePalette_018, 10018 }, - { gBattleAnimSpritePalette_019, 10019 }, - { gBattleAnimSpritePalette_020, 10020 }, - { gBattleAnimSpritePalette_021, 10021 }, - { gBattleAnimSpritePalette_022, 10022 }, - { gBattleAnimSpritePalette_023, 10023 }, - { gBattleAnimSpritePalette_024, 10024 }, - { gBattleAnimSpritePalette_025, 10025 }, - { gBattleAnimSpritePalette_026, 10026 }, - { gBattleAnimSpritePalette_027, 10027 }, - { gBattleAnimSpritePalette_028, 10028 }, - { gBattleAnimSpritePalette_029, 10029 }, - { gBattleAnimSpritePalette_030, 10030 }, - { gBattleAnimSpritePalette_031, 10031 }, - { gBattleAnimSpritePalette_032, 10032 }, - { gBattleAnimSpritePalette_033, 10033 }, - { gBattleAnimSpritePalette_033, 10034 }, - { gBattleAnimSpritePalette_033, 10035 }, - { gBattleAnimSpritePalette_036, 10036 }, - { gBattleAnimSpritePalette_036, 10037 }, - { gBattleAnimSpritePalette_038, 10038 }, - { gBattleAnimSpritePalette_039, 10039 }, - { gBattleAnimSpritePalette_038, 10040 }, - { gBattleAnimSpritePalette_038, 10041 }, - { gBattleAnimSpritePalette_042, 10042 }, - { gBattleAnimSpritePalette_043, 10043 }, - { gBattleAnimSpritePalette_044, 10044 }, - { gBattleAnimSpritePalette_045, 10045 }, - { gBattleAnimSpritePalette_046, 10046 }, - { gBattleAnimSpritePalette_047, 10046 }, - { gBattleAnimSpritePalette_048, 10048 }, - { gBattleAnimSpritePalette_049, 10049 }, - { gBattleAnimSpritePalette_050, 10050 }, - { gBattleAnimSpritePalette_050, 10051 }, - { gBattleAnimSpritePalette_050, 10052 }, - { gBattleAnimSpritePalette_026, 10053 }, - { gBattleAnimSpritePalette_054, 10054 }, - { gBattleAnimSpritePalette_050, 10055 }, - { gBattleAnimSpritePalette_056, 10056 }, - { gBattleAnimSpritePalette_057, 10057 }, - { gBattleAnimSpritePalette_058, 10058 }, - { gBattleAnimSpritePalette_059, 10059 }, - { gBattleAnimSpritePalette_060, 10060 }, - { gBattleAnimSpritePalette_061, 10061 }, - { gBattleAnimSpritePalette_062, 10062 }, - { gBattleAnimSpritePalette_063, 10063 }, - { gBattleAnimSpritePalette_064, 10064 }, - { gBattleAnimSpritePalette_065, 10065 }, - { gBattleAnimSpritePalette_066, 10066 }, - { gBattleAnimSpritePalette_067, 10067 }, - { gBattleAnimSpritePalette_068, 10068 }, - { gBattleAnimSpritePalette_065, 10069 }, - { gBattleAnimSpritePalette_070, 10070 }, - { gBattleAnimSpritePalette_070, 10071 }, - { gBattleAnimSpritePalette_072, 10072 }, - { gBattleAnimSpritePalette_073, 10073 }, - { gBattleAnimSpritePalette_074, 10074 }, - { gBattleAnimSpritePalette_075, 10075 }, - { gBattleAnimSpritePalette_076, 10076 }, - { gBattleAnimSpritePalette_076, 10077 }, - { gBattleAnimSpritePalette_078, 10078 }, - { gBattleAnimSpritePalette_078, 10079 }, - { gBattleAnimSpritePalette_080, 10080 }, - { gBattleAnimSpritePalette_081, 10081 }, - { gBattleAnimSpritePalette_082, 10082 }, - { gBattleAnimSpritePalette_083, 10083 }, - { gBattleAnimSpritePalette_084, 10084 }, - { gBattleAnimSpritePalette_085, 10085 }, - { gBattleAnimSpritePalette_086, 10086 }, - { gBattleAnimSpritePalette_087, 10087 }, - { gBattleAnimSpritePalette_088, 10088 }, - { gBattleAnimSpritePalette_089, 10089 }, - { gBattleAnimSpritePalette_090, 10090 }, - { gBattleAnimSpritePalette_091, 10091 }, - { gBattleAnimSpritePalette_092, 10092 }, - { gBattleAnimSpritePalette_093, 10093 }, - { gBattleAnimSpritePalette_094, 10094 }, - { gBattleAnimSpritePalette_095, 10095 }, - { gBattleAnimSpritePalette_096, 10096 }, - { gBattleAnimSpritePalette_097, 10097 }, - { gBattleAnimSpritePalette_094, 10098 }, - { gBattleAnimSpritePalette_099, 10099 }, - { gBattleAnimSpritePalette_100, 10100 }, - { gBattleAnimSpritePalette_101, 10101 }, - { gBattleAnimSpritePalette_101, 10102 }, - { gBattleAnimSpritePalette_103, 10103 }, - { gBattleAnimSpritePalette_104, 10104 }, - { gBattleAnimSpritePalette_105, 10105 }, - { gBattleAnimSpritePalette_105, 10106 }, - { gBattleAnimSpritePalette_107, 10107 }, - { gBattleAnimSpritePalette_107, 10108 }, - { gBattleAnimSpritePalette_109, 10109 }, - { gBattleAnimSpritePalette_109, 10110 }, - { gBattleAnimSpritePalette_111, 10111 }, - { gBattleAnimSpritePalette_112, 10112 }, - { gBattleAnimSpritePalette_113, 10113 }, - { gBattleAnimSpritePalette_114, 10114 }, - { gBattleAnimSpritePalette_115, 10115 }, - { gBattleAnimSpritePalette_116, 10116 }, - { gBattleAnimSpritePalette_117, 10117 }, - { gBattleAnimSpritePalette_118, 10118 }, - { gBattleAnimSpritePalette_119, 10119 }, - { gBattleAnimSpritePalette_120, 10120 }, - { gBattleAnimSpritePalette_121, 10121 }, - { gBattleAnimSpritePalette_122, 10122 }, - { gBattleAnimSpritePalette_122, 10123 }, - { gBattleAnimSpritePalette_124, 10124 }, - { gBattleAnimSpritePalette_125, 10125 }, - { gBattleAnimSpritePalette_126, 10126 }, - { gBattleAnimSpritePalette_127, 10127 }, - { gBattleAnimSpritePalette_128, 10128 }, - { gBattleAnimSpritePalette_128, 10129 }, - { gBattleAnimSpritePalette_130, 10130 }, - { gBattleAnimSpritePalette_130, 10131 }, - { gBattleAnimSpritePalette_132, 10132 }, - { gBattleAnimSpritePalette_133, 10133 }, - { gBattleAnimSpritePalette_133, 10134 }, - { gBattleAnimSpritePalette_135, 10135 }, - { gBattleAnimSpritePalette_136, 10136 }, - { gBattleAnimSpritePalette_135, 10137 }, - { gBattleAnimSpritePalette_135, 10138 }, - { gBattleAnimSpritePalette_139, 10139 }, - { gBattleAnimSpritePalette_140, 10140 }, - { gBattleAnimSpritePalette_141, 10141 }, - { gBattleAnimSpritePalette_141, 10142 }, - { gBattleAnimSpritePalette_143, 10143 }, - { gBattleAnimSpritePalette_144, 10144 }, - { gBattleAnimSpritePalette_139, 10145 }, - { gBattleAnimSpritePalette_115, 10146 }, - { gBattleAnimSpritePalette_147, 10147 }, - { gBattleAnimSpritePalette_148, 10148 }, - { gBattleAnimSpritePalette_148, 10149 }, - { gBattleAnimSpritePalette_150, 10150 }, - { gBattleAnimSpritePalette_150, 10151 }, - { gBattleAnimSpritePalette_152, 10152 }, - { gBattleAnimSpritePalette_153, 10153 }, - { gBattleAnimSpritePalette_154, 10154 }, - { gBattleAnimSpritePalette_155, 10155 }, - { gBattleAnimSpritePalette_156, 10156 }, - { gBattleAnimSpritePalette_157, 10157 }, - { gBattleAnimSpritePalette_158, 10158 }, - { gBattleAnimSpritePalette_159, 10159 }, - { gBattleAnimSpritePalette_160, 10160 }, - { gBattleAnimSpritePalette_161, 10161 }, - { gBattleAnimSpritePalette_162, 10162 }, - { gBattleAnimSpritePalette_163, 10163 }, - { gBattleAnimSpritePalette_164, 10164 }, - { gBattleAnimSpritePalette_165, 10165 }, - { gBattleAnimSpritePalette_166, 10166 }, - { gBattleAnimSpritePalette_167, 10167 }, - { gBattleAnimSpritePalette_168, 10168 }, - { gBattleAnimSpritePalette_169, 10169 }, - { gBattleAnimSpritePalette_170, 10170 }, - { gBattleAnimSpritePalette_171, 10171 }, - { gBattleAnimSpritePalette_172, 10172 }, - { gBattleAnimSpritePalette_001, 10173 }, - { gBattleAnimSpritePalette_174, 10174 }, - { gBattleAnimSpritePalette_175, 10175 }, - { gBattleAnimSpritePalette_176, 10176 }, - { gBattleAnimSpritePalette_177, 10177 }, - { gBattleAnimSpritePalette_178, 10178 }, - { gBattleAnimSpritePalette_179, 10179 }, - { gBattleAnimSpritePalette_179, 10180 }, - { gBattleAnimSpritePalette_179, 10181 }, - { gBattleAnimSpritePalette_182, 10182 }, - { gBattleAnimSpritePalette_183, 10183 }, - { gBattleAnimSpritePalette_184, 10184 }, - { gBattleAnimSpritePalette_185, 10185 }, - { gBattleAnimSpritePalette_186, 10186 }, - { gBattleAnimSpritePalette_187, 10187 }, - { gBattleAnimSpritePalette_188, 10188 }, - { gBattleAnimSpritePalette_189, 10189 }, - { gBattleAnimSpritePalette_190, 10190 }, - { gBattleAnimSpritePalette_191, 10191 }, - { gBattleAnimSpritePalette_192, 10192 }, - { gBattleAnimSpritePalette_193, 10193 }, - { gBattleAnimSpritePalette_194, 10194 }, - { gBattleAnimSpritePalette_195, 10195 }, - { gBattleAnimSpritePalette_196, 10196 }, - { gBattleAnimSpritePalette_197, 10197 }, - { gBattleAnimSpritePalette_198, 10198 }, - { gBattleAnimSpritePalette_199, 10199 }, - { gBattleAnimSpritePalette_200, 10200 }, - { gBattleAnimSpritePalette_201, 10201 }, - { gBattleAnimSpritePalette_202, 10202 }, - { gBattleAnimSpritePalette_203, 10203 }, - { gBattleAnimSpritePalette_204, 10204 }, - { gBattleAnimSpritePalette_205, 10205 }, - { gBattleAnimSpritePalette_206, 10206 }, - { gBattleAnimSpritePalette_207, 10207 }, - { gBattleAnimSpritePalette_167, 10208 }, - { gBattleAnimSpritePalette_209, 10209 }, - { gBattleAnimSpritePalette_210, 10210 }, - { gBattleAnimSpritePalette_211, 10211 }, - { gBattleAnimSpritePalette_211, 10212 }, - { gBattleAnimSpritePalette_211, 10213 }, - { gBattleAnimSpritePalette_064, 10214 }, - { gBattleAnimSpritePalette_215, 10215 }, - { gBattleAnimSpritePalette_216, 10216 }, - { gBattleAnimSpritePalette_217, 10217 }, - { gBattleAnimSpritePalette_218, 10218 }, - { gBattleAnimSpritePalette_219, 10219 }, - { gBattleAnimSpritePalette_220, 10220 }, - { gBattleAnimSpritePalette_221, 10221 }, - { gBattleAnimSpritePalette_222, 10222 }, - { gBattleAnimSpritePalette_223, 10223 }, - { gBattleAnimSpritePalette_224, 10224 }, - { gBattleAnimSpritePalette_225, 10225 }, - { gBattleAnimSpritePalette_226, 10226 }, - { gBattleAnimSpritePalette_226, 10227 }, - { gBattleAnimSpritePalette_228, 10228 }, - { gBattleAnimSpritePalette_229, 10229 }, - { gBattleAnimSpritePalette_230, 10230 }, - { gBattleAnimSpritePalette_231, 10231 }, - { gBattleAnimSpritePalette_231, 10232 }, - { gBattleAnimSpritePalette_233, 10233 }, - { gBattleAnimSpritePalette_234, 10234 }, - { gBattleAnimSpritePalette_235, 10235 }, - { gBattleAnimSpritePalette_236, 10236 }, - { gBattleAnimSpritePalette_237, 10237 }, - { gBattleAnimSpritePalette_238, 10238 }, - { gBattleAnimSpritePalette_239, 10239 }, - { gBattleAnimSpritePalette_240, 10240 }, - { gBattleAnimSpritePalette_241, 10241 }, - { gBattleAnimSpritePalette_242, 10242 }, - { gBattleAnimSpritePalette_243, 10243 }, - { gBattleAnimSpritePalette_244, 10244 }, - { gBattleAnimSpritePalette_245, 10245 }, - { gBattleAnimSpritePalette_245, 10246 }, - { gBattleAnimSpritePalette_064, 10247 }, - { gBattleAnimSpritePalette_248, 10248 }, - { gBattleAnimSpritePalette_249, 10249 }, - { gBattleAnimSpritePalette_249, 10250 }, - { gBattleAnimSpritePalette_251, 10251 }, - { gBattleAnimSpritePalette_252, 10252 }, - { gBattleAnimSpritePalette_253, 10253 }, - { gBattleAnimSpritePalette_254, 10254 }, - { gBattleAnimSpritePalette_255, 10255 }, - { gBattleAnimSpritePalette_256, 10256 }, - { gBattleAnimSpritePalette_257, 10257 }, - { gBattleAnimSpritePalette_258, 10258 }, - { gBattleAnimSpritePalette_259, 10259 }, - { gBattleAnimSpritePalette_260, 10260 }, - { gBattleAnimSpritePalette_261, 10261 }, - { gBattleAnimSpritePalette_262, 10262 }, - { gBattleAnimSpritePalette_263, 10263 }, - { gBattleAnimSpritePalette_264, 10264 }, - { gBattleAnimSpritePalette_265, 10265 }, - { gBattleAnimSpritePalette_266, 10266 }, - { gBattleAnimSpritePalette_267, 10267 }, - { gBattleAnimSpritePalette_268, 10268 }, - { gBattleAnimSpritePalette_269, 10269 }, - { gBattleAnimSpritePalette_270, 10270 }, - { gBattleAnimSpritePalette_271, 10271 }, - { gBattleAnimSpritePalette_272, 10272 }, - { gBattleAnimSpritePalette_272, 10273 }, - { gBattleAnimSpritePalette_274, 10274 }, - { gBattleAnimSpritePalette_274, 10275 }, - { gBattleAnimSpritePalette_274, 10276 }, - { gBattleAnimSpritePalette_277, 10277 }, - { gBattleAnimSpritePalette_278, 10278 }, - { gBattleAnimSpritePalette_279, 10279 }, - { gBattleAnimSpritePalette_280, 10280 }, - { gBattleAnimSpritePalette_281, 10281 }, - { gBattleAnimSpritePalette_282, 10282 }, - { gBattleAnimSpritePalette_283, 10283 }, - { gBattleAnimSpritePalette_284, 10284 }, - { gBattleAnimSpritePalette_285, 10285 }, - { gBattleAnimSpritePalette_286, 10286 }, - { gBattleAnimSpritePalette_287, 10287 }, - { gBattleAnimSpritePalette_288, 10288 }, + { gBattleAnimSpritePalette_000, ANIM_TAG_BONE }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK }, + { gBattleAnimSpritePalette_002, ANIM_TAG_PENCIL }, + { gBattleAnimSpritePalette_003, ANIM_TAG_AIR_WAVE }, + { gBattleAnimSpritePalette_004, ANIM_TAG_UNUSED_ORB }, + { gBattleAnimSpritePalette_005, ANIM_TAG_SWORD }, + { gBattleAnimSpritePalette_006, ANIM_TAG_SEED }, + { gBattleAnimSpritePalette_007, ANIM_TAG_UNUSED_EXPLOSION }, + { gBattleAnimSpritePalette_008, ANIM_TAG_UNUSED_PINK_ORB }, + { gBattleAnimSpritePalette_009, ANIM_TAG_GUST }, + { gBattleAnimSpritePalette_010, ANIM_TAG_ICE_CUBE }, + { gBattleAnimSpritePalette_011, ANIM_TAG_SPARK_2 }, + { gBattleAnimSpritePalette_012, ANIM_TAG_UNUSED_ORANGE }, + { gBattleAnimSpritePalette_013, ANIM_TAG_YELLOW_BALL }, + { gBattleAnimSpritePalette_014, ANIM_TAG_LOCK_ON }, + { gBattleAnimSpritePalette_015, ANIM_TAG_TIED_BAG }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_SMOKE }, + { gBattleAnimSpritePalette_016, ANIM_TAG_BLACK_BALL }, + { gBattleAnimSpritePalette_018, ANIM_TAG_CONVERSION }, + { gBattleAnimSpritePalette_019, ANIM_TAG_UNUSED_GLASS }, + { gBattleAnimSpritePalette_020, ANIM_TAG_HORN_HIT }, + { gBattleAnimSpritePalette_021, ANIM_TAG_UNUSED_HIT }, + { gBattleAnimSpritePalette_022, ANIM_TAG_UNUSED_HIT_2 }, + { gBattleAnimSpritePalette_023, ANIM_TAG_UNUSED_BLUE_SHARDS }, + { gBattleAnimSpritePalette_024, ANIM_TAG_UNUSED_CLOSING_EYE }, + { gBattleAnimSpritePalette_025, ANIM_TAG_UNUSED_WAVING_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_UNUSED_HIT_DUPLICATE }, + { gBattleAnimSpritePalette_027, ANIM_TAG_LEER }, + { gBattleAnimSpritePalette_028, ANIM_TAG_UNUSED_BLUE_BURST }, + { gBattleAnimSpritePalette_029, ANIM_TAG_SMALL_EMBER }, + { gBattleAnimSpritePalette_030, ANIM_TAG_GRAY_SMOKE }, + { gBattleAnimSpritePalette_031, ANIM_TAG_BLUE_STAR }, + { gBattleAnimSpritePalette_032, ANIM_TAG_UNUSED_BUBBLE_BURST }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_UNUSED_SPINNING_FIRE }, + { gBattleAnimSpritePalette_033, ANIM_TAG_FIRE_PLUME }, + { gBattleAnimSpritePalette_036, ANIM_TAG_UNUSED_LIGHTNING }, + { gBattleAnimSpritePalette_036, ANIM_TAG_LIGHTNING }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_CLAW_SLASH }, + { gBattleAnimSpritePalette_039, ANIM_TAG_CLAW_SLASH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH }, + { gBattleAnimSpritePalette_038, ANIM_TAG_UNUSED_SCRATCH_2 }, + { gBattleAnimSpritePalette_042, ANIM_TAG_UNUSED_BUBBLE_BURST_2 }, + { gBattleAnimSpritePalette_043, ANIM_TAG_ICE_CHUNK }, + { gBattleAnimSpritePalette_044, ANIM_TAG_UNUSED_GLASS_2 }, + { gBattleAnimSpritePalette_045, ANIM_TAG_UNUSED_PINK_HEART }, + { gBattleAnimSpritePalette_046, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_047, ANIM_TAG_UNUSED_SAP_DRIP }, + { gBattleAnimSpritePalette_048, ANIM_TAG_SPARKLE_1 }, + { gBattleAnimSpritePalette_049, ANIM_TAG_SPARKLE_2 }, + { gBattleAnimSpritePalette_050, ANIM_TAG_HUMANOID_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_MONSTER_FOOT }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_HUMANOID_HAND }, + { gBattleAnimSpritePalette_026, ANIM_TAG_NOISE_LINE }, + { gBattleAnimSpritePalette_054, ANIM_TAG_UNUSED_YELLOW_UNK }, + { gBattleAnimSpritePalette_050, ANIM_TAG_UNUSED_RED_FIST }, + { gBattleAnimSpritePalette_056, ANIM_TAG_SLAM_HIT }, + { gBattleAnimSpritePalette_057, ANIM_TAG_UNUSED_RING }, + { gBattleAnimSpritePalette_058, ANIM_TAG_ROCKS }, + { gBattleAnimSpritePalette_059, ANIM_TAG_UNUSED_Z }, + { gBattleAnimSpritePalette_060, ANIM_TAG_UNUSED_YELLOW_UNK_2 }, + { gBattleAnimSpritePalette_061, ANIM_TAG_UNUSED_AIR_SLASH }, + { gBattleAnimSpritePalette_062, ANIM_TAG_UNUSED_SPINNING_GREEN_ORBS }, + { gBattleAnimSpritePalette_063, ANIM_TAG_LEAF }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER }, + { gBattleAnimSpritePalette_065, ANIM_TAG_POISON_POWDER }, + { gBattleAnimSpritePalette_066, ANIM_TAG_UNUSED_BROWN_TRIANGLE }, + { gBattleAnimSpritePalette_067, ANIM_TAG_SLEEP_POWDER }, + { gBattleAnimSpritePalette_068, ANIM_TAG_STUN_SPORE }, + { gBattleAnimSpritePalette_065, ANIM_TAG_UNUSED_POWDER }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_3 }, + { gBattleAnimSpritePalette_070, ANIM_TAG_SPARKLE_4 }, + { gBattleAnimSpritePalette_072, ANIM_TAG_MUSIC_NOTES }, + { gBattleAnimSpritePalette_073, ANIM_TAG_DUCK }, + { gBattleAnimSpritePalette_074, ANIM_TAG_MUD_SAND }, + { gBattleAnimSpritePalette_075, ANIM_TAG_ALERT }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES }, + { gBattleAnimSpritePalette_076, ANIM_TAG_UNUSED_BLUE_FLAMES_2 }, + { gBattleAnimSpritePalette_078, ANIM_TAG_UNUSED_SHOCK }, + { gBattleAnimSpritePalette_078, ANIM_TAG_SHOCK }, + { gBattleAnimSpritePalette_080, ANIM_TAG_UNUSED_BELL }, + { gBattleAnimSpritePalette_081, ANIM_TAG_UNUSED_PINK_GLOVE }, + { gBattleAnimSpritePalette_082, ANIM_TAG_UNUSED_BLUE_LINES }, + { gBattleAnimSpritePalette_083, ANIM_TAG_UNUSED_IMPACT }, + { gBattleAnimSpritePalette_084, ANIM_TAG_UNUSED_IMPACT_2 }, + { gBattleAnimSpritePalette_085, ANIM_TAG_UNUSED_RETICLE }, + { gBattleAnimSpritePalette_086, ANIM_TAG_BREATH }, + { gBattleAnimSpritePalette_087, ANIM_TAG_ANGER }, + { gBattleAnimSpritePalette_088, ANIM_TAG_UNUSED_SNOWBALL }, + { gBattleAnimSpritePalette_089, ANIM_TAG_UNUSED_VINE }, + { gBattleAnimSpritePalette_090, ANIM_TAG_UNUSED_SWORD }, + { gBattleAnimSpritePalette_091, ANIM_TAG_UNUSED_CLAPPING }, + { gBattleAnimSpritePalette_092, ANIM_TAG_UNUSED_RED_TUBE }, + { gBattleAnimSpritePalette_093, ANIM_TAG_AMNESIA }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_STRING }, + { gBattleAnimSpritePalette_095, ANIM_TAG_UNUSED_PENCIL }, + { gBattleAnimSpritePalette_096, ANIM_TAG_UNUSED_PETAL }, + { gBattleAnimSpritePalette_097, ANIM_TAG_BENT_SPOON }, + { gBattleAnimSpritePalette_094, ANIM_TAG_UNUSED_WEB }, + { gBattleAnimSpritePalette_099, ANIM_TAG_MILK_BOTTLE }, + { gBattleAnimSpritePalette_100, ANIM_TAG_COIN }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_CRACKED_EGG }, + { gBattleAnimSpritePalette_101, ANIM_TAG_UNUSED_HATCHED_EGG }, + { gBattleAnimSpritePalette_103, ANIM_TAG_UNUSED_FRESH_EGG }, + { gBattleAnimSpritePalette_104, ANIM_TAG_UNUSED_FANGS }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_2 }, + { gBattleAnimSpritePalette_105, ANIM_TAG_UNUSED_EXPLOSION_3 }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET }, + { gBattleAnimSpritePalette_107, ANIM_TAG_UNUSED_WATER_DROPLET_2 }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SEED }, + { gBattleAnimSpritePalette_109, ANIM_TAG_UNUSED_SPROUT }, + { gBattleAnimSpritePalette_111, ANIM_TAG_UNUSED_RED_WAND }, + { gBattleAnimSpritePalette_112, ANIM_TAG_UNUSED_PURPLE_GREEN_UNK }, + { gBattleAnimSpritePalette_113, ANIM_TAG_UNUSED_WATER_COLUMN }, + { gBattleAnimSpritePalette_114, ANIM_TAG_UNUSED_MUD_UNK }, + { gBattleAnimSpritePalette_115, ANIM_TAG_RAIN_DROPS }, + { gBattleAnimSpritePalette_116, ANIM_TAG_UNUSED_FURY_SWIPES }, + { gBattleAnimSpritePalette_117, ANIM_TAG_UNUSED_VINE_2 }, + { gBattleAnimSpritePalette_118, ANIM_TAG_UNUSED_TEETH }, + { gBattleAnimSpritePalette_119, ANIM_TAG_UNUSED_BONE }, + { gBattleAnimSpritePalette_120, ANIM_TAG_UNUSED_WHITE_BAG }, + { gBattleAnimSpritePalette_121, ANIM_TAG_UNUSED_UNKNOWN }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_CORAL }, + { gBattleAnimSpritePalette_122, ANIM_TAG_UNUSED_PURPLE_DROPLET }, + { gBattleAnimSpritePalette_124, ANIM_TAG_UNUSED_SHOCK_2 }, + { gBattleAnimSpritePalette_125, ANIM_TAG_UNUSED_CLOSING_EYE_2 }, + { gBattleAnimSpritePalette_126, ANIM_TAG_UNUSED_METAL_BALL }, + { gBattleAnimSpritePalette_127, ANIM_TAG_UNUSED_MONSTER_DOLL }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND }, + { gBattleAnimSpritePalette_128, ANIM_TAG_UNUSED_WHIRLWIND_2 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_4 }, + { gBattleAnimSpritePalette_130, ANIM_TAG_UNUSED_EXPLOSION_5 }, + { gBattleAnimSpritePalette_132, ANIM_TAG_UNUSED_TONGUE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE }, + { gBattleAnimSpritePalette_133, ANIM_TAG_UNUSED_SMOKE_2 }, + { gBattleAnimSpritePalette_135, ANIM_TAG_IMPACT }, + { gBattleAnimSpritePalette_136, ANIM_TAG_CIRCLE_IMPACT }, + { gBattleAnimSpritePalette_135, ANIM_TAG_SCRATCH }, + { gBattleAnimSpritePalette_135, ANIM_TAG_CUT }, + { gBattleAnimSpritePalette_139, ANIM_TAG_SHARP_TEETH }, + { gBattleAnimSpritePalette_140, ANIM_TAG_RAINBOW_RINGS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_CRYSTALS }, + { gBattleAnimSpritePalette_141, ANIM_TAG_ICE_SPIKES }, + { gBattleAnimSpritePalette_143, ANIM_TAG_HANDS_AND_FEET }, + { gBattleAnimSpritePalette_144, ANIM_TAG_MIST_CLOUD }, + { gBattleAnimSpritePalette_139, ANIM_TAG_CLAMP }, + { gBattleAnimSpritePalette_115, ANIM_TAG_BUBBLE }, + { gBattleAnimSpritePalette_147, ANIM_TAG_ORBS }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_IMPACT }, + { gBattleAnimSpritePalette_148, ANIM_TAG_WATER_ORB }, + { gBattleAnimSpritePalette_150, ANIM_TAG_POISON_BUBBLE }, + { gBattleAnimSpritePalette_150, ANIM_TAG_TOXIC_BUBBLE }, + { gBattleAnimSpritePalette_152, ANIM_TAG_SPIKES }, + { gBattleAnimSpritePalette_153, ANIM_TAG_HORN_HIT_2 }, + { gBattleAnimSpritePalette_154, ANIM_TAG_AIR_WAVE_2 }, + { gBattleAnimSpritePalette_155, ANIM_TAG_SMALL_BUBBLES }, + { gBattleAnimSpritePalette_156, ANIM_TAG_ROUND_SHADOW }, + { gBattleAnimSpritePalette_157, ANIM_TAG_SUNLIGHT }, + { gBattleAnimSpritePalette_158, ANIM_TAG_SPORE }, + { gBattleAnimSpritePalette_159, ANIM_TAG_FLOWER }, + { gBattleAnimSpritePalette_160, ANIM_TAG_RAZOR_LEAF }, + { gBattleAnimSpritePalette_161, ANIM_TAG_NEEDLE }, + { gBattleAnimSpritePalette_162, ANIM_TAG_WHIRLWIND_LINES }, + { gBattleAnimSpritePalette_163, ANIM_TAG_GOLD_RING }, + { gBattleAnimSpritePalette_164, ANIM_TAG_PURPLE_RING }, + { gBattleAnimSpritePalette_165, ANIM_TAG_BLUE_RING }, + { gBattleAnimSpritePalette_166, ANIM_TAG_GREEN_LIGHT_WALL }, + { gBattleAnimSpritePalette_167, ANIM_TAG_BLUE_LIGHT_WALL }, + { gBattleAnimSpritePalette_168, ANIM_TAG_RED_LIGHT_WALL }, + { gBattleAnimSpritePalette_169, ANIM_TAG_GRAY_LIGHT_WALL }, + { gBattleAnimSpritePalette_170, ANIM_TAG_ORANGE_LIGHT_WALL }, + { gBattleAnimSpritePalette_171, ANIM_TAG_BLACK_BALL_2 }, + { gBattleAnimSpritePalette_172, ANIM_TAG_PURPLE_GAS_CLOUD }, + { gBattleAnimSpritePalette_001, ANIM_TAG_SPARK_H }, + { gBattleAnimSpritePalette_174, ANIM_TAG_YELLOW_STAR }, + { gBattleAnimSpritePalette_175, ANIM_TAG_LARGE_FRESH_EGG }, + { gBattleAnimSpritePalette_176, ANIM_TAG_SHADOW_BALL }, + { gBattleAnimSpritePalette_177, ANIM_TAG_LICK }, + { gBattleAnimSpritePalette_178, ANIM_TAG_UNUSED_VOID_LINES }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING }, + { gBattleAnimSpritePalette_179, ANIM_TAG_STRING_DOT }, + { gBattleAnimSpritePalette_179, ANIM_TAG_WEB }, + { gBattleAnimSpritePalette_182, ANIM_TAG_UNUSED_LIGHTBULB }, + { gBattleAnimSpritePalette_183, ANIM_TAG_SLASH }, + { gBattleAnimSpritePalette_184, ANIM_TAG_FOCUS_ENERGY }, + { gBattleAnimSpritePalette_185, ANIM_TAG_SPHERE_TO_CUBE }, + { gBattleAnimSpritePalette_186, ANIM_TAG_TENDRILS }, + { gBattleAnimSpritePalette_187, ANIM_TAG_EYE }, + { gBattleAnimSpritePalette_188, ANIM_TAG_WHITE_SHADOW }, + { gBattleAnimSpritePalette_189, ANIM_TAG_TEAL_ALERT }, + { gBattleAnimSpritePalette_190, ANIM_TAG_OPENING_EYE }, + { gBattleAnimSpritePalette_191, ANIM_TAG_ROUND_WHITE_HALO }, + { gBattleAnimSpritePalette_192, ANIM_TAG_FANG_ATTACK }, + { gBattleAnimSpritePalette_193, ANIM_TAG_PURPLE_HAND_OUTLINE }, + { gBattleAnimSpritePalette_194, ANIM_TAG_MOON }, + { gBattleAnimSpritePalette_195, ANIM_TAG_SPARKLE_5 }, + { gBattleAnimSpritePalette_196, ANIM_TAG_SPIRAL }, + { gBattleAnimSpritePalette_197, ANIM_TAG_SNORE_Z }, + { gBattleAnimSpritePalette_198, ANIM_TAG_EXPLOSION }, + { gBattleAnimSpritePalette_199, ANIM_TAG_NAIL }, + { gBattleAnimSpritePalette_200, ANIM_TAG_GHOSTLY_SPIRIT }, + { gBattleAnimSpritePalette_201, ANIM_TAG_WARM_ROCK }, + { gBattleAnimSpritePalette_202, ANIM_TAG_BREAKING_EGG }, + { gBattleAnimSpritePalette_203, ANIM_TAG_THIN_RING }, + { gBattleAnimSpritePalette_204, ANIM_TAG_UNUSED_PUNCH_IMPACT }, + { gBattleAnimSpritePalette_205, ANIM_TAG_BELL }, + { gBattleAnimSpritePalette_206, ANIM_TAG_MUSIC_NOTES_2 }, + { gBattleAnimSpritePalette_207, ANIM_TAG_SPEED_DUST }, + { gBattleAnimSpritePalette_167, ANIM_TAG_TORN_METAL }, + { gBattleAnimSpritePalette_209, ANIM_TAG_THOUGHT_BUBBLE }, + { gBattleAnimSpritePalette_210, ANIM_TAG_MAGENTA_HEART }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRIC_ORBS }, + { gBattleAnimSpritePalette_211, ANIM_TAG_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_211, ANIM_TAG_ELECTRICITY }, + { gBattleAnimSpritePalette_064, ANIM_TAG_FINGER_2 }, + { gBattleAnimSpritePalette_215, ANIM_TAG_MOVEMENT_WAVES }, + { gBattleAnimSpritePalette_216, ANIM_TAG_RED_HEART }, + { gBattleAnimSpritePalette_217, ANIM_TAG_RED_ORB }, + { gBattleAnimSpritePalette_218, ANIM_TAG_EYE_SPARKLE }, + { gBattleAnimSpritePalette_219, ANIM_TAG_PINK_HEART }, + { gBattleAnimSpritePalette_220, ANIM_TAG_ANGEL }, + { gBattleAnimSpritePalette_221, ANIM_TAG_DEVIL }, + { gBattleAnimSpritePalette_222, ANIM_TAG_SWIPE }, + { gBattleAnimSpritePalette_223, ANIM_TAG_ROOTS }, + { gBattleAnimSpritePalette_224, ANIM_TAG_ITEM_BAG }, + { gBattleAnimSpritePalette_225, ANIM_TAG_JAGGED_MUSIC_NOTE }, + { gBattleAnimSpritePalette_226, ANIM_TAG_POKEBALL }, + { gBattleAnimSpritePalette_226, ANIM_TAG_SPOTLIGHT }, + { gBattleAnimSpritePalette_228, ANIM_TAG_LETTER_Z }, + { gBattleAnimSpritePalette_229, ANIM_TAG_RAPID_SPIN }, + { gBattleAnimSpritePalette_230, ANIM_TAG_TRI_FORCE_TRIANGLE }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_ORB }, + { gBattleAnimSpritePalette_231, ANIM_TAG_WISP_FIRE }, + { gBattleAnimSpritePalette_233, ANIM_TAG_GOLD_STARS }, + { gBattleAnimSpritePalette_234, ANIM_TAG_ECLIPSING_ORB }, + { gBattleAnimSpritePalette_235, ANIM_TAG_GRAY_ORB }, + { gBattleAnimSpritePalette_236, ANIM_TAG_BLUE_ORB }, + { gBattleAnimSpritePalette_237, ANIM_TAG_RED_ORB_2 }, + { gBattleAnimSpritePalette_238, ANIM_TAG_PINK_PETAL }, + { gBattleAnimSpritePalette_239, ANIM_TAG_PAIN_SPLIT }, + { gBattleAnimSpritePalette_240, ANIM_TAG_CONFETTI }, + { gBattleAnimSpritePalette_241, ANIM_TAG_GREEN_STAR }, + { gBattleAnimSpritePalette_242, ANIM_TAG_PINK_CLOUD }, + { gBattleAnimSpritePalette_243, ANIM_TAG_SWEAT_DROP }, + { gBattleAnimSpritePalette_244, ANIM_TAG_GUARD_RING }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SCRATCH }, + { gBattleAnimSpritePalette_245, ANIM_TAG_PURPLE_SWIPE }, + { gBattleAnimSpritePalette_064, ANIM_TAG_TAG_HAND }, + { gBattleAnimSpritePalette_248, ANIM_TAG_SMALL_RED_EYE }, + { gBattleAnimSpritePalette_249, ANIM_TAG_HOLLOW_ORB }, + { gBattleAnimSpritePalette_249, ANIM_TAG_X_SIGN }, + { gBattleAnimSpritePalette_251, ANIM_TAG_BLUEGREEN_ORB }, + { gBattleAnimSpritePalette_252, ANIM_TAG_PAW_PRINT }, + { gBattleAnimSpritePalette_253, ANIM_TAG_PURPLE_FLAME }, + { gBattleAnimSpritePalette_254, ANIM_TAG_RED_BALL }, + { gBattleAnimSpritePalette_255, ANIM_TAG_SMELLINGSALT_EFFECT }, + { gBattleAnimSpritePalette_256, ANIM_TAG_METEOR }, + { gBattleAnimSpritePalette_257, ANIM_TAG_FLAT_ROCK }, + { gBattleAnimSpritePalette_258, ANIM_TAG_MAGNIFYING_GLASS }, + { gBattleAnimSpritePalette_259, ANIM_TAG_BROWN_ORB }, + { gBattleAnimSpritePalette_260, ANIM_TAG_METAL_SOUND_WAVES }, + { gBattleAnimSpritePalette_261, ANIM_TAG_FLYING_DIRT }, + { gBattleAnimSpritePalette_262, ANIM_TAG_ICICLE_SPEAR }, + { gBattleAnimSpritePalette_263, ANIM_TAG_HAIL }, + { gBattleAnimSpritePalette_264, ANIM_TAG_GLOWY_RED_ORB }, + { gBattleAnimSpritePalette_265, ANIM_TAG_GLOWY_GREEN_ORB }, + { gBattleAnimSpritePalette_266, ANIM_TAG_GREEN_SPIKE }, + { gBattleAnimSpritePalette_267, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT }, + { gBattleAnimSpritePalette_268, ANIM_TAG_GLOWY_BLUE_ORB }, + { gBattleAnimSpritePalette_269, ANIM_TAG_UNUSED_RED_BRICK }, + { gBattleAnimSpritePalette_270, ANIM_TAG_WHITE_FEATHER }, + { gBattleAnimSpritePalette_271, ANIM_TAG_SPARKLE_6 }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SPLASH }, + { gBattleAnimSpritePalette_272, ANIM_TAG_SWEAT_BEAD }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_1 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_2 }, + { gBattleAnimSpritePalette_274, ANIM_TAG_UNUSED_GEM_3 }, + { gBattleAnimSpritePalette_277, ANIM_TAG_SLAM_HIT_2 }, + { gBattleAnimSpritePalette_278, ANIM_TAG_RECYCLE }, + { gBattleAnimSpritePalette_279, ANIM_TAG_UNUSED_RED_PARTICLES }, + { gBattleAnimSpritePalette_280, ANIM_TAG_PROTECT }, + { gBattleAnimSpritePalette_281, ANIM_TAG_DIRT_MOUND }, + { gBattleAnimSpritePalette_282, ANIM_TAG_SHOCK_3 }, + { gBattleAnimSpritePalette_283, ANIM_TAG_WEATHER_BALL }, + { gBattleAnimSpritePalette_284, ANIM_TAG_BIRD }, + { gBattleAnimSpritePalette_285, ANIM_TAG_CROSS_IMPACT }, + { gBattleAnimSpritePalette_286, ANIM_TAG_SLASH_2 }, + { gBattleAnimSpritePalette_287, ANIM_TAG_WHIP_HIT }, + { gBattleAnimSpritePalette_288, ANIM_TAG_BLUE_RING_2 }, }; const struct BattleAnimBackground gBattleAnimBackgroundTable[] = diff --git a/src/battle/battle_anim_807B69C.c b/src/battle/battle_anim_807B69C.c index 92099c495..5daf7bb50 100644 --- a/src/battle/battle_anim_807B69C.c +++ b/src/battle/battle_anim_807B69C.c @@ -41,8 +41,8 @@ static const struct SubspriteTable gSubspriteTables_83931D8[] = static const struct SpriteTemplate gSpriteTemplate_83931E0 = { - .tileTag = 10010, - .paletteTag = 10010, + .tileTag = ANIM_TAG_ICE_CUBE, + .paletteTag = ANIM_TAG_ICE_CUBE, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -53,8 +53,8 @@ static const struct SpriteTemplate gSpriteTemplate_83931E0 = static void sub_807B870(struct Sprite *); static const struct SpriteTemplate gSpriteTemplate_83931F8 = { - .tileTag = 10136, - .paletteTag = 10136, + .tileTag = ANIM_TAG_CIRCLE_IMPACT, + .paletteTag = ANIM_TAG_CIRCLE_IMPACT, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 4614f9aa9..af7397c23 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -157,8 +157,8 @@ const union AnimCmd *const gSpriteAnimTable_840217C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = { - .tileTag = 10137, - .paletteTag = 10137, + .tileTag = ANIM_TAG_SCRATCH, + .paletteTag = ANIM_TAG_SCRATCH, .oam = &gOamData_837E054, .anims = gSpriteAnimTable_840217C, .images = NULL, @@ -168,8 +168,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402180 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = { - .tileTag = 10016, - .paletteTag = 10016, + .tileTag = ANIM_TAG_BLACK_SMOKE, + .paletteTag = ANIM_TAG_BLACK_SMOKE, .oam = &gOamData_837DF54, .anims = gDummySpriteAnimTable, .images = NULL, @@ -179,8 +179,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402198 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021B0 = { - .tileTag = 10017, - .paletteTag = 10017, + .tileTag = ANIM_TAG_BLACK_BALL, + .paletteTag = ANIM_TAG_BLACK_BALL, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -203,8 +203,8 @@ const union AnimCmd *const gSpriteAnimTable_84021D8[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = { - .tileTag = 10190, - .paletteTag = 10190, + .tileTag = ANIM_TAG_OPENING_EYE, + .paletteTag = ANIM_TAG_OPENING_EYE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84021D8, .images = NULL, @@ -214,8 +214,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021DC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = { - .tileTag = 10191, - .paletteTag = 10191, + .tileTag = ANIM_TAG_ROUND_WHITE_HALO, + .paletteTag = ANIM_TAG_ROUND_WHITE_HALO, .oam = &gOamData_837E05C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -225,8 +225,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84021F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840220C = { - .tileTag = 10189, - .paletteTag = 10189, + .tileTag = ANIM_TAG_TEAL_ALERT, + .paletteTag = ANIM_TAG_TEAL_ALERT, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -257,8 +257,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_840225C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = { - .tileTag = 10187, - .paletteTag = 10187, + .tileTag = ANIM_TAG_EYE, + .paletteTag = ANIM_TAG_EYE, .oam = &gOamData_837E11C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -268,8 +268,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402264 = const struct SpriteTemplate gBattleAnimSpriteTemplate_840227C = { - .tileTag = 10152, - .paletteTag = 10152, + .tileTag = ANIM_TAG_SPIKES, + .paletteTag = ANIM_TAG_SPIKES, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -294,8 +294,8 @@ const union AnimCmd *const gSpriteAnimTable_84022AC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022B0 = { - .tileTag = 10027, - .paletteTag = 10027, + .tileTag = ANIM_TAG_LEER, + .paletteTag = ANIM_TAG_LEER, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_84022AC, .images = NULL, @@ -328,8 +328,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84022EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84022F0 = { - .tileTag = 10228, - .paletteTag = 10228, + .tileTag = ANIM_TAG_LETTER_Z, + .paletteTag = ANIM_TAG_LETTER_Z, .oam = &gOamData_837DF94, .anims = gSpriteAnimTable_84022D0, .images = NULL, @@ -365,8 +365,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402338[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840233C = { - .tileTag = 10192, - .paletteTag = 10192, + .tileTag = ANIM_TAG_FANG_ATTACK, + .paletteTag = ANIM_TAG_FANG_ATTACK, .oam = &gOamData_837DFF4, .anims = gSpriteAnimTable_840231C, .images = NULL, @@ -396,8 +396,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402384[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -407,8 +407,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_840238C = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -418,8 +418,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84023A4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023BC = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -442,8 +442,8 @@ const union AnimCmd *const gSpriteAnimTable_84023E4[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84023E8 = { - .tileTag = 10229, - .paletteTag = 10229, + .tileTag = ANIM_TAG_RAPID_SPIN, + .paletteTag = ANIM_TAG_RAPID_SPIN, .oam = &gOamData_837DF54, .anims = gSpriteAnimTable_84023E4, .images = NULL, @@ -486,8 +486,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402454[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402458 = { - .tileTag = 10230, - .paletteTag = 10230, + .tileTag = ANIM_TAG_TRI_FORCE_TRIANGLE, + .paletteTag = ANIM_TAG_TRI_FORCE_TRIANGLE, .oam = &gOamData_837DFFC, .anims = gSpriteAnimTable_8402428, .images = NULL, @@ -515,8 +515,8 @@ const union AnimCmd *const gSpriteAnimTable_8402494[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402498 = { - .tileTag = 10234, - .paletteTag = 10234, + .tileTag = ANIM_TAG_ECLIPSING_ORB, + .paletteTag = ANIM_TAG_ECLIPSING_ORB, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_8402494, .images = NULL, @@ -534,8 +534,8 @@ const union AffineAnimCmd gUnknown_084024B0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = { - .tileTag = 10226, - .paletteTag = 10226, + .tileTag = ANIM_TAG_POKEBALL, + .paletteTag = ANIM_TAG_POKEBALL, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -545,8 +545,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -556,8 +556,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84024E8 = const struct SpriteTemplate gSpriteTemplate_8402500 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -587,8 +587,8 @@ const union AffineAnimCmd gUnknown_08402540[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402578 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -642,8 +642,8 @@ const union AnimCmd *const gSpriteAnimTable_84025E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC = { - .tileTag = 10241, - .paletteTag = 10241, + .tileTag = ANIM_TAG_GREEN_STAR, + .paletteTag = ANIM_TAG_GREEN_STAR, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84025E0, .images = NULL, @@ -678,8 +678,8 @@ const union AffineAnimCmd gUnknown_08402610[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402630 = { - .tileTag = 10087, - .paletteTag = 10087, + .tileTag = ANIM_TAG_ANGER, + .paletteTag = ANIM_TAG_ANGER, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -728,8 +728,8 @@ const union AnimCmd *const gSpriteAnimTable_8402698[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026A4 = { - .tileTag = 10238, - .paletteTag = 10238, + .tileTag = ANIM_TAG_PINK_PETAL, + .paletteTag = ANIM_TAG_PINK_PETAL, .oam = &gOamData_837DF24, .anims = gSpriteAnimTable_8402698, .images = NULL, @@ -754,8 +754,8 @@ const union AnimCmd *const gSpriteAnimTable_84026EC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = { - .tileTag = 10239, - .paletteTag = 10239, + .tileTag = ANIM_TAG_PAIN_SPLIT, + .paletteTag = ANIM_TAG_PAIN_SPLIT, .oam = &gOamData_837DF2C, .anims = gSpriteAnimTable_84026EC, .images = NULL, @@ -765,8 +765,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84026F0 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = { - .tileTag = 10240, - .paletteTag = 10240, + .tileTag = ANIM_TAG_CONFETTI, + .paletteTag = ANIM_TAG_CONFETTI, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -776,8 +776,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402708 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = { - .tileTag = 10227, - .paletteTag = 10227, + .tileTag = ANIM_TAG_SPOTLIGHT, + .paletteTag = ANIM_TAG_SPOTLIGHT, .oam = &gOamData_837DFFC, .anims = gDummySpriteAnimTable, .images = NULL, @@ -787,8 +787,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402720 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402738 = { - .tileTag = 10236, - .paletteTag = 10236, + .tileTag = ANIM_TAG_BLUE_ORB, + .paletteTag = ANIM_TAG_BLUE_ORB, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -839,8 +839,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84027E0[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84027EC = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -890,8 +890,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = { - .tileTag = 10242, - .paletteTag = 10242, + .tileTag = ANIM_TAG_PINK_CLOUD, + .paletteTag = ANIM_TAG_PINK_CLOUD, .oam = &gOamData_837DFF4, .anims = gDummySpriteAnimTable, .images = NULL, @@ -909,8 +909,8 @@ const union AffineAnimCmd gUnknown_084028AC[] = const struct SpriteTemplate gSpriteTemplate_84028CC = { - .tileTag = 10243, - .paletteTag = 10243, + .tileTag = ANIM_TAG_SWEAT_DROP, + .paletteTag = ANIM_TAG_SWEAT_DROP, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -942,8 +942,8 @@ const union AnimCmd *const gSpriteAnimTable_840292C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = { - .tileTag = 10053, - .paletteTag = 10053, + .tileTag = ANIM_TAG_NOISE_LINE, + .paletteTag = ANIM_TAG_NOISE_LINE, .oam = &gOamData_837DF34, .anims = gSpriteAnimTable_840292C, .images = NULL, @@ -953,8 +953,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402934 = const struct SpriteTemplate gSpriteTemplate_840294C = { - .tileTag = 10248, - .paletteTag = 10248, + .tileTag = ANIM_TAG_SMALL_RED_EYE, + .paletteTag = ANIM_TAG_SMALL_RED_EYE, .oam = &gOamData_837DF24, .anims = gDummySpriteAnimTable, .images = NULL, @@ -964,8 +964,8 @@ const struct SpriteTemplate gSpriteTemplate_840294C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402964 = { - .tileTag = 10252, - .paletteTag = 10252, + .tileTag = ANIM_TAG_PAW_PRINT, + .paletteTag = ANIM_TAG_PAW_PRINT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -994,8 +994,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_84029A4[] = const struct SpriteTemplate gSpriteTemplate_84029AC = { - .tileTag = 10254, - .paletteTag = 10254, + .tileTag = ANIM_TAG_RED_BALL, + .paletteTag = ANIM_TAG_RED_BALL, .oam = &gOamData_837DF94, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1005,8 +1005,8 @@ const struct SpriteTemplate gSpriteTemplate_84029AC = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029C4 = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1023,8 +1023,8 @@ const union AffineAnimCmd gUnknown_084029DC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = { - .tileTag = 10255, - .paletteTag = 10255, + .tileTag = ANIM_TAG_SMELLINGSALT_EFFECT, + .paletteTag = ANIM_TAG_SMELLINGSALT_EFFECT, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1034,8 +1034,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84029F4 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = { - .tileTag = 10247, - .paletteTag = 10247, + .tileTag = ANIM_TAG_TAG_HAND, + .paletteTag = ANIM_TAG_TAG_HAND, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1045,8 +1045,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A0C = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = { - .tileTag = 10258, - .paletteTag = 10258, + .tileTag = ANIM_TAG_MAGNIFYING_GLASS, + .paletteTag = ANIM_TAG_MAGNIFYING_GLASS, .oam = &gOamData_837E054, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1056,8 +1056,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A24 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1067,8 +1067,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A3C = const struct SpriteTemplate gSpriteTemplate_8402A54 = { - .tileTag = 10233, - .paletteTag = 10233, + .tileTag = ANIM_TAG_GOLD_STARS, + .paletteTag = ANIM_TAG_GOLD_STARS, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1078,8 +1078,8 @@ const struct SpriteTemplate gSpriteTemplate_8402A54 = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = { - .tileTag = 10250, - .paletteTag = 10250, + .tileTag = ANIM_TAG_X_SIGN, + .paletteTag = ANIM_TAG_X_SIGN, .oam = &gOamData_837DF3C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1089,8 +1089,8 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402A6C = const struct SpriteTemplate gSpriteTemplate_8402A84 = { - .tileTag = 10224, - .paletteTag = 10224, + .tileTag = ANIM_TAG_ITEM_BAG, + .paletteTag = ANIM_TAG_ITEM_BAG, .oam = &gOamData_837DF34, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1132,8 +1132,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402ADC[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402AE4 = { - .tileTag = 10277, - .paletteTag = 10277, + .tileTag = ANIM_TAG_SLAM_HIT_2, + .paletteTag = ANIM_TAG_SLAM_HIT_2, .oam = &gOamData_837DF9C, .anims = gSpriteAnimTable_8402AA8, .images = NULL, @@ -1154,8 +1154,8 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402B0C[] = const struct SpriteTemplate gBattleAnimSpriteTemplate_8402B10 = { - .tileTag = 10278, - .paletteTag = 10278, + .tileTag = ANIM_TAG_RECYCLE, + .paletteTag = ANIM_TAG_RECYCLE, .oam = &gOamData_837E0BC, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/battle/battle_anim_813F0F4.c b/src/battle/battle_anim_813F0F4.c index 312cdf8c9..2ad17c3b2 100755 --- a/src/battle/battle_anim_813F0F4.c +++ b/src/battle/battle_anim_813F0F4.c @@ -351,8 +351,8 @@ const u16 gUnknown_0840B4D4[] = static void sub_8141C30(struct Sprite *sprite); const struct SpriteTemplate gBattleAnimSpriteTemplate_840B4FC = { - .tileTag = 10269, - .paletteTag = 10269, + .tileTag = ANIM_TAG_UNUSED_RED_BRICK, + .paletteTag = ANIM_TAG_UNUSED_RED_BRICK, .oam = &gOamData_837DF2C, .anims = gDummySpriteAnimTable, .images = NULL, |