From 6bf6f8ded14269097d844177371bc58cf8d919fc Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 19:15:24 -0600 Subject: finish moving data to load_screen --- src/debug_menu.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/debug_menu.c') 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); -- cgit v1.2.3 From 19decc36d0465f26de20b389e6c8bf0775862cdb Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 7 Jan 2022 15:03:08 -0600 Subject: Move all the menus to respective directory in src/data/menus --- src/debug_menu.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'src/debug_menu.c') diff --git a/src/debug_menu.c b/src/debug_menu.c index 1c1a022..6f7dcd8 100644 --- a/src/debug_menu.c +++ b/src/debug_menu.c @@ -27,43 +27,9 @@ const struct UnkTextStruct2 gUnknown_80E7D58 = NULL }; -extern const char dungeons_string[]; -extern const char field_string[]; -extern const char field_map_string[]; -extern const char field_script_string[]; -extern const char debug_menu_string[]; -extern const char storage_string[]; -extern const char h_open_string[]; +#include "data/menus/debug_menu.h" -const struct MenuItem gDebugMenuItems[8] = -{ - {dungeons_string, MENU_DEBUG_MENU_DUNGEONS}, - {field_string, MENU_DEBUG_MENU_FIELD}, - {field_map_string, MENU_DEBUG_MENU_FIELD_MAP}, - {field_script_string, MENU_DEBUG_MENU_FIELD_SCRIPT}, - {debug_menu_string, MENU_DEBUG_MENU_DEBUG_MENU}, - {storage_string, MENU_DEBUG_MENU_STORAGE}, - {h_open_string, MENU_DEBUG_MENU_H_OPEN}, - {NULL, 10}, -}; - -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) 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 u8 sub_8012FD8(struct DebugMenu *); extern void sub_8013114(struct DebugMenu *, s32 *); -- cgit v1.2.3 From 6c5749a148856780933326f8e83779cf8e8dbd69 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 20 Feb 2022 09:00:38 -0800 Subject: actually nuke src/data/menus and put strings in the structs when possible vs references --- src/debug_menu.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/debug_menu.c') diff --git a/src/debug_menu.c b/src/debug_menu.c index 6f7dcd8..376b267 100644 --- a/src/debug_menu.c +++ b/src/debug_menu.c @@ -27,7 +27,25 @@ const struct UnkTextStruct2 gUnknown_80E7D58 = NULL }; -#include "data/menus/debug_menu.h" +const struct MenuItem gDebugMenuItems[8] = +{ + {"Dungeons", MENU_DEBUG_MENU_DUNGEONS}, + {"Field", MENU_DEBUG_MENU_FIELD}, + {"Field Map", MENU_DEBUG_MENU_FIELD_MAP}, + {"Field Script", MENU_DEBUG_MENU_FIELD_SCRIPT}, + {"Debug Menu", MENU_DEBUG_MENU_DEBUG_MENU}, + {"Storage", MENU_DEBUG_MENU_STORAGE}, + {"h-open", MENU_DEBUG_MENU_H_OPEN}, + {NULL, 10}, +}; + +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"; -- cgit v1.2.3