From c402a840b1f92e88a14bbdd14831eeb5441d30a6 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:20:26 +0100 Subject: [PATCH] changed to P_ENABLE_DEBUG --- include/pokemon_debug.h | 2 +- src/decompress.c | 2 +- src/field_control_avatar.c | 4 ++-- src/pokemon_icon.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/pokemon_debug.h b/include/pokemon_debug.h index a1aae5e153..d70409a6b1 100644 --- a/include/pokemon_debug.h +++ b/include/pokemon_debug.h @@ -1,7 +1,7 @@ #ifndef GUARD_POKEMON_DEBUG_H #define GUARD_POKEMON_DEBUG_H -#define POKEMON_DEBUG +#define P_ENABLE_DEBUG void CB2_Debug_Pokemon(void); diff --git a/src/decompress.c b/src/decompress.c index 722e6574a6..ba5e4b8429 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 POKEMON_DEBUG +#ifdef 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/field_control_avatar.c b/src/field_control_avatar.c index 66065681fc..c3fb5edd9d 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -132,7 +132,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys) else if (heldKeys & DPAD_RIGHT) input->dpadDirection = DIR_EAST; - #ifdef POKEMON_DEBUG + #ifdef P_ENABLE_DEBUG if ((heldKeys & R_BUTTON) && input->pressedStartButton) { input->input_field_1_2 = TRUE; @@ -199,7 +199,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) return TRUE; - #ifdef POKEMON_DEBUG + #ifdef P_ENABLE_DEBUG if (input->input_field_1_2) { //PlaySE(SE_WIN_OPEN); diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index ad5820ba13..0b7c3203cb 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 POKEMON_DEBUG +#ifdef 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 POKEMON_DEBUG +#ifdef 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 POKEMON_DEBUG +#ifdef 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 POKEMON_DEBUG +#ifdef P_ENABLE_DEBUG static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale) { const u8* iconSprite = gMonIconTable[species];