Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Pokémon Sprite Visualizer name official #4745

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/config/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#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_MENU TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
#define DEBUG_POKEMON_SPRITE_VISUALIZER TRUE // Enables a debug menu for Pokémon sprites and icons, accessed by pressing Select in the summary screen.

#endif // GUARD_CONFIG_DEBUG_H
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
#ifndef GUARD_CONSTANTS_POKEMON_DEBUG_H
#define GUARD_CONSTANTS_POKEMON_DEBUG_H
#ifndef GUARD_CONSTANTS_POKEMON_SPRITE_VISUALIZER_H
#define GUARD_CONSTANTS_POKEMON_SPRITE_VISUALIZER_H

//Defines
#define DEBUG_MON_BACK_X 62
#define DEBUG_MON_BACK_Y 80
#define DEBUG_ICON_X 224
#define DEBUG_ICON_Y 144
#define DEBUG_MON_SHINY 0
#define DEBUG_MON_NORMAL 9
#define DEBUG_FOLLOWER_X 176
#define DEBUG_FOLLOWER_Y 128
#define VISUALIZER_MON_BACK_X 62
#define VISUALIZER_MON_BACK_Y 80
#define VISUALIZER_ICON_X 224
#define VISUALIZER_ICON_Y 144
#define VISUALIZER_FOLLOWER_X 176
#define VISUALIZER_FOLLOWER_Y 128

#define MODIFY_DIGITS_MAX 4
#define MODIFY_DIGITS_ARROW_X 129
Expand Down Expand Up @@ -52,4 +50,4 @@
#define MAP_BATTLE_SCENE_KYOGRE 12
#define MAP_BATTLE_SCENE_RAYQUAZA 13

#endif // GUARD_CONSTANTS_POKEMON_DEBUG_H
#endif // GUARD_CONSTANTS_POKEMON_SPRITE_VISUALIZER_H
24 changes: 12 additions & 12 deletions include/pokemon_debug.h → include/pokemon_sprite_visualizer.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef GUARD_POKEMON_DEBUG_H
#define GUARD_POKEMON_DEBUG_H
#ifndef GUARD_POKEMON_SPRITE_VISUALIZER_H
#define GUARD_POKEMON_SPRITE_VISUALIZER_H

#include "constants/pokemon_debug.h"
#include "constants/pokemon_sprite_visualizer.h"

//Structs
struct PokemonDebugModifyArrows
struct PokemonSpriteVisualizerModifyArrows
{
u8 arrowSpriteId[2];
u16 minValue;
Expand All @@ -17,13 +17,13 @@ struct PokemonDebugModifyArrows
u8 typeOfVal;
};

struct PokemonDebugOptionArrows
struct PokemonSpriteVisualizerOptionArrows
{
u8 arrowSpriteId[1];
u8 currentDigit;
};

struct PokemonDebugYPosModifiyArrows
struct PokemonSpriteVisualizerYPosModifiyArrows
{
u8 arrowSpriteId[1];
u8 currentDigit;
Expand All @@ -43,7 +43,7 @@ struct PokemonSpriteOffsets
s8 offset_front_elevation;
};

struct PokemonDebugMenu
struct PokemonSpriteVisualizer
{
u16 currentmonId;
u8 currentmonWindowId;
Expand All @@ -55,9 +55,9 @@ struct PokemonDebugMenu
u8 frontShadowSpriteId;
bool8 isShiny;
bool8 isFemale;
struct PokemonDebugModifyArrows modifyArrows;
struct PokemonDebugOptionArrows optionArrows;
struct PokemonDebugYPosModifiyArrows yPosModifyArrows;
struct PokemonSpriteVisualizerModifyArrows modifyArrows;
struct PokemonSpriteVisualizerOptionArrows optionArrows;
struct PokemonSpriteVisualizerYPosModifiyArrows yPosModifyArrows;
struct PokemonSpriteConstValues constSpriteValues;
struct PokemonSpriteOffsets offsetsSpriteValues;
u8 animIdBack;
Expand All @@ -68,7 +68,7 @@ struct PokemonDebugMenu
u8 submenuYpos[3];
};

void CB2_Debug_Pokemon(void);
void CB2_Pokemon_Sprite_Visualizer(void);


#endif // GUARD_POKEMON_DEBUG_H
#endif // GUARD_POKEMON_SPRITE_VISUALIZER_H
4 changes: 2 additions & 2 deletions ld_script.ld
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ SECTIONS {
src/gym_leader_rematch.o(.text);
src/battle_transition_frontier.o(.text);
src/international_string_util.o(.text);
src/pokemon_debug.o(.text);
src/pokemon_sprite_visualizer.o(.text);
src/expansion_intro.o(.text);
} > ROM =0

Expand Down Expand Up @@ -726,7 +726,7 @@ SECTIONS {
data/mystery_gift.o(.rodata);
src/m4a_tables.o(.rodata);
data/sound_data.o(.rodata);
src/pokemon_debug.o(.rodata);
src/pokemon_sprite_visualizer.o(.rodata);
src/expansion_intro.o(.rodata);
} > ROM =0

Expand Down
2 changes: 1 addition & 1 deletion src/decompress.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "data.h"
#include "decompress.h"
#include "pokemon.h"
#include "pokemon_debug.h"
#include "pokemon_sprite_visualizer.h"
#include "text.h"

EWRAM_DATA ALIGNED(4) u8 gDecompressionBuffer[0x4000] = {0};
Expand Down
2 changes: 1 addition & 1 deletion src/pokemon_icon.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "graphics.h"
#include "mail.h"
#include "palette.h"
#include "pokemon_debug.h"
#include "pokemon_sprite_visualizer.h"
#include "pokemon_icon.h"
#include "sprite.h"
#include "data.h"
Expand Down
Loading
Loading