From 2435bcc09db545d337c2b45a59d5276fa08ffa08 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Thu, 17 Oct 2019 21:24:47 -0400
Subject: sys flag rearrange

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

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index e3854b803..442884c05 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -207,9 +207,9 @@ static void AppendToStartMenuItems(u8 newEntry)
 
 static void SetUpStartMenu_NormalField(void)
 {
-    if (FlagGet(FLAG_0x829) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
         AppendToStartMenuItems(STARTMENU_POKEDEX);
-    if (FlagGet(FLAG_0x828) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE)
         AppendToStartMenuItems(STARTMENU_POKEMON);
     AppendToStartMenuItems(STARTMENU_BAG);
     AppendToStartMenuItems(STARTMENU_PLAYER);
@@ -973,7 +973,7 @@ static void PrintSaveStats(void)
     SaveStatToString(SAVE_STAT_BADGES, gStringVar4, 2);
     AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, 28, sTextColor_StatValue, -1, gStringVar4);
     y = 42;
-    if (FlagGet(FLAG_0x829) == TRUE)
+    if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE)
     {
         AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex);
         SaveStatToString(SAVE_STAT_POKEDEX, gStringVar4, 2);
-- 
cgit v1.2.3


From e48725d9b54ed9f71f65c3ba5577cffa8f4887d1 Mon Sep 17 00:00:00 2001
From: jiangzhengwenjz <jiangzhengwenjzw@qq.com>
Date: Sat, 19 Oct 2019 03:14:17 +0800
Subject: document battle_setup symbols

---
 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 e3854b803..1c57dee0c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -392,7 +392,7 @@ void ShowStartMenu(void)
 {
     if (!IsUpdateLinkStateCBActive())
     {
-        player_bitmagic();
+        FreezeEventObjects();
         sub_805C270();
         sub_805C780();
     }
-- 
cgit v1.2.3


From 7c3d9df380ba92c34b24326805e2b6819aecb085 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 24 Oct 2019 15:28:43 -0400
Subject: Finish field_specials

---
 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 442884c05..221ae1f1f 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -445,7 +445,7 @@ static void StartMenu_FadeScreenIfLeavingOverworld(void)
      && sStartMenuCallback != StartMenuExitCallback
      && sStartMenuCallback != StartMenuSafariZoneRetireCallback)
     {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
         fade_screen(1, 0);
     }
 }
-- 
cgit v1.2.3