From 7d4de15d9d3f58a8097c75f26e7a5c1fa10f23f9 Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Mon, 21 Apr 2025 11:09:20 +0200 Subject: [PATCH] Change HasTwoFramesAnimation to take into account species with 1 frame (#6655) Co-authored-by: Hedara Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/pokemon.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index 0938a49b8f..d480701a3e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6334,7 +6334,10 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) bool8 HasTwoFramesAnimation(u16 species) { - return P_TWO_FRAME_FRONT_SPRITES && species != SPECIES_UNOWN && !gTestRunnerHeadless; + return P_TWO_FRAME_FRONT_SPRITES + && gSpeciesInfo[species].frontAnimFrames != sAnims_SingleFramePlaceHolder + && species != SPECIES_UNOWN + && !gTestRunnerHeadless; } static bool8 ShouldSkipFriendshipChange(void)