diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/battle/anim/tile_out.c | |
parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/battle/anim/tile_out.c')
-rwxr-xr-x | src/battle/anim/tile_out.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/tile_out.c b/src/battle/anim/tile_out.c index 8b710268f..50468a440 100755 --- a/src/battle/anim/tile_out.c +++ b/src/battle/anim/tile_out.c @@ -6,8 +6,8 @@ #include "battle_interface.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gNoOfAllBanks; extern u8 gHealthboxIDs[]; @@ -35,10 +35,10 @@ void sub_80CE1AC(struct Sprite* sprite) { sprite->animPaused = 0; sprite->data[0] = 30; - sprite->data[2] = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->data[4] = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->data[2] = GetBankPosition(gAnimBankAttacker, 2); + sprite->data[4] = GetBankPosition(gAnimBankAttacker, 3); sprite->callback = sub_8078B34; - StoreSpriteCallbackInData(sprite, move_anim_8072740); + StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } } |