From 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 13:15:01 -0600 Subject: Port battle_anim changes from pokeemerald --- src/battle/anim/tile_in.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/battle/anim/tile_in.c') 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) -- cgit v1.2.3