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/leaf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/battle/anim/leaf.c') diff --git a/src/battle/anim/leaf.c b/src/battle/anim/leaf.c index 13d1bc9f5..676734717 100755 --- a/src/battle/anim/leaf.c +++ b/src/battle/anim/leaf.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CAF20(struct Sprite* sprite); static void sub_80CAF6C(struct Sprite* sprite); @@ -15,8 +15,8 @@ static void sub_80CAF6C(struct Sprite* sprite); void sub_80CAED8(struct Sprite* sprite) { - sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2); - sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3); + sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2); + sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3); sprite->data[0] = gBattleAnimArgs[0]; sprite->data[1] = gBattleAnimArgs[1]; sprite->data[2] = gBattleAnimArgs[2]; @@ -51,7 +51,7 @@ void sub_80CAF20(struct Sprite* sprite) void sub_80CAF6C(struct Sprite* sprite) { - if (GetBankSide(gBattleAnimBankAttacker)) + if (GetBankSide(gAnimBankAttacker)) { sprite->pos2.x = -Sin(sprite->data[0], 0x19); } @@ -69,6 +69,6 @@ void sub_80CAF6C(struct Sprite* sprite) if (sprite->data[1] > 0x50) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } -- cgit v1.2.3