summaryrefslogtreecommitdiff
path: root/src/battle/anim/unused_7.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
committerMarcus Huderle <huderlem@gmail.com>2017-12-27 13:15:01 -0600
commit16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (patch)
treeb92766b1ed1710c7d8ea0492c160e0a39a3dc539 /src/battle/anim/unused_7.c
parent86a36767dba19e84297047addf1d1d776e2efdec (diff)
Port battle_anim changes from pokeemerald
Diffstat (limited to 'src/battle/anim/unused_7.c')
-rwxr-xr-xsrc/battle/anim/unused_7.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/unused_7.c b/src/battle/anim/unused_7.c
index 3a8998f1d..2be6e7633 100755
--- a/src/battle/anim/unused_7.c
+++ b/src/battle/anim/unused_7.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[];
@@ -30,10 +30,10 @@ void sub_80CF374(struct Sprite* sprite)
void sub_80CF3C4(struct Sprite* sprite)
{
u8 a;
- sprite->pos1.x = sub_8077ABC(gBattleAnimBankAttacker, 2);
- sprite->pos1.y = sub_8077ABC(gBattleAnimBankAttacker, 3);
- a = gObjectBankIDs[gBattleAnimBankTarget];
- if (GetBankSide(gBattleAnimBankAttacker) != 0)
+ sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
+ sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);
+ a = gObjectBankIDs[gAnimBankTarget];
+ if (GetBankSide(gAnimBankAttacker) != 0)
{
sprite->pos1.x -= gBattleAnimArgs[0];
}