diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index bca1d5fb7..597b96f8e 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -18,7 +18,7 @@ #define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 8, certain Pokémon have gained new egg groups. #define P_SHEDINJA_BALL GEN_8 // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. -#define P_ENABLE_DEBUG // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. +#define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. #ifndef ITEM_EXPANSION //Item Definitions for gEvolutionTable diff --git a/src/decompress.c b/src/decompress.c index ba5e4b842..e85256106 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -114,7 +114,7 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 DrawSpindaSpots(species, personality, dest, isFrontPic); } -#ifdef P_ENABLE_DEBUG +#if P_ENABLE_DEBUG static void LoadSpecialPokePicCustom(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic, bool8 isFemale) { if (species == SPECIES_UNOWN) diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c index 5c632ed61..8543c1c4b 100644 --- a/src/pokemon_debug.c +++ b/src/pokemon_debug.c @@ -1,4 +1,4 @@ -//Credits: Gamer2020, AsparagusEduardo +//Credits: Gamer2020, AsparagusEduardo, TheXaman #include "global.h" #include "battle.h" #include "battle_anim.h" @@ -118,6 +118,7 @@ static const struct WindowTemplate sPokemonDebugMsgBoxWindowTemplate = .baseBlock = 0x100 }; +#if P_ENABLE_DEBUG //Function declarations static void PrintDigitChars(struct PokemonDebugMenu *data); static void SetUpModifyArrows(struct PokemonDebugMenu *data); @@ -676,3 +677,5 @@ static void Exit_Debug_Pokemon(u8 taskId) m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); } } + +#endif diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 0b7c3203c..678e19367 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -23,7 +23,7 @@ struct MonIconSpriteTemplate // static functions static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8); -#ifdef P_ENABLE_DEBUG +#if P_ENABLE_DEBUG static const u8 *GetMonIconPtrCustom(u16 species, u32 personality, bool8 isFemale); static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale); #endif @@ -2580,7 +2580,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u return spriteId; } -#ifdef P_ENABLE_DEBUG +#if P_ENABLE_DEBUG u8 CreateMonIconCustom(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool8 isFemale, bool8 isShiny) { u8 spriteId; @@ -2678,7 +2678,7 @@ const u8 *GetMonIconPtr(u16 species, u32 personality) return GetMonIconTiles(GetIconSpecies(species, personality), personality); } -#ifdef P_ENABLE_DEBUG +#if P_ENABLE_DEBUG static const u8 *GetMonIconPtrCustom(u16 species, u32 personality, bool8 isFemale) { return GetMonIconTilesCustom(GetIconSpecies(species, personality), isFemale); @@ -2754,7 +2754,7 @@ const u8* GetMonIconTiles(u16 species, u32 personality) return iconSprite; } -#ifdef P_ENABLE_DEBUG +#if P_ENABLE_DEBUG static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale) { const u8* iconSprite = gMonIconTable[species]; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 5545feab9..11da5ce17 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1556,7 +1556,7 @@ static void Task_HandleInput(u8 taskId) PlaySE(SE_SELECT); BeginCloseSummaryScreen(taskId); } - #ifdef P_ENABLE_DEBUG + #if P_ENABLE_DEBUG else if (JOY_NEW(SELECT_BUTTON)) { sMonSummaryScreen->callback = CB2_Debug_Pokemon;