diff options
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | src/choose_party.c | 4 | ||||
| -rw-r--r-- | src/party_menu.c | 6 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 9e3dd2e34..82ec9d644 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -134,6 +134,8 @@ #define STATUS_PRIMARY_SLEEP 0x3 #define STATUS_PRIMARY_FREEZE 0x4 #define STATUS_PRIMARY_BURN 0x5 +#define STATUS_PRIMARY_POKERUS 0x6 +#define STATUS_PRIMARY_FAINTED 0x7 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 diff --git a/src/choose_party.c b/src/choose_party.c index 186b42de3..698460547 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -628,7 +628,7 @@ static void sub_81229B8(void) PartyMenuPrintHP(i, 3, &gPlayerParty[i]); status = GetMonStatusAndPokerus(&gPlayerParty[i]); - if (status != 0 && status != 6) + if (status && status != STATUS_PRIMARY_POKERUS) PartyMenuPutStatusTilemap(i, 3, status - 1); else PartyMenuPrintLevel(i, 3, &gPlayerParty[i]); @@ -675,7 +675,7 @@ static void sub_8122B10(u8 taskId) PartyMenuDoPrintHP(i + 3, 3, gMultiPartnerParty[i].hp, gMultiPartnerParty[i].maxhp); if (gMultiPartnerParty[i].hp == 0) - primaryStatus = 7; + primaryStatus = STATUS_PRIMARY_FAINTED; else primaryStatus = GetPrimaryStatus(gMultiPartnerParty[i].status); diff --git a/src/party_menu.c b/src/party_menu.c index c21c29b01..dd96ec116 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3376,7 +3376,7 @@ void PartyMenuPrintMonLevelOrStatus(u8 monIndex, struct Pokemon *pokemon) else menuLayout = IsDoubleBattle(); - if (statusAndPkrs != 0 && statusAndPkrs != 6) + if (statusAndPkrs && statusAndPkrs != STATUS_PRIMARY_POKERUS) PartyMenuPutStatusTilemap(monIndex, menuLayout, statusAndPkrs - 1); else PartyMenuPrintLevel(monIndex, menuLayout, pokemon); @@ -4419,7 +4419,7 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func) else PlaySE(SE_BIDORO); statusAndPkrs = GetMonStatusAndPokerus(ewram1C000.pokemon); - if (statusAndPkrs == 6 || statusAndPkrs == 0) + if (statusAndPkrs == STATUS_PRIMARY_POKERUS || statusAndPkrs == STATUS_PRIMARY_NONE) PartyMenuUpdateLevelOrStatus(ewram1C000.pokemon, ewram1C000.primarySelectedMonIndex); if (r9 == TRUE) { @@ -4843,7 +4843,7 @@ void RedrawPokemonInfoInMenu(u8 monIndex, struct Pokemon *pokemon) u8 statusAndPkrs = GetMonStatusAndPokerus(pokemon); u8 icon; - if (statusAndPkrs == 0 || statusAndPkrs == 6) + if (statusAndPkrs == STATUS_PRIMARY_NONE || statusAndPkrs == STATUS_PRIMARY_POKERUS) PartyMenuUpdateLevelOrStatus(pokemon, monIndex); PartyMenuDoPrintHP(monIndex, IsDoubleBattle(), GetMonData(pokemon, MON_DATA_HP), GetMonData(pokemon, MON_DATA_MAX_HP)); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2bfb42681..28dd21b42 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4844,15 +4844,15 @@ u8 GetMonStatusAndPokerus(struct Pokemon *mon) u8 statusAilment; if (GetMonData(mon, MON_DATA_HP) == 0) - return 7; + return STATUS_PRIMARY_FAINTED; statusAilment = GetPrimaryStatus(GetMonData(mon, MON_DATA_STATUS)); if (statusAilment == STATUS_PRIMARY_NONE) { if (!CheckPartyPokerus(mon, 0)) - return 0; + return STATUS_PRIMARY_NONE; else - return 6; + return STATUS_PRIMARY_POKERUS; } return statusAilment; |