finish moving data to load_screen

4 files changed, 155 insertions, 172 deletions

diff --git a/data/data_80E59A8.s b/data/data_80E59A8.s
index 23b0695..6fcb699 100644
--- a/data/data_80E59A8.s
+++ b/data/data_80E59A8.s
@@ -1076,103 +1076,3 @@ sUnknown_80E75CC:
     .align 2, 0
 
     .string "pksdir0\0"
-
-	.global gUnknown_80E75F8
-gUnknown_80E75F8: @ 80E75F8
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_80E7610
-gUnknown_80E7610: @ 80E7610
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x02, 0x00
-        .byte 0x1A, 0x00, 0x0B, 0x00
-        .byte 0x0B, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x20, 0x00, 0x00, 0x00
-
-	.global gUnknown_80E762C
-gUnknown_80E762C: @ 80E762C
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x02, 0x00, 0x0F, 0x00
-        .byte 0x13, 0x00, 0x03, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gResumeQuicksaveMenuItems
-gResumeQuicksaveMenuItems: @ 80E7644
-    .4byte ResumeQuicksave_80E7668, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-IsThatOK_80E765C:
-    .string "Is that OK?\0"
-    .align 2, 0
-
-ResumeQuicksave_80E7668:
-    .string "Resuming from quicksave.\0"
-    .align 2, 0
-
-	.global gResumeAdventureMenuItems
-gResumeAdventureMenuItems: @ 80E7684
-    .4byte ResumeAdventure_80E769C, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-ResumeAdventure_80E769C:
-    .string "Resuming saved adventure.\0"
-    .align 2, 0
-
-	.global gQuitWaitingRescueMenuItems
-gQuitWaitingRescueMenuItems: @ 80E76B8
-    .4byte QuitAwaitingRescue_80E76D0, 0x5
-    .4byte IsThatOK_80E765C, 0x5
-    .4byte 0, 0x3
-
-QuitAwaitingRescue_80E76D0:
-    .string "Quit awaiting rescue?\0"
-    .align 2, 0
-
-	.global gDeleteSavePromptMenuItems
-gDeleteSavePromptMenuItems: @ 80E76E8
-        .4byte Deleted_80E7718, 0x5
-        .4byte Deleted_80E7700, 0x5
-        .4byte 0, 0x3
-
-Deleted_80E7700:
-    .string "deleted. Is that OK?\0"
-    .align 2, 0
-
-Deleted_80E7718:
-    .string "Your saved data will be\0"
-    .align 2, 0
-
-	.global gDeleteSaveConfirmMenuItems
-gDeleteSaveConfirmMenuItems: @ 80E7730
-    .4byte Deleted_80E7768, 0x5
-    .4byte Deleted_80E7748, 0x5
-    .4byte 0, 0x3
-
-Deleted_80E7748:
-    .string "delete all of your saved data?\0"
-    .align 2, 0
-
-Deleted_80E7768:
-    .string "Are you sure you want to\0"
-    .align 2, 0
-
-	.global gUnknown_80E7784
-gUnknown_80E7784: @ 80E7784
-        .byte 0x00, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x17, 0x00, 0x0F, 0x00
-        .byte 0x05, 0x00, 0x03, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
diff --git a/src/debug.c b/src/debug.c
index 0716330..757af0f 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -19,7 +19,7 @@ ALIGNED(4) const char gFuncFileLineString2[] = "func = '%s'\nfile = '%s'  line =
 
 ALIGNED(4) const char debug_fill14[] = "pksdir0";
 ALIGNED(4) const char gDebugPrintPrefix[] = "  Print  ";
-ALIGNED(4) const char debug_fill13[] = "pksdir0";
+ALIGNED(4) static const char debug_fill13[] = "pksdir0";
 
 ALIGNED(4) const char Performance_Text[] = "Performance";
 ALIGNED(4) const char MemoryCard_Text[] = "Memory Card";
@@ -34,23 +34,23 @@ ALIGNED(4) const char Ground_Text[] = "Ground";
 
 
 ALIGNED(4) const char gNotMountText[] = "not mount log system";
