summaryrefslogtreecommitdiff
path: root/src/battle/anim/tile_out.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
committerPikalaxALT <pikalaxalt@gmail.com>2018-01-03 16:45:53 -0700
commit4df728666e55b47480467fbea86f48dadcb81c97 (patch)
tree6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/anim/tile_out.c
parent9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff)
parent397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff)
Merge branch 'master' into slot_machine
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);
}
}