summaryrefslogtreecommitdiff
path: root/src/battle_controller_oak_old_man.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-03-15 20:17:47 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-03-15 20:17:47 -0400
commit14aa5bf52f5e6bfe93b41afcd0f9ccd6bb796d68 (patch)
treec5ceea26b5526c6ccc11d8b757800076680c3a7f /src/battle_controller_oak_old_man.c
parent81da6acff56cadc5e2b7b5572aba944bf0f1c8ad (diff)
Remove unused, unneeded fields from BattleHealthboxInfo
Diffstat (limited to 'src/battle_controller_oak_old_man.c')
-rw-r--r--src/battle_controller_oak_old_man.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c
index 51ee7c097..e51881523 100644
--- a/src/battle_controller_oak_old_man.c
+++ b/src/battle_controller_oak_old_man.c
@@ -439,13 +439,13 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
if (gSprites[gHealthboxSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
r4 = TRUE;
if (r4
- && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1
- && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1)
+ && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim
+ && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim)
{
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = 0;
- gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_1_x1 = 0;
+ gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = 0;
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim = 0;
- gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].field_1_x1 = 0;
+ gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim = 0;
FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);