summaryrefslogtreecommitdiff
path: root/src/battle/anim/fight.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2019-07-29 20:44:18 -0500
committercamthesaxman <cameronghall@cox.net>2019-07-29 20:44:18 -0500
commitdb4af549fdf13cdaca6654f7bb9ef54ecef14359 (patch)
treec06f2d86efac079db46a3e9767faee1207f7f7e7 /src/battle/anim/fight.c
parentb8393b3a799f92e7064c266600607d98f6baf4d9 (diff)
resolve some Emerald differences
Diffstat (limited to 'src/battle/anim/fight.c')
-rw-r--r--src/battle/anim/fight.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c
index 6b8d8a3b5..8d045c42d 100644
--- a/src/battle/anim/fight.c
+++ b/src/battle/anim/fight.c
@@ -8,10 +8,10 @@
#include "constants/battle.h"
extern s16 gBattleAnimArgs[];
-extern u8 gBankAttacker;
+extern u8 gBattlerAttacker;
extern u8 gBattleAnimAttacker;
extern u8 gBattleAnimTarget;
-extern u8 gBankSpriteIds[];
+extern u8 gBattlerSpriteIds[];
extern u8 gBanksBySide[];
extern u16 gBattle_BG1_X;
extern u16 gBattle_BG1_Y;
@@ -817,8 +817,8 @@ void sub_80D97CC(struct Sprite *sprite)
{
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
sprite->data[7] = gBattleAnimTarget;
}
@@ -919,8 +919,8 @@ void sub_80D9A38(struct Sprite *sprite)
if (gBattleAnimArgs[0] == 0)
{
- sprite->pos1.x = GetBattlerSpriteCoord(gBankAttacker, 2);
- sprite->pos1.y = GetBattlerSpriteCoord(gBankAttacker, 3);
+ sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+ sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
bank = gBattleAnimTarget;
sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
}