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/thunder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle/anim/thunder.c') diff --git a/src/battle/anim/thunder.c b/src/battle/anim/thunder.c index 5064148ef..2ed073221 100644 --- a/src/battle/anim/thunder.c +++ b/src/battle/anim/thunder.c @@ -3,8 +3,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gBattleTypeFlags; static void sub_80D6218(struct Sprite *); @@ -14,7 +14,7 @@ static void sub_80D6218(struct Sprite *); void sub_80D61C8(struct Sprite *sprite) { - if (GetBankSide(gBattleAnimBankAttacker) != 0) + if (GetBankSide(gAnimBankAttacker) != 0) { sprite->pos1.x -= gBattleAnimArgs[0]; } @@ -31,6 +31,6 @@ static void sub_80D6218(struct Sprite *sprite) { if (sprite->animEnded) { - move_anim_8072740(sprite); + DestroyAnimSprite(sprite); } } -- cgit v1.2.3