diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /src/battle/anim/tile_out.c | |
parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) |
Merge branch 'master' into decompile_easy_chat
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); } } |