Merge pull request #1978 from DizzyEggg/windows_overflow

Fix HideMapNamePopUpWindow possible overflow

ld_script_modern.ld

@@ -15,11 +15,6 @@ SECTIONS {
     ewram 0x2000000 (NOLOAD) :
     ALIGN(4)
     {
-        /* 
-           We link malloc.o here to prevent `gHeap` from landing in the middle of EWRAM.
-           Otherwise this causes corruption issues on some ld versions
-        */
-        gflib/malloc.o(ewram_data);
         src/*.o(ewram_data);
         gflib/*.o(ewram_data);
     } > EWRAM

src/map_name_popup.c

@@ -316,9 +316,14 @@ static void Task_MapNamePopUpWindow(u8 taskId)
 void HideMapNamePopUpWindow(void)
 {
     if (FuncIsActiveTask(Task_MapNamePopUpWindow))
+    {
+    #ifdef UBFIX
+        if (GetMapNamePopUpWindowId() != WINDOW_NONE)
+    #endif // UBFIX
         {
             ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
             RemoveMapNamePopUpWindow();
+        }
         SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0);
         DestroyTask(sPopupTaskId);
     }