Renamed missing overworld debug configs

This commit is contained in:
Eduardo Quezada 2022-11-14 14:07:32 -03:00
parent 540f4679bb
commit 791c547b2c
3 changed files with 12 additions and 12 deletions

View File

@ -3,9 +3,9 @@
// Overworld Debug // 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_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_OVERWORLD_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_OVERWORLD_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_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_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
// Debug Flags // Debug Flags
// To use the following debug features, replace the 0s with the flag ID you're assigning it to. // To use the following debug features, replace the 0s with the flag ID you're assigning it to.

View File

@ -131,11 +131,11 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
else if (heldKeys & DPAD_RIGHT) else if (heldKeys & DPAD_RIGHT)
input->dpadDirection = DIR_EAST; input->dpadDirection = DIR_EAST;
#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE #if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_OVERWORLD_IN_MENU == FALSE
if ((heldKeys & DEBUG_SYSTEM_HELD_KEYS) && input->DEBUG_SYSTEM_TRIGGER_EVENT) if ((heldKeys & DEBUG_OVERWORLD_HELD_KEYS) && input->DEBUG_OVERWORLD_TRIGGER_EVENT)
{ {
input->input_field_1_2 = TRUE; input->input_field_1_2 = TRUE;
input->DEBUG_SYSTEM_TRIGGER_EVENT = FALSE; input->DEBUG_OVERWORLD_TRIGGER_EVENT = FALSE;
} }
#endif #endif
} }
@ -197,7 +197,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE) if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
return 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) if (input->input_field_1_2)
{ {
PlaySE(SE_WIN_OPEN); PlaySE(SE_WIN_OPEN);

View File

@ -286,7 +286,7 @@ static void BuildStartMenuActions(void)
} }
else else
{ {
#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == TRUE #if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_OVERWORLD_IN_MENU == TRUE
BuildDebugStartMenu(); BuildDebugStartMenu();
#else #else
BuildNormalStartMenu(); BuildNormalStartMenu();