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.

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

Moved front animations frames to gSpeciesInfo #5605

Open
wants to merge 4 commits into
base: upcoming
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Loading