mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Merge pull request #1504 from LOuroboros/staticRegionMapSecIdToPopUpThemeIdMapping
Renamed gRegionMapSectionId_To_PopUpThemeIdMapping
This commit is contained in:
commit
09fd4fc4c5
@ -68,7 +68,7 @@ static const u16 sMapPopUp_PaletteTable[][16] =
|
||||
|
||||
static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/interface/map_popup/underwater.gbapal");
|
||||
|
||||
static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
|
||||
static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
|
||||
{
|
||||
[MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_WOOD,
|
||||
[MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_WOOD,
|
||||
@ -378,7 +378,7 @@ static void LoadMapNamePopUpWindowBg(void)
|
||||
else
|
||||
regionMapSectionId = 0; // Discard kanto region sections;
|
||||
}
|
||||
popUpThemeId = gRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
|
||||
popUpThemeId = sRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
|
||||
|
||||
LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), sMapPopUp_OutlineTable[popUpThemeId], 0x400, 0x21D);
|
||||
CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame);
|
||||
|
Loading…
Reference in New Issue
Block a user