diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-17 17:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 17:01:38 -0500 |
| commit | 6467ff26999d89252092d727f507f8b4b562c25c (patch) | |
| tree | 8c952a7748119de80a36aee062bd953bd02fbb66 /src/battle/anim/fire.c | |
| parent | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff) | |
| parent | 2ac92e38ffa627b49ce2c634b35d1a0e1835f0af (diff) | |
Merge pull request #697 from garakmon/battle-scrcmd-labels
Battle scrcmd labels
Diffstat (limited to 'src/battle/anim/fire.c')
| -rw-r--r-- | src/battle/anim/fire.c | 28 |
1 files changed, 14 insertions, 14 deletions
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, |