From fabbbdd02add1087f0243ffbeac2a79e0f82a98b Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 19 Dec 2018 19:53:52 -0500 Subject: [PATCH] fix up party_menu --- src/party_menu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/party_menu.c b/src/party_menu.c index 0c21960f97..dc03908893 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -783,7 +783,7 @@ void PartyMenuInitHelperStructs(u8 a) gUnknown_0203CEDC[0].unk0 = &gUnknown_086156C4[0]; if (a == 3) gUnknown_0203CEDC[3].unk0 = &gUnknown_086156C4[0]; - else if (a) + else if (a != 0) gUnknown_0203CEDC[1].unk0 = &gUnknown_086156C4[0]; } @@ -881,15 +881,13 @@ void DisplayPartyPokemonSelectForBattle(u8 slot) } else { - i = 0; - while (i < sub_81B8830()) + for (i = 0; i < sub_81B8830(); i++) { if (ptr[i] != 0 && (ptr[i] - 1) == slot) { DisplayPartyPokemonSelectData(slot, i + 2); return; } - i++; } DisplayPartyPokemonSelectData(slot, 1); }