Merge branch 'master' into slot_machine

1 files changed, 6 insertions, 6 deletions

diff --git a/src/battle/anim/tile_in.c b/src/battle/anim/tile_in.c
index 5fcbadbb7..a4a544a0c 100755
--- a/src/battle/anim/tile_in.c
+++ b/src/battle/anim/tile_in.c
@@ -5,8 +5,8 @@
 #include "sound.h"
 
 extern s16 gBattleAnimArgs[];
-extern u8 gBattleAnimBankAttacker;
-extern u8 gBattleAnimBankTarget;
+extern u8 gAnimBankAttacker;
+extern u8 gAnimBankTarget;
 
 // tile_in (flips a white tile from the scene into facing the player.)
 // Used in Conversion.
@@ -15,15 +15,15 @@ void sub_80CE09C(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1];
-        if (NotInBattle())
+        sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 0) + gBattleAnimArgs[0];
+        sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 1) + gBattleAnimArgs[1];
+        if (IsContest())
             sprite->pos1.y += 10;
         sprite->data[0]++;
     }
 
     if ((u16)gBattleAnimArgs[7] == 0xFFFF)
-        move_anim_8072740(sprite);
+        DestroyAnimSprite(sprite);
 }
 
 void sub_80CE108(u8 taskId)