From 406f87c534090825e668935b1ed5efaddca61275 Mon Sep 17 00:00:00 2001
From: RavePossum <ravepossum@proton.me>
Date: Mon, 15 Apr 2024 15:26:43 -0400
Subject: [PATCH] first stab at making configable BW map pop-ups in expansion

---
 graphics/map_popup/bw/black.pal        |  19 ++
 graphics/map_popup/bw/bw_primary.png   | Bin 0 -> 9264 bytes
 graphics/map_popup/bw/bw_secondary.png | Bin 0 -> 9265 bytes
 graphics/map_popup/bw/white.pal        |  19 ++
 include/config/map_name_popup.h        |  23 +++
 include/field_weather.h                |   1 +
 include/menu.h                         |   5 +
 include/rtc.h                          |   1 +
 include/strings.h                      |   4 +
 src/field_weather.c                    |   8 +
 src/map_name_popup.c                   | 260 +++++++++++++++++++++++--
 src/menu.c                             |  56 ++++++
 src/rtc.c                              |  31 +++
 src/strings.c                          |   2 +
 14 files changed, 410 insertions(+), 19 deletions(-)
 create mode 100644 graphics/map_popup/bw/black.pal
 create mode 100644 graphics/map_popup/bw/bw_primary.png
 create mode 100644 graphics/map_popup/bw/bw_secondary.png
 create mode 100644 graphics/map_popup/bw/white.pal
 create mode 100644 include/config/map_name_popup.h

diff --git a/graphics/map_popup/bw/black.pal b/graphics/map_popup/bw/black.pal
new file mode 100644
index 0000000000..696191f6ba
--- /dev/null
+++ b/graphics/map_popup/bw/black.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+255 255 255
+41 49 90
+0 0 0
+238 230 238
+189 180 197
+139 139 164
+90 90 123
+41 49 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/map_popup/bw/bw_primary.png b/graphics/map_popup/bw/bw_primary.png
new file mode 100644
index 0000000000000000000000000000000000000000..72602052fe3e30f2d01371a5c526bc34e08f3fb0
GIT binary patch
literal 9264
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

literal 0
HcmV?d00001

diff --git a/graphics/map_popup/bw/bw_secondary.png b/graphics/map_popup/bw/bw_secondary.png
new file mode 100644
index 0000000000000000000000000000000000000000..39ad7d2e062cefcbb1adf1ef11717580a73546e9
GIT binary patch
literal 9265
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

literal 0
HcmV?d00001

diff --git a/graphics/map_popup/bw/white.pal b/graphics/map_popup/bw/white.pal
new file mode 100644
index 0000000000..4b72f67ecb
--- /dev/null
+++ b/graphics/map_popup/bw/white.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+0 0 0
+158 158 158
+0 0 0
+238 230 238
+189 180 197
+139 139 164
+90 90 123
+41 49 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/include/config/map_name_popup.h b/include/config/map_name_popup.h
new file mode 100644
index 0000000000..b8a9d8eb87
--- /dev/null
+++ b/include/config/map_name_popup.h
@@ -0,0 +1,23 @@
+#ifndef GUARD_CONFIG_MAP_POPUP_H
+#define GUARD_CONFIG_MAP_POPUP_H
+
+// General map pop-up config
+#define MAP_POPUP_GENERATION        GEN_3   // Different generations display location names in overworld pop-ups differently
+                                            // current vaid choices are GEN_3 and GEN_5
+
+// Gen 5 specific pop-up config
+// Constants
+#define MAP_POPUP_BW_TIME_NONE      0   // don't show the time
+#define MAP_POPUP_BW_TIME_12_HR     1   // use 12 hour (AM/PM) time
+#define MAP_POPUP_BW_TIME_24_HR     2   // use 24 hour time
+
+#define MAP_POPUP_BW_COLOR_BLACK    0
+#define MAP_POPUP_BW_COLOR_WHITE    1
+
+// Configuration
+#define MAP_POPUP_BW_COLOR          MAP_POPUP_BW_COLOR_BLACK    // Black 2 and White 2 use different colors for their map pop-ups           
+#define MAP_POPUP_BW_TIME_MODE      MAP_POPUP_BW_TIME_NONE      // determines what type of time is shown
+#define MAP_POPUP_BW_ALPHA_BLEND    FALSE                       // enables alpha blending/transparency for the pop-ups
+                                                                // mostly intended to be used with the black color option
+
+#endif // GUARD_CONFIG_MAP_POPUP_H
\ No newline at end of file
diff --git a/include/field_weather.h b/include/field_weather.h
index b354d500e3..eda06834bc 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -170,6 +170,7 @@ void SetWeatherScreenFadeOut(void);
 void SetWeatherPalStateIdle(void);
 void PreservePaletteInWeather(u8 preservedPalIndex);
 void ResetPreservedPalettesInWeather(void);
