pret · lhearachel · Jan 31, 2025 · Jan 4, 2025 · Jan 8, 2025 · Jan 8, 2025
diff --git a/include/field/field_system_sub2_t.h b/include/field/field_system_sub2_t.h
@@ -4,17 +4,17 @@
 #include "struct_decls/struct_02055CBC_decl.h"
 
 #include "overlay005/hblank_system.h"
+#include "overlay005/map_name_popup.h"
 #include "overlay005/struct_ov5_021D1A94_decl.h"
 #include "overlay005/struct_ov5_021D5CB0_decl.h"
 #include "overlay005/struct_ov5_021D5EF8_decl.h"
-#include "overlay005/struct_ov5_021DD9C8_decl.h"
 #include "overlay005/struct_ov5_021EF4F8_decl.h"
 #include "overlay025/poketch_system.h"
 
 struct FieldSystem_sub2_t {
     BOOL unk_00;
     UnkStruct_ov5_021D1A94 *unk_04;
-    UnkStruct_ov5_021DD9C8 *unk_08;
+    MapNamePopUp *unk_08;
     UnkStruct_ov5_021D5EF8 *unk_0C;
     UnkStruct_ov5_021D5CB0 *unk_10;
     PoketchSystem *poketchSys;

diff --git a/include/map_header_util.h b/include/map_header_util.h
@@ -0,0 +1,12 @@
+#ifndef POKEPLATINUM_MAP_HEADER_UTIL_H
+#define POKEPLATINUM_MAP_HEADER_UTIL_H
+
+#include "generated/map_headers.h"
+
+#include "message.h"
+#include "strbuf.h"
+
+u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, Strbuf *strbuf);
+void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, Strbuf *strbuf);
+
+#endif // POKEPLATINUM_MAP_HEADER_UTIL_H
diff --git a/include/overlay005/map_name_popup.h b/include/overlay005/map_name_popup.h
@@ -0,0 +1,16 @@
+#ifndef POKEPLATINUM_MAP_NAME_POPUP_H
+#define POKEPLATINUM_MAP_NAME_POPUP_H
+
+#include "field/field_system_decl.h"
+
+#include "bg_window.h"
+
+typedef struct MapNamePopUp MapNamePopUp;
+
+MapNamePopUp *MapNamePopUp_Create(BgConfig *bgConfig);
+void MapNamePopUp_Destroy(MapNamePopUp *mapPopUp);
+void MapNamePopUp_Show(MapNamePopUp *mapPopUp, s32 mapLabelTextID, s32 mapLabelWindowID);
+void MapNamePopUp_Hide(MapNamePopUp *mapPopUp);
+void FieldSystem_RequestLocationName(FieldSystem *fieldSystem);
+
+#endif // POKEPLATINUM_MAP_NAME_POPUP_H
diff --git a/include/overlay005/ov5_021DD6FC.h b/include/overlay005/ov5_021DD6FC.h
diff --git a/include/overlay005/struct_ov5_021DD9C8_decl.h b/include/overlay005/struct_ov5_021DD9C8_decl.h
diff --git a/include/unk_02071CFC.h b/include/unk_02071CFC.h
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
@@ -281,7 +281,7 @@ Static main
 	Object main.nef.p/src_unk_0207160C.c.o
 	Object main.nef.p/src_unk_02071B10.c.o
 	Object main.nef.p/src_unk_02071CD0.c.o
-	Object main.nef.p/src_unk_02071CFC.c.o
+	Object main.nef.p/src_map_header_util.c.o
 	Object main.nef.p/src_unk_02071D40.c.o
 	Object main.nef.p/src_unk_020722AC.c.o
 	Object main.nef.p/src_unk_02073700.c.o
@@ -481,7 +481,7 @@ Overlay overlay5
 	Object main.nef.p/src_overlay005_vs_seeker.c.o
 	Object main.nef.p/src_overlay005_ov5_021DC018.c.o
 	Object main.nef.p/src_overlay005_ov5_021DD42C.c.o
