Moved front animations frames to gSpeciesInfo (#5605)

Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
This commit is contained in:
Eduardo Quezada 2025-01-20 02:14:12 -03:00 committed by GitHub
parent f6a86a65ef
commit 3cdcb4b282
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 6326 additions and 14066 deletions

View File

@ -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
@ -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),

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -41,7 +41,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Chespin,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Chespin,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 24),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 24),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_H_SLIDE_SLOW,
.backPic = gMonBackPic_Chespin,
.backPicSize = MON_COORDS_SIZE(56, 64),
@ -104,7 +110,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Quilladin,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Quilladin,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 11),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_LUNGE_GROW,
.backPic = gMonBackPic_Quilladin,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -166,7 +178,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Chesnaught,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Chesnaught,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GROW_IN_STAGES,
.backPic = gMonBackPic_Chesnaught,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -229,7 +245,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Fennekin,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Fennekin,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Fennekin,
.backPicSize = MON_COORDS_SIZE(56, 48),
@ -292,7 +316,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Braixen,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Braixen,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Braixen,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -354,7 +382,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Delphox,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Delphox,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Delphox,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -417,7 +453,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Froakie,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Froakie,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 13),
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 13),
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 13),
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 11),
),
.frontAnimId = ANIM_H_JUMPS,
.backPic = gMonBackPic_Froakie,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -480,7 +524,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Frogadier,
.frontPicSize = MON_COORDS_SIZE(56, 48),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Frogadier,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 30),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Frogadier,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -598,7 +645,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Greninja,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_Greninja,
.frontAnimFrames =sAnims_Greninja,
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Greninja,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -658,7 +705,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_GreninjaAsh,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_GreninjaAsh,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 35),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_GreninjaAsh,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -715,7 +768,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Bunnelby,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Bunnelby,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE,
.backPic = gMonBackPic_Bunnelby,
.backPicSize = MON_COORDS_SIZE(48, 64),
@ -778,7 +834,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Diggersby,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Diggersby,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 35),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_H_JUMPS_V_STRETCH,
.backPic = gMonBackPic_Diggersby,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -841,7 +900,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Fletchling,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Fletchling,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(1, 7),
ANIMCMD_FRAME(0, 3),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_JUMPS_SMALL,
.backPic = gMonBackPic_Fletchling,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -904,7 +970,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Fletchinder,
.frontPicSize = MON_COORDS_SIZE(56, 48),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Fletchinder,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SLIDE_SLOW,
.enemyMonElevation = 9,
.backPic = gMonBackPic_Fletchinder,
@ -967,7 +1042,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Talonflame,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Talonflame,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 55),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SLIDE_WOBBLE,
.enemyMonElevation = 7,
.backPic = gMonBackPic_Talonflame,
@ -1201,7 +1279,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.shinyPalette = gMonShinyPalette_Vivillon ##form, \
.iconSprite = gMonIcon_Vivillon ##form, \
.iconPalIndex = iconPal, \
SHADOW(0, 20, SHADOW_SIZE_M) \
SHADOW(0, 20, SHADOW_SIZE_M) \
FOOTPRINT(Vivillon) \
OVERWORLD( \
sPicTable_Vivillon ##form, \
@ -1435,7 +1513,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Litleo,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Litleo,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 30),
),
.frontAnimId = ANIM_BACK_AND_LUNGE,
.backPic = gMonBackPic_Litleo,
.backPicSize = MON_COORDS_SIZE(56, 48),
@ -1498,7 +1580,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Pyroar,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Pyroar,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Pyroar,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1914,7 +1999,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Skiddo,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_Skiddo,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Skiddo,
.backPicSize = MON_COORDS_SIZE(56, 48),
@ -1977,7 +2065,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Gogoat,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Gogoat,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 36),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Gogoat,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2041,7 +2133,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Pancham,
.frontPicSize = MON_COORDS_SIZE(32, 48),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Pancham,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 8),
),
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_Pancham,
.backPicSize = MON_COORDS_SIZE(48, 56),
@ -2105,7 +2204,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Pangoro,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Pangoro,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_BACK_AND_LUNGE,
.backPic = gMonBackPic_Pangoro,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2175,7 +2281,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.shinyPalette = gMonShinyPalette_Furfrou##_form, \
.iconSprite = gMonIcon_Furfrou##_form, \
.iconPalIndex = _iconIdx, \
SHADOW(3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) \
SHADOW(3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) \
FOOTPRINT(Furfrou) \
OVERWORLD( \
sPicTable_Furfrou##_form, \
@ -2242,7 +2348,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Espurr,
.frontPicSize = MON_COORDS_SIZE(32, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Espurr,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 50),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Espurr,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -2432,7 +2546,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Honedge,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Honedge,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_SWING_CONVEX,
.enemyMonElevation = 4,
.backPic = gMonBackPic_Honedge,
@ -2496,7 +2614,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Doublade,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Doublade,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GROW_VIBRATE,
.enemyMonElevation = 5,
.backPic = gMonBackPic_Doublade,
@ -2562,7 +2686,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_AegislashShield,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_AegislashShield,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_H_VIBRATE,
.enemyMonElevation = 3,
.backPic = gMonBackPic_AegislashShield,
@ -2632,7 +2762,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_AegislashBlade,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_AegislashBlade,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW,
.enemyMonElevation = 3,
.backPic = gMonBackPic_AegislashBlade,
@ -2690,7 +2826,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Spritzee,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Spritzee,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_V_SLIDE_WOBBLE,
.enemyMonElevation = 14,
.backPic = gMonBackPic_Spritzee,
@ -2755,7 +2898,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Aromatisse,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Aromatisse,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 30),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Aromatisse,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -2818,7 +2964,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Swirlix,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Swirlix,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_H_JUMPS_V_STRETCH,
.backPic = gMonBackPic_Swirlix,
.backPicSize = MON_COORDS_SIZE(56, 40),
@ -2882,7 +3036,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Slurpuff,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Slurpuff,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 35),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Slurpuff,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -2945,7 +3105,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Inkay,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Inkay,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 25),
),
.frontAnimId = ANIM_V_SLIDE_WOBBLE,
.enemyMonElevation = 14,
.backPic = gMonBackPic_Inkay,
@ -3009,7 +3174,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Malamar,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Malamar,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 20),
),
.frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE,
.backPic = gMonBackPic_Malamar,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -3072,7 +3242,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Binacle,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 9,
.frontAnimFrames = sAnims_Binacle,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
),
.frontAnimId = ANIM_H_SLIDE,
.backPic = gMonBackPic_Binacle,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3136,7 +3313,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Barbaracle,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Barbaracle,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Barbaracle,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3199,7 +3379,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Skrelp,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Skrelp,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL,
.backPic = gMonBackPic_Skrelp,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3262,7 +3451,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Dragalge,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Dragalge,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_FRONT_FLIP,
.backPic = gMonBackPic_Dragalge,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3326,7 +3520,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Clauncher,
.frontPicSize = MON_COORDS_SIZE(56, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Clauncher,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_TIP_MOVE_FORWARD,
.backPic = gMonBackPic_Clauncher,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3390,7 +3590,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Clawitzer,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Clawitzer,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
),
.frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW,
.backPic = gMonBackPic_Clawitzer,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3453,7 +3662,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Helioptile,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Helioptile,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GLOW_YELLOW,
.backPic = gMonBackPic_Helioptile,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3517,7 +3730,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Heliolisk,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Heliolisk,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 30),
),
.frontAnimId = ANIM_RAPID_H_HOPS,
.backPic = gMonBackPic_Heliolisk,
.backPicSize = MON_COORDS_SIZE(56, 64),
@ -3580,7 +3797,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Tyrunt,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Tyrunt,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Tyrunt,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3643,7 +3865,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Tyrantrum,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Tyrantrum,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Tyrantrum,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -3706,7 +3931,18 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Amaura,
.frontPicSize = MON_COORDS_SIZE(32, 56),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Amaura,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 11),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_CONCAVE_ARC_SMALL_TWICE,
.backPic = gMonBackPic_Amaura,
.backPicSize = MON_COORDS_SIZE(40, 64),
@ -3769,7 +4005,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Aurorus,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Aurorus,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 20),
),
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Aurorus,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3837,7 +4076,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Hawlucha,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Hawlucha,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 28),
ANIMCMD_FRAME(1, 32),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Hawlucha,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3901,7 +4144,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Dedenne,
.frontPicSize = MON_COORDS_SIZE(64, 40),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Dedenne,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GLOW_YELLOW,
.backPic = gMonBackPic_Dedenne,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3966,7 +4213,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Carbink,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Carbink,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_ZIGZAG_SLOW,
.enemyMonElevation = 4,
.backPic = gMonBackPic_Carbink,
@ -4031,7 +4288,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Goomy,
.frontPicSize = MON_COORDS_SIZE(32, 40),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Goomy,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 28),
ANIMCMD_FRAME(1, 32),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Goomy,
.backPicSize = MON_COORDS_SIZE(48, 56),
@ -4096,7 +4357,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Sliggoo,
.frontPicSize = MON_COORDS_SIZE(32, 64),
.frontPicYOffset = 6,
.frontAnimFrames = sAnims_Sliggoo,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Sliggoo,
.backPicSize = MON_COORDS_SIZE(48, 64),
@ -4160,7 +4425,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Goodra,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Goodra,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Goodra,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -4224,7 +4495,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_SliggooHisui,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_SliggooHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_SliggooHisui,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -4289,7 +4560,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_GoodraHisui,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_GoodraHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_GoodraHisui,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -4356,7 +4627,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Klefki,
.frontPicSize = MON_COORDS_SIZE(40, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Klefki,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_FOUR_PETAL,
.enemyMonElevation = 5,
.backPic = gMonBackPic_Klefki,
@ -4421,7 +4702,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Phantump,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Phantump,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.enemyMonElevation = 5,
.backPic = gMonBackPic_Phantump,
@ -4486,7 +4771,14 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Trevenant,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Trevenant,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_H_SLIDE_SLOW,
.backPic = gMonBackPic_Trevenant,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -5066,7 +5358,13 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Bergmite,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Bergmite,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 11),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_LUNGE_GROW,
.backPic = gMonBackPic_Bergmite,
.backPicSize = MON_COORDS_SIZE(56, 48),
@ -5130,7 +5428,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Avalugg,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Avalugg,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Avalugg,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -5192,7 +5495,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_AvaluggHisui,
.frontPicSize = MON_COORDS_SIZE(64, 48),
.frontPicYOffset = 6,
.frontAnimFrames = sAnims_AvaluggHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_AvaluggHisui,
.backPicSize = MON_COORDS_SIZE(64, 32),
@ -5262,7 +5565,16 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Noibat,
.frontPicSize = MON_COORDS_SIZE(64, 48),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Noibat,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_RISING_WOBBLE,
.enemyMonElevation = 8,
.backPic = gMonBackPic_Noibat,
@ -5330,7 +5642,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Noivern,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Noivern,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 32),
ANIMCMD_FRAME(0, 20),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Noivern,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -5519,7 +5834,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Yveltal,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Yveltal,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_FRONT_FLIP,
.enemyMonElevation = 5,
.backPic = gMonBackPic_Yveltal,
@ -5837,7 +6157,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_ZygardeComplete,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_ZygardeComplete,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 15),
),
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_ZygardeComplete,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -5906,7 +6230,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Diancie,
.frontPicSize = MON_COORDS_SIZE(40, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Diancie,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Diancie,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -5974,7 +6302,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_DiancieMega,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_DiancieMega,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_DiancieMega,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -6036,7 +6364,17 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_HoopaConfined,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_HoopaConfined,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_ZIGZAG_SLOW,
.enemyMonElevation = 13,
.backPic = gMonBackPic_HoopaConfined,
@ -6103,7 +6441,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_HoopaUnbound,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_HoopaUnbound,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GROW_IN_STAGES,
.enemyMonElevation = 3,
.backPic = gMonBackPic_HoopaUnbound,
@ -6172,7 +6513,10 @@ const struct SpeciesInfo gSpeciesInfoGen6[] =
.frontPic = gMonFrontPic_Volcanion,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Volcanion,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE_TWICE,
.backPic = gMonBackPic_Volcanion,
.backPicSize = MON_COORDS_SIZE(64, 64),

View File

@ -41,7 +41,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Rowlet,
.frontPicSize = MON_COORDS_SIZE(31, 37),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Rowlet,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE,
.backPic = gMonBackPic_Rowlet,
.backPicSize = MON_COORDS_SIZE(43, 36),
@ -105,7 +108,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Dartrix,
.frontPicSize = MON_COORDS_SIZE(34, 47),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Dartrix,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Dartrix,
.backPicSize = MON_COORDS_SIZE(56, 54),
@ -168,7 +174,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Decidueye,
.frontPicSize = MON_COORDS_SIZE(45, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Decidueye,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_Decidueye,
.backPicSize = MON_COORDS_SIZE(46, 62),
@ -231,7 +240,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_DecidueyeHisui,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_DecidueyeHisui,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_DecidueyeHisui,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -297,7 +306,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Litten,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Litten,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_Litten,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -360,7 +369,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Torracat,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Torracat,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Torracat,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -422,7 +431,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Incineroar,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Incineroar,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Incineroar,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -485,7 +494,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Popplio,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Popplio,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Popplio,
.backPicSize = MON_COORDS_SIZE(48, 48),
@ -548,7 +557,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Brionne,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 6,
.frontAnimFrames = sAnims_Brionne,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW,
.backPic = gMonBackPic_Brionne,
.backPicSize = MON_COORDS_SIZE(48, 56),
@ -610,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Primarina,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Primarina,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_GLOW_BLUE_SLOW,
.backPic = gMonBackPic_Primarina,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -674,7 +683,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Pikipek,
.frontPicSize = MON_COORDS_SIZE(29, 40),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Pikipek,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Pikipek,
.backPicSize = MON_COORDS_SIZE(48, 48),
@ -738,7 +751,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Trumbeak,
.frontPicSize = MON_COORDS_SIZE(44, 53),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Trumbeak,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_Trumbeak,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -801,7 +819,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Toucannon,
.frontPicSize = MON_COORDS_SIZE(59, 59),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Toucannon,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_SHAKE_GLOW_RED_SLOW,
.backPic = gMonBackPic_Toucannon,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -865,7 +886,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Yungoos,
.frontPicSize = MON_COORDS_SIZE(64, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Yungoos,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Yungoos,
.backPicSize = MON_COORDS_SIZE(48, 40),
@ -925,7 +946,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Gumshoos,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Gumshoos,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SHAKE,
.backPic = gMonBackPic_Gumshoos,
.backPicSize = MON_COORDS_SIZE(48, 56),
@ -984,7 +1005,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Gumshoos,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Gumshoos,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SHAKE,
.backPic = gMonBackPic_Gumshoos,
.backPicSize = MON_COORDS_SIZE(48, 56),
@ -1050,7 +1071,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Grubbin,
.frontPicSize = MON_COORDS_SIZE(48, 32),
.frontPicYOffset = 17,
.frontAnimFrames = sAnims_Grubbin,
.frontAnimFrames = sAnims_Vikavolt,
.frontAnimId = ANIM_H_SLIDE,
.backPic = gMonBackPic_Grubbin,
.backPicSize = MON_COORDS_SIZE(64, 32),
@ -1114,7 +1135,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Charjabug,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Charjabug,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_SHAKE_FLASH_YELLOW_SLOW,
.backPic = gMonBackPic_Charjabug,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -1233,7 +1258,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Vikavolt,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Vikavolt,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES,
.enemyMonElevation = 8,
.backPic = gMonBackPic_Vikavolt,
@ -1301,7 +1334,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Crabrawler,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_Crabrawler,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Crabrawler,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -1366,7 +1399,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Crabominable,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Crabominable,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_Crabominable,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1430,7 +1463,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_OricorioBaile,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Oricorio,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_CONCAVE_ARC_SMALL,
.backPic = gMonBackPic_OricorioBaile,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1495,7 +1528,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_OricorioPomPom,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Oricorio,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_OricorioPomPom,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1560,7 +1593,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_OricorioPau,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Oricorio,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_OricorioPau,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1625,7 +1658,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_OricorioSensu,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Oricorio,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_OricorioSensu,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -1692,7 +1725,40 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Cutiefly,
.frontPicSize = MON_COORDS_SIZE(33, 35),
.frontPicYOffset = 16,
.frontAnimFrames = sAnims_Cutiefly,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 35),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 1),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_H_SLIDE_WOBBLE,
.enemyMonElevation = 10,
.backPic = gMonBackPic_Cutiefly,
@ -2002,7 +2068,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_LycanrocMidday,
.frontPicSize = MON_COORDS_SIZE(57, 53),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_LycanrocMidday,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_LycanrocMidday,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2064,7 +2133,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_LycanrocMidnight,
.frontPicSize = MON_COORDS_SIZE(56, 61),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_LycanrocMidnight,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_SLOW,
.backPic = gMonBackPic_LycanrocMidnight,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2126,7 +2198,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_LycanrocDusk,
.frontPicSize = MON_COORDS_SIZE(57, 58),
.frontPicYOffset = 6,
.frontAnimFrames = sAnims_LycanrocDusk,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_LycanrocDusk,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2190,7 +2265,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_WishiwashiSolo,
.frontPicSize = MON_COORDS_SIZE(40, 24),
.frontPicYOffset = 20,
.frontAnimFrames = sAnims_WishiwashiSolo,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL,
.enemyMonElevation = 12,
.backPic = gMonBackPic_WishiwashiSolo,
@ -2255,8 +2330,8 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_WishiwashiSchool,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_WishiwashiSchool,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, //Todo
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_WishiwashiSchool,
.backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = 5,
@ -2314,7 +2389,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Mareanie,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Mareanie,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GLOW_PURPLE,
.backPic = gMonBackPic_Mareanie,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -2378,7 +2453,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Toxapex,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Toxapex,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_GLOW_PURPLE_SLOW,
.backPic = gMonBackPic_Toxapex,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2442,7 +2517,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Mudbray,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_Mudbray,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Mudbray,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2506,7 +2581,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Mudsdale,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Mudsdale,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SHAKE_TWICE,
.backPic = gMonBackPic_Mudsdale,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -2570,7 +2645,14 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Dewpider,
.frontPicSize = MON_COORDS_SIZE(32, 48),
.frontPicYOffset = 13,
.frontAnimFrames = sAnims_Dewpider,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 9),
ANIMCMD_FRAME(0, 9),
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 9),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_SHRINK_GROW,
.backPic = gMonBackPic_Dewpider,
.backPicSize = MON_COORDS_SIZE(40, 48),
@ -2757,7 +2839,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Fomantis,
.frontPicSize = MON_COORDS_SIZE(40, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Fomantis,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.backPic = gMonBackPic_Fomantis,
.backPicSize = MON_COORDS_SIZE(40, 56),
@ -2818,7 +2900,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Lurantis,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Lurantis,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Lurantis,
.backPicSize = MON_COORDS_SIZE(56, 64),
@ -2877,7 +2959,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Lurantis,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Lurantis,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Lurantis,
.backPicSize = MON_COORDS_SIZE(56, 64),
@ -2945,7 +3027,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Morelull,
.frontPicSize = MON_COORDS_SIZE(24, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Morelull,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_FLASH_YELLOW,
.backPic = gMonBackPic_Morelull,
.backPicSize = MON_COORDS_SIZE(40, 48),
@ -3010,7 +3092,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Shiinotic,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Shiinotic,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_GLOW_WHITE_SLOW,
.backPic = gMonBackPic_Shiinotic,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3074,7 +3156,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Salandit,
.frontPicSize = MON_COORDS_SIZE(56, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Salandit,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_GLOW_RED,
.backPic = gMonBackPic_Salandit,
.backPicSize = MON_COORDS_SIZE(56, 40),
@ -3260,7 +3346,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Stufful,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Stufful,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 44),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Stufful,
.backPicSize = MON_COORDS_SIZE(56, 40),
@ -3323,7 +3413,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Bewear,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Bewear,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 60),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_Bewear,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -3387,7 +3481,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Bounsweet,
.frontPicSize = MON_COORDS_SIZE(32, 40),
.frontPicYOffset = 16,
.frontAnimFrames = sAnims_Bounsweet,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Bounsweet,
.backPicSize = MON_COORDS_SIZE(48, 40),
@ -3452,7 +3546,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Steenee,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 7,
.frontAnimFrames = sAnims_Steenee,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Steenee,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -3516,7 +3610,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Tsareena,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Tsareena,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW,
.backPic = gMonBackPic_Tsareena,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -3581,7 +3675,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Comfey,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 9,
.frontAnimFrames = sAnims_Comfey,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SLIDE_WOBBLE,
.enemyMonElevation = 8,
.backPic = gMonBackPic_Comfey,
@ -3646,7 +3740,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Oranguru,
.frontPicSize = MON_COORDS_SIZE(56, 56),
.frontPicYOffset = 5,
.frontAnimFrames = sAnims_Oranguru,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_SHRINK_GROW_SLOW,
.backPic = gMonBackPic_Oranguru,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3710,7 +3807,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Passimian,
.frontPicSize = MON_COORDS_SIZE(57, 60),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Passimian,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_H_SHAKE,
.backPic = gMonBackPic_Passimian,
.backPicSize = MON_COORDS_SIZE(51, 52),
@ -3774,7 +3874,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Wimpod,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 14,
.frontAnimFrames = sAnims_Wimpod,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_V_SHAKE_H_SLIDE_FAST,
.backPic = gMonBackPic_Wimpod,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3837,7 +3941,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Golisopod,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Golisopod,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_Golisopod,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -3901,7 +4009,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Sandygast,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Sandygast,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE,
.backPic = gMonBackPic_Sandygast,
.backPicSize = MON_COORDS_SIZE(40, 48),
@ -3965,7 +4073,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Palossand,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Palossand,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_VIBRATE,
.backPic = gMonBackPic_Palossand,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -4028,7 +4136,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Pyukumuku,
.frontPicSize = MON_COORDS_SIZE(40, 40),
.frontPicYOffset = 15,
.frontAnimFrames = sAnims_Pyukumuku,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_Pyukumuku,
.backPicSize = MON_COORDS_SIZE(48, 32),
@ -4092,7 +4204,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_TypeNull,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_TypeNull,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SHAKE,
.backPic = gMonBackPic_TypeNull,
.backPicSize = MON_COORDS_SIZE(56, 64),
@ -4154,7 +4266,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Silvally, \
.frontPicSize = MON_COORDS_SIZE(64, 64), \
.frontPicYOffset = 0, \
.frontAnimFrames = sAnims_Silvally, \
.frontAnimFrames = sAnims_SingleFramePlaceHolder, \
.frontAnimId = ANIM_V_SHAKE, \
.backPic = gMonBackPic_Silvally, \
.backPicSize = MON_COORDS_SIZE(56, 64), \
@ -4245,7 +4357,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MiniorMeteor, \
.frontPicSize = MON_COORDS_SIZE(48, 40), \
.frontPicYOffset = 14, \
.frontAnimFrames = sAnims_MiniorMeteor, \
.frontAnimFrames = sAnims_SingleFramePlaceHolder, \
.frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \
.enemyMonElevation = 17, \
.backPic = gMonBackPic_MiniorMeteor, \
@ -4282,7 +4394,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MiniorCore, \
.frontPicSize = MON_COORDS_SIZE(48, 40), \
.frontPicYOffset = 16, \
.frontAnimFrames = sAnims_MiniorMeteor, \
.frontAnimFrames = sAnims_SingleFramePlaceHolder, \
.frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, \
.enemyMonElevation = 17, \
.backPic = gMonBackPic_MiniorCore, \
@ -4352,7 +4464,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Komala,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_Komala,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_DIP,
.backPic = gMonBackPic_Komala,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -4417,7 +4529,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Turtonator,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Turtonator,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 44),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_SHAKE_GLOW_RED,
.backPic = gMonBackPic_Turtonator,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -4602,7 +4718,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MimikyuDisguised,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_MimikyuDisguised,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_MimikyuDisguised,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -4663,7 +4779,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MimikyuBusted,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_MimikyuBusted,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_MimikyuBusted,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -4716,7 +4832,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MimikyuDisguised,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_MimikyuDisguised,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_MimikyuDisguised,
.backPicSize = MON_COORDS_SIZE(56, 56),
@ -4779,7 +4895,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MimikyuBusted,
.frontPicSize = MON_COORDS_SIZE(48, 40),
.frontPicYOffset = 12,
.frontAnimFrames = sAnims_MimikyuBusted,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_MimikyuBusted,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -4840,7 +4956,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Bruxish,
.frontPicSize = MON_COORDS_SIZE(56, 40),
.frontPicYOffset = 15,
.frontAnimFrames = sAnims_Bruxish,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_RISING_WOBBLE,
.backPic = gMonBackPic_Bruxish,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -4905,7 +5021,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Drampa,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Drampa,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 50),
),
.frontAnimId = ANIM_V_SHAKE_TWICE,
.backPic = gMonBackPic_Drampa,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -4970,7 +5089,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Dhelmise,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Dhelmise,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SWING_CONVEX,
.enemyMonElevation = 2,
.backPic = gMonBackPic_Dhelmise,
@ -5035,7 +5154,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_JangmoO,
.frontPicSize = MON_COORDS_SIZE(36, 43),
.frontPicYOffset = 9,
.frontAnimFrames = sAnims_Jangmo_O,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_JangmoO,
.backPicSize = MON_COORDS_SIZE(42, 56),
@ -5099,7 +5221,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_HakamoO,
.frontPicSize = MON_COORDS_SIZE(53, 61),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Hakamo_O,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
),
.frontAnimId = ANIM_H_STRETCH,
.backPic = gMonBackPic_HakamoO,
.backPicSize = MON_COORDS_SIZE(49, 56),
@ -5218,7 +5343,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_KommoO,
.frontPicSize = MON_COORDS_SIZE(63, 63),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Kommo_O,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_KommoO,
.backPicSize = MON_COORDS_SIZE(60, 60),
@ -5284,7 +5415,15 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_TapuKoko,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_TapuKoko,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_TRIANGLE_DOWN_TWICE,
.enemyMonElevation = 9,
.backPic = gMonBackPic_TapuKoko,
@ -5350,7 +5489,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_TapuLele,
.frontPicSize = MON_COORDS_SIZE(48, 56),
.frontPicYOffset = 6,
.frontAnimFrames = sAnims_TapuLele,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL,
.enemyMonElevation = 8,
.backPic = gMonBackPic_TapuLele,
@ -5416,7 +5559,13 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_TapuBulu,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_TapuBulu,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 40),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_V_SHAKE_TWICE,
.enemyMonElevation = 5,
.backPic = gMonBackPic_TapuBulu,
@ -5482,7 +5631,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_TapuFini,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_TapuFini,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(1, 60),
ANIMCMD_FRAME(1, 60),
ANIMCMD_FRAME(0, 1),
),
.frontAnimId = ANIM_SHAKE_GLOW_BLUE_SLOW,
.frontAnimDelay = 5,
.enemyMonElevation = 6,
@ -5549,7 +5702,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Cosmog,
.frontPicSize = MON_COORDS_SIZE(56, 48),
.frontPicYOffset = 10,
.frontAnimFrames = sAnims_Cosmog,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_JUMPS_V_STRETCH,
.enemyMonElevation = 7,
.backPic = gMonBackPic_Cosmog,
@ -5617,7 +5770,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Cosmoem,
.frontPicSize = MON_COORDS_SIZE(48, 48),
.frontPicYOffset = 9,
.frontAnimFrames = sAnims_Cosmoem,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_RISING_WOBBLE,
.enemyMonElevation = 3,
.backPic = gMonBackPic_Cosmoem,
@ -5685,7 +5838,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Solgaleo,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Solgaleo,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Solgaleo,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -5749,7 +5902,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Lunala,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Lunala,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_CIRCULAR_VIBRATE,
.enemyMonElevation = 6,
.backPic = gMonBackPic_Lunala,
@ -5816,7 +5969,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Nihilego,
.frontPicSize = MON_COORDS_SIZE(48, 64),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Nihilego,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE,
.enemyMonElevation = 6,
.backPic = gMonBackPic_Nihilego,
@ -5883,7 +6036,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Buzzwole,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Buzzwole,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_Buzzwole,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -5948,7 +6101,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Pheromosa,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Pheromosa,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW,
.backPic = gMonBackPic_Pheromosa,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -6013,7 +6166,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Xurkitree,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Xurkitree,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_FLASH_YELLOW_FAST,
.backPic = gMonBackPic_Xurkitree,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -6080,7 +6233,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Celesteela,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Celesteela,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_STUTTER_SLOW,
.backPic = gMonBackPic_Celesteela,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -6145,7 +6298,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Kartana,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Kartana,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_VIBRATE,
.enemyMonElevation = 3,
.backPic = gMonBackPic_Kartana,
@ -6211,7 +6364,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Guzzlord,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 3,
.frontAnimFrames = sAnims_Guzzlord,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHRINK_GROW_VIBRATE_FAST,
.backPic = gMonBackPic_Guzzlord,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -6278,7 +6431,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Necrozma,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 2,
.frontAnimFrames = sAnims_Necrozma,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.enemyMonElevation = 6,
.backPic = gMonBackPic_Necrozma,
@ -6346,7 +6499,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_NecrozmaDuskMane,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Necrozma,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_NecrozmaDuskMane,
.backPicSize = MON_COORDS_SIZE(64, 64),
@ -6414,7 +6567,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_NecrozmaDawnWings,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Necrozma,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.enemyMonElevation = 6,
.backPic = gMonBackPic_NecrozmaDawnWings,
@ -6486,7 +6639,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_NecrozmaUltra,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Necrozma,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.enemyMonElevation = 5,
.backPic = gMonBackPic_NecrozmaUltra,
@ -6550,7 +6703,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Magearna,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Magearna,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SLIDE_SLOW,
.backPic = gMonBackPic_Magearna,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -6614,7 +6767,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MagearnaOriginal,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Magearna,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_H_SLIDE_SLOW,
.backPic = gMonBackPic_MagearnaOriginal,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -6683,7 +6836,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Marshadow,
.frontPicSize = MON_COORDS_SIZE(32, 56),
.frontPicYOffset = 9,
.frontAnimFrames = sAnims_Marshadow,
.frontAnimFrames = ANIM_FRAMES(
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 54),
ANIMCMD_FRAME(0, 10),
),
.frontAnimId = ANIM_V_SHAKE,
.backPic = gMonBackPic_Marshadow,
.backPicSize = MON_COORDS_SIZE(40, 56),
@ -6748,7 +6905,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Poipole,
.frontPicSize = MON_COORDS_SIZE(40, 56),
.frontPicYOffset = 8,
.frontAnimFrames = sAnims_Poipole,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_GLOW_PURPLE_SLOW,
.enemyMonElevation = 9,
.backPic = gMonBackPic_Poipole,
@ -6812,7 +6969,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Naganadel,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Naganadel,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_TRIANGLE_DOWN_TWICE,
.enemyMonElevation = 7,
.backPic = gMonBackPic_Naganadel,
@ -6878,7 +7035,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Stakataka,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Stakataka,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Stakataka,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -6943,7 +7100,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Blacephalon,
.frontPicSize = MON_COORDS_SIZE(56, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_Blacephalon,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_SHAKE_GLOW_RED,
.backPic = gMonBackPic_Blacephalon,
.backPicSize = MON_COORDS_SIZE(64, 48),
@ -7007,7 +7164,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Zeraora,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Zeraora,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_V_STRETCH,
.backPic = gMonBackPic_Zeraora,
.backPicSize = MON_COORDS_SIZE(64, 56),
@ -7072,7 +7229,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Meltan,
.frontPicSize = MON_COORDS_SIZE(32, 48),
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Meltan,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_STUTTER_SLOW,
.backPic = gMonBackPic_Meltan,
.backPicSize = MON_COORDS_SIZE(40, 40),
@ -7135,7 +7292,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_Melmetal,
.frontPicSize = MON_COORDS_SIZE(64, 56),
.frontPicYOffset = 4,
.frontAnimFrames = sAnims_Melmetal,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_Melmetal,
.backPicSize = MON_COORDS_SIZE(64, 40),
@ -7202,7 +7359,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.frontPic = gMonFrontPic_MelmetalGmax,
.frontPicSize = MON_COORDS_SIZE(64, 64),
.frontPicYOffset = 1,
.frontAnimFrames = sAnims_MelmetalGmax,
.frontAnimFrames = sAnims_SingleFramePlaceHolder,
//.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,
.backPic = gMonBackPic_MelmetalGmax,
.backPicSize = MON_COORDS_SIZE(64, 64),

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,448 @@
static const union AnimCmd *const sAnims_SingleFramePlaceHolder[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_TwoFramePlaceHolder[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#if P_FAMILY_BURMY
static const union AnimCmd *const sAnims_Burmy[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 32),
ANIMCMD_FRAME(0, 20),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Wormadam[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Mothim[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(1, 4),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 4),
ANIMCMD_FRAME(0, 4),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_BURMY
#if P_FAMILY_SHELLOS
static const union AnimCmd *const sAnims_Shellos[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 36),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Gastrodon[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
#endif //P_FAMILY_SHELLOS
#if P_FAMILY_ARCEUS
static const union AnimCmd *const sAnims_Arceus[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
#endif //P_FAMILY_ARCEUS
#if P_FAMILY_BASCULIN
static const union AnimCmd *const sAnims_Basculin[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
#endif //P_FAMILY_BASCULIN
#if P_FAMILY_DEERLING
static const union AnimCmd *const sAnims_Deerling[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Sawsbuck[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
#endif //P_FAMILY_DEERLING
#if P_FAMILY_GENESECT
static const union AnimCmd *const sAnims_Genesect[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 5),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_GENESECT
#if P_FAMILY_FROAKIE
static const union AnimCmd *const sAnims_Greninja[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 32),
ANIMCMD_FRAME(0, 20),
ANIMCMD_END,
},
};
#endif //P_FAMILY_GRENINJA
#if P_FAMILY_SCATTERBUG
static const union AnimCmd *const sAnims_Scatterbug[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 5),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 35),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Spewpa[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 18),
ANIMCMD_FRAME(1, 18),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Vivillon[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 50),
ANIMCMD_END,
},
};
#endif //P_FAMILY_SCATTERBUG
#if P_FAMILY_FLABEBE
static const union AnimCmd *const sAnims_Flabebe[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 27),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 23),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Floette[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 25),
ANIMCMD_FRAME(1, 50),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Florges[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_FLABEBE
#if P_FAMILY_FURFROU
static const union AnimCmd *const sAnims_Furfrou[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 27),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 6),
ANIMCMD_FRAME(1, 6),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#endif //P_FAMILY_FURFROU
#if P_FAMILY_ESPURR
static const union AnimCmd *const sAnims_Meowstic[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
#endif //P_FAMILY_MEOWSTIC
#if P_FAMILY_PUMPKABOO
static const union AnimCmd *const sAnims_Pumpkaboo[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 12),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Gourgeist[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 15),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_PUMPKABOO
#if P_FAMILY_XERNEAS
static const union AnimCmd *const sAnims_Xerneas[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 12),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 15),
ANIMCMD_END,
},
};
#endif //P_FAMILY_XERNEAS
#if P_FAMILY_ZYGARDE
static const union AnimCmd *const sAnims_Zygarde50[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 25),
ANIMCMD_FRAME(0, 30),
ANIMCMD_END,
},
};
static const union AnimCmd *const sAnims_Zygarde10[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 10),
ANIMCMD_FRAME(0, 10),
ANIMCMD_END,
},
};
#endif //P_FAMILY_ZYGARDE
#if P_FAMILY_GRUBBIN
static const union AnimCmd *const sAnims_Vikavolt[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 15),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#endif //P_FAMILY_GRUBBIN
#if P_FAMILY_CUTIEFLY
static const union AnimCmd *const sAnims_Ribombee[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 8),
ANIMCMD_END,
},
};
#endif //P_FAMILY_CUTIEFLY
#if P_FAMILY_ROCKRUFF
static const union AnimCmd *const sAnims_Rockruff[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 9),
ANIMCMD_FRAME(0, 8),
ANIMCMD_FRAME(1, 8),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_ROCKRUFF
#if P_FAMILY_DEWPIDER
static const union AnimCmd *const sAnims_Araquanid[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 1),
ANIMCMD_FRAME(1, 45),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#endif //P_FAMILY_DEWPIDER
#if P_FAMILY_SALANDIT
static const union AnimCmd *const sAnims_Salazzle[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#endif //P_FAMILY_SALANDIT
#if P_FAMILY_TOGEDEMARU
static const union AnimCmd *const sAnims_Togedemaru[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 5),
ANIMCMD_END,
},
};
#endif //P_FAMILY_TOGEDEMARU
#if P_FAMILY_JANGMO_O
static const union AnimCmd *const sAnims_Kommo_O[] =
{
sAnim_GeneralFrame0,
(const union AnimCmd[]) {
ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 20),
ANIMCMD_FRAME(1, 20),
ANIMCMD_FRAME(0, 1),
ANIMCMD_END,
},
};
#endif //P_FAMILY_JANGMO_O

File diff suppressed because it is too large Load Diff

View File

@ -676,7 +676,6 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] =
};
#include "data/graphics/pokemon.h"
#include "data/pokemon_graphics/front_pic_anims.h"
#include "data/pokemon/trainer_class_lookups.h"
#include "data/pokemon/experience_tables.h"