diff --git a/include/config/debug.h b/include/config/debug.h index 2446b9360..f5e1b55fb 100644 --- a/include/config/debug.h +++ b/include/config/debug.h @@ -2,16 +2,16 @@ #define GUARD_CONFIG_DEBUG_H // Overworld Debug -#define DEBUG_OVERWORLD_MENU TRUE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default. +#define DEBUG_OVERWORLD_MENU FALSE // Enables an overworld debug menu to change 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). // 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 FALSE // If set to TRUE, enables a debug menu to use in battles by pressing the Select button. #define DEBUG_AI_DELAY_TIMER FALSE // If set to TRUE, displays the number of frames it takes for the AI to choose a move. Replaces the "What will PKMN do" text. Useful for devs or anyone who modifies the AI code and wants to see if it doesn't take too long to run. // Pokémon Debug -#define DEBUG_POKEMON_SPRITE_VISUALIZER TRUE // Enables a debug menu for Pokémon sprites and icons, accessed by pressing Select in the summary screen. +#define DEBUG_POKEMON_SPRITE_VISUALIZER FALSE // Enables a debug menu for Pokémon sprites and icons, accessed by pressing Select in the summary screen. #endif // GUARD_CONFIG_DEBUG_H diff --git a/src/start_menu.c b/src/start_menu.c index abf71ce97..64619a5df 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -140,7 +140,7 @@ static const struct WindowTemplate sTimeWindowTemplate = { .width = 10, .height = 4, .paletteNum = 15, - .baseBlock = 0x198 + .baseBlock = 0x1A8 }; static const struct WindowTemplate sTimeSafariWindowTemplate = { @@ -234,6 +234,9 @@ static void AppendToStartMenuItems(u8 newEntry) static void SetUpStartMenu_NormalField(void) { +#if DEBUG_OVERWORLD_MENU == TRUE + AppendToStartMenuItems(STARTMENU_DEBUG); +#endif if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) AppendToStartMenuItems(STARTMENU_POKEDEX); if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) @@ -242,11 +245,7 @@ static void SetUpStartMenu_NormalField(void) AppendToStartMenuItems(STARTMENU_PLAYER); AppendToStartMenuItems(STARTMENU_SAVE); AppendToStartMenuItems(STARTMENU_OPTION); -#if DEBUG_OVERWORLD_MENU == TRUE - AppendToStartMenuItems(STARTMENU_DEBUG); -#else AppendToStartMenuItems(STARTMENU_EXIT); -#endif } static void SetUpStartMenu_SafariZone(void)