From 791c547b2c8c2cc3a52db704714d0fda16b8988c Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Mon, 14 Nov 2022 14:07:32 -0300
Subject: [PATCH] Renamed missing overworld debug configs

---
 include/config/debug.h     | 14 +++++++-------
 src/field_control_avatar.c |  8 ++++----
 src/start_menu.c           |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/config/debug.h b/include/config/debug.h
index fe368958f3..b427fcb513 100644
--- a/include/config/debug.h
+++ b/include/config/debug.h
@@ -2,20 +2,20 @@
 #define GUARD_CONFIG_DEBUG_H
 
 // Overworld Debug
-#define DEBUG_OVERWORLD_MENU         TRUE                // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
-#define DEBUG_SYSTEM_HELD_KEYS      (R_BUTTON)          // The keys required to be held to open the debug menu.
-#define DEBUG_SYSTEM_TRIGGER_EVENT  pressedStartButton  // The event that opens the menu when holding the key(s) defined in DEBUG_SYSTEM_HELD_KEYS.
-#define DEBUG_SYSTEM_IN_MENU        FALSE               // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
+#define DEBUG_OVERWORLD_MENU            TRUE                // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
+#define DEBUG_OVERWORLD_HELD_KEYS       (R_BUTTON)          // The keys required to be held to open the debug menu.
+#define DEBUG_OVERWORLD_TRIGGER_EVENT   pressedStartButton  // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_HELD_KEYS.
+#define DEBUG_OVERWORLD_IN_MENU         FALSE               // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
 
 // Debug Flags
 // To use the following debug features, replace the 0s with the flag ID you're assigning it to.
 // Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
-#define DEBUG_FLAG_NO_COLLISION     0       // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
+#define DEBUG_FLAG_NO_COLLISION         0       // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
 
 // Battle Debug Menu
-#define DEBUG_BATTLE_MENU           TRUE    // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
+#define DEBUG_BATTLE_MENU               TRUE    // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
 
 // Pokémon Debug
-#define DEBUG_POKEMON_MENU          TRUE    // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
+#define DEBUG_POKEMON_MENU              TRUE    // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
 
 #endif // GUARD_CONFIG_DEBUG_H
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index f90ef6cb57..96e9173c9b 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -131,11 +131,11 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
     else if (heldKeys & DPAD_RIGHT)
         input->dpadDirection = DIR_EAST;
 
-#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
-    if ((heldKeys & DEBUG_SYSTEM_HELD_KEYS) && input->DEBUG_SYSTEM_TRIGGER_EVENT)
+#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_OVERWORLD_IN_MENU == FALSE
+    if ((heldKeys & DEBUG_OVERWORLD_HELD_KEYS) && input->DEBUG_OVERWORLD_TRIGGER_EVENT)
     {
         input->input_field_1_2 = TRUE;
-        input->DEBUG_SYSTEM_TRIGGER_EVENT = FALSE;
+        input->DEBUG_OVERWORLD_TRIGGER_EVENT = FALSE;
     }
 #endif
 }
@@ -197,7 +197,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
     if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
         return TRUE;
 
-#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
+#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_OVERWORLD_IN_MENU == FALSE
     if (input->input_field_1_2)
     {
         PlaySE(SE_WIN_OPEN);
diff --git a/src/start_menu.c b/src/start_menu.c
index 981e4ab937..8525813d38 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -286,7 +286,7 @@ static void BuildStartMenuActions(void)
     }
     else
     {
-    #if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == TRUE
+    #if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_OVERWORLD_IN_MENU == TRUE
         BuildDebugStartMenu();
     #else
         BuildNormalStartMenu();