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/bubble.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/battle/anim/bubble.c') diff --git a/src/battle/anim/bubble.c b/src/battle/anim/bubble.c index 9caf4d918..1870b786d 100644 --- a/src/battle/anim/bubble.c +++ b/src/battle/anim/bubble.c @@ -5,8 +5,8 @@ #include "util.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D31C8(struct Sprite* sprite); static void sub_80D32E8(struct Sprite *sprite); @@ -56,29 +56,29 @@ void sub_80D31C8(struct Sprite* sprite) { u8 newSpriteId; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) - gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2) + gBattleAnimArgs[0]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[1]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1]; } sprite->animPaused = 1; - if (GetBattlerSide(gAnimBankAttacker) != 0) + if (GetBattlerSide(gBattleAnimAttacker) != 0) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[6]; sprite->data[1] = sprite->pos1.x; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2); + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2); sprite->data[3] = sprite->pos1.y; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3); + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3); InitAnimLinearTranslation(sprite); -- cgit v1.2.3