diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-04-08 14:37:01 -0700 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-08 14:37:01 -0700 |
commit | d26de1d236c7f3358e56733955460078e07712c7 (patch) | |
tree | 00374183cd83537f70b407bb046008c1ff9bf319 /src/choose_party.c | |
parent | 0a3b052bdc89eacddd1152049983c89dde37e7e4 (diff) |
Add 'fainted' and 'pokerus' primary status defines
Diffstat (limited to 'src/choose_party.c')
-rw-r--r-- | src/choose_party.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |