Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed EVO_SPECIFIC_MAP (PE from rhh), huge thanks to "Spherical Ice"

Browse Source
This commit is contained in:
TheXaman 2021-02-11 18:58:26 +01:00
parent 1b3b717248
commit 80af708958
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pokedex.c
View File

@ -7180,7 +7180,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species)
int i; int i;
#ifdef POKEMON_EXPANSION #ifdef POKEMON_EXPANSION
int j; int j;
u16 currentMap; const struct MapHeader *mapHeader;
#endif #endif
u16 targetSpecies = 0; u16 targetSpecies = 0;
@ -7446,8 +7446,8 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species)
PrintInfoScreenTextSmall(gStringVar4, base_x+base_x_offset, base_y + base_offset*base_i); PrintInfoScreenTextSmall(gStringVar4, base_x+base_x_offset, base_y + base_offset*base_i);
break; break;
case EVO_SPECIFIC_MAP: case EVO_SPECIFIC_MAP:
//currentMap = ((gSaveBlock1Ptr->location.mapGroup) << 8 | gSaveBlock1Ptr->location.mapNum); mapHeader = Overworld_GetMapHeaderByGroupAndId(gEvolutionTable[species][i].param >> 8, gEvolutionTable[species][i].param & 0xFF);
GetMapName(gStringVar2, gEvolutionTable[species][i].param, 0); GetMapName(gStringVar2, mapHeader->regionMapSectionId, 0);
targetSpecies = gEvolutionTable[species][i].targetSpecies; targetSpecies = gEvolutionTable[species][i].targetSpecies;
handleTargetSpeciesPrint(taskId, targetSpecies, base_x, base_y, base_offset, base_i); //evolution mon name handleTargetSpeciesPrint(taskId, targetSpecies, base_x, base_y, base_offset, base_i); //evolution mon name
StringExpandPlaceholders(gStringVar4, gText_EVO_SPECIFIC_MAP ); StringExpandPlaceholders(gStringVar4, gText_EVO_SPECIFIC_MAP );