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.

Sign up for GitHub

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

Jump to bottom

Removed footprint field when P_FOOTPRINTS is FALSE #3925

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Removed footprint field when P_FOOTPRINTS is FALSE #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions include/pokedex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ u16 GetNationalPokedexCount(u8);
u16 GetHoennPokedexCount(u8);
u8 DisplayCaughtMonDexPage(u16 species, bool32 isShiny, u32 personality);
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
void DrawFootprint(u8 windowId, u16 species);
u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
bool16 HasAllHoennMons(void);
void ResetPokedexScrollPositions(void);
Expand Down
2 changes: 2 additions & 0 deletions include/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,9 @@ struct SpeciesInfo /*0x8C*/
/* 0x64 */ const u32 *shinyPaletteFemale;
/* 0x68 */ const u8 *iconSprite;
/* 0x6C */ const u8 *iconSpriteFemale;
#if P_FOOTPRINTS
/* 0x70 */ const u8 *footprint;
#endif
// All Pokémon pics are 64x64, but this data table defines where in this 64x64 frame the sprite's non-transparent pixels actually are.
/* 0x74 */ u8 frontPicSize; // The dimensions of this drawn pixel area.
/* 0x74 */ u8 frontPicSizeFemale; // The dimensions of this drawn pixel area.
Expand Down
6 changes: 3 additions & 3 deletions src/data/pokemon/species_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ const u8 gOgerponCornerstoneMaskPokedexText[] = _(
.teachableLearnset = s ## learn##TeachableLearnset

#if P_FOOTPRINTS
#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite
#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite,
#else
#define FOOTPRINT(sprite) .footprint = NULL
#define FOOTPRINT(sprite)
#endif

// Maximum value for a female Pokémon is 254 (MON_FEMALE) which is 100% female.
Expand Down Expand Up @@ -336,7 +336,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
//PALETTE_FEMALE(CircledQuestionMark),
ICON(QuestionMark, 0),
//ICON_FEMALE(QuestionMark, 1),
//FOOTPRINT(None),
//FOOTPRINT(None)
LEARNSETS(None),
.evolutions = EVOLUTION({EVO_LEVEL, 100, SPECIES_NONE},
{EVO_ITEM, ITEM_MOOMOO_MILK, SPECIES_NONE}),
Expand Down
374 changes: 187 additions & 187 deletions src/data/pokemon/species_info/gen_1.h
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading