From 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 13:15:01 -0600 Subject: Port battle_anim changes from pokeemerald --- src/battle/anim/shield.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/battle/anim/shield.c') diff --git a/src/battle/anim/shield.c b/src/battle/anim/shield.c index 8ed4f9796..676318545 100755 --- a/src/battle/anim/shield.c +++ b/src/battle/anim/shield.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; static void sub_80CCE0C(struct Sprite* sprite); @@ -16,17 +16,17 @@ static void sub_80CCE0C(struct Sprite* sprite); void sub_80CCD24(struct Sprite* sprite) { - if (NotInBattle() != 0) + if (IsContest() != 0) { gBattleAnimArgs[1] += 8; } - sprite->pos1.x = sub_8077EE4(gBattleAnimBankAttacker, 0) + gBattleAnimArgs[0]; - sprite->pos1.y = sub_8077EE4(gBattleAnimBankAttacker, 1) + gBattleAnimArgs[1]; - if (GetBankSide(gBattleAnimBankAttacker) == 0 || NotInBattle()) - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker) + 1; + sprite->pos1.x = sub_8077EE4(gAnimBankAttacker, 0) + gBattleAnimArgs[0]; + sprite->pos1.y = sub_8077EE4(gAnimBankAttacker, 1) + gBattleAnimArgs[1]; + if (GetBankSide(gAnimBankAttacker) == 0 || IsContest()) + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker) + 1; else - sprite->oam.priority = sub_8079ED4(gBattleAnimBankAttacker); + sprite->oam.priority = sub_8079ED4(gAnimBankAttacker); sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = (IndexOfSpritePaletteTag(0x2828) << 4) + 0x100; -- cgit v1.2.3