+bool8 IsWeatherAlphaBlend(void);
 
 // field_weather_effect.c
 void Clouds_InitVars(void);
diff --git a/include/menu.h b/include/menu.h
index 0b0a42423d..fac4ef1b65 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -41,6 +41,7 @@ struct MenuAction
 };
 
 extern const u16 gStandardMenuPalette[];
+extern EWRAM_DATA u8 gPopupTaskId;
 
 void FreeAllOverworldWindowBuffers(void);
 void InitStandardTextBoxWindows(void);
@@ -124,5 +125,9 @@ void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonP
 void EraseYesNoWindow(void);
 void PrintMenuActionTextsAtPos(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
 void Menu_LoadStdPal(void);
+u8 AddSecondaryPopUpWindow(void);
+u8 GetSecondaryPopUpWindowId(void);
+void RemoveSecondaryPopUpWindow(void);
+void HBlankCB_DoublePopupWindow(void);
 
 #endif // GUARD_MENU_H
diff --git a/include/rtc.h b/include/rtc.h
index 9882d702b6..2645458f68 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -118,5 +118,6 @@ void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds);
 void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
 u32 RtcGetMinuteCount(void);
 u32 RtcGetLocalDayCount(void);
+void FormatDecimalTimeWithoutSeconds(u8 *dest, s8 hour, s8 minute, bool8 is24Hour);
 
 #endif // GUARD_RTC_UTIL_H
diff --git a/include/strings.h b/include/strings.h
index af0ee0bbba..359184cbf4 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -3061,4 +3061,8 @@ extern const u8 gText_BasePointsResetToZero[];
 extern const u8 gText_Fertilize[];
 extern const u8 gText_PlantBerry[];
 
+// Map name pop-up
+extern const u8 gText_AM[];
+extern const u8 gText_PM[];
+
 #endif // GUARD_STRINGS_H
diff --git a/src/field_weather.c b/src/field_weather.c
index 118db10bed..0466ab4062 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -1104,3 +1104,11 @@ void ResetPreservedPalettesInWeather(void)
 {
     sPaletteColorMapTypes = sBasePaletteColorMapTypes;
 }
+
+bool8 IsWeatherAlphaBlend(void)
+{
+    return gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL || 
+           gWeatherPtr->currWeather == WEATHER_FOG_DIAGONAL   ||
+           gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES ||
+           gWeatherPtr->currWeather == WEATHER_UNDERWATER;
+}
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index 725bb80838..cfde934f73 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -2,12 +2,16 @@
 #include "battle_pyramid.h"
 #include "bg.h"
 #include "event_data.h"
+#include "field_weather.h"
 #include "gpu_regs.h"
+#include "graphics.h"
 #include "international_string_util.h"
+#include "main.h"
 #include "menu.h"
 #include "map_name_popup.h"
 #include "palette.h"
 #include "region_map.h"
+#include "rtc.h"
 #include "start_menu.h"
 #include "string_util.h"
 #include "task.h"
