summaryrefslogtreecommitdiff
path: root/src/battle/anim/tile_out.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-30 23:50:49 -0600
committerGitHub <noreply@github.com>2017-12-30 23:50:49 -0600
commit153ddde3b90c893b47d5c844b2a58c707038e6b4 (patch)
tree8e3e5ab774b89399bf91e9ca110f270fa9bfffde /src/battle/anim/tile_out.c
parent86a36767dba19e84297047addf1d1d776e2efdec (diff)
parentc21bde059812ed521952512e4d800038e0e1deb7 (diff)
Merge pull request #502 from huderlem/misc_ports
Misc ports from pokeemerald
Diffstat (limited to 'src/battle/anim/tile_out.c')
-rwxr-xr-xsrc/battle/anim/tile_out.c10
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);
}
}