From 00be991c66d37d090792db8bc1e4c1b9f9e88536 Mon Sep 17 00:00:00 2001 From: shinny456 Date: Mon, 17 Dec 2018 18:12:00 -0500 Subject: gAnimBankAttacker/Target to gBattleAnimAttacker/Target --- src/battle/anim/guard.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/battle/anim/guard.c') diff --git a/src/battle/anim/guard.c b/src/battle/anim/guard.c index 779895831..9f9685003 100644 --- a/src/battle/anim/guard.c +++ b/src/battle/anim/guard.c @@ -4,8 +4,8 @@ #include "rom_8077ABC.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern u16 gBattleTypeFlags; void sub_80D3014(struct Sprite *sprite); @@ -44,17 +44,17 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7D74 = void sub_80D3014(struct Sprite *sprite) { - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gAnimBankAttacker ^ 2)) + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsAnimBankSpriteVisible(gBattleAnimAttacker ^ 2)) { - SetAverageBattlerPositions(gAnimBankAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); + SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y); sprite->pos1.y += 40; StartSpriteAffineAnim(sprite, 1); } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + 40; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40; } sprite->data[0] = 13; -- cgit v1.2.3