summaryrefslogtreecommitdiff
path: root/src/battle_anim_status_effects.c
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
committerPhlosioneer <mattmdrr2@gmail.com>2019-04-07 20:20:22 -0400
commit50350cc2e1c26082f9d852e97e1698f7254d4145 (patch)
tree3217b352dae2be8da75ad08a8d94ddc7f81a5017 /src/battle_anim_status_effects.c
parent1360b3a477f1107785900cd0c4e73ebf018f058c (diff)
parenta4ea0ac816f799b76ac4bec1b66c569d6b684e64 (diff)
Merge branch 'master' into contest-ai-cleanup
Diffstat (limited to 'src/battle_anim_status_effects.c')
-rw-r--r--src/battle_anim_status_effects.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index 1271680e0..7ed78ea9a 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -44,8 +44,8 @@ static const union AnimCmd *const sSpriteAnimTable_853EDF8[] =
const struct SpriteTemplate gUnknown_0853EDFC =
{
- .tileTag = ANIM_TAG_UNUSED_ORB,
- .paletteTag = ANIM_TAG_UNUSED_ORB,
+ .tileTag = ANIM_TAG_ORB,
+ .paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
@@ -55,8 +55,8 @@ const struct SpriteTemplate gUnknown_0853EDFC =
const struct SpriteTemplate gUnknown_0853EE14 =
{
- .tileTag = ANIM_TAG_UNUSED_ORB,
- .paletteTag = ANIM_TAG_UNUSED_ORB,
+ .tileTag = ANIM_TAG_ORB,
+ .paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_0852490C,
.anims = sSpriteAnimTable_853EDF8,
.images = NULL,
@@ -125,8 +125,8 @@ const struct SpriteTemplate gUnknown_0853EE84 =
const struct SpriteTemplate gUnknown_0853EE9C =
{
- .tileTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
- .paletteTag = ANIM_TAG_UNUSED_MONSTER_FOOT,
+ .tileTag = ANIM_TAG_MONSTER_FOOT,
+ .paletteTag = ANIM_TAG_MONSTER_FOOT,
.oam = &gUnknown_08524914,
.anims = gDummySpriteAnimTable,
.images = NULL,
@@ -195,8 +195,8 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_853EEF8[] =
const struct SpriteTemplate gUnknown_0853EF18 =
{
- .tileTag = ANIM_TAG_UNUSED_ORB,
- .paletteTag = ANIM_TAG_UNUSED_ORB,
+ .tileTag = ANIM_TAG_ORB,
+ .paletteTag = ANIM_TAG_ORB,
.oam = &gUnknown_085249CC,
.anims = sSpriteAnimTable_853EEF8,
.images = NULL,