atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed P_ENABLE_DEBUG to TRUE/FALSE

Browse source
This commit is contained in:
TheXaman 2021-12-03 11:02:22 +01:00
parent bf0d2b8393
commit 40f7247e11
5 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/pokemon_config.h
View file

@ -18,7 +18,7 @@
#define P_UPDATED_EGG_GROUPS GEN_8 // Since Gen 8, certain Pokémon have gained new egg groups. #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_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 #ifndef ITEM_EXPANSION
//Item Definitions for gEvolutionTable //Item Definitions for gEvolutionTable

2
src/decompress.c
View file

@ -114,7 +114,7 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32
DrawSpindaSpots(species, personality, dest, isFrontPic); 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) static void LoadSpecialPokePicCustom(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic, bool8 isFemale)
{ {
if (species == SPECIES_UNOWN) if (species == SPECIES_UNOWN)

5
src/pokemon_debug.c
View file

@ -1,4 +1,4 @@
//Credits: Gamer2020, AsparagusEduardo //Credits: Gamer2020, AsparagusEduardo, TheXaman
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h" #include "battle_anim.h"
@ -118,6 +118,7 @@ static const struct WindowTemplate sPokemonDebugMsgBoxWindowTemplate =
.baseBlock = 0x100 .baseBlock = 0x100
}; };
#if P_ENABLE_DEBUG
//Function declarations //Function declarations
static void PrintDigitChars(struct PokemonDebugMenu *data); static void PrintDigitChars(struct PokemonDebugMenu *data);
static void SetUpModifyArrows(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); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
} }
} }
#endif

8
src/pokemon_icon.c
View file

@ -23,7 +23,7 @@ struct MonIconSpriteTemplate
// static functions // static functions
static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *, s16, s16, u8); 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 *GetMonIconPtrCustom(u16 species, u32 personality, bool8 isFemale);
static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale); static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale);
#endif #endif
@ -2580,7 +2580,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
return spriteId; 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 CreateMonIconCustom(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, u32 personality, bool8 isFemale, bool8 isShiny)
{ {
u8 spriteId; u8 spriteId;
@ -2678,7 +2678,7 @@ const u8 *GetMonIconPtr(u16 species, u32 personality)
return GetMonIconTiles(GetIconSpecies(species, personality), 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) static const u8 *GetMonIconPtrCustom(u16 species, u32 personality, bool8 isFemale)
{ {
return GetMonIconTilesCustom(GetIconSpecies(species, personality), isFemale); return GetMonIconTilesCustom(GetIconSpecies(species, personality), isFemale);
@ -2754,7 +2754,7 @@ const u8* GetMonIconTiles(u16 species, u32 personality)
return iconSprite; return iconSprite;
} }
#ifdef P_ENABLE_DEBUG #if P_ENABLE_DEBUG
static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale) static const u8* GetMonIconTilesCustom(u16 species, bool8 isFemale)
{ {
const u8* iconSprite = gMonIconTable[species]; const u8* iconSprite = gMonIconTable[species];

2
src/pokemon_summary_screen.c
View file

@ -1556,7 +1556,7 @@ static void Task_HandleInput(u8 taskId)
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
BeginCloseSummaryScreen(taskId); BeginCloseSummaryScreen(taskId);
} }
#ifdef P_ENABLE_DEBUG #if P_ENABLE_DEBUG
else if (JOY_NEW(SELECT_BUTTON)) else if (JOY_NEW(SELECT_BUTTON))
{ {
sMonSummaryScreen->callback = CB2_Debug_Pokemon; sMonSummaryScreen->callback = CB2_Debug_Pokemon;