@@ -16,7 +20,142 @@
 #include "constants/layouts.h"
 #include "constants/region_map_sections.h"
 #include "constants/weather.h"
+#include "config/map_name_popup.h"
+#include "config.h"
 
+#if MAP_POPUP_GENERATION != GEN_3 && MAP_POPUP_GENERATION != GEN_5
+#error "Invalid choice for MAP_POPUP_GENERATION, must be one of [GEN_3, GEN_5]"
+#endif
+
+// static functions
+static void Task_MapNamePopUpWindow(u8 taskId);
+static void ShowMapNamePopUpWindow(void);
+static void LoadMapNamePopUpWindowBg(void);
+
+// EWRAM
+EWRAM_DATA u8 gPopupTaskId = 0;
+
+#if MAP_POPUP_GENERATION == GEN_5
+// enums
+enum MapPopUp_Themes
+{
+    MAPPOPUP_THEME_DEFAULT,
+};
+
+// .rodata
+static const u8 sMapPopUpTilesPrimary_BW[] = INCBIN_U8("graphics/map_popup/bw/bw_primary.4bpp");
+static const u8 sMapPopUpTilesSecondary_BW[] = INCBIN_U8("graphics/map_popup/bw/bw_secondary.4bpp");
+static const u16 sMapPopUpTilesPalette_BW_Black[16] = INCBIN_U16("graphics/map_popup/bw/black.gbapal");
+static const u16 sMapPopUpTilesPalette_BW_White[16] = INCBIN_U16("graphics/map_popup/bw/white.gbapal");
+
+static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
+{
+    [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,
+};
+#else
 // enums
 enum MapPopUp_Themes
 {
@@ -28,14 +167,6 @@ enum MapPopUp_Themes
     MAPPOPUP_THEME_STONE2,
 };
 
-// static functions
-static void Task_MapNamePopUpWindow(u8 taskId);
-static void ShowMapNamePopUpWindow(void);
-static void LoadMapNamePopUpWindowBg(void);
-
-// EWRAM
-static EWRAM_DATA u8 sPopupTaskId = 0;
-
 // .rodata
 static const u8 sMapPopUp_Table[][960] =
 {
@@ -176,6 +307,7 @@ static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
     [MAPSEC_NAVEL_ROCK - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
     [MAPSEC_TRAINER_HILL - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_MARBLE
 };
+#endif
 
 static const u8 sText_PyramidFloor1[] = _("PYRAMID FLOOR 1");
 static const u8 sText_PyramidFloor2[] = _("PYRAMID FLOOR 2");
@@ -216,7 +348,7 @@ enum {
     STATE_PRINT, // For some reason the first state is numerically last.
 };
 
-#define POPUP_OFFSCREEN_Y  40
+#define POPUP_OFFSCREEN_Y  ((MAP_POPUP_GENERATION == GEN_5) ? 24 : 40)
 #define POPUP_SLIDE_SPEED  2
 
 #define tState         data[0]
@@ -232,18 +364,26 @@ void ShowMapNamePopup(void)
         if (!FuncIsActiveTask(Task_MapNamePopUpWindow))
         {
             // New pop up window
-            sPopupTaskId = CreateTask(Task_MapNamePopUpWindow, 90);
+        #if MAP_POPUP_GENERATION == GEN_5
+            gPopupTaskId = CreateTask(Task_MapNamePopUpWindow, 100);
+
+            if (MAP_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend())
+                SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND);
+        #else
+            gPopupTaskId = CreateTask(Task_MapNamePopUpWindow, 90);
             SetGpuReg(REG_OFFSET_BG0VOFS, POPUP_OFFSCREEN_Y);
-            gTasks[sPopupTaskId].tState = STATE_PRINT;
-            gTasks[sPopupTaskId].tYOffset = POPUP_OFFSCREEN_Y;
+        #endif
+
+            gTasks[gPopupTaskId].tState = STATE_PRINT;
+            gTasks[gPopupTaskId].tYOffset = POPUP_OFFSCREEN_Y;
         }
         else
         {
             // There's already a pop up window running.
             // Hurry the old pop up offscreen so the new one can appear.
-            if (gTasks[sPopupTaskId].tState != STATE_SLIDE_OUT)
-                gTasks[sPopupTaskId].tState = STATE_SLIDE_OUT;
-            gTasks[sPopupTaskId].tIncomingPopUp = TRUE;
+            if (gTasks[gPopupTaskId].tState != STATE_SLIDE_OUT)
+                gTasks[gPopupTaskId].tState = STATE_SLIDE_OUT;
+            gTasks[gPopupTaskId].tIncomingPopUp = TRUE;
         }
     }
 }
