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

Add config to turn off two-framed front sprites #4750

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Add config to turn off two-framed front sprites #4750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92bb44f
Add config to turn off two-framed front sprites
Bassoonian Jun 9, 2024
074f0af
Two frames should be on by default
Bassoonian Jun 9, 2024
ea6a1ab
Simplifies integration
Bassoonian Jun 9, 2024
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/config/pokemon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#define P_SHOW_TERA_TYPE GEN_8 // Since Gen 9, the Tera Type is shown on the summary screen.
#define P_TM_LITERACY GEN_LATEST // Since Gen 6, TM illiterate Pokémon can learn TMs that teach moves that are in their level-up learnsets.
#define P_EGG_CYCLE_LENGTH GEN_LATEST // Since Gen 8, egg cycles take half as many steps as before.
#define P_TWO_FRAME_FRONT_SPRITES TRUE // In Pokémon Emerald, Pokémon front sprites always consist of two frames. This config can revert it to only use the first frame, as is the case in the other Gen 3 games.

// Learnset helper toggles
#define P_LEARNSET_HELPER_TEACHABLE TRUE // If TRUE, teachable_learnsets.h will be populated by tools/learnset_helpers/teachable.py using the included JSON files based on available TMs and tutors.
Expand Down
2 changes: 1 addition & 1 deletion src/pokemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6220,7 +6220,7 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality)

bool8 HasTwoFramesAnimation(u16 species)
{
return species != SPECIES_UNOWN;
return P_TWO_FRAME_FRONT_SPRITES && species != SPECIES_UNOWN;
}

static bool8 ShouldSkipFriendshipChange(void)
Expand Down
Loading