From fa98819e1dad9f069df0bf883176d039987fe23d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 10 Sep 2023 06:52:26 -0400
Subject: [PATCH] More externs

---
 include/code_800C9CC.h     |  2 ++
 include/code_80130A8.h     |  1 +
 include/main_menu.h        |  5 ++++-
 src/code_2.c               |  3 +--
 src/code_80118A4.c         |  1 -
 src/code_8012A18.c         |  3 +--
 src/code_8040094.c         |  1 -
 src/ground_main.c          |  1 -
 src/other_menus1.c         | 12 ++++++------
 src/other_menus2.c         | 11 ++++++-----
 src/rescue_password_menu.c | 16 +++++++---------
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/code_800C9CC.h b/include/code_800C9CC.h
index db62d4d8d..6fcbb5e94 100644
--- a/include/code_800C9CC.h
+++ b/include/code_800C9CC.h
@@ -4,6 +4,8 @@
 #include "input.h"
 
 void ReadKeyInput(Inputs *);
+void xxx_call_update_bg_sound_input(void);
+
 void sub_800CB20(void);
 
 #endif // GUARD_CODE_800D090_H
\ No newline at end of file
diff --git a/include/code_80130A8.h b/include/code_80130A8.h
index c87d41430..199c7aeb3 100644
--- a/include/code_80130A8.h
+++ b/include/code_80130A8.h
@@ -16,6 +16,7 @@ extern void sub_8014114(void);
 extern void sub_80141B4(const u8 *, u32, OpenedFile **, u32);
 extern void sub_8014248(const u8 *, u32, u32, const MenuItem *, void *, u32, u32, OpenedFile **, u32);
 extern s32 sub_80144A4(s32 *);
+extern void xxx_draw_string_80144C4(void);
 extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
 
 #endif // GUARD_CODE_80130A8_H
\ No newline at end of file
diff --git a/include/main_menu.h b/include/main_menu.h
index f08b1df1f..6bb68c7f2 100644
--- a/include/main_menu.h
+++ b/include/main_menu.h
@@ -75,11 +75,14 @@ MainMenu *GetMainMenu(void);
 void InitMainMenu(void);
 void SetMenuItems(MenuStruct *, UnkTextStruct2 *, s32, const UnkTextStruct2 *, const MenuItem *, u8, u32, u32);
 void SetUpMenu(void);
+s32 UpdateMenu(void);
+
 void sub_8035CC0(UnkTextStruct2 *, u32);
 void sub_8035CF4(MenuStruct*, u32, bool8);
+s16 sub_8035D3C(void);
+s32 sub_8035D74(void);
 unkStruct_8035D94 *sub_8035D94(void);
 void sub_8035DA0(void);
 bool8 sub_80363E0(void);
-s32 UpdateMenu(void);
 
 #endif // GUARD_MAIN_MENU_H
diff --git a/src/code_2.c b/src/code_2.c
index 2a8969fe2..755cf17b0 100644
--- a/src/code_2.c
+++ b/src/code_2.c
@@ -5,6 +5,7 @@
 #include "code_8009804.h"
 #include "code_800C9CC.h"
 #include "code_80118A4.h"
+#include "code_80130A8.h"
 #include "code_8094F88.h"
 #include "code_8097670.h"
 #include "constants/bg_music.h"
@@ -45,11 +46,9 @@ extern s32 GetFirstIndexofMailType(u8);
 extern void nullsub_33(void);
 extern u32 sub_80009D0(u32);
 
-extern void xxx_draw_string_80144C4(void);
 extern void nullsub_8(u32);
 extern void sub_80060EC(void);
 extern void xxx_call_update_bg_vram(void);
-extern void xxx_call_update_bg_sound_input(void);
 
 extern u32 gUnknown_203B03C;
 extern u16 gUnknown_2026E4E;
diff --git a/src/code_80118A4.c b/src/code_80118A4.c
index 3363a047d..dc68f08a4 100644
--- a/src/code_80118A4.c
+++ b/src/code_80118A4.c
@@ -40,7 +40,6 @@ EWRAM_DATA s16 gUnknown_202DE24;
 
 void nullsub_8(u32);
 extern void xxx_call_update_bg_vram(void);
-extern void xxx_call_update_bg_sound_input(void);
 extern bool8 sub_80111C4();
 extern void sub_8010F28();
 
diff --git a/src/code_8012A18.c b/src/code_8012A18.c
index fb8cd4d86..d6cdb40dc 100644
--- a/src/code_8012A18.c
+++ b/src/code_8012A18.c
@@ -4,14 +4,13 @@
 #include "code_8009804.h"
 #include "code_800C9CC.h"
 #include "code_80118A4.h"
+#include "code_80130A8.h"
 #include "game_options.h"
 #include "input.h"
 #include "sprite.h"
 
-extern void xxx_draw_string_80144C4();
 extern void nullsub_8(u8);
 extern void xxx_call_update_bg_vram();