@@ -261,6 +401,10 @@ static void Task_MapNamePopUpWindow(u8 taskId)
             task->tState = STATE_SLIDE_IN;
             task->tPrintTimer = 0;
             ShowMapNamePopUpWindow();
+        #if MAP_POPUP_GENERATION == GEN_5
+            EnableInterrupts(INTR_FLAG_HBLANK);
+            SetHBlankCallback(HBlankCB_DoublePopupWindow);
+        #endif
         }
         break;
     case STATE_SLIDE_IN:
@@ -270,7 +414,7 @@ static void Task_MapNamePopUpWindow(u8 taskId)
         {
             task->tYOffset = 0;
             task->tState = STATE_WAIT;
-            gTasks[sPopupTaskId].data[1] = 0;
+            gTasks[gPopupTaskId].data[1] = 0;
         }
         break;
     case STATE_WAIT:
@@ -304,13 +448,18 @@ static void Task_MapNamePopUpWindow(u8 taskId)
         break;
     case STATE_ERASE:
         ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
+    #if MAP_POPUP_GENERATION == GEN_5
+        ClearStdWindowAndFrame(GetSecondaryPopUpWindowId(), TRUE);
+    #endif
         task->tState = STATE_END;
         break;
     case STATE_END:
         HideMapNamePopUpWindow();
         return;
     }
+#if MAP_POPUP_GENERATION != GEN_5
     SetGpuReg(REG_OFFSET_BG0VOFS, task->tYOffset);
+#endif
 }
 
 void HideMapNamePopUpWindow(void)
@@ -324,8 +473,28 @@ void HideMapNamePopUpWindow(void)
             ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
             RemoveMapNamePopUpWindow();
         }
+
+    #if MAP_POPUP_GENERATION == GEN_5
+    #ifdef UBFIX
+        if (GetSecondaryPopUpWindowId() != WINDOW_NONE)
+    #endif // UBFIX   
+        {
+            ClearStdWindowAndFrame(GetSecondaryPopUpWindowId(), TRUE);
+            RemoveSecondaryPopUpWindow();
+        }
+
+        DisableInterrupts(INTR_FLAG_HBLANK);
+        SetHBlankCallback(NULL);
+
+        if (MAP_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend())
+        {
+            SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ);
+            SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_EFFECT_BLEND);
+            SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 10));
+        }
+    #endif
         SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0);
-        DestroyTask(sPopupTaskId);
+        DestroyTask(gPopupTaskId);
     }
 }
 
