From db4af549fdf13cdaca6654f7bb9ef54ecef14359 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 29 Jul 2019 20:44:18 -0500 Subject: resolve some Emerald differences --- src/battle/anim/dragon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle/anim/dragon.c') diff --git a/src/battle/anim/dragon.c b/src/battle/anim/dragon.c index b59e8aff4..6ac0746a3 100644 --- a/src/battle/anim/dragon.c +++ b/src/battle/anim/dragon.c @@ -8,11 +8,11 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBankAttacker; +extern u8 gBattlerAttacker; extern u16 gBattle_BG1_X; extern u16 gBattle_BG2_X; extern u16 gUnknown_03000730[]; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; void sub_80DF5A0(struct Sprite *sprite); void sub_80DF760(struct Sprite *sprite); @@ -286,8 +286,8 @@ void sub_80DF78C(struct Sprite *sprite) sprite->data[4] = 0; sprite->data[5] = 1; sprite->data[6] = gBattleAnimArgs[0]; - r5 = GetBattlerSpriteCoordAttr(gBankAttacker, 0); - r0 = GetBattlerSpriteCoordAttr(gBankAttacker, 1); + r5 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 0); + r0 = GetBattlerSpriteCoordAttr(gBattlerAttacker, 1); if (r5 > r0) sprite->data[7] = r5 / 2; else -- cgit v1.2.3