From 59fea06badaf640b4428ab9c2a2598b8e2ad61d9 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 25 Apr 2022 11:19:13 -0400 Subject: [PATCH] =?UTF-8?q?Fixed=20compile=20when=20using=20both=20Pok?= =?UTF-8?q?=C3=A9mon=20expansion=20and=20randomizer/challenges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pokedex.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index d61a8e6853..4b881d094f 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -7982,15 +7982,16 @@ static u8 PrintPreEvolutions(u8 taskId, u16 species) u16 preEvolutionTwo = 0; u8 numPreEvolutions = 0; + #ifdef POKEMON_EXPANSION + bool8 isMega = FALSE; + sPokedexView->sEvoScreenData.isMega = FALSE; + #endif + #ifdef TX_RANDOMIZER_AND_CHALLENGES if (gSaveBlock1Ptr->tx_Random_Evolutions || gSaveBlock1Ptr->tx_Random_EvolutionMethods) return 0; #endif - #ifdef POKEMON_EXPANSION - bool8 isMega = FALSE; - sPokedexView->sEvoScreenData.isMega = FALSE; - #endif //Calculate previous evolution for (i = 0; i < NUM_SPECIES; i++)