From 80af708958bdf166cfab680a111a67a29dc3da26 Mon Sep 17 00:00:00 2001 From: TheXaman Date: Thu, 11 Feb 2021 18:58:26 +0100 Subject: [PATCH] Fixed EVO_SPECIFIC_MAP (PE from rhh), huge thanks to "Spherical Ice" --- src/pokedex.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pokedex.c b/src/pokedex.c index 560d64dbba..02f7d69301 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -7180,7 +7180,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species) int i; #ifdef POKEMON_EXPANSION int j; - u16 currentMap; + const struct MapHeader *mapHeader; #endif 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); break; case EVO_SPECIFIC_MAP: - //currentMap = ((gSaveBlock1Ptr->location.mapGroup) << 8 | gSaveBlock1Ptr->location.mapNum); - GetMapName(gStringVar2, gEvolutionTable[species][i].param, 0); + mapHeader = Overworld_GetMapHeaderByGroupAndId(gEvolutionTable[species][i].param >> 8, gEvolutionTable[species][i].param & 0xFF); + GetMapName(gStringVar2, mapHeader->regionMapSectionId, 0); targetSpecies = gEvolutionTable[species][i].targetSpecies; handleTargetSpeciesPrint(taskId, targetSpecies, base_x, base_y, base_offset, base_i); //evolution mon name StringExpandPlaceholders(gStringVar4, gText_EVO_SPECIFIC_MAP );