@@ -333,8 +502,12 @@ static void ShowMapNamePopUpWindow(void)
 {
     u8 mapDisplayHeader[24];
     u8 *withoutPrefixPtr;
-    u8 x;
     const u8 *mapDisplayHeaderSource;
+#if MAP_POPUP_GENERATION == GEN_5
+    u8 mapNamePopUpWindowId, secondaryPopUpWindowId;
+#else
+    u8 x;
+#endif
 
     if (InBattlePyramid())
     {
@@ -355,16 +528,43 @@ static void ShowMapNamePopUpWindow(void)
         withoutPrefixPtr = &(mapDisplayHeader[3]);
         GetMapName(withoutPrefixPtr, gMapHeader.regionMapSectionId, 0);
     }
+
+#if MAP_POPUP_GENERATION == GEN_5
+    if (MAP_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend())
+        SetGpuRegBits(REG_OFFSET_WININ, WININ_WIN0_CLR);
+
+    mapNamePopUpWindowId = AddMapNamePopUpWindow();
+    secondaryPopUpWindowId = AddSecondaryPopUpWindow();
+#else
     AddMapNamePopUpWindow();
+#endif
+
     LoadMapNamePopUpWindowBg();
-    x = GetStringCenterAlignXOffset(FONT_NARROW, withoutPrefixPtr, 80);
+
     mapDisplayHeader[0] = EXT_CTRL_CODE_BEGIN;
     mapDisplayHeader[1] = EXT_CTRL_CODE_HIGHLIGHT;
     mapDisplayHeader[2] = TEXT_COLOR_TRANSPARENT;
+
+#if MAP_POPUP_GENERATION == GEN_5
+    AddTextPrinterParameterized(mapNamePopUpWindowId, FONT_SHORT, mapDisplayHeader, 8, 2, TEXT_SKIP_DRAW, NULL);
+    
+    if (MAP_POPUP_BW_TIME_MODE != MAP_POPUP_BW_TIME_NONE)
+    {
+        RtcCalcLocalTime();
+        FormatDecimalTimeWithoutSeconds(withoutPrefixPtr, gLocalTime.hours, gLocalTime.minutes, MAP_POPUP_BW_TIME_MODE == MAP_POPUP_BW_TIME_24_HR);
+        AddTextPrinterParameterized(secondaryPopUpWindowId, FONT_SMALL, mapDisplayHeader, GetStringRightAlignXOffset(FONT_SMALL, mapDisplayHeader, DISPLAY_WIDTH) - 5, 8, TEXT_SKIP_DRAW, NULL);
+    }
+
+    CopyWindowToVram(mapNamePopUpWindowId, COPYWIN_FULL);
+    CopyWindowToVram(secondaryPopUpWindowId, COPYWIN_FULL);
+#else
+    x = GetStringCenterAlignXOffset(FONT_NARROW, withoutPrefixPtr, 80);
     AddTextPrinterParameterized(GetMapNamePopUpWindowId(), FONT_NARROW, mapDisplayHeader, x, 3, TEXT_SKIP_DRAW, NULL);
     CopyWindowToVram(GetMapNamePopUpWindowId(), COPYWIN_FULL);
+#endif
 }
 
+#if MAP_POPUP_GENERATION != GEN_5
 #define TILE_TOP_EDGE_START 0x21D
 #define TILE_TOP_EDGE_END   0x228
 #define TILE_LEFT_EDGE_TOP  0x229
@@ -396,12 +596,16 @@ static void DrawMapNamePopUpFrame(u8 bg, u8 x, u8 y, u8 deltaX, u8 deltaY, u8 un
     for (i = 0; i < 1 + TILE_BOT_EDGE_END - TILE_BOT_EDGE_START; i++)
         FillBgTilemapBufferRect(bg, TILE_BOT_EDGE_START + i, i - 1 + x, y + deltaY, 1, 1, 14);
 }
