atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #22 from AsparagusEduardo/tx_pokedexFix

Browse source 
Fixed HGSS Pokédex compile when using both Pokémon Expansion and randomizer/challenges
This commit is contained in:
TheXaman 2022-04-25 17:23:53 +02:00 committed by GitHub
commit 599153bed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/pokedex.c
View file

@ -7982,15 +7982,16 @@ static u8 PrintPreEvolutions(u8 taskId, u16 species)
u16 preEvolutionTwo = 0; u16 preEvolutionTwo = 0;
u8 numPreEvolutions = 0; u8 numPreEvolutions = 0;
#ifdef POKEMON_EXPANSION
bool8 isMega = FALSE;
sPokedexView->sEvoScreenData.isMega = FALSE;
#endif
#ifdef TX_RANDOMIZER_AND_CHALLENGES #ifdef TX_RANDOMIZER_AND_CHALLENGES
if (gSaveBlock1Ptr->tx_Random_Evolutions || gSaveBlock1Ptr->tx_Random_EvolutionMethods) if (gSaveBlock1Ptr->tx_Random_Evolutions || gSaveBlock1Ptr->tx_Random_EvolutionMethods)
return 0; return 0;
#endif #endif
#ifdef POKEMON_EXPANSION
bool8 isMega = FALSE;
sPokedexView->sEvoScreenData.isMega = FALSE;
#endif
//Calculate previous evolution //Calculate previous evolution
for (i = 0; i < NUM_SPECIES; i++) for (i = 0; i < NUM_SPECIES; i++)