From 7ea5dd7923eb9a44609a6cdaff331f7cd97bb34a Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Jun 2018 00:45:48 +0200
Subject: start fldeffect cut

---
 src/overworld.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/overworld.c')

diff --git a/src/overworld.c b/src/overworld.c
index 1e4116053..99670dfe2 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -88,7 +88,7 @@ extern const u16 gUnknown_82EC7C4[];
 
 u16 gUnknown_03005DA8;
 MainCallback gFieldCallback;
-bool8 (*gUnknown_03005DB0)(void);
+bool8 (*gFieldCallback2)(void);
 u8 gUnknown_03005DB4;
 u8 gFieldLinkPlayerCount;
 
@@ -1518,15 +1518,15 @@ void sub_8085E94(void *a0)
 
 static bool8 map_post_load_hook_exec(void)
 {
-    if (gUnknown_03005DB0 != NULL)
+    if (gFieldCallback2 != NULL)
     {
-        if (!gUnknown_03005DB0())
+        if (!gFieldCallback2())
         {
             return FALSE;
         }
         else
         {
-            gUnknown_03005DB0 = NULL;
+            gFieldCallback2 = NULL;
             gFieldCallback = NULL;
         }
     }
@@ -1554,7 +1554,7 @@ void CB2_NewGame(void)
     ScriptContext1_Init();
     ScriptContext2_Disable();
     gFieldCallback = ExecuteTruckSequence;
-    gUnknown_03005DB0 = NULL;
+    gFieldCallback2 = NULL;
     do_load_map_stuff_loop(&gMain.state);
     SetFieldVBlankCallback();
     SetMainCallback1(CB1_Overworld);
@@ -1684,7 +1684,7 @@ void c2_8056854(void)
 void CB2_ReturnToFieldWithOpenMenu(void)
 {
     FieldClearVBlankHBlankCallbacks();
-    gUnknown_03005DB0 = sub_80AF6A4;
+    gFieldCallback2 = sub_80AF6A4;
     CB2_ReturnToField();
 }
 
-- 
cgit v1.2.3


From 546819bc722b706a1c49a3d323b3b36d03fa612a Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Thu, 12 Jul 2018 22:39:38 -0500
Subject: Use map type constants in map headers

---
 src/overworld.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/overworld.c')

diff --git a/src/overworld.c b/src/overworld.c
index d4cb25e6c..9cbc8dc52 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -57,6 +57,7 @@
 #include "malloc.h"
 #include "gpu_regs.h"
 #include "link_rfu.h"
+#include "constants/map_types.h"
 
 // event scripts
 extern const u8 EventScript_WhiteOut[];
-- 
cgit v1.2.3