-ALIGNED(4) const char debug_fill9[] = "pksdir0";
-ALIGNED(4) const char debug_fill10[] = "pksdir0";
-ALIGNED(4) const char debug_fill11[] = "pksdir0";
-ALIGNED(4) const char debug_fill12[] = "pksdir0";
+ALIGNED(4) static const char debug_fill9[] = "pksdir0";
+ALIGNED(4) static const char debug_fill10[] = "pksdir0";
+ALIGNED(4) static const char debug_fill11[] = "pksdir0";
+ALIGNED(4) static const char debug_fill12[] = "pksdir0";
 
 ALIGNED(4) const char gFatalText[] = "!!!!! Fatal !!!!!\n";
 ALIGNED(4) const char gFatalErrorBufferPlaceholder[] = "%s\n";
 
-ALIGNED(4) const char debug_fill0[] = "pksdir0";
-ALIGNED(4) const char debug_fill1[] = "pksdir0";
-ALIGNED(4) const char debug_fill2[] = "pksdir0";
-ALIGNED(4) const char debug_fill3[] = "pksdir0";
-ALIGNED(4) const char debug_fill4[] = "pksdir0";
-ALIGNED(4) const char debug_fill5[] = "pksdir0";
-ALIGNED(4) const char debug_fill6[] = "pksdir0";
-ALIGNED(4) const char debug_fill7[] = "pksdir0";
-ALIGNED(4) const char debug_fill8[] = "pksdir0";
+ALIGNED(4) static const char debug_fill0[] = "pksdir0";
+ALIGNED(4) static const char debug_fill1[] = "pksdir0";
+ALIGNED(4) static const char debug_fill2[] = "pksdir0";
+ALIGNED(4) static const char debug_fill3[] = "pksdir0";
+ALIGNED(4) static const char debug_fill4[] = "pksdir0";
+ALIGNED(4) static const char debug_fill5[] = "pksdir0";
+ALIGNED(4) static const char debug_fill6[] = "pksdir0";
+ALIGNED(4) static const char debug_fill7[] = "pksdir0";
+ALIGNED(4) static const char debug_fill8[] = "pksdir0";
 
 void NDS_DebugInit(void)
 {
diff --git a/src/debug_menu.c b/src/debug_menu.c
index da765a1..1c1a022 100644
--- a/src/debug_menu.c
+++ b/src/debug_menu.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "debug_menu.h"
+#include "input.h"
 #include "main_menu.h"
 #include "menu.h"
 #include "memory.h"
@@ -47,24 +48,23 @@ const struct MenuItem gDebugMenuItems[8] =
     {NULL, 10},
 };
 
-ALIGNED(4) const char h_open_string[] = "h-open";
-ALIGNED(4) const char storage_string[] = "Storage";
-ALIGNED(4) const char debug_menu_string[] = "Debug Menu";
-ALIGNED(4) const char field_script_string[] = "Field Script";
-ALIGNED(4) const char field_map_string[] = "Field Map";
-ALIGNED(4) const char field_string[] = "Field";
-ALIGNED(4) const char dungeons_string[] = "Dungeons";
+ALIGNED(4) static const char h_open_string[] = "h-open";
+ALIGNED(4) static const char storage_string[] = "Storage";
+ALIGNED(4) static const char debug_menu_string[] = "Debug Menu";
+ALIGNED(4) static const char field_script_string[] = "Field Script";
+ALIGNED(4) static const char field_map_string[] = "Field Map";
+ALIGNED(4) static const char field_string[] = "Field";
+ALIGNED(4) static const char dungeons_string[] = "Dungeons";
 
