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/tile.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/tile.c')
| -rw-r--r-- | src/battle/anim/tile.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, |