From b2866fae2126012f7d7b4db8b60e07ba344a5f97 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 22 Feb 2019 22:20:42 -0500
Subject: Document the weather state functions

All weather types are now documented (including WEATHER_15)
---
 src/overworld.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/overworld.c')

diff --git a/src/overworld.c b/src/overworld.c
index 08fd94c1b..6f973f16b 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1)
 
     FieldEffectActiveListClear();
     StartWeather();
-    sub_80AEE84();
+    DoPausedWeather();
     if (!a1)
         SetUpFieldTasks();
     mapheader_run_script_with_tag_x5();
-- 
cgit v1.2.3


From e1b2460748dfd9d1a4b3c6eb760e86fb616a7ce6 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Mon, 25 Feb 2019 02:28:41 -0500
Subject: Adjust formatting, rename function

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

(limited to 'src/overworld.c')

diff --git a/src/overworld.c b/src/overworld.c
index 6f973f16b..2650a619c 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -2123,7 +2123,7 @@ static void sub_8086988(u32 a1)
 
     FieldEffectActiveListClear();
     StartWeather();
-    DoPausedWeather();
+    ResumePausedWeather();
     if (!a1)
         SetUpFieldTasks();
     mapheader_run_script_with_tag_x5();
-- 
cgit v1.2.3


From 5f7a9713134d7694120dac27bef5ac14467f2734 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 22 Feb 2019 02:23:46 -0500
Subject: Source file part of map script renaming

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

(limited to 'src/overworld.c')

diff --git a/src/overworld.c b/src/overworld.c
index 08fd94c1b..d5584efc3 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -761,7 +761,7 @@ static bool8 SetDiveWarp(u8 dir, u16 x, u16 y)
     }
     else
     {
-        mapheader_run_script_with_tag_x6();
+        RunOnDiveWarpMapScript();
         if (IsDummyWarp(&gFixedDiveWarp))
             return FALSE;
         SetWarpDestinationToDiveWarp();
@@ -779,7 +779,7 @@ bool8 SetDiveWarpDive(u16 x, u16 y)
     return SetDiveWarp(CONNECTION_DIVE, x, y);
 }
 
-void mliX_load_map(u8 mapGroup, u8 mapNum)
+void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
 {
     s32 paletteIndex;
 
@@ -800,7 +800,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum)
     ChooseAmbientCrySpecies();
     SetDefaultFlashLevel();
     Overworld_ClearSavedMusic();
-    mapheader_run_script_with_tag_x3();
+    RunOnTransitionMapScript();
     InitMap();
     copy_map_tileset2_to_vram_2(gMapHeader.mapLayout);
     apply_map_tileset2_palette(gMapHeader.mapLayout);
@@ -813,7 +813,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum)
     RoamerMove();
     DoCurrentWeather();
     ResetFieldTasksArgs();
-    mapheader_run_script_with_tag_x5();
+    RunOnResumeMapScript();
 
     if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER || gMapHeader.regionMapSectionId != sLastMapSectionId)
         ShowMapNamePopup();
@@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1)
         FlagClear(FLAG_SYS_USE_FLASH);
     SetDefaultFlashLevel();
     Overworld_ClearSavedMusic();
-    mapheader_run_script_with_tag_x3();
+    RunOnTransitionMapScript();
     UpdateLocationHistoryForRoamer();
     RoamerMoveToOtherLocationSet();
     if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
@@ -2126,7 +2126,7 @@ static void sub_8086988(u32 a1)
     sub_80AEE84();
     if (!a1)
         SetUpFieldTasks();
-    mapheader_run_script_with_tag_x5();
+    RunOnResumeMapScript();
     TryStartMirageTowerPulseBlendEffect();
 }
 
@@ -2136,7 +2136,7 @@ static void sub_80869DC(void)
     gTotalCameraPixelOffsetY = 0;
     ResetEventObjects();
     TrySpawnEventObjects(0, 0);
-    mapheader_run_first_tag4_script_list_match();
+    TryRunOnWarpIntoMapScript();
 }
 
 static void mli4_mapscripts_and_other(void)
@@ -2153,14 +2153,14 @@ static void mli4_mapscripts_and_other(void)
     SetPlayerAvatarTransitionFlags(player->transitionFlags);
     ResetInitialPlayerAvatarState();
     TrySpawnEventObjects(0, 0);
-    mapheader_run_first_tag4_script_list_match();
+    TryRunOnWarpIntoMapScript();
 }
 
 static void sub_8086A68(void)
 {
     sub_808E16C(0, 0);
     RotatingGate_InitPuzzleAndGraphics();
-    mapheader_run_script_with_tag_x7();
+    RunOnReturnToFieldMapScript();
 }
 
 static void sub_8086A80(void)
-- 
cgit v1.2.3