From 3ceb1667c9b5e81934c7d608efc08905f21c372e Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Fri, 1 Mar 2019 22:32:50 -0500
Subject: Reduce externs

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

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index 4b71f6147..79404d0b2 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -1,44 +1,45 @@
 #include "global.h"
-#include "start_menu.h"
-#include "menu.h"
-#include "safari_zone.h"
-#include "event_data.h"
-#include "window.h"
-#include "string_util.h"
-#include "text.h"
-#include "strings.h"
+#include "battle_pike.h"
+#include "battle_pyramid.h"
+#include "battle_pyramid_bag.h"
 #include "bg.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "event_obj_lock.h"
+#include "event_scripts.h"
 #include "field_effect.h"
-#include "party_menu.h"
-#include "frontier_pass.h"
-#include "task.h"
-#include "overworld.h"
-#include "link.h"
-#include "frontier_util.h"
+#include "field_player_avatar.h"
 #include "field_specials.h"
-#include "event_object_movement.h"
-#include "script.h"
-#include "main.h"
-#include "sound.h"
-#include "pokedex.h"
 #include "field_weather.h"
-#include "palette.h"
+#include "frontier_pass.h"
+#include "frontier_util.h"
+#include "gpu_regs.h"
+#include "international_string_util.h"
 #include "item_menu.h"
+#include "link.h"
+#include "load_save.h"
+#include "main.h"
+#include "menu.h"
+#include "new_game.h"
 #include "option_menu.h"
-#include "event_scripts.h"
+#include "overworld.h"
+#include "palette.h"
+#include "party_menu.h"
+#include "pokedex.h"
+#include "safari_zone.h"
 #include "save.h"
-#include "gpu_regs.h"
 #include "scanline_effect.h"
+#include "script.h"
+#include "sound.h"
+#include "start_menu.h"
+#include "strings.h"
+#include "string_util.h"
+#include "task.h"
+#include "text.h"
 #include "text_window.h"
-#include "load_save.h"
 #include "trainer_card.h"
-#include "international_string_util.h"
+#include "window.h"
 #include "constants/songs.h"
-#include "field_player_avatar.h"
-#include "battle_pyramid.h"
-#include "battle_pyramid_bag.h"
-#include "battle_pike.h"
-#include "new_game.h"
 
 // Menu actions
 enum
@@ -93,7 +94,6 @@ extern void sub_808B864(void);
 extern void CB2_Pokedex(void);
 extern void PlayRainStoppingSoundEffect(void);
 extern void CB2_PokeNav(void);
-extern void ScriptUnfreezeEventObjects(void);
 extern void save_serialize_map(void);
 
 // Menu action callbacks
-- 
cgit v1.2.3


From 49bef258567b8ac6ead607de8ce0ac64581cdb55 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Sat, 2 Mar 2019 03:18:08 -0500
Subject: Clean up the last extern functions

---
 src/start_menu.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index 79404d0b2..1052b640c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -7,10 +7,12 @@
 #include "event_object_movement.h"
 #include "event_obj_lock.h"
 #include "event_scripts.h"
+#include "fieldmap.h"
 #include "field_effect.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"
 #include "field_weather.h"
+#include "field_screen_effect.h"
 #include "frontier_pass.h"
 #include "frontier_util.h"
 #include "gpu_regs.h"
@@ -26,6 +28,7 @@
 #include "palette.h"
 #include "party_menu.h"
 #include "pokedex.h"
+#include "pokenav.h"
 #include "safari_zone.h"
 #include "save.h"
 #include "scanline_effect.h"
@@ -40,6 +43,7 @@
 #include "trainer_card.h"
 #include "window.h"
 #include "constants/songs.h"
+#include "rom_8011DC0.h"
 
 // Menu actions
 enum
@@ -84,18 +88,6 @@ EWRAM_DATA static u8 sSaveDialogTimer = 0;
 EWRAM_DATA static bool8 sSavingComplete = FALSE;
 EWRAM_DATA static u8 sSaveInfoWindowId = 0;
 
-// Extern variables.
-extern u8 gLocalLinkPlayerId;
-
-// Extern functions in not decompiled files.
-extern void sub_80AF688(void);
-extern void var_800D_set_xB(void);
-extern void sub_808B864(void);
-extern void CB2_Pokedex(void);
-extern void PlayRainStoppingSoundEffect(void);
-extern void CB2_PokeNav(void);
-extern void save_serialize_map(void);
-
 // Menu action callbacks
 static bool8 StartMenuPokedexCallback(void);
 static bool8 StartMenuPokemonCallback(void);
@@ -656,7 +648,7 @@ static bool8 StartMenuPokeNavCallback(void)
         PlayRainStoppingSoundEffect();
         RemoveExtraStartMenuWindows();
         CleanupOverworldWindowsAndTilemaps();
-        SetMainCallback2(CB2_PokeNav);  // Display PokeNav
+        SetMainCallback2(CB2_InitPokeNav);  // Display PokeNav
 
         return TRUE;
     }
-- 
cgit v1.2.3