diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 23:19:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 23:19:57 -0500 |
| commit | 159bb37bbe9d960f0d2a3da9736e1be5eefb8290 (patch) | |
| tree | 44e6d447e57941a77623253884304c3174b72886 /src/battle_main.c | |
| parent | 9d3345a6d69c38bf31014df69c52583c877eed24 (diff) | |
| parent | 9a932cd9c3089c03adada30ace4c79a84bf73cf0 (diff) | |
Merge branch 'master' into fix_saveblock_reorder
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 8079546d4..2d2afed71 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3492,7 +3492,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = HP_EMPTY_SLOT; hpStatus[i].status = 0; } else @@ -3510,7 +3510,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = HP_EMPTY_SLOT; hpStatus[i].status = 0; } else @@ -3536,7 +3536,7 @@ static void BattleIntroDrawPartySummaryScreens(void) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - hpStatus[i].hp = 0xFFFF; + hpStatus[i].hp = HP_EMPTY_SLOT; hpStatus[i].status = 0; } else |