diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-30 11:26:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 11:26:44 -0500 |
| commit | c8ef69a00d303bf0fd57d3a3069b51d58d8c5def (patch) | |
| tree | 889ac67966e1ed2b86922546486bfb207c1cb501 /src/battle_anim_80A9C70.c | |
| parent | f3af20d3cf4c5a51b991e7f605f7cbea217a3cad (diff) | |
| parent | 6cf39e8a6ed3b0cb882e2d71d2ecd6c10152a489 (diff) | |
Merge pull request #372 from garakmon/sprite-tags
Synchronize sprite tags
Diffstat (limited to 'src/battle_anim_80A9C70.c')
| -rw-r--r-- | src/battle_anim_80A9C70.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_80A9C70.c b/src/battle_anim_80A9C70.c index 9b9218b1c..89c945ca4 100644 --- a/src/battle_anim_80A9C70.c +++ b/src/battle_anim_80A9C70.c @@ -56,8 +56,8 @@ static const struct SpriteTemplate gUnknown_0853EF48 = static const struct SpriteTemplate gUnknown_0853EF60 = { - .tileTag = ANIM_TAG_136, - .paletteTag = ANIM_TAG_136, + .tileTag = ANIM_TAG_CIRCLE_IMPACT, + .paletteTag = ANIM_TAG_CIRCLE_IMPACT, .oam = &gUnknown_08524904, .anims = gDummySpriteAnimTable, .images = NULL, @@ -73,8 +73,8 @@ u8 sub_80A9C70(u8 battlerId, bool8 b) u8 spriteId2; u8 i; - LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_136)]); - LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_136)]); + LoadCompressedObjectPicUsingHeap(&gBattleAnimPicTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]); + LoadCompressedObjectPaletteUsingHeap(&gBattleAnimPaletteTable[GET_TRUE_SPRITE_INDEX(ANIM_TAG_CIRCLE_IMPACT)]); gTasks[taskId].data[0] = battlerId; if (b) { |