diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
| commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
| tree | db4ae87659baced2022e440109306266c1c80e3b /src/map_name_popup.c | |
| parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
| parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) | |
Merge branch 'master' into tag-none
Diffstat (limited to 'src/map_name_popup.c')
| -rw-r--r-- | src/map_name_popup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map_name_popup.c b/src/map_name_popup.c index cd92bbac1..97b02acf6 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -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); |