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