Merge pull request #2143 from LOuroboros/patch-1

Added Castform's forms to HasTwoFramesAnimation
This commit is contained in:
Eduardo Quezada D'Ottone 2022-05-18 17:52:09 -04:00 committed by GitHub
commit 6ee5c203fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8143,7 +8143,10 @@ bool8 HasTwoFramesAnimation(u16 species)
return (species != SPECIES_CASTFORM return (species != SPECIES_CASTFORM
&& species != SPECIES_SPINDA && species != SPECIES_SPINDA
&& species != SPECIES_UNOWN && species != SPECIES_UNOWN
&& species != SPECIES_CHERRIM); && species != SPECIES_CHERRIM
&& species != SPECIES_CASTFORM_SUNNY
&& species != SPECIES_CASTFORM_RAINY
&& species != SPECIES_CASTFORM_SNOWY);
} }
static bool8 ShouldSkipFriendshipChange(void) static bool8 ShouldSkipFriendshipChange(void)