diff options
Diffstat (limited to 'src/battle/anim/fight.c')
-rw-r--r-- | src/battle/anim/fight.c | 80 |
1 files changed, 40 insertions, 40 deletions
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, |