From d2d7b6ffefa3a5cc677e64f5a0172ab2f233f752 Mon Sep 17 00:00:00 2001 From: BuffelSaft Date: Fri, 16 Jul 2021 18:09:41 +1200 Subject: [PATCH] Remove Mimikyu check from loop More efficient than checking in each loop iteration. --- src/battle_util.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index 0892263175..3466a88f9d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8341,14 +8341,14 @@ void UndoFormChange(u32 monId, u32 side, bool32 isSwitchingOut) {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI}, }; - currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL); - for (i = 0; i < ARRAY_COUNT(species); i++) - { - if (i == 0 && isSwitchingOut) - { - i++; // Don't revert Mimikyu Busted when switching out - } + if (isSwitchingOut) // Don't revert Mimikyu Busted when switching out + i = 1; + else + i = 0; + currSpecies = GetMonData(&party[monId], MON_DATA_SPECIES, NULL); + for (; i < ARRAY_COUNT(species); i++) + { if (currSpecies == species[i][0]) { SetMonData(&party[monId], MON_DATA_SPECIES, &species[i][1]);