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/withdraw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/battle/anim/withdraw.c') diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index 9abcff32d..e67248b9f 100755 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u8 gObjectBankIDs[]; @@ -17,15 +17,15 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - sub_8078E70(gObjectBankIDs[gBattleAnimBankAttacker], 0); + sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gObjectBankIDs[gBattleAnimBankAttacker]; + u8 a = gObjectBankIDs[gAnimBankAttacker]; s16 b; - if (GetBankSide(gBattleAnimBankAttacker) == 0) + if (GetBankSide(gAnimBankAttacker) == 0) { b = -gTasks[taskId].data[0]; } -- cgit v1.2.3