-	Object main.nef.p/src_overlay005_ov5_021DD6FC.c.o
+	Object main.nef.p/src_overlay005_map_name_popup.c.o
 	Object main.nef.p/src_overlay005_ov5_021DDAE4.c.o
 	Object main.nef.p/src_overlay005_encounter_effect.c.o
 	Object main.nef.p/src_overlay005_ov5_021DF440.c.o

diff --git a/src/field_map_change.c b/src/field_map_change.c
@@ -12,7 +12,7 @@
 #include "struct_defs/struct_0205EC34.h"
 
 #include "field/field_system.h"
-#include "overlay005/ov5_021DD6FC.h"
+#include "overlay005/map_name_popup.h"
 #include "overlay005/ov5_021E135C.h"
 #include "overlay005/save_info_window.h"
 #include "overlay005/struct_ov5_021D432C_decl.h"

diff --git a/src/field_system.c b/src/field_system.c
@@ -10,7 +10,7 @@
 #include "field/field_system_sub2_t.h"
 #include "overlay005/field_control.h"
 #include "overlay005/fieldmap.h"
-#include "overlay005/ov5_021DD6FC.h"
+#include "overlay005/map_name_popup.h"
 #include "overlay005/ov5_021DFB54.h"
 #include "overlay005/ov5_021E1B08.h"
 #include "overlay005/ov5_021EA714.h"