-extern void xxx_call_update_bg_sound_input();
 
 extern GameOptions *gGameOptionsRef;
 
diff --git a/src/code_8040094.c b/src/code_8040094.c
index 6fcf9e214..83b43865c 100644
--- a/src/code_8040094.c
+++ b/src/code_8040094.c
@@ -18,7 +18,6 @@ extern struct FileArchive gDungeonFileArchive;
 extern OpenedFile *gUnknown_202EE04;
 
 extern void sub_803F7BC(void);
-extern void xxx_call_update_bg_sound_input(void);
 
 extern void sub_803F580(u32);
 extern void sub_8049ED4();
diff --git a/src/ground_main.c b/src/ground_main.c
index 8b4c3b4cb..9476cffe5 100644
--- a/src/ground_main.c
+++ b/src/ground_main.c
@@ -44,7 +44,6 @@ extern void sub_809B638();
 extern void nullsub_106();
 extern void sub_80A73EC();
 extern void sub_8099750();
-extern void xxx_call_update_bg_sound_input();
 extern void sub_80A6E68();
 extern void GroundMap_Action();
 extern void nullsub_124();
diff --git a/src/other_menus1.c b/src/other_menus1.c
index 7e8948a1d..9142e7da6 100644
--- a/src/other_menus1.c
+++ b/src/other_menus1.c
@@ -4,6 +4,7 @@
 #include "code_8009804.h"
 #include "code_800C9CC.h"
 #include "code_80118A4.h"
+#include "code_80130A8.h"
 #include "constants/communication_error_codes.h"
 #include "dungeon_global_data.h"
 #include "input.h"
@@ -20,14 +21,13 @@ EWRAM_DATA_2 unkStruct_203B35C *sUnknown_203B35C = {0};
 
 #include "data/other_menus1.h"
 
-extern void sub_8037900(void);
-extern void xxx_call_update_bg_vram();
-extern void xxx_call_update_bg_sound_input();
+// other_menus1.s
 extern void sub_8037810(void);
+extern void sub_8037900(void);
+// text.s
+extern void xxx_call_update_bg_vram();
+// other_menus2.s
 extern s32 sub_8037B28(u32);
-s32 sub_8035D3C(void);
-extern s32 sub_8035D74(void);
-extern void xxx_draw_string_80144C4(void);
 
 static void sub_80371B8(void);
 static void sub_8037400(void);
diff --git a/src/other_menus2.c b/src/other_menus2.c
index 65cea2e02..7069b3707 100644
--- a/src/other_menus2.c
+++ b/src/other_menus2.c
@@ -20,14 +20,15 @@ extern struct UnkStruct_203B184 *gUnknown_203B184;
 
 #include "data/other_menus2.h"
 
-extern void sub_800D494(void);
+// code_800D090.s
 extern s32 sub_800D33C(void);
-extern void sub_800D520(void);
-extern u8 sub_800D600(void);
-extern void sub_800D59C(s32 *, u32);
-extern void sub_800D570(void);
+extern void sub_800D494(void);
 extern void sub_800D510(void);
+extern void sub_800D520(void);
+extern void sub_800D570(void);
 extern u8 sub_800D588(void);
+extern void sub_800D59C(s32 *, u32);
+extern u8 sub_800D600(void);
 extern void sub_800D670(u32, s32 *, u32);
 extern void sub_800D68C(u32);
 
diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c
index 6eedd34b8..bad35cafe 100644
--- a/src/rescue_password_menu.c
+++ b/src/rescue_password_menu.c
@@ -1,18 +1,18 @@
 #include "global.h"
-#include "memory.h"
+#include "code_80130A8.h"
+#include "code_8094F88.h"
+#include "dungeon.h"
 #include "input.h"
 #include "items.h"
-#include "menu.h"
+#include "main_menu.h"
+#include "memory.h"
+#include "menu_input.h"
 #include "pokemon.h"
+#include "rescue_password_menu.h"
 #include "save.h"
 #include "text1.h"
 #include "text2.h"
-#include "main_menu.h"
-#include "rescue_password_menu.h"
-#include "code_8094F88.h"
 #include "wonder_mail.h"
-#include "menu_input.h"
-#include "dungeon.h"
 
 #define RESCUE_PASSWORD_SIZE 0x36
 
@@ -242,7 +242,6 @@ ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for
 
 static const u8 fill0[] = "pksdir0";
 
-extern s32 sub_8035D74(void);
 extern void sub_80151C0(u32, u8 *);
 extern void sub_8031D70(u32, u32);
 extern void sub_80155F0(void);
@@ -250,7 +249,6 @@ extern void sub_8031E10(void);
 extern u32 sub_80154F0(void);
 extern u32 sub_8031DCC(void);
 extern void sub_8031E00(void);
-extern void xxx_draw_string_80144C4(void);
 
 void DisplayRescuePasswordError(u32 error);
 void sub_8039174(void);