Skip to content

Commit

Permalink
Moved front animations frames to gSpeciesInfo (#5605)
Browse files Browse the repository at this point in the history
Co-authored-by: psf <[email protected]>
  • Loading branch information
AsparagusEduardo and pkmnsnfrn authored Jan 20, 2025
1 parent f6a86a6 commit 3cdcb4b
Show file tree
Hide file tree
Showing 13 changed files with 6,326 additions and 14,066 deletions.
5 changes: 4 additions & 1 deletion src/data/pokemon/species_info.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#include "constants/abilities.h"
#include "species_info/shared_dex_text.h"
#include "species_info/shared_front_pic_anims.h"

// Macros for ease of use.

#define EVOLUTION(...) (const struct Evolution[]) { __VA_ARGS__, { EVOLUTIONS_END }, }

#define ANIM_FRAMES(...) (const union AnimCmd *const[]) { sAnim_GeneralFrame0, (const union AnimCmd[]) { __VA_ARGS__ ANIMCMD_END, }, }

#if P_FOOTPRINTS
#define FOOTPRINT(sprite) .footprint = gMonFootprint_## sprite,
#else
Expand Down Expand Up @@ -145,7 +148,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
1,681 changes: 1,408 additions & 273 deletions src/data/pokemon/species_info/gen_1_families.h

Large diffs are not rendered by default.

736 changes: 624 additions & 112 deletions src/data/pokemon/species_info/gen_2_families.h

Large diffs are not rendered by default.

1,343 changes: 1,171 additions & 172 deletions src/data/pokemon/species_info/gen_3_families.h

Large diffs are not rendered by default.

Loading

0 comments on commit 3cdcb4b

Please sign in to comment.