@@ -281,13 +281,13 @@ static void HandleFieldInput(FieldSystem *fieldSystem)
     case MAP_LOAD_TYPE_BATTLE_TOWER:
         if (processInput) {
             if (FieldInput_Process_BattleTower(&fieldInput, fieldSystem) == TRUE) {
-                ov5_021DDA78(fieldSystem->unk_04->unk_08);
+                MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
                 ov5_021E1BCC(fieldSystem, 4);
                 ov5_021E0EEC(fieldSystem->playerAvatar);
                 ov5_021EA714(fieldSystem, 0, 1);
             } else {
                 if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-                    ov5_021DDA78(fieldSystem->unk_04->unk_08);
+                    MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
                 }
 
                 BOOL tappedPoketch = FALSE;
@@ -304,14 +304,14 @@ static void HandleFieldInput(FieldSystem *fieldSystem)
     default:
         if (processInput) {
             if (FieldInput_Process(&fieldInput, fieldSystem) == TRUE) {
-                ov5_021DDA78(fieldSystem->unk_04->unk_08);
+                MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
                 ov5_021E1BCC(fieldSystem, 4);
                 sub_0205F56C(fieldSystem->playerAvatar);
                 ov5_021E0EEC(fieldSystem->playerAvatar);
                 ov5_021EA714(fieldSystem, 0, 1);
             } else {
                 if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
-                    ov5_021DDA78(fieldSystem->unk_04->unk_08);
+                    MapNamePopUp_Hide(fieldSystem->unk_04->unk_08);
                 }
 
                 BOOL tappedPoketch = 0;

diff --git a/src/field_transition.c b/src/field_transition.c
@@ -7,7 +7,7 @@
 
 #include "field/field_system.h"
 #include "overlay005/encounter_effect.h"
-#include "overlay005/ov5_021DD6FC.h"
+#include "overlay005/map_name_popup.h"
 
 #include "field_system.h"
 #include "field_task.h"

diff --git a/src/map_header_util.c b/src/map_header_util.c
@@ -0,0 +1,30 @@
+#include "map_header_util.h"
+
+#include <nitro.h>
+
+#include "generated/text_banks.h"
+
+#include "font.h"
+#include "map_header.h"
+#include "message.h"
+#include "strbuf.h"
+
+u32 MapHeader_LoadString(MessageLoader *msgLoader, u32 entryID, Strbuf *strbuf)
+{
+    MessageLoader_GetStrbuf(msgLoader, entryID, strbuf);
+    u32 width = Font_CalcStrbufWidth(FONT_SYSTEM, strbuf, 0);
+
+    return width;
+}
+
+void MapHeader_LoadName(enum MapHeader headerID, u32 heapID, Strbuf *strbuf)
+{
+    u32 mapLabelTextID;
+    MessageLoader *msgLoader;
+
+    msgLoader = MessageLoader_Init(MESSAGE_LOADER_NARC_HANDLE, NARC_INDEX_MSGDATA__PL_MSG, TEXT_BANK_LOCATION_NAMES, heapID);
+    mapLabelTextID = MapHeader_GetMapLabelTextID(headerID);
+
+    MapHeader_LoadString(msgLoader, mapLabelTextID, strbuf); // It should be MessageLoader_GetStrbuf()
+    MessageLoader_Free(msgLoader);
+}
diff --git a/src/meson.build b/src/meson.build
@@ -268,7 +268,7 @@ pokeplatinum_c = files(
     'unk_0207160C.c',
     'unk_02071B10.c',
     'unk_02071CD0.c',
-    'unk_02071CFC.c',
+    'map_header_util.c',
     'unk_02071D40.c',
     'unk_020722AC.c',
     'unk_02073700.c',
@@ -375,7 +375,7 @@ pokeplatinum_c = files(
     'overlay005/vs_seeker.c',
     'overlay005/ov5_021DC018.c',
     'overlay005/ov5_021DD42C.c',
-    'overlay005/ov5_021DD6FC.c',
+    'overlay005/map_name_popup.c',
     'overlay005/ov5_021DDAE4.c',
     'overlay005/encounter_effect.c',
     'overlay005/ov5_021DF440.c',

diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c
@@ -18,6 +18,7 @@
 #include "overlay005/const_ov5_021FF744.h"
 #include "overlay005/const_ov5_021FF7D0.h"
 #include "overlay005/hblank_system.h"
+#include "overlay005/map_name_popup.h"
 #include "overlay005/ov5_021D1A94.h"
 #include "overlay005/ov5_021D37AC.h"
 #include "overlay005/ov5_021D521C.h"
@@ -27,7 +28,6 @@
 #include "overlay005/ov5_021D5BC0.h"
 #include "overlay005/ov5_021D5CB0.h"
 #include "overlay005/ov5_021D5EB8.h"
-#include "overlay005/ov5_021DD6FC.h"
 #include "overlay005/ov5_021DF440.h"
 #include "overlay005/ov5_021E15F4.h"
 #include "overlay005/ov5_021E1B08.h"
@@ -311,7 +311,7 @@ static BOOL FieldMap_Exit(OverlayManager *overlayMan, int *param1)
             ov5_021D5BA8(fieldSystem);
             ov5_021D5278(&fieldSystem->unk_4C);
             ov5_021E1B20(fieldSystem->unk_64);
-            ov5_021DD9C8(fieldSystem->unk_04->unk_08);
+            MapNamePopUp_Destroy(fieldSystem->unk_04->unk_08);
 
             if (fieldSystem->unk_04->unk_0C != NULL) {
                 ov5_021D5EF8(fieldSystem->unk_04->unk_0C);
@@ -450,7 +450,7 @@ static BOOL FieldMap_ChangeZone(FieldSystem *fieldSystem)
             v9--;
         }
 
-        ov5_021DD9E8(fieldSystem->unk_04->unk_08, v8, v9);
+        MapNamePopUp_Show(fieldSystem->unk_04->unk_08, v8, v9);
     }
 
     return TRUE;
@@ -909,7 +909,7 @@ static void ov5_021D1968(FieldSystem *fieldSystem)
         fieldSystem->unk_04->unk_0C = ov5_021D5EB8(fieldSystem);
     }
 
-    fieldSystem->unk_04->unk_08 = ov5_021DD98C(fieldSystem->bgConfig);
+    fieldSystem->unk_04->unk_08 = MapNamePopUp_Create(fieldSystem->bgConfig);
     fieldSystem->unk_64 = ov5_021E1B08(4);
     fieldSystem->unk_04->unk_10 = ov5_021D5CB0();