diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 65b2b08d5f..e690fabff6 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -196,110 +196,110 @@ static const u16 sMapPopUpTilesPalette_BW_White[16] = INCBIN_U16("graphics/map_p static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping_BW[] = { - [MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_DEWFORD_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_LAVARIDGE_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_FALLARBOR_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_VERDANTURF_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_PACIFIDLOG_TOWN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_PETALBURG_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SLATEPORT_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MAUVILLE_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_RUSTBORO_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_FORTREE_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_LILYCOVE_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MOSSDEEP_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SOOTOPOLIS_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_EVER_GRANDE_CITY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_101] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_102] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_103] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_104] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_105] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_106] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_107] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_108] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_109] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_110] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_111] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_112] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_113] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_114] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_115] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_116] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_117] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_118] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_119] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_120] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_121] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_122] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_123] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_124] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_125] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_126] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_127] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_128] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_129] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_130] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_131] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_132] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_133] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ROUTE_134] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_124] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_126] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_127] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_SOOTOPOLIS] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_GRANITE_CAVE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MT_CHIMNEY] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SAFARI_ZONE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_BATTLE_FRONTIER] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_PETALBURG_WOODS] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_RUSTURF_TUNNEL] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ABANDONED_SHIP] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_NEW_MAUVILLE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_METEOR_FALLS] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_METEOR_FALLS2] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MT_PYRE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_AQUA_HIDEOUT_OLD] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SHOAL_CAVE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_VICTORY_ROAD] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MIRAGE_ISLAND] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_CAVE_OF_ORIGIN] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SOUTHERN_ISLAND] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_FIERY_PATH] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_FIERY_PATH2] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_JAGGED_PASS] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_JAGGED_PASS2] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SEALED_CHAMBER] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_SEALED_CHAMBER] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SCORCHED_SLAB] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ISLAND_CAVE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_DESERT_RUINS] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ANCIENT_TOMB] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_INSIDE_OF_TRUCK] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SKY_PILLAR] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_SECRET_BASE] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_DYNAMIC] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_AQUA_HIDEOUT - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MAGMA_HIDEOUT - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MIRAGE_TOWER - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_BIRTH_ISLAND - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_FARAWAY_ISLAND - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ARTISAN_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_105 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_125 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_UNDERWATER_129 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_DESERT_UNDERPASS - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_NAVEL_ROCK - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, - [MAPSEC_TRAINER_HILL - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_DEFAULT, + [MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_DEWFORD_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_LAVARIDGE_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_FALLARBOR_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_VERDANTURF_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_PACIFIDLOG_TOWN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_PETALBURG_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SLATEPORT_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MAUVILLE_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_RUSTBORO_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_FORTREE_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_LILYCOVE_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MOSSDEEP_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SOOTOPOLIS_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_EVER_GRANDE_CITY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_101] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_102] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_103] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_104] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_105] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_106] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_107] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_108] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_109] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_110] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_111] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_112] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_113] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_114] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_115] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_116] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_117] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_118] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_119] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_120] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_121] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_122] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_123] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_124] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_125] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_126] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_127] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_128] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_129] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_130] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_131] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_132] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_133] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ROUTE_134] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_124] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_126] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_127] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_SOOTOPOLIS] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_GRANITE_CAVE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MT_CHIMNEY] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SAFARI_ZONE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_BATTLE_FRONTIER] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_PETALBURG_WOODS] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_RUSTURF_TUNNEL] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ABANDONED_SHIP] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_NEW_MAUVILLE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_METEOR_FALLS] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_METEOR_FALLS2] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MT_PYRE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_AQUA_HIDEOUT_OLD] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SHOAL_CAVE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_VICTORY_ROAD] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MIRAGE_ISLAND] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_CAVE_OF_ORIGIN] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SOUTHERN_ISLAND] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_FIERY_PATH] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_FIERY_PATH2] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_JAGGED_PASS] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_JAGGED_PASS2] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SEALED_CHAMBER] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_SEALED_CHAMBER] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SCORCHED_SLAB] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ISLAND_CAVE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_DESERT_RUINS] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ANCIENT_TOMB] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_INSIDE_OF_TRUCK] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SKY_PILLAR] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_SECRET_BASE] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_DYNAMIC] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_AQUA_HIDEOUT - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MAGMA_HIDEOUT - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MIRAGE_TOWER - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_BIRTH_ISLAND - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_FARAWAY_ISLAND - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ARTISAN_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_105 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_125 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_UNDERWATER_129 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_DESERT_UNDERPASS - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_NAVEL_ROCK - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, + [MAPSEC_TRAINER_HILL - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_BW_DEFAULT, }; static const u8 sText_PyramidFloor1[] = _("PYRAMID FLOOR 1"); @@ -617,7 +617,7 @@ static void LoadMapNamePopUpWindowBg(void) popUpThemeId = sRegionMapSectionId_To_PopUpThemeIdMapping_BW[regionMapSectionId]; switch (popUpThemeId) { - // add additional themes as cases here + // add additional gen 5-style pop-up themes as cases here case MAPPOPUP_THEME_BW_DEFAULT: if (MAP_POPUP_BW_COLOR == MAP_POPUP_BW_COLOR_WHITE) LoadPalette(sMapPopUpTilesPalette_BW_White, BG_PLTT_ID(14), sizeof(sMapPopUpTilesPalette_BW_White));