+#endif
 
 static void LoadMapNamePopUpWindowBg(void)
 {
     u8 popUpThemeId;
     u8 popupWindowId = GetMapNamePopUpWindowId();
     u16 regionMapSectionId = gMapHeader.regionMapSectionId;
+#if MAP_POPUP_GENERATION == GEN_5
+    u8 secondaryPopUpWindowId = GetSecondaryPopUpWindowId();
+#endif
 
     if (regionMapSectionId >= KANTO_MAPSEC_START)
     {
@@ -412,6 +616,23 @@ static void LoadMapNamePopUpWindowBg(void)
     }
     popUpThemeId = sRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
 
+#if MAP_POPUP_GENERATION == GEN_5
+    switch (popUpThemeId) {
+        // add more themes as case statements here
+        default:
+            if (MAP_POPUP_BW_COLOR == MAP_POPUP_BW_COLOR_WHITE)
+                LoadPalette(sMapPopUpTilesPalette_BW_White, BG_PLTT_ID(14), sizeof(sMapPopUpTilesPalette_BW_White));
+            else
+                LoadPalette(sMapPopUpTilesPalette_BW_Black, BG_PLTT_ID(14), sizeof(sMapPopUpTilesPalette_BW_Black));
+
+            CopyToWindowPixelBuffer(popupWindowId, sMapPopUpTilesPrimary_BW, sizeof(sMapPopUpTilesPrimary_BW), 0);
+            CopyToWindowPixelBuffer(secondaryPopUpWindowId, sMapPopUpTilesSecondary_BW, sizeof(sMapPopUpTilesSecondary_BW), 0);
+            break;
+    }
+
+    PutWindowTilemap(popupWindowId);
+    PutWindowTilemap(secondaryPopUpWindowId);
+#else
     LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), sMapPopUp_OutlineTable[popUpThemeId], 0x400, 0x21D);
     CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame);
     PutWindowTilemap(popupWindowId);
@@ -420,4 +641,5 @@ static void LoadMapNamePopUpWindowBg(void)
     else
         LoadPalette(sMapPopUp_PaletteTable[popUpThemeId], BG_PLTT_ID(14), sizeof(sMapPopUp_PaletteTable[0]));
     BlitBitmapToWindow(popupWindowId, sMapPopUp_Table[popUpThemeId], 0, 0, 80, 24);
+#endif
 }
diff --git a/src/menu.c b/src/menu.c
index a6bd9ae2bc..9c257d5521 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -4,8 +4,10 @@
 #include "blit.h"
 #include "dma3.h"
 #include "event_data.h"
+#include "field_weather.h"
 #include "graphics.h"
 #include "main.h"
+#include "map_name_popup.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "palette.h"
@@ -18,6 +20,7 @@
 #include "task.h"
 #include "text_window.h"
 #include "window.h"
+#include "config/map_name_popup.h"
 #include "constants/songs.h"
 
 #define DLG_WINDOW_PALETTE_NUM 15
@@ -62,6 +65,9 @@ static void task_free_buf_after_copying_tile_data_to_vram(u8 taskId);
 
 static EWRAM_DATA u8 sStartMenuWindowId = 0;
 static EWRAM_DATA u8 sMapNamePopupWindowId = 0;
+#if MAP_POPUP_GENERATION == GEN_5
+static EWRAM_DATA u8 sSecondaryPopupWindowId = 0;
+#endif
 static EWRAM_DATA struct Menu sMenu = {0};
 static EWRAM_DATA u16 sTileNum = 0;
 static EWRAM_DATA u8 sPaletteNum = 0;
@@ -145,6 +151,9 @@ void InitStandardTextBoxWindows(void)
     InitWindows(sStandardTextBox_WindowTemplates);
     sStartMenuWindowId = WINDOW_NONE;
     sMapNamePopupWindowId = WINDOW_NONE;
+#if MAP_POPUP_GENERATION == GEN_5
+    sSecondaryPopupWindowId = WINDOW_NONE;
+#endif
 }
 
 void FreeAllOverworldWindowBuffers(void)
@@ -521,7 +530,13 @@ static u16 UNUSED GetStandardFrameBaseTileNum(void)
 u8 AddMapNamePopUpWindow(void)
 {
     if (sMapNamePopupWindowId == WINDOW_NONE)
+    {
+    #if MAP_POPUP_GENERATION == GEN_5
+        sMapNamePopupWindowId = AddWindowParameterized(0, 0, 0, 30, 3, 14, 0x107);
+    #else
         sMapNamePopupWindowId = AddWindowParameterized(0, 1, 1, 10, 3, 14, 0x107);
+    #endif
+    }
     return sMapNamePopupWindowId;
 }
 
@@ -2145,3 +2160,44 @@ void BufferSaveMenuText(u8 textId, u8 *dest, u8 color)
             break;
     }
 }
