atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix healthbox reappearing from B_ANIM_SWITCH_OUT_OPPONENT_MON (#2849)

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2023-05-06 21:25:04 -04:00 committed by GitHub
commit 3cee3b18c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/battle_anim.c
View file

@ -119,6 +119,7 @@ EWRAM_DATA u8 gBattleAnimAttacker = 0;
EWRAM_DATA u8 gBattleAnimTarget = 0; EWRAM_DATA u8 gBattleAnimTarget = 0;
EWRAM_DATA u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT] = {0}; EWRAM_DATA u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u8 gAnimCustomPanning = 0; EWRAM_DATA u8 gAnimCustomPanning = 0;
EWRAM_DATA static bool8 sAnimHideHpBoxes = FALSE;
#include "data/battle_anim.h" #include "data/battle_anim.h"
@ -232,7 +233,6 @@ void LaunchBattleAnimation(u32 animType, u32 animId)
{ {
s32 i; s32 i;
const u8 *const *animsTable; const u8 *const *animsTable;
bool32 hideHpBoxes;
if (gTestRunnerEnabled) if (gTestRunnerEnabled)
{ {
@ -261,7 +261,7 @@ void LaunchBattleAnimation(u32 animType, u32 animId)
break; break;
} }
hideHpBoxes = !(animType == ANIM_TYPE_MOVE && animId == MOVE_TRANSFORM); sAnimHideHpBoxes = !(animType == ANIM_TYPE_MOVE && animId == MOVE_TRANSFORM);
if (animType != ANIM_TYPE_MOVE) if (animType != ANIM_TYPE_MOVE)
{ {
switch (animId) switch (animId)
@ -276,10 +276,10 @@ void LaunchBattleAnimation(u32 animType, u32 animId)
case B_ANIM_MEGA_EVOLUTION: case B_ANIM_MEGA_EVOLUTION:
case B_ANIM_PRIMAL_REVERSION: case B_ANIM_PRIMAL_REVERSION:
case B_ANIM_GULP_MISSILE: case B_ANIM_GULP_MISSILE:
hideHpBoxes = TRUE; sAnimHideHpBoxes = TRUE;
break; break;
default: default:
hideHpBoxes = FALSE; sAnimHideHpBoxes = FALSE;
break; break;
} }
} }
@ -287,7 +287,7 @@ void LaunchBattleAnimation(u32 animType, u32 animId)
if (!IsContest()) if (!IsContest())
{ {
InitPrioritiesForVisibleBattlers(); InitPrioritiesForVisibleBattlers();
UpdateOamPriorityInAllHealthboxes(0, hideHpBoxes); UpdateOamPriorityInAllHealthboxes(0, sAnimHideHpBoxes);
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{ {
if (GetBattlerSide(i) != B_SIDE_PLAYER) if (GetBattlerSide(i) != B_SIDE_PLAYER)
@ -764,7 +764,8 @@ static void Cmd_end(void)
if (!IsContest()) if (!IsContest())
{ {
InitPrioritiesForVisibleBattlers(); InitPrioritiesForVisibleBattlers();
UpdateOamPriorityInAllHealthboxes(1, TRUE); UpdateOamPriorityInAllHealthboxes(1, sAnimHideHpBoxes);
sAnimHideHpBoxes = FALSE;
} }
gAnimScriptActive = FALSE; gAnimScriptActive = FALSE;
} }