Skip to content

Commit

Permalink
Removed duplicate placeholder animations
Browse files Browse the repository at this point in the history
  • Loading branch information
@AsparagusEduardo
AsparagusEduardo committed Oct 27, 2024
1 parent 661cbc4 commit e831fed
Show file tree
Hide file tree
Showing 11 changed files with 490 additions and 2,778 deletions.
2 changes: 1 addition & 1 deletion src/data/pokemon/species_info.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.frontPic = gMonFrontPic_CircledQuestionMark,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_None,
.frontAnimFrames = sAnims_TwoFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_CircledQuestionMark,
.backPicSize = MON_COORDS_SIZE(40, 40),
Expand Down
176 changes: 88 additions & 88 deletions src/data/pokemon/species_info/gen_1_families.h
View file

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions src/data/pokemon/species_info/gen_2_families.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_TyphlosionHisui,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_TyphlosionHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_TyphlosionHisui,
.backPicSize = MON_COORDS_SIZE(64, 56),
Expand Down Expand Up @@ -1981,7 +1981,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_AmpharosMega,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_AmpharosMega,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_AmpharosMega,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -3209,7 +3209,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_WooperPaldea,
.frontPicSize = MON_COORDS_SIZE(40, 32),
.frontPicYOffset = 16,
.frontAnimFrames = sAnims_WooperPaldea,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_WooperPaldea,
.backPicSize = MON_COORDS_SIZE(64, 40),
Expand Down Expand Up @@ -3276,7 +3276,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Clodsire,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Clodsire,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Clodsire,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -3626,7 +3626,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Unown ##letter, \
.frontPicSize = MON_COORDS_SIZE(frontWidth, frontHeight), \
.frontPicYOffset = 16, \
.frontAnimFrames = sAnims_Unown, \
.frontAnimFrames = sAnims_SingleFramePlaceHolder, \
.frontAnimId = ANIM_ZIGZAG_FAST, \
.enemyMonElevation = 8, \
.backPic = gMonBackPic_Unown ##letter, \
Expand Down Expand Up @@ -3953,7 +3953,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Farigiraf,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Farigiraf,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Farigiraf,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -4223,7 +4223,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_DudunsparceTwoSegment,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Dudunsparce,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_DudunsparceTwoSegment,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -4287,7 +4287,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_DudunsparceThreeSegment,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Dudunsparce,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_DudunsparceThreeSegment,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -4722,7 +4722,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_QwilfishHisui,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 16,
.frontAnimFrames = sAnims_QwilfishHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.enemyMonElevation = 9,
.backPic = gMonBackPic_QwilfishHisui,
Expand Down Expand Up @@ -4789,7 +4789,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Overqwil,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Overqwil,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Overqwil,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -5008,7 +5008,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_HeracrossMega,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_HeracrossMega,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_HeracrossMega,
.backPicSize = MON_COORDS_SIZE(56, 64),
Expand Down Expand Up @@ -5234,7 +5234,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_SneaselHisui,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_SneaselHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_SneaselHisui,
.backPicSize = MON_COORDS_SIZE(56, 64),
Expand Down Expand Up @@ -5314,7 +5314,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Sneasler,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Sneasler,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Sneasler,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -5533,7 +5533,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Ursaluna,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Ursaluna,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Ursaluna,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -5597,7 +5597,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_UrsalunaBloodmoon,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_UrsalunaBloodmoon,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_UrsalunaBloodmoon,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -6105,7 +6105,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_CorsolaGalar,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_CorsolaGalar,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_CorsolaGalar,
.backPicSize = MON_COORDS_SIZE(56, 48),
Expand Down Expand Up @@ -6172,7 +6172,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Cursola,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Cursola,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Cursola,
.backPicSize = MON_COORDS_SIZE(64, 56),
Expand Down Expand Up @@ -6807,7 +6807,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_HoundoomMega,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_HoundoomMega,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_HoundoomMega,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -7082,7 +7082,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_Wyrdeer,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Wyrdeer,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Wyrdeer,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down Expand Up @@ -7726,7 +7726,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.frontPic = gMonFrontPic_TyranitarMega,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_TyranitarMega,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_TyranitarMega,
.backPicSize = MON_COORDS_SIZE(64, 64),
Expand Down
Loading

0 comments on commit e831fed

Please sign in to comment.