-ALIGNED(4) const char debug_menu_fill0[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill1[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill2[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill3[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill4[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill5[] = "pksdir0";
-ALIGNED(4) const char debug_menu_fill6[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill0[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill1[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill2[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill3[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill4[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill5[] = "pksdir0";
+ALIGNED(4) static const char debug_menu_fill6[] = "pksdir0";
 
 
-extern void ResetUnusedInputStruct(void);
 extern u8 sub_8012FD8(struct DebugMenu *);
 extern void sub_8013114(struct DebugMenu *, s32 *);
 extern void sub_80976F8(u8);
diff --git a/src/load_screen.c b/src/load_screen.c
index ab092cc..7383503 100644
--- a/src/load_screen.c
+++ b/src/load_screen.c
@@ -45,54 +45,12 @@ EWRAM_DATA u32 gUnknown_203B3B8[12];
 
 extern struct unkStruct_203B484 *gUnknown_203B484;
 
-extern struct UnkTextStruct2 gUnknown_80E75F8;
-extern struct UnkTextStruct2 gUnknown_80E7610;
-extern struct UnkTextStruct2 gUnknown_80E762C;
-extern struct MenuItem gResumeQuicksaveMenuItems[];
-extern struct MenuItem gResumeAdventureMenuItems[];
-extern struct MenuItem gQuitWaitingRescueMenuItems[];
-extern struct MenuItem gDeleteSavePromptMenuItems[];
-extern struct MenuItem gDeleteSaveConfirmMenuItems[];
-extern struct UnkTextStruct2 gUnknown_80E7784;
-
-extern const char No_80E77B4[];
-extern const char Yes_80E77B8[];
-
-const struct MenuItem gLoadScreenYesNoMenu[3] =
-{
-    {Yes_80E77B8, 1},
-    {No_80E77B4, 2},
-    {NULL, 3},
-};
-
-ALIGNED(4) const char No_80E77B4[] = "No";
-ALIGNED(4) const char Yes_80E77B8[] = "Yes";
-
-ALIGNED(4) const char gTeamHeadingText[] = "Team:";
-ALIGNED(4) const char gNameHeadingText[] = "Name:";
-ALIGNED(4) const char gLocationHeadingText[] = "Location:";
-ALIGNED(4) const char gPlayTimeHeadingText[] = "Play time:";
-ALIGNED(4) const char gAdventuresHeadingText[] = "Adventures:";
-ALIGNED(4) const char gHelperHeadingText[] = "Helper:";
-ALIGNED(4) const char gNoTeamNamePlaceholder[] = _("？？？？");
-ALIGNED(4) const char gUnknown_80E7804[] = "%s ";
-ALIGNED(4) const char gNoNamePlaceholder[] = "???";
-ALIGNED(4) const char gQuicksaveDataDeletedText[] = "Quicksave data deleted.";
-ALIGNED(4) const char gLocationUnknownText[] = "Location unknown.";
-ALIGNED(4) const char gPlayTimePlaceholder[] = "%d:%02d:%02d ";
-ALIGNED(4) const char gNumAdventurePlaceholder[] = "%d";
-ALIGNED(4) const char gHelperInfoPlaceholder[] = "%s (%s)";
-ALIGNED(4) const char gNoHelperText[] = "-----";
-ALIGNED(4) const char gClmkpatFileName[] = "clmkpat"; // clmkpat
-ALIGNED(4) const char load_screen_fill[] = "pksdir0";
-
-
 u8 IsQuickSave(void);
 void DrawLoadScreenText(void);
 void sub_80397B4(void);
 
 extern void sub_8035CF4(u32 *, u32, u32);
-extern void SetMenuItems(u32 *, struct UnkTextStruct2 *, u32, struct UnkTextStruct2 *, const struct MenuItem *, u32, u32, u32);
+extern void SetMenuItems(u32 *, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *, u32, u32, u32);
 extern u8 sub_8012FD8(u32 *);
 extern void sub_8013114(u32 *, u32 *);
 extern void sub_8095240(u32);
@@ -119,6 +77,131 @@ extern void xxx_format_string(u8 *, u8 *, u8 *, u32);
 extern void SetBGPaletteBufferColorArray(s32, s32);
 extern void sub_8007E20(s32, s32, s32, u32, u32, s32, u32);
 
+extern const u8 Deleted_80E7700[];
+extern const u8 Deleted_80E7718[];
+extern const u8 Deleted_80E7748[];
+extern const u8 Deleted_80E7768[];
+extern const u8 QuitAwaitingRescue_80E76D0[];
+extern const u8 IsThatOK_80E765C[];
+extern const u8 ResumeAdventure_80E769C[];
+extern const u8 ResumeQuicksave_80E7668[];
+extern const char No_80E77B4[];
+extern const char Yes_80E77B8[];
+
+const struct UnkTextStruct2 gUnknown_80E75F8 = {
+   0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00,
+   0x00, 0x00,
+   NULL
+};
+
+const struct UnkTextStruct2 gUnknown_80E7610 = {
+   0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0x02, 0x00,
+   0x1A, 0x0B,
+   0x0B, 0x00,
+   NULL
+};
+
+const u8 gUnkData_80E7628[] = {0x20, 0x00, 0x00, 0x00};
+
+const struct UnkTextStruct2 gUnknown_80E762C = {
+   0x00, 0x00, 0x00, 0x00,
+   0x03, 0x00, 0x00, 0x00,
+   0x02, 0x00, 0x0F, 0x00,
+   0x13, 0x03,
+   0x03, 0x00,
+   NULL
+};
+
+const struct MenuItem gResumeQuicksaveMenuItems[3] =
+{
+    {ResumeQuicksave_80E7668, 5},
+    {IsThatOK_80E765C, 5},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const u8 IsThatOK_80E765C[] = "Is that OK?";
+ALIGNED(4) static const u8 ResumeQuicksave_80E7668[] = "Resuming from quicksave.";
+
+const struct MenuItem gResumeAdventureMenuItems[3] =
+{
+    {ResumeAdventure_80E769C, 5},
+    {IsThatOK_80E765C, 5},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const u8 ResumeAdventure_80E769C[] = "Resuming saved adventure.";
+
+const struct MenuItem gQuitWaitingRescueMenuItems[3] =
+{
+    {QuitAwaitingRescue_80E76D0, 5},
+    {IsThatOK_80E765C, 5},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const u8 QuitAwaitingRescue_80E76D0[] = "Quit awaiting rescue?";
+
+const struct MenuItem gDeleteSavePromptMenuItems[3] =
+{
+    {Deleted_80E7718, 5},
+    {Deleted_80E7700, 5},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const u8 Deleted_80E7700[] = "deleted. Is that OK?";
+ALIGNED(4) static const u8 Deleted_80E7718[] = "Your saved data will be";
+
+const struct MenuItem gDeleteSaveConfirmMenuItems[3] =
+{
+    {Deleted_80E7768, 5},
+    {Deleted_80E7748, 5},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const u8 Deleted_80E7748[] = "delete all of your saved data?";
+ALIGNED(4) static const u8 Deleted_80E7768[] = "Are you sure you want to";
+
+const struct UnkTextStruct2 gUnknown_80E7784 =
+{
+    0x00, 0x00, 0x00, 0x00,
+    0x03, 0x00, 0x00, 0x00,
+    0x17, 0x00, 0x0F, 0x00,
+    0x05, 0x03,
+    0x03, 0x00,
+    NULL
+};
+
+const struct MenuItem gLoadScreenYesNoMenu[3] =
+{
+    {Yes_80E77B8, 1},
+    {No_80E77B4, 2},
+    {NULL, 3},
+};
+
+ALIGNED(4) static const char No_80E77B4[] = "No";
+ALIGNED(4) static const char Yes_80E77B8[] = "Yes";
+
+ALIGNED(4) const char gTeamHeadingText[] = "Team:";
+ALIGNED(4) const char gNameHeadingText[] = "Name:";
+ALIGNED(4) const char gLocationHeadingText[] = "Location:";
+ALIGNED(4) const char gPlayTimeHeadingText[] = "Play time:";
+ALIGNED(4) const char gAdventuresHeadingText[] = "Adventures:";
+ALIGNED(4) const char gHelperHeadingText[] = "Helper:";
+ALIGNED(4) const char gNoTeamNamePlaceholder[] = _("？？？？");
+ALIGNED(4) const char gUnknown_80E7804[] = "%s ";
+ALIGNED(4) const char gNoNamePlaceholder[] = "???";
+ALIGNED(4) const char gQuicksaveDataDeletedText[] = "Quicksave data deleted.";
+ALIGNED(4) const char gLocationUnknownText[] = "Location unknown.";
+ALIGNED(4) const char gPlayTimePlaceholder[] = "%d:%02d:%02d ";
+ALIGNED(4) const char gNumAdventurePlaceholder[] = "%d";
+ALIGNED(4) const char gHelperInfoPlaceholder[] = "%s (%s)";
+ALIGNED(4) const char gNoHelperText[] = "-----";
+ALIGNED(4) const char gClmkpatFileName[] = "clmkpat"; // clmkpat
+ALIGNED(4) const char load_screen_fill[] = "pksdir0";
 
 void CreateLoadScreen(u32 currMenu)
 {