+
+// BW map pop-ups
+#if MAP_POPUP_GENERATION == GEN_5
+u8 AddSecondaryPopUpWindow(void)
+{
+    if (sSecondaryPopupWindowId == WINDOW_NONE)
+        sSecondaryPopupWindowId = AddWindowParameterized(0, 0, 17, 30, 3, 14, 0x161);
+    return sSecondaryPopupWindowId;
+}
+
+u8 GetSecondaryPopUpWindowId(void)
+{
+    return sSecondaryPopupWindowId;
+}
+
+void RemoveSecondaryPopUpWindow(void)
+{
+    if (sSecondaryPopupWindowId != WINDOW_NONE)
+    {
+        RemoveWindow(sSecondaryPopupWindowId);
+        sSecondaryPopupWindowId = WINDOW_NONE;
+    }
+}
+
+void HBlankCB_DoublePopupWindow(void)
+{
+    u16 offset = gTasks[gPopupTaskId].data[2];
+    u16 scanline = REG_VCOUNT;
+
+    if (scanline < 80 || scanline > 160)
+    {
+        REG_BG0VOFS = offset;
+        if(MAP_POPUP_BW_ALPHA_BLEND && !IsWeatherAlphaBlend())
+            REG_BLDALPHA = BLDALPHA_BLEND(15, 5);
+    }
+    else
+    {
+        REG_BG0VOFS = 512 - offset;
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/rtc.c b/src/rtc.c
index a90c9aa89b..c77d7dd9fd 100644
--- a/src/rtc.c
+++ b/src/rtc.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "rtc.h"
 #include "string_util.h"
+#include "strings.h"
 #include "text.h"
 
 // iwram bss
@@ -364,3 +365,33 @@ u32 RtcGetLocalDayCount(void)
 {
     return RtcGetDayCount(&sRtc);
 }
+
+void FormatDecimalTimeWithoutSeconds(u8 *txtPtr, s8 hour, s8 minute, bool8 is24Hour)
+{
+    if (is24Hour)
+    {
+        txtPtr = ConvertIntToDecimalStringN(txtPtr, hour, STR_CONV_MODE_LEADING_ZEROS, 2);
+        *txtPtr++ = CHAR_COLON;
+        txtPtr = ConvertIntToDecimalStringN(txtPtr, minute, STR_CONV_MODE_LEADING_ZEROS, 2);
+    }
+    else
+    {
+        if (hour == 0)
+            txtPtr = ConvertIntToDecimalStringN(txtPtr, 12, STR_CONV_MODE_LEADING_ZEROS, 2);
+        else if (hour < 13)
+            txtPtr = ConvertIntToDecimalStringN(txtPtr, hour, STR_CONV_MODE_LEADING_ZEROS, 2);
+        else
+            txtPtr = ConvertIntToDecimalStringN(txtPtr, hour - 12, STR_CONV_MODE_LEADING_ZEROS, 2);
+
+        *txtPtr++ = CHAR_COLON;
+        txtPtr = ConvertIntToDecimalStringN(txtPtr, minute, STR_CONV_MODE_LEADING_ZEROS, 2);
+        txtPtr = StringAppend(txtPtr, gText_Space);
+        if (hour < 12)
+            txtPtr = StringAppend(txtPtr, gText_AM);
+        else
+            txtPtr = StringAppend(txtPtr, gText_PM);
+    }
+
+    *txtPtr++ = EOS;
+    *txtPtr = EOS;
+}
diff --git a/src/strings.c b/src/strings.c
index 4fde380240..a28489dd91 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1856,3 +1856,5 @@ const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTI
 const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}'s base points\nwere all reset to zero!{PAUSE_UNTIL_PRESS}");
 const u8 gText_Fertilize[] = _("FERTILIZE");
 const u8 gText_PlantBerry[] = _("PLANT BERRY");
+const u8 gText_AM[] = _("AM");
+const u8 gText_PM[] = _("PM");