From 69d8833b31519208f04444d3393b68a393163aa3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 21 Feb 2020 13:41:18 -0500
Subject: Prelim names for mvmt actions; merge field_ground_effect into evobjmv

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

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index b159f0375..bdcf68b51 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -23,7 +23,7 @@
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "new_menu_helpers.h"
-#include "event_object_80688E4.h"
+#include "event_object_movement.h"
 #include "event_object_lock.h"
 #include "script.h"
 #include "sound.h"
-- 
cgit v1.2.3


From 4df660dc76b5f35d2a89e0cb627180b79e9caa12 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 4 Mar 2020 10:42:40 -0500
Subject: Add enums for help system text, label help context

---
 src/start_menu.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index bdcf68b51..cf8be2de9 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -562,8 +562,8 @@ static bool8 StartMenuLinkPlayerCallback(void)
 
 static bool8 StartCB_Save1(void)
 {
-    HelpSystem_BackupSomeVariable();
-    HelpSystem_SetSomeVariable2(12);
+    BackupHelpContext();
+    SetHelpContext(HELPCONTEXT_SAVE);
     StartMenu_PrepareForSave();
     sStartMenuCallback = StartCB_Save2;
     return FALSE;
@@ -579,19 +579,19 @@ static bool8 StartCB_Save2(void)
         ClearDialogWindowAndFrameToTransparent(0, TRUE);
         sub_80696C0();
         ScriptContext2_Disable();
-        HelpSystem_RestoreSomeVariable();
+        RestoreHelpContext();
         return TRUE;
     case SAVECB_RETURN_CANCEL:
         ClearDialogWindowAndFrameToTransparent(0, FALSE);
         DrawStartMenuInOneGo();
-        HelpSystem_RestoreSomeVariable();
+        RestoreHelpContext();
         sStartMenuCallback = StartCB_HandleInput;
         break;
     case SAVECB_RETURN_ERROR:
         ClearDialogWindowAndFrameToTransparent(0, TRUE);
         sub_80696C0();
         ScriptContext2_Disable();
-        HelpSystem_RestoreSomeVariable();
+        RestoreHelpContext();
         return TRUE;
     }
     return FALSE;
@@ -614,8 +614,8 @@ static u8 RunSaveDialogCB(void)
 
 void Field_AskSaveTheGame(void)
 {
-    HelpSystem_BackupSomeVariable();
-    HelpSystem_SetSomeVariable2(12);
+    BackupHelpContext();
+    SetHelpContext(HELPCONTEXT_SAVE);
     StartMenu_PrepareForSave();
     CreateTask(task50_save_game, 80);
 }
@@ -645,7 +645,7 @@ static void task50_save_game(u8 taskId)
     }
     DestroyTask(taskId);
     EnableBothScriptContexts();
-    HelpSystem_RestoreSomeVariable();
+    RestoreHelpContext();
 }
 
 static void CloseSaveMessageWindow(void)
-- 
cgit v1.2.3


From 6676e5bcb8345eaa2dc1e1999a8de3ac534bfdbf Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 9 Mar 2020 09:43:37 -0400
Subject: Use FADE_TO_BLACK define in other files

---
 src/start_menu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index cf8be2de9..867e469e0 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -39,6 +39,7 @@
 #include "help_system.h"
 #include "constants/songs.h"
 #include "constants/flags.h"
+#include "constants/field_weather.h"
 
 enum StartMenuOption
 {
@@ -446,7 +447,7 @@ static void StartMenu_FadeScreenIfLeavingOverworld(void)
      && sStartMenuCallback != StartMenuSafariZoneRetireCallback)
     {
         StopPokemonLeagueLightingEffectTask();
-        FadeScreen(1, 0);
+        FadeScreen(FADE_TO_BLACK, 0);
     }
 }
 
-- 
cgit v1.2.3