From 9eb8a9bf9aa5dcf3c081537fa315f7bc3cbf90e1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 29 Oct 2024 12:37:03 -0300 Subject: [PATCH 1/2] Removed duplicate placeholder animations --- src/data/pokemon/species_info.h | 2 +- .../pokemon/species_info/gen_1_families.h | 176 +- .../pokemon/species_info/gen_2_families.h | 40 +- .../pokemon/species_info/gen_3_families.h | 52 +- .../pokemon/species_info/gen_4_families.h | 12 +- .../pokemon/species_info/gen_5_families.h | 32 +- .../pokemon/species_info/gen_6_families.h | 8 +- .../pokemon/species_info/gen_7_families.h | 140 +- .../pokemon/species_info/gen_8_families.h | 232 +- .../pokemon/species_info/gen_9_families.h | 250 +- src/data/pokemon_graphics/front_pic_anims.h | 2324 +---------------- 11 files changed, 490 insertions(+), 2778 deletions(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 864fdc529732..e5b3faf076ca 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -145,7 +145,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), diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index fa8c8d9fde94..21dad49af705 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -250,7 +250,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_VenusaurMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_VenusaurMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_VenusaurMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -309,7 +309,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_VenusaurGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_VenusaurGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_VenusaurGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -563,7 +563,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_CharizardMegaX, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CharizardMegaX, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CharizardMegaX, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -619,7 +619,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_CharizardMegaY, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CharizardMegaY, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CharizardMegaY, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -677,7 +677,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_CharizardGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CharizardGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CharizardGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -933,7 +933,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_BlastoiseMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_BlastoiseMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BlastoiseMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -991,7 +991,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_BlastoiseGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_BlastoiseGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BlastoiseGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1267,7 +1267,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ButterfreeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_ButterfreeGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_ButterfreeGmax, @@ -1534,7 +1534,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_BeedrillMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_BeedrillMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_BeedrillMega, @@ -1807,7 +1807,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PidgeotMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_PidgeotMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_PidgeotMega, @@ -2019,7 +2019,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_RattataAlola, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_RattataAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RattataAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2082,7 +2082,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_RaticateAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_RaticateAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RaticateAlola, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2142,7 +2142,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_RaticateAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_RaticateAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RaticateAlola, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2532,7 +2532,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PichuSpikyEared, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_PichuSpikyEared, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PichuSpikyEared, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -2681,7 +2681,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuCosplay, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuCosplay, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuCosplay, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2732,7 +2732,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuRockStar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuRockStar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuRockStar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2784,7 +2784,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuBelle, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuBelle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuBelle, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2836,7 +2836,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuPopStar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuPopStar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuPopStar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2887,7 +2887,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuPhD, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuPhD, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuPhD, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2938,7 +2938,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuLibre, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuLibre, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuLibre, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2997,7 +2997,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuOriginal, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuOriginal, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuOriginal, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3052,7 +3052,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuHoenn, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuHoenn, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuHoenn, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3107,7 +3107,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuSinnoh, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuSinnoh, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuSinnoh, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3162,7 +3162,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuUnova, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuUnova, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuUnova, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3217,7 +3217,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuKalos, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuKalos, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuKalos, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3272,7 +3272,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3328,7 +3328,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuPartner, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuPartner, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuPartner, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3383,7 +3383,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuWorld, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_PikachuWorld, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuWorld, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3441,7 +3441,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PikachuGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_PikachuGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PikachuGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3655,7 +3655,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_RaichuAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RaichuAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_RaichuAlola, @@ -3852,7 +3852,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SandshrewAlola, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_SandshrewAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandshrewAlola, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -3918,7 +3918,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SandslashAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_SandslashAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandslashAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4753,7 +4753,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_VulpixAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_VulpixAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_VulpixAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4820,7 +4820,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_NinetalesAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_NinetalesAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_NinetalesAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6048,7 +6048,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_DiglettAlola, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 19, - .frontAnimFrames = sAnims_DiglettAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DiglettAlola, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -6115,7 +6115,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_DugtrioAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_DugtrioAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DugtrioAlola, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -6322,7 +6322,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MeowthAlola, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_MeowthAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MeowthAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6388,7 +6388,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PersianAlola, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_PersianAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PersianAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6453,7 +6453,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MeowthGalar, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_MeowthGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MeowthGalar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6517,7 +6517,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Perrserker, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Perrserker, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Perrserker, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6581,7 +6581,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MeowthGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_MeowthGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MeowthGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6902,7 +6902,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Annihilape, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Annihilape, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Annihilape, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7095,7 +7095,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GrowlitheHisui, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_GrowlitheHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GrowlitheHisui, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -7159,7 +7159,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ArcanineHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ArcanineHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ArcanineHisui, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7747,7 +7747,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_AlakazamMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_AlakazamMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_AlakazamMega, @@ -8032,7 +8032,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MachampGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MachampGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MachampGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -8633,7 +8633,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GeodudeAlola, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_GeodudeAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 16, .backPic = gMonBackPic_GeodudeAlola, @@ -8700,7 +8700,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GravelerAlola, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_GravelerAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GravelerAlola, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -8766,7 +8766,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GolemAlola, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GolemAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GolemAlola, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -8960,7 +8960,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PonytaGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_PonytaGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PonytaGalar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9025,7 +9025,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_RapidashGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RapidashGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RapidashGalar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9289,7 +9289,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SlowbroMega, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SlowbroMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlowbroMega, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9347,7 +9347,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SlowpokeGalar, .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 19, - .frontAnimFrames = sAnims_SlowpokeGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlowpokeGalar, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -9414,7 +9414,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SlowbroGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_SlowbroGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlowbroGalar, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9479,7 +9479,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SlowkingGalar, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SlowkingGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlowkingGalar, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -9825,7 +9825,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_FarfetchdGalar, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_FarfetchdGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_FarfetchdGalar, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9891,7 +9891,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Sirfetchd, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Sirfetchd, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sirfetchd, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -10379,7 +10379,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GrimerAlola, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_GrimerAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GrimerAlola, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -10447,7 +10447,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MukAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_MukAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MukAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -10857,7 +10857,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GengarMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_GengarMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GengarMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -10915,7 +10915,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GengarGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_GengarGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GengarGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11118,7 +11118,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SteelixMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SteelixMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SteelixMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11456,7 +11456,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_KinglerGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KinglerGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KinglerGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11651,7 +11651,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_VoltorbHisui, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_VoltorbHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_VoltorbHisui, .backPicSize = MON_COORDS_SIZE(48, 32), @@ -11715,7 +11715,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ElectrodeHisui, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_ElectrodeHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ElectrodeHisui, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -11919,7 +11919,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ExeggutorAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ExeggutorAlola, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ExeggutorAlola, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -12113,7 +12113,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MarowakAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_MarowakAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MarowakAlola, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -12173,7 +12173,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MarowakAlola, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_MarowakAlola, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MarowakAlola, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -12783,7 +12783,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_WeezingGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_WeezingGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_WeezingGalar, @@ -13487,7 +13487,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_KangaskhanMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KangaskhanMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KangaskhanMega, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -14186,7 +14186,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MrMimeGalar, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_MrMimeGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MrMimeGalar, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -14250,7 +14250,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MrRime, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_MrRime, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MrRime, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -14474,7 +14474,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ScizorMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ScizorMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ScizorMega, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -14533,7 +14533,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kleavor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Kleavor, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kleavor, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -15211,7 +15211,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PinsirMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_PinsirMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_PinsirMega, @@ -15341,7 +15341,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_TaurosPaldeaCombat, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldea, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeaCombat, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -15405,7 +15405,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_TaurosPaldeaBlaze, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldea, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeaBlaze, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -15469,7 +15469,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_TaurosPaldeaAqua, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_TaurosPaldea, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TaurosPaldeaAqua, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -15687,7 +15687,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_GyaradosMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GyaradosMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_GyaradosMega, @@ -15816,7 +15816,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_LaprasGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LaprasGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_LaprasGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -16029,7 +16029,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_EeveeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_EeveeGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_EeveeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -17199,7 +17199,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_AerodactylMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_AerodactylMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_AerodactylMega, @@ -17396,7 +17396,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_SnorlaxGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SnorlaxGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SnorlaxGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -17528,7 +17528,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ArticunoGalar, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_ArticunoGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_ArticunoGalar, @@ -17673,7 +17673,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_ZapdosGalar, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ZapdosGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZapdosGalar, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -17813,7 +17813,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MoltresGalar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_MoltresGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MoltresGalar, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -18152,7 +18152,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MewtwoMegaX, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MewtwoMegaX, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MewtwoMegaX, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -18211,7 +18211,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MewtwoMegaY, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MewtwoMegaY, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, .backPic = gMonBackPic_MewtwoMegaY, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index b3bd0da95abc..974610fddbcc 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -448,7 +448,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), @@ -1921,7 +1921,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), @@ -3111,7 +3111,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), @@ -3176,7 +3176,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), @@ -3515,7 +3515,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, \ @@ -3832,7 +3832,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), @@ -4094,7 +4094,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), @@ -4156,7 +4156,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), @@ -4578,7 +4578,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, @@ -4643,7 +4643,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), @@ -4855,7 +4855,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), @@ -5074,7 +5074,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), @@ -5151,7 +5151,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), @@ -5363,7 +5363,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), @@ -5425,7 +5425,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), @@ -5918,7 +5918,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), @@ -5983,7 +5983,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), @@ -6598,7 +6598,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), @@ -6865,7 +6865,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), @@ -7491,7 +7491,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), diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index af1b4476d8f2..7dda682c8de3 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -236,7 +236,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_SceptileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SceptileMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SceptileMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -525,7 +525,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_BlazikenMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_BlazikenMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BlazikenMega, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -779,7 +779,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_SwampertMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_SwampertMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SwampertMega, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1125,7 +1125,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_ZigzagoonGalar, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_ZigzagoonGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZigzagoonGalar, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1190,7 +1190,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_LinooneGalar, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_LinooneGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_LinooneGalar, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -1254,7 +1254,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Obstagoon, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Obstagoon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Obstagoon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2606,7 +2606,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_GardevoirMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GardevoirMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GardevoirMega, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -2738,7 +2738,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_GalladeMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GalladeMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GalladeMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4126,7 +4126,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_SableyeMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_SableyeMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SableyeMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4260,7 +4260,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_MawileMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_MawileMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MawileMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4519,7 +4519,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_AggronMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_AggronMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AggronMega, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4729,7 +4729,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_MedichamMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MedichamMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MedichamMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4914,7 +4914,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_ManectricMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_ManectricMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ManectricMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5770,7 +5770,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_SharpedoMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SharpedoMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, .backPic = gMonBackPic_SharpedoMega, @@ -6118,7 +6118,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CameruptMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_CameruptMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CameruptMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6920,7 +6920,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_AltariaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_AltariaMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_AltariaMega, @@ -8552,7 +8552,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_BanetteMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_BanetteMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_BanetteMega, @@ -9109,7 +9109,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_AbsolMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_AbsolMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AbsolMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -9307,7 +9307,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_GlalieMega, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GlalieMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_GlalieMega, @@ -10176,7 +10176,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_SalamenceMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_SalamenceMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SalamenceMega, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -10434,7 +10434,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_MetagrossMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_MetagrossMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_MetagrossMega, @@ -10782,7 +10782,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_LatiasMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LatiasMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_LatiasMega, @@ -10917,7 +10917,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_LatiosMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LatiosMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_LatiosMega, @@ -11052,7 +11052,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_KyogrePrimal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KyogrePrimal, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KyogrePrimal, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -11187,7 +11187,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_GroudonPrimal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GroudonPrimal, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GroudonPrimal, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -11326,7 +11326,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_RayquazaMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RayquazaMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_RayquazaMega, diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index b84284de2905..d23f7072803f 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -3176,7 +3176,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_LopunnyMega, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_LopunnyMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_LopunnyMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3976,7 +3976,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_GarchompMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GarchompMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GarchompMega, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4164,7 +4164,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_LucarioMega, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_LucarioMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_LucarioMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5024,7 +5024,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_AbomasnowMega, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_AbomasnowMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AbomasnowMega, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5779,7 +5779,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_DialgaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DialgaOrigin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DialgaOrigin, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5921,7 +5921,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_PalkiaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_PalkiaOrigin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_PalkiaOrigin, .backPicSize = MON_COORDS_SIZE(64, 64), diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 052b0f40c568..1f8e2d29476c 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -673,7 +673,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_SamurottHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SamurottHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SamurottHisui, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2570,7 +2570,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_AudinoMega, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_AudinoMega, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AudinoMega, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3816,7 +3816,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_LilligantHisui, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LilligantHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_LilligantHisui, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -4079,7 +4079,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_BasculegionM, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Basculegion, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_BasculegionM, @@ -4141,7 +4141,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_BasculegionF, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Basculegion, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_BasculegionF, @@ -4586,7 +4586,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_DarumakaGalar, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_DarumakaGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarumakaGalar, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -4651,7 +4651,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_DarmanitanGalarStandard, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DarmanitanGalarStandard, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarStandard, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -4715,7 +4715,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_DarmanitanGalarZen, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_DarmanitanGalarZen, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DarmanitanGalarZen, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5290,7 +5290,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_YamaskGalar, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_YamaskGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_YamaskGalar, @@ -5355,7 +5355,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Runerigus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Runerigus, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_Runerigus, @@ -5807,7 +5807,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_GarbodorGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_GarbodorGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GarbodorGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5993,7 +5993,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_ZoruaHisui, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ZoruaHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZoruaHisui, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -6057,7 +6057,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_ZoroarkHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ZoroarkHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZoroarkHisui, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -9576,7 +9576,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_StunfiskGalar, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_StunfiskGalar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_StunfiskGalar, .backPicSize = MON_COORDS_SIZE(64, 24), @@ -10090,7 +10090,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Kingambit, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Kingambit, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kingambit, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -10344,7 +10344,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_BraviaryHisui, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_BraviaryHisui, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, .backPic = gMonBackPic_BraviaryHisui, diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 147fadbaf806..a3b28756ddf7 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -4224,7 +4224,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 +4289,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), @@ -5192,7 +5192,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), @@ -5974,7 +5974,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), diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index d42167b88319..ece25e9ab250 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -231,7 +231,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 +297,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 +360,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 +422,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 +485,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 +548,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 +610,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), @@ -865,7 +865,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 +925,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 +984,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), @@ -1301,7 +1301,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 +1366,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 +1430,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 +1495,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 +1560,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 +1625,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), @@ -2190,7 +2190,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 +2255,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 +2314,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 +2378,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 +2442,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 +2506,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), @@ -2757,7 +2757,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 +2818,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 +2877,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 +2945,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 +3010,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), @@ -3387,7 +3387,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 +3452,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 +3516,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 +3581,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, @@ -3901,7 +3901,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 +3965,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), @@ -4092,7 +4092,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 +4154,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 +4245,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 +4282,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 +4352,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), @@ -4602,7 +4602,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 +4663,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 +4716,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 +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), @@ -4840,7 +4840,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), @@ -4970,7 +4970,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, @@ -5549,7 +5549,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 +5617,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 +5685,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 +5749,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 +5816,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 +5883,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 +5948,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 +6013,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 +6080,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 +6145,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 +6211,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 +6278,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 +6346,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 +6414,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 +6486,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 +6550,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 +6614,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), @@ -6748,7 +6748,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 +6812,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 +6878,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 +6943,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 +7007,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 +7072,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 +7135,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 +7202,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), diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 37eefda7f9e3..e46cd74682d7 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -41,7 +41,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Grookey, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Grookey, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Grookey, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -103,7 +103,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Thwackey, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Thwackey, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Thwackey, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -164,7 +164,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Rillaboom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Rillaboom, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Rillaboom, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -227,7 +227,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_RillaboomGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RillaboomGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RillaboomGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -286,7 +286,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Scorbunny, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Scorbunny, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Scorbunny, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -348,7 +348,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Raboot, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Raboot, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Raboot, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -410,7 +410,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Cinderace, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cinderace, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cinderace, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -474,7 +474,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CinderaceGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CinderaceGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CinderaceGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -534,7 +534,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Sobble, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Sobble, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sobble, .backPicSize = MON_COORDS_SIZE(40, 56), @@ -596,7 +596,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Drizzile, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Drizzile, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Drizzile, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -658,7 +658,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Inteleon, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Inteleon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Inteleon, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -722,7 +722,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_InteleonGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_InteleonGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_InteleonGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -781,7 +781,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Skwovet, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Skwovet, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Skwovet, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -845,7 +845,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Greedent, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Greedent, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Greedent, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1098,7 +1098,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CorviknightGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_CorviknightGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CorviknightGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1156,7 +1156,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Blipbug, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Blipbug, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Blipbug, .backPicSize = MON_COORDS_SIZE(40, 56), @@ -1221,7 +1221,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dottler, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Dottler, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dottler, .backPicSize = MON_COORDS_SIZE(56, 32), @@ -1284,7 +1284,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Orbeetle, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Orbeetle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Orbeetle, @@ -1350,7 +1350,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_OrbeetleGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_OrbeetleGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OrbeetleGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1409,7 +1409,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Nickit, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Nickit, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nickit, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1472,7 +1472,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Thievul, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Thievul, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Thievul, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -1535,7 +1535,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Gossifleur, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Gossifleur, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gossifleur, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1598,7 +1598,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Eldegoss, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Eldegoss, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Eldegoss, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -1661,7 +1661,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Wooloo, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Wooloo, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wooloo, .backPicSize = MON_COORDS_SIZE(56, 32), @@ -1724,7 +1724,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dubwool, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Dubwool, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dubwool, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -1912,7 +1912,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_DrednawGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DrednawGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DrednawGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1971,7 +1971,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Yamper, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Yamper, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Yamper, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -2034,7 +2034,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Boltund, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Boltund, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Boltund, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2097,7 +2097,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Rolycoly, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Rolycoly, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Rolycoly, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -2159,7 +2159,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Carkol, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Carkol, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Carkol, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2221,7 +2221,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Coalossal, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Coalossal, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, .frontAnimId = ANIM_GLOW_RED, .backPic = gMonBackPic_Coalossal, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2285,7 +2285,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CoalossalGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_CoalossalGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CoalossalGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2344,7 +2344,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Applin, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Applin, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Applin, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -2409,7 +2409,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Flapple, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Flapple, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, .backPic = gMonBackPic_Flapple, @@ -2474,7 +2474,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_FlappleGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_FlappleGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_FlappleGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2530,7 +2530,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Appletun, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Appletun, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Appletun, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2594,7 +2594,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_AppletunGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_AppletunGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AppletunGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2651,7 +2651,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dipplin, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Dipplin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dipplin, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2713,7 +2713,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Hydrapple, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Hydrapple, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Hydrapple, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2776,7 +2776,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Silicobra, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Silicobra, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Silicobra, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -2839,7 +2839,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Sandaconda, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Sandaconda, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sandaconda, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -2903,7 +2903,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_SandacondaGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_SandacondaGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandacondaGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2961,7 +2961,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Cramorant, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cramorant, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cramorant, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3025,7 +3025,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CramorantGulping, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cramorant, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CramorantGulping, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3081,7 +3081,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CramorantGorging, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cramorant, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CramorantGorging, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3139,7 +3139,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Arrokuda, .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Arrokuda, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arrokuda, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -3202,7 +3202,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Barraskewda, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Barraskewda, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Barraskewda, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3265,7 +3265,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Toxel, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Toxel, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toxel, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -3329,7 +3329,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ToxtricityAmped, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Toxtricity, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ToxtricityAmped, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3389,7 +3389,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ToxtricityGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ToxtricityGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ToxtricityGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3445,7 +3445,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ToxtricityLowKey, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Toxtricity, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ToxtricityLowKey, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -3505,7 +3505,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ToxtricityGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_ToxtricityGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ToxtricityGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3690,7 +3690,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CentiskorchGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_CentiskorchGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CentiskorchGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3749,7 +3749,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Clobbopus, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Clobbopus, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Clobbopus, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3811,7 +3811,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Grapploct, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Grapploct, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Grapploct, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -3873,7 +3873,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Sinistea, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Sinistea, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 9, .backPic = gMonBackPic_Sinistea, @@ -3937,7 +3937,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Sinistea, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Sinistea, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistea, @@ -4000,7 +4000,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Polteageist, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Polteageist, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, .backPic = gMonBackPic_Polteageist, @@ -4063,7 +4063,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Polteageist, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Polteageist, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 11, .backPic = gMonBackPic_Polteageist, @@ -4128,7 +4128,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Hatenna, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Hatenna, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Hatenna, .backPicSize = MON_COORDS_SIZE(40, 40), @@ -4190,7 +4190,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Hattrem, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Hattrem, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Hattrem, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -4251,7 +4251,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Hatterene, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Hatterene, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Hatterene, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -4315,7 +4315,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_HattereneGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_HattereneGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_HattereneGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4374,7 +4374,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Impidimp, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Impidimp, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Impidimp, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -4436,7 +4436,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Morgrem, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Morgrem, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Morgrem, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -4498,7 +4498,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Grimmsnarl, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Grimmsnarl, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Grimmsnarl, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -4562,7 +4562,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_GrimmsnarlGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_GrimmsnarlGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GrimmsnarlGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4620,7 +4620,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Milcery, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Milcery, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Milcery, @@ -4691,7 +4691,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Alcremie ##sweet, \ .frontPicSize = MON_COORDS_SIZE(40, 56), \ .frontPicYOffset = 7, \ - .frontAnimFrames = sAnims_Alcremie, \ + .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ .backPic = gMonBackPic_Alcremie ##sweet, \ .backPicSize = MON_COORDS_SIZE(48, 56), \ @@ -4802,7 +4802,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_AlcremieGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_AlcremieGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_AlcremieGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4860,7 +4860,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Falinks, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Falinks, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Falinks, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -4922,7 +4922,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Pincurchin, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Pincurchin, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pincurchin, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -4987,7 +4987,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Snom, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 20, - .frontAnimFrames = sAnims_Snom, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Snom, .backPicSize = MON_COORDS_SIZE(48, 32), @@ -5050,7 +5050,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Frosmoth, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Frosmoth, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_Frosmoth, @@ -5114,7 +5114,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Stonjourner, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Stonjourner, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Stonjourner, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5178,7 +5178,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_EiscueIce, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Eiscue, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_EiscueIce, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -5242,7 +5242,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_EiscueNoice, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Eiscue, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_EiscueNoice, .backPicSize = MON_COORDS_SIZE(40, 64), @@ -5300,7 +5300,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_IndeedeeM, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Indeedee, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IndeedeeM, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -5362,7 +5362,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_IndeedeeF, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Indeedee, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IndeedeeF, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5427,7 +5427,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_MorpekoFullBelly, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Morpeko, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MorpekoFullBelly, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -5491,7 +5491,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_MorpekoHangry, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Morpeko, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_MorpekoHangry, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -5550,7 +5550,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Cufant, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Cufant, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cufant, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -5613,7 +5613,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Copperajah, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Copperajah, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Copperajah, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -5678,7 +5678,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CopperajahGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_CopperajahGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CopperajahGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5737,7 +5737,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dracozolt, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Dracozolt, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dracozolt, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5799,7 +5799,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Arctozolt, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Arctozolt, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arctozolt, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -5862,7 +5862,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dracovish, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Dracovish, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dracovish, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5925,7 +5925,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Arctovish, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Arctovish, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arctovish, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -5987,7 +5987,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Duraludon, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Duraludon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Duraludon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6053,7 +6053,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_DuraludonGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DuraludonGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_DuraludonGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6112,7 +6112,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Archaludon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Archaludon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Archaludon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6176,7 +6176,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dreepy, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Dreepy, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_Dreepy, @@ -6239,7 +6239,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Drakloak, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Drakloak, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_Drakloak, @@ -6302,7 +6302,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Dragapult, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Dragapult, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 3, .backPic = gMonBackPic_Dragapult, @@ -6365,7 +6365,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ZacianHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Zacian, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZacianHero, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6431,7 +6431,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ZacianCrowned, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Zacian, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZacianCrowned, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6499,7 +6499,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ZamazentaHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Zamazenta, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZamazentaHero, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6565,7 +6565,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ZamazentaCrowned, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Zamazenta, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZamazentaCrowned, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6633,7 +6633,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Eternatus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Eternatus, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 4, .backPic = gMonBackPic_Eternatus, @@ -6699,7 +6699,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_EternatusEternamax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Eternatus, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 13, .backPic = gMonBackPic_EternatusEternamax, @@ -6758,7 +6758,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Kubfu, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Kubfu, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kubfu, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -6825,7 +6825,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_UrshifuSingleStrike, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Urshifu, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_UrshifuSingleStrike, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6891,7 +6891,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_UrshifuSingleStrikeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_UrshifuSingleStrikeGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_UrshifuSingleStrikeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6949,7 +6949,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_UrshifuRapidStrike, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Urshifu, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_UrshifuRapidStrike, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7015,7 +7015,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_UrshifuRapidStrikeGmax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_UrshifuRapidStrikeGmax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_UrshifuRapidStrikeGmax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7076,7 +7076,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Zarude, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Zarude, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Zarude, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7140,7 +7140,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_ZarudeDada, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Zarude, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ZarudeDada, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7199,7 +7199,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Regieleki, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Regieleki, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Regieleki, @@ -7265,7 +7265,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Regidrago, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Regidrago, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_Regidrago, @@ -7330,7 +7330,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Glastrier, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Glastrier, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Glastrier, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -7395,7 +7395,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Spectrier, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Spectrier, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Spectrier, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -7460,7 +7460,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Calyrex, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Calyrex, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Calyrex, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -7526,7 +7526,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CalyrexIce, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Calyrex, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CalyrexIce, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7592,7 +7592,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_CalyrexShadow, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Calyrex, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CalyrexShadow, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7661,7 +7661,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_EnamorusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_EnamorusIncarnate, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_EnamorusIncarnate, @@ -7726,7 +7726,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_EnamorusTherian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_EnamorusTherian, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_EnamorusTherian, .backPicSize = MON_COORDS_SIZE(64, 64), diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 7b5fcdd3d1eb..2f258307a1e0 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -41,7 +41,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Sprigatito, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Sprigatito, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sprigatito, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -104,7 +104,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Floragato, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Floragato, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Floragato, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -166,7 +166,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Meowscarada, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Meowscarada, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Meowscarada, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -229,7 +229,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Fuecoco, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Fuecoco, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fuecoco, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -292,7 +292,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Crocalor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Crocalor, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Crocalor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -354,7 +354,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Skeledirge, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Skeledirge, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Skeledirge, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -417,7 +417,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Quaxly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Quaxly, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Quaxly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -480,7 +480,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Quaxwell, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Quaxwell, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Quaxwell, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -542,7 +542,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Quaquaval, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Quaquaval, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Quaquaval, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -605,7 +605,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Lechonk, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Lechonk, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lechonk, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -668,7 +668,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_OinkologneM, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Oinkologne, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneM, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -730,7 +730,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_OinkologneF, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Oinkologne, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_OinkologneF, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -794,7 +794,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tarountula, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Tarountula, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tarountula, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -857,7 +857,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Spidops, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Spidops, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Spidops, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -920,7 +920,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Nymble, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Nymble, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nymble, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -983,7 +983,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Lokix, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Lokix, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lokix, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1046,7 +1046,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Pawmi, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Pawmi, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pawmi, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1109,7 +1109,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Pawmo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Pawmo, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pawmo, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1171,7 +1171,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Pawmot, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Pawmot, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pawmot, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1234,7 +1234,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tandemaus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Tandemaus, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tandemaus, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1298,7 +1298,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_MausholdThree, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Maushold, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_MausholdThree, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1359,7 +1359,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_MausholdFour, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Maushold, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_MausholdFour, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1423,7 +1423,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Fidough, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Fidough, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fidough, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1486,7 +1486,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Dachsbun, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Dachsbun, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dachsbun, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1549,7 +1549,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Smoliv, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Smoliv, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Smoliv, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1612,7 +1612,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Dolliv, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Dolliv, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dolliv, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1674,7 +1674,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Arboliva, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Arboliva, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arboliva, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1737,7 +1737,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Squawkabilly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Squawkabilly, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_Squawkabilly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1800,7 +1800,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Squawkabilly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Squawkabilly, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_Squawkabilly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1863,7 +1863,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Squawkabilly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Squawkabilly, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_Squawkabilly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1926,7 +1926,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Squawkabilly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Squawkabilly, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_Squawkabilly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1991,7 +1991,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Nacli, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Nacli, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nacli, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2054,7 +2054,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Naclstack, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Naclstack, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Naclstack, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2116,7 +2116,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Garganacl, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Garganacl, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Garganacl, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2179,7 +2179,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Charcadet, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Charcadet, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Charcadet, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2243,7 +2243,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Armarouge, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Armarouge, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Armarouge, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2304,7 +2304,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Ceruledge, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Ceruledge, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Ceruledge, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2367,7 +2367,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tadbulb, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Tadbulb, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 12, .backPic = gMonBackPic_Tadbulb, @@ -2431,7 +2431,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Bellibolt, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Bellibolt, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Bellibolt, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2494,7 +2494,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Wattrel, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Wattrel, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wattrel, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2557,7 +2557,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Kilowattrel, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Kilowattrel, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kilowattrel, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2620,7 +2620,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Maschiff, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Maschiff, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Maschiff, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2683,7 +2683,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Mabosstiff, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Mabosstiff, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Mabosstiff, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2746,7 +2746,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Shroodle, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Shroodle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Shroodle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2809,7 +2809,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Grafaiai, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Grafaiai, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Grafaiai, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2872,7 +2872,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Bramblin, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Bramblin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Bramblin, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2935,7 +2935,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Brambleghast, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Brambleghast, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Brambleghast, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3000,7 +3000,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Toedscool, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Toedscool, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toedscool, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3065,7 +3065,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Toedscruel, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Toedscruel, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toedscruel, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3128,7 +3128,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Klawf, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Klawf, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Klawf, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3192,7 +3192,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Capsakid, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Capsakid, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Capsakid, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3255,7 +3255,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Scovillain, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Scovillain, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Scovillain, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3319,7 +3319,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Rellor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Rellor, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Rellor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3382,7 +3382,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Rabsca, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Rabsca, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Rabsca, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3445,7 +3445,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Flittle, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Flittle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Flittle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3508,7 +3508,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Espathra, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Espathra, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Espathra, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3571,7 +3571,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tinkatink, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Tinkatink, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkatink, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3635,7 +3635,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tinkatuff, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Tinkatuff, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkatuff, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3698,7 +3698,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Tinkaton, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Tinkaton, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tinkaton, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3761,7 +3761,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Wiglett, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Wiglett, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wiglett, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3823,7 +3823,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Wugtrio, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Wugtrio, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wugtrio, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3886,7 +3886,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Bombirdier, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Bombirdier, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Bombirdier, @@ -3950,7 +3950,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Finizen, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Finizen, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Finizen, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4013,7 +4013,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_PalafinZero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Palafin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_PalafinZero, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4076,7 +4076,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_PalafinHero, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Palafin, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_PalafinHero, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4141,7 +4141,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Varoom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Varoom, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Varoom, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4204,7 +4204,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Revavroom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Revavroom, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Revavroom, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4267,7 +4267,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Cyclizar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Cyclizar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cyclizar, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4331,7 +4331,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Orthworm, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Orthworm, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Orthworm, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4395,7 +4395,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Glimmet, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Glimmet, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 11, .backPic = gMonBackPic_Glimmet, @@ -4459,7 +4459,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Glimmora, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Glimmora, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Glimmora, @@ -4523,7 +4523,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Greavard, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Greavard, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Greavard, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4586,7 +4586,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Houndstone, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Houndstone, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Houndstone, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4649,7 +4649,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Flamigo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Flamigo, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Flamigo, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4713,7 +4713,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Cetoddle, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Cetoddle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cetoddle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4776,7 +4776,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Cetitan, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Cetitan, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cetitan, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4839,7 +4839,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Veluza, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Veluza, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 5, .backPic = gMonBackPic_Veluza, @@ -4904,7 +4904,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Dondozo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Dondozo, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, .backPic = gMonBackPic_Dondozo, @@ -4969,7 +4969,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TatsugiriCurly, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Tatsugiri, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TatsugiriCurly, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5031,7 +5031,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TatsugiriDroopy, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Tatsugiri, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TatsugiriDroopy, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5093,7 +5093,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TatsugiriStretchy, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Tatsugiri, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ .backPic = gMonBackPic_TatsugiriStretchy, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5159,7 +5159,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GreatTusk, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_GreatTusk, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GreatTusk, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5224,7 +5224,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_ScreamTail, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_ScreamTail, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ScreamTail, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5289,7 +5289,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_BruteBonnet, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_BruteBonnet, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_BruteBonnet, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5356,7 +5356,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_FlutterMane, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_FlutterMane, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 18, .backPic = gMonBackPic_FlutterMane, @@ -5421,7 +5421,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_SlitherWing, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SlitherWing, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SlitherWing, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5486,7 +5486,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_SandyShocks, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_SandyShocks, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_SandyShocks, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5551,7 +5551,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronTreads, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_IronTreads, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronTreads, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5616,7 +5616,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronBundle, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_IronBundle, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBundle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5681,7 +5681,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronHands, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_IronHands, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronHands, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5746,7 +5746,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronJugulis, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_IronJugulis, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 7, .backPic = gMonBackPic_IronJugulis, @@ -5812,7 +5812,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronMoth, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_IronMoth, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_IronMoth, @@ -5878,7 +5878,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronThorns, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_IronThorns, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronThorns, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5942,7 +5942,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Frigibax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Frigibax, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Frigibax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6005,7 +6005,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Arctibax, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Arctibax, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Arctibax, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6067,7 +6067,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Baxcalibur, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Baxcalibur, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Baxcalibur, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6130,7 +6130,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GimmighoulChest, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Gimmighoul, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GimmighoulChest, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6193,7 +6193,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GimmighoulRoaming, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Gimmighoul, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GimmighoulRoaming, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6248,7 +6248,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Gholdengo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Gholdengo, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gholdengo, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6311,7 +6311,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_WoChien, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_WoChien, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WoChien, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6376,7 +6376,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_ChienPao, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_ChienPao, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ChienPao, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6441,7 +6441,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TingLu, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_TingLu, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_TingLu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6506,7 +6506,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_ChiYu, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_ChiYu, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 15, .backPic = gMonBackPic_ChiYu, @@ -6573,7 +6573,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_RoaringMoon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RoaringMoon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 0, .backPic = gMonBackPic_RoaringMoon, @@ -6638,7 +6638,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronValiant, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_IronValiant, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronValiant, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6702,7 +6702,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Koraidon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Koraidon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Koraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6768,7 +6768,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Miraidon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Miraidon, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Miraidon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6834,7 +6834,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_WalkingWake, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_WalkingWake, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_WalkingWake, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6898,7 +6898,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronLeaves, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_IronLeaves, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronLeaves, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6962,7 +6962,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Poltchageist, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Poltchageist, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Poltchageist, @@ -7024,7 +7024,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Poltchageist, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Poltchageist, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Poltchageist, @@ -7087,7 +7087,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Sinistcha, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Sinistcha, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistcha, @@ -7148,7 +7148,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Sinistcha, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Sinistcha, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Sinistcha, @@ -7212,7 +7212,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Okidogi, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Okidogi, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Okidogi, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7277,7 +7277,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Munkidori, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Munkidori, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Munkidori, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7342,7 +7342,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Fezandipiti, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Fezandipiti, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fezandipiti, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7404,7 +7404,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Ogerpon##Form2, \ .frontPicSize = MON_COORDS_SIZE(64, 64), \ .frontPicYOffset = 0, \ - .frontAnimFrames = sAnims_Ogerpon, \ + .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ .backPic = gMonBackPic_Ogerpon##Form2, \ .backPicSize = MON_COORDS_SIZE(64, 64), \ @@ -7485,7 +7485,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_GougingFire, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_GougingFire, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_GougingFire, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7550,7 +7550,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_RagingBolt, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_RagingBolt, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_RagingBolt, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7614,7 +7614,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronBoulder, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_IronBoulder, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronBoulder, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7679,7 +7679,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_IronCrown, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_IronCrown, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_IronCrown, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7744,7 +7744,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TerapagosNormal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_TerapagosNormal, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, .backPic = gMonBackPic_TerapagosNormal, @@ -7813,7 +7813,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TerapagosTerastal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_TerapagosTerastal, + .frontAnimFrames = sAnims_TwoFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 1, .backPic = gMonBackPic_TerapagosTerastal, @@ -7881,7 +7881,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_TerapagosStellar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_TerapagosStellar, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_TerapagosStellar, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7942,7 +7942,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .frontPic = gMonFrontPic_Pecharunt, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Pecharunt, + .frontAnimFrames = sAnims_SingleFramePlaceHolder, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pecharunt, .backPicSize = MON_COORDS_SIZE(64, 64), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 8452e24732c7..396abbea2829 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -1,25 +1,27 @@ -#define PLACEHOLDER_ANIM_SINGLE_FRAME(name) \ -static const union AnimCmd sAnim_##name##_1[] = \ -{ \ - ANIMCMD_FRAME(0, 1), \ - ANIMCMD_END, \ -} +static const union AnimCmd sAnim_SingleFramePlaceHolder_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; -#define PLACEHOLDER_ANIM_TWO_FRAMES(name) \ -static const union AnimCmd sAnim_##name##_1[] = \ -{ \ - ANIMCMD_FRAME(0, 30), \ - ANIMCMD_FRAME(1, 30), \ - ANIMCMD_FRAME(0, 1), \ - ANIMCMD_END, \ -} +static const union AnimCmd *const sAnims_SingleFramePlaceHolder[] = +{ + sAnim_GeneralFrame0, + sAnim_SingleFramePlaceHolder_1, +}; -static const union AnimCmd sAnim_None_1[] = +static const union AnimCmd sAnim_TwoFramePlaceHolder_1[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), - ANIMCMD_END, + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnims_TwoFramePlaceHolder[] = +{ + sAnim_GeneralFrame0, + sAnim_TwoFramePlaceHolder_1, }; #if P_FAMILY_BULBASAUR @@ -46,14 +48,6 @@ static const union AnimCmd sAnim_Venusaur_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(VenusaurMega); -#endif //P_MEGA_EVOLUTIONS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VenusaurGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR #if P_FAMILY_CHARMANDER @@ -79,18 +73,6 @@ static const union AnimCmd sAnim_Charizard_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardMegaX); -#endif //P_MEGA_EVOLUTIONS - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardMegaY); -#endif //P_MEGA_EVOLUTIONS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CharizardGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER #if P_FAMILY_SQUIRTLE @@ -119,14 +101,6 @@ static const union AnimCmd sAnim_Blastoise_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(BlastoiseMega); -#endif //P_MEGA_EVOLUTIONS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(BlastoiseGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE #if P_FAMILY_CATERPIE @@ -167,10 +141,6 @@ static const union AnimCmd sAnim_Butterfree_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ButterfreeGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE #if P_FAMILY_WEEDLE @@ -213,10 +183,6 @@ static const union AnimCmd sAnim_Beedrill_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(BeedrillMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE #if P_FAMILY_PIDGEY @@ -244,10 +210,6 @@ static const union AnimCmd sAnim_Pidgeot_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(PidgeotMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PIDGEY #if P_FAMILY_RATTATA @@ -276,11 +238,6 @@ static const union AnimCmd sAnim_Raticate_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RattataAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(RaticateAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA #if P_FAMILY_SPEAROW @@ -339,8 +296,6 @@ static const union AnimCmd sAnim_Pichu_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -PLACEHOLDER_ANIM_SINGLE_FRAME(PichuSpikyEared); #endif //P_GEN_2_CROSS_EVOS static const union AnimCmd sAnim_Pikachu_1[] = @@ -352,29 +307,6 @@ static const union AnimCmd sAnim_Pikachu_1[] = ANIMCMD_END, }; -#if P_COSPLAY_PIKACHU_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuCosplay); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuRockStar); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuBelle); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPopStar); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPhD); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuLibre); -#endif //P_COSPLAY_PIKACHU_FORMS -#if P_CAP_PIKACHU_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuOriginal); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuHoenn); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuSinnoh); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuUnova); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuKalos); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuPartner); -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuWorld); -#endif //P_CAP_PIKACHU_FORMS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PikachuGmax); -#endif //P_GIGANTAMAX_FORMS - static const union AnimCmd sAnim_Raichu_1[] = { ANIMCMD_FRAME(0, 15), @@ -384,10 +316,6 @@ static const union AnimCmd sAnim_Raichu_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RaichuAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU #if P_FAMILY_SANDSHREW @@ -410,11 +338,6 @@ static const union AnimCmd sAnim_Sandslash_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SandshrewAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(SandslashAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW #if P_FAMILY_NIDORAN @@ -521,11 +444,6 @@ static const union AnimCmd sAnim_Ninetales_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VulpixAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(NinetalesAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX #if P_FAMILY_JIGGLYPUFF @@ -780,11 +698,6 @@ static const union AnimCmd sAnim_Dugtrio_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DiglettAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(DugtrioAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT #if P_FAMILY_MEOWTH @@ -805,20 +718,6 @@ static const union AnimCmd sAnim_Persian_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(PersianAlola); -#endif //P_ALOLAN_FORMS - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(Perrserker); -#endif //P_GALARIAN_FORMS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MeowthGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH #if P_FAMILY_PSYDUCK @@ -866,10 +765,6 @@ static const union AnimCmd sAnim_Primeape_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Annihilape); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY #if P_FAMILY_GROWLITHE @@ -890,11 +785,6 @@ static const union AnimCmd sAnim_Arcanine_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrowlitheHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(ArcanineHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE #if P_FAMILY_POLIWAG @@ -963,10 +853,6 @@ static const union AnimCmd sAnim_Alakazam_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AlakazamMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA #if P_FAMILY_MACHOP @@ -999,10 +885,6 @@ static const union AnimCmd sAnim_Machamp_1[] = ANIMCMD_FRAME(0, 11), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MachampGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP #if P_FAMILY_BELLSPROUT @@ -1089,12 +971,6 @@ static const union AnimCmd sAnim_Golem_1[] = ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GeodudeAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(GravelerAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(GolemAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE #if P_FAMILY_PONYTA @@ -1112,11 +988,6 @@ static const union AnimCmd sAnim_Rapidash_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(PonytaGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(RapidashGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA #if P_FAMILY_SLOWPOKE @@ -1144,18 +1015,6 @@ static const union AnimCmd sAnim_Slowking_1[] = ANIMCMD_END, }; #endif //P_GEN_2_CROSS_EVOS - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowbroMega); -#endif //P_MEGA_EVOLUTIONS - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowpokeGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowbroGalar); -#if P_GEN_2_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(SlowkingGalar); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE #if P_FAMILY_MAGNEMITE @@ -1211,11 +1070,6 @@ static const union AnimCmd sAnim_Farfetchd_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(FarfetchdGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(Sirfetchd); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD #if P_FAMILY_DODUO @@ -1281,11 +1135,6 @@ static const union AnimCmd sAnim_Muk_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrimerAlola); -PLACEHOLDER_ANIM_SINGLE_FRAME(MukAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER #if P_FAMILY_SHELLDER @@ -1338,14 +1187,6 @@ static const union AnimCmd sAnim_Gengar_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GengarMega); -#endif //P_MEGA_EVOLUTIONS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GengarGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY #if P_FAMILY_ONIX @@ -1366,10 +1207,6 @@ static const union AnimCmd sAnim_Steelix_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SteelixMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ONIX @@ -1416,10 +1253,6 @@ static const union AnimCmd sAnim_Kingler_1[] = ANIMCMD_FRAME(0, 14), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(KinglerGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY #if P_FAMILY_VOLTORB @@ -1441,11 +1274,6 @@ static const union AnimCmd sAnim_Electrode_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(VoltorbHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(ElectrodeHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB #if P_FAMILY_EXEGGCUTE @@ -1469,10 +1297,6 @@ static const union AnimCmd sAnim_Exeggutor_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_TWO_FRAMES(ExeggutorAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE #if P_FAMILY_CUBONE @@ -1497,10 +1321,6 @@ static const union AnimCmd sAnim_Marowak_1[] = ANIMCMD_FRAME(0, 14), ANIMCMD_END, }; - -#if P_ALOLAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MarowakAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE #if P_FAMILY_HITMONS @@ -1595,10 +1415,6 @@ static const union AnimCmd sAnim_Weezing_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(WeezingGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING #if P_FAMILY_RHYHORN @@ -1695,10 +1511,6 @@ static const union AnimCmd sAnim_Kangaskhan_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(KangaskhanMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN #if P_FAMILY_HORSEA @@ -1807,11 +1619,6 @@ static const union AnimCmd sAnim_MrMime_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MrMimeGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(MrRime); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME #if P_FAMILY_SCYTHER @@ -1835,15 +1642,7 @@ static const union AnimCmd sAnim_Scizor_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(ScizorMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS - -#if P_GEN_8_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Kleavor); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER #if P_FAMILY_JYNX @@ -1938,10 +1737,6 @@ static const union AnimCmd sAnim_Pinsir_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(PinsirMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR #if P_FAMILY_TAUROS @@ -1953,10 +1748,6 @@ static const union AnimCmd sAnim_Tauros_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_PALDEAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(TaurosPaldea); -#endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS #if P_FAMILY_MAGIKARP @@ -1981,10 +1772,6 @@ static const union AnimCmd sAnim_Gyarados_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GyaradosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP #if P_FAMILY_LAPRAS @@ -1994,10 +1781,6 @@ static const union AnimCmd sAnim_Lapras_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(LaprasGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS #if P_FAMILY_DITTO @@ -2019,10 +1802,6 @@ static const union AnimCmd sAnim_Eevee_1[] = ANIMCMD_END, }; -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(EeveeGmax); -#endif //P_GIGANTAMAX_FORMS - static const union AnimCmd sAnim_Vaporeon_1[] = { ANIMCMD_FRAME(1, 40), @@ -2181,10 +1960,6 @@ static const union AnimCmd sAnim_Aerodactyl_1[] = ANIMCMD_FRAME(0, 25), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AerodactylMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL #if P_FAMILY_SNORLAX @@ -2205,10 +1980,6 @@ static const union AnimCmd sAnim_Snorlax_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SnorlaxGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX #if P_FAMILY_ARTICUNO @@ -2220,10 +1991,6 @@ static const union AnimCmd sAnim_Articuno_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ArticunoGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO #if P_FAMILY_ZAPDOS @@ -2235,10 +2002,6 @@ static const union AnimCmd sAnim_Zapdos_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZapdosGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS #if P_FAMILY_MOLTRES @@ -2278,10 +2041,6 @@ static const union AnimCmd sAnim_Moltres_1[] = ANIMCMD_FRAME(0, 3), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MoltresGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES #if P_FAMILY_DRATINI @@ -2318,14 +2077,6 @@ static const union AnimCmd sAnim_Mewtwo_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(MewtwoMegaX); -#endif //P_MEGA_EVOLUTIONS - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(MewtwoMegaY); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO #if P_FAMILY_MEW @@ -2385,10 +2136,6 @@ static const union AnimCmd sAnim_Typhlosion_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(TyphlosionHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL #if P_FAMILY_TOTODILE @@ -2615,10 +2362,6 @@ static const union AnimCmd sAnim_Ampharos_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AmpharosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP #if P_FAMILY_MARILL @@ -2832,11 +2575,6 @@ static const union AnimCmd sAnim_Quagsire_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_PALDEAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(WooperPaldea); -PLACEHOLDER_ANIM_SINGLE_FRAME(Clodsire); -#endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER #if P_FAMILY_MURKROW @@ -2893,10 +2631,6 @@ static const union AnimCmd sAnim_Mismagius_1[] = #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS -#if P_FAMILY_UNOWN -PLACEHOLDER_ANIM_SINGLE_FRAME(Unown); -#endif //P_FAMILY_UNOWN - #if P_FAMILY_WOBBUFFET #if P_GEN_3_CROSS_EVOS static const union AnimCmd sAnim_Wynaut_1[] = @@ -2929,10 +2663,6 @@ static const union AnimCmd sAnim_Girafarig_1[] = ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Farigiraf); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG #if P_FAMILY_PINECO @@ -2968,10 +2698,6 @@ static const union AnimCmd sAnim_Dunsparce_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Dudunsparce); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DUNSPARCE #if P_FAMILY_GLIGAR @@ -3022,11 +2748,6 @@ static const union AnimCmd sAnim_Qwilfish_1[] = ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(QwilfishHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(Overqwil); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH #if P_FAMILY_SHUCKLE @@ -3049,10 +2770,6 @@ static const union AnimCmd sAnim_Heracross_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(HeracrossMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS #if P_FAMILY_SNEASEL @@ -3075,11 +2792,6 @@ static const union AnimCmd sAnim_Weavile_1[] = ANIMCMD_END, }; #endif //P_GEN_4_CROSS_EVOS - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SneaselHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(Sneasler); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL #if P_FAMILY_TEDDIURSA @@ -3096,11 +2808,6 @@ static const union AnimCmd sAnim_Ursaring_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_GEN_8_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Ursaluna); -PLACEHOLDER_ANIM_SINGLE_FRAME(UrsalunaBloodmoon); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA #if P_FAMILY_SLUGMA @@ -3165,11 +2872,6 @@ static const union AnimCmd sAnim_Corsola_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CorsolaGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(Cursola); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA #if P_FAMILY_REMORAID @@ -3245,10 +2947,6 @@ static const union AnimCmd sAnim_Houndoom_1[] = ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(HoundoomMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR #if P_FAMILY_PHANPY @@ -3280,10 +2978,6 @@ static const union AnimCmd sAnim_Stantler_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_GEN_8_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Wyrdeer); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER #if P_FAMILY_SMEARGLE @@ -3358,10 +3052,6 @@ static const union AnimCmd sAnim_Tyranitar_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(TyranitarMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR #if P_FAMILY_LUGIA @@ -3431,10 +3121,6 @@ static const union AnimCmd sAnim_Sceptile_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SceptileMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO #if P_FAMILY_TORCHIC @@ -3467,10 +3153,6 @@ static const union AnimCmd sAnim_Blaziken_1[] = ANIMCMD_FRAME(0, 7), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(BlazikenMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC #if P_FAMILY_MUDKIP @@ -3507,10 +3189,6 @@ static const union AnimCmd sAnim_Swampert_1[] = ANIMCMD_FRAME(0, 7), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SwampertMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP #if P_FAMILY_POOCHYENA @@ -3553,12 +3231,6 @@ static const union AnimCmd sAnim_Linoone_1[] = ANIMCMD_FRAME(0, 14), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZigzagoonGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(LinooneGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(Obstagoon); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON #if P_FAMILY_WURMPLE @@ -3766,10 +3438,6 @@ static const union AnimCmd sAnim_Gardevoir_1[] = ANIMCMD_END, }; -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GardevoirMega); -#endif //P_MEGA_EVOLUTIONS - #if P_GEN_4_CROSS_EVOS static const union AnimCmd sAnim_Gallade_1[] = { @@ -3777,10 +3445,6 @@ static const union AnimCmd sAnim_Gallade_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GalladeMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RALTS @@ -4034,10 +3698,6 @@ static const union AnimCmd sAnim_Sableye_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SableyeMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE #if P_FAMILY_MAWILE @@ -4052,10 +3712,6 @@ static const union AnimCmd sAnim_Mawile_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(MawileMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE #if P_FAMILY_ARON @@ -4086,10 +3742,6 @@ static const union AnimCmd sAnim_Aggron_1[] = ANIMCMD_FRAME(0, 11), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AggronMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON #if P_FAMILY_MEDITITE @@ -4112,10 +3764,6 @@ static const union AnimCmd sAnim_Medicham_1[] = ANIMCMD_FRAME(0, 11), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(MedichamMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE #if P_FAMILY_ELECTRIKE @@ -4138,10 +3786,6 @@ static const union AnimCmd sAnim_Manectric_1[] = ANIMCMD_FRAME(0, 3), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(ManectricMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE #if P_FAMILY_PLUSLE @@ -4270,10 +3914,6 @@ static const union AnimCmd sAnim_Sharpedo_1[] = ANIMCMD_FRAME(0, 22), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SharpedoMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA #if P_FAMILY_WAILMER @@ -4320,10 +3960,6 @@ static const union AnimCmd sAnim_Camerupt_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(CameruptMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL #if P_FAMILY_TORKOAL @@ -4464,10 +4100,6 @@ static const union AnimCmd sAnim_Altaria_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AltariaMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU #if P_FAMILY_ZANGOOSE @@ -4764,10 +4396,6 @@ static const union AnimCmd sAnim_Banette_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(BanetteMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET #if P_FAMILY_DUSKULL @@ -4862,10 +4490,6 @@ static const union AnimCmd sAnim_Absol_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AbsolMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL #if P_FAMILY_SNORUNT @@ -4889,10 +4513,6 @@ static const union AnimCmd sAnim_Glalie_1[] = ANIMCMD_END, }; -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GlalieMega); -#endif //P_MEGA_EVOLUTIONS - #if P_GEN_4_CROSS_EVOS static const union AnimCmd sAnim_Froslass_1[] = { @@ -5025,10 +4645,6 @@ static const union AnimCmd sAnim_Salamence_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(SalamenceMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON #if P_FAMILY_BELDUM @@ -5061,10 +4677,6 @@ static const union AnimCmd sAnim_Metagross_1[] = ANIMCMD_FRAME(0, 16), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(MetagrossMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM #if P_FAMILY_REGIROCK @@ -5113,10 +4725,6 @@ static const union AnimCmd sAnim_Latias_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(LatiasMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS #if P_FAMILY_LATIOS @@ -5129,10 +4737,6 @@ static const union AnimCmd sAnim_Latios_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(LatiosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS #if P_FAMILY_KYOGRE @@ -5145,10 +4749,6 @@ static const union AnimCmd sAnim_Kyogre_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_PRIMAL_REVERSIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(KyogrePrimal); -#endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE #if P_FAMILY_GROUDON @@ -5161,10 +4761,6 @@ static const union AnimCmd sAnim_Groudon_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_PRIMAL_REVERSIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GroudonPrimal); -#endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON #if P_FAMILY_RAYQUAZA @@ -5177,10 +4773,6 @@ static const union AnimCmd sAnim_Rayquaza_1[] = ANIMCMD_FRAME(0, 6), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(RayquazaMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA #if P_FAMILY_JIRACHI @@ -5676,10 +5268,6 @@ static const union AnimCmd sAnim_Lopunny_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(LopunnyMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY #if P_FAMILY_GLAMEOW @@ -5809,10 +5397,6 @@ static const union AnimCmd sAnim_Garchomp_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(GarchompMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE #if P_FAMILY_RIOLU @@ -5831,10 +5415,6 @@ static const union AnimCmd sAnim_Lucario_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(LucarioMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU #if P_FAMILY_HIPPOPOTAS @@ -5973,10 +5553,6 @@ static const union AnimCmd sAnim_Abomasnow_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AbomasnowMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER #if P_FAMILY_ROTOM @@ -6097,8 +5673,6 @@ static const union AnimCmd sAnim_Dialga_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -PLACEHOLDER_ANIM_SINGLE_FRAME(DialgaOrigin); #endif //P_FAMILY_DIALGA #if P_FAMILY_PALKIA @@ -6108,8 +5682,6 @@ static const union AnimCmd sAnim_Palkia_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -PLACEHOLDER_ANIM_SINGLE_FRAME(PalkiaOrigin); #endif //P_FAMILY_PALKIA #if P_FAMILY_HEATRAN @@ -6338,10 +5910,6 @@ static const union AnimCmd sAnim_Samurott_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SamurottHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT #if P_FAMILY_PATRAT @@ -6641,10 +6209,6 @@ static const union AnimCmd sAnim_Audino_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(AudinoMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO #if P_FAMILY_TIMBURR @@ -6830,10 +6394,6 @@ static const union AnimCmd sAnim_Lilligant_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(LilligantHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL #if P_FAMILY_BASCULIN @@ -6847,10 +6407,6 @@ static const union AnimCmd sAnim_Basculin_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(Basculegion); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN #if P_FAMILY_SANDILE @@ -6904,12 +6460,6 @@ static const union AnimCmd sAnim_DarmanitanZen_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DarumakaGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarStandard); -PLACEHOLDER_ANIM_SINGLE_FRAME(DarmanitanGalarZen); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA #if P_FAMILY_MARACTUS @@ -7004,11 +6554,6 @@ static const union AnimCmd sAnim_Cofagrigus_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(YamaskGalar); -PLACEHOLDER_ANIM_SINGLE_FRAME(Runerigus); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK #if P_FAMILY_TIRTOUGA @@ -7076,10 +6621,6 @@ static const union AnimCmd sAnim_Garbodor_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GarbodorGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH #if P_FAMILY_ZORUA @@ -7102,11 +6643,6 @@ static const union AnimCmd sAnim_Zoroark_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ZoruaHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(ZoroarkHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA #if P_FAMILY_MINCCINO @@ -7589,10 +7125,6 @@ static const union AnimCmd sAnim_Stunfisk_1[] = ANIMCMD_FRAME(0, 20), ANIMCMD_END, }; - -#if P_GALARIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(StunfiskGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK #if P_FAMILY_MIENFOO @@ -7667,10 +7199,6 @@ static const union AnimCmd sAnim_Bisharp_1[] = ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Kingambit); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD #if P_FAMILY_BOUFFALANT @@ -7701,10 +7229,6 @@ static const union AnimCmd sAnim_Braviary_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(BraviaryHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET #if P_FAMILY_VULLABY @@ -8677,11 +8201,6 @@ static const union AnimCmd sAnim_Goodra_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SliggooHisui); -PLACEHOLDER_ANIM_SINGLE_FRAME(GoodraHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY #if P_FAMILY_KLEFKI @@ -8763,10 +8282,6 @@ static const union AnimCmd sAnim_Avalugg_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AvaluggHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE #if P_FAMILY_NOIBAT @@ -8846,10 +8361,6 @@ static const union AnimCmd sAnim_Diancie_1[] = ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; - -#if P_MEGA_EVOLUTIONS -PLACEHOLDER_ANIM_SINGLE_FRAME(DiancieMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE #if P_FAMILY_HOOPA @@ -8905,24 +8416,8 @@ static const union AnimCmd sAnim_Decidueye_1[] = ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; - -#if P_HISUIAN_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DecidueyeHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET -#if P_FAMILY_LITTEN -PLACEHOLDER_ANIM_SINGLE_FRAME(Litten); -PLACEHOLDER_ANIM_SINGLE_FRAME(Torracat); -PLACEHOLDER_ANIM_SINGLE_FRAME(Incineroar); -#endif //P_FAMILY_LITTEN - -#if P_FAMILY_POPPLIO -PLACEHOLDER_ANIM_SINGLE_FRAME(Popplio); -PLACEHOLDER_ANIM_SINGLE_FRAME(Brionne); -PLACEHOLDER_ANIM_SINGLE_FRAME(Primarina); -#endif //P_FAMILY_POPPLIO - #if P_FAMILY_PIKIPEK static const union AnimCmd sAnim_Pikipek_1[] = { @@ -8949,11 +8444,6 @@ static const union AnimCmd sAnim_Toucannon_1[] = }; #endif //P_FAMILY_PIKIPEK -#if P_FAMILY_YUNGOOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Yungoos); -PLACEHOLDER_ANIM_SINGLE_FRAME(Gumshoos); -#endif //P_FAMILY_YUNGOOS - #if P_FAMILY_GRUBBIN static const union AnimCmd sAnim_Grubbin_1[] = { @@ -8984,15 +8474,6 @@ static const union AnimCmd sAnim_Vikavolt_1[] = }; #endif //P_FAMILY_GRUBBIN -#if P_FAMILY_CRABRAWLER -PLACEHOLDER_ANIM_SINGLE_FRAME(Crabrawler); -PLACEHOLDER_ANIM_SINGLE_FRAME(Crabominable); -#endif //P_FAMILY_CRABRAWLER - -#if P_FAMILY_ORICORIO -PLACEHOLDER_ANIM_SINGLE_FRAME(Oricorio); -#endif //P_FAMILY_ORICORIO - #if P_FAMILY_CUTIEFLY static const union AnimCmd sAnim_Cutiefly_1[] = { @@ -9081,21 +8562,6 @@ static const union AnimCmd sAnim_LycanrocDusk_1[] = }; #endif //P_FAMILY_ROCKRUFF -#if P_FAMILY_WISHIWASHI -PLACEHOLDER_ANIM_SINGLE_FRAME(WishiwashiSolo); -PLACEHOLDER_ANIM_SINGLE_FRAME(WishiwashiSchool); -#endif //P_FAMILY_WISHIWASHI - -#if P_FAMILY_MAREANIE -PLACEHOLDER_ANIM_SINGLE_FRAME(Mareanie); -PLACEHOLDER_ANIM_SINGLE_FRAME(Toxapex); -#endif //P_FAMILY_MAREANIE - -#if P_FAMILY_MUDBRAY -PLACEHOLDER_ANIM_SINGLE_FRAME(Mudbray); -PLACEHOLDER_ANIM_SINGLE_FRAME(Mudsdale); -#endif //P_FAMILY_MUDBRAY - #if P_FAMILY_DEWPIDER static const union AnimCmd sAnim_Dewpider_1[] = { @@ -9117,16 +8583,6 @@ static const union AnimCmd sAnim_Araquanid_1[] = }; #endif //P_FAMILY_DEWPIDER -#if P_FAMILY_FOMANTIS -PLACEHOLDER_ANIM_SINGLE_FRAME(Fomantis); -PLACEHOLDER_ANIM_SINGLE_FRAME(Lurantis); -#endif //P_FAMILY_FOMANTIS - -#if P_FAMILY_MORELULL -PLACEHOLDER_ANIM_SINGLE_FRAME(Morelull); -PLACEHOLDER_ANIM_SINGLE_FRAME(Shiinotic); -#endif //P_FAMILY_MORELULL - #if P_FAMILY_SALANDIT static const union AnimCmd sAnim_Salandit_1[] = { @@ -9163,16 +8619,6 @@ static const union AnimCmd sAnim_Bewear_1[] = }; #endif //P_FAMILY_STUFFUL -#if P_FAMILY_BOUNSWEET -PLACEHOLDER_ANIM_SINGLE_FRAME(Bounsweet); -PLACEHOLDER_ANIM_SINGLE_FRAME(Steenee); -PLACEHOLDER_ANIM_SINGLE_FRAME(Tsareena); -#endif //P_FAMILY_BOUNSWEET - -#if P_FAMILY_COMFEY -PLACEHOLDER_ANIM_SINGLE_FRAME(Comfey); -#endif //P_FAMILY_COMFEY - #if P_FAMILY_ORANGURU static const union AnimCmd sAnim_Oranguru_1[] = { @@ -9209,11 +8655,6 @@ static const union AnimCmd sAnim_Golisopod_1[] = }; #endif //P_FAMILY_WIMPOD -#if P_FAMILY_SANDYGAST -PLACEHOLDER_ANIM_SINGLE_FRAME(Sandygast); -PLACEHOLDER_ANIM_SINGLE_FRAME(Palossand); -#endif //P_FAMILY_SANDYGAST - #if P_FAMILY_PYUKUMUKU static const union AnimCmd sAnim_Pyukumuku_1[] = { @@ -9224,20 +8665,6 @@ static const union AnimCmd sAnim_Pyukumuku_1[] = }; #endif //P_FAMILY_PYUKUMUKU -#if P_FAMILY_TYPE_NULL -PLACEHOLDER_ANIM_SINGLE_FRAME(TypeNull); -PLACEHOLDER_ANIM_SINGLE_FRAME(Silvally); -#endif //P_FAMILY_TYPE_NULL - -#if P_FAMILY_MINIOR -PLACEHOLDER_ANIM_SINGLE_FRAME(MiniorMeteor); -PLACEHOLDER_ANIM_SINGLE_FRAME(MiniorCore); -#endif //P_FAMILY_MINIOR - -#if P_FAMILY_KOMALA -PLACEHOLDER_ANIM_SINGLE_FRAME(Komala); -#endif //P_FAMILY_KOMALA - #if P_FAMILY_TURTONATOR static const union AnimCmd sAnim_Turtonator_1[] = { @@ -9257,15 +8684,6 @@ static const union AnimCmd sAnim_Togedemaru_1[] = }; #endif //P_FAMILY_TOGEDEMARU -#if P_FAMILY_MIMIKYU -PLACEHOLDER_ANIM_SINGLE_FRAME(MimikyuDisguised); -PLACEHOLDER_ANIM_SINGLE_FRAME(MimikyuBusted); -#endif //P_FAMILY_MIMIKYU - -#if P_FAMILY_BRUXISH -PLACEHOLDER_ANIM_SINGLE_FRAME(Bruxish); -#endif //P_FAMILY_BRUXISH - #if P_FAMILY_DRAMPA static const union AnimCmd sAnim_Drampa_1[] = { @@ -9275,10 +8693,6 @@ static const union AnimCmd sAnim_Drampa_1[] = }; #endif //P_FAMILY_DRAMPA -#if P_FAMILY_DHELMISE -PLACEHOLDER_ANIM_SINGLE_FRAME(Dhelmise); -#endif //P_FAMILY_DHELMISE - #if P_FAMILY_JANGMO_O static const union AnimCmd sAnim_Jangmo_O_1[] = { @@ -9351,49 +8765,6 @@ static const union AnimCmd sAnim_TapuFini_1[] = }; #endif //P_FAMILY_TAPU_FINI -#if P_FAMILY_COSMOG -PLACEHOLDER_ANIM_SINGLE_FRAME(Cosmog); -PLACEHOLDER_ANIM_SINGLE_FRAME(Cosmoem); -PLACEHOLDER_ANIM_SINGLE_FRAME(Solgaleo); -PLACEHOLDER_ANIM_SINGLE_FRAME(Lunala); -#endif //P_FAMILY_COSMOG - -#if P_FAMILY_NIHILEGO -PLACEHOLDER_ANIM_SINGLE_FRAME(Nihilego); -#endif //P_FAMILY_NIHILEGO - -#if P_FAMILY_BUZZWOLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Buzzwole); -#endif //P_FAMILY_BUZZWOLE - -#if P_FAMILY_PHEROMOSA -PLACEHOLDER_ANIM_SINGLE_FRAME(Pheromosa); -#endif //P_FAMILY_PHEROMOSA - -#if P_FAMILY_XURKITREE -PLACEHOLDER_ANIM_SINGLE_FRAME(Xurkitree); -#endif //P_FAMILY_XURKITREE - -#if P_FAMILY_CELESTEELA -PLACEHOLDER_ANIM_SINGLE_FRAME(Celesteela); -#endif //P_FAMILY_CELESTEELA - -#if P_FAMILY_KARTANA -PLACEHOLDER_ANIM_SINGLE_FRAME(Kartana); -#endif //P_FAMILY_KARTANA - -#if P_FAMILY_GUZZLORD -PLACEHOLDER_ANIM_SINGLE_FRAME(Guzzlord); -#endif //P_FAMILY_GUZZLORD - -#if P_FAMILY_NECROZMA -PLACEHOLDER_ANIM_SINGLE_FRAME(Necrozma); -#endif //P_FAMILY_NECROZMA - -#if P_FAMILY_MAGEARNA -PLACEHOLDER_ANIM_SINGLE_FRAME(Magearna); -#endif //P_FAMILY_MAGEARNA - #if P_FAMILY_MARSHADOW static const union AnimCmd sAnim_Marshadow_1[] = { @@ -9404,67 +8775,6 @@ static const union AnimCmd sAnim_Marshadow_1[] = }; #endif //P_FAMILY_MARSHADOW -#if P_FAMILY_POIPOLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Poipole); -PLACEHOLDER_ANIM_SINGLE_FRAME(Naganadel); -#endif //P_FAMILY_POIPOLE - -#if P_FAMILY_STAKATAKA -PLACEHOLDER_ANIM_SINGLE_FRAME(Stakataka); -#endif //P_FAMILY_STAKATAKA - -#if P_FAMILY_BLACEPHALON -PLACEHOLDER_ANIM_SINGLE_FRAME(Blacephalon); -#endif //P_FAMILY_BLACEPHALON - -#if P_FAMILY_ZERAORA -PLACEHOLDER_ANIM_SINGLE_FRAME(Zeraora); -#endif //P_FAMILY_ZERAORA - -#if P_FAMILY_MELTAN -PLACEHOLDER_ANIM_SINGLE_FRAME(Meltan); -PLACEHOLDER_ANIM_SINGLE_FRAME(Melmetal); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(MelmetalGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_MELTAN - -#if P_FAMILY_GROOKEY -PLACEHOLDER_ANIM_SINGLE_FRAME(Grookey); -PLACEHOLDER_ANIM_SINGLE_FRAME(Thwackey); -PLACEHOLDER_ANIM_SINGLE_FRAME(Rillaboom); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(RillaboomGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_GROOKEY - -#if P_FAMILY_SCORBUNNY -PLACEHOLDER_ANIM_SINGLE_FRAME(Scorbunny); -PLACEHOLDER_ANIM_SINGLE_FRAME(Raboot); -PLACEHOLDER_ANIM_SINGLE_FRAME(Cinderace); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CinderaceGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SCORBUNNY - -#if P_FAMILY_SOBBLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Sobble); -PLACEHOLDER_ANIM_SINGLE_FRAME(Drizzile); -PLACEHOLDER_ANIM_SINGLE_FRAME(Inteleon); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(InteleonGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SOBBLE - -#if P_FAMILY_SKWOVET -PLACEHOLDER_ANIM_SINGLE_FRAME(Skwovet); -PLACEHOLDER_ANIM_SINGLE_FRAME(Greedent); -#endif //P_FAMILY_SKWOVET - #if P_FAMILY_ROOKIDEE static const union AnimCmd sAnim_Rookidee_1[] = { @@ -9497,37 +8807,8 @@ static const union AnimCmd sAnim_Corviknight_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CorviknightGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE -#if P_FAMILY_BLIPBUG -PLACEHOLDER_ANIM_SINGLE_FRAME(Blipbug); -PLACEHOLDER_ANIM_SINGLE_FRAME(Dottler); -PLACEHOLDER_ANIM_SINGLE_FRAME(Orbeetle); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(OrbeetleGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_BLIPBUG - -#if P_FAMILY_NICKIT -PLACEHOLDER_ANIM_SINGLE_FRAME(Nickit); -PLACEHOLDER_ANIM_SINGLE_FRAME(Thievul); -#endif //P_FAMILY_NICKIT - -#if P_FAMILY_GOSSIFLEUR -PLACEHOLDER_ANIM_SINGLE_FRAME(Gossifleur); -PLACEHOLDER_ANIM_SINGLE_FRAME(Eldegoss); -#endif //P_FAMILY_GOSSIFLEUR - -#if P_FAMILY_WOOLOO -PLACEHOLDER_ANIM_SINGLE_FRAME(Wooloo); -PLACEHOLDER_ANIM_SINGLE_FRAME(Dubwool); -#endif //P_FAMILY_WOOLOO - #if P_FAMILY_CHEWTLE static const union AnimCmd sAnim_Chewtle_1[] = { @@ -9544,74 +8825,8 @@ static const union AnimCmd sAnim_Drednaw_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DrednawGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE -#if P_FAMILY_YAMPER -PLACEHOLDER_ANIM_SINGLE_FRAME(Yamper); -PLACEHOLDER_ANIM_SINGLE_FRAME(Boltund); -#endif //P_FAMILY_YAMPER - -#if P_FAMILY_ROLYCOLY -PLACEHOLDER_ANIM_TWO_FRAMES(Rolycoly); -PLACEHOLDER_ANIM_TWO_FRAMES(Carkol); -PLACEHOLDER_ANIM_TWO_FRAMES(Coalossal); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CoalossalGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_ROLYCOLY - -#if P_FAMILY_APPLIN -PLACEHOLDER_ANIM_TWO_FRAMES(Applin); -PLACEHOLDER_ANIM_TWO_FRAMES(Flapple); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(FlappleGmax); -#endif //P_GIGANTAMAX_FORMS - -PLACEHOLDER_ANIM_TWO_FRAMES(Appletun); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AppletunGmax); -#endif //P_GIGANTAMAX_FORMS - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Dipplin); -PLACEHOLDER_ANIM_SINGLE_FRAME(Hydrapple); -#endif //P_GEN_9_CROSS_EVOS -#endif //P_FAMILY_APPLIN - -#if P_FAMILY_SILICOBRA -PLACEHOLDER_ANIM_SINGLE_FRAME(Silicobra); -PLACEHOLDER_ANIM_SINGLE_FRAME(Sandaconda); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(SandacondaGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SILICOBRA - -#if P_FAMILY_CRAMORANT -PLACEHOLDER_ANIM_SINGLE_FRAME(Cramorant); -#endif //P_FAMILY_CRAMORANT - -#if P_FAMILY_ARROKUDA -PLACEHOLDER_ANIM_SINGLE_FRAME(Arrokuda); -PLACEHOLDER_ANIM_SINGLE_FRAME(Barraskewda); -#endif //P_FAMILY_ARROKUDA - -#if P_FAMILY_TOXEL -PLACEHOLDER_ANIM_SINGLE_FRAME(Toxel); -PLACEHOLDER_ANIM_SINGLE_FRAME(Toxtricity); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(ToxtricityGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_TOXEL - #if P_FAMILY_SIZZLIPEDE static const union AnimCmd sAnim_Sizzlipede_1[] = { @@ -9628,519 +8843,8 @@ static const union AnimCmd sAnim_Centiskorch_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CentiskorchGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE -#if P_FAMILY_CLOBBOPUS -PLACEHOLDER_ANIM_SINGLE_FRAME(Clobbopus); -PLACEHOLDER_ANIM_SINGLE_FRAME(Grapploct); -#endif //P_FAMILY_CLOBBOPUS - -#if P_FAMILY_SINISTEA -PLACEHOLDER_ANIM_SINGLE_FRAME(Sinistea); -PLACEHOLDER_ANIM_SINGLE_FRAME(Polteageist); -#endif //P_FAMILY_SINISTEA - -#if P_FAMILY_HATENNA -PLACEHOLDER_ANIM_SINGLE_FRAME(Hatenna); -PLACEHOLDER_ANIM_SINGLE_FRAME(Hattrem); -PLACEHOLDER_ANIM_SINGLE_FRAME(Hatterene); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(HattereneGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_HATENNA - -#if P_FAMILY_IMPIDIMP -PLACEHOLDER_ANIM_SINGLE_FRAME(Impidimp); -PLACEHOLDER_ANIM_SINGLE_FRAME(Morgrem); -PLACEHOLDER_ANIM_SINGLE_FRAME(Grimmsnarl); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(GrimmsnarlGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_IMPIDIMP - -#if P_FAMILY_MILCERY -PLACEHOLDER_ANIM_SINGLE_FRAME(Milcery); -PLACEHOLDER_ANIM_SINGLE_FRAME(Alcremie); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(AlcremieGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_MILCERY - -#if P_FAMILY_FALINKS -PLACEHOLDER_ANIM_SINGLE_FRAME(Falinks); -#endif //P_FAMILY_FALINKS - -#if P_FAMILY_PINCURCHIN -PLACEHOLDER_ANIM_TWO_FRAMES(Pincurchin); -#endif //P_FAMILY_PINCURCHIN - -#if P_FAMILY_SNOM -PLACEHOLDER_ANIM_SINGLE_FRAME(Snom); -PLACEHOLDER_ANIM_SINGLE_FRAME(Frosmoth); -#endif //P_FAMILY_SNOM - -#if P_FAMILY_STONJOURNER -PLACEHOLDER_ANIM_SINGLE_FRAME(Stonjourner); -#endif //P_FAMILY_STONJOURNER - -#if P_FAMILY_EISCUE -PLACEHOLDER_ANIM_SINGLE_FRAME(Eiscue); -#endif //P_FAMILY_EISCUE - -#if P_FAMILY_INDEEDEE -PLACEHOLDER_ANIM_SINGLE_FRAME(Indeedee); -#endif //P_FAMILY_INDEEDEE - -#if P_FAMILY_MORPEKO -PLACEHOLDER_ANIM_SINGLE_FRAME(Morpeko); -#endif //P_FAMILY_MORPEKO - -#if P_FAMILY_CUFANT -PLACEHOLDER_ANIM_SINGLE_FRAME(Cufant); -PLACEHOLDER_ANIM_SINGLE_FRAME(Copperajah); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(CopperajahGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_CUFANT - -#if P_FAMILY_DRACOZOLT -PLACEHOLDER_ANIM_SINGLE_FRAME(Dracozolt); -#endif //P_FAMILY_DRACOZOLT - -#if P_FAMILY_ARCTOZOLT -PLACEHOLDER_ANIM_SINGLE_FRAME(Arctozolt); -#endif //P_FAMILY_ARCTOZOLT - -#if P_FAMILY_DRACOVISH -PLACEHOLDER_ANIM_SINGLE_FRAME(Dracovish); -#endif //P_FAMILY_DRACOVISH - -#if P_FAMILY_ARCTOVISH -PLACEHOLDER_ANIM_SINGLE_FRAME(Arctovish); -#endif //P_FAMILY_ARCTOVISH - -#if P_FAMILY_DURALUDON -PLACEHOLDER_ANIM_SINGLE_FRAME(Duraludon); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(DuraludonGmax); -#endif //P_GIGANTAMAX_FORMS - -#if P_GEN_9_CROSS_EVOS -PLACEHOLDER_ANIM_SINGLE_FRAME(Archaludon); -#endif //P_GEN_9_CROSS_EVOS -#endif //P_FAMILY_DURALUDON - -#if P_FAMILY_DREEPY -PLACEHOLDER_ANIM_SINGLE_FRAME(Dreepy); -PLACEHOLDER_ANIM_SINGLE_FRAME(Drakloak); -PLACEHOLDER_ANIM_SINGLE_FRAME(Dragapult); -#endif //P_FAMILY_DREEPY - -#if P_FAMILY_ZACIAN -PLACEHOLDER_ANIM_SINGLE_FRAME(Zacian); -#endif //P_FAMILY_ZACIAN - -#if P_FAMILY_ZAMAZENTA -PLACEHOLDER_ANIM_SINGLE_FRAME(Zamazenta); -#endif //P_FAMILY_ZAMAZENTA - -#if P_FAMILY_ETERNATUS -PLACEHOLDER_ANIM_SINGLE_FRAME(Eternatus); -#endif //P_FAMILY_ETERNATUS - -#if P_FAMILY_KUBFU -PLACEHOLDER_ANIM_SINGLE_FRAME(Kubfu); -PLACEHOLDER_ANIM_SINGLE_FRAME(Urshifu); - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuSingleStrikeGmax); -#endif //P_GIGANTAMAX_FORMS - -#if P_GIGANTAMAX_FORMS -PLACEHOLDER_ANIM_SINGLE_FRAME(UrshifuRapidStrikeGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_KUBFU - -#if P_FAMILY_ZARUDE -PLACEHOLDER_ANIM_SINGLE_FRAME(Zarude); -#endif //P_FAMILY_ZARUDE - -#if P_FAMILY_REGIELEKI -PLACEHOLDER_ANIM_SINGLE_FRAME(Regieleki); -#endif //P_FAMILY_REGIELEKI - -#if P_FAMILY_REGIDRAGO -PLACEHOLDER_ANIM_SINGLE_FRAME(Regidrago); -#endif //P_FAMILY_REGIDRAGO - -#if P_FAMILY_GLASTRIER -PLACEHOLDER_ANIM_SINGLE_FRAME(Glastrier); -#endif //P_FAMILY_GLASTRIER - -#if P_FAMILY_SPECTRIER -PLACEHOLDER_ANIM_SINGLE_FRAME(Spectrier); -#endif //P_FAMILY_SPECTRIER - -#if P_FAMILY_CALYREX -PLACEHOLDER_ANIM_SINGLE_FRAME(Calyrex); -#endif //P_FAMILY_CALYREX - -#if P_FAMILY_ENAMORUS -PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusIncarnate); -PLACEHOLDER_ANIM_SINGLE_FRAME(EnamorusTherian); -#endif //P_FAMILY_ENAMORUS - -#if P_FAMILY_SPRIGATITO -PLACEHOLDER_ANIM_SINGLE_FRAME(Sprigatito); -PLACEHOLDER_ANIM_SINGLE_FRAME(Floragato); -PLACEHOLDER_ANIM_SINGLE_FRAME(Meowscarada); -#endif //P_FAMILY_SPRIGATITO - -#if P_FAMILY_FUECOCO -PLACEHOLDER_ANIM_SINGLE_FRAME(Fuecoco); -PLACEHOLDER_ANIM_SINGLE_FRAME(Crocalor); -PLACEHOLDER_ANIM_SINGLE_FRAME(Skeledirge); -#endif //P_FAMILY_FUECOCO - -#if P_FAMILY_QUAXLY -PLACEHOLDER_ANIM_SINGLE_FRAME(Quaxly); -PLACEHOLDER_ANIM_SINGLE_FRAME(Quaxwell); -PLACEHOLDER_ANIM_SINGLE_FRAME(Quaquaval); -#endif //P_FAMILY_QUAXLY - -#if P_FAMILY_LECHONK -PLACEHOLDER_ANIM_SINGLE_FRAME(Lechonk); -PLACEHOLDER_ANIM_SINGLE_FRAME(Oinkologne); -#endif //P_FAMILY_LECHONK - -#if P_FAMILY_TAROUNTULA -PLACEHOLDER_ANIM_SINGLE_FRAME(Tarountula); -PLACEHOLDER_ANIM_SINGLE_FRAME(Spidops); -#endif //P_FAMILY_TAROUNTULA - -#if P_FAMILY_NYMBLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Nymble); -PLACEHOLDER_ANIM_SINGLE_FRAME(Lokix); -#endif //P_FAMILY_NYMBLE - -#if P_FAMILY_PAWMI -PLACEHOLDER_ANIM_SINGLE_FRAME(Pawmi); -PLACEHOLDER_ANIM_SINGLE_FRAME(Pawmo); -PLACEHOLDER_ANIM_SINGLE_FRAME(Pawmot); -#endif //P_FAMILY_PAWMI - -#if P_FAMILY_TANDEMAUS -PLACEHOLDER_ANIM_SINGLE_FRAME(Tandemaus); -PLACEHOLDER_ANIM_SINGLE_FRAME(Maushold); -#endif //P_FAMILY_TANDEMAUS - -#if P_FAMILY_FIDOUGH -PLACEHOLDER_ANIM_SINGLE_FRAME(Fidough); -PLACEHOLDER_ANIM_SINGLE_FRAME(Dachsbun); -#endif //P_FAMILY_FIDOUGH - -#if P_FAMILY_SMOLIV -PLACEHOLDER_ANIM_SINGLE_FRAME(Smoliv); -PLACEHOLDER_ANIM_SINGLE_FRAME(Dolliv); -PLACEHOLDER_ANIM_SINGLE_FRAME(Arboliva); -#endif //P_FAMILY_SMOLIV - -#if P_FAMILY_SQUAWKABILLY -PLACEHOLDER_ANIM_SINGLE_FRAME(Squawkabilly); -#endif //P_FAMILY_SQUAWKABILLY - -#if P_FAMILY_NACLI -PLACEHOLDER_ANIM_SINGLE_FRAME(Nacli); -PLACEHOLDER_ANIM_SINGLE_FRAME(Naclstack); -PLACEHOLDER_ANIM_SINGLE_FRAME(Garganacl); -#endif //P_FAMILY_NACLI - -#if P_FAMILY_CHARCADET -PLACEHOLDER_ANIM_SINGLE_FRAME(Charcadet); -PLACEHOLDER_ANIM_SINGLE_FRAME(Armarouge); -PLACEHOLDER_ANIM_SINGLE_FRAME(Ceruledge); -#endif //P_FAMILY_CHARCADET - -#if P_FAMILY_TADBULB -PLACEHOLDER_ANIM_SINGLE_FRAME(Tadbulb); -PLACEHOLDER_ANIM_SINGLE_FRAME(Bellibolt); -#endif //P_FAMILY_TADBULB - -#if P_FAMILY_WATTREL -PLACEHOLDER_ANIM_SINGLE_FRAME(Wattrel); -PLACEHOLDER_ANIM_SINGLE_FRAME(Kilowattrel); -#endif //P_FAMILY_WATTREL - -#if P_FAMILY_MASCHIFF -PLACEHOLDER_ANIM_SINGLE_FRAME(Maschiff); -PLACEHOLDER_ANIM_SINGLE_FRAME(Mabosstiff); -#endif //P_FAMILY_MASCHIFF - -#if P_FAMILY_SHROODLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Shroodle); -PLACEHOLDER_ANIM_SINGLE_FRAME(Grafaiai); -#endif //P_FAMILY_SHROODLE - -#if P_FAMILY_BRAMBLIN -PLACEHOLDER_ANIM_SINGLE_FRAME(Bramblin); -PLACEHOLDER_ANIM_SINGLE_FRAME(Brambleghast); -#endif //P_FAMILY_BRAMBLIN - -#if P_FAMILY_TOEDSCOOL -PLACEHOLDER_ANIM_SINGLE_FRAME(Toedscool); -PLACEHOLDER_ANIM_SINGLE_FRAME(Toedscruel); -#endif //P_FAMILY_TOEDSCOOL - -#if P_FAMILY_KLAWF -PLACEHOLDER_ANIM_SINGLE_FRAME(Klawf); -#endif //P_FAMILY_KLAWF - -#if P_FAMILY_CAPSAKID -PLACEHOLDER_ANIM_SINGLE_FRAME(Capsakid); -PLACEHOLDER_ANIM_SINGLE_FRAME(Scovillain); -#endif //P_FAMILY_CAPSAKID - -#if P_FAMILY_RELLOR -PLACEHOLDER_ANIM_SINGLE_FRAME(Rellor); -PLACEHOLDER_ANIM_SINGLE_FRAME(Rabsca); -#endif //P_FAMILY_RELLOR - -#if P_FAMILY_FLITTLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Flittle); -PLACEHOLDER_ANIM_SINGLE_FRAME(Espathra); -#endif //P_FAMILY_FLITTLE - -#if P_FAMILY_TINKATINK -PLACEHOLDER_ANIM_SINGLE_FRAME(Tinkatink); -PLACEHOLDER_ANIM_SINGLE_FRAME(Tinkatuff); -PLACEHOLDER_ANIM_SINGLE_FRAME(Tinkaton); -#endif //P_FAMILY_TINKATINK - -#if P_FAMILY_WIGLETT -PLACEHOLDER_ANIM_SINGLE_FRAME(Wiglett); -PLACEHOLDER_ANIM_SINGLE_FRAME(Wugtrio); -#endif //P_FAMILY_WIGLETT - -#if P_FAMILY_BOMBIRDIER -PLACEHOLDER_ANIM_SINGLE_FRAME(Bombirdier); -#endif //P_FAMILY_BOMBIRDIER - -#if P_FAMILY_FINIZEN -PLACEHOLDER_ANIM_SINGLE_FRAME(Finizen); -PLACEHOLDER_ANIM_SINGLE_FRAME(Palafin); -#endif //P_FAMILY_FINIZEN - -#if P_FAMILY_VAROOM -PLACEHOLDER_ANIM_SINGLE_FRAME(Varoom); -PLACEHOLDER_ANIM_SINGLE_FRAME(Revavroom); -#endif //P_FAMILY_VAROOM - -#if P_FAMILY_CYCLIZAR -PLACEHOLDER_ANIM_SINGLE_FRAME(Cyclizar); -#endif //P_FAMILY_CYCLIZAR - -#if P_FAMILY_ORTHWORM -PLACEHOLDER_ANIM_SINGLE_FRAME(Orthworm); -#endif //P_FAMILY_ORTHWORM - -#if P_FAMILY_GLIMMET -PLACEHOLDER_ANIM_SINGLE_FRAME(Glimmet); -PLACEHOLDER_ANIM_SINGLE_FRAME(Glimmora); -#endif //P_FAMILY_GLIMMET - -#if P_FAMILY_GREAVARD -PLACEHOLDER_ANIM_SINGLE_FRAME(Greavard); -PLACEHOLDER_ANIM_SINGLE_FRAME(Houndstone); -#endif //P_FAMILY_GREAVARD - -#if P_FAMILY_FLAMIGO -PLACEHOLDER_ANIM_SINGLE_FRAME(Flamigo); -#endif //P_FAMILY_FLAMIGO - -#if P_FAMILY_CETODDLE -PLACEHOLDER_ANIM_SINGLE_FRAME(Cetoddle); -PLACEHOLDER_ANIM_SINGLE_FRAME(Cetitan); -#endif //P_FAMILY_CETODDLE - -#if P_FAMILY_VELUZA -PLACEHOLDER_ANIM_SINGLE_FRAME(Veluza); -#endif //P_FAMILY_VELUZA - -#if P_FAMILY_DONDOZO -PLACEHOLDER_ANIM_SINGLE_FRAME(Dondozo); -#endif //P_FAMILY_DONDOZO - -#if P_FAMILY_TATSUGIRI -PLACEHOLDER_ANIM_SINGLE_FRAME(Tatsugiri); -#endif //P_FAMILY_TATSUGIRI - -#if P_FAMILY_GREAT_TUSK -PLACEHOLDER_ANIM_TWO_FRAMES(GreatTusk); -#endif //P_FAMILY_GREAT_TUSK - -#if P_FAMILY_SCREAM_TAIL -PLACEHOLDER_ANIM_SINGLE_FRAME(ScreamTail); -#endif //P_FAMILY_SCREAM_TAIL - -#if P_FAMILY_BRUTE_BONNET -PLACEHOLDER_ANIM_SINGLE_FRAME(BruteBonnet); -#endif //P_FAMILY_BRUTE_BONNET - -#if P_FAMILY_FLUTTER_MANE -PLACEHOLDER_ANIM_SINGLE_FRAME(FlutterMane); -#endif //P_FAMILY_FLUTTER_MANE - -#if P_FAMILY_SLITHER_WING -PLACEHOLDER_ANIM_SINGLE_FRAME(SlitherWing); -#endif //P_FAMILY_SLITHER_WING - -#if P_FAMILY_SANDY_SHOCKS -PLACEHOLDER_ANIM_SINGLE_FRAME(SandyShocks); -#endif //P_FAMILY_SANDY_SHOCKS - -#if P_FAMILY_IRON_TREADS -PLACEHOLDER_ANIM_SINGLE_FRAME(IronTreads); -#endif //P_FAMILY_IRON_TREADS - -#if P_FAMILY_IRON_BUNDLE -PLACEHOLDER_ANIM_SINGLE_FRAME(IronBundle); -#endif //P_FAMILY_IRON_BUNDLE - -#if P_FAMILY_IRON_HANDS -PLACEHOLDER_ANIM_SINGLE_FRAME(IronHands); -#endif //P_FAMILY_IRON_HANDS - -#if P_FAMILY_IRON_JUGULIS -PLACEHOLDER_ANIM_SINGLE_FRAME(IronJugulis); -#endif //P_FAMILY_IRON_JUGULIS - -#if P_FAMILY_IRON_MOTH -PLACEHOLDER_ANIM_SINGLE_FRAME(IronMoth); -#endif //P_FAMILY_IRON_MOTH - -#if P_FAMILY_IRON_THORNS -PLACEHOLDER_ANIM_SINGLE_FRAME(IronThorns); -#endif //P_FAMILY_IRON_THORNS - -#if P_FAMILY_FRIGIBAX -PLACEHOLDER_ANIM_TWO_FRAMES(Frigibax); -PLACEHOLDER_ANIM_SINGLE_FRAME(Arctibax); -PLACEHOLDER_ANIM_SINGLE_FRAME(Baxcalibur); -#endif //P_FAMILY_FRIGIBAX - -#if P_FAMILY_GIMMIGHOUL -PLACEHOLDER_ANIM_SINGLE_FRAME(Gimmighoul); -PLACEHOLDER_ANIM_SINGLE_FRAME(Gholdengo); -#endif //P_FAMILY_GIMMIGHOUL - -#if P_FAMILY_WO_CHIEN -PLACEHOLDER_ANIM_SINGLE_FRAME(WoChien); -#endif //P_FAMILY_WO_CHIEN - -#if P_FAMILY_CHIEN_PAO -PLACEHOLDER_ANIM_SINGLE_FRAME(ChienPao); -#endif //P_FAMILY_CHIEN_PAO - -#if P_FAMILY_TING_LU -PLACEHOLDER_ANIM_SINGLE_FRAME(TingLu); -#endif //P_FAMILY_TING_LU - -#if P_FAMILY_CHI_YU -PLACEHOLDER_ANIM_SINGLE_FRAME(ChiYu); -#endif //P_FAMILY_CHI_YU - -#if P_FAMILY_ROARING_MOON -PLACEHOLDER_ANIM_SINGLE_FRAME(RoaringMoon); -#endif //P_FAMILY_ROARING_MOON - -#if P_FAMILY_IRON_VALIANT -PLACEHOLDER_ANIM_SINGLE_FRAME(IronValiant); -#endif //P_FAMILY_IRON_VALIANT - -#if P_FAMILY_KORAIDON -PLACEHOLDER_ANIM_SINGLE_FRAME(Koraidon); -#endif //P_FAMILY_KORAIDON - -#if P_FAMILY_MIRAIDON -PLACEHOLDER_ANIM_SINGLE_FRAME(Miraidon); -#endif //P_FAMILY_MIRAIDON - -#if P_FAMILY_WALKING_WAKE -PLACEHOLDER_ANIM_SINGLE_FRAME(WalkingWake); -#endif //P_FAMILY_WALKING_WAKE - -#if P_FAMILY_IRON_LEAVES -PLACEHOLDER_ANIM_SINGLE_FRAME(IronLeaves); -#endif //P_FAMILY_IRON_LEAVES - -#if P_FAMILY_POLTCHAGEIST -PLACEHOLDER_ANIM_SINGLE_FRAME(Poltchageist); -PLACEHOLDER_ANIM_SINGLE_FRAME(Sinistcha); -#endif //P_FAMILY_POLTCHAGEIST - -#if P_FAMILY_OKIDOGI -PLACEHOLDER_ANIM_SINGLE_FRAME(Okidogi); -#endif //P_FAMILY_OKIDOGI - -#if P_FAMILY_MUNKIDORI -PLACEHOLDER_ANIM_SINGLE_FRAME(Munkidori); -#endif //P_FAMILY_MUNKIDORI - -#if P_FAMILY_FEZANDIPITI -PLACEHOLDER_ANIM_SINGLE_FRAME(Fezandipiti); -#endif //P_FAMILY_FEZANDIPITI - -#if P_FAMILY_OGERPON -PLACEHOLDER_ANIM_SINGLE_FRAME(Ogerpon); -#endif //P_FAMILY_OGERPON - -#if P_FAMILY_GOUGING_FIRE -PLACEHOLDER_ANIM_SINGLE_FRAME(GougingFire); -#endif //P_FAMILY_GOUGING_FIRE - -#if P_FAMILY_RAGING_BOLT -PLACEHOLDER_ANIM_SINGLE_FRAME(RagingBolt); -#endif //P_FAMILY_RAGING_BOLT - -#if P_FAMILY_IRON_BOULDER -PLACEHOLDER_ANIM_SINGLE_FRAME(IronBoulder); -#endif //P_FAMILY_IRON_BOULDER - -#if P_FAMILY_IRON_CROWN -PLACEHOLDER_ANIM_SINGLE_FRAME(IronCrown); -#endif //P_FAMILY_IRON_CROWN - -#if P_FAMILY_TERAPAGOS -static const union AnimCmd sAnim_TerapagosNormal_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -static const union AnimCmd sAnim_TerapagosTerastal_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -PLACEHOLDER_ANIM_SINGLE_FRAME(TerapagosStellar); -#endif //P_FAMILY_TERAPAGOS - -#if P_FAMILY_PECHARUNT -PLACEHOLDER_ANIM_SINGLE_FRAME(Pecharunt); -#endif //P_FAMILY_PECHARUNT - static const union AnimCmd sAnim_Egg_1[] = { ANIMCMD_FRAME(0, 6), @@ -10157,73 +8861,39 @@ static const union AnimCmd *const sAnims_##name[] = \ sAnim_##name##_1, \ } - -SINGLE_ANIMATION(None); #if P_FAMILY_BULBASAUR SINGLE_ANIMATION(Bulbasaur); SINGLE_ANIMATION(Ivysaur); SINGLE_ANIMATION(Venusaur); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(VenusaurMega); -#endif //P_MEGA_EVOLUTIONS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(VenusaurGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_BULBASAUR #if P_FAMILY_CHARMANDER SINGLE_ANIMATION(Charmander); SINGLE_ANIMATION(Charmeleon); SINGLE_ANIMATION(Charizard); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(CharizardMegaX); -SINGLE_ANIMATION(CharizardMegaY); -#endif //P_MEGA_EVOLUTIONS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CharizardGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHARMANDER #if P_FAMILY_SQUIRTLE SINGLE_ANIMATION(Squirtle); SINGLE_ANIMATION(Wartortle); SINGLE_ANIMATION(Blastoise); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(BlastoiseMega); -#endif //P_MEGA_EVOLUTIONS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(BlastoiseGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SQUIRTLE #if P_FAMILY_CATERPIE SINGLE_ANIMATION(Caterpie); SINGLE_ANIMATION(Metapod); SINGLE_ANIMATION(Butterfree); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(ButterfreeGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CATERPIE #if P_FAMILY_WEEDLE SINGLE_ANIMATION(Weedle); SINGLE_ANIMATION(Kakuna); SINGLE_ANIMATION(Beedrill); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(BeedrillMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_WEEDLE #if P_FAMILY_PIDGEY SINGLE_ANIMATION(Pidgey); SINGLE_ANIMATION(Pidgeotto); SINGLE_ANIMATION(Pidgeot); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(PidgeotMega); -#endif #endif //P_FAMILY_PIDGEY #if P_FAMILY_RATTATA SINGLE_ANIMATION(Rattata); SINGLE_ANIMATION(Raticate); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(RattataAlola); -SINGLE_ANIMATION(RaticateAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_RATTATA #if P_FAMILY_SPEAROW SINGLE_ANIMATION(Spearow); @@ -10236,42 +8906,13 @@ SINGLE_ANIMATION(Arbok); #if P_FAMILY_PIKACHU #if P_GEN_2_CROSS_EVOS SINGLE_ANIMATION(Pichu); -SINGLE_ANIMATION(PichuSpikyEared); #endif //P_GEN_2_CROSS_EVOS SINGLE_ANIMATION(Pikachu); -#if P_COSPLAY_PIKACHU_FORMS -SINGLE_ANIMATION(PikachuCosplay); -SINGLE_ANIMATION(PikachuRockStar); -SINGLE_ANIMATION(PikachuBelle); -SINGLE_ANIMATION(PikachuPopStar); -SINGLE_ANIMATION(PikachuPhD); -SINGLE_ANIMATION(PikachuLibre); -#endif //P_COSPLAY_PIKACHU_FORMS -#if P_CAP_PIKACHU_FORMS -SINGLE_ANIMATION(PikachuOriginal); -SINGLE_ANIMATION(PikachuHoenn); -SINGLE_ANIMATION(PikachuSinnoh); -SINGLE_ANIMATION(PikachuUnova); -SINGLE_ANIMATION(PikachuKalos); -SINGLE_ANIMATION(PikachuAlola); -SINGLE_ANIMATION(PikachuPartner); -SINGLE_ANIMATION(PikachuWorld); -#endif //P_CAP_PIKACHU_FORMS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(PikachuGmax); -#endif //P_GIGANTAMAX_FORMS SINGLE_ANIMATION(Raichu); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(RaichuAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_PIKACHU #if P_FAMILY_SANDSHREW SINGLE_ANIMATION(Sandshrew); SINGLE_ANIMATION(Sandslash); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(SandshrewAlola); -SINGLE_ANIMATION(SandslashAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_SANDSHREW #if P_FAMILY_NIDORAN SINGLE_ANIMATION(NidoranF); @@ -10291,10 +8932,6 @@ SINGLE_ANIMATION(Clefable); #if P_FAMILY_VULPIX SINGLE_ANIMATION(Vulpix); SINGLE_ANIMATION(Ninetales); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(VulpixAlola); -SINGLE_ANIMATION(NinetalesAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_VULPIX #if P_FAMILY_JIGGLYPUFF #if P_GEN_2_CROSS_EVOS @@ -10329,25 +8966,10 @@ SINGLE_ANIMATION(Venomoth); #if P_FAMILY_DIGLETT SINGLE_ANIMATION(Diglett); SINGLE_ANIMATION(Dugtrio); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(DiglettAlola); -SINGLE_ANIMATION(DugtrioAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_DIGLETT #if P_FAMILY_MEOWTH SINGLE_ANIMATION(Meowth); SINGLE_ANIMATION(Persian); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(MeowthAlola); -SINGLE_ANIMATION(PersianAlola); -#endif //P_ALOLAN_FORMS -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(MeowthGalar); -SINGLE_ANIMATION(Perrserker); -#endif //P_GALARIAN_FORMS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MeowthGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MEOWTH #if P_FAMILY_PSYDUCK SINGLE_ANIMATION(Psyduck); @@ -10356,17 +8978,10 @@ SINGLE_ANIMATION(Golduck); #if P_FAMILY_MANKEY SINGLE_ANIMATION(Mankey); SINGLE_ANIMATION(Primeape); -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Annihilape); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_MANKEY #if P_FAMILY_GROWLITHE SINGLE_ANIMATION(Growlithe); SINGLE_ANIMATION(Arcanine); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(GrowlitheHisui); -SINGLE_ANIMATION(ArcanineHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_GROWLITHE #if P_FAMILY_POLIWAG SINGLE_ANIMATION(Poliwag); @@ -10380,17 +8995,11 @@ SINGLE_ANIMATION(Politoed); SINGLE_ANIMATION(Abra); SINGLE_ANIMATION(Kadabra); SINGLE_ANIMATION(Alakazam); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AlakazamMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABRA #if P_FAMILY_MACHOP SINGLE_ANIMATION(Machop); SINGLE_ANIMATION(Machoke); SINGLE_ANIMATION(Machamp); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MachampGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_MACHOP #if P_FAMILY_BELLSPROUT SINGLE_ANIMATION(Bellsprout); @@ -10405,19 +9014,10 @@ SINGLE_ANIMATION(Tentacruel); SINGLE_ANIMATION(Geodude); SINGLE_ANIMATION(Graveler); SINGLE_ANIMATION(Golem); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(GeodudeAlola); -SINGLE_ANIMATION(GravelerAlola); -SINGLE_ANIMATION(GolemAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_GEODUDE #if P_FAMILY_PONYTA SINGLE_ANIMATION(Ponyta); SINGLE_ANIMATION(Rapidash); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(PonytaGalar); -SINGLE_ANIMATION(RapidashGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_PONYTA #if P_FAMILY_SLOWPOKE SINGLE_ANIMATION(Slowpoke); @@ -10425,16 +9025,6 @@ SINGLE_ANIMATION(Slowbro); #if P_GEN_2_CROSS_EVOS SINGLE_ANIMATION(Slowking); #endif //P_GEN_2_CROSS_EVOS -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SlowbroMega); -#endif //P_MEGA_EVOLUTIONS -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(SlowpokeGalar); -SINGLE_ANIMATION(SlowbroGalar); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(SlowkingGalar); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_SLOWPOKE #if P_FAMILY_MAGNEMITE SINGLE_ANIMATION(Magnemite); @@ -10445,10 +9035,6 @@ SINGLE_ANIMATION(Magnezone); #endif //P_FAMILY_MAGNEMITE #if P_FAMILY_FARFETCHD SINGLE_ANIMATION(Farfetchd); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(FarfetchdGalar); -SINGLE_ANIMATION(Sirfetchd); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_FARFETCHD #if P_FAMILY_DODUO SINGLE_ANIMATION(Doduo); @@ -10461,10 +9047,6 @@ SINGLE_ANIMATION(Dewgong); #if P_FAMILY_GRIMER SINGLE_ANIMATION(Grimer); SINGLE_ANIMATION(Muk); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(GrimerAlola); -SINGLE_ANIMATION(MukAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_GRIMER #if P_FAMILY_SHELLDER SINGLE_ANIMATION(Shellder); @@ -10474,20 +9056,11 @@ SINGLE_ANIMATION(Cloyster); SINGLE_ANIMATION(Gastly); SINGLE_ANIMATION(Haunter); SINGLE_ANIMATION(Gengar); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GengarMega); -#endif //P_MEGA_EVOLUTIONS -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GengarGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_GASTLY #if P_FAMILY_ONIX SINGLE_ANIMATION(Onix); #if P_GEN_2_CROSS_EVOS SINGLE_ANIMATION(Steelix); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SteelixMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS #endif //P_FAMILY_ONIX #if P_FAMILY_DROWZEE @@ -10497,31 +9070,18 @@ SINGLE_ANIMATION(Hypno); #if P_FAMILY_KRABBY SINGLE_ANIMATION(Krabby); SINGLE_ANIMATION(Kingler); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(KinglerGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_KRABBY #if P_FAMILY_VOLTORB SINGLE_ANIMATION(Voltorb); SINGLE_ANIMATION(Electrode); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(VoltorbHisui); -SINGLE_ANIMATION(ElectrodeHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_VOLTORB #if P_FAMILY_EXEGGCUTE SINGLE_ANIMATION(Exeggcute); SINGLE_ANIMATION(Exeggutor); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(ExeggutorAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_EXEGGCUTE #if P_FAMILY_CUBONE SINGLE_ANIMATION(Cubone); SINGLE_ANIMATION(Marowak); -#if P_ALOLAN_FORMS -SINGLE_ANIMATION(MarowakAlola); -#endif //P_ALOLAN_FORMS #endif //P_FAMILY_CUBONE #if P_FAMILY_HITMONS #if P_GEN_2_CROSS_EVOS @@ -10542,9 +9102,6 @@ SINGLE_ANIMATION(Lickilicky); #if P_FAMILY_KOFFING SINGLE_ANIMATION(Koffing); SINGLE_ANIMATION(Weezing); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(WeezingGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_KOFFING #if P_FAMILY_RHYHORN SINGLE_ANIMATION(Rhyhorn); @@ -10570,9 +9127,6 @@ SINGLE_ANIMATION(Tangrowth); #endif //P_FAMILY_TANGELA #if P_FAMILY_KANGASKHAN SINGLE_ANIMATION(Kangaskhan); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(KangaskhanMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_KANGASKHAN #if P_FAMILY_HORSEA SINGLE_ANIMATION(Horsea); @@ -10594,22 +9148,12 @@ SINGLE_ANIMATION(Starmie); SINGLE_ANIMATION(MimeJr); #endif //P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(MrMime); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(MrMimeGalar); -SINGLE_ANIMATION(MrRime); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_MR_MIME #if P_FAMILY_SCYTHER SINGLE_ANIMATION(Scyther); #if P_GEN_2_CROSS_EVOS SINGLE_ANIMATION(Scizor); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(ScizorMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_2_CROSS_EVOS -#if P_GEN_8_CROSS_EVOS -SINGLE_ANIMATION(Kleavor); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_SCYTHER #if P_FAMILY_JYNX #if P_GEN_2_CROSS_EVOS @@ -10637,37 +9181,22 @@ SINGLE_ANIMATION(Magmortar); #endif //P_FAMILY_MAGMAR #if P_FAMILY_PINSIR SINGLE_ANIMATION(Pinsir); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(PinsirMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_PINSIR #if P_FAMILY_TAUROS SINGLE_ANIMATION(Tauros); -#if P_PALDEAN_FORMS -SINGLE_ANIMATION(TaurosPaldea); -#endif //P_PALDEAN_FORMS #endif //P_FAMILY_TAUROS #if P_FAMILY_MAGIKARP SINGLE_ANIMATION(Magikarp); SINGLE_ANIMATION(Gyarados); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GyaradosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAGIKARP #if P_FAMILY_LAPRAS SINGLE_ANIMATION(Lapras); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(LaprasGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_LAPRAS #if P_FAMILY_DITTO SINGLE_ANIMATION(Ditto); #endif //P_FAMILY_DITTO #if P_FAMILY_EEVEE SINGLE_ANIMATION(Eevee); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(EeveeGmax); -#endif //P_GIGANTAMAX_FORMS SINGLE_ANIMATION(Vaporeon); SINGLE_ANIMATION(Jolteon); SINGLE_ANIMATION(Flareon); @@ -10702,36 +9231,21 @@ SINGLE_ANIMATION(Kabutops); #endif //P_FAMILY_KABUTO #if P_FAMILY_AERODACTYL SINGLE_ANIMATION(Aerodactyl); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AerodactylMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AERODACTYL #if P_FAMILY_SNORLAX #if P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Munchlax); #endif //P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Snorlax); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(SnorlaxGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SNORLAX #if P_FAMILY_ARTICUNO SINGLE_ANIMATION(Articuno); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(ArticunoGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ARTICUNO #if P_FAMILY_ZAPDOS SINGLE_ANIMATION(Zapdos); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(ZapdosGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZAPDOS #if P_FAMILY_MOLTRES SINGLE_ANIMATION(Moltres); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(MoltresGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_MOLTRES #if P_FAMILY_DRATINI SINGLE_ANIMATION(Dratini); @@ -10740,10 +9254,6 @@ SINGLE_ANIMATION(Dragonite); #endif //P_FAMILY_DRATINI #if P_FAMILY_MEWTWO SINGLE_ANIMATION(Mewtwo); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(MewtwoMegaX); -SINGLE_ANIMATION(MewtwoMegaY); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEWTWO #if P_FAMILY_MEW SINGLE_ANIMATION(Mew); @@ -10757,9 +9267,6 @@ SINGLE_ANIMATION(Meganium); SINGLE_ANIMATION(Cyndaquil); SINGLE_ANIMATION(Quilava); SINGLE_ANIMATION(Typhlosion); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(TyphlosionHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_CYNDAQUIL #if P_FAMILY_TOTODILE SINGLE_ANIMATION(Totodile); @@ -10801,9 +9308,6 @@ SINGLE_ANIMATION(Xatu); SINGLE_ANIMATION(Mareep); SINGLE_ANIMATION(Flaaffy); SINGLE_ANIMATION(Ampharos); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AmpharosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAREEP #if P_FAMILY_MARILL #if P_GEN_3_CROSS_EVOS @@ -10842,10 +9346,6 @@ SINGLE_ANIMATION(Yanmega); #if P_FAMILY_WOOPER SINGLE_ANIMATION(Wooper); SINGLE_ANIMATION(Quagsire); -#if P_PALDEAN_FORMS -SINGLE_ANIMATION(WooperPaldea); -SINGLE_ANIMATION(Clodsire); -#endif //P_PALDEAN_FORMS #endif //P_FAMILY_WOOPER #if P_FAMILY_MURKROW SINGLE_ANIMATION(Murkrow); @@ -10859,9 +9359,6 @@ SINGLE_ANIMATION(Misdreavus); SINGLE_ANIMATION(Mismagius); #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_MISDREAVUS -#if P_FAMILY_UNOWN -SINGLE_ANIMATION(Unown); -#endif //P_FAMILY_UNOWN #if P_FAMILY_WOBBUFFET #if P_GEN_3_CROSS_EVOS SINGLE_ANIMATION(Wynaut); @@ -10870,9 +9367,6 @@ SINGLE_ANIMATION(Wobbuffet); #endif //P_FAMILY_WOBBUFFET #if P_FAMILY_GIRAFARIG SINGLE_ANIMATION(Girafarig); -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Farigiraf); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_GIRAFARIG #if P_FAMILY_PINECO SINGLE_ANIMATION(Pineco); @@ -10880,9 +9374,6 @@ SINGLE_ANIMATION(Forretress); #endif //P_FAMILY_PINECO #if P_FAMILY_DUNSPARCE SINGLE_ANIMATION(Dunsparce); -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Dudunsparce); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_DUNSPARCE #if P_FAMILY_GLIGAR SINGLE_ANIMATION(Gligar); @@ -10896,37 +9387,22 @@ SINGLE_ANIMATION(Granbull); #endif //P_FAMILY_SNUBBULL #if P_FAMILY_QWILFISH SINGLE_ANIMATION(Qwilfish); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(QwilfishHisui); -SINGLE_ANIMATION(Overqwil); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_QWILFISH #if P_FAMILY_SHUCKLE SINGLE_ANIMATION(Shuckle); #endif //P_FAMILY_SHUCKLE #if P_FAMILY_HERACROSS SINGLE_ANIMATION(Heracross); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(HeracrossMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HERACROSS #if P_FAMILY_SNEASEL SINGLE_ANIMATION(Sneasel); #if P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Weavile); #endif //P_GEN_4_CROSS_EVOS -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(SneaselHisui); -SINGLE_ANIMATION(Sneasler); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_SNEASEL #if P_FAMILY_TEDDIURSA SINGLE_ANIMATION(Teddiursa); SINGLE_ANIMATION(Ursaring); -#if P_GEN_8_CROSS_EVOS -SINGLE_ANIMATION(Ursaluna); -SINGLE_ANIMATION(UrsalunaBloodmoon); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_TEDDIURSA #if P_FAMILY_SLUGMA SINGLE_ANIMATION(Slugma); @@ -10941,10 +9417,6 @@ SINGLE_ANIMATION(Mamoswine); #endif //P_FAMILY_SWINUB #if P_FAMILY_CORSOLA SINGLE_ANIMATION(Corsola); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(CorsolaGalar); -SINGLE_ANIMATION(Cursola); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_CORSOLA #if P_FAMILY_REMORAID SINGLE_ANIMATION(Remoraid); @@ -10965,9 +9437,6 @@ SINGLE_ANIMATION(Skarmory); #if P_FAMILY_HOUNDOUR SINGLE_ANIMATION(Houndour); SINGLE_ANIMATION(Houndoom); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(HoundoomMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_HOUNDOUR #if P_FAMILY_PHANPY SINGLE_ANIMATION(Phanpy); @@ -10975,9 +9444,6 @@ SINGLE_ANIMATION(Donphan); #endif //P_FAMILY_PHANPY #if P_FAMILY_STANTLER SINGLE_ANIMATION(Stantler); -#if P_GEN_8_CROSS_EVOS -SINGLE_ANIMATION(Wyrdeer); -#endif //P_GEN_8_CROSS_EVOS #endif //P_FAMILY_STANTLER #if P_FAMILY_SMEARGLE SINGLE_ANIMATION(Smeargle); @@ -10998,9 +9464,6 @@ SINGLE_ANIMATION(Suicune); SINGLE_ANIMATION(Larvitar); SINGLE_ANIMATION(Pupitar); SINGLE_ANIMATION(Tyranitar); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(TyranitarMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LARVITAR #if P_FAMILY_LUGIA SINGLE_ANIMATION(Lugia); @@ -11015,25 +9478,16 @@ SINGLE_ANIMATION(Celebi); SINGLE_ANIMATION(Treecko); SINGLE_ANIMATION(Grovyle); SINGLE_ANIMATION(Sceptile); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SceptileMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TREECKO #if P_FAMILY_TORCHIC SINGLE_ANIMATION(Torchic); SINGLE_ANIMATION(Combusken); SINGLE_ANIMATION(Blaziken); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(BlazikenMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_TORCHIC #if P_FAMILY_MUDKIP SINGLE_ANIMATION(Mudkip); SINGLE_ANIMATION(Marshtomp); SINGLE_ANIMATION(Swampert); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SwampertMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MUDKIP #if P_FAMILY_POOCHYENA SINGLE_ANIMATION(Poochyena); @@ -11042,11 +9496,6 @@ SINGLE_ANIMATION(Mightyena); #if P_FAMILY_ZIGZAGOON SINGLE_ANIMATION(Zigzagoon); SINGLE_ANIMATION(Linoone); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(ZigzagoonGalar); -SINGLE_ANIMATION(LinooneGalar); -SINGLE_ANIMATION(Obstagoon); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_ZIGZAGOON #if P_FAMILY_WURMPLE SINGLE_ANIMATION(Wurmple); @@ -11077,14 +9526,8 @@ SINGLE_ANIMATION(Pelipper); SINGLE_ANIMATION(Ralts); SINGLE_ANIMATION(Kirlia); SINGLE_ANIMATION(Gardevoir); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GardevoirMega); -#endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Gallade); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GalladeMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_GEN_4_CROSS_EVOS #endif //P_FAMILY_RALTS #if P_FAMILY_SURSKIT @@ -11126,37 +9569,22 @@ SINGLE_ANIMATION(Delcatty); #endif //P_FAMILY_SKITTY #if P_FAMILY_SABLEYE SINGLE_ANIMATION(Sableye); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SableyeMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SABLEYE #if P_FAMILY_MAWILE SINGLE_ANIMATION(Mawile); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(MawileMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MAWILE #if P_FAMILY_ARON SINGLE_ANIMATION(Aron); SINGLE_ANIMATION(Lairon); SINGLE_ANIMATION(Aggron); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AggronMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ARON #if P_FAMILY_MEDITITE SINGLE_ANIMATION(Meditite); SINGLE_ANIMATION(Medicham); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(MedichamMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_MEDITITE #if P_FAMILY_ELECTRIKE SINGLE_ANIMATION(Electrike); SINGLE_ANIMATION(Manectric); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(ManectricMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ELECTRIKE #if P_FAMILY_PLUSLE SINGLE_ANIMATION(Plusle); @@ -11184,9 +9612,6 @@ SINGLE_ANIMATION(Swalot); #if P_FAMILY_CARVANHA SINGLE_ANIMATION(Carvanha); SINGLE_ANIMATION(Sharpedo); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SharpedoMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_CARVANHA #if P_FAMILY_WAILMER SINGLE_ANIMATION(Wailmer); @@ -11195,9 +9620,6 @@ SINGLE_ANIMATION(Wailord); #if P_FAMILY_NUMEL SINGLE_ANIMATION(Numel); SINGLE_ANIMATION(Camerupt); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(CameruptMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_NUMEL #if P_FAMILY_TORKOAL SINGLE_ANIMATION(Torkoal); @@ -11221,9 +9643,6 @@ SINGLE_ANIMATION(Cacturne); #if P_FAMILY_SWABLU SINGLE_ANIMATION(Swablu); SINGLE_ANIMATION(Altaria); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AltariaMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SWABLU #if P_FAMILY_ZANGOOSE SINGLE_ANIMATION(Zangoose); @@ -11273,9 +9692,6 @@ SINGLE_ANIMATION(Kecleon); #if P_FAMILY_SHUPPET SINGLE_ANIMATION(Shuppet); SINGLE_ANIMATION(Banette); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(BanetteMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SHUPPET #if P_FAMILY_DUSKULL SINGLE_ANIMATION(Duskull); @@ -11295,16 +9711,10 @@ SINGLE_ANIMATION(Chimecho); #endif //P_FAMILY_CHIMECHO #if P_FAMILY_ABSOL SINGLE_ANIMATION(Absol); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AbsolMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_ABSOL #if P_FAMILY_SNORUNT SINGLE_ANIMATION(Snorunt); SINGLE_ANIMATION(Glalie); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GlalieMega); -#endif //P_MEGA_EVOLUTIONS #if P_GEN_4_CROSS_EVOS SINGLE_ANIMATION(Froslass); #endif //P_GEN_4_CROSS_EVOS @@ -11329,17 +9739,11 @@ SINGLE_ANIMATION(Luvdisc); SINGLE_ANIMATION(Bagon); SINGLE_ANIMATION(Shelgon); SINGLE_ANIMATION(Salamence); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(SalamenceMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BAGON #if P_FAMILY_BELDUM SINGLE_ANIMATION(Beldum); SINGLE_ANIMATION(Metang); SINGLE_ANIMATION(Metagross); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(MetagrossMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BELDUM #if P_FAMILY_REGIROCK SINGLE_ANIMATION(Regirock); @@ -11352,33 +9756,18 @@ SINGLE_ANIMATION(Registeel); #endif //P_FAMILY_REGISTEEL #if P_FAMILY_LATIAS SINGLE_ANIMATION(Latias); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(LatiasMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIAS #if P_FAMILY_LATIOS SINGLE_ANIMATION(Latios); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(LatiosMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_LATIOS #if P_FAMILY_KYOGRE SINGLE_ANIMATION(Kyogre); -#if P_PRIMAL_REVERSIONS -SINGLE_ANIMATION(KyogrePrimal); -#endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_KYOGRE #if P_FAMILY_GROUDON SINGLE_ANIMATION(Groudon); -#if P_PRIMAL_REVERSIONS -SINGLE_ANIMATION(GroudonPrimal); -#endif //P_PRIMAL_REVERSIONS #endif //P_FAMILY_GROUDON #if P_FAMILY_RAYQUAZA SINGLE_ANIMATION(Rayquaza); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(RayquazaMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RAYQUAZA #if P_FAMILY_JIRACHI SINGLE_ANIMATION(Jirachi); @@ -11462,9 +9851,6 @@ SINGLE_ANIMATION(Drifblim); #if P_FAMILY_BUNEARY SINGLE_ANIMATION(Buneary); SINGLE_ANIMATION(Lopunny); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(LopunnyMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_BUNEARY #if P_FAMILY_GLAMEOW SINGLE_ANIMATION(Glameow); @@ -11488,16 +9874,10 @@ SINGLE_ANIMATION(Spiritomb); SINGLE_ANIMATION(Gible); SINGLE_ANIMATION(Gabite); SINGLE_ANIMATION(Garchomp); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(GarchompMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_GIBLE #if P_FAMILY_RIOLU SINGLE_ANIMATION(Riolu); SINGLE_ANIMATION(Lucario); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(LucarioMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_RIOLU #if P_FAMILY_HIPPOPOTAS SINGLE_ANIMATION(Hippopotas); @@ -11521,9 +9901,6 @@ SINGLE_ANIMATION(Lumineon); #if P_FAMILY_SNOVER SINGLE_ANIMATION(Snover); SINGLE_ANIMATION(Abomasnow); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AbomasnowMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_SNOVER #if P_FAMILY_ROTOM SINGLE_ANIMATION(Rotom); @@ -11544,11 +9921,9 @@ SINGLE_ANIMATION(Azelf); #endif //P_FAMILY_AZELF #if P_FAMILY_DIALGA SINGLE_ANIMATION(Dialga); -SINGLE_ANIMATION(DialgaOrigin); #endif //P_FAMILY_DIALGA #if P_FAMILY_PALKIA SINGLE_ANIMATION(Palkia); -SINGLE_ANIMATION(PalkiaOrigin); #endif //P_FAMILY_PALKIA #if P_FAMILY_HEATRAN SINGLE_ANIMATION(Heatran); @@ -11594,9 +9969,6 @@ SINGLE_ANIMATION(Emboar); SINGLE_ANIMATION(Oshawott); SINGLE_ANIMATION(Dewott); SINGLE_ANIMATION(Samurott); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(SamurottHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_OSHAWOTT #if P_FAMILY_PATRAT SINGLE_ANIMATION(Patrat); @@ -11651,9 +10023,6 @@ SINGLE_ANIMATION(Excadrill); #endif //P_FAMILY_DRILBUR #if P_FAMILY_AUDINO SINGLE_ANIMATION(Audino); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(AudinoMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_AUDINO #if P_FAMILY_TIMBURR SINGLE_ANIMATION(Timburr); @@ -11688,15 +10057,9 @@ SINGLE_ANIMATION(Whimsicott); #if P_FAMILY_PETILIL SINGLE_ANIMATION(Petilil); SINGLE_ANIMATION(Lilligant); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(LilligantHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_PETILIL #if P_FAMILY_BASCULIN SINGLE_ANIMATION(Basculin); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(Basculegion); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_BASCULIN #if P_FAMILY_SANDILE SINGLE_ANIMATION(Sandile); @@ -11707,11 +10070,6 @@ SINGLE_ANIMATION(Krookodile); SINGLE_ANIMATION(Darumaka); SINGLE_ANIMATION(DarmanitanStandard); SINGLE_ANIMATION(DarmanitanZen); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(DarumakaGalar); -SINGLE_ANIMATION(DarmanitanGalarStandard); -SINGLE_ANIMATION(DarmanitanGalarZen); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_DARUMAKA #if P_FAMILY_MARACTUS SINGLE_ANIMATION(Maractus); @@ -11730,10 +10088,6 @@ SINGLE_ANIMATION(Sigilyph); #if P_FAMILY_YAMASK SINGLE_ANIMATION(Yamask); SINGLE_ANIMATION(Cofagrigus); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(YamaskGalar); -SINGLE_ANIMATION(Runerigus); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_YAMASK #if P_FAMILY_TIRTOUGA SINGLE_ANIMATION(Tirtouga); @@ -11746,17 +10100,10 @@ SINGLE_ANIMATION(Archeops); #if P_FAMILY_TRUBBISH SINGLE_ANIMATION(Trubbish); SINGLE_ANIMATION(Garbodor); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GarbodorGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_TRUBBISH #if P_FAMILY_ZORUA SINGLE_ANIMATION(Zorua); SINGLE_ANIMATION(Zoroark); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(ZoruaHisui); -SINGLE_ANIMATION(ZoroarkHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_ZORUA #if P_FAMILY_MINCCINO SINGLE_ANIMATION(Minccino); @@ -11848,9 +10195,6 @@ SINGLE_ANIMATION(Accelgor); #endif //P_FAMILY_SHELMET #if P_FAMILY_STUNFISK SINGLE_ANIMATION(Stunfisk); -#if P_GALARIAN_FORMS -SINGLE_ANIMATION(StunfiskGalar); -#endif //P_GALARIAN_FORMS #endif //P_FAMILY_STUNFISK #if P_FAMILY_MIENFOO SINGLE_ANIMATION(Mienfoo); @@ -11866,9 +10210,6 @@ SINGLE_ANIMATION(Golurk); #if P_FAMILY_PAWNIARD SINGLE_ANIMATION(Pawniard); SINGLE_ANIMATION(Bisharp); -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Kingambit); -#endif //P_GEN_9_CROSS_EVOS #endif //P_FAMILY_PAWNIARD #if P_FAMILY_BOUFFALANT SINGLE_ANIMATION(Bouffalant); @@ -11876,9 +10217,6 @@ SINGLE_ANIMATION(Bouffalant); #if P_FAMILY_RUFFLET SINGLE_ANIMATION(Rufflet); SINGLE_ANIMATION(Braviary); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(BraviaryHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_RUFFLET #if P_FAMILY_VULLABY SINGLE_ANIMATION(Vullaby); @@ -12053,10 +10391,6 @@ SINGLE_ANIMATION(Carbink); SINGLE_ANIMATION(Goomy); SINGLE_ANIMATION(Sliggoo); SINGLE_ANIMATION(Goodra); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(SliggooHisui); -SINGLE_ANIMATION(GoodraHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_GOOMY #if P_FAMILY_KLEFKI SINGLE_ANIMATION(Klefki); @@ -12072,9 +10406,6 @@ SINGLE_ANIMATION(Gourgeist); #if P_FAMILY_BERGMITE SINGLE_ANIMATION(Bergmite); SINGLE_ANIMATION(Avalugg); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(AvaluggHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_BERGMITE #if P_FAMILY_NOIBAT SINGLE_ANIMATION(Noibat); @@ -12093,9 +10424,6 @@ SINGLE_ANIMATION(ZygardeComplete); #endif //P_FAMILY_ZYGARDE #if P_FAMILY_DIANCIE SINGLE_ANIMATION(Diancie); -#if P_MEGA_EVOLUTIONS -SINGLE_ANIMATION(DiancieMega); -#endif //P_MEGA_EVOLUTIONS #endif //P_FAMILY_DIANCIE #if P_FAMILY_HOOPA SINGLE_ANIMATION(HoopaConfined); @@ -12108,41 +10436,17 @@ SINGLE_ANIMATION(Volcanion); SINGLE_ANIMATION(Rowlet); SINGLE_ANIMATION(Dartrix); SINGLE_ANIMATION(Decidueye); -#if P_HISUIAN_FORMS -SINGLE_ANIMATION(DecidueyeHisui); -#endif //P_HISUIAN_FORMS #endif //P_FAMILY_ROWLET -#if P_FAMILY_LITTEN -SINGLE_ANIMATION(Litten); -SINGLE_ANIMATION(Torracat); -SINGLE_ANIMATION(Incineroar); -#endif //P_FAMILY_LITTEN -#if P_FAMILY_POPPLIO -SINGLE_ANIMATION(Popplio); -SINGLE_ANIMATION(Brionne); -SINGLE_ANIMATION(Primarina); -#endif //P_FAMILY_POPPLIO #if P_FAMILY_PIKIPEK SINGLE_ANIMATION(Pikipek); SINGLE_ANIMATION(Trumbeak); SINGLE_ANIMATION(Toucannon); #endif //P_FAMILY_PIKIPEK -#if P_FAMILY_YUNGOOS -SINGLE_ANIMATION(Yungoos); -SINGLE_ANIMATION(Gumshoos); -#endif //P_FAMILY_YUNGOOS #if P_FAMILY_GRUBBIN SINGLE_ANIMATION(Grubbin); SINGLE_ANIMATION(Charjabug); SINGLE_ANIMATION(Vikavolt); #endif //P_FAMILY_GRUBBIN -#if P_FAMILY_CRABRAWLER -SINGLE_ANIMATION(Crabrawler); -SINGLE_ANIMATION(Crabominable); -#endif //P_FAMILY_CRABRAWLER -#if P_FAMILY_ORICORIO -SINGLE_ANIMATION(Oricorio); -#endif //P_FAMILY_ORICORIO #if P_FAMILY_CUTIEFLY SINGLE_ANIMATION(Cutiefly); SINGLE_ANIMATION(Ribombee); @@ -12153,30 +10457,10 @@ SINGLE_ANIMATION(LycanrocMidday); SINGLE_ANIMATION(LycanrocMidnight); SINGLE_ANIMATION(LycanrocDusk); #endif //P_FAMILY_ROCKRUFF -#if P_FAMILY_WISHIWASHI -SINGLE_ANIMATION(WishiwashiSolo); -SINGLE_ANIMATION(WishiwashiSchool); -#endif //P_FAMILY_WISHIWASHI -#if P_FAMILY_MAREANIE -SINGLE_ANIMATION(Mareanie); -SINGLE_ANIMATION(Toxapex); -#endif //P_FAMILY_MAREANIE -#if P_FAMILY_MUDBRAY -SINGLE_ANIMATION(Mudbray); -SINGLE_ANIMATION(Mudsdale); -#endif //P_FAMILY_MUDBRAY #if P_FAMILY_DEWPIDER SINGLE_ANIMATION(Dewpider); SINGLE_ANIMATION(Araquanid); #endif //P_FAMILY_DEWPIDER -#if P_FAMILY_FOMANTIS -SINGLE_ANIMATION(Fomantis); -SINGLE_ANIMATION(Lurantis); -#endif //P_FAMILY_FOMANTIS -#if P_FAMILY_MORELULL -SINGLE_ANIMATION(Morelull); -SINGLE_ANIMATION(Shiinotic); -#endif //P_FAMILY_MORELULL #if P_FAMILY_SALANDIT SINGLE_ANIMATION(Salandit); SINGLE_ANIMATION(Salazzle); @@ -12185,14 +10469,6 @@ SINGLE_ANIMATION(Salazzle); SINGLE_ANIMATION(Stufful); SINGLE_ANIMATION(Bewear); #endif //P_FAMILY_STUFFUL -#if P_FAMILY_BOUNSWEET -SINGLE_ANIMATION(Bounsweet); -SINGLE_ANIMATION(Steenee); -SINGLE_ANIMATION(Tsareena); -#endif //P_FAMILY_BOUNSWEET -#if P_FAMILY_COMFEY -SINGLE_ANIMATION(Comfey); -#endif //P_FAMILY_COMFEY #if P_FAMILY_ORANGURU SINGLE_ANIMATION(Oranguru); #endif //P_FAMILY_ORANGURU @@ -12203,43 +10479,18 @@ SINGLE_ANIMATION(Passimian); SINGLE_ANIMATION(Wimpod); SINGLE_ANIMATION(Golisopod); #endif //P_FAMILY_WIMPOD -#if P_FAMILY_SANDYGAST -SINGLE_ANIMATION(Sandygast); -SINGLE_ANIMATION(Palossand); -#endif //P_FAMILY_SANDYGAST #if P_FAMILY_PYUKUMUKU SINGLE_ANIMATION(Pyukumuku); #endif //P_FAMILY_PYUKUMUKU -#if P_FAMILY_TYPE_NULL -SINGLE_ANIMATION(TypeNull); -SINGLE_ANIMATION(Silvally); -#endif //P_FAMILY_TYPE_NULL -#if P_FAMILY_MINIOR -SINGLE_ANIMATION(MiniorMeteor); -SINGLE_ANIMATION(MiniorCore); -#endif //P_FAMILY_MINIOR -#if P_FAMILY_KOMALA -SINGLE_ANIMATION(Komala); -#endif //P_FAMILY_KOMALA #if P_FAMILY_TURTONATOR SINGLE_ANIMATION(Turtonator); #endif //P_FAMILY_TURTONATOR #if P_FAMILY_TOGEDEMARU SINGLE_ANIMATION(Togedemaru); #endif //P_FAMILY_TOGEDEMARU -#if P_FAMILY_MIMIKYU -SINGLE_ANIMATION(MimikyuDisguised); -SINGLE_ANIMATION(MimikyuBusted); -#endif //P_FAMILY_MIMIKYU -#if P_FAMILY_BRUXISH -SINGLE_ANIMATION(Bruxish); -#endif //P_FAMILY_BRUXISH #if P_FAMILY_DRAMPA SINGLE_ANIMATION(Drampa); #endif //P_FAMILY_DRAMPA -#if P_FAMILY_DHELMISE -SINGLE_ANIMATION(Dhelmise); -#endif //P_FAMILY_DHELMISE #if P_FAMILY_JANGMO_O SINGLE_ANIMATION(Jangmo_O); SINGLE_ANIMATION(Hakamo_O); @@ -12257,561 +10508,22 @@ SINGLE_ANIMATION(TapuBulu); #if P_FAMILY_TAPU_FINI SINGLE_ANIMATION(TapuFini); #endif //P_FAMILY_TAPU_FINI -#if P_FAMILY_COSMOG -SINGLE_ANIMATION(Cosmog); -SINGLE_ANIMATION(Cosmoem); -SINGLE_ANIMATION(Solgaleo); -SINGLE_ANIMATION(Lunala); -#endif //P_FAMILY_COSMOG -#if P_FAMILY_NIHILEGO -SINGLE_ANIMATION(Nihilego); -#endif //P_FAMILY_NIHILEGO -#if P_FAMILY_BUZZWOLE -SINGLE_ANIMATION(Buzzwole); -#endif //P_FAMILY_BUZZWOLE -#if P_FAMILY_PHEROMOSA -SINGLE_ANIMATION(Pheromosa); -#endif //P_FAMILY_PHEROMOSA -#if P_FAMILY_XURKITREE -SINGLE_ANIMATION(Xurkitree); -#endif //P_FAMILY_XURKITREE -#if P_FAMILY_CELESTEELA -SINGLE_ANIMATION(Celesteela); -#endif //P_FAMILY_CELESTEELA -#if P_FAMILY_KARTANA -SINGLE_ANIMATION(Kartana); -#endif //P_FAMILY_KARTANA -#if P_FAMILY_GUZZLORD -SINGLE_ANIMATION(Guzzlord); -#endif //P_FAMILY_GUZZLORD -#if P_FAMILY_NECROZMA -SINGLE_ANIMATION(Necrozma); -#endif //P_FAMILY_NECROZMA -#if P_FAMILY_MAGEARNA -SINGLE_ANIMATION(Magearna); -#endif //P_FAMILY_MAGEARNA #if P_FAMILY_MARSHADOW SINGLE_ANIMATION(Marshadow); #endif //P_FAMILY_MARSHADOW -#if P_FAMILY_POIPOLE -SINGLE_ANIMATION(Poipole); -SINGLE_ANIMATION(Naganadel); -#endif //P_FAMILY_POIPOLE -#if P_FAMILY_STAKATAKA -SINGLE_ANIMATION(Stakataka); -#endif //P_FAMILY_STAKATAKA -#if P_FAMILY_BLACEPHALON -SINGLE_ANIMATION(Blacephalon); -#endif //P_FAMILY_BLACEPHALON -#if P_FAMILY_ZERAORA -SINGLE_ANIMATION(Zeraora); -#endif //P_FAMILY_ZERAORA -#if P_FAMILY_MELTAN -SINGLE_ANIMATION(Meltan); -SINGLE_ANIMATION(Melmetal); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(MelmetalGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_MELTAN -#if P_FAMILY_GROOKEY -SINGLE_ANIMATION(Grookey); -SINGLE_ANIMATION(Thwackey); -SINGLE_ANIMATION(Rillaboom); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(RillaboomGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_GROOKEY -#if P_FAMILY_SCORBUNNY -SINGLE_ANIMATION(Scorbunny); -SINGLE_ANIMATION(Raboot); -SINGLE_ANIMATION(Cinderace); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CinderaceGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SCORBUNNY -#if P_FAMILY_SOBBLE -SINGLE_ANIMATION(Sobble); -SINGLE_ANIMATION(Drizzile); -SINGLE_ANIMATION(Inteleon); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(InteleonGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SOBBLE -#if P_FAMILY_SKWOVET -SINGLE_ANIMATION(Skwovet); -SINGLE_ANIMATION(Greedent); -#endif //P_FAMILY_SKWOVET #if P_FAMILY_ROOKIDEE SINGLE_ANIMATION(Rookidee); SINGLE_ANIMATION(Corvisquire); SINGLE_ANIMATION(Corviknight); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CorviknightGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_ROOKIDEE -#if P_FAMILY_BLIPBUG -SINGLE_ANIMATION(Blipbug); -SINGLE_ANIMATION(Dottler); -SINGLE_ANIMATION(Orbeetle); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(OrbeetleGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_BLIPBUG -#if P_FAMILY_NICKIT -SINGLE_ANIMATION(Nickit); -SINGLE_ANIMATION(Thievul); -#endif //P_FAMILY_NICKIT -#if P_FAMILY_GOSSIFLEUR -SINGLE_ANIMATION(Gossifleur); -SINGLE_ANIMATION(Eldegoss); -#endif //P_FAMILY_GOSSIFLEUR -#if P_FAMILY_WOOLOO -SINGLE_ANIMATION(Wooloo); -SINGLE_ANIMATION(Dubwool); -#endif //P_FAMILY_WOOLOO #if P_FAMILY_CHEWTLE SINGLE_ANIMATION(Chewtle); SINGLE_ANIMATION(Drednaw); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(DrednawGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_CHEWTLE -#if P_FAMILY_YAMPER -SINGLE_ANIMATION(Yamper); -SINGLE_ANIMATION(Boltund); -#endif //P_FAMILY_YAMPER -#if P_FAMILY_ROLYCOLY -SINGLE_ANIMATION(Rolycoly); -SINGLE_ANIMATION(Carkol); -SINGLE_ANIMATION(Coalossal); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CoalossalGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_ROLYCOLY -#if P_FAMILY_APPLIN -SINGLE_ANIMATION(Applin); -SINGLE_ANIMATION(Flapple); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(FlappleGmax); -#endif //P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(Appletun); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(AppletunGmax); -#endif //P_GIGANTAMAX_FORMS -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Dipplin); -SINGLE_ANIMATION(Hydrapple); -#endif //P_GEN_9_CROSS_EVOS -#endif //P_FAMILY_APPLIN -#if P_FAMILY_SILICOBRA -SINGLE_ANIMATION(Silicobra); -SINGLE_ANIMATION(Sandaconda); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(SandacondaGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_SILICOBRA -#if P_FAMILY_CRAMORANT -SINGLE_ANIMATION(Cramorant); -#endif //P_FAMILY_CRAMORANT -#if P_FAMILY_ARROKUDA -SINGLE_ANIMATION(Arrokuda); -SINGLE_ANIMATION(Barraskewda); -#endif //P_FAMILY_ARROKUDA -#if P_FAMILY_TOXEL -SINGLE_ANIMATION(Toxel); -SINGLE_ANIMATION(Toxtricity); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(ToxtricityGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_TOXEL #if P_FAMILY_SIZZLIPEDE SINGLE_ANIMATION(Sizzlipede); SINGLE_ANIMATION(Centiskorch); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CentiskorchGmax); -#endif //P_GIGANTAMAX_FORMS #endif //P_FAMILY_SIZZLIPEDE -#if P_FAMILY_CLOBBOPUS -SINGLE_ANIMATION(Clobbopus); -SINGLE_ANIMATION(Grapploct); -#endif //P_FAMILY_CLOBBOPUS -#if P_FAMILY_SINISTEA -SINGLE_ANIMATION(Sinistea); -SINGLE_ANIMATION(Polteageist); -#endif //P_FAMILY_SINISTEA -#if P_FAMILY_HATENNA -SINGLE_ANIMATION(Hatenna); -SINGLE_ANIMATION(Hattrem); -SINGLE_ANIMATION(Hatterene); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(HattereneGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_HATENNA -#if P_FAMILY_IMPIDIMP -SINGLE_ANIMATION(Impidimp); -SINGLE_ANIMATION(Morgrem); -SINGLE_ANIMATION(Grimmsnarl); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(GrimmsnarlGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_IMPIDIMP -#if P_FAMILY_MILCERY -SINGLE_ANIMATION(Milcery); -SINGLE_ANIMATION(Alcremie); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(AlcremieGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_MILCERY -#if P_FAMILY_FALINKS -SINGLE_ANIMATION(Falinks); -#endif //P_FAMILY_FALINKS -#if P_FAMILY_PINCURCHIN -SINGLE_ANIMATION(Pincurchin); -#endif //P_FAMILY_PINCURCHIN -#if P_FAMILY_SNOM -SINGLE_ANIMATION(Snom); -SINGLE_ANIMATION(Frosmoth); -#endif //P_FAMILY_SNOM -#if P_FAMILY_STONJOURNER -SINGLE_ANIMATION(Stonjourner); -#endif //P_FAMILY_STONJOURNER -#if P_FAMILY_EISCUE -SINGLE_ANIMATION(Eiscue); -#endif //P_FAMILY_EISCUE -#if P_FAMILY_INDEEDEE -SINGLE_ANIMATION(Indeedee); -#endif //P_FAMILY_INDEEDEE -#if P_FAMILY_MORPEKO -SINGLE_ANIMATION(Morpeko); -#endif //P_FAMILY_MORPEKO -#if P_FAMILY_CUFANT -SINGLE_ANIMATION(Cufant); -SINGLE_ANIMATION(Copperajah); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(CopperajahGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_CUFANT -#if P_FAMILY_DRACOZOLT -SINGLE_ANIMATION(Dracozolt); -#endif //P_FAMILY_DRACOZOLT -#if P_FAMILY_ARCTOZOLT -SINGLE_ANIMATION(Arctozolt); -#endif //P_FAMILY_ARCTOZOLT -#if P_FAMILY_DRACOVISH -SINGLE_ANIMATION(Dracovish); -#endif //P_FAMILY_DRACOVISH -#if P_FAMILY_ARCTOVISH -SINGLE_ANIMATION(Arctovish); -#endif //P_FAMILY_ARCTOVISH -#if P_FAMILY_DURALUDON -SINGLE_ANIMATION(Duraludon); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(DuraludonGmax); -#endif //P_GIGANTAMAX_FORMS -#if P_GEN_9_CROSS_EVOS -SINGLE_ANIMATION(Archaludon); -#endif //P_GEN_9_CROSS_EVOS -#endif //P_FAMILY_DURALUDON -#if P_FAMILY_DREEPY -SINGLE_ANIMATION(Dreepy); -SINGLE_ANIMATION(Drakloak); -SINGLE_ANIMATION(Dragapult); -#endif //P_FAMILY_DREEPY -#if P_FAMILY_ZACIAN -SINGLE_ANIMATION(Zacian); -#endif //P_FAMILY_ZACIAN -#if P_FAMILY_ZAMAZENTA -SINGLE_ANIMATION(Zamazenta); -#endif //P_FAMILY_ZAMAZENTA -#if P_FAMILY_ETERNATUS -SINGLE_ANIMATION(Eternatus); -#endif //P_FAMILY_ETERNATUS -#if P_FAMILY_KUBFU -SINGLE_ANIMATION(Kubfu); -SINGLE_ANIMATION(Urshifu); -#if P_GIGANTAMAX_FORMS -SINGLE_ANIMATION(UrshifuSingleStrikeGmax); -SINGLE_ANIMATION(UrshifuRapidStrikeGmax); -#endif //P_GIGANTAMAX_FORMS -#endif //P_FAMILY_KUBFU -#if P_FAMILY_ZARUDE -SINGLE_ANIMATION(Zarude); -#endif //P_FAMILY_ZARUDE -#if P_FAMILY_REGIELEKI -SINGLE_ANIMATION(Regieleki); -#endif //P_FAMILY_REGIELEKI -#if P_FAMILY_REGIDRAGO -SINGLE_ANIMATION(Regidrago); -#endif //P_FAMILY_REGIDRAGO -#if P_FAMILY_GLASTRIER -SINGLE_ANIMATION(Glastrier); -#endif //P_FAMILY_GLASTRIER -#if P_FAMILY_SPECTRIER -SINGLE_ANIMATION(Spectrier); -#endif //P_FAMILY_SPECTRIER -#if P_FAMILY_CALYREX -SINGLE_ANIMATION(Calyrex); -#endif //P_FAMILY_CALYREX -#if P_FAMILY_ENAMORUS -SINGLE_ANIMATION(EnamorusIncarnate); -SINGLE_ANIMATION(EnamorusTherian); -#endif //P_FAMILY_ENAMORUS -#if P_FAMILY_SPRIGATITO -SINGLE_ANIMATION(Sprigatito); -SINGLE_ANIMATION(Floragato); -SINGLE_ANIMATION(Meowscarada); -#endif //P_FAMILY_SPRIGATITO -#if P_FAMILY_FUECOCO -SINGLE_ANIMATION(Fuecoco); -SINGLE_ANIMATION(Crocalor); -SINGLE_ANIMATION(Skeledirge); -#endif //P_FAMILY_FUECOCO -#if P_FAMILY_QUAXLY -SINGLE_ANIMATION(Quaxly); -SINGLE_ANIMATION(Quaxwell); -SINGLE_ANIMATION(Quaquaval); -#endif //P_FAMILY_QUAXLY -#if P_FAMILY_LECHONK -SINGLE_ANIMATION(Lechonk); -SINGLE_ANIMATION(Oinkologne); -#endif //P_FAMILY_LECHONK -#if P_FAMILY_TAROUNTULA -SINGLE_ANIMATION(Tarountula); -SINGLE_ANIMATION(Spidops); -#endif //P_FAMILY_TAROUNTULA -#if P_FAMILY_NYMBLE -SINGLE_ANIMATION(Nymble); -SINGLE_ANIMATION(Lokix); -#endif //P_FAMILY_NYMBLE -#if P_FAMILY_PAWMI -SINGLE_ANIMATION(Pawmi); -SINGLE_ANIMATION(Pawmo); -SINGLE_ANIMATION(Pawmot); -#endif //P_FAMILY_PAWMI -#if P_FAMILY_TANDEMAUS -SINGLE_ANIMATION(Tandemaus); -SINGLE_ANIMATION(Maushold); -#endif //P_FAMILY_TANDEMAUS -#if P_FAMILY_FIDOUGH -SINGLE_ANIMATION(Fidough); -SINGLE_ANIMATION(Dachsbun); -#endif //P_FAMILY_FIDOUGH -#if P_FAMILY_SMOLIV -SINGLE_ANIMATION(Smoliv); -SINGLE_ANIMATION(Dolliv); -SINGLE_ANIMATION(Arboliva); -#endif //P_FAMILY_SMOLIV -#if P_FAMILY_SQUAWKABILLY -SINGLE_ANIMATION(Squawkabilly); -#endif //P_FAMILY_SQUAWKABILLY -#if P_FAMILY_NACLI -SINGLE_ANIMATION(Nacli); -SINGLE_ANIMATION(Naclstack); -SINGLE_ANIMATION(Garganacl); -#endif //P_FAMILY_NACLI -#if P_FAMILY_CHARCADET -SINGLE_ANIMATION(Charcadet); -SINGLE_ANIMATION(Armarouge); -SINGLE_ANIMATION(Ceruledge); -#endif //P_FAMILY_CHARCADET -#if P_FAMILY_TADBULB -SINGLE_ANIMATION(Tadbulb); -SINGLE_ANIMATION(Bellibolt); -#endif //P_FAMILY_TADBULB -#if P_FAMILY_WATTREL -SINGLE_ANIMATION(Wattrel); -SINGLE_ANIMATION(Kilowattrel); -#endif //P_FAMILY_WATTREL -#if P_FAMILY_MASCHIFF -SINGLE_ANIMATION(Maschiff); -SINGLE_ANIMATION(Mabosstiff); -#endif //P_FAMILY_MASCHIFF -#if P_FAMILY_SHROODLE -SINGLE_ANIMATION(Shroodle); -SINGLE_ANIMATION(Grafaiai); -#endif //P_FAMILY_SHROODLE -#if P_FAMILY_BRAMBLIN -SINGLE_ANIMATION(Bramblin); -SINGLE_ANIMATION(Brambleghast); -#endif //P_FAMILY_BRAMBLIN -#if P_FAMILY_TOEDSCOOL -SINGLE_ANIMATION(Toedscool); -SINGLE_ANIMATION(Toedscruel); -#endif //P_FAMILY_TOEDSCOOL -#if P_FAMILY_KLAWF -SINGLE_ANIMATION(Klawf); -#endif //P_FAMILY_KLAWF -#if P_FAMILY_CAPSAKID -SINGLE_ANIMATION(Capsakid); -SINGLE_ANIMATION(Scovillain); -#endif //P_FAMILY_CAPSAKID -#if P_FAMILY_RELLOR -SINGLE_ANIMATION(Rellor); -SINGLE_ANIMATION(Rabsca); -#endif //P_FAMILY_RELLOR -#if P_FAMILY_FLITTLE -SINGLE_ANIMATION(Flittle); -SINGLE_ANIMATION(Espathra); -#endif //P_FAMILY_FLITTLE -#if P_FAMILY_TINKATINK -SINGLE_ANIMATION(Tinkatink); -SINGLE_ANIMATION(Tinkatuff); -SINGLE_ANIMATION(Tinkaton); -#endif //P_FAMILY_TINKATINK -#if P_FAMILY_WIGLETT -SINGLE_ANIMATION(Wiglett); -SINGLE_ANIMATION(Wugtrio); -#endif //P_FAMILY_WIGLETT -#if P_FAMILY_BOMBIRDIER -SINGLE_ANIMATION(Bombirdier); -#endif //P_FAMILY_BOMBIRDIER -#if P_FAMILY_FINIZEN -SINGLE_ANIMATION(Finizen); -SINGLE_ANIMATION(Palafin); -#endif //P_FAMILY_FINIZEN -#if P_FAMILY_VAROOM -SINGLE_ANIMATION(Varoom); -SINGLE_ANIMATION(Revavroom); -#endif //P_FAMILY_VAROOM -#if P_FAMILY_CYCLIZAR -SINGLE_ANIMATION(Cyclizar); -#endif //P_FAMILY_CYCLIZAR -#if P_FAMILY_ORTHWORM -SINGLE_ANIMATION(Orthworm); -#endif //P_FAMILY_ORTHWORM -#if P_FAMILY_GLIMMET -SINGLE_ANIMATION(Glimmet); -SINGLE_ANIMATION(Glimmora); -#endif //P_FAMILY_GLIMMET -#if P_FAMILY_GREAVARD -SINGLE_ANIMATION(Greavard); -SINGLE_ANIMATION(Houndstone); -#endif //P_FAMILY_GREAVARD -#if P_FAMILY_FLAMIGO -SINGLE_ANIMATION(Flamigo); -#endif //P_FAMILY_FLAMIGO -#if P_FAMILY_CETODDLE -SINGLE_ANIMATION(Cetoddle); -SINGLE_ANIMATION(Cetitan); -#endif //P_FAMILY_CETODDLE -#if P_FAMILY_VELUZA -SINGLE_ANIMATION(Veluza); -#endif //P_FAMILY_VELUZA -#if P_FAMILY_DONDOZO -SINGLE_ANIMATION(Dondozo); -#endif //P_FAMILY_DONDOZO -#if P_FAMILY_TATSUGIRI -SINGLE_ANIMATION(Tatsugiri); -#endif //P_FAMILY_TATSUGIRI -#if P_FAMILY_GREAT_TUSK -SINGLE_ANIMATION(GreatTusk); -#endif //P_FAMILY_GREAT_TUSK -#if P_FAMILY_SCREAM_TAIL -SINGLE_ANIMATION(ScreamTail); -#endif //P_FAMILY_SCREAM_TAIL -#if P_FAMILY_BRUTE_BONNET -SINGLE_ANIMATION(BruteBonnet); -#endif //P_FAMILY_BRUTE_BONNET -#if P_FAMILY_FLUTTER_MANE -SINGLE_ANIMATION(FlutterMane); -#endif //P_FAMILY_FLUTTER_MANE -#if P_FAMILY_SLITHER_WING -SINGLE_ANIMATION(SlitherWing); -#endif //P_FAMILY_SLITHER_WING -#if P_FAMILY_SANDY_SHOCKS -SINGLE_ANIMATION(SandyShocks); -#endif //P_FAMILY_SANDY_SHOCKS -#if P_FAMILY_IRON_TREADS -SINGLE_ANIMATION(IronTreads); -#endif //P_FAMILY_IRON_TREADS -#if P_FAMILY_IRON_BUNDLE -SINGLE_ANIMATION(IronBundle); -#endif //P_FAMILY_IRON_BUNDLE -#if P_FAMILY_IRON_HANDS -SINGLE_ANIMATION(IronHands); -#endif //P_FAMILY_IRON_HANDS -#if P_FAMILY_IRON_JUGULIS -SINGLE_ANIMATION(IronJugulis); -#endif //P_FAMILY_IRON_JUGULIS -#if P_FAMILY_IRON_MOTH -SINGLE_ANIMATION(IronMoth); -#endif //P_FAMILY_IRON_MOTH -#if P_FAMILY_IRON_THORNS -SINGLE_ANIMATION(IronThorns); -#endif //P_FAMILY_IRON_THORNS -#if P_FAMILY_FRIGIBAX -SINGLE_ANIMATION(Frigibax); -SINGLE_ANIMATION(Arctibax); -SINGLE_ANIMATION(Baxcalibur); -#endif //P_FAMILY_FRIGIBAX -#if P_FAMILY_GIMMIGHOUL -SINGLE_ANIMATION(Gimmighoul); -SINGLE_ANIMATION(Gholdengo); -#endif //P_FAMILY_GIMMIGHOUL -#if P_FAMILY_WO_CHIEN -SINGLE_ANIMATION(WoChien); -#endif //P_FAMILY_WO_CHIEN -#if P_FAMILY_CHIEN_PAO -SINGLE_ANIMATION(ChienPao); -#endif //P_FAMILY_CHIEN_PAO -#if P_FAMILY_TING_LU -SINGLE_ANIMATION(TingLu); -#endif //P_FAMILY_TING_LU -#if P_FAMILY_CHI_YU -SINGLE_ANIMATION(ChiYu); -#endif //P_FAMILY_CHI_YU -#if P_FAMILY_ROARING_MOON -SINGLE_ANIMATION(RoaringMoon); -#endif //P_FAMILY_ROARING_MOON -#if P_FAMILY_IRON_VALIANT -SINGLE_ANIMATION(IronValiant); -#endif //P_FAMILY_IRON_VALIANT -#if P_FAMILY_KORAIDON -SINGLE_ANIMATION(Koraidon); -#endif //P_FAMILY_KORAIDON -#if P_FAMILY_MIRAIDON -SINGLE_ANIMATION(Miraidon); -#endif //P_FAMILY_MIRAIDON -#if P_FAMILY_WALKING_WAKE -SINGLE_ANIMATION(WalkingWake); -#endif //P_FAMILY_WALKING_WAKE -#if P_FAMILY_IRON_LEAVES -SINGLE_ANIMATION(IronLeaves); -#endif //P_FAMILY_IRON_LEAVES -#if P_FAMILY_POLTCHAGEIST -SINGLE_ANIMATION(Poltchageist); -SINGLE_ANIMATION(Sinistcha); -#endif //P_FAMILY_POLTCHAGEIST -#if P_FAMILY_OKIDOGI -SINGLE_ANIMATION(Okidogi); -#endif //P_FAMILY_OKIDOGI -#if P_FAMILY_MUNKIDORI -SINGLE_ANIMATION(Munkidori); -#endif //P_FAMILY_MUNKIDORI -#if P_FAMILY_FEZANDIPITI -SINGLE_ANIMATION(Fezandipiti); -#endif //P_FAMILY_FEZANDIPITI -#if P_FAMILY_OGERPON -SINGLE_ANIMATION(Ogerpon); -#endif //P_FAMILY_OGERPON -#if P_FAMILY_GOUGING_FIRE -SINGLE_ANIMATION(GougingFire); -#endif //P_FAMILY_GOUGING_FIRE -#if P_FAMILY_RAGING_BOLT -SINGLE_ANIMATION(RagingBolt); -#endif //P_FAMILY_RAGING_BOLT -#if P_FAMILY_IRON_BOULDER -SINGLE_ANIMATION(IronBoulder); -#endif //P_FAMILY_IRON_BOULDER -#if P_FAMILY_IRON_CROWN -SINGLE_ANIMATION(IronCrown); -#endif //P_FAMILY_IRON_CROWN #if P_FAMILY_TERAPAGOS -SINGLE_ANIMATION(TerapagosNormal); -SINGLE_ANIMATION(TerapagosTerastal); -SINGLE_ANIMATION(TerapagosStellar); #endif //P_FAMILY_TERAPAGOS -#if P_FAMILY_PECHARUNT -SINGLE_ANIMATION(Pecharunt); -#endif //P_FAMILY_PECHARUNT SINGLE_ANIMATION(Egg); From 1a2640ae2f6d4cb5a4f1f2ce89bdeb665e4125dd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 29 Oct 2024 12:40:47 -0300 Subject: [PATCH 2/2] Moved the rest of the animations to gSpeciesInfo --- src/data/pokemon/species_info.h | 3 + .../pokemon/species_info/gen_1_families.h | 1497 ++- .../pokemon/species_info/gen_2_families.h | 696 +- .../pokemon/species_info/gen_3_families.h | 1291 +- .../pokemon/species_info/gen_4_families.h | 648 +- .../pokemon/species_info/gen_5_families.h | 1285 +- .../pokemon/species_info/gen_6_families.h | 474 +- .../pokemon/species_info/gen_7_families.h | 221 +- .../pokemon/species_info/gen_8_families.h | 50 +- .../species_info/shared_front_pic_anims.h | 448 + src/data/pokemon_graphics/front_pic_anims.h | 10529 ---------------- src/pokemon.c | 1 - 12 files changed, 5846 insertions(+), 11297 deletions(-) create mode 100644 src/data/pokemon/species_info/shared_front_pic_anims.h delete mode 100644 src/data/pokemon_graphics/front_pic_anims.h diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index e5b3faf076ca..226689701d69 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -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 diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 21dad49af705..bec3f311feef 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -41,7 +41,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Bulbasaur, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 13, - .frontAnimFrames = sAnims_Bulbasaur, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Bulbasaur, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 32) : MON_COORDS_SIZE(56, 40), @@ -105,7 +109,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Ivysaur, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 9, - .frontAnimFrames = sAnims_Ivysaur, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Ivysaur, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -174,7 +182,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Venusaur, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Venusaur, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Venusaur, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), @@ -368,7 +380,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Charmander, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Charmander, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 46), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Charmander, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), @@ -432,7 +448,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Charmeleon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 8, - .frontAnimFrames = sAnims_Charmeleon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Charmeleon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -500,7 +520,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Charizard, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Charizard, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Charizard, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -736,7 +759,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Squirtle, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 11, - .frontAnimFrames = sAnims_Squirtle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_V_JUMPS_BIG, .backPic = gMonBackPic_Squirtle, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), @@ -800,7 +828,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Wartortle, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Wartortle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Wartortle, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -868,7 +900,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Blastoise, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 4, - .frontAnimFrames = sAnims_Blastoise, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 50 : 20, .backPic = gMonBackPic_Blastoise, @@ -1050,7 +1087,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Caterpie, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Caterpie, + .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), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Caterpie, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), @@ -1113,7 +1159,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Metapod, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 14, - .frontAnimFrames = sAnims_Metapod, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Metapod, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 48), @@ -1188,7 +1237,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Butterfree, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, - .frontAnimFrames = sAnims_Butterfree, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 12, .backPic = gMonBackPic_Butterfree, @@ -1327,7 +1390,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Weedle, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 13, - .frontAnimFrames = sAnims_Weedle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .frontAnimDelay = 10, .backPic = gMonBackPic_Weedle, @@ -1391,7 +1462,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kakuna, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(24, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Kakuna, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_GLOW_ORANGE, .frontAnimDelay = 20, .backPic = gMonBackPic_Kakuna, @@ -1467,7 +1550,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Beedrill, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 5, - .frontAnimFrames = sAnims_Beedrill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_VIBRATE : ANIM_ZIGZAG_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, .backPic = gMonBackPic_Beedrill, @@ -1598,7 +1689,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pidgey, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, - .frontAnimFrames = sAnims_Pidgey, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_STRETCH, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 0, .backPic = gMonBackPic_Pidgey, @@ -1666,7 +1761,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pidgeotto, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, - .frontAnimFrames = sAnims_Pidgeotto, + .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, .frontAnimDelay = 25, .backPic = gMonBackPic_Pidgeotto, @@ -1743,7 +1844,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pidgeot, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 2, - .frontAnimFrames = sAnims_Pidgeot, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FRONT_FLIP : ANIM_GROW_VIBRATE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, .backPic = gMonBackPic_Pidgeot, @@ -1867,7 +1971,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Rattata, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 13, - .frontAnimFrames = sAnims_Rattata, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_RAPID_H_HOPS : ANIM_H_JUMPS, .backPic = gMonBackPic_Rattata, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56), @@ -1943,7 +2052,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Raticate, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, - .frontAnimFrames = sAnims_Raticate, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FIGURE_8 : ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Raticate, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), @@ -2211,7 +2333,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Spearow, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, - .frontAnimFrames = sAnims_Spearow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_RISING_WOBBLE : ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Spearow, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 56), @@ -2275,7 +2402,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Fearow, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Fearow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_FIGURE_8, .frontAnimDelay = 2, .enemyMonElevation = 6, @@ -2340,7 +2476,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Ekans, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Ekans, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_STRETCH, .frontAnimDelay = 30, .backPic = gMonBackPic_Ekans, @@ -2410,7 +2553,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Arbok, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 1, - .frontAnimFrames = sAnims_Arbok, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Arbok, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), @@ -2471,7 +2618,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pichu, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 14, - .frontAnimFrames = sAnims_Pichu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_JUMPS_BIG, .backPic = gMonBackPic_Pichu, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), @@ -2601,7 +2754,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pikachu, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Pikachu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 0 : 25, .backPic = gMonBackPic_Pikachu, @@ -3495,7 +3653,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pikachu, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Pikachu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 25, .backPic = gMonBackPic_Pikachu, @@ -3582,7 +3745,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Raichu, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Raichu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Raichu, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -3723,7 +3892,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Sandshrew, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Sandshrew, + .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_SWING_CONCAVE_FAST_SHORT, .backPic = gMonBackPic_Sandshrew, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -3788,7 +3963,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Sandslash, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 6, - .frontAnimFrames = sAnims_Sandslash, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_H_SHAKE, .backPic = gMonBackPic_Sandslash, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3988,7 +4169,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_NidoranF, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 13, - .frontAnimFrames = sAnims_NidoranF, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 28, .backPic = gMonBackPic_NidoranF, @@ -4056,7 +4247,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Nidorina, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, - .frontAnimFrames = sAnims_Nidorina, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Nidorina, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), @@ -4130,7 +4324,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Nidoqueen, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, - .frontAnimFrames = sAnims_Nidoqueen, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Nidoqueen, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -4195,7 +4392,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_NidoranM, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_NidoranM, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_NidoranM, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), @@ -4262,7 +4463,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Nidorino, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 8, - .frontAnimFrames = sAnims_Nidorino, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SHRINK_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Nidorino, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -4336,7 +4541,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Nidoking, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Nidoking, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 25, .backPic = gMonBackPic_Nidoking, @@ -4413,7 +4623,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Cleffa, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 18, - .frontAnimFrames = sAnims_Cleffa, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Cleffa, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -4483,7 +4698,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Clefairy, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Clefairy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Clefairy, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 40), @@ -4559,7 +4778,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Clefable, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, - .frontAnimFrames = sAnims_Clefable, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 48), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Clefable, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -4623,7 +4846,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Vulpix, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 11, - .frontAnimFrames = sAnims_Vulpix, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Vulpix, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -4689,7 +4918,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Ninetales, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Ninetales, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Ninetales, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -4898,7 +5133,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Igglybuff, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 17, - .frontAnimFrames = sAnims_Igglybuff, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_SWING_CONCAVE_FAST, .backPic = gMonBackPic_Igglybuff, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 40), @@ -4968,7 +5209,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Jigglypuff, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 14, - .frontAnimFrames = sAnims_Jigglypuff, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Jigglypuff, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 48), @@ -5044,7 +5291,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Wigglytuff, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 4, - .frontAnimFrames = sAnims_Wigglytuff, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Wigglytuff, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 64), @@ -5107,7 +5360,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Zubat, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 16, - .frontAnimFrames = sAnims_Zubat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 16, .backPic = gMonBackPic_Zubat, @@ -5183,7 +5450,27 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Golbat, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 7, - .frontAnimFrames = sAnims_Golbat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Golbat, @@ -5265,7 +5552,25 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Crobat, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 6, - .frontAnimFrames = sAnims_Crobat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 9, .backPic = gMonBackPic_Crobat, @@ -5331,7 +5636,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Oddish, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Oddish, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Oddish, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), @@ -5395,7 +5708,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Gloom, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, - .frontAnimFrames = sAnims_Gloom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 21), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Gloom, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), @@ -5479,7 +5797,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Vileplume, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 7, - .frontAnimFrames = sAnims_Vileplume, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 38), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW : ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Vileplume, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5562,7 +5883,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Bellossom, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 12, - .frontAnimFrames = sAnims_Bellossom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Bellossom, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -5632,7 +5970,24 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Paras, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Paras, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .frontAnimDelay = 10, .backPic = gMonBackPic_Paras, @@ -5703,7 +6058,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Parasect, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Parasect, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 45, .backPic = gMonBackPic_Parasect, @@ -5771,7 +6133,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Venonat, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Venonat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 35), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .frontAnimDelay = 20, .backPic = gMonBackPic_Venonat, @@ -5841,7 +6210,30 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Venomoth, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 9, - .frontAnimFrames = sAnims_Venomoth, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = ANIM_ZIGZAG_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 16, .backPic = gMonBackPic_Venomoth, @@ -5917,7 +6309,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Diglett, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(32, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 17, - .frontAnimFrames = sAnims_Diglett, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 25, .backPic = gMonBackPic_Diglett, @@ -5983,7 +6379,18 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dugtrio, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 11, - .frontAnimFrames = sAnims_Dugtrio, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + 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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE_SLOW, .frontAnimDelay = 35, .backPic = gMonBackPic_Dugtrio, @@ -6186,7 +6593,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Meowth, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Meowth, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .frontAnimDelay = 40, .backPic = gMonBackPic_Meowth, @@ -6257,7 +6671,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Persian, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 4, - .frontAnimFrames = sAnims_Persian, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, .backPic = gMonBackPic_Persian, @@ -6641,7 +7058,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Psyduck, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11, - .frontAnimFrames = sAnims_Psyduck, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Psyduck, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 48), @@ -6704,7 +7127,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Golduck, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 4, - .frontAnimFrames = sAnims_Golduck, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Golduck, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), @@ -6771,7 +7200,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Mankey, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Mankey, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 20, .backPic = gMonBackPic_Mankey, @@ -6839,7 +7275,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Primeape, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 6, - .frontAnimFrames = sAnims_Primeape, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL : ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Primeape, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), @@ -6966,7 +7410,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Growlithe, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 9, - .frontAnimFrames = sAnims_Growlithe, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_BACK_AND_LUNGE : ANIM_V_STRETCH, .frontAnimDelay = 30, .backPic = gMonBackPic_Growlithe, @@ -7031,7 +7482,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Arcanine, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Arcanine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 38), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_VIBRATE : ANIM_V_SHAKE, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 40 : 8, .backPic = gMonBackPic_Arcanine, @@ -7226,7 +7680,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Poliwag, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(64, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 13, - .frontAnimFrames = sAnims_Poliwag, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Poliwag, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(48, 32), @@ -7291,7 +7749,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Poliwhirl, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 9, - .frontAnimFrames = sAnims_Poliwhirl, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 5, .backPic = gMonBackPic_Poliwhirl, @@ -7366,7 +7830,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Poliwrath, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, - .frontAnimFrames = sAnims_Poliwrath, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Poliwrath, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -7436,7 +7903,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Politoed, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, - .frontAnimFrames = sAnims_Politoed, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .frontAnimDelay = 40, .backPic = gMonBackPic_Politoed, @@ -7520,7 +7994,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Abra, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 10, - .frontAnimFrames = sAnims_Abra, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 21), + ANIMCMD_FRAME(0, 13), + ANIMCMD_FRAME(1, 21), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_JUMPS : ANIM_H_VIBRATE, .backPic = gMonBackPic_Abra, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -7585,7 +8065,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kadabra, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Kadabra, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Kadabra, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -7671,7 +8155,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Alakazam, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, - .frontAnimFrames = sAnims_Alakazam, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 54), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Alakazam, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), @@ -7818,7 +8306,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Machop, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, - .frontAnimFrames = sAnims_Machop, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_V_STRETCH, .backPic = gMonBackPic_Machop, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 56), @@ -7887,7 +8381,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Machoke, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, - .frontAnimFrames = sAnims_Machoke, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Machoke, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -7963,7 +8461,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Machamp, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Machamp, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Machamp, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), @@ -8091,7 +8597,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Bellsprout, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, - .frontAnimFrames = sAnims_Bellsprout, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_H_JUMPS, .backPic = gMonBackPic_Bellsprout, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 48), @@ -8154,7 +8664,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Weepinbell, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Weepinbell, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SWING_CONVEX, .frontAnimDelay = 3, .backPic = gMonBackPic_Weepinbell, @@ -8225,7 +8743,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Victreebel, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 6, - .frontAnimFrames = sAnims_Victreebel, + .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_Victreebel, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -8289,7 +8815,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tentacool, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 7, - .frontAnimFrames = sAnims_Tentacool, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Tentacool, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(64, 48), @@ -8353,7 +8885,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tentacruel, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Tentacruel, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 19), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 19), + ANIMCMD_FRAME(1, 19), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_Tentacruel, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -8438,7 +8976,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Geodude, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(64, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 19, - .frontAnimFrames = sAnims_Geodude, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 10, .backPic = gMonBackPic_Geodude, @@ -8504,7 +9046,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Graveler, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 9, - .frontAnimFrames = sAnims_Graveler, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL : ANIM_V_SHAKE, .backPic = gMonBackPic_Graveler, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), @@ -8569,7 +9117,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Golem, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 6, - .frontAnimFrames = sAnims_Golem, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 31), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Golem, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 48), @@ -8832,7 +9386,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Ponyta, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, - .frontAnimFrames = sAnims_Ponyta, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_GLOW_ORANGE : ANIM_V_SHAKE, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 0 : 10, .backPic = gMonBackPic_Ponyta, @@ -8897,7 +9454,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Rapidash, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Rapidash, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_CIRCULAR_VIBRATE : ANIM_H_SHAKE, .backPic = gMonBackPic_Rapidash, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -9092,7 +9653,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Slowpoke, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 16, - .frontAnimFrames = sAnims_Slowpoke, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Slowpoke, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -9159,7 +9724,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Slowbro, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 4, - .frontAnimFrames = sAnims_Slowbro, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_H_STRETCH, .backPic = gMonBackPic_Slowbro, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9224,7 +9792,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Slowking, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 64) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Slowking, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Slowking, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 64), @@ -9547,7 +10119,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magnemite, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 24) : MON_COORDS_SIZE(48, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 21 : 20, - .frontAnimFrames = sAnims_Magnemite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 28), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 28), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_TUMBLING_FRONT_FLIP_TWICE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 17, .backPic = gMonBackPic_Magnemite, @@ -9611,7 +10189,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magneton, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Magneton, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ), .frontAnimId = ANIM_FLASH_YELLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, .backPic = gMonBackPic_Magneton, @@ -9683,7 +10269,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magnezone, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Magnezone, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 4, .backPic = gMonBackPic_Magnezone, @@ -9759,7 +10351,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Farfetchd, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 7, - .frontAnimFrames = sAnims_Farfetchd, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Farfetchd, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), @@ -9956,7 +10561,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Doduo, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 7, - .frontAnimFrames = sAnims_Doduo, + .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_SHAKE_SLOW, .backPic = gMonBackPic_Doduo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -10038,7 +10649,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dodrio, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Dodrio, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_LUNGE_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Dodrio, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -10117,7 +10736,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Seel, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, - .frontAnimFrames = sAnims_Seel, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Seel, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 40), @@ -10184,7 +10808,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dewgong, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 2, - .frontAnimFrames = sAnims_Dewgong, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Dewgong, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -10248,7 +10876,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Grimer, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 9, - .frontAnimFrames = sAnims_Grimer, + .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_H_SLIDE_SLOW, .backPic = gMonBackPic_Grimer, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 40), @@ -10314,7 +10948,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Muk, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 7, - .frontAnimFrames = sAnims_Muk, + .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_DEEP_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 45, .backPic = gMonBackPic_Muk, @@ -10519,7 +11159,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Shellder, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 13, - .frontAnimFrames = sAnims_Shellder, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_TWIST, .frontAnimDelay = 20, .backPic = gMonBackPic_Shellder, @@ -10589,7 +11234,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Cloyster, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 3, - .frontAnimFrames = sAnims_Cloyster, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE_WOBBLE : ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Cloyster, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -10652,7 +11302,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Gastly, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 13, - .frontAnimFrames = sAnims_Gastly, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_GLOW_BLACK : ANIM_SHRINK_GROW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 4 : 13, .backPic = gMonBackPic_Gastly, @@ -10716,7 +11374,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Haunter, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 13, - .frontAnimFrames = sAnims_Haunter, + .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_FLICKER_INCREASING, .frontAnimDelay = 23, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 4 : 14, @@ -10793,7 +11457,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Gengar, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 7, - .frontAnimFrames = sAnims_Gengar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_IN_STAGES, .backPic = gMonBackPic_Gengar, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -10974,7 +11642,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Onix, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 3, - .frontAnimFrames = sAnims_Onix, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_RAPID_H_HOPS : ANIM_H_SHAKE, .backPic = gMonBackPic_Onix, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), @@ -11040,7 +11711,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Steelix, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Steelix, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 21), + ANIMCMD_FRAME(0, 13), + ANIMCMD_FRAME(1, 21), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SHAKE : ANIM_V_SHAKE, .frontAnimDelay = 45, .backPic = gMonBackPic_Steelix, @@ -11182,7 +11859,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Drowzee, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Drowzee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_CIRCLE_C_CLOCKWISE_SLOW : ANIM_V_STRETCH, .frontAnimDelay = 48, .backPic = gMonBackPic_Drowzee, @@ -11250,7 +11934,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Hypno, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Hypno, + .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, .frontAnimDelay = 40, .backPic = gMonBackPic_Hypno, @@ -11326,7 +12018,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Krabby, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 14, - .frontAnimFrames = sAnims_Krabby, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SLIDE : ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Krabby, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 40), @@ -11390,7 +12089,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kingler, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 8, - .frontAnimFrames = sAnims_Kingler, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 14), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_ZIGZAG_SLOW : ANIM_V_SHAKE_TWICE, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 0 : 4, .backPic = gMonBackPic_Kingler, @@ -11523,7 +12225,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Voltorb, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 32) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 15, - .frontAnimFrames = sAnims_Voltorb, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SWING_CONCAVE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 10 : 0, .backPic = gMonBackPic_Voltorb, @@ -11587,7 +12295,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Electrode, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Electrode, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(1, 34), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SHRINK_GROW_VIBRATE_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 0, .backPic = gMonBackPic_Electrode, @@ -11782,7 +12495,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Exeggcute, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 12, - .frontAnimFrames = sAnims_Exeggcute, + .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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Exeggcute, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 32), @@ -11856,7 +12579,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Exeggutor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Exeggutor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Exeggutor, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), @@ -11986,7 +12712,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Cubone, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 13, - .frontAnimFrames = sAnims_Cubone, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL : ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = P_GBA_STYLE_SPECIES_GFX ? 0 : 30, .backPic = gMonBackPic_Cubone, @@ -12053,7 +12786,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Marowak, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, - .frontAnimFrames = sAnims_Marowak, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Marowak, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), @@ -12246,7 +12986,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tyrogue, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Tyrogue, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Tyrogue, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -12316,7 +13059,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Hitmonlee, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, - .frontAnimFrames = sAnims_Hitmonlee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Hitmonlee, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56), @@ -12381,7 +13128,19 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Hitmonchan, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Hitmonchan, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Hitmonchan, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 56), @@ -12447,7 +13206,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Hitmontop, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 7, - .frontAnimFrames = sAnims_Hitmontop, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 26), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_VIBRATE : ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Hitmontop, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -12512,7 +13277,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Lickitung, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Lickitung, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE_SLOW : ANIM_V_STRETCH, .backPic = gMonBackPic_Lickitung, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 40), @@ -12577,7 +13345,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Lickilicky, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Lickilicky, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lickilicky, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -12646,7 +13424,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Koffing, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, - .frontAnimFrames = sAnims_Koffing, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SHRINK_GROW : ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 14, .backPic = gMonBackPic_Koffing, @@ -12717,7 +13501,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Weezing, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 0, - .frontAnimFrames = sAnims_Weezing, + .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_V_SLIDE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 3, .backPic = gMonBackPic_Weezing, @@ -12850,7 +13640,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Rhyhorn, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 12, - .frontAnimFrames = sAnims_Rhyhorn, + .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_V_SHAKE, .backPic = gMonBackPic_Rhyhorn, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), @@ -12925,7 +13721,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Rhydon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 3, - .frontAnimFrames = sAnims_Rhydon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SHRINK_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Rhydon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), @@ -13007,7 +13806,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Rhyperior, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Rhyperior, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Rhyperior, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -13085,7 +13890,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Happiny, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Happiny, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Happiny, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -13151,7 +13960,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Chansey, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Chansey, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE_SLOW : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Chansey, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -13216,7 +14029,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Blissey, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, - .frontAnimFrames = sAnims_Blissey, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Blissey, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 32), @@ -13284,7 +14101,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tangela, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 12, - .frontAnimFrames = sAnims_Tangela, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 40), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL : ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Tangela, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -13348,7 +14169,15 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tangrowth, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Tangrowth, + .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_H_STRETCH, .backPic = gMonBackPic_Tangrowth, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -13422,7 +14251,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kangaskhan, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, - .frontAnimFrames = sAnims_Kangaskhan, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Kangaskhan, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -13552,7 +14386,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Horsea, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 14, - .frontAnimFrames = sAnims_Horsea, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_TWIST : ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Horsea, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 40), @@ -13621,7 +14461,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Seadra, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 6, - .frontAnimFrames = sAnims_Seadra, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Seadra, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -13698,7 +14544,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kingdra, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 1, - .frontAnimFrames = sAnims_Kingdra, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_CIRCLE_INTO_BG, .backPic = gMonBackPic_Kingdra, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -13763,7 +14615,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Goldeen, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 13, - .frontAnimFrames = sAnims_Goldeen, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Goldeen, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), @@ -13839,7 +14701,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Seaking, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, - .frontAnimFrames = sAnims_Seaking, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .backPic = gMonBackPic_Seaking, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -13917,7 +14785,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Staryu, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, - .frontAnimFrames = sAnims_Staryu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_TWIST_TWICE, .backPic = gMonBackPic_Staryu, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 56), @@ -13981,7 +14855,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Starmie, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Starmie, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_TWIST, .backPic = gMonBackPic_Starmie, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 64), @@ -14053,7 +14933,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MimeJr, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_MimeJr, + .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_MimeJr, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -14122,7 +15009,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_MrMime, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, - .frontAnimFrames = sAnims_MrMime, + .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_MrMime, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), @@ -14318,7 +15212,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Scyther, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, - .frontAnimFrames = sAnims_Scyther, + .frontAnimFrames = ANIM_FRAMES( + 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), + ), .frontAnimId = ANIM_H_VIBRATE, .frontAnimDelay = 10, .backPic = gMonBackPic_Scyther, @@ -14399,7 +15302,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Scizor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, - .frontAnimFrames = sAnims_Scizor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_VIBRATE, .frontAnimDelay = 19, .backPic = gMonBackPic_Scizor, @@ -14602,7 +15508,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Smoochum, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(24, 40) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 13, - .frontAnimFrames = sAnims_Smoochum, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .frontAnimDelay = 40, .backPic = gMonBackPic_Smoochum, @@ -14671,7 +15580,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Jynx, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 9, - .frontAnimFrames = sAnims_Jynx, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Jynx, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 64), @@ -14737,7 +15652,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Elekid, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, - .frontAnimFrames = sAnims_Elekid, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_FLASH_YELLOW, .backPic = gMonBackPic_Elekid, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 48), @@ -14803,7 +15722,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Electabuzz, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 4, - .frontAnimFrames = sAnims_Electabuzz, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FLASH_YELLOW : ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, .backPic = gMonBackPic_Electabuzz, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), @@ -14874,7 +15799,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Electivire, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Electivire, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GLOW_YELLOW, .backPic = gMonBackPic_Electivire, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -14941,7 +15870,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magby, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(32, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 11, - .frontAnimFrames = sAnims_Magby, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Magby, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 48), @@ -15006,7 +15940,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magmar, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Magmar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Magmar, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), @@ -15078,7 +16015,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magmortar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Magmortar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Magmortar, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -15146,7 +16086,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Pinsir, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, - .frontAnimFrames = sAnims_Pinsir, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_GROW_VIBRATE : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pinsir, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -15277,7 +16223,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Tauros, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 5, - .frontAnimFrames = sAnims_Tauros, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .frontAnimDelay = 10, .backPic = gMonBackPic_Tauros, @@ -15536,7 +16487,17 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Magikarp, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, - .frontAnimFrames = sAnims_Magikarp, + .frontAnimFrames = ANIM_FRAMES( + 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), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Magikarp, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -15611,7 +16572,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Gyarados, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 2, - .frontAnimFrames = sAnims_Gyarados, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, .backPic = gMonBackPic_Gyarados, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), @@ -15749,7 +16714,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Lapras, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 2, - .frontAnimFrames = sAnims_Lapras, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Lapras, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(56, 64), @@ -15878,7 +16846,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Ditto, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 15, - .frontAnimFrames = sAnims_Ditto, + .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_Ditto, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(48, 32), @@ -15942,7 +16915,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Eevee, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11, - .frontAnimFrames = sAnims_Eevee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Eevee, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -16083,7 +17059,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Eevee, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Eevee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Eevee, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -16158,7 +17137,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Vaporeon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 9, - .frontAnimFrames = sAnims_Vaporeon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GLOW_BLUE, .backPic = gMonBackPic_Vaporeon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -16219,7 +17201,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Jolteon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, - .frontAnimFrames = sAnims_Jolteon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Jolteon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 56), @@ -16280,7 +17265,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Flareon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, - .frontAnimFrames = sAnims_Flareon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_V_SHAKE, .backPic = gMonBackPic_Flareon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), @@ -16342,7 +17330,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Espeon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, - .frontAnimFrames = sAnims_Espeon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Espeon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -16403,7 +17395,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Umbreon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, - .frontAnimFrames = sAnims_Umbreon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Umbreon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -16466,7 +17461,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Leafeon, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Leafeon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Leafeon, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -16527,7 +17526,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Glaceon, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Glaceon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Glaceon, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -16591,7 +17594,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Sylveon, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Sylveon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Sylveon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -16659,7 +17666,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Porygon, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 14, - .frontAnimFrames = sAnims_Porygon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Porygon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 40), @@ -16727,7 +17739,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Porygon2, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Porygon2, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 0 : 9, .backPic = gMonBackPic_Porygon2, @@ -16798,7 +17816,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_PorygonZ, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Porygon_Z, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 40), + ), .frontAnimId = ANIM_CIRCLE_C_CLOCKWISE_SLOW, .enemyMonElevation = 12, .backPic = gMonBackPic_PorygonZ, @@ -16870,7 +17893,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Omanyte, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 14, - .frontAnimFrames = sAnims_Omanyte, + .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_Omanyte, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 40), @@ -16933,7 +17965,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Omastar, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 9, - .frontAnimFrames = sAnims_Omastar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Omastar, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), @@ -17002,7 +18039,16 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kabuto, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 16, - .frontAnimFrames = sAnims_Kabuto, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Kabuto, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -17071,7 +18117,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Kabutops, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, - .frontAnimFrames = sAnims_Kabutops, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Kabutops, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -17134,7 +18185,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Aerodactyl, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 4, - .frontAnimFrames = sAnims_Aerodactyl, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 25), + ), .frontAnimId = ANIM_V_SLIDE_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 7 : 9, .backPic = gMonBackPic_Aerodactyl, @@ -17263,7 +18319,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Munchlax, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Munchlax, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Munchlax, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -17329,7 +18389,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Snorlax, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 1, - .frontAnimFrames = sAnims_Snorlax, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_V_STRETCH, .backPic = gMonBackPic_Snorlax, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 40), @@ -17462,7 +18526,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Articuno, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, - .frontAnimFrames = sAnims_Articuno, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0, .backPic = gMonBackPic_Articuno, @@ -17607,7 +18676,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Zapdos, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Zapdos, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_FLASH_YELLOW, .enemyMonElevation = 8, .backPic = gMonBackPic_Zapdos, @@ -17747,7 +18821,40 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Moltres, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, - .frontAnimFrames = sAnims_Moltres, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 5 : 0, .backPic = gMonBackPic_Moltres, @@ -17882,7 +18989,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dratini, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 9, - .frontAnimFrames = sAnims_Dratini, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dratini, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -17946,7 +19057,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dragonair, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 1, - .frontAnimFrames = sAnims_Dragonair, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Dragonair, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(40, 56), @@ -18015,7 +19131,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Dragonite, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Dragonite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SHAKE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0, .backPic = gMonBackPic_Dragonite, @@ -18085,7 +19205,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Mewtwo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Mewtwo, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Mewtwo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), @@ -18282,7 +19405,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPic = gMonFrontPic_Mew, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 9, - .frontAnimFrames = sAnims_Mew, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_ZIGZAG_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 11, .backPic = gMonBackPic_Mew, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 974610fddbcc..34668b511518 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -41,7 +41,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Chikorita, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 10, - .frontAnimFrames = sAnims_Chikorita, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Chikorita, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(56, 48), @@ -105,7 +109,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Bayleef, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Bayleef, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Bayleef, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -174,7 +181,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Meganium, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Meganium, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Meganium, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -249,7 +259,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Cyndaquil, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Cyndaquil, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_SMALL : ANIM_V_STRETCH, .backPic = gMonBackPic_Cyndaquil, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 64), @@ -313,7 +328,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Quilava, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, - .frontAnimFrames = sAnims_Quilava, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_H_STRETCH, .backPic = gMonBackPic_Quilava, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -384,7 +402,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Typhlosion, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Typhlosion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .frontAnimDelay = 20, .backPic = gMonBackPic_Typhlosion, @@ -514,7 +535,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Totodile, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 14, - .frontAnimFrames = sAnims_Totodile, + .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_JUMPS, .backPic = gMonBackPic_Totodile, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -579,7 +607,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Croconaw, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, - .frontAnimFrames = sAnims_Croconaw, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Croconaw, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 64), @@ -648,7 +679,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Feraligatr, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, - .frontAnimFrames = sAnims_Feraligatr, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 40), + ), .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 5, .backPic = gMonBackPic_Feraligatr, @@ -712,7 +748,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Sentret, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 56) : MON_COORDS_SIZE(40, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, - .frontAnimFrames = sAnims_Sentret, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sentret, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(48, 64), @@ -775,7 +816,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Furret, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 4, - .frontAnimFrames = sAnims_Furret, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Furret, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -838,7 +882,20 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Hoothoot, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, - .frontAnimFrames = sAnims_Hoothoot, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_V_SLIDE_SLOW, .backPic = gMonBackPic_Hoothoot, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 64), @@ -907,7 +964,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Noctowl, .frontPicSize = MON_COORDS_SIZE(40, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, - .frontAnimFrames = sAnims_Noctowl, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Noctowl, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -970,7 +1030,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ledyba, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Ledyba, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Ledyba, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1045,7 +1110,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ledian, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 6, - .frontAnimFrames = sAnims_Ledian, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 25), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Ledian, @@ -1121,7 +1191,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Spinarak, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(48, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 16, - .frontAnimFrames = sAnims_Spinarak, + .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_Spinarak, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 24) : MON_COORDS_SIZE(64, 32), @@ -1190,7 +1269,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ariados, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 7, - .frontAnimFrames = sAnims_Ariados, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Ariados, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -1254,7 +1338,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Chinchou, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Chinchou, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Chinchou, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -1318,7 +1408,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Lanturn, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Lanturn, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .backPic = gMonBackPic_Lanturn, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -1383,7 +1479,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Togepi, .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 16, - .frontAnimFrames = sAnims_Togepi, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_V_JUMPS_BIG, .backPic = gMonBackPic_Togepi, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(48, 40), @@ -1446,7 +1546,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Togetic, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 8, - .frontAnimFrames = sAnims_Togetic, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Togetic, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), @@ -1517,7 +1621,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Togekiss, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Togekiss, + .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_SWING_CONVEX, .enemyMonElevation = 14, .backPic = gMonBackPic_Togekiss, @@ -1582,7 +1694,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Natu, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 17, - .frontAnimFrames = sAnims_Natu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_JUMPS, .frontAnimDelay = 30, .backPic = gMonBackPic_Natu, @@ -1647,7 +1765,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Xatu, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 56) : MON_COORDS_SIZE(40, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 5, - .frontAnimFrames = sAnims_Xatu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Xatu, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -1720,7 +1846,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Mareep, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Mareep, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 50, .backPic = gMonBackPic_Mareep, @@ -1784,7 +1917,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Flaaffy, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 9, - .frontAnimFrames = sAnims_Flaaffy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_BIG : ANIM_V_STRETCH, .backPic = gMonBackPic_Flaaffy, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), @@ -1856,7 +1995,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ampharos, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 2, - .frontAnimFrames = sAnims_Ampharos, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_FLASH_YELLOW, .frontAnimDelay = 10, .backPic = gMonBackPic_Ampharos, @@ -1985,7 +2128,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Azurill, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 11, - .frontAnimFrames = sAnims_Azurill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Azurill, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -2053,7 +2204,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Marill, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Marill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Marill, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 40), @@ -2128,7 +2283,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Azumarill, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 6, - .frontAnimFrames = sAnims_Azumarill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW : ANIM_SHRINK_GROW, .backPic = gMonBackPic_Azumarill, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 64), @@ -2192,7 +2353,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Bonsly, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Bonsly, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Bonsly, .backPicSize = MON_COORDS_SIZE(40, 64), @@ -2256,7 +2423,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Sudowoodo, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 7, - .frontAnimFrames = sAnims_Sudowoodo, + .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_Sudowoodo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), @@ -2336,7 +2510,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Hoppip, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 14, - .frontAnimFrames = sAnims_Hoppip, + .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 = P_GBA_STYLE_SPECIES_GFX ? 11 : 15, .backPic = gMonBackPic_Hoppip, @@ -2404,7 +2583,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Skiploom, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Skiploom, + .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 = P_GBA_STYLE_SPECIES_GFX ? 12 : 15, .backPic = gMonBackPic_Skiploom, @@ -2479,7 +2667,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Jumpluff, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 9, - .frontAnimFrames = sAnims_Jumpluff, + .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_SMALL, .enemyMonElevation = 9, .backPic = gMonBackPic_Jumpluff, @@ -2543,7 +2738,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Aipom, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 64) : MON_COORDS_SIZE(32, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 1, - .frontAnimFrames = sAnims_Aipom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Aipom, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), @@ -2619,7 +2817,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ambipom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Ambipom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Ambipom, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2699,7 +2901,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Sunkern, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 32) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 17, - .frontAnimFrames = sAnims_Sunkern, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_SMALL : ANIM_H_JUMPS, .backPic = gMonBackPic_Sunkern, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), @@ -2766,7 +2975,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Sunflora, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Sunflora, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sunflora, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), @@ -2830,7 +3043,30 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Yanma, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 14, - .frontAnimFrames = sAnims_Yanma, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 13, .backPic = gMonBackPic_Yanma, @@ -2896,7 +3132,34 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Yanmega, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Yanmega, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_H_VIBRATE, .enemyMonElevation = 6, .backPic = gMonBackPic_Yanmega, @@ -2961,7 +3224,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Wooper, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Wooper, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wooper, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3037,7 +3304,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Quagsire, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 5, - .frontAnimFrames = sAnims_Quagsire, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Quagsire, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -3244,7 +3514,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Murkrow, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 15, - .frontAnimFrames = sAnims_Murkrow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 0 : 12, .backPic = gMonBackPic_Murkrow, @@ -3321,7 +3594,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Honchkrow, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Honchkrow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 21), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Honchkrow, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3386,7 +3664,18 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Misdreavus, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 13, - .frontAnimFrames = sAnims_Misdreavus, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + 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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 12, .backPic = gMonBackPic_Misdreavus, @@ -3452,7 +3741,18 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Mismagius, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Mismagius, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + 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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 3, .backPic = gMonBackPic_Mismagius, @@ -3611,7 +3911,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Wynaut, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Wynaut, + .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_H_JUMPS_V_STRETCH, .frontAnimDelay = 15, .backPic = gMonBackPic_Wynaut, @@ -3676,7 +3982,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Wobbuffet, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, - .frontAnimFrames = sAnims_Wobbuffet, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_DEEP_V_SQUISH_AND_BOUNCE : ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Wobbuffet, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(56, 56), @@ -3756,7 +4068,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Girafarig, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 0, - .frontAnimFrames = sAnims_Girafarig, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_BIG : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Girafarig, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -3896,7 +4212,16 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Pineco, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, - .frontAnimFrames = sAnims_Pineco, + .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_SWING_CONCAVE, .backPic = gMonBackPic_Pineco, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 40), @@ -3959,7 +4284,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Forretress, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 8, - .frontAnimFrames = sAnims_Forretress, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Forretress, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -4028,7 +4358,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Dunsparce, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 9, - .frontAnimFrames = sAnims_Dunsparce, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .frontAnimDelay = 10, .backPic = gMonBackPic_Dunsparce, @@ -4221,7 +4556,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Gligar, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 4, - .frontAnimFrames = sAnims_Gligar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 17), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 8, .backPic = gMonBackPic_Gligar, @@ -4299,7 +4637,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Gliscor, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Gliscor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 40), + ), .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 9, .backPic = gMonBackPic_Gliscor, @@ -4368,7 +4711,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Snubbull, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, - .frontAnimFrames = sAnims_Snubbull, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Snubbull, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 40), @@ -4439,7 +4785,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Granbull, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 56) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 4, - .frontAnimFrames = sAnims_Granbull, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Granbull, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 48), @@ -4512,7 +4861,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Qwilfish, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, - .frontAnimFrames = sAnims_Qwilfish, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_GROW_IN_STAGES, .frontAnimDelay = 39, .backPic = gMonBackPic_Qwilfish, @@ -4714,7 +5071,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Shuckle, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 8, - .frontAnimFrames = sAnims_Shuckle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Shuckle, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 48), @@ -4778,7 +5139,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Heracross, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 1, - .frontAnimFrames = sAnims_Heracross, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_LUNGE_GROW : ANIM_V_STRETCH, .backPic = gMonBackPic_Heracross, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 64), @@ -4917,7 +5284,14 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Sneasel, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 8, - .frontAnimFrames = sAnims_Sneasel, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_H_JUMPS, .backPic = gMonBackPic_Sneasel, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 64), @@ -4997,7 +5371,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Weavile, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Weavile, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Weavile, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5221,7 +5598,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Teddiursa, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, - .frontAnimFrames = sAnims_Teddiursa, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Teddiursa, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -5288,7 +5668,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Ursaring, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Ursaring, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_H_SHAKE, .backPic = gMonBackPic_Ursaring, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), @@ -5482,7 +5865,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Slugma, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(32, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, - .frontAnimFrames = sAnims_Slugma, + .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_V_STRETCH, .backPic = gMonBackPic_Slugma, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(64, 56), @@ -5552,7 +5941,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Magcargo, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 56) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 6, - .frontAnimFrames = sAnims_Magcargo, + .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_V_STRETCH, .backPic = gMonBackPic_Magcargo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -5619,7 +6014,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Swinub, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 24) : MON_COORDS_SIZE(40, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 18, - .frontAnimFrames = sAnims_Swinub, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Swinub, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 24) : MON_COORDS_SIZE(56, 40), @@ -5687,7 +6087,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Piloswine, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Piloswine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Piloswine, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), @@ -5768,7 +6173,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Mamoswine, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Mamoswine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Mamoswine, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5854,7 +6263,13 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Corsola, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Corsola, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Corsola, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 48), @@ -6051,7 +6466,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Remoraid, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Remoraid, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_SMALL : ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Remoraid, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -6119,7 +6538,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Octillery, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, - .frontAnimFrames = sAnims_Octillery, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .frontAnimDelay = 20, .backPic = gMonBackPic_Octillery, @@ -6195,7 +6619,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Delibird, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Delibird, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_SMALL : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Delibird, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 56), @@ -6260,7 +6687,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Mantyke, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Mantyke, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_TWIST_TWICE, .backPic = gMonBackPic_Mantyke, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6330,7 +6762,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Mantine, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 9, - .frontAnimFrames = sAnims_Mantine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 40), + ), .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 0 : 6, .backPic = gMonBackPic_Mantine, @@ -6396,7 +6833,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Skarmory, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, - .frontAnimFrames = sAnims_Skarmory, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_STRETCH : ANIM_V_SHAKE, .backPic = gMonBackPic_Skarmory, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(48, 64), @@ -6460,7 +6900,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Houndour, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 9, - .frontAnimFrames = sAnims_Houndour, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Houndour, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), @@ -6523,7 +6966,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Houndoom, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 0, - .frontAnimFrames = sAnims_Houndoom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Houndoom, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6657,7 +7103,15 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Phanpy, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Phanpy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Phanpy, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(56, 40), @@ -6721,7 +7175,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Donphan, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 9, - .frontAnimFrames = sAnims_Donphan, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE_TWICE : ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Donphan, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), @@ -6800,7 +7258,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Stantler, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Stantler, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Stantler, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), @@ -6933,7 +7394,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Smeargle, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Smeargle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_JUMPS : ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Smeargle, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -7003,7 +7469,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Miltank, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 8, - .frontAnimFrames = sAnims_Miltank, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Miltank, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7078,7 +7547,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Raikou, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 5, - .frontAnimFrames = sAnims_Raikou, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FLASH_YELLOW : ANIM_V_STRETCH, .backPic = gMonBackPic_Raikou, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -7154,7 +7627,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Entei, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, - .frontAnimFrames = sAnims_Entei, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Entei, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), @@ -7230,7 +7706,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Suicune, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 3, - .frontAnimFrames = sAnims_Suicune, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Suicune, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7295,7 +7774,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Larvitar, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, - .frontAnimFrames = sAnims_Larvitar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Larvitar, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 64), @@ -7358,7 +7842,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Pupitar, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11, - .frontAnimFrames = sAnims_Pupitar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_H_SHAKE, .backPic = gMonBackPic_Pupitar, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -7426,7 +7913,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Tyranitar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Tyranitar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_SHAKE : ANIM_V_SHAKE, .frontAnimDelay = 10, .backPic = gMonBackPic_Tyranitar, @@ -7556,7 +8047,20 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Lugia, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Lugia, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_IN_STAGES, .frontAnimDelay = 20, .enemyMonElevation = 6, @@ -7632,7 +8136,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_HoOh, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_HoOh, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 6, .backPic = gMonBackPic_HoOh, @@ -7707,7 +8214,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPic = gMonFrontPic_Celebi, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 12, - .frontAnimFrames = sAnims_Celebi, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_RISING_WOBBLE : ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 15, .backPic = gMonBackPic_Celebi, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index 7dda682c8de3..4f72924cce04 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -41,7 +41,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Treecko, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Treecko, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Treecko, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 48), @@ -104,7 +110,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Grovyle, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, - .frontAnimFrames = sAnims_Grovyle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Grovyle, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -172,7 +184,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Sceptile, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Sceptile, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 26), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Sceptile, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -295,7 +311,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Torchic, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(32, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 12, - .frontAnimFrames = sAnims_Torchic, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Torchic, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(40, 48), @@ -369,7 +393,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Combusken, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 3, - .frontAnimFrames = sAnims_Combusken, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 12), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Combusken, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -449,7 +477,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Blaziken, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Blaziken, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Blaziken, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -584,7 +618,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Mudkip, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 13, - .frontAnimFrames = sAnims_Mudkip, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 13), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Mudkip, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 48), @@ -647,7 +687,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Marshtomp, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 7, - .frontAnimFrames = sAnims_Marshtomp, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE : ANIM_V_STRETCH, .backPic = gMonBackPic_Marshtomp, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -715,7 +765,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Swampert, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 6, - .frontAnimFrames = sAnims_Swampert, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 18), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_JUMPS_BIG : ANIM_H_SHAKE, .backPic = gMonBackPic_Swampert, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -848,7 +904,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Poochyena, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 11, - .frontAnimFrames = sAnims_Poochyena, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Poochyena, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), @@ -915,7 +975,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Mightyena, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Mightyena, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Mightyena, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -992,7 +1058,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Zigzagoon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, - .frontAnimFrames = sAnims_Zigzagoon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Zigzagoon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 56), @@ -1062,7 +1134,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Linoone, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 13, - .frontAnimFrames = sAnims_Linoone, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Linoone, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 40), @@ -1326,7 +1404,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Wurmple, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 12, - .frontAnimFrames = sAnims_Wurmple, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Wurmple, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 56), @@ -1390,7 +1472,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Silcoon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 10, - .frontAnimFrames = sAnims_Silcoon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Silcoon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(64, 40), @@ -1462,7 +1548,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Beautifly, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Beautifly, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_V_SLIDE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, .backPic = gMonBackPic_Beautifly, @@ -1542,7 +1638,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Cascoon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 10, - .frontAnimFrames = sAnims_Cascoon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Cascoon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 24) : MON_COORDS_SIZE(56, 40), @@ -1616,7 +1718,23 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Dustox, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, - .frontAnimFrames = sAnims_Dustox, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 1), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, .backPic = gMonBackPic_Dustox, @@ -1693,7 +1811,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Lotad, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 13, - .frontAnimFrames = sAnims_Lotad, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 55), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lotad, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -1757,7 +1879,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Lombre, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, - .frontAnimFrames = sAnims_Lombre, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lombre, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(48, 56), @@ -1826,7 +1954,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Ludicolo, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Ludicolo, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Ludicolo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -1902,7 +2038,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Seedot, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Seedot, + .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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES : ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Seedot, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(48, 48), @@ -1966,7 +2112,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Nuzleaf, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Nuzleaf, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nuzleaf, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -2051,7 +2207,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Shiftry, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 7, - .frontAnimFrames = sAnims_Shiftry, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Shiftry, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -2126,7 +2286,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Taillow, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 32) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 11, - .frontAnimFrames = sAnims_Taillow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_JUMPS_BIG, .backPic = gMonBackPic_Taillow, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 32) : MON_COORDS_SIZE(56, 40), @@ -2195,7 +2365,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Swellow, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 5, - .frontAnimFrames = sAnims_Swellow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Swellow, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), @@ -2263,7 +2437,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Wingull, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 24 : 11, - .frontAnimFrames = sAnims_Wingull, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 13), + ), .frontAnimId = ANIM_H_PIVOT, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 15, .backPic = gMonBackPic_Wingull, @@ -2338,7 +2516,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Pelipper, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, - .frontAnimFrames = sAnims_Pelipper, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, .backPic = gMonBackPic_Pelipper, @@ -2410,7 +2598,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Ralts, .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 12, - .frontAnimFrames = sAnims_Ralts, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Ralts, .backPicSize = MON_COORDS_SIZE(32, 40), @@ -2473,7 +2665,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Kirlia, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Kirlia, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 39), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kirlia, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 56) : MON_COORDS_SIZE(48, 56), @@ -2542,7 +2738,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Gardevoir, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Gardevoir, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Gardevoir, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 56), @@ -2674,7 +2874,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Gallade, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Gallade, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Gallade, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2799,7 +3002,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Surskit, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 8, - .frontAnimFrames = sAnims_Surskit, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Surskit, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 40), @@ -2870,7 +3079,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Masquerain, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 4, - .frontAnimFrames = sAnims_Masquerain, + .frontAnimFrames = ANIM_FRAMES( + 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), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 10, .backPic = gMonBackPic_Masquerain, @@ -2940,7 +3159,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Shroomish, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 14, - .frontAnimFrames = sAnims_Shroomish, + .frontAnimFrames = ANIM_FRAMES( + 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), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Shroomish, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 48), @@ -3009,7 +3240,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Breloom, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(48, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Breloom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Breloom, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -3072,7 +3309,14 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Slakoth, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 15, - .frontAnimFrames = sAnims_Slakoth, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 13), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Slakoth, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3135,7 +3379,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Vigoroth, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 7, - .frontAnimFrames = sAnims_Vigoroth, + .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_Vigoroth, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 64), @@ -3203,7 +3455,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Slaking, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Slaking, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Slaking, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -3267,7 +3527,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Nincada, .frontPicSize = MON_COORDS_SIZE(56, 32), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 16, - .frontAnimFrames = sAnims_Nincada, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Nincada, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(64, 32), @@ -3331,7 +3597,26 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Ninjask, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 11, - .frontAnimFrames = sAnims_Ninjask, + .frontAnimFrames = ANIM_FRAMES( + 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, 33), + 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, 11), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .enemyMonElevation = 10, .backPic = gMonBackPic_Ninjask, @@ -3393,7 +3678,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Shedinja, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Shedinja, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 33), + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 33), + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, .backPic = gMonBackPic_Shedinja, @@ -3457,7 +3748,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Whismur, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 13, - .frontAnimFrames = sAnims_Whismur, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 33), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Whismur, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 40), @@ -3520,7 +3822,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Loudred, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Loudred, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 33), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW : ANIM_SHRINK_GROW, .backPic = gMonBackPic_Loudred, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -3590,7 +3898,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Exploud, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Exploud, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 9), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Exploud, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3654,7 +3966,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Makuhita, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 8, - .frontAnimFrames = sAnims_Makuhita, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE : ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Makuhita, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 56), @@ -3718,7 +4040,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Hariyama, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Hariyama, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_ROTATE_UP_TO_SIDES, .backPic = gMonBackPic_Hariyama, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3782,7 +4109,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Nosepass, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Nosepass, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW : ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Nosepass, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 48), @@ -3849,7 +4184,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Probopass, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Probopass, + .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_V_SLIDE, .enemyMonElevation = 6, .backPic = gMonBackPic_Probopass, @@ -3918,7 +4259,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Skitty, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 12, - .frontAnimFrames = sAnims_Skitty, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 9), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Skitty, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -3992,7 +4337,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Delcatty, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 4, - .frontAnimFrames = sAnims_Delcatty, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 46), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Delcatty, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 64), @@ -4061,7 +4410,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Sableye, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 10, - .frontAnimFrames = sAnims_Sableye, + .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_GLOW_BLACK, .backPic = gMonBackPic_Sableye, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 48), @@ -4194,7 +4549,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Mawile, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Mawile, + .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_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Mawile, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4321,7 +4684,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Aron, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 24) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 20 : 14, - .frontAnimFrames = sAnims_Aron, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 33), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 33), + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Aron, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(48, 40), @@ -4385,7 +4754,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Lairon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 8, - .frontAnimFrames = sAnims_Lairon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 29), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 29), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lairon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 40), @@ -4454,7 +4829,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Aggron, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Aggron, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Aggron, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4578,7 +4957,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Meditite, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(48, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Meditite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES, .backPic = gMonBackPic_Meditite, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 48), @@ -4653,7 +5036,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Medicham, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(40, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Medicham, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Medicham, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(56, 64), @@ -4788,7 +5179,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Electrike, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 32) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 14, - .frontAnimFrames = sAnims_Electrike, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Electrike, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(56, 40), @@ -4851,7 +5248,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Manectric, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 56) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 2, - .frontAnimFrames = sAnims_Manectric, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 33), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Manectric, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 64), @@ -4978,7 +5381,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Plusle, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Plusle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Plusle, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 64), @@ -5047,7 +5456,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Minun, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 11, - .frontAnimFrames = sAnims_Minun, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_CIRCULAR_STRETCH_TWICE : ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_Minun, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 64), @@ -5118,7 +5533,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Volbeat, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Volbeat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 11), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Volbeat, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 64), @@ -5191,7 +5614,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Illumise, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 10, - .frontAnimFrames = sAnims_Illumise, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_BOUNCE_ROTATE_TO_SIDES : ANIM_RISING_WOBBLE, .backPic = gMonBackPic_Illumise, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -5258,7 +5687,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Budew, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Budew, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Budew, .backPicSize = MON_COORDS_SIZE(40, 56), @@ -5324,7 +5757,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Roselia, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 11, - .frontAnimFrames = sAnims_Roselia, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 18), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Roselia, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -5410,7 +5847,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Roserade, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Roserade, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Roserade, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5488,7 +5928,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Gulpin, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 18 : 15, - .frontAnimFrames = sAnims_Gulpin, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 14), + ANIMCMD_FRAME(1, 14), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gulpin, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), @@ -5565,7 +6011,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Swalot, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 5, - .frontAnimFrames = sAnims_Swalot, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Swalot, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), @@ -5641,7 +6092,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Carvanha, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Carvanha, + .frontAnimFrames = ANIM_FRAMES( + 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), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Carvanha, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), @@ -5705,7 +6166,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Sharpedo, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 0, - .frontAnimFrames = sAnims_Sharpedo, + .frontAnimFrames = ANIM_FRAMES( + 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), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, .backPic = gMonBackPic_Sharpedo, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5830,7 +6301,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Wailmer, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 10, - .frontAnimFrames = sAnims_Wailmer, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Wailmer, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(64, 48), @@ -5893,7 +6372,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Wailord, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 4, - .frontAnimFrames = sAnims_Wailord, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 48), + ANIMCMD_FRAME(0, 33), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .frontAnimDelay = 10, .backPic = gMonBackPic_Wailord, @@ -5961,7 +6444,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Numel, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 15 : 9, - .frontAnimFrames = sAnims_Numel, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 40), + ), .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Numel, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 56), @@ -6041,7 +6530,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Camerupt, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 6, - .frontAnimFrames = sAnims_Camerupt, + .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_V_SHAKE, .backPic = gMonBackPic_Camerupt, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 40), @@ -6182,7 +6679,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Torkoal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 3, - .frontAnimFrames = sAnims_Torkoal, + .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_V_STRETCH, .backPic = gMonBackPic_Torkoal, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -6246,7 +6749,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Spoink, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Spoink, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 10), + 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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH_TWICE, .backPic = gMonBackPic_Spoink, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 64), @@ -6309,7 +6824,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Grumpig, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 2, - .frontAnimFrames = sAnims_Grumpig, + .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_H_JUMPS_V_STRETCH, .frontAnimDelay = 15, .backPic = gMonBackPic_Grumpig, @@ -6378,7 +6899,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Spinda, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Spinda, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 17), + ANIMCMD_FRAME(1, 23), + ANIMCMD_FRAME(0, 13), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_JUMPS : ANIM_CIRCLE_INTO_BG, .backPic = gMonBackPic_Spinda, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -6447,7 +6974,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Trapinch, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 32) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 12, - .frontAnimFrames = sAnims_Trapinch, + .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_V_SHAKE, .backPic = gMonBackPic_Trapinch, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 40) : MON_COORDS_SIZE(48, 48), @@ -6515,7 +7048,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Vibrava, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 10, - .frontAnimFrames = sAnims_Vibrava, + .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_H_SHAKE, .backPic = gMonBackPic_Vibrava, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(64, 40), @@ -6588,7 +7129,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Flygon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Flygon, + .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_ZIGZAG_SLOW, .enemyMonElevation = 7, .backPic = gMonBackPic_Flygon, @@ -6653,7 +7202,19 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Cacnea, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 32) : MON_COORDS_SIZE(56, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 13, - .frontAnimFrames = sAnims_Cacnea, + .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), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Cacnea, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -6718,7 +7279,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Cacturne, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cacturne, + .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_V_SLIDE, .backPic = gMonBackPic_Cacturne, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -6791,7 +7358,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Swablu, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 14, - .frontAnimFrames = sAnims_Swablu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + 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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE : ANIM_GROW_VIBRATE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 0, .backPic = gMonBackPic_Swablu, @@ -6855,7 +7430,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Altaria, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 1, - .frontAnimFrames = sAnims_Altaria, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_STRETCH, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_Altaria, @@ -6982,7 +7563,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Zangoose, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Zangoose, + .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_GROW_VIBRATE, .backPic = gMonBackPic_Zangoose, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), @@ -7049,7 +7638,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Seviper, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 6, - .frontAnimFrames = sAnims_Seviper, + .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_Seviper, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7121,7 +7718,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Lunatone, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Lunatone, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_SWING_CONVEX_FAST, .enemyMonElevation = 13, .backPic = gMonBackPic_Lunatone, @@ -7193,7 +7796,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Solrock, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Solrock, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_ROTATE_TO_SIDES_TWICE, .enemyMonElevation = 4, .backPic = gMonBackPic_Solrock, @@ -7261,7 +7870,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Barboach, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 15, - .frontAnimFrames = sAnims_Barboach, + .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), + 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_BOUNCE_ROTATE_TO_SIDES_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 0 : 7, .backPic = gMonBackPic_Barboach, @@ -7329,7 +7952,21 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Whiscash, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Whiscash, + .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), + 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_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Whiscash, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -7392,7 +8029,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Corphish, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 8, - .frontAnimFrames = sAnims_Corphish, + .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_SHAKE, .backPic = gMonBackPic_Corphish, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 48), @@ -7455,7 +8100,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Crawdaunt, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 4, - .frontAnimFrames = sAnims_Crawdaunt, + .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_GROW_VIBRATE, .backPic = gMonBackPic_Crawdaunt, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7519,7 +8170,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Baltoy, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 14, - .frontAnimFrames = sAnims_Baltoy, + .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_H_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 4 : 8, .backPic = gMonBackPic_Baltoy, @@ -7583,7 +8242,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Claydol, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 3, - .frontAnimFrames = sAnims_Claydol, + .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_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 10, .backPic = gMonBackPic_Claydol, @@ -7654,7 +8321,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Lileep, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Lileep, + .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_V_STRETCH, .backPic = gMonBackPic_Lileep, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(48, 48), @@ -7724,7 +8397,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Cradily, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cradily, + .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_V_SHAKE_TWICE, .backPic = gMonBackPic_Cradily, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(56, 64), @@ -7793,7 +8474,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Anorith, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 7, - .frontAnimFrames = sAnims_Anorith, + .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_TWIST, .backPic = gMonBackPic_Anorith, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(56, 32), @@ -7862,7 +8551,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Armaldo, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, - .frontAnimFrames = sAnims_Armaldo, + .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_V_SHAKE, .backPic = gMonBackPic_Armaldo, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), @@ -7929,7 +8624,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Feebas, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 10, - .frontAnimFrames = sAnims_Feebas, + .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_BOUNCE_ROTATE_TO_SIDES_SLOW, .backPic = gMonBackPic_Feebas, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -7998,7 +8701,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Milotic, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, - .frontAnimFrames = sAnims_Milotic, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_GLOW_BLUE : ANIM_CIRCULAR_STRETCH_TWICE, .frontAnimDelay = 45, .backPic = gMonBackPic_Milotic, @@ -8076,7 +8787,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformNormal, .frontPicSize = MON_COORDS_SIZE(24, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_CastformNormal, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 24), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 24), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 16, .backPic = gMonBackPic_CastformNormal, @@ -8143,7 +8860,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformSunny, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_CastformSunny, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ), .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformSunny, @@ -8210,7 +8935,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformRainy, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_CastformRainy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_SWING_CONVEX_FAST, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformRainy, @@ -8277,7 +9008,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_CastformSnowy, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_CastformSnowy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 29), + ANIMCMD_FRAME(0, 12), + ), .frontAnimId = ANIM_V_STRETCH, .enemyMonElevation = 5, .backPic = gMonBackPic_CastformSnowy, @@ -8348,7 +9085,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Kecleon, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 5, - .frontAnimFrames = sAnims_Kecleon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_FLICKER_INCREASING, .frontAnimDelay = 30, .backPic = gMonBackPic_Kecleon, @@ -8418,7 +9161,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Shuppet, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(40, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 13, - .frontAnimFrames = sAnims_Shuppet, + .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_V_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 14, .backPic = gMonBackPic_Shuppet, @@ -8487,7 +9238,15 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Banette, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 7, - .frontAnimFrames = sAnims_Banette, + .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 = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0, .backPic = gMonBackPic_Banette, @@ -8618,7 +9377,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Duskull, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 12, - .frontAnimFrames = sAnims_Duskull, + .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_ZIGZAG_FAST, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 9 : 13, .backPic = gMonBackPic_Duskull, @@ -8688,7 +9453,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Dusclops, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 5 : 3, - .frontAnimFrames = sAnims_Dusclops, + .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_H_VIBRATE, .frontAnimDelay = 30, .backPic = gMonBackPic_Dusclops, @@ -8765,7 +9536,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Dusknoir, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Dusknoir, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ), .frontAnimId = ANIM_H_SLIDE, .enemyMonElevation = 6, .backPic = gMonBackPic_Dusknoir, @@ -8834,7 +9616,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Tropius, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Tropius, + .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_V_SHAKE, .backPic = gMonBackPic_Tropius, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(56, 64), @@ -8900,7 +9688,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Chingling, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Chingling, + .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_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Chingling, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -8972,7 +9769,17 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Chimecho, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Chimecho, + .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), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 16, .backPic = gMonBackPic_Chimecho, @@ -9042,7 +9849,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Absol, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(56, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 2, - .frontAnimFrames = sAnims_Absol, + .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_CIRCULAR_VIBRATE, .frontAnimDelay = 45, .backPic = gMonBackPic_Absol, @@ -9174,7 +9987,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Snorunt, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 12, - .frontAnimFrames = sAnims_Snorunt, + .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_V_SQUISH_AND_BOUNCE_SLOW, .frontAnimDelay = 20, .backPic = gMonBackPic_Snorunt, @@ -9243,7 +10062,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Glalie, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 48) : MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 10 : 8, - .frontAnimFrames = sAnims_Glalie, + .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_ZIGZAG_FAST, .enemyMonElevation = 12, .backPic = gMonBackPic_Glalie, @@ -9366,7 +10191,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Froslass, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Froslass, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 7, .backPic = gMonBackPic_Froslass, @@ -9435,7 +10264,16 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Spheal, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 16 : 11, - .frontAnimFrames = sAnims_Spheal, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 43), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SPIN : ANIM_SPIN_LONG, .frontAnimDelay = 15, .backPic = gMonBackPic_Spheal, @@ -9503,7 +10341,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Sealeo, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Sealeo, + .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_V_STRETCH, .backPic = gMonBackPic_Sealeo, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9575,7 +10419,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Walrein, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Walrein, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Walrein, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), @@ -9640,7 +10490,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Clamperl, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(40, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, - .frontAnimFrames = sAnims_Clamperl, + .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_TWIST, .backPic = gMonBackPic_Clamperl, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(56, 40), @@ -9708,7 +10564,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Huntail, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Huntail, + .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_GROW_VIBRATE, .backPic = gMonBackPic_Huntail, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 64) : MON_COORDS_SIZE(64, 56), @@ -9770,7 +10632,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Gorebyss, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 6, - .frontAnimFrames = sAnims_Gorebyss, + .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_V_SLIDE_WOBBLE, .backPic = gMonBackPic_Gorebyss, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 56) : MON_COORDS_SIZE(64, 56), @@ -9835,7 +10703,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Relicanth, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 8, - .frontAnimFrames = sAnims_Relicanth, + .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_Relicanth, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 40), @@ -9912,7 +10786,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Luvdisc, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(32, 40), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 24 : 14, - .frontAnimFrames = sAnims_Luvdisc, + .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_H_SLIDE_WOBBLE, .backPic = gMonBackPic_Luvdisc, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(32, 48) : MON_COORDS_SIZE(40, 48), @@ -9977,7 +10857,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Bagon, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 48) : MON_COORDS_SIZE(32, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 11 : 9, - .frontAnimFrames = sAnims_Bagon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE_TWICE : ANIM_H_SHAKE, .backPic = gMonBackPic_Bagon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(48, 56), @@ -10041,7 +10927,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Shelgon, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Shelgon, + .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_V_SLIDE, .backPic = gMonBackPic_Shelgon, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -10110,7 +11002,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Salamence, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Salamence, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 70, .backPic = gMonBackPic_Salamence, @@ -10236,7 +11134,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Beldum, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Beldum, + .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_H_SHAKE, .enemyMonElevation = 8, .backPic = gMonBackPic_Beldum, @@ -10301,7 +11205,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Metang, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 9, - .frontAnimFrames = sAnims_Metang, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_V_SLIDE, .backPic = gMonBackPic_Metang, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 32) : MON_COORDS_SIZE(64, 40), @@ -10370,7 +11280,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Metagross, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 9, - .frontAnimFrames = sAnims_Metagross, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Metagross, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 24) : MON_COORDS_SIZE(64, 56), @@ -10501,7 +11417,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Regirock, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(56, 64) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 3, - .frontAnimFrames = sAnims_Regirock, + .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_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Regirock, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 48) : MON_COORDS_SIZE(64, 56), @@ -10572,7 +11494,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Regice, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Regice, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_FOUR_PETAL : ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Regice, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), @@ -10644,7 +11572,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Registeel, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 56), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 5, - .frontAnimFrames = sAnims_Registeel, + .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, .backPic = gMonBackPic_Registeel, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 40) : MON_COORDS_SIZE(64, 48), @@ -10715,7 +11649,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Latias, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 64) : MON_COORDS_SIZE(64, 48), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 8, - .frontAnimFrames = sAnims_Latias, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONCAVE_FAST_SHORT : ANIM_ZIGZAG_SLOW, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 12, .backPic = gMonBackPic_Latias, @@ -10850,7 +11790,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Latios, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 0, - .frontAnimFrames = sAnims_Latios, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SHAKE : ANIM_CIRCLE_C_CLOCKWISE_SLOW, .enemyMonElevation = 6, .backPic = gMonBackPic_Latios, @@ -10985,7 +11931,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Kyogre, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 0, - .frontAnimFrames = sAnims_Kyogre, + .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_SWING_CONCAVE_FAST_SHORT, .frontAnimDelay = 60, .backPic = gMonBackPic_Kyogre, @@ -11120,7 +12072,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Groudon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 1 : 0, - .frontAnimFrames = sAnims_Groudon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Groudon, .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), @@ -11256,7 +12214,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Rayquaza, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Rayquaza, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ), .frontAnimId = ANIM_H_SHAKE, .frontAnimDelay = 60, .enemyMonElevation = 6, @@ -11397,7 +12361,18 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_Jirachi, .frontPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Jirachi, + .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(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_RISING_WOBBLE, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 14, .backPic = gMonBackPic_Jirachi, @@ -11470,7 +12445,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_DeoxysNormal, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DeoxysNormal, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_DeoxysNormal, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -11533,7 +12514,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_DeoxysAttack, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DeoxysAttack, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_DeoxysAttack, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11595,7 +12582,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_DeoxysDefense, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_DeoxysDefense, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_DeoxysDefense, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -11658,7 +12651,13 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPic = gMonFrontPic_DeoxysSpeed, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_DeoxysSpeed, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 16), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 26), + ANIMCMD_FRAME(1, 16), + ANIMCMD_FRAME(0, 16), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_DeoxysSpeed, .backPicSize = MON_COORDS_SIZE(64, 64), diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index d23f7072803f..340aaf14467c 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -41,7 +41,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Turtwig, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Turtwig, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Turtwig, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -105,7 +109,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Grotle, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Grotle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Grotle, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -175,7 +183,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Torterra, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Torterra, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Torterra, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -239,7 +250,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Chimchar, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Chimchar, + .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_V_JUMPS_BIG, .backPic = gMonBackPic_Chimchar, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -304,7 +322,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Monferno, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Monferno, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Monferno, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -374,7 +398,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Infernape, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Infernape, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Infernape, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -441,7 +469,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Piplup, .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Piplup, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Piplup, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -508,7 +540,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Prinplup, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Prinplup, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Prinplup, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -580,7 +622,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Empoleon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Empoleon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Empoleon, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -647,7 +693,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Starly, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Starly, + .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_Starly, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -722,7 +774,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Staravia, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Staravia, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Staravia, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -804,7 +859,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Staraptor, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Staraptor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Staraptor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -877,7 +935,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Bidoof, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Bidoof, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Bidoof, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -952,7 +1018,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Bibarel, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Bibarel, + .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, .backPic = gMonBackPic_Bibarel, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1026,7 +1098,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Kricketot, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Kricketot, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Kricketot, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -1102,7 +1191,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Kricketune, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Kricketune, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Kricketune, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -1177,7 +1274,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Shinx, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Shinx, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Shinx, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -1252,7 +1353,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Luxio, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Luxio, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Luxio, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1332,7 +1436,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Luxray, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Luxray, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GLOW_YELLOW, .backPic = gMonBackPic_Luxray, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1407,7 +1517,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Cranidos, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Cranidos, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Cranidos, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1470,7 +1583,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Rampardos, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Rampardos, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Rampardos, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1533,7 +1652,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Shieldon, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Shieldon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Shieldon, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1596,7 +1719,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Bastiodon, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Bastiodon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Bastiodon, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2121,7 +2248,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Combee, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Combee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 15, .backPic = gMonBackPic_Combee, @@ -2197,7 +2332,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Vespiquen, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Vespiquen, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_LUNGE_GROW, .enemyMonElevation = 4, .backPic = gMonBackPic_Vespiquen, @@ -2261,7 +2406,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Pachirisu, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Pachirisu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Pachirisu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2335,7 +2490,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Buizel, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Buizel, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Buizel, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2408,7 +2567,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Floatzel, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Floatzel, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Floatzel, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2482,7 +2648,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Cherubi, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Cherubi, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cherubi, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -2546,7 +2722,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_CherrimOvercast, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_CherrimOvercast, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_CherrimOvercast, .backPicSize = MON_COORDS_SIZE(40, 56), @@ -2610,7 +2792,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_CherrimSunshine, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_CherrimSunshine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_CherrimSunshine, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2921,7 +3110,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Drifloon, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Drifloon, + .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 = 5, .backPic = gMonBackPic_Drifloon, @@ -2985,7 +3179,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Drifblim, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Drifblim, + .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 = 7, .backPic = gMonBackPic_Drifblim, @@ -3049,7 +3250,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Buneary, .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Buneary, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Buneary, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3112,7 +3316,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Lopunny, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Lopunny, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Lopunny, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3235,7 +3443,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Glameow, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Glameow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Glameow, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3298,7 +3510,15 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Purugly, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Purugly, + .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_Purugly, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3361,7 +3581,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Stunky, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Stunky, + .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_Stunky, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3424,7 +3650,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Skuntank, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Skuntank, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Skuntank, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3488,7 +3718,18 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Bronzor, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Bronzor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(0, 9), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 9, .backPic = gMonBackPic_Bronzor, @@ -3553,7 +3794,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Bronzong, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Bronzong, + .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_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 7, .backPic = gMonBackPic_Bronzong, @@ -3618,7 +3865,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Chatot, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Chatot, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Chatot, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -3683,7 +3947,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Spiritomb, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Spiritomb, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_IN_STAGES, .backPic = gMonBackPic_Spiritomb, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -3747,7 +4014,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Gible, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Gible, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Gible, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -3822,7 +4093,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Gabite, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Gabite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Gabite, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3902,7 +4176,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Garchomp, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Garchomp, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Garchomp, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4035,7 +4316,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Riolu, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Riolu, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 28), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_RAPID_H_HOPS, .backPic = gMonBackPic_Riolu, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4099,7 +4385,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Lucario, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Lucario, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Lucario, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4223,7 +4512,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Hippopotas, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Hippopotas, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Hippopotas, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -4300,7 +4593,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Hippowdon, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Hippowdon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Hippowdon, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4376,7 +4672,24 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Skorupi, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Skorupi, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SLIDE_SLOW, .backPic = gMonBackPic_Skorupi, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4440,7 +4753,17 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Drapion, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Drapion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_JUMPS_BIG, .backPic = gMonBackPic_Drapion, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4504,7 +4827,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Croagunk, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_Croagunk, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 28), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_RAPID_H_HOPS, .backPic = gMonBackPic_Croagunk, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -4580,7 +4908,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Toxicroak, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Toxicroak, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Toxicroak, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -4655,7 +4989,20 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Carnivine, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Carnivine, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 8, .backPic = gMonBackPic_Carnivine, @@ -4720,7 +5067,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Finneon, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Finneon, + .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_V_SLIDE_WOBBLE_SMALL, .backPic = gMonBackPic_Finneon, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -4795,7 +5151,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Lumineon, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Lumineon, + .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_Lumineon, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -4871,7 +5234,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Snover, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Snover, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Snover, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4948,7 +5315,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Abomasnow, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Abomasnow, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Abomasnow, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5084,7 +5455,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Rotom, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Rotom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GLOW_YELLOW, .enemyMonElevation = 10, .backPic = gMonBackPic_Rotom, @@ -5157,7 +5534,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_RotomHeat, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_RotomHeat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_RotomHeat, @@ -5223,7 +5604,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_RotomWash, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_RotomWash, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .enemyMonElevation = 6, .backPic = gMonBackPic_RotomWash, @@ -5288,7 +5673,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_RotomFrost, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_RotomFrost, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_STRETCH, .enemyMonElevation = 6, .backPic = gMonBackPic_RotomFrost, @@ -5353,7 +5741,34 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_RotomFan, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_RotomFan, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ANIMCMD_FRAME(1, 3), + ANIMCMD_FRAME(0, 3), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .frontAnimDelay = 7, .enemyMonElevation = 6, @@ -5419,7 +5834,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_RotomMow, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_RotomMow, + .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, .enemyMonElevation = 6, .backPic = gMonBackPic_RotomMow, @@ -5492,7 +5913,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Uxie, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Uxie, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SWING_CONCAVE, .enemyMonElevation = 6, .backPic = gMonBackPic_Uxie, @@ -5566,7 +5991,16 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Mesprit, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Mesprit, + .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_H_SLIDE_WOBBLE, .enemyMonElevation = 6, .backPic = gMonBackPic_Mesprit, @@ -5639,7 +6073,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Azelf, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Azelf, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 6, .backPic = gMonBackPic_Azelf, @@ -5713,7 +6151,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Dialga, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Dialga, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Dialga, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5855,7 +6296,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Palkia, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Palkia, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Palkia, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5995,7 +6439,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Heatran, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Heatran, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GLOW_ORANGE, .backPic = gMonBackPic_Heatran, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -6066,7 +6514,10 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Regigigas, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Regigigas, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Regigigas, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -6139,7 +6590,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_GiratinaAltered, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GiratinaAltered, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_GiratinaAltered, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6205,7 +6660,13 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_GiratinaOrigin, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_GiratinaOrigin, + .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, .enemyMonElevation = 7, .backPic = gMonBackPic_GiratinaOrigin, @@ -6280,7 +6741,14 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Cresselia, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Cresselia, + .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_WOBBLE, .enemyMonElevation = 3, .backPic = gMonBackPic_Cresselia, @@ -6352,7 +6820,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Phione, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Phione, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Phione, @@ -6423,7 +6895,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Manaphy, .frontPicSize = MON_COORDS_SIZE(64, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Manaphy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SWING_CONVEX, .enemyMonElevation = 10, .backPic = gMonBackPic_Manaphy, @@ -6497,7 +6973,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_Darkrai, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Darkrai, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GLOW_BLACK, .enemyMonElevation = 4, .backPic = gMonBackPic_Darkrai, @@ -6574,7 +7054,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_ShayminLand, .frontPicSize = MON_COORDS_SIZE(40, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_ShayminLand, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_ShayminLand, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -6647,7 +7131,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPic = gMonFrontPic_ShayminSky, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_ShayminSky, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_ShayminSky, .backPicSize = MON_COORDS_SIZE(56, 64), diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 1f8e2d29476c..a05e7ff46c88 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -41,7 +41,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Victini, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Victini, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 46), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS, .backPic = gMonBackPic_Victini, .backPicSize = MON_COORDS_SIZE(40, 64), @@ -107,7 +111,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Snivy, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Snivy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Snivy, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -170,7 +178,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Servine, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Servine, + .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_Servine, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -232,7 +248,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Serperior, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Serperior, + .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_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Serperior, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -295,7 +317,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Tepig, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Tepig, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Tepig, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -358,7 +386,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Pignite, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Pignite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Pignite, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -421,7 +453,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Emboar, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Emboar, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 4), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = ANIM_DEEP_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Emboar, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -484,7 +539,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Oshawott, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Oshawott, + .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_Oshawott, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -547,7 +610,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Dewott, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Dewott, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Dewott, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -610,7 +679,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Samurott, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Samurott, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Samurott, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -739,7 +811,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Patrat, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Patrat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Patrat, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -802,7 +877,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Watchog, .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Watchog, + .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_Watchog, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -865,7 +948,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Lillipup, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Lillipup, + .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_Lillipup, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -928,7 +1019,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Herdier, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Herdier, + .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_Herdier, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -996,7 +1094,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Stoutland, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Stoutland, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 6), + ANIMCMD_FRAME(1, 6), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Stoutland, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1059,7 +1163,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Purrloin, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Purrloin, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(1, 54), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Purrloin, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1122,7 +1230,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Liepard, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Liepard, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Liepard, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1185,7 +1297,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Pansage, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Pansage, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 13), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Pansage, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -1248,7 +1366,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Simisage, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Simisage, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Simisage, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -1312,7 +1434,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Pansear, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Pansear, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Pansear, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -1376,7 +1501,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Simisear, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Simisear, + .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_SWING_CONCAVE_FAST, .backPic = gMonBackPic_Simisear, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1439,7 +1570,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Panpour, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Panpour, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Panpour, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -1502,7 +1637,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Simipour, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Simipour, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Simipour, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -1565,7 +1703,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Munna, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Munna, + .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 = 7, .backPic = gMonBackPic_Munna, @@ -1629,7 +1776,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Musharna, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Musharna, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_ROTATE_TO_SIDES_TWICE, .enemyMonElevation = 5, .backPic = gMonBackPic_Musharna, @@ -1693,7 +1846,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Pidove, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Pidove, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 46), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Pidove, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -1756,7 +1913,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Tranquill, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Tranquill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Tranquill, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -1824,7 +1985,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Unfezant, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Unfezant, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Unfezant, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1905,7 +2070,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Blitzle, .frontPicSize = MON_COORDS_SIZE(40, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Blitzle, + .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_V_STRETCH, .backPic = gMonBackPic_Blitzle, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -1968,7 +2140,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Zebstrika, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Zebstrika, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Zebstrika, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2037,7 +2213,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Roggenrola, .frontPicSize = MON_COORDS_SIZE(24, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Roggenrola, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Roggenrola, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -2107,7 +2287,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Boldore, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Boldore, + .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_Boldore, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -2182,7 +2369,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Gigalith, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Gigalith, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_ROTATE_UP_SLAM_DOWN, .backPic = gMonBackPic_Gigalith, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -2245,7 +2436,27 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Woobat, .frontPicSize = MON_COORDS_SIZE(64, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Woobat, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_FOUR_PETAL, .enemyMonElevation = 19, .backPic = gMonBackPic_Woobat, @@ -2309,7 +2520,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Swoobat, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Swoobat, + .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_BOUNCE_ROTATE_TO_SIDES_SMALL, .enemyMonElevation = 10, .backPic = gMonBackPic_Swoobat, @@ -2374,7 +2592,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Drilbur, .frontPicSize = MON_COORDS_SIZE(48, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Drilbur, + .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_SWING_CONCAVE_FAST_SHORT, .backPic = gMonBackPic_Drilbur, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -2438,7 +2662,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Excadrill, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Excadrill, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Excadrill, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -2503,7 +2732,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Audino, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Audino, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Audino, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -2630,7 +2863,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Timburr, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Timburr, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Timburr, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -2693,7 +2930,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Gurdurr, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Gurdurr, + .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_GROW_VIBRATE, .backPic = gMonBackPic_Gurdurr, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -2756,7 +3001,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Conkeldurr, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Conkeldurr, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Conkeldurr, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -2819,7 +3067,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Tympole, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Tympole, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Tympole, .backPicSize = MON_COORDS_SIZE(40, 32), @@ -2882,7 +3133,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Palpitoad, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Palpitoad, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 13), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .backPic = gMonBackPic_Palpitoad, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -2950,7 +3207,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Seismitoad, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Seismitoad, + .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_Seismitoad, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3014,7 +3279,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Throh, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Throh, + .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_Throh, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3079,7 +3349,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Sawk, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Sawk, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Sawk, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3143,7 +3416,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Sewaddle, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Sewaddle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_CIRCLE_INTO_BG, .backPic = gMonBackPic_Sewaddle, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -3207,7 +3486,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Swadloon, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Swadloon, + .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_Swadloon, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -3276,7 +3560,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Leavanny, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Leavanny, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Leavanny, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -3344,7 +3632,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Venipede, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Venipede, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SLIDE, .backPic = gMonBackPic_Venipede, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3412,7 +3708,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Whirlipede, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Whirlipede, + .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_TIP_MOVE_FORWARD, .backPic = gMonBackPic_Whirlipede, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3485,7 +3788,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Scolipede, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Scolipede, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Scolipede, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -3555,7 +3861,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cottonee, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 18, - .frontAnimFrames = sAnims_Cottonee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cottonee, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -3619,7 +3935,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Whimsicott, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Whimsicott, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_SHRINK_GROW, .backPic = gMonBackPic_Whimsicott, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -3683,7 +4003,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Petilil, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Petilil, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .enemyMonElevation = 7, .backPic = gMonBackPic_Petilil, @@ -3750,7 +4076,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Lilligant, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Lilligant, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Lilligant, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4208,7 +4538,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Sandile, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 18, - .frontAnimFrames = sAnims_Sandile, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Sandile, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -4272,7 +4606,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Krokorok, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Krokorok, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Krokorok, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -4341,7 +4678,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Krookodile, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Krookodile, + .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_SWING_CONCAVE_FAST_SHORT, .backPic = gMonBackPic_Krookodile, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4404,7 +4747,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Darumaka, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Darumaka, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Darumaka, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -4468,7 +4815,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_DarmanitanStandard, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_DarmanitanStandard, + .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_DarmanitanStandard, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4530,7 +4882,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_DarmanitanZen, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_DarmanitanZen, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_DarmanitanZen, .backPicSize = MON_COORDS_SIZE(56, 48), @@ -4775,7 +5130,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Maractus, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Maractus, + .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_Maractus, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -4840,7 +5203,17 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Dwebble, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Dwebble, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 50), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Dwebble, .backPicSize = MON_COORDS_SIZE(56, 32), @@ -4904,7 +5277,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Crustle, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Crustle, + .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_Crustle, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -4968,7 +5348,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Scraggy, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Scraggy, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Scraggy, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -5033,7 +5417,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Scrafty, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Scrafty, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Scrafty, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -5096,7 +5484,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Sigilyph, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Sigilyph, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ANIMCMD_FRAME(1, 7), + ANIMCMD_FRAME(0, 7), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, .backPic = gMonBackPic_Sigilyph, @@ -5162,7 +5559,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Yamask, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Yamask, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 10, .backPic = gMonBackPic_Yamask, @@ -5228,7 +5631,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cofagrigus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cofagrigus, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GLOW_BLACK, .backPic = gMonBackPic_Cofagrigus, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -5420,7 +5827,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Tirtouga, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Tirtouga, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_RISING_WOBBLE, .backPic = gMonBackPic_Tirtouga, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -5483,7 +5895,18 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Carracosta, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Carracosta, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + 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), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE_SLOW, .backPic = gMonBackPic_Carracosta, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -5546,7 +5969,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Archen, .frontPicSize = MON_COORDS_SIZE(56, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Archen, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 46), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Archen, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -5609,7 +6036,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Archeops, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Archeops, + .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 = 11, .backPic = gMonBackPic_Archeops, @@ -5674,7 +6110,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Trubbish, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 15, - .frontAnimFrames = sAnims_Trubbish, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Trubbish, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -5740,7 +6180,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Garbodor, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Garbodor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Garbodor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -5866,7 +6310,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Zorua, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Zorua, + .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_CIRCULAR_VIBRATE, .backPic = gMonBackPic_Zorua, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -5930,7 +6380,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Zoroark, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Zoroark, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 18), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 8), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_FLICKER_INCREASING, .backPic = gMonBackPic_Zoroark, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6123,7 +6579,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Minccino, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Minccino, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Minccino, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -6187,7 +6647,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cinccino, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Cinccino, + .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_V_SLIDE, .backPic = gMonBackPic_Cinccino, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6254,7 +6720,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Gothita, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Gothita, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_SMALL, .backPic = gMonBackPic_Gothita, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -6321,7 +6792,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Gothorita, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Gothorita, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Gothorita, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -6387,7 +6864,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Gothitelle, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Gothitelle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Gothitelle, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6451,7 +6933,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Solosis, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Solosis, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_TWIST, .enemyMonElevation = 14, .backPic = gMonBackPic_Solosis, @@ -6515,7 +7002,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Duosion, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Duosion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 7, .backPic = gMonBackPic_Duosion, @@ -6578,7 +7070,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Reuniclus, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Reuniclus, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE, .enemyMonElevation = 8, .backPic = gMonBackPic_Reuniclus, @@ -6642,7 +7140,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Ducklett, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Ducklett, + .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_Ducklett, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -6705,7 +7211,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Swanna, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Swanna, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Swanna, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -6773,7 +7282,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Vanillite, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Vanillite, + .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_H_SLIDE, .backPic = gMonBackPic_Vanillite, .backPicSize = MON_COORDS_SIZE(40, 48), @@ -6841,7 +7356,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Vanillish, .frontPicSize = MON_COORDS_SIZE(32, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Vanillish, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Vanillish, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -6908,7 +7427,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Vanilluxe, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Vanilluxe, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Vanilluxe, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -7478,7 +8001,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Emolga, .frontPicSize = MON_COORDS_SIZE(64, 48), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Emolga, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 21), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .enemyMonElevation = 19, .backPic = gMonBackPic_Emolga, @@ -7543,7 +8071,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Karrablast, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Karrablast, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Karrablast, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -7606,7 +8137,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Escavalier, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Escavalier, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_BACK_AND_LUNGE, .backPic = gMonBackPic_Escavalier, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -7671,7 +8206,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Foongus, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Foongus, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_SWING_CONCAVE_FAST, .backPic = gMonBackPic_Foongus, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -7737,7 +8278,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Amoonguss, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Amoonguss, + .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_Amoonguss, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -7800,7 +8348,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Frillish, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Frillish, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ), .frontAnimId = ANIM_RISING_WOBBLE, .backPic = gMonBackPic_Frillish, .backPicSize = MON_COORDS_SIZE(40, 56), @@ -7881,7 +8434,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Jellicent, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 3, - .frontAnimFrames = sAnims_Jellicent, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 8), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 8), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Jellicent, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -7962,7 +8521,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Alomomola, .frontPicSize = MON_COORDS_SIZE(32, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Alomomola, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SWING_CONCAVE, .backPic = gMonBackPic_Alomomola, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -8026,7 +8589,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Joltik, .frontPicSize = MON_COORDS_SIZE(32, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Joltik, + .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_H_SLIDE, .backPic = gMonBackPic_Joltik, .backPicSize = MON_COORDS_SIZE(48, 32), @@ -8089,7 +8658,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Galvantula, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Galvantula, + .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_Galvantula, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -8153,7 +8731,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Ferroseed, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Ferroseed, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Ferroseed, .backPicSize = MON_COORDS_SIZE(48, 40), @@ -8221,7 +8805,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Ferrothorn, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Ferrothorn, + .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_V_SHAKE, .enemyMonElevation = 10, .backPic = gMonBackPic_Ferrothorn, @@ -8286,7 +8876,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Klink, .frontPicSize = MON_COORDS_SIZE(48, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Klink, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 12, .backPic = gMonBackPic_Klink, @@ -8350,7 +8945,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Klang, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Klang, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 8, .backPic = gMonBackPic_Klang, @@ -8414,7 +9014,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Klinklang, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Klinklang, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_CIRCULAR_STRETCH_TWICE, .enemyMonElevation = 4, .backPic = gMonBackPic_Klinklang, @@ -8478,7 +9083,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Tynamo, .frontPicSize = MON_COORDS_SIZE(40, 24), .frontPicYOffset = 22, - .frontAnimFrames = sAnims_Tynamo, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SLIDE_WOBBLE_SMALL, .enemyMonElevation = 16, .backPic = gMonBackPic_Tynamo, @@ -8542,7 +9164,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Eelektrik, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Eelektrik, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 4), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 8, .backPic = gMonBackPic_Eelektrik, @@ -8605,7 +9233,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Eelektross, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Eelektross, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(0, 25), + ANIMCMD_FRAME(1, 27), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, .enemyMonElevation = 8, .backPic = gMonBackPic_Eelektross, @@ -8669,7 +9304,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Elgyem, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Elgyem, + .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, .backPic = gMonBackPic_Elgyem, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -8732,7 +9376,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Beheeyem, .frontPicSize = MON_COORDS_SIZE(48, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Beheeyem, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Beheeyem, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -8800,7 +9447,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Litwick, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Litwick, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Litwick, .backPicSize = MON_COORDS_SIZE(40, 40), @@ -8867,7 +9519,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Lampent, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 8, - .frontAnimFrames = sAnims_Lampent, + .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 = 6, .backPic = gMonBackPic_Lampent, @@ -8934,7 +9591,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Chandelure, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Chandelure, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_SLIDE_WOBBLE, .enemyMonElevation = 6, .backPic = gMonBackPic_Chandelure, @@ -8998,7 +9659,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Axew, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Axew, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Axew, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -9061,7 +9725,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Fraxure, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Fraxure, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Fraxure, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -9123,7 +9790,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Haxorus, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Haxorus, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Haxorus, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9190,7 +9862,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cubchoo, .frontPicSize = MON_COORDS_SIZE(32, 40), .frontPicYOffset = 12, - .frontAnimFrames = sAnims_Cubchoo, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Cubchoo, .backPicSize = MON_COORDS_SIZE(40, 40), @@ -9257,7 +9933,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Beartic, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Beartic, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Beartic, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -9321,7 +10002,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cryogonal, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cryogonal, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 11), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 48), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_SHRINK_GROW, .enemyMonElevation = 3, .backPic = gMonBackPic_Cryogonal, @@ -9385,7 +10072,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Shelmet, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Shelmet, + .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_TWIST, .backPic = gMonBackPic_Shelmet, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -9448,7 +10141,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Accelgor, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Accelgor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_JUMPS_V_STRETCH, .backPic = gMonBackPic_Accelgor, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -9512,7 +10208,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Stunfisk, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 14, - .frontAnimFrames = sAnims_Stunfisk, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Stunfisk, .backPicSize = MON_COORDS_SIZE(64, 24), @@ -9643,7 +10342,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Mienfoo, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 11, - .frontAnimFrames = sAnims_Mienfoo, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Mienfoo, .backPicSize = MON_COORDS_SIZE(56, 40), @@ -9706,7 +10408,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Mienshao, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Mienshao, + .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_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Mienshao, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -9770,7 +10480,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Druddigon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Druddigon, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 22), + ANIMCMD_FRAME(1, 22), + ANIMCMD_FRAME(0, 11), + ), .frontAnimId = ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, .backPic = gMonBackPic_Druddigon, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9836,7 +10554,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Golett, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Golett, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 44), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Golett, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9900,7 +10622,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Golurk, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Golurk, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Golurk, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -9963,7 +10688,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Pawniard, .frontPicSize = MON_COORDS_SIZE(56, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Pawniard, + .frontAnimFrames = ANIM_FRAMES( + 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), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Pawniard, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -10027,7 +10761,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Bisharp, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Bisharp, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Bisharp, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -10154,7 +10891,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Bouffalant, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Bouffalant, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 28), + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .backPic = gMonBackPic_Bouffalant, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -10218,7 +10959,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Rufflet, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Rufflet, + .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_Rufflet, .backPicSize = MON_COORDS_SIZE(48, 56), @@ -10281,7 +11028,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Braviary, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Braviary, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .enemyMonElevation = 6, .backPic = gMonBackPic_Braviary, @@ -10411,7 +11162,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Vullaby, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Vullaby, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Vullaby, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -10474,7 +11229,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Mandibuzz, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Mandibuzz, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Mandibuzz, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -10537,7 +11296,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Heatmor, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Heatmor, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_Heatmor, .backPicSize = MON_COORDS_SIZE(64, 24), @@ -10601,7 +11363,25 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Durant, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Durant, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_RAPID_H_HOPS, .backPic = gMonBackPic_Durant, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -10665,7 +11445,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Deino, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 10, - .frontAnimFrames = sAnims_Deino, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Deino, .backPicSize = MON_COORDS_SIZE(48, 48), @@ -10728,7 +11512,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Zweilous, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Zweilous, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_H_STRETCH, .backPic = gMonBackPic_Zweilous, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -10790,7 +11577,16 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Hydreigon, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Hydreigon, + .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 = 3, .backPic = gMonBackPic_Hydreigon, @@ -10854,7 +11650,19 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Larvesta, .frontPicSize = MON_COORDS_SIZE(40, 48), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Larvesta, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_GLOW_ORANGE, .backPic = gMonBackPic_Larvesta, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -10919,7 +11727,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Volcarona, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 4, - .frontAnimFrames = sAnims_Volcarona, + .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 = 6, .backPic = gMonBackPic_Volcarona, @@ -10983,7 +11796,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Cobalion, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Cobalion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_STRETCH, .backPic = gMonBackPic_Cobalion, .backPicSize = MON_COORDS_SIZE(48, 64), @@ -11048,7 +11865,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Terrakion, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Terrakion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_V_SHAKE_TWICE, .backPic = gMonBackPic_Terrakion, .backPicSize = MON_COORDS_SIZE(64, 48), @@ -11113,7 +11938,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Virizion, .frontPicSize = MON_COORDS_SIZE(48, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Virizion, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Virizion, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -11178,7 +12006,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_TornadusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_TornadusIncarnate, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, .backPic = gMonBackPic_TornadusIncarnate, @@ -11244,7 +12095,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_TornadusTherian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_TornadusTherian, + .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_TornadusTherian, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -11311,7 +12168,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_ThundurusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_ThundurusIncarnate, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusIncarnate, @@ -11377,7 +12257,24 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_ThundurusTherian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_ThundurusTherian, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 5), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_RISING_WOBBLE, .enemyMonElevation = 7, .backPic = gMonBackPic_ThundurusTherian, @@ -11445,7 +12342,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Reshiram, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_Reshiram, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Reshiram, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11511,7 +12411,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Zekrom, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_Zekrom, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_Zekrom, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11577,7 +12480,30 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_LandorusIncarnate, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 1, - .frontAnimFrames = sAnims_LandorusIncarnate, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ANIMCMD_FRAME(1, 2), + ANIMCMD_FRAME(0, 2), + ), .frontAnimId = ANIM_FIGURE_8, .enemyMonElevation = 7, .backPic = gMonBackPic_LandorusIncarnate, @@ -11643,7 +12569,13 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_LandorusTherian, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_LandorusTherian, + .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_CIRCULAR_VIBRATE, .backPic = gMonBackPic_LandorusTherian, .backPicSize = MON_COORDS_SIZE(64, 56), @@ -11713,7 +12645,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_Kyurem, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 6, - .frontAnimFrames = sAnims_Kyurem, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Kyurem, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -11786,7 +12723,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_KyuremWhite, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KyuremWhite, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_H_SHAKE, .backPic = gMonBackPic_KyuremWhite, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11859,7 +12799,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_KyuremBlack, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 0, - .frontAnimFrames = sAnims_KyuremBlack, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(0, 5), + ), .frontAnimId = ANIM_V_SHAKE, .backPic = gMonBackPic_KyuremBlack, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -11928,7 +12871,10 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_KeldeoOrdinary, .frontPicSize = MON_COORDS_SIZE(56, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_KeldeoOrdinary, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(1, 32), + ANIMCMD_FRAME(0, 20), + ), .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_KeldeoOrdinary, .backPicSize = MON_COORDS_SIZE(56, 64), @@ -11995,7 +12941,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_KeldeoResolute, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_KeldeoResolute, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 36), + ANIMCMD_FRAME(0, 10), + ), .frontAnimId = ANIM_V_JUMPS_H_JUMPS, .backPic = gMonBackPic_KeldeoResolute, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -12060,7 +13010,15 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_MeloettaAria, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 9, - .frontAnimFrames = sAnims_MeloettaAria, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 45), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 15), + ), .frontAnimId = ANIM_GROW_VIBRATE, .enemyMonElevation = 8, .backPic = gMonBackPic_MeloettaAria, @@ -12131,7 +13089,14 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .frontPic = gMonFrontPic_MeloettaPirouette, .frontPicSize = MON_COORDS_SIZE(64, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_MeloettaPirouette, + .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, .enemyMonElevation = 5, .backPic = gMonBackPic_MeloettaPirouette, diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index a3b28756ddf7..df1563b460ad 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -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), @@ -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), @@ -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), @@ -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), diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index ece25e9ab250..be36c7f1219a 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -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), @@ -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), @@ -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, @@ -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), @@ -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), @@ -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), @@ -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), @@ -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), @@ -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), @@ -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), @@ -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, @@ -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), diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index e46cd74682d7..c17c10d9910c 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -908,7 +908,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Rookidee, .frontPicSize = MON_COORDS_SIZE(40, 40), .frontPicYOffset = 16, - .frontAnimFrames = sAnims_Rookidee, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Rookidee, .backPicSize = MON_COORDS_SIZE(64, 32), @@ -971,7 +979,15 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Corvisquire, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 5, - .frontAnimFrames = sAnims_Corvisquire, + .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_CIRCLE_INTO_BG, .enemyMonElevation = 10, .backPic = gMonBackPic_Corvisquire, @@ -1034,7 +1050,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Corviknight, .frontPicSize = MON_COORDS_SIZE(56, 64), .frontPicYOffset = 2, - .frontAnimFrames = sAnims_Corviknight, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 50), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Corviknight, .backPicSize = MON_COORDS_SIZE(64, 64), @@ -1786,7 +1806,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Chewtle, .frontPicSize = MON_COORDS_SIZE(32, 48), .frontPicYOffset = 13, - .frontAnimFrames = sAnims_Chewtle, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 1), + ), //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Chewtle, .backPicSize = MON_COORDS_SIZE(56, 56), @@ -1848,7 +1872,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Drednaw, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Drednaw, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_GROW_VIBRATE, .backPic = gMonBackPic_Drednaw, .backPicSize = MON_COORDS_SIZE(64, 40), @@ -3563,7 +3591,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Sizzlipede, .frontPicSize = MON_COORDS_SIZE(48, 32), .frontPicYOffset = 17, - .frontAnimFrames = sAnims_Sizzlipede, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 25), + ANIMCMD_FRAME(0, 1), + ), .frontAnimId = ANIM_H_VIBRATE, .backPic = gMonBackPic_Sizzlipede, .backPicSize = MON_COORDS_SIZE(40, 32), @@ -3626,7 +3658,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .frontPic = gMonFrontPic_Centiskorch, .frontPicSize = MON_COORDS_SIZE(64, 56), .frontPicYOffset = 7, - .frontAnimFrames = sAnims_Centiskorch, + .frontAnimFrames = ANIM_FRAMES( + ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 35), + ANIMCMD_FRAME(0, 1), + ), //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, .backPic = gMonBackPic_Centiskorch, .backPicSize = MON_COORDS_SIZE(56, 64), diff --git a/src/data/pokemon/species_info/shared_front_pic_anims.h b/src/data/pokemon/species_info/shared_front_pic_anims.h new file mode 100644 index 000000000000..ba1ddfd53e70 --- /dev/null +++ b/src/data/pokemon/species_info/shared_front_pic_anims.h @@ -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 diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h deleted file mode 100644 index 396abbea2829..000000000000 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ /dev/null @@ -1,10529 +0,0 @@ -static const union AnimCmd sAnim_SingleFramePlaceHolder_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd *const sAnims_SingleFramePlaceHolder[] = -{ - sAnim_GeneralFrame0, - sAnim_SingleFramePlaceHolder_1, -}; - -static const union AnimCmd sAnim_TwoFramePlaceHolder_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd *const sAnims_TwoFramePlaceHolder[] = -{ - sAnim_GeneralFrame0, - sAnim_TwoFramePlaceHolder_1, -}; - -#if P_FAMILY_BULBASAUR -static const union AnimCmd sAnim_Bulbasaur_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ivysaur_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Venusaur_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_BULBASAUR - -#if P_FAMILY_CHARMANDER -static const union AnimCmd sAnim_Charmander_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 46), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Charmeleon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Charizard_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHARMANDER - -#if P_FAMILY_SQUIRTLE -static const union AnimCmd sAnim_Squirtle_1[] = -{ - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Wartortle_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Blastoise_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_SQUIRTLE - -#if P_FAMILY_CATERPIE -static const union AnimCmd sAnim_Caterpie_1[] = -{ - 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_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Metapod_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Butterfree_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 5), - 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_CATERPIE - -#if P_FAMILY_WEEDLE -static const union AnimCmd sAnim_Weedle_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kakuna_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Beedrill_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_WEEDLE - -#if P_FAMILY_PIDGEY -static const union AnimCmd sAnim_Pidgey_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pidgeotto_1[] = -{ - 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 sAnim_Pidgeot_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PIDGEY - -#if P_FAMILY_RATTATA -static const union AnimCmd sAnim_Rattata_1[] = -{ - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Raticate_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - 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_RATTATA - -#if P_FAMILY_SPEAROW -static const union AnimCmd sAnim_Spearow_1[] = -{ - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Fearow_1[] = -{ - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPEAROW - -#if P_FAMILY_EKANS -static const union AnimCmd sAnim_Ekans_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Arbok_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_EKANS - -#if P_FAMILY_PIKACHU -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Pichu_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Pikachu_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 60), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Raichu_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PIKACHU - -#if P_FAMILY_SANDSHREW -static const union AnimCmd sAnim_Sandshrew_1[] = -{ - 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 sAnim_Sandslash_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SANDSHREW - -#if P_FAMILY_NIDORAN -static const union AnimCmd sAnim_NidoranF_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Nidorina_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Nidoqueen_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_NidoranM_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Nidorino_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Nidoking_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_NIDORAN - -#if P_FAMILY_CLEFAIRY -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Cleffa_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Clefairy_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Clefable_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 48), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_CLEFAIRY - -#if P_FAMILY_VULPIX -static const union AnimCmd sAnim_Vulpix_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ninetales_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_VULPIX - -#if P_FAMILY_JIGGLYPUFF -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Igglybuff_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Jigglypuff_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Wigglytuff_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_JIGGLYPUFF - -#if P_FAMILY_ZUBAT -static const union AnimCmd sAnim_Zubat_1[] = -{ - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Golbat_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Crobat_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ZUBAT - -#if P_FAMILY_ODDISH -static const union AnimCmd sAnim_Oddish_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gloom_1[] = -{ - ANIMCMD_FRAME(0, 21), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vileplume_1[] = -{ - ANIMCMD_FRAME(1, 38), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Bellossom_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ODDISH - -#if P_FAMILY_PARAS -static const union AnimCmd sAnim_Paras_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Parasect_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PARAS - -#if P_FAMILY_VENONAT -static const union AnimCmd sAnim_Venonat_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 35), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Venomoth_1[] = -{ - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; -#endif //P_FAMILY_VENONAT - -#if P_FAMILY_DIGLETT -static const union AnimCmd sAnim_Diglett_1[] = -{ - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dugtrio_1[] = -{ - ANIMCMD_FRAME(1, 35), - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DIGLETT - -#if P_FAMILY_MEOWTH -static const union AnimCmd sAnim_Meowth_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Persian_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_MEOWTH - -#if P_FAMILY_PSYDUCK -static const union AnimCmd sAnim_Psyduck_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Golduck_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PSYDUCK - -#if P_FAMILY_MANKEY -static const union AnimCmd sAnim_Mankey_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Primeape_1[] = -{ - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_MANKEY - -#if P_FAMILY_GROWLITHE -static const union AnimCmd sAnim_Growlithe_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Arcanine_1[] = -{ - ANIMCMD_FRAME(1, 38), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_GROWLITHE - -#if P_FAMILY_POLIWAG -static const union AnimCmd sAnim_Poliwag_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Poliwhirl_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Poliwrath_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Politoed_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_POLIWAG - -#if P_FAMILY_ABRA -static const union AnimCmd sAnim_Abra_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 21), - ANIMCMD_FRAME(0, 13), - ANIMCMD_FRAME(1, 21), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kadabra_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Alakazam_1[] = -{ - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 54), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_ABRA - -#if P_FAMILY_MACHOP -static const union AnimCmd sAnim_Machop_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Machoke_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Machamp_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_MACHOP - -#if P_FAMILY_BELLSPROUT -static const union AnimCmd sAnim_Bellsprout_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Weepinbell_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Victreebel_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_BELLSPROUT - -#if P_FAMILY_TENTACOOL -static const union AnimCmd sAnim_Tentacool_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Tentacruel_1[] = -{ - ANIMCMD_FRAME(0, 19), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 19), - ANIMCMD_FRAME(1, 19), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_TENTACOOL - -#if P_FAMILY_GEODUDE -static const union AnimCmd sAnim_Geodude_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Graveler_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Golem_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 31), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_GEODUDE - -#if P_FAMILY_PONYTA -static const union AnimCmd sAnim_Ponyta_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Rapidash_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PONYTA - -#if P_FAMILY_SLOWPOKE -static const union AnimCmd sAnim_Slowpoke_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Slowbro_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Slowking_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_SLOWPOKE - -#if P_FAMILY_MAGNEMITE -static const union AnimCmd sAnim_Magnemite_1[] = -{ - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 28), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 28), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Magneton_1[] = -{ - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Magnezone_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MAGNEMITE - -#if P_FAMILY_FARFETCHD -static const union AnimCmd sAnim_Farfetchd_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_FARFETCHD - -#if P_FAMILY_DODUO -static const union AnimCmd sAnim_Doduo_1[] = -{ - 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 sAnim_Dodrio_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_DODUO - -#if P_FAMILY_SEEL -static const union AnimCmd sAnim_Seel_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dewgong_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_SEEL - -#if P_FAMILY_GRIMER -static const union AnimCmd sAnim_Grimer_1[] = -{ - 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 sAnim_Muk_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GRIMER - -#if P_FAMILY_SHELLDER -static const union AnimCmd sAnim_Shellder_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cloyster_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHELLDER - -#if P_FAMILY_GASTLY -static const union AnimCmd sAnim_Gastly_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Haunter_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gengar_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GASTLY - -#if P_FAMILY_ONIX -static const union AnimCmd sAnim_Onix_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Steelix_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 21), - ANIMCMD_FRAME(0, 13), - ANIMCMD_FRAME(1, 21), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ONIX - -#if P_FAMILY_DROWZEE -static const union AnimCmd sAnim_Drowzee_1[] = -{ - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hypno_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_DROWZEE - -#if P_FAMILY_KRABBY -static const union AnimCmd sAnim_Krabby_1[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kingler_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 14), - ANIMCMD_END, -}; -#endif //P_FAMILY_KRABBY - -#if P_FAMILY_VOLTORB -static const union AnimCmd sAnim_Voltorb_1[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Electrode_1[] = -{ - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 34), - ANIMCMD_FRAME(1, 34), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_VOLTORB - -#if P_FAMILY_EXEGGCUTE -static const union AnimCmd sAnim_Exeggcute_1[] = -{ - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Exeggutor_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_EXEGGCUTE - -#if P_FAMILY_CUBONE -static const union AnimCmd sAnim_Cubone_1[] = -{ - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Marowak_1[] = -{ - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_END, -}; -#endif //P_FAMILY_CUBONE - -#if P_FAMILY_HITMONS -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Tyrogue_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Hitmonlee_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hitmonchan_1[] = -{ - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Hitmontop_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 26), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_HITMONS - -#if P_FAMILY_LICKITUNG -static const union AnimCmd sAnim_Lickitung_1[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Lickilicky_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_LICKITUNG - -#if P_FAMILY_KOFFING -static const union AnimCmd sAnim_Koffing_1[] = -{ - 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 sAnim_Weezing_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_KOFFING - -#if P_FAMILY_RHYHORN -static const union AnimCmd sAnim_Rhyhorn_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Rhydon_1[] = -{ - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Rhyperior_1[] = -{ - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_RHYHORN - -#if P_FAMILY_CHANSEY -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Happiny_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Chansey_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Blissey_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_CHANSEY - -#if P_FAMILY_TANGELA -static const union AnimCmd sAnim_Tangela_1[] = -{ - ANIMCMD_FRAME(0, 40), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Tangrowth_1[] = -{ - 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_GEN_4_CROSS_EVOS -#endif //P_FAMILY_TANGELA - -#if P_FAMILY_KANGASKHAN -static const union AnimCmd sAnim_Kangaskhan_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_KANGASKHAN - -#if P_FAMILY_HORSEA -static const union AnimCmd sAnim_Horsea_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Seadra_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Kingdra_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_HORSEA - -#if P_FAMILY_GOLDEEN -static const union AnimCmd sAnim_Goldeen_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Seaking_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GOLDEEN - -#if P_FAMILY_STARYU -static const union AnimCmd sAnim_Staryu_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Starmie_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_STARYU - -#if P_FAMILY_MR_MIME -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_MimeJr_1[] = -{ - 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_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_MrMime_1[] = -{ - 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_MR_MIME - -#if P_FAMILY_SCYTHER -static const union AnimCmd sAnim_Scyther_1[] = -{ - 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, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Scizor_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_SCYTHER - -#if P_FAMILY_JYNX -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Smoochum_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Jynx_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_JYNX - -#if P_FAMILY_ELECTABUZZ -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Elekid_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Electabuzz_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Electivire_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_ELECTABUZZ - -#if P_FAMILY_MAGMAR -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Magby_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -static const union AnimCmd sAnim_Magmar_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Magmortar_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MAGMAR - -#if P_FAMILY_PINSIR -static const union AnimCmd sAnim_Pinsir_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PINSIR - -#if P_FAMILY_TAUROS -static const union AnimCmd sAnim_Tauros_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAUROS - -#if P_FAMILY_MAGIKARP -static const union AnimCmd sAnim_Magikarp_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Gyarados_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MAGIKARP - -#if P_FAMILY_LAPRAS -static const union AnimCmd sAnim_Lapras_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_LAPRAS - -#if P_FAMILY_DITTO -static const union AnimCmd sAnim_Ditto_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_DITTO - -#if P_FAMILY_EEVEE -static const union AnimCmd sAnim_Eevee_1[] = -{ - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vaporeon_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Jolteon_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Flareon_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Espeon_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Umbreon_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_2_CROSS_EVOS - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Leafeon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Glaceon_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -#if P_GEN_6_CROSS_EVOS -static const union AnimCmd sAnim_Sylveon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_GEN_6_CROSS_EVOS -#endif //P_FAMILY_EEVEE - -#if P_FAMILY_PORYGON -static const union AnimCmd sAnim_Porygon_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_2_CROSS_EVOS -static const union AnimCmd sAnim_Porygon2_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Porygon_Z_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_PORYGON - -#if P_FAMILY_OMANYTE -static const union AnimCmd sAnim_Omanyte_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Omastar_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_OMANYTE - -#if P_FAMILY_KABUTO -static const union AnimCmd sAnim_Kabuto_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kabutops_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_KABUTO - -#if P_FAMILY_AERODACTYL -static const union AnimCmd sAnim_Aerodactyl_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; -#endif //P_FAMILY_AERODACTYL - -#if P_FAMILY_SNORLAX -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Munchlax_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Snorlax_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SNORLAX - -#if P_FAMILY_ARTICUNO -static const union AnimCmd sAnim_Articuno_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_ARTICUNO - -#if P_FAMILY_ZAPDOS -static const union AnimCmd sAnim_Zapdos_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_ZAPDOS - -#if P_FAMILY_MOLTRES -static const union AnimCmd sAnim_Moltres_1[] = -{ - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; -#endif //P_FAMILY_MOLTRES - -#if P_FAMILY_DRATINI -static const union AnimCmd sAnim_Dratini_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dragonair_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dragonite_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DRATINI - -#if P_FAMILY_MEWTWO -static const union AnimCmd sAnim_Mewtwo_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_MEWTWO - -#if P_FAMILY_MEW -static const union AnimCmd sAnim_Mew_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MEW - -#if P_FAMILY_CHIKORITA -static const union AnimCmd sAnim_Chikorita_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Bayleef_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Meganium_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHIKORITA - -#if P_FAMILY_CYNDAQUIL -static const union AnimCmd sAnim_Cyndaquil_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Quilava_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Typhlosion_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_CYNDAQUIL - -#if P_FAMILY_TOTODILE -static const union AnimCmd sAnim_Totodile_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Croconaw_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Feraligatr_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; -#endif //P_FAMILY_TOTODILE - -#if P_FAMILY_SENTRET -static const union AnimCmd sAnim_Sentret_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Furret_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_SENTRET - -#if P_FAMILY_HOOTHOOT -static const union AnimCmd sAnim_Hoothoot_1[] = -{ - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Noctowl_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_HOOTHOOT - -#if P_FAMILY_LEDYBA -static const union AnimCmd sAnim_Ledyba_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ledian_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; -#endif //P_FAMILY_LEDYBA - -#if P_FAMILY_SPINARAK -static const union AnimCmd sAnim_Spinarak_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ariados_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPINARAK - -#if P_FAMILY_CHINCHOU -static const union AnimCmd sAnim_Chinchou_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lanturn_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHINCHOU - -#if P_FAMILY_TOGEPI -static const union AnimCmd sAnim_Togepi_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Togetic_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Togekiss_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_TOGEPI - -#if P_FAMILY_NATU -static const union AnimCmd sAnim_Natu_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Xatu_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_NATU - -#if P_FAMILY_MAREEP -static const union AnimCmd sAnim_Mareep_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Flaaffy_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ampharos_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MAREEP - -#if P_FAMILY_MARILL -#if P_GEN_3_CROSS_EVOS -static const union AnimCmd sAnim_Azurill_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_END, -}; -#endif //P_GEN_3_CROSS_EVOS - -static const union AnimCmd sAnim_Marill_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Azumarill_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_MARILL - -#if P_FAMILY_SUDOWOODO -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Bonsly_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Sudowoodo_1[] = -{ - 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_SUDOWOODO - -#if P_FAMILY_HOPPIP -static const union AnimCmd sAnim_Hoppip_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Skiploom_1[] = -{ - 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 sAnim_Jumpluff_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_HOPPIP - -#if P_FAMILY_AIPOM -static const union AnimCmd sAnim_Aipom_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Ambipom_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_AIPOM - -#if P_FAMILY_SUNKERN -static const union AnimCmd sAnim_Sunkern_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Sunflora_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SUNKERN - -#if P_FAMILY_YANMA -static const union AnimCmd sAnim_Yanma_1[] = -{ - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Yanmega_1[] = -{ - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_YANMA - -#if P_FAMILY_WOOPER -static const union AnimCmd sAnim_Wooper_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Quagsire_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_WOOPER - -#if P_FAMILY_MURKROW -static const union AnimCmd sAnim_Murkrow_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Honchkrow_1[] = -{ - ANIMCMD_FRAME(0, 21), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MURKROW - -#if P_FAMILY_MISDREAVUS -static const union AnimCmd sAnim_Misdreavus_1[] = -{ - ANIMCMD_FRAME(1, 10), - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Mismagius_1[] = -{ - ANIMCMD_FRAME(1, 10), - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MISDREAVUS - -#if P_FAMILY_WOBBUFFET -#if P_GEN_3_CROSS_EVOS -static const union AnimCmd sAnim_Wynaut_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_GEN_3_CROSS_EVOS - -static const union AnimCmd sAnim_Wobbuffet_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_WOBBUFFET - -#if P_FAMILY_GIRAFARIG -static const union AnimCmd sAnim_Girafarig_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_GIRAFARIG - -#if P_FAMILY_PINECO -static const union AnimCmd sAnim_Pineco_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Forretress_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PINECO - -#if P_FAMILY_DUNSPARCE -static const union AnimCmd sAnim_Dunsparce_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DUNSPARCE - -#if P_FAMILY_GLIGAR -static const union AnimCmd sAnim_Gligar_1[] = -{ - ANIMCMD_FRAME(1, 17), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Gliscor_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_GLIGAR - -#if P_FAMILY_SNUBBULL -static const union AnimCmd sAnim_Snubbull_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Granbull_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_SNUBBULL - -#if P_FAMILY_QWILFISH -static const union AnimCmd sAnim_Qwilfish_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_QWILFISH - -#if P_FAMILY_SHUCKLE -static const union AnimCmd sAnim_Shuckle_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHUCKLE - -#if P_FAMILY_HERACROSS -static const union AnimCmd sAnim_Heracross_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_HERACROSS - -#if P_FAMILY_SNEASEL -static const union AnimCmd sAnim_Sneasel_1[] = -{ - 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, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Weavile_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SNEASEL - -#if P_FAMILY_TEDDIURSA -static const union AnimCmd sAnim_Teddiursa_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ursaring_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_TEDDIURSA - -#if P_FAMILY_SLUGMA -static const union AnimCmd sAnim_Slugma_1[] = -{ - 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 sAnim_Magcargo_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SLUGMA - -#if P_FAMILY_SWINUB -static const union AnimCmd sAnim_Swinub_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Piloswine_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Mamoswine_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SWINUB - -#if P_FAMILY_CORSOLA -static const union AnimCmd sAnim_Corsola_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CORSOLA - -#if P_FAMILY_REMORAID -static const union AnimCmd sAnim_Remoraid_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Octillery_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_REMORAID - -#if P_FAMILY_DELIBIRD -static const union AnimCmd sAnim_Delibird_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_DELIBIRD - -#if P_FAMILY_MANTINE -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Mantyke_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Mantine_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; -#endif //P_FAMILY_MANTINE - -#if P_FAMILY_SKARMORY -static const union AnimCmd sAnim_Skarmory_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_SKARMORY - -#if P_FAMILY_HOUNDOUR -static const union AnimCmd sAnim_Houndour_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Houndoom_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_HOUNDOUR - -#if P_FAMILY_PHANPY -static const union AnimCmd sAnim_Phanpy_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Donphan_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PHANPY - -#if P_FAMILY_STANTLER -static const union AnimCmd sAnim_Stantler_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_STANTLER - -#if P_FAMILY_SMEARGLE -static const union AnimCmd sAnim_Smeargle_1[] = -{ - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SMEARGLE - -#if P_FAMILY_MILTANK -static const union AnimCmd sAnim_Miltank_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_MILTANK - -#if P_FAMILY_RAIKOU -static const union AnimCmd sAnim_Raikou_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_RAIKOU - -#if P_FAMILY_ENTEI -static const union AnimCmd sAnim_Entei_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_ENTEI - -#if P_FAMILY_SUICUNE -static const union AnimCmd sAnim_Suicune_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_SUICUNE - -#if P_FAMILY_LARVITAR -static const union AnimCmd sAnim_Larvitar_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pupitar_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Tyranitar_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_LARVITAR - -#if P_FAMILY_LUGIA -static const union AnimCmd sAnim_Lugia_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_LUGIA - -#if P_FAMILY_HO_OH -static const union AnimCmd sAnim_HoOh_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_HO_OH - -#if P_FAMILY_CELEBI -static const union AnimCmd sAnim_Celebi_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_CELEBI - -#if P_FAMILY_TREECKO -static const union AnimCmd sAnim_Treecko_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Grovyle_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Sceptile_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 26), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TREECKO - -#if P_FAMILY_TORCHIC -static const union AnimCmd sAnim_Torchic_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Combusken_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 12), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Blaziken_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; -#endif //P_FAMILY_TORCHIC - -#if P_FAMILY_MUDKIP -static const union AnimCmd sAnim_Mudkip_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 13), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Marshtomp_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Swampert_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; -#endif //P_FAMILY_MUDKIP - -#if P_FAMILY_POOCHYENA -static const union AnimCmd sAnim_Poochyena_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Mightyena_1[] = -{ - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; -#endif //P_FAMILY_POOCHYENA - -#if P_FAMILY_ZIGZAGOON -static const union AnimCmd sAnim_Zigzagoon_1[] = -{ - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Linoone_1[] = -{ - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_END, -}; -#endif //P_FAMILY_ZIGZAGOON - -#if P_FAMILY_WURMPLE -static const union AnimCmd sAnim_Wurmple_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Silcoon_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Beautifly_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cascoon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dustox_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 1), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_WURMPLE - -#if P_FAMILY_LOTAD -static const union AnimCmd sAnim_Lotad_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 55), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lombre_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ludicolo_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; -#endif //P_FAMILY_LOTAD - -#if P_FAMILY_SEEDOT -static const union AnimCmd sAnim_Seedot_1[] = -{ - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Nuzleaf_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Shiftry_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SEEDOT - -#if P_FAMILY_TAILLOW -static const union AnimCmd sAnim_Taillow_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Swellow_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAILLOW - -#if P_FAMILY_WINGULL -static const union AnimCmd sAnim_Wingull_1[] = -{ - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 13), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pelipper_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - 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_WINGULL - -#if P_FAMILY_RALTS -static const union AnimCmd sAnim_Ralts_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kirlia_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 39), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gardevoir_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Gallade_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_RALTS - -#if P_FAMILY_SURSKIT -static const union AnimCmd sAnim_Surskit_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Masquerain_1[] = -{ - 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_SURSKIT - -#if P_FAMILY_SHROOMISH -static const union AnimCmd sAnim_Shroomish_1[] = -{ - 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), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Breloom_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHROOMISH - -#if P_FAMILY_SLAKOTH -static const union AnimCmd sAnim_Slakoth_1[] = -{ - ANIMCMD_FRAME(0, 13), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vigoroth_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Slaking_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; -#endif //P_FAMILY_SLAKOTH - -#if P_FAMILY_NINCADA -static const union AnimCmd sAnim_Nincada_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ninjask_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, 33), - 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, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Shedinja_1[] = -{ - ANIMCMD_FRAME(0, 33), - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 33), - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_NINCADA - -#if P_FAMILY_WHISMUR -static const union AnimCmd sAnim_Whismur_1[] = -{ - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 33), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Loudred_1[] = -{ - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 33), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Exploud_1[] = -{ - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 9), - ANIMCMD_END, -}; -#endif //P_FAMILY_WHISMUR - -#if P_FAMILY_MAKUHITA -static const union AnimCmd sAnim_Makuhita_1[] = -{ - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hariyama_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_MAKUHITA - -#if P_FAMILY_NOSEPASS -static const union AnimCmd sAnim_Nosepass_1[] = -{ - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Probopass_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_NOSEPASS - -#if P_FAMILY_SKITTY -static const union AnimCmd sAnim_Skitty_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 9), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Delcatty_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 46), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SKITTY - -#if P_FAMILY_SABLEYE -static const union AnimCmd sAnim_Sableye_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SABLEYE - -#if P_FAMILY_MAWILE -static const union AnimCmd sAnim_Mawile_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_MAWILE - -#if P_FAMILY_ARON -static const union AnimCmd sAnim_Aron_1[] = -{ - ANIMCMD_FRAME(0, 33), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 33), - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lairon_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 29), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 29), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Aggron_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_ARON - -#if P_FAMILY_MEDITITE -static const union AnimCmd sAnim_Meditite_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Medicham_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_MEDITITE - -#if P_FAMILY_ELECTRIKE -static const union AnimCmd sAnim_Electrike_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Manectric_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 33), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; -#endif //P_FAMILY_ELECTRIKE - -#if P_FAMILY_PLUSLE -static const union AnimCmd sAnim_Plusle_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PLUSLE - -#if P_FAMILY_MINUN -static const union AnimCmd sAnim_Minun_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MINUN - -#if P_FAMILY_VOLBEAT_ILLUMISE -static const union AnimCmd sAnim_Volbeat_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 11), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Illumise_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_VOLBEAT_ILLUMISE - -#if P_FAMILY_ROSELIA -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Budew_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Roselia_1[] = -{ - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Roserade_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_ROSELIA - -#if P_FAMILY_GULPIN -static const union AnimCmd sAnim_Gulpin_1[] = -{ - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 14), - ANIMCMD_FRAME(1, 14), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Swalot_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_GULPIN - -#if P_FAMILY_CARVANHA -static const union AnimCmd sAnim_Carvanha_1[] = -{ - 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), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Sharpedo_1[] = -{ - 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), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; -#endif //P_FAMILY_CARVANHA - -#if P_FAMILY_WAILMER -static const union AnimCmd sAnim_Wailmer_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Wailord_1[] = -{ - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 48), - ANIMCMD_FRAME(0, 33), - ANIMCMD_END, -}; -#endif //P_FAMILY_WAILMER - -#if P_FAMILY_NUMEL -static const union AnimCmd sAnim_Numel_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 40), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Camerupt_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_NUMEL - -#if P_FAMILY_TORKOAL -static const union AnimCmd sAnim_Torkoal_1[] = -{ - 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_TORKOAL - -#if P_FAMILY_SPOINK -static const union AnimCmd sAnim_Spoink_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 10), - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Grumpig_1[] = -{ - 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_SPOINK - -#if P_FAMILY_SPINDA -static const union AnimCmd sAnim_Spinda_1[] = -{ - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 17), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 13), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPINDA - -#if P_FAMILY_TRAPINCH -static const union AnimCmd sAnim_Trapinch_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vibrava_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Flygon_1[] = -{ - 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_TRAPINCH - -#if P_FAMILY_CACNEA -static const union AnimCmd sAnim_Cacnea_1[] = -{ - 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), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cacturne_1[] = -{ - 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_CACNEA - -#if P_FAMILY_SWABLU -static const union AnimCmd sAnim_Swablu_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 10), - 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 sAnim_Altaria_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SWABLU - -#if P_FAMILY_ZANGOOSE -static const union AnimCmd sAnim_Zangoose_1[] = -{ - 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_ZANGOOSE - -#if P_FAMILY_SEVIPER -static const union AnimCmd sAnim_Seviper_1[] = -{ - 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_SEVIPER - -#if P_FAMILY_LUNATONE -static const union AnimCmd sAnim_Lunatone_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_LUNATONE - -#if P_FAMILY_SOLROCK -static const union AnimCmd sAnim_Solrock_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SOLROCK - -#if P_FAMILY_BARBOACH -static const union AnimCmd sAnim_Barboach_1[] = -{ - 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), - 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, -}; - -static const union AnimCmd sAnim_Whiscash_1[] = -{ - 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), - 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_BARBOACH - -#if P_FAMILY_CORPHISH -static const union AnimCmd sAnim_Corphish_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Crawdaunt_1[] = -{ - 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_CORPHISH - -#if P_FAMILY_BALTOY -static const union AnimCmd sAnim_Baltoy_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Claydol_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_BALTOY - -#if P_FAMILY_LILEEP -static const union AnimCmd sAnim_Lileep_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cradily_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_LILEEP - -#if P_FAMILY_ANORITH -static const union AnimCmd sAnim_Anorith_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Armaldo_1[] = -{ - 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_ANORITH - -#if P_FAMILY_FEEBAS -static const union AnimCmd sAnim_Feebas_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Milotic_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_FEEBAS - -#if P_FAMILY_CASTFORM -static const union AnimCmd sAnim_CastformNormal_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 24), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 24), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_CastformSunny_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_CastformRainy_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_CastformSnowy_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 29), - ANIMCMD_FRAME(0, 12), - ANIMCMD_END, -}; -#endif //P_FAMILY_CASTFORM - -#if P_FAMILY_KECLEON -static const union AnimCmd sAnim_Kecleon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_KECLEON - -#if P_FAMILY_SHUPPET -static const union AnimCmd sAnim_Shuppet_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Banette_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHUPPET - -#if P_FAMILY_DUSKULL -static const union AnimCmd sAnim_Duskull_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dusclops_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Dusknoir_1[] = -{ - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_DUSKULL - -#if P_FAMILY_TROPIUS -static const union AnimCmd sAnim_Tropius_1[] = -{ - 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_TROPIUS - -#if P_FAMILY_CHIMECHO -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Chingling_1[] = -{ - 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, -}; -#endif //P_GEN_4_CROSS_EVOS - -static const union AnimCmd sAnim_Chimecho_1[] = -{ - 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), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHIMECHO - -#if P_FAMILY_ABSOL -static const union AnimCmd sAnim_Absol_1[] = -{ - 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_ABSOL - -#if P_FAMILY_SNORUNT -static const union AnimCmd sAnim_Snorunt_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Glalie_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -#if P_GEN_4_CROSS_EVOS -static const union AnimCmd sAnim_Froslass_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SNORUNT - -#if P_FAMILY_SPHEAL -static const union AnimCmd sAnim_Spheal_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 43), - ANIMCMD_FRAME(1, 60), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Sealeo_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Walrein_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPHEAL - -#if P_FAMILY_CLAMPERL -static const union AnimCmd sAnim_Clamperl_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Huntail_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gorebyss_1[] = -{ - 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_CLAMPERL - -#if P_FAMILY_RELICANTH -static const union AnimCmd sAnim_Relicanth_1[] = -{ - 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_RELICANTH - -#if P_FAMILY_LUVDISC -static const union AnimCmd sAnim_Luvdisc_1[] = -{ - 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_LUVDISC - -#if P_FAMILY_BAGON -static const union AnimCmd sAnim_Bagon_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Shelgon_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Salamence_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_BAGON - -#if P_FAMILY_BELDUM -static const union AnimCmd sAnim_Beldum_1[] = -{ - 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 sAnim_Metang_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Metagross_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; -#endif //P_FAMILY_BELDUM - -#if P_FAMILY_REGIROCK -static const union AnimCmd sAnim_Regirock_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_REGIROCK - -#if P_FAMILY_REGICE -static const union AnimCmd sAnim_Regice_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_REGICE - -#if P_FAMILY_REGISTEEL -static const union AnimCmd sAnim_Registeel_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_REGISTEEL - -#if P_FAMILY_LATIAS -static const union AnimCmd sAnim_Latias_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_LATIAS - -#if P_FAMILY_LATIOS -static const union AnimCmd sAnim_Latios_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_LATIOS - -#if P_FAMILY_KYOGRE -static const union AnimCmd sAnim_Kyogre_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_KYOGRE - -#if P_FAMILY_GROUDON -static const union AnimCmd sAnim_Groudon_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GROUDON - -#if P_FAMILY_RAYQUAZA -static const union AnimCmd sAnim_Rayquaza_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_END, -}; -#endif //P_FAMILY_RAYQUAZA - -#if P_FAMILY_JIRACHI -static const union AnimCmd sAnim_Jirachi_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_JIRACHI - -#if P_FAMILY_DEOXYS -static const union AnimCmd sAnim_DeoxysNormal_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DeoxysAttack_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DeoxysDefense_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DeoxysSpeed_1[] = -{ - ANIMCMD_FRAME(0, 16), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 26), - ANIMCMD_FRAME(1, 16), - ANIMCMD_FRAME(0, 16), - ANIMCMD_END, -}; -#endif //P_FAMILY_DEOXYS - -#if P_FAMILY_TURTWIG -static const union AnimCmd sAnim_Turtwig_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Grotle_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Torterra_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TURTWIG - -#if P_FAMILY_CHIMCHAR -static const union AnimCmd sAnim_Chimchar_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Monferno_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Infernape_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHIMCHAR - -#if P_FAMILY_PIPLUP -static const union AnimCmd sAnim_Piplup_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Prinplup_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Empoleon_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PIPLUP - -#if P_FAMILY_STARLY -static const union AnimCmd sAnim_Starly_1[] = -{ - 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 sAnim_Staravia_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Staraptor_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_STARLY - -#if P_FAMILY_BIDOOF -static const union AnimCmd sAnim_Bidoof_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Bibarel_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_BIDOOF - -#if P_FAMILY_KRICKETOT -static const union AnimCmd sAnim_Kricketot_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kricketune_1[] = -{ - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; -#endif //P_FAMILY_KRICKETOT - -#if P_FAMILY_SHINX -static const union AnimCmd sAnim_Shinx_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Luxio_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Luxray_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHINX - -#if P_FAMILY_CRANIDOS -static const union AnimCmd sAnim_Cranidos_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Rampardos_1[] = -{ - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_CRANIDOS - -#if P_FAMILY_SHIELDON -static const union AnimCmd sAnim_Shieldon_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Bastiodon_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHIELDON - -#if P_FAMILY_BURMY -static const union AnimCmd sAnim_Burmy_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Wormadam_1[] = -{ - 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 sAnim_Mothim_1[] = -{ - 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_COMBEE -static const union AnimCmd sAnim_Combee_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vespiquen_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_COMBEE - -#if P_FAMILY_PACHIRISU -static const union AnimCmd sAnim_Pachirisu_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_PACHIRISU - -#if P_FAMILY_BUIZEL -static const union AnimCmd sAnim_Buizel_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Floatzel_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_BUIZEL - -#if P_FAMILY_CHERUBI -static const union AnimCmd sAnim_Cherubi_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_CherrimOvercast_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_CherrimSunshine_1[] = -{ - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 12), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHERUBI - -#if P_FAMILY_SHELLOS -static const union AnimCmd sAnim_Shellos_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gastrodon_1[] = -{ - 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_DRIFLOON -static const union AnimCmd sAnim_Drifloon_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Drifblim_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_DRIFLOON - -#if P_FAMILY_BUNEARY -static const union AnimCmd sAnim_Buneary_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lopunny_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_BUNEARY - -#if P_FAMILY_GLAMEOW -static const union AnimCmd sAnim_Glameow_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Purugly_1[] = -{ - 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_GLAMEOW - -#if P_FAMILY_STUNKY -static const union AnimCmd sAnim_Stunky_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Skuntank_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_STUNKY - -#if P_FAMILY_BRONZOR -static const union AnimCmd sAnim_Bronzor_1[] = -{ - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Bronzong_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_BRONZOR - -#if P_FAMILY_CHATOT -static const union AnimCmd sAnim_Chatot_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 20), - 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_CHATOT - -#if P_FAMILY_SPIRITOMB -static const union AnimCmd sAnim_Spiritomb_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPIRITOMB - -#if P_FAMILY_GIBLE -static const union AnimCmd sAnim_Gible_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gabite_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Garchomp_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_GIBLE - -#if P_FAMILY_RIOLU -static const union AnimCmd sAnim_Riolu_1[] = -{ - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 28), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lucario_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_RIOLU - -#if P_FAMILY_HIPPOPOTAS -static const union AnimCmd sAnim_Hippopotas_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hippowdon_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_HIPPOPOTAS - -#if P_FAMILY_SKORUPI -static const union AnimCmd sAnim_Skorupi_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Drapion_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_SKORUPI - -#if P_FAMILY_CROAGUNK -static const union AnimCmd sAnim_Croagunk_1[] = -{ - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 28), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Toxicroak_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CROAGUNK - -#if P_FAMILY_CARNIVINE -static const union AnimCmd sAnim_Carnivine_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - 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_CARNIVINE - -#if P_FAMILY_FINNEON -static const union AnimCmd sAnim_Finneon_1[] = -{ - 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 sAnim_Lumineon_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_FINNEON - -#if P_FAMILY_SNOVER -static const union AnimCmd sAnim_Snover_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Abomasnow_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_SNOVER - -#if P_FAMILY_ROTOM -static const union AnimCmd sAnim_Rotom_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_RotomHeat_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_RotomWash_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_RotomFrost_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_RotomFan_1[] = -{ - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 3), - ANIMCMD_FRAME(0, 3), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_RotomMow_1[] = -{ - 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_ROTOM - -#if P_FAMILY_UXIE -static const union AnimCmd sAnim_Uxie_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_UXIE - -#if P_FAMILY_MESPRIT -static const union AnimCmd sAnim_Mesprit_1[] = -{ - 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, -}; -#endif //P_FAMILY_MESPRIT - -#if P_FAMILY_AZELF -static const union AnimCmd sAnim_Azelf_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_AZELF - -#if P_FAMILY_DIALGA -static const union AnimCmd sAnim_Dialga_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_DIALGA - -#if P_FAMILY_PALKIA -static const union AnimCmd sAnim_Palkia_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PALKIA - -#if P_FAMILY_HEATRAN -static const union AnimCmd sAnim_Heatran_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_HEATRAN - -#if P_FAMILY_REGIGIGAS -static const union AnimCmd sAnim_Regigigas_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_REGIGIGAS - -#if P_FAMILY_GIRATINA -static const union AnimCmd sAnim_GiratinaAltered_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_GiratinaOrigin_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GIRATINA - -#if P_FAMILY_CRESSELIA -static const union AnimCmd sAnim_Cresselia_1[] = -{ - 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_CRESSELIA - -#if P_FAMILY_MANAPHY -static const union AnimCmd sAnim_Phione_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Manaphy_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MANAPHY - -#if P_FAMILY_DARKRAI -static const union AnimCmd sAnim_Darkrai_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DARKRAI - -#if P_FAMILY_SHAYMIN -static const union AnimCmd sAnim_ShayminLand_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ShayminSky_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHAYMIN - -#if P_FAMILY_ARCEUS -static const union AnimCmd sAnim_Arceus_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_ARCEUS - -#if P_FAMILY_VICTINI -static const union AnimCmd sAnim_Victini_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 46), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_VICTINI - -#if P_FAMILY_SNIVY -static const union AnimCmd sAnim_Snivy_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Servine_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Serperior_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SNIVY - -#if P_FAMILY_TEPIG -static const union AnimCmd sAnim_Tepig_1[] = -{ - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pignite_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Emboar_1[] = -{ - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 4), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; -#endif //P_FAMILY_TEPIG - -#if P_FAMILY_OSHAWOTT -static const union AnimCmd sAnim_Oshawott_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dewott_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Samurott_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_OSHAWOTT - -#if P_FAMILY_PATRAT -static const union AnimCmd sAnim_Patrat_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Watchog_1[] = -{ - 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_PATRAT - -#if P_FAMILY_LILLIPUP -static const union AnimCmd sAnim_Lillipup_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Herdier_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Stoutland_1[] = -{ - 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_LILLIPUP - -#if P_FAMILY_PURRLOIN -static const union AnimCmd sAnim_Purrloin_1[] = -{ - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(1, 54), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Liepard_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PURRLOIN - -#if P_FAMILY_PANSAGE -static const union AnimCmd sAnim_Pansage_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 13), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Simisage_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PANSAGE - -#if P_FAMILY_PANSEAR -static const union AnimCmd sAnim_Pansear_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Simisear_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PANSEAR - -#if P_FAMILY_PANPOUR -static const union AnimCmd sAnim_Panpour_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Simipour_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PANPOUR - -#if P_FAMILY_MUNNA -static const union AnimCmd sAnim_Munna_1[] = -{ - 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 sAnim_Musharna_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_MUNNA - -#if P_FAMILY_PIDOVE -static const union AnimCmd sAnim_Pidove_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 46), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Tranquill_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Unfezant_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_PIDOVE - -#if P_FAMILY_BLITZLE -static const union AnimCmd sAnim_Blitzle_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Zebstrika_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_BLITZLE - -#if P_FAMILY_ROGGENROLA -static const union AnimCmd sAnim_Roggenrola_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Boldore_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Gigalith_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_ROGGENROLA - -#if P_FAMILY_WOOBAT -static const union AnimCmd sAnim_Woobat_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Swoobat_1[] = -{ - 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_WOOBAT - -#if P_FAMILY_DRILBUR -static const union AnimCmd sAnim_Drilbur_1[] = -{ - 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 sAnim_Excadrill_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DRILBUR - -#if P_FAMILY_AUDINO -static const union AnimCmd sAnim_Audino_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_AUDINO - -#if P_FAMILY_TIMBURR -static const union AnimCmd sAnim_Timburr_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gurdurr_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Conkeldurr_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TIMBURR - -#if P_FAMILY_TYMPOLE -static const union AnimCmd sAnim_Tympole_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Palpitoad_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 13), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Seismitoad_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_TYMPOLE - -#if P_FAMILY_THROH -static const union AnimCmd sAnim_Throh_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_THROH - -#if P_FAMILY_SAWK -static const union AnimCmd sAnim_Sawk_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SAWK - -#if P_FAMILY_SEWADDLE -static const union AnimCmd sAnim_Sewaddle_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Swadloon_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Leavanny_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_SEWADDLE - -#if P_FAMILY_VENIPEDE -static const union AnimCmd sAnim_Venipede_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Whirlipede_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Scolipede_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_VENIPEDE - -#if P_FAMILY_COTTONEE -static const union AnimCmd sAnim_Cottonee_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Whimsicott_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_COTTONEE - -#if P_FAMILY_PETILIL -static const union AnimCmd sAnim_Petilil_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lilligant_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_PETILIL - -#if P_FAMILY_BASCULIN -static const union AnimCmd sAnim_Basculin_1[] = -{ - 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_SANDILE -static const union AnimCmd sAnim_Sandile_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Krokorok_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Krookodile_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SANDILE - -#if P_FAMILY_DARUMAKA -static const union AnimCmd sAnim_Darumaka_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DarmanitanStandard_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_DarmanitanZen_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_DARUMAKA - -#if P_FAMILY_MARACTUS -static const union AnimCmd sAnim_Maractus_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_MARACTUS - -#if P_FAMILY_DWEBBLE -static const union AnimCmd sAnim_Dwebble_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 50), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Crustle_1[] = -{ - 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_DWEBBLE - -#if P_FAMILY_SCRAGGY -static const union AnimCmd sAnim_Scraggy_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Scrafty_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SCRAGGY - -#if P_FAMILY_SIGILYPH -static const union AnimCmd sAnim_Sigilyph_1[] = -{ - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 7), - ANIMCMD_END, -}; -#endif //P_FAMILY_SIGILYPH - -#if P_FAMILY_YAMASK -static const union AnimCmd sAnim_Yamask_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cofagrigus_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_YAMASK - -#if P_FAMILY_TIRTOUGA -static const union AnimCmd sAnim_Tirtouga_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Carracosta_1[] = -{ - ANIMCMD_FRAME(1, 35), - 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), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TIRTOUGA - -#if P_FAMILY_ARCHEN -static const union AnimCmd sAnim_Archen_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 46), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Archeops_1[] = -{ - 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, -}; -#endif //P_FAMILY_ARCHEN - -#if P_FAMILY_TRUBBISH -static const union AnimCmd sAnim_Trubbish_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Garbodor_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TRUBBISH - -#if P_FAMILY_ZORUA -static const union AnimCmd sAnim_Zorua_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Zoroark_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_ZORUA - -#if P_FAMILY_MINCCINO -static const union AnimCmd sAnim_Minccino_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Cinccino_1[] = -{ - 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_MINCCINO - -#if P_FAMILY_GOTHITA -static const union AnimCmd sAnim_Gothita_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gothorita_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gothitelle_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GOTHITA - -#if P_FAMILY_SOLOSIS -static const union AnimCmd sAnim_Solosis_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Duosion_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Reuniclus_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SOLOSIS - -#if P_FAMILY_DUCKLETT -static const union AnimCmd sAnim_Ducklett_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Swanna_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_DUCKLETT - -#if P_FAMILY_VANILLITE -static const union AnimCmd sAnim_Vanillite_1[] = -{ - 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 sAnim_Vanillish_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vanilluxe_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_VANILLITE - -#if P_FAMILY_DEERLING -static const union AnimCmd sAnim_Deerling_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Sawsbuck_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DEERLING - -#if P_FAMILY_EMOLGA -static const union AnimCmd sAnim_Emolga_1[] = -{ - ANIMCMD_FRAME(0, 21), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_EMOLGA - -#if P_FAMILY_KARRABLAST -static const union AnimCmd sAnim_Karrablast_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Escavalier_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_KARRABLAST - -#if P_FAMILY_FOONGUS -static const union AnimCmd sAnim_Foongus_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Amoonguss_1[] = -{ - 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_FOONGUS - -#if P_FAMILY_FRILLISH -static const union AnimCmd sAnim_Frillish_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Jellicent_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; -#endif //P_FAMILY_FRILLISH - -#if P_FAMILY_ALOMOMOLA -static const union AnimCmd sAnim_Alomomola_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_ALOMOMOLA - -#if P_FAMILY_JOLTIK -static const union AnimCmd sAnim_Joltik_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Galvantula_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_JOLTIK - -#if P_FAMILY_FERROSEED -static const union AnimCmd sAnim_Ferroseed_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ferrothorn_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_FERROSEED - -#if P_FAMILY_KLINK -static const union AnimCmd sAnim_Klink_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Klang_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Klinklang_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_KLINK - -#if P_FAMILY_TYNAMO -static const union AnimCmd sAnim_Tynamo_1[] = -{ - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Eelektrik_1[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Eelektross_1[] = -{ - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 27), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_TYNAMO - -#if P_FAMILY_ELGYEM -static const union AnimCmd sAnim_Elgyem_1[] = -{ - 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 sAnim_Beheeyem_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_ELGYEM - -#if P_FAMILY_LITWICK -static const union AnimCmd sAnim_Litwick_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Lampent_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Chandelure_1[] = -{ - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_LITWICK - -#if P_FAMILY_AXEW -static const union AnimCmd sAnim_Axew_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Fraxure_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Haxorus_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_AXEW - -#if P_FAMILY_CUBCHOO -static const union AnimCmd sAnim_Cubchoo_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Beartic_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CUBCHOO - -#if P_FAMILY_CRYOGONAL -static const union AnimCmd sAnim_Cryogonal_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 48), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CRYOGONAL - -#if P_FAMILY_SHELMET -static const union AnimCmd sAnim_Shelmet_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Accelgor_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_SHELMET - -#if P_FAMILY_STUNFISK -static const union AnimCmd sAnim_Stunfisk_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_STUNFISK - -#if P_FAMILY_MIENFOO -static const union AnimCmd sAnim_Mienfoo_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Mienshao_1[] = -{ - 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_MIENFOO - -#if P_FAMILY_DRUDDIGON -static const union AnimCmd sAnim_Druddigon_1[] = -{ - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 22), - ANIMCMD_FRAME(1, 22), - ANIMCMD_FRAME(0, 11), - ANIMCMD_END, -}; -#endif //P_FAMILY_DRUDDIGON - -#if P_FAMILY_GOLETT -static const union AnimCmd sAnim_Golett_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Golurk_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GOLETT - -#if P_FAMILY_PAWNIARD -static const union AnimCmd sAnim_Pawniard_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Bisharp_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_PAWNIARD - -#if P_FAMILY_BOUFFALANT -static const union AnimCmd sAnim_Bouffalant_1[] = -{ - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_BOUFFALANT - -#if P_FAMILY_RUFFLET -static const union AnimCmd sAnim_Rufflet_1[] = -{ - 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 sAnim_Braviary_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_RUFFLET - -#if P_FAMILY_VULLABY -static const union AnimCmd sAnim_Vullaby_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Mandibuzz_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_VULLABY - -#if P_FAMILY_HEATMOR -static const union AnimCmd sAnim_Heatmor_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_HEATMOR - -#if P_FAMILY_DURANT -static const union AnimCmd sAnim_Durant_1[] = -{ - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; -#endif //P_FAMILY_DURANT - -#if P_FAMILY_DEINO -static const union AnimCmd sAnim_Deino_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Zweilous_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hydreigon_1[] = -{ - 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, -}; -#endif //P_FAMILY_DEINO - -#if P_FAMILY_LARVESTA -static const union AnimCmd sAnim_Larvesta_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Volcarona_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; -#endif //P_FAMILY_LARVESTA - -#if P_FAMILY_COBALION -static const union AnimCmd sAnim_Cobalion_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_COBALION - -#if P_FAMILY_TERRAKION -static const union AnimCmd sAnim_Terrakion_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_TERRAKION - -#if P_FAMILY_VIRIZION -static const union AnimCmd sAnim_Virizion_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_VIRIZION - -#if P_FAMILY_TORNADUS -static const union AnimCmd sAnim_TornadusIncarnate_1[] = -{ - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_TornadusTherian_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_TORNADUS - -#if P_FAMILY_THUNDURUS -static const union AnimCmd sAnim_ThundurusIncarnate_1[] = -{ - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ThundurusTherian_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 5), - ANIMCMD_FRAME(0, 20), - 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_THUNDURUS - -#if P_FAMILY_RESHIRAM -static const union AnimCmd sAnim_Reshiram_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_RESHIRAM - -#if P_FAMILY_ZEKROM -static const union AnimCmd sAnim_Zekrom_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_ZEKROM - -#if P_FAMILY_LANDORUS -static const union AnimCmd sAnim_LandorusIncarnate_1[] = -{ - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_FRAME(1, 2), - ANIMCMD_FRAME(0, 2), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LandorusTherian_1[] = -{ - 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_LANDORUS - -#if P_FAMILY_KYUREM -static const union AnimCmd sAnim_Kyurem_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -#if P_FUSION_FORMS -static const union AnimCmd sAnim_KyuremWhite_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FUSION_FORMS - -#if P_FUSION_FORMS -static const union AnimCmd sAnim_KyuremBlack_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FUSION_FORMS -#endif //P_FAMILY_KYUREM - -#if P_FAMILY_KELDEO -static const union AnimCmd sAnim_KeldeoOrdinary_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_KeldeoResolute_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_KELDEO - -#if P_FAMILY_MELOETTA -static const union AnimCmd sAnim_MeloettaAria_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_MeloettaPirouette_1[] = -{ - 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_MELOETTA - -#if P_FAMILY_GENESECT -static const union AnimCmd sAnim_Genesect_1[] = -{ - 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_CHESPIN -static const union AnimCmd sAnim_Chespin_1[] = -{ - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 24), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Quilladin_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Chesnaught_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHESPIN - -#if P_FAMILY_FENNEKIN -static const union AnimCmd sAnim_Fennekin_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Braixen_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Delphox_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_FENNEKIN - -#if P_FAMILY_FROAKIE -static const union AnimCmd sAnim_Froakie_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Frogadier_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Greninja_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_GreninjaAsh_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_FROAKIE - -#if P_FAMILY_BUNNELBY -static const union AnimCmd sAnim_Bunnelby_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Diggersby_1[] = -{ - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_BUNNELBY - -#if P_FAMILY_FLETCHLING -static const union AnimCmd sAnim_Fletchling_1[] = -{ - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 7), - ANIMCMD_FRAME(0, 3), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -static const union AnimCmd sAnim_Fletchinder_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Talonflame_1[] = -{ - ANIMCMD_FRAME(1, 55), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_FLETCHLING - -#if P_FAMILY_SCATTERBUG -static const union AnimCmd sAnim_Scatterbug_1[] = -{ - 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 sAnim_Spewpa_1[] = -{ - 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 sAnim_Vivillon_1[] = -{ - 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_LITLEO -static const union AnimCmd sAnim_Litleo_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pyroar_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_LITLEO - -#if P_FAMILY_FLABEBE -static const union AnimCmd sAnim_Flabebe_1[] = -{ - ANIMCMD_FRAME(1, 27), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 23), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Floette_1[] = -{ - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Florges_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_FLABEBE - -#if P_FAMILY_SKIDDO -static const union AnimCmd sAnim_Skiddo_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Gogoat_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 36), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_SKIDDO - -#if P_FAMILY_PANCHAM -static const union AnimCmd sAnim_Pancham_1[] = -{ - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 8), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Pangoro_1[] = -{ - 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_PANCHAM - -#if P_FAMILY_FURFROU -static const union AnimCmd sAnim_Furfrou_1[] = -{ - 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 sAnim_Espurr_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Meowstic_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_ESPURR - -#if P_FAMILY_HONEDGE -static const union AnimCmd sAnim_Honedge_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Doublade_1[] = -{ - 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 sAnim_AegislashShield_1[] = -{ - 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 sAnim_AegislashBlade_1[] = -{ - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_HONEDGE - -#if P_FAMILY_SPRITZEE -static const union AnimCmd sAnim_Spritzee_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Aromatisse_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_SPRITZEE - -#if P_FAMILY_SWIRLIX -static const union AnimCmd sAnim_Swirlix_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Slurpuff_1[] = -{ - ANIMCMD_FRAME(0, 5), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_SWIRLIX - -#if P_FAMILY_INKAY -static const union AnimCmd sAnim_Inkay_1[] = -{ - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 25), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Malamar_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_INKAY - -#if P_FAMILY_BINACLE -static const union AnimCmd sAnim_Binacle_1[] = -{ - 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, -}; - -static const union AnimCmd sAnim_Barbaracle_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_BINACLE - -#if P_FAMILY_SKRELP -static const union AnimCmd sAnim_Skrelp_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dragalge_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_SKRELP - -#if P_FAMILY_CLAUNCHER -static const union AnimCmd sAnim_Clauncher_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Clawitzer_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_CLAUNCHER - -#if P_FAMILY_HELIOPTILE -static const union AnimCmd sAnim_Helioptile_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Heliolisk_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; -#endif //P_FAMILY_HELIOPTILE - -#if P_FAMILY_TYRUNT -static const union AnimCmd sAnim_Tyrunt_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Tyrantrum_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_TYRUNT - -#if P_FAMILY_AMAURA -static const union AnimCmd sAnim_Amaura_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Aurorus_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_AMAURA - -#if P_FAMILY_HAWLUCHA -static const union AnimCmd sAnim_Hawlucha_1[] = -{ - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_HAWLUCHA - -#if P_FAMILY_DEDENNE -static const union AnimCmd sAnim_Dedenne_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DEDENNE - -#if P_FAMILY_CARBINK -static const union AnimCmd sAnim_Carbink_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_CARBINK - -#if P_FAMILY_GOOMY -static const union AnimCmd sAnim_Goomy_1[] = -{ - ANIMCMD_FRAME(0, 28), - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Sliggoo_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Goodra_1[] = -{ - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 18), - ANIMCMD_FRAME(1, 18), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_GOOMY - -#if P_FAMILY_KLEFKI -static const union AnimCmd sAnim_Klefki_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_KLEFKI - -#if P_FAMILY_PHANTUMP -static const union AnimCmd sAnim_Phantump_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Trevenant_1[] = -{ - 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_PHANTUMP - -#if P_FAMILY_PUMPKABOO -static const union AnimCmd sAnim_Pumpkaboo_1[] = -{ - 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 sAnim_Gourgeist_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_PUMPKABOO - -#if P_FAMILY_BERGMITE -static const union AnimCmd sAnim_Bergmite_1[] = -{ - ANIMCMD_FRAME(0, 11), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Avalugg_1[] = -{ - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_BERGMITE - -#if P_FAMILY_NOIBAT -static const union AnimCmd sAnim_Noibat_1[] = -{ - 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 sAnim_Noivern_1[] = -{ - ANIMCMD_FRAME(1, 32), - ANIMCMD_FRAME(0, 20), - ANIMCMD_END, -}; -#endif //P_FAMILY_NOIBAT - -#if P_FAMILY_XERNEAS -static const union AnimCmd sAnim_Xerneas_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_XERNEAS - -#if P_FAMILY_YVELTAL -static const union AnimCmd sAnim_Yveltal_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_YVELTAL - -#if P_FAMILY_ZYGARDE -static const union AnimCmd sAnim_Zygarde50_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 30), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Zygarde10_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_ZygardeComplete_1[] = -{ - ANIMCMD_FRAME(0, 12), - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 15), - ANIMCMD_END, -}; -#endif //P_FAMILY_ZYGARDE - -#if P_FAMILY_DIANCIE -static const union AnimCmd sAnim_Diancie_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_DIANCIE - -#if P_FAMILY_HOOPA -static const union AnimCmd sAnim_HoopaConfined_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_HoopaUnbound_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_HOOPA - -#if P_FAMILY_VOLCANION -static const union AnimCmd sAnim_Volcanion_1[] = -{ - ANIMCMD_FRAME(1, 45), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_VOLCANION - -#if P_FAMILY_ROWLET -static const union AnimCmd sAnim_Rowlet_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Dartrix_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Decidueye_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_ROWLET - -#if P_FAMILY_PIKIPEK -static const union AnimCmd sAnim_Pikipek_1[] = -{ - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Trumbeak_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Toucannon_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_PIKIPEK - -#if P_FAMILY_GRUBBIN -static const union AnimCmd sAnim_Grubbin_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Charjabug_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Vikavolt_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_GRUBBIN - -#if P_FAMILY_CUTIEFLY -static const union AnimCmd sAnim_Cutiefly_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, 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Ribombee_1[] = -{ - 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 sAnim_Rockruff_1[] = -{ - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 8), - ANIMCMD_FRAME(1, 8), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LycanrocMidday_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LycanrocMidnight_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_LycanrocDusk_1[] = -{ - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_ROCKRUFF - -#if P_FAMILY_DEWPIDER -static const union AnimCmd sAnim_Dewpider_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 9), - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 9), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Araquanid_1[] = -{ - 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 sAnim_Salandit_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Salazzle_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_SALANDIT - -#if P_FAMILY_STUFFUL -static const union AnimCmd sAnim_Stufful_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Bewear_1[] = -{ - ANIMCMD_FRAME(0, 20), - ANIMCMD_FRAME(1, 60), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_STUFFUL - -#if P_FAMILY_ORANGURU -static const union AnimCmd sAnim_Oranguru_1[] = -{ - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_ORANGURU - -#if P_FAMILY_PASSIMIAN -static const union AnimCmd sAnim_Passimian_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_PASSIMIAN - -#if P_FAMILY_WIMPOD -static const union AnimCmd sAnim_Wimpod_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Golisopod_1[] = -{ - ANIMCMD_FRAME(0, 25), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_WIMPOD - -#if P_FAMILY_PYUKUMUKU -static const union AnimCmd sAnim_Pyukumuku_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_PYUKUMUKU - -#if P_FAMILY_TURTONATOR -static const union AnimCmd sAnim_Turtonator_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 44), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_TURTONATOR - -#if P_FAMILY_TOGEDEMARU -static const union AnimCmd sAnim_Togedemaru_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; -#endif //P_FAMILY_TOGEDEMARU - -#if P_FAMILY_DRAMPA -static const union AnimCmd sAnim_Drampa_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 50), - ANIMCMD_END, -}; -#endif //P_FAMILY_DRAMPA - -#if P_FAMILY_JANGMO_O -static const union AnimCmd sAnim_Jangmo_O_1[] = -{ - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Hakamo_O_1[] = -{ - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 5), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Kommo_O_1[] = -{ - 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 - -#if P_FAMILY_TAPU_KOKO -static const union AnimCmd sAnim_TapuKoko_1[] = -{ - 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), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAPU_KOKO - -#if P_FAMILY_TAPU_LELE -static const union AnimCmd sAnim_TapuLele_1[] = -{ - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAPU_LELE - -#if P_FAMILY_TAPU_BULU -static const union AnimCmd sAnim_TapuBulu_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 40), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAPU_BULU - -#if P_FAMILY_TAPU_FINI -static const union AnimCmd sAnim_TapuFini_1[] = -{ - ANIMCMD_FRAME(1, 60), - ANIMCMD_FRAME(1, 60), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_TAPU_FINI - -#if P_FAMILY_MARSHADOW -static const union AnimCmd sAnim_Marshadow_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 54), - ANIMCMD_FRAME(0, 10), - ANIMCMD_END, -}; -#endif //P_FAMILY_MARSHADOW - -#if P_FAMILY_ROOKIDEE -static const union AnimCmd sAnim_Rookidee_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 15), - ANIMCMD_FRAME(0, 15), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 10), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Corvisquire_1[] = -{ - 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), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Corviknight_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 50), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_ROOKIDEE - -#if P_FAMILY_CHEWTLE -static const union AnimCmd sAnim_Chewtle_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 20), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Drednaw_1[] = -{ - ANIMCMD_FRAME(0, 10), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_CHEWTLE - -#if P_FAMILY_SIZZLIPEDE -static const union AnimCmd sAnim_Sizzlipede_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 25), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; - -static const union AnimCmd sAnim_Centiskorch_1[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_FRAME(1, 35), - ANIMCMD_FRAME(0, 1), - ANIMCMD_END, -}; -#endif //P_FAMILY_SIZZLIPEDE - -static const union AnimCmd sAnim_Egg_1[] = -{ - ANIMCMD_FRAME(0, 6), - ANIMCMD_FRAME(1, 6), - ANIMCMD_FRAME(2, 6), - ANIMCMD_FRAME(3, 6), - ANIMCMD_END, -}; - -#define SINGLE_ANIMATION(name) \ -static const union AnimCmd *const sAnims_##name[] = \ -{ \ - sAnim_GeneralFrame0, \ - sAnim_##name##_1, \ -} - -#if P_FAMILY_BULBASAUR -SINGLE_ANIMATION(Bulbasaur); -SINGLE_ANIMATION(Ivysaur); -SINGLE_ANIMATION(Venusaur); -#endif //P_FAMILY_BULBASAUR -#if P_FAMILY_CHARMANDER -SINGLE_ANIMATION(Charmander); -SINGLE_ANIMATION(Charmeleon); -SINGLE_ANIMATION(Charizard); -#endif //P_FAMILY_CHARMANDER -#if P_FAMILY_SQUIRTLE -SINGLE_ANIMATION(Squirtle); -SINGLE_ANIMATION(Wartortle); -SINGLE_ANIMATION(Blastoise); -#endif //P_FAMILY_SQUIRTLE -#if P_FAMILY_CATERPIE -SINGLE_ANIMATION(Caterpie); -SINGLE_ANIMATION(Metapod); -SINGLE_ANIMATION(Butterfree); -#endif //P_FAMILY_CATERPIE -#if P_FAMILY_WEEDLE -SINGLE_ANIMATION(Weedle); -SINGLE_ANIMATION(Kakuna); -SINGLE_ANIMATION(Beedrill); -#endif //P_FAMILY_WEEDLE -#if P_FAMILY_PIDGEY -SINGLE_ANIMATION(Pidgey); -SINGLE_ANIMATION(Pidgeotto); -SINGLE_ANIMATION(Pidgeot); -#endif //P_FAMILY_PIDGEY -#if P_FAMILY_RATTATA -SINGLE_ANIMATION(Rattata); -SINGLE_ANIMATION(Raticate); -#endif //P_FAMILY_RATTATA -#if P_FAMILY_SPEAROW -SINGLE_ANIMATION(Spearow); -SINGLE_ANIMATION(Fearow); -#endif //P_FAMILY_SPEAROW -#if P_FAMILY_EKANS -SINGLE_ANIMATION(Ekans); -SINGLE_ANIMATION(Arbok); -#endif //P_FAMILY_EKANS -#if P_FAMILY_PIKACHU -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Pichu); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Pikachu); -SINGLE_ANIMATION(Raichu); -#endif //P_FAMILY_PIKACHU -#if P_FAMILY_SANDSHREW -SINGLE_ANIMATION(Sandshrew); -SINGLE_ANIMATION(Sandslash); -#endif //P_FAMILY_SANDSHREW -#if P_FAMILY_NIDORAN -SINGLE_ANIMATION(NidoranF); -SINGLE_ANIMATION(Nidorina); -SINGLE_ANIMATION(Nidoqueen); -SINGLE_ANIMATION(NidoranM); -SINGLE_ANIMATION(Nidorino); -SINGLE_ANIMATION(Nidoking); -#endif //P_FAMILY_NIDORAN -#if P_FAMILY_CLEFAIRY -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Cleffa); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Clefairy); -SINGLE_ANIMATION(Clefable); -#endif //P_FAMILY_CLEFAIRY -#if P_FAMILY_VULPIX -SINGLE_ANIMATION(Vulpix); -SINGLE_ANIMATION(Ninetales); -#endif //P_FAMILY_VULPIX -#if P_FAMILY_JIGGLYPUFF -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Igglybuff); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Jigglypuff); -SINGLE_ANIMATION(Wigglytuff); -#endif //P_FAMILY_JIGGLYPUFF -#if P_FAMILY_ZUBAT -SINGLE_ANIMATION(Zubat); -SINGLE_ANIMATION(Golbat); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Crobat); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ZUBAT -#if P_FAMILY_ODDISH -SINGLE_ANIMATION(Oddish); -SINGLE_ANIMATION(Gloom); -SINGLE_ANIMATION(Vileplume); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Bellossom); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ODDISH -#if P_FAMILY_PARAS -SINGLE_ANIMATION(Paras); -SINGLE_ANIMATION(Parasect); -#endif //P_FAMILY_PARAS -#if P_FAMILY_VENONAT -SINGLE_ANIMATION(Venonat); -SINGLE_ANIMATION(Venomoth); -#endif //P_FAMILY_VENONAT -#if P_FAMILY_DIGLETT -SINGLE_ANIMATION(Diglett); -SINGLE_ANIMATION(Dugtrio); -#endif //P_FAMILY_DIGLETT -#if P_FAMILY_MEOWTH -SINGLE_ANIMATION(Meowth); -SINGLE_ANIMATION(Persian); -#endif //P_FAMILY_MEOWTH -#if P_FAMILY_PSYDUCK -SINGLE_ANIMATION(Psyduck); -SINGLE_ANIMATION(Golduck); -#endif //P_FAMILY_PSYDUCK -#if P_FAMILY_MANKEY -SINGLE_ANIMATION(Mankey); -SINGLE_ANIMATION(Primeape); -#endif //P_FAMILY_MANKEY -#if P_FAMILY_GROWLITHE -SINGLE_ANIMATION(Growlithe); -SINGLE_ANIMATION(Arcanine); -#endif //P_FAMILY_GROWLITHE -#if P_FAMILY_POLIWAG -SINGLE_ANIMATION(Poliwag); -SINGLE_ANIMATION(Poliwhirl); -SINGLE_ANIMATION(Poliwrath); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Politoed); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_POLIWAG -#if P_FAMILY_ABRA -SINGLE_ANIMATION(Abra); -SINGLE_ANIMATION(Kadabra); -SINGLE_ANIMATION(Alakazam); -#endif //P_FAMILY_ABRA -#if P_FAMILY_MACHOP -SINGLE_ANIMATION(Machop); -SINGLE_ANIMATION(Machoke); -SINGLE_ANIMATION(Machamp); -#endif //P_FAMILY_MACHOP -#if P_FAMILY_BELLSPROUT -SINGLE_ANIMATION(Bellsprout); -SINGLE_ANIMATION(Weepinbell); -SINGLE_ANIMATION(Victreebel); -#endif //P_FAMILY_BELLSPROUT -#if P_FAMILY_TENTACOOL -SINGLE_ANIMATION(Tentacool); -SINGLE_ANIMATION(Tentacruel); -#endif //P_FAMILY_TENTACOOL -#if P_FAMILY_GEODUDE -SINGLE_ANIMATION(Geodude); -SINGLE_ANIMATION(Graveler); -SINGLE_ANIMATION(Golem); -#endif //P_FAMILY_GEODUDE -#if P_FAMILY_PONYTA -SINGLE_ANIMATION(Ponyta); -SINGLE_ANIMATION(Rapidash); -#endif //P_FAMILY_PONYTA -#if P_FAMILY_SLOWPOKE -SINGLE_ANIMATION(Slowpoke); -SINGLE_ANIMATION(Slowbro); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Slowking); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_SLOWPOKE -#if P_FAMILY_MAGNEMITE -SINGLE_ANIMATION(Magnemite); -SINGLE_ANIMATION(Magneton); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Magnezone); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MAGNEMITE -#if P_FAMILY_FARFETCHD -SINGLE_ANIMATION(Farfetchd); -#endif //P_FAMILY_FARFETCHD -#if P_FAMILY_DODUO -SINGLE_ANIMATION(Doduo); -SINGLE_ANIMATION(Dodrio); -#endif //P_FAMILY_DODUO -#if P_FAMILY_SEEL -SINGLE_ANIMATION(Seel); -SINGLE_ANIMATION(Dewgong); -#endif //P_FAMILY_SEEL -#if P_FAMILY_GRIMER -SINGLE_ANIMATION(Grimer); -SINGLE_ANIMATION(Muk); -#endif //P_FAMILY_GRIMER -#if P_FAMILY_SHELLDER -SINGLE_ANIMATION(Shellder); -SINGLE_ANIMATION(Cloyster); -#endif //P_FAMILY_SHELLDER -#if P_FAMILY_GASTLY -SINGLE_ANIMATION(Gastly); -SINGLE_ANIMATION(Haunter); -SINGLE_ANIMATION(Gengar); -#endif //P_FAMILY_GASTLY -#if P_FAMILY_ONIX -SINGLE_ANIMATION(Onix); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Steelix); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_ONIX -#if P_FAMILY_DROWZEE -SINGLE_ANIMATION(Drowzee); -SINGLE_ANIMATION(Hypno); -#endif //P_FAMILY_DROWZEE -#if P_FAMILY_KRABBY -SINGLE_ANIMATION(Krabby); -SINGLE_ANIMATION(Kingler); -#endif //P_FAMILY_KRABBY -#if P_FAMILY_VOLTORB -SINGLE_ANIMATION(Voltorb); -SINGLE_ANIMATION(Electrode); -#endif //P_FAMILY_VOLTORB -#if P_FAMILY_EXEGGCUTE -SINGLE_ANIMATION(Exeggcute); -SINGLE_ANIMATION(Exeggutor); -#endif //P_FAMILY_EXEGGCUTE -#if P_FAMILY_CUBONE -SINGLE_ANIMATION(Cubone); -SINGLE_ANIMATION(Marowak); -#endif //P_FAMILY_CUBONE -#if P_FAMILY_HITMONS -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Tyrogue); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Hitmonlee); -SINGLE_ANIMATION(Hitmonchan); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Hitmontop); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_HITMONS -#if P_FAMILY_LICKITUNG -SINGLE_ANIMATION(Lickitung); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Lickilicky); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_LICKITUNG -#if P_FAMILY_KOFFING -SINGLE_ANIMATION(Koffing); -SINGLE_ANIMATION(Weezing); -#endif //P_FAMILY_KOFFING -#if P_FAMILY_RHYHORN -SINGLE_ANIMATION(Rhyhorn); -SINGLE_ANIMATION(Rhydon); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Rhyperior); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_RHYHORN -#if P_FAMILY_CHANSEY -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Happiny); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Chansey); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Blissey); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_CHANSEY -#if P_FAMILY_TANGELA -SINGLE_ANIMATION(Tangela); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Tangrowth); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_TANGELA -#if P_FAMILY_KANGASKHAN -SINGLE_ANIMATION(Kangaskhan); -#endif //P_FAMILY_KANGASKHAN -#if P_FAMILY_HORSEA -SINGLE_ANIMATION(Horsea); -SINGLE_ANIMATION(Seadra); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Kingdra); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_HORSEA -#if P_FAMILY_GOLDEEN -SINGLE_ANIMATION(Goldeen); -SINGLE_ANIMATION(Seaking); -#endif //P_FAMILY_GOLDEEN -#if P_FAMILY_STARYU -SINGLE_ANIMATION(Staryu); -SINGLE_ANIMATION(Starmie); -#endif //P_FAMILY_STARYU -#if P_FAMILY_MR_MIME -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(MimeJr); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(MrMime); -#endif //P_FAMILY_MR_MIME -#if P_FAMILY_SCYTHER -SINGLE_ANIMATION(Scyther); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Scizor); -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_SCYTHER -#if P_FAMILY_JYNX -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Smoochum); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Jynx); -#endif //P_FAMILY_JYNX -#if P_FAMILY_ELECTABUZZ -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Elekid); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Electabuzz); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Electivire); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_ELECTABUZZ -#if P_FAMILY_MAGMAR -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Magby); -#endif //P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Magmar); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Magmortar); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MAGMAR -#if P_FAMILY_PINSIR -SINGLE_ANIMATION(Pinsir); -#endif //P_FAMILY_PINSIR -#if P_FAMILY_TAUROS -SINGLE_ANIMATION(Tauros); -#endif //P_FAMILY_TAUROS -#if P_FAMILY_MAGIKARP -SINGLE_ANIMATION(Magikarp); -SINGLE_ANIMATION(Gyarados); -#endif //P_FAMILY_MAGIKARP -#if P_FAMILY_LAPRAS -SINGLE_ANIMATION(Lapras); -#endif //P_FAMILY_LAPRAS -#if P_FAMILY_DITTO -SINGLE_ANIMATION(Ditto); -#endif //P_FAMILY_DITTO -#if P_FAMILY_EEVEE -SINGLE_ANIMATION(Eevee); -SINGLE_ANIMATION(Vaporeon); -SINGLE_ANIMATION(Jolteon); -SINGLE_ANIMATION(Flareon); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Espeon); -SINGLE_ANIMATION(Umbreon); -#endif //P_GEN_2_CROSS_EVOS -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Leafeon); -SINGLE_ANIMATION(Glaceon); -#endif //P_GEN_4_CROSS_EVOS -#if P_GEN_6_CROSS_EVOS -SINGLE_ANIMATION(Sylveon); -#endif //P_GEN_6_CROSS_EVOS -#endif //P_FAMILY_EEVEE -#if P_FAMILY_PORYGON -SINGLE_ANIMATION(Porygon); -#if P_GEN_2_CROSS_EVOS -SINGLE_ANIMATION(Porygon2); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Porygon_Z); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_GEN_2_CROSS_EVOS -#endif //P_FAMILY_PORYGON -#if P_FAMILY_OMANYTE -SINGLE_ANIMATION(Omanyte); -SINGLE_ANIMATION(Omastar); -#endif //P_FAMILY_OMANYTE -#if P_FAMILY_KABUTO -SINGLE_ANIMATION(Kabuto); -SINGLE_ANIMATION(Kabutops); -#endif //P_FAMILY_KABUTO -#if P_FAMILY_AERODACTYL -SINGLE_ANIMATION(Aerodactyl); -#endif //P_FAMILY_AERODACTYL -#if P_FAMILY_SNORLAX -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Munchlax); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Snorlax); -#endif //P_FAMILY_SNORLAX -#if P_FAMILY_ARTICUNO -SINGLE_ANIMATION(Articuno); -#endif //P_FAMILY_ARTICUNO -#if P_FAMILY_ZAPDOS -SINGLE_ANIMATION(Zapdos); -#endif //P_FAMILY_ZAPDOS -#if P_FAMILY_MOLTRES -SINGLE_ANIMATION(Moltres); -#endif //P_FAMILY_MOLTRES -#if P_FAMILY_DRATINI -SINGLE_ANIMATION(Dratini); -SINGLE_ANIMATION(Dragonair); -SINGLE_ANIMATION(Dragonite); -#endif //P_FAMILY_DRATINI -#if P_FAMILY_MEWTWO -SINGLE_ANIMATION(Mewtwo); -#endif //P_FAMILY_MEWTWO -#if P_FAMILY_MEW -SINGLE_ANIMATION(Mew); -#endif //P_FAMILY_MEW -#if P_FAMILY_CHIKORITA -SINGLE_ANIMATION(Chikorita); -SINGLE_ANIMATION(Bayleef); -SINGLE_ANIMATION(Meganium); -#endif //P_FAMILY_CHIKORITA -#if P_FAMILY_CYNDAQUIL -SINGLE_ANIMATION(Cyndaquil); -SINGLE_ANIMATION(Quilava); -SINGLE_ANIMATION(Typhlosion); -#endif //P_FAMILY_CYNDAQUIL -#if P_FAMILY_TOTODILE -SINGLE_ANIMATION(Totodile); -SINGLE_ANIMATION(Croconaw); -SINGLE_ANIMATION(Feraligatr); -#endif //P_FAMILY_TOTODILE -#if P_FAMILY_SENTRET -SINGLE_ANIMATION(Sentret); -SINGLE_ANIMATION(Furret); -#endif //P_FAMILY_SENTRET -#if P_FAMILY_HOOTHOOT -SINGLE_ANIMATION(Hoothoot); -SINGLE_ANIMATION(Noctowl); -#endif //P_FAMILY_HOOTHOOT -#if P_FAMILY_LEDYBA -SINGLE_ANIMATION(Ledyba); -SINGLE_ANIMATION(Ledian); -#endif //P_FAMILY_LEDYBA -#if P_FAMILY_SPINARAK -SINGLE_ANIMATION(Spinarak); -SINGLE_ANIMATION(Ariados); -#endif //P_FAMILY_SPINARAK -#if P_FAMILY_CHINCHOU -SINGLE_ANIMATION(Chinchou); -SINGLE_ANIMATION(Lanturn); -#endif //P_FAMILY_CHINCHOU -#if P_FAMILY_TOGEPI -SINGLE_ANIMATION(Togepi); -SINGLE_ANIMATION(Togetic); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Togekiss); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_TOGEPI -#if P_FAMILY_NATU -SINGLE_ANIMATION(Natu); -SINGLE_ANIMATION(Xatu); -#endif //P_FAMILY_NATU -#if P_FAMILY_MAREEP -SINGLE_ANIMATION(Mareep); -SINGLE_ANIMATION(Flaaffy); -SINGLE_ANIMATION(Ampharos); -#endif //P_FAMILY_MAREEP -#if P_FAMILY_MARILL -#if P_GEN_3_CROSS_EVOS -SINGLE_ANIMATION(Azurill); -#endif //P_GEN_3_CROSS_EVOS -SINGLE_ANIMATION(Marill); -SINGLE_ANIMATION(Azumarill); -#endif //P_FAMILY_MARILL -#if P_FAMILY_SUDOWOODO -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Bonsly); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Sudowoodo); -#endif //P_FAMILY_SUDOWOODO -#if P_FAMILY_HOPPIP -SINGLE_ANIMATION(Hoppip); -SINGLE_ANIMATION(Skiploom); -SINGLE_ANIMATION(Jumpluff); -#endif //P_FAMILY_HOPPIP -#if P_FAMILY_AIPOM -SINGLE_ANIMATION(Aipom); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Ambipom); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_AIPOM -#if P_FAMILY_SUNKERN -SINGLE_ANIMATION(Sunkern); -SINGLE_ANIMATION(Sunflora); -#endif //P_FAMILY_SUNKERN -#if P_FAMILY_YANMA -SINGLE_ANIMATION(Yanma); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Yanmega); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_YANMA -#if P_FAMILY_WOOPER -SINGLE_ANIMATION(Wooper); -SINGLE_ANIMATION(Quagsire); -#endif //P_FAMILY_WOOPER -#if P_FAMILY_MURKROW -SINGLE_ANIMATION(Murkrow); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Honchkrow); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MURKROW -#if P_FAMILY_MISDREAVUS -SINGLE_ANIMATION(Misdreavus); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Mismagius); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_MISDREAVUS -#if P_FAMILY_WOBBUFFET -#if P_GEN_3_CROSS_EVOS -SINGLE_ANIMATION(Wynaut); -#endif //P_GEN_3_CROSS_EVOS -SINGLE_ANIMATION(Wobbuffet); -#endif //P_FAMILY_WOBBUFFET -#if P_FAMILY_GIRAFARIG -SINGLE_ANIMATION(Girafarig); -#endif //P_FAMILY_GIRAFARIG -#if P_FAMILY_PINECO -SINGLE_ANIMATION(Pineco); -SINGLE_ANIMATION(Forretress); -#endif //P_FAMILY_PINECO -#if P_FAMILY_DUNSPARCE -SINGLE_ANIMATION(Dunsparce); -#endif //P_FAMILY_DUNSPARCE -#if P_FAMILY_GLIGAR -SINGLE_ANIMATION(Gligar); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Gliscor); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_GLIGAR -#if P_FAMILY_SNUBBULL -SINGLE_ANIMATION(Snubbull); -SINGLE_ANIMATION(Granbull); -#endif //P_FAMILY_SNUBBULL -#if P_FAMILY_QWILFISH -SINGLE_ANIMATION(Qwilfish); -#endif //P_FAMILY_QWILFISH -#if P_FAMILY_SHUCKLE -SINGLE_ANIMATION(Shuckle); -#endif //P_FAMILY_SHUCKLE -#if P_FAMILY_HERACROSS -SINGLE_ANIMATION(Heracross); -#endif //P_FAMILY_HERACROSS -#if P_FAMILY_SNEASEL -SINGLE_ANIMATION(Sneasel); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Weavile); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SNEASEL -#if P_FAMILY_TEDDIURSA -SINGLE_ANIMATION(Teddiursa); -SINGLE_ANIMATION(Ursaring); -#endif //P_FAMILY_TEDDIURSA -#if P_FAMILY_SLUGMA -SINGLE_ANIMATION(Slugma); -SINGLE_ANIMATION(Magcargo); -#endif //P_FAMILY_SLUGMA -#if P_FAMILY_SWINUB -SINGLE_ANIMATION(Swinub); -SINGLE_ANIMATION(Piloswine); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Mamoswine); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SWINUB -#if P_FAMILY_CORSOLA -SINGLE_ANIMATION(Corsola); -#endif //P_FAMILY_CORSOLA -#if P_FAMILY_REMORAID -SINGLE_ANIMATION(Remoraid); -SINGLE_ANIMATION(Octillery); -#endif //P_FAMILY_REMORAID -#if P_FAMILY_DELIBIRD -SINGLE_ANIMATION(Delibird); -#endif //P_FAMILY_DELIBIRD -#if P_FAMILY_MANTINE -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Mantyke); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Mantine); -#endif //P_FAMILY_MANTINE -#if P_FAMILY_SKARMORY -SINGLE_ANIMATION(Skarmory); -#endif //P_FAMILY_SKARMORY -#if P_FAMILY_HOUNDOUR -SINGLE_ANIMATION(Houndour); -SINGLE_ANIMATION(Houndoom); -#endif //P_FAMILY_HOUNDOUR -#if P_FAMILY_PHANPY -SINGLE_ANIMATION(Phanpy); -SINGLE_ANIMATION(Donphan); -#endif //P_FAMILY_PHANPY -#if P_FAMILY_STANTLER -SINGLE_ANIMATION(Stantler); -#endif //P_FAMILY_STANTLER -#if P_FAMILY_SMEARGLE -SINGLE_ANIMATION(Smeargle); -#endif //P_FAMILY_SMEARGLE -#if P_FAMILY_MILTANK -SINGLE_ANIMATION(Miltank); -#endif //P_FAMILY_MILTANK -#if P_FAMILY_RAIKOU -SINGLE_ANIMATION(Raikou); -#endif //P_FAMILY_RAIKOU -#if P_FAMILY_ENTEI -SINGLE_ANIMATION(Entei); -#endif //P_FAMILY_ENTEI -#if P_FAMILY_SUICUNE -SINGLE_ANIMATION(Suicune); -#endif //P_FAMILY_SUICUNE -#if P_FAMILY_LARVITAR -SINGLE_ANIMATION(Larvitar); -SINGLE_ANIMATION(Pupitar); -SINGLE_ANIMATION(Tyranitar); -#endif //P_FAMILY_LARVITAR -#if P_FAMILY_LUGIA -SINGLE_ANIMATION(Lugia); -#endif //P_FAMILY_LUGIA -#if P_FAMILY_HO_OH -SINGLE_ANIMATION(HoOh); -#endif //P_FAMILY_HO_OH -#if P_FAMILY_CELEBI -SINGLE_ANIMATION(Celebi); -#endif //P_FAMILY_CELEBI -#if P_FAMILY_TREECKO -SINGLE_ANIMATION(Treecko); -SINGLE_ANIMATION(Grovyle); -SINGLE_ANIMATION(Sceptile); -#endif //P_FAMILY_TREECKO -#if P_FAMILY_TORCHIC -SINGLE_ANIMATION(Torchic); -SINGLE_ANIMATION(Combusken); -SINGLE_ANIMATION(Blaziken); -#endif //P_FAMILY_TORCHIC -#if P_FAMILY_MUDKIP -SINGLE_ANIMATION(Mudkip); -SINGLE_ANIMATION(Marshtomp); -SINGLE_ANIMATION(Swampert); -#endif //P_FAMILY_MUDKIP -#if P_FAMILY_POOCHYENA -SINGLE_ANIMATION(Poochyena); -SINGLE_ANIMATION(Mightyena); -#endif //P_FAMILY_POOCHYENA -#if P_FAMILY_ZIGZAGOON -SINGLE_ANIMATION(Zigzagoon); -SINGLE_ANIMATION(Linoone); -#endif //P_FAMILY_ZIGZAGOON -#if P_FAMILY_WURMPLE -SINGLE_ANIMATION(Wurmple); -SINGLE_ANIMATION(Silcoon); -SINGLE_ANIMATION(Beautifly); -SINGLE_ANIMATION(Cascoon); -SINGLE_ANIMATION(Dustox); -#endif //P_FAMILY_WURMPLE -#if P_FAMILY_LOTAD -SINGLE_ANIMATION(Lotad); -SINGLE_ANIMATION(Lombre); -SINGLE_ANIMATION(Ludicolo); -#endif //P_FAMILY_LOTAD -#if P_FAMILY_SEEDOT -SINGLE_ANIMATION(Seedot); -SINGLE_ANIMATION(Nuzleaf); -SINGLE_ANIMATION(Shiftry); -#endif //P_FAMILY_SEEDOT -#if P_FAMILY_TAILLOW -SINGLE_ANIMATION(Taillow); -SINGLE_ANIMATION(Swellow); -#endif //P_FAMILY_TAILLOW -#if P_FAMILY_WINGULL -SINGLE_ANIMATION(Wingull); -SINGLE_ANIMATION(Pelipper); -#endif //P_FAMILY_WINGULL -#if P_FAMILY_RALTS -SINGLE_ANIMATION(Ralts); -SINGLE_ANIMATION(Kirlia); -SINGLE_ANIMATION(Gardevoir); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Gallade); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_RALTS -#if P_FAMILY_SURSKIT -SINGLE_ANIMATION(Surskit); -SINGLE_ANIMATION(Masquerain); -#endif //P_FAMILY_SURSKIT -#if P_FAMILY_SHROOMISH -SINGLE_ANIMATION(Shroomish); -SINGLE_ANIMATION(Breloom); -#endif //P_FAMILY_SHROOMISH -#if P_FAMILY_SLAKOTH -SINGLE_ANIMATION(Slakoth); -SINGLE_ANIMATION(Vigoroth); -SINGLE_ANIMATION(Slaking); -#endif //P_FAMILY_SLAKOTH -#if P_FAMILY_NINCADA -SINGLE_ANIMATION(Nincada); -SINGLE_ANIMATION(Ninjask); -SINGLE_ANIMATION(Shedinja); -#endif //P_FAMILY_NINCADA -#if P_FAMILY_WHISMUR -SINGLE_ANIMATION(Whismur); -SINGLE_ANIMATION(Loudred); -SINGLE_ANIMATION(Exploud); -#endif //P_FAMILY_WHISMUR -#if P_FAMILY_MAKUHITA -SINGLE_ANIMATION(Makuhita); -SINGLE_ANIMATION(Hariyama); -#endif //P_FAMILY_MAKUHITA -#if P_FAMILY_NOSEPASS -SINGLE_ANIMATION(Nosepass); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Probopass); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_NOSEPASS -#if P_FAMILY_SKITTY -SINGLE_ANIMATION(Skitty); -SINGLE_ANIMATION(Delcatty); -#endif //P_FAMILY_SKITTY -#if P_FAMILY_SABLEYE -SINGLE_ANIMATION(Sableye); -#endif //P_FAMILY_SABLEYE -#if P_FAMILY_MAWILE -SINGLE_ANIMATION(Mawile); -#endif //P_FAMILY_MAWILE -#if P_FAMILY_ARON -SINGLE_ANIMATION(Aron); -SINGLE_ANIMATION(Lairon); -SINGLE_ANIMATION(Aggron); -#endif //P_FAMILY_ARON -#if P_FAMILY_MEDITITE -SINGLE_ANIMATION(Meditite); -SINGLE_ANIMATION(Medicham); -#endif //P_FAMILY_MEDITITE -#if P_FAMILY_ELECTRIKE -SINGLE_ANIMATION(Electrike); -SINGLE_ANIMATION(Manectric); -#endif //P_FAMILY_ELECTRIKE -#if P_FAMILY_PLUSLE -SINGLE_ANIMATION(Plusle); -#endif //P_FAMILY_PLUSLE -#if P_FAMILY_MINUN -SINGLE_ANIMATION(Minun); -#endif //P_FAMILY_MINUN -#if P_FAMILY_VOLBEAT_ILLUMISE -SINGLE_ANIMATION(Volbeat); -SINGLE_ANIMATION(Illumise); -#endif //P_FAMILY_VOLBEAT_ILLUMISE -#if P_FAMILY_ROSELIA -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Budew); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Roselia); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Roserade); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_ROSELIA -#if P_FAMILY_GULPIN -SINGLE_ANIMATION(Gulpin); -SINGLE_ANIMATION(Swalot); -#endif //P_FAMILY_GULPIN -#if P_FAMILY_CARVANHA -SINGLE_ANIMATION(Carvanha); -SINGLE_ANIMATION(Sharpedo); -#endif //P_FAMILY_CARVANHA -#if P_FAMILY_WAILMER -SINGLE_ANIMATION(Wailmer); -SINGLE_ANIMATION(Wailord); -#endif //P_FAMILY_WAILMER -#if P_FAMILY_NUMEL -SINGLE_ANIMATION(Numel); -SINGLE_ANIMATION(Camerupt); -#endif //P_FAMILY_NUMEL -#if P_FAMILY_TORKOAL -SINGLE_ANIMATION(Torkoal); -#endif //P_FAMILY_TORKOAL -#if P_FAMILY_SPOINK -SINGLE_ANIMATION(Spoink); -SINGLE_ANIMATION(Grumpig); -#endif //P_FAMILY_SPOINK -#if P_FAMILY_SPINDA -SINGLE_ANIMATION(Spinda); -#endif //P_FAMILY_SPINDA -#if P_FAMILY_TRAPINCH -SINGLE_ANIMATION(Trapinch); -SINGLE_ANIMATION(Vibrava); -SINGLE_ANIMATION(Flygon); -#endif //P_FAMILY_TRAPINCH -#if P_FAMILY_CACNEA -SINGLE_ANIMATION(Cacnea); -SINGLE_ANIMATION(Cacturne); -#endif //P_FAMILY_CACNEA -#if P_FAMILY_SWABLU -SINGLE_ANIMATION(Swablu); -SINGLE_ANIMATION(Altaria); -#endif //P_FAMILY_SWABLU -#if P_FAMILY_ZANGOOSE -SINGLE_ANIMATION(Zangoose); -#endif //P_FAMILY_ZANGOOSE -#if P_FAMILY_SEVIPER -SINGLE_ANIMATION(Seviper); -#endif //P_FAMILY_SEVIPER -#if P_FAMILY_LUNATONE -SINGLE_ANIMATION(Lunatone); -#endif //P_FAMILY_LUNATONE -#if P_FAMILY_SOLROCK -SINGLE_ANIMATION(Solrock); -#endif //P_FAMILY_SOLROCK -#if P_FAMILY_BARBOACH -SINGLE_ANIMATION(Barboach); -SINGLE_ANIMATION(Whiscash); -#endif //P_FAMILY_BARBOACH -#if P_FAMILY_CORPHISH -SINGLE_ANIMATION(Corphish); -SINGLE_ANIMATION(Crawdaunt); -#endif //P_FAMILY_CORPHISH -#if P_FAMILY_BALTOY -SINGLE_ANIMATION(Baltoy); -SINGLE_ANIMATION(Claydol); -#endif //P_FAMILY_BALTOY -#if P_FAMILY_LILEEP -SINGLE_ANIMATION(Lileep); -SINGLE_ANIMATION(Cradily); -#endif //P_FAMILY_LILEEP -#if P_FAMILY_ANORITH -SINGLE_ANIMATION(Anorith); -SINGLE_ANIMATION(Armaldo); -#endif //P_FAMILY_ANORITH -#if P_FAMILY_FEEBAS -SINGLE_ANIMATION(Feebas); -SINGLE_ANIMATION(Milotic); -#endif //P_FAMILY_FEEBAS -#if P_FAMILY_CASTFORM -SINGLE_ANIMATION(CastformNormal); -SINGLE_ANIMATION(CastformSunny); -SINGLE_ANIMATION(CastformRainy); -SINGLE_ANIMATION(CastformSnowy); -#endif //P_FAMILY_CASTFORM -#if P_FAMILY_KECLEON -SINGLE_ANIMATION(Kecleon); -#endif //P_FAMILY_KECLEON -#if P_FAMILY_SHUPPET -SINGLE_ANIMATION(Shuppet); -SINGLE_ANIMATION(Banette); -#endif //P_FAMILY_SHUPPET -#if P_FAMILY_DUSKULL -SINGLE_ANIMATION(Duskull); -SINGLE_ANIMATION(Dusclops); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Dusknoir); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_DUSKULL -#if P_FAMILY_TROPIUS -SINGLE_ANIMATION(Tropius); -#endif //P_FAMILY_TROPIUS -#if P_FAMILY_CHIMECHO -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Chingling); -#endif //P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Chimecho); -#endif //P_FAMILY_CHIMECHO -#if P_FAMILY_ABSOL -SINGLE_ANIMATION(Absol); -#endif //P_FAMILY_ABSOL -#if P_FAMILY_SNORUNT -SINGLE_ANIMATION(Snorunt); -SINGLE_ANIMATION(Glalie); -#if P_GEN_4_CROSS_EVOS -SINGLE_ANIMATION(Froslass); -#endif //P_GEN_4_CROSS_EVOS -#endif //P_FAMILY_SNORUNT -#if P_FAMILY_SPHEAL -SINGLE_ANIMATION(Spheal); -SINGLE_ANIMATION(Sealeo); -SINGLE_ANIMATION(Walrein); -#endif //P_FAMILY_SPHEAL -#if P_FAMILY_CLAMPERL -SINGLE_ANIMATION(Clamperl); -SINGLE_ANIMATION(Huntail); -SINGLE_ANIMATION(Gorebyss); -#endif //P_FAMILY_CLAMPERL -#if P_FAMILY_RELICANTH -SINGLE_ANIMATION(Relicanth); -#endif //P_FAMILY_RELICANTH -#if P_FAMILY_LUVDISC -SINGLE_ANIMATION(Luvdisc); -#endif //P_FAMILY_LUVDISC -#if P_FAMILY_BAGON -SINGLE_ANIMATION(Bagon); -SINGLE_ANIMATION(Shelgon); -SINGLE_ANIMATION(Salamence); -#endif //P_FAMILY_BAGON -#if P_FAMILY_BELDUM -SINGLE_ANIMATION(Beldum); -SINGLE_ANIMATION(Metang); -SINGLE_ANIMATION(Metagross); -#endif //P_FAMILY_BELDUM -#if P_FAMILY_REGIROCK -SINGLE_ANIMATION(Regirock); -#endif //P_FAMILY_REGIROCK -#if P_FAMILY_REGICE -SINGLE_ANIMATION(Regice); -#endif //P_FAMILY_REGICE -#if P_FAMILY_REGISTEEL -SINGLE_ANIMATION(Registeel); -#endif //P_FAMILY_REGISTEEL -#if P_FAMILY_LATIAS -SINGLE_ANIMATION(Latias); -#endif //P_FAMILY_LATIAS -#if P_FAMILY_LATIOS -SINGLE_ANIMATION(Latios); -#endif //P_FAMILY_LATIOS -#if P_FAMILY_KYOGRE -SINGLE_ANIMATION(Kyogre); -#endif //P_FAMILY_KYOGRE -#if P_FAMILY_GROUDON -SINGLE_ANIMATION(Groudon); -#endif //P_FAMILY_GROUDON -#if P_FAMILY_RAYQUAZA -SINGLE_ANIMATION(Rayquaza); -#endif //P_FAMILY_RAYQUAZA -#if P_FAMILY_JIRACHI -SINGLE_ANIMATION(Jirachi); -#endif //P_FAMILY_JIRACHI -#if P_FAMILY_DEOXYS -SINGLE_ANIMATION(DeoxysNormal); -SINGLE_ANIMATION(DeoxysAttack); -SINGLE_ANIMATION(DeoxysDefense); -SINGLE_ANIMATION(DeoxysSpeed); -#endif //P_FAMILY_DEOXYS -#if P_FAMILY_TURTWIG -SINGLE_ANIMATION(Turtwig); -SINGLE_ANIMATION(Grotle); -SINGLE_ANIMATION(Torterra); -#endif //P_FAMILY_TURTWIG -#if P_FAMILY_CHIMCHAR -SINGLE_ANIMATION(Chimchar); -SINGLE_ANIMATION(Monferno); -SINGLE_ANIMATION(Infernape); -#endif //P_FAMILY_CHIMCHAR -#if P_FAMILY_PIPLUP -SINGLE_ANIMATION(Piplup); -SINGLE_ANIMATION(Prinplup); -SINGLE_ANIMATION(Empoleon); -#endif //P_FAMILY_PIPLUP -#if P_FAMILY_STARLY -SINGLE_ANIMATION(Starly); -SINGLE_ANIMATION(Staravia); -SINGLE_ANIMATION(Staraptor); -#endif //P_FAMILY_STARLY -#if P_FAMILY_BIDOOF -SINGLE_ANIMATION(Bidoof); -SINGLE_ANIMATION(Bibarel); -#endif //P_FAMILY_BIDOOF -#if P_FAMILY_KRICKETOT -SINGLE_ANIMATION(Kricketot); -SINGLE_ANIMATION(Kricketune); -#endif //P_FAMILY_KRICKETOT -#if P_FAMILY_SHINX -SINGLE_ANIMATION(Shinx); -SINGLE_ANIMATION(Luxio); -SINGLE_ANIMATION(Luxray); -#endif //P_FAMILY_SHINX -#if P_FAMILY_CRANIDOS -SINGLE_ANIMATION(Cranidos); -SINGLE_ANIMATION(Rampardos); -#endif //P_FAMILY_CRANIDOS -#if P_FAMILY_SHIELDON -SINGLE_ANIMATION(Shieldon); -SINGLE_ANIMATION(Bastiodon); -#endif //P_FAMILY_SHIELDON -#if P_FAMILY_BURMY -SINGLE_ANIMATION(Burmy); -SINGLE_ANIMATION(Wormadam); -SINGLE_ANIMATION(Mothim); -#endif //P_FAMILY_BURMY -#if P_FAMILY_COMBEE -SINGLE_ANIMATION(Combee); -SINGLE_ANIMATION(Vespiquen); -#endif //P_FAMILY_COMBEE -#if P_FAMILY_PACHIRISU -SINGLE_ANIMATION(Pachirisu); -#endif //P_FAMILY_PACHIRISU -#if P_FAMILY_BUIZEL -SINGLE_ANIMATION(Buizel); -SINGLE_ANIMATION(Floatzel); -#endif //P_FAMILY_BUIZEL -#if P_FAMILY_CHERUBI -SINGLE_ANIMATION(Cherubi); -SINGLE_ANIMATION(CherrimOvercast); -SINGLE_ANIMATION(CherrimSunshine); -#endif //P_FAMILY_CHERUBI -#if P_FAMILY_SHELLOS -SINGLE_ANIMATION(Shellos); -SINGLE_ANIMATION(Gastrodon); -#endif //P_FAMILY_SHELLOS -#if P_FAMILY_DRIFLOON -SINGLE_ANIMATION(Drifloon); -SINGLE_ANIMATION(Drifblim); -#endif //P_FAMILY_DRIFLOON -#if P_FAMILY_BUNEARY -SINGLE_ANIMATION(Buneary); -SINGLE_ANIMATION(Lopunny); -#endif //P_FAMILY_BUNEARY -#if P_FAMILY_GLAMEOW -SINGLE_ANIMATION(Glameow); -SINGLE_ANIMATION(Purugly); -#endif //P_FAMILY_GLAMEOW -#if P_FAMILY_STUNKY -SINGLE_ANIMATION(Stunky); -SINGLE_ANIMATION(Skuntank); -#endif //P_FAMILY_STUNKY -#if P_FAMILY_BRONZOR -SINGLE_ANIMATION(Bronzor); -SINGLE_ANIMATION(Bronzong); -#endif //P_FAMILY_BRONZOR -#if P_FAMILY_CHATOT -SINGLE_ANIMATION(Chatot); -#endif //P_FAMILY_CHATOT -#if P_FAMILY_SPIRITOMB -SINGLE_ANIMATION(Spiritomb); -#endif //P_FAMILY_SPIRITOMB -#if P_FAMILY_GIBLE -SINGLE_ANIMATION(Gible); -SINGLE_ANIMATION(Gabite); -SINGLE_ANIMATION(Garchomp); -#endif //P_FAMILY_GIBLE -#if P_FAMILY_RIOLU -SINGLE_ANIMATION(Riolu); -SINGLE_ANIMATION(Lucario); -#endif //P_FAMILY_RIOLU -#if P_FAMILY_HIPPOPOTAS -SINGLE_ANIMATION(Hippopotas); -SINGLE_ANIMATION(Hippowdon); -#endif //P_FAMILY_HIPPOPOTAS -#if P_FAMILY_SKORUPI -SINGLE_ANIMATION(Skorupi); -SINGLE_ANIMATION(Drapion); -#endif //P_FAMILY_SKORUPI -#if P_FAMILY_CROAGUNK -SINGLE_ANIMATION(Croagunk); -SINGLE_ANIMATION(Toxicroak); -#endif //P_FAMILY_CROAGUNK -#if P_FAMILY_CARNIVINE -SINGLE_ANIMATION(Carnivine); -#endif //P_FAMILY_CARNIVINE -#if P_FAMILY_FINNEON -SINGLE_ANIMATION(Finneon); -SINGLE_ANIMATION(Lumineon); -#endif //P_FAMILY_FINNEON -#if P_FAMILY_SNOVER -SINGLE_ANIMATION(Snover); -SINGLE_ANIMATION(Abomasnow); -#endif //P_FAMILY_SNOVER -#if P_FAMILY_ROTOM -SINGLE_ANIMATION(Rotom); -SINGLE_ANIMATION(RotomHeat); -SINGLE_ANIMATION(RotomWash); -SINGLE_ANIMATION(RotomFrost); -SINGLE_ANIMATION(RotomFan); -SINGLE_ANIMATION(RotomMow); -#endif //P_FAMILY_ROTOM -#if P_FAMILY_UXIE -SINGLE_ANIMATION(Uxie); -#endif //P_FAMILY_UXIE -#if P_FAMILY_MESPRIT -SINGLE_ANIMATION(Mesprit); -#endif //P_FAMILY_MESPRIT -#if P_FAMILY_AZELF -SINGLE_ANIMATION(Azelf); -#endif //P_FAMILY_AZELF -#if P_FAMILY_DIALGA -SINGLE_ANIMATION(Dialga); -#endif //P_FAMILY_DIALGA -#if P_FAMILY_PALKIA -SINGLE_ANIMATION(Palkia); -#endif //P_FAMILY_PALKIA -#if P_FAMILY_HEATRAN -SINGLE_ANIMATION(Heatran); -#endif //P_FAMILY_HEATRAN -#if P_FAMILY_REGIGIGAS -SINGLE_ANIMATION(Regigigas); -#endif //P_FAMILY_REGIGIGAS -#if P_FAMILY_GIRATINA -SINGLE_ANIMATION(GiratinaAltered); -SINGLE_ANIMATION(GiratinaOrigin); -#endif //P_FAMILY_GIRATINA -#if P_FAMILY_CRESSELIA -SINGLE_ANIMATION(Cresselia); -#endif //P_FAMILY_CRESSELIA -#if P_FAMILY_MANAPHY -SINGLE_ANIMATION(Phione); -SINGLE_ANIMATION(Manaphy); -#endif //P_FAMILY_MANAPHY -#if P_FAMILY_DARKRAI -SINGLE_ANIMATION(Darkrai); -#endif //P_FAMILY_DARKRAI -#if P_FAMILY_SHAYMIN -SINGLE_ANIMATION(ShayminLand); -SINGLE_ANIMATION(ShayminSky); -#endif //P_FAMILY_SHAYMIN -#if P_FAMILY_ARCEUS -SINGLE_ANIMATION(Arceus); -#endif //P_FAMILY_ARCEUS -#if P_FAMILY_VICTINI -SINGLE_ANIMATION(Victini); -#endif //P_FAMILY_VICTINI -#if P_FAMILY_SNIVY -SINGLE_ANIMATION(Snivy); -SINGLE_ANIMATION(Servine); -SINGLE_ANIMATION(Serperior); -#endif //P_FAMILY_SNIVY -#if P_FAMILY_TEPIG -SINGLE_ANIMATION(Tepig); -SINGLE_ANIMATION(Pignite); -SINGLE_ANIMATION(Emboar); -#endif //P_FAMILY_TEPIG -#if P_FAMILY_OSHAWOTT -SINGLE_ANIMATION(Oshawott); -SINGLE_ANIMATION(Dewott); -SINGLE_ANIMATION(Samurott); -#endif //P_FAMILY_OSHAWOTT -#if P_FAMILY_PATRAT -SINGLE_ANIMATION(Patrat); -SINGLE_ANIMATION(Watchog); -#endif //P_FAMILY_PATRAT -#if P_FAMILY_LILLIPUP -SINGLE_ANIMATION(Lillipup); -SINGLE_ANIMATION(Herdier); -SINGLE_ANIMATION(Stoutland); -#endif //P_FAMILY_LILLIPUP -#if P_FAMILY_PURRLOIN -SINGLE_ANIMATION(Purrloin); -SINGLE_ANIMATION(Liepard); -#endif //P_FAMILY_PURRLOIN -#if P_FAMILY_PANSAGE -SINGLE_ANIMATION(Pansage); -SINGLE_ANIMATION(Simisage); -#endif //P_FAMILY_PANSAGE -#if P_FAMILY_PANSEAR -SINGLE_ANIMATION(Pansear); -SINGLE_ANIMATION(Simisear); -#endif //P_FAMILY_PANSEAR -#if P_FAMILY_PANPOUR -SINGLE_ANIMATION(Panpour); -SINGLE_ANIMATION(Simipour); -#endif //P_FAMILY_PANPOUR -#if P_FAMILY_MUNNA -SINGLE_ANIMATION(Munna); -SINGLE_ANIMATION(Musharna); -#endif //P_FAMILY_MUNNA -#if P_FAMILY_PIDOVE -SINGLE_ANIMATION(Pidove); -SINGLE_ANIMATION(Tranquill); -SINGLE_ANIMATION(Unfezant); -#endif //P_FAMILY_PIDOVE -#if P_FAMILY_BLITZLE -SINGLE_ANIMATION(Blitzle); -SINGLE_ANIMATION(Zebstrika); -#endif //P_FAMILY_BLITZLE -#if P_FAMILY_ROGGENROLA -SINGLE_ANIMATION(Roggenrola); -SINGLE_ANIMATION(Boldore); -SINGLE_ANIMATION(Gigalith); -#endif //P_FAMILY_ROGGENROLA -#if P_FAMILY_WOOBAT -SINGLE_ANIMATION(Woobat); -SINGLE_ANIMATION(Swoobat); -#endif //P_FAMILY_WOOBAT -#if P_FAMILY_DRILBUR -SINGLE_ANIMATION(Drilbur); -SINGLE_ANIMATION(Excadrill); -#endif //P_FAMILY_DRILBUR -#if P_FAMILY_AUDINO -SINGLE_ANIMATION(Audino); -#endif //P_FAMILY_AUDINO -#if P_FAMILY_TIMBURR -SINGLE_ANIMATION(Timburr); -SINGLE_ANIMATION(Gurdurr); -SINGLE_ANIMATION(Conkeldurr); -#endif //P_FAMILY_TIMBURR -#if P_FAMILY_TYMPOLE -SINGLE_ANIMATION(Tympole); -SINGLE_ANIMATION(Palpitoad); -SINGLE_ANIMATION(Seismitoad); -#endif //P_FAMILY_TYMPOLE -#if P_FAMILY_THROH -SINGLE_ANIMATION(Throh); -#endif //P_FAMILY_THROH -#if P_FAMILY_SAWK -SINGLE_ANIMATION(Sawk); -#endif //P_FAMILY_SAWK -#if P_FAMILY_SEWADDLE -SINGLE_ANIMATION(Sewaddle); -SINGLE_ANIMATION(Swadloon); -SINGLE_ANIMATION(Leavanny); -#endif //P_FAMILY_SEWADDLE -#if P_FAMILY_VENIPEDE -SINGLE_ANIMATION(Venipede); -SINGLE_ANIMATION(Whirlipede); -SINGLE_ANIMATION(Scolipede); -#endif //P_FAMILY_VENIPEDE -#if P_FAMILY_COTTONEE -SINGLE_ANIMATION(Cottonee); -SINGLE_ANIMATION(Whimsicott); -#endif //P_FAMILY_COTTONEE -#if P_FAMILY_PETILIL -SINGLE_ANIMATION(Petilil); -SINGLE_ANIMATION(Lilligant); -#endif //P_FAMILY_PETILIL -#if P_FAMILY_BASCULIN -SINGLE_ANIMATION(Basculin); -#endif //P_FAMILY_BASCULIN -#if P_FAMILY_SANDILE -SINGLE_ANIMATION(Sandile); -SINGLE_ANIMATION(Krokorok); -SINGLE_ANIMATION(Krookodile); -#endif //P_FAMILY_SANDILE -#if P_FAMILY_DARUMAKA -SINGLE_ANIMATION(Darumaka); -SINGLE_ANIMATION(DarmanitanStandard); -SINGLE_ANIMATION(DarmanitanZen); -#endif //P_FAMILY_DARUMAKA -#if P_FAMILY_MARACTUS -SINGLE_ANIMATION(Maractus); -#endif //P_FAMILY_MARACTUS -#if P_FAMILY_DWEBBLE -SINGLE_ANIMATION(Dwebble); -SINGLE_ANIMATION(Crustle); -#endif //P_FAMILY_DWEBBLE -#if P_FAMILY_SCRAGGY -SINGLE_ANIMATION(Scraggy); -SINGLE_ANIMATION(Scrafty); -#endif //P_FAMILY_SCRAGGY -#if P_FAMILY_SIGILYPH -SINGLE_ANIMATION(Sigilyph); -#endif //P_FAMILY_SIGILYPH -#if P_FAMILY_YAMASK -SINGLE_ANIMATION(Yamask); -SINGLE_ANIMATION(Cofagrigus); -#endif //P_FAMILY_YAMASK -#if P_FAMILY_TIRTOUGA -SINGLE_ANIMATION(Tirtouga); -SINGLE_ANIMATION(Carracosta); -#endif //P_FAMILY_TIRTOUGA -#if P_FAMILY_ARCHEN -SINGLE_ANIMATION(Archen); -SINGLE_ANIMATION(Archeops); -#endif //P_FAMILY_ARCHEN -#if P_FAMILY_TRUBBISH -SINGLE_ANIMATION(Trubbish); -SINGLE_ANIMATION(Garbodor); -#endif //P_FAMILY_TRUBBISH -#if P_FAMILY_ZORUA -SINGLE_ANIMATION(Zorua); -SINGLE_ANIMATION(Zoroark); -#endif //P_FAMILY_ZORUA -#if P_FAMILY_MINCCINO -SINGLE_ANIMATION(Minccino); -SINGLE_ANIMATION(Cinccino); -#endif //P_FAMILY_MINCCINO -#if P_FAMILY_GOTHITA -SINGLE_ANIMATION(Gothita); -SINGLE_ANIMATION(Gothorita); -SINGLE_ANIMATION(Gothitelle); -#endif //P_FAMILY_GOTHITA -#if P_FAMILY_SOLOSIS -SINGLE_ANIMATION(Solosis); -SINGLE_ANIMATION(Duosion); -SINGLE_ANIMATION(Reuniclus); -#endif //P_FAMILY_SOLOSIS -#if P_FAMILY_DUCKLETT -SINGLE_ANIMATION(Ducklett); -SINGLE_ANIMATION(Swanna); -#endif //P_FAMILY_DUCKLETT -#if P_FAMILY_VANILLITE -SINGLE_ANIMATION(Vanillite); -SINGLE_ANIMATION(Vanillish); -SINGLE_ANIMATION(Vanilluxe); -#endif //P_FAMILY_VANILLITE -#if P_FAMILY_DEERLING -SINGLE_ANIMATION(Deerling); -SINGLE_ANIMATION(Sawsbuck); -#endif //P_FAMILY_DEERLING -#if P_FAMILY_EMOLGA -SINGLE_ANIMATION(Emolga); -#endif //P_FAMILY_EMOLGA -#if P_FAMILY_KARRABLAST -SINGLE_ANIMATION(Karrablast); -SINGLE_ANIMATION(Escavalier); -#endif //P_FAMILY_KARRABLAST -#if P_FAMILY_FOONGUS -SINGLE_ANIMATION(Foongus); -SINGLE_ANIMATION(Amoonguss); -#endif //P_FAMILY_FOONGUS -#if P_FAMILY_FRILLISH -SINGLE_ANIMATION(Frillish); -SINGLE_ANIMATION(Jellicent); -#endif //P_FAMILY_FRILLISH -#if P_FAMILY_ALOMOMOLA -SINGLE_ANIMATION(Alomomola); -#endif //P_FAMILY_ALOMOMOLA -#if P_FAMILY_JOLTIK -SINGLE_ANIMATION(Joltik); -SINGLE_ANIMATION(Galvantula); -#endif //P_FAMILY_JOLTIK -#if P_FAMILY_FERROSEED -SINGLE_ANIMATION(Ferroseed); -SINGLE_ANIMATION(Ferrothorn); -#endif //P_FAMILY_FERROSEED -#if P_FAMILY_KLINK -SINGLE_ANIMATION(Klink); -SINGLE_ANIMATION(Klang); -SINGLE_ANIMATION(Klinklang); -#endif //P_FAMILY_KLINK -#if P_FAMILY_TYNAMO -SINGLE_ANIMATION(Tynamo); -SINGLE_ANIMATION(Eelektrik); -SINGLE_ANIMATION(Eelektross); -#endif //P_FAMILY_TYNAMO -#if P_FAMILY_ELGYEM -SINGLE_ANIMATION(Elgyem); -SINGLE_ANIMATION(Beheeyem); -#endif //P_FAMILY_ELGYEM -#if P_FAMILY_LITWICK -SINGLE_ANIMATION(Litwick); -SINGLE_ANIMATION(Lampent); -SINGLE_ANIMATION(Chandelure); -#endif //P_FAMILY_LITWICK -#if P_FAMILY_AXEW -SINGLE_ANIMATION(Axew); -SINGLE_ANIMATION(Fraxure); -SINGLE_ANIMATION(Haxorus); -#endif //P_FAMILY_AXEW -#if P_FAMILY_CUBCHOO -SINGLE_ANIMATION(Cubchoo); -SINGLE_ANIMATION(Beartic); -#endif //P_FAMILY_CUBCHOO -#if P_FAMILY_CRYOGONAL -SINGLE_ANIMATION(Cryogonal); -#endif //P_FAMILY_CRYOGONAL -#if P_FAMILY_SHELMET -SINGLE_ANIMATION(Shelmet); -SINGLE_ANIMATION(Accelgor); -#endif //P_FAMILY_SHELMET -#if P_FAMILY_STUNFISK -SINGLE_ANIMATION(Stunfisk); -#endif //P_FAMILY_STUNFISK -#if P_FAMILY_MIENFOO -SINGLE_ANIMATION(Mienfoo); -SINGLE_ANIMATION(Mienshao); -#endif //P_FAMILY_MIENFOO -#if P_FAMILY_DRUDDIGON -SINGLE_ANIMATION(Druddigon); -#endif //P_FAMILY_DRUDDIGON -#if P_FAMILY_GOLETT -SINGLE_ANIMATION(Golett); -SINGLE_ANIMATION(Golurk); -#endif //P_FAMILY_GOLETT -#if P_FAMILY_PAWNIARD -SINGLE_ANIMATION(Pawniard); -SINGLE_ANIMATION(Bisharp); -#endif //P_FAMILY_PAWNIARD -#if P_FAMILY_BOUFFALANT -SINGLE_ANIMATION(Bouffalant); -#endif //P_FAMILY_BOUFFALANT -#if P_FAMILY_RUFFLET -SINGLE_ANIMATION(Rufflet); -SINGLE_ANIMATION(Braviary); -#endif //P_FAMILY_RUFFLET -#if P_FAMILY_VULLABY -SINGLE_ANIMATION(Vullaby); -SINGLE_ANIMATION(Mandibuzz); -#endif //P_FAMILY_VULLABY -#if P_FAMILY_HEATMOR -SINGLE_ANIMATION(Heatmor); -#endif //P_FAMILY_HEATMOR -#if P_FAMILY_DURANT -SINGLE_ANIMATION(Durant); -#endif //P_FAMILY_DURANT -#if P_FAMILY_DEINO -SINGLE_ANIMATION(Deino); -SINGLE_ANIMATION(Zweilous); -SINGLE_ANIMATION(Hydreigon); -#endif //P_FAMILY_DEINO -#if P_FAMILY_LARVESTA -SINGLE_ANIMATION(Larvesta); -SINGLE_ANIMATION(Volcarona); -#endif //P_FAMILY_LARVESTA -#if P_FAMILY_COBALION -SINGLE_ANIMATION(Cobalion); -#endif //P_FAMILY_COBALION -#if P_FAMILY_TERRAKION -SINGLE_ANIMATION(Terrakion); -#endif //P_FAMILY_TERRAKION -#if P_FAMILY_VIRIZION -SINGLE_ANIMATION(Virizion); -#endif //P_FAMILY_VIRIZION -#if P_FAMILY_TORNADUS -SINGLE_ANIMATION(TornadusIncarnate); -SINGLE_ANIMATION(TornadusTherian); -#endif //P_FAMILY_TORNADUS -#if P_FAMILY_THUNDURUS -SINGLE_ANIMATION(ThundurusIncarnate); -SINGLE_ANIMATION(ThundurusTherian); -#endif //P_FAMILY_THUNDURUS -#if P_FAMILY_RESHIRAM -SINGLE_ANIMATION(Reshiram); -#endif //P_FAMILY_RESHIRAM -#if P_FAMILY_ZEKROM -SINGLE_ANIMATION(Zekrom); -#endif //P_FAMILY_ZEKROM -#if P_FAMILY_LANDORUS -SINGLE_ANIMATION(LandorusIncarnate); -SINGLE_ANIMATION(LandorusTherian); -#endif //P_FAMILY_LANDORUS -#if P_FAMILY_KYUREM -SINGLE_ANIMATION(Kyurem); -#if P_FUSION_FORMS -SINGLE_ANIMATION(KyuremWhite); -SINGLE_ANIMATION(KyuremBlack); -#endif //P_FUSION_FORMS -#endif //P_FAMILY_KYUREM -#if P_FAMILY_KELDEO -SINGLE_ANIMATION(KeldeoOrdinary); -SINGLE_ANIMATION(KeldeoResolute); -#endif //P_FAMILY_KELDEO -#if P_FAMILY_MELOETTA -SINGLE_ANIMATION(MeloettaAria); -SINGLE_ANIMATION(MeloettaPirouette); -#endif //P_FAMILY_MELOETTA -#if P_FAMILY_GENESECT -SINGLE_ANIMATION(Genesect); -#endif //P_FAMILY_GENESECT -#if P_FAMILY_CHESPIN -SINGLE_ANIMATION(Chespin); -SINGLE_ANIMATION(Quilladin); -SINGLE_ANIMATION(Chesnaught); -#endif //P_FAMILY_CHESPIN -#if P_FAMILY_FENNEKIN -SINGLE_ANIMATION(Fennekin); -SINGLE_ANIMATION(Braixen); -SINGLE_ANIMATION(Delphox); -#endif //P_FAMILY_FENNEKIN -#if P_FAMILY_FROAKIE -SINGLE_ANIMATION(Froakie); -SINGLE_ANIMATION(Frogadier); -SINGLE_ANIMATION(Greninja); -SINGLE_ANIMATION(GreninjaAsh); -#endif //P_FAMILY_FROAKIE -#if P_FAMILY_BUNNELBY -SINGLE_ANIMATION(Bunnelby); -SINGLE_ANIMATION(Diggersby); -#endif //P_FAMILY_BUNNELBY -#if P_FAMILY_FLETCHLING -SINGLE_ANIMATION(Fletchling); -SINGLE_ANIMATION(Fletchinder); -SINGLE_ANIMATION(Talonflame); -#endif //P_FAMILY_FLETCHLING -#if P_FAMILY_SCATTERBUG -SINGLE_ANIMATION(Scatterbug); -SINGLE_ANIMATION(Spewpa); -SINGLE_ANIMATION(Vivillon); -#endif //P_FAMILY_SCATTERBUG -#if P_FAMILY_LITLEO -SINGLE_ANIMATION(Litleo); -SINGLE_ANIMATION(Pyroar); -#endif //P_FAMILY_LITLEO -#if P_FAMILY_FLABEBE -SINGLE_ANIMATION(Flabebe); -SINGLE_ANIMATION(Floette); -SINGLE_ANIMATION(Florges); -#endif //P_FAMILY_FLABEBE -#if P_FAMILY_SKIDDO -SINGLE_ANIMATION(Skiddo); -SINGLE_ANIMATION(Gogoat); -#endif //P_FAMILY_SKIDDO -#if P_FAMILY_PANCHAM -SINGLE_ANIMATION(Pancham); -SINGLE_ANIMATION(Pangoro); -#endif //P_FAMILY_PANCHAM -#if P_FAMILY_FURFROU -SINGLE_ANIMATION(Furfrou); -#endif //P_FAMILY_FURFROU -#if P_FAMILY_ESPURR -SINGLE_ANIMATION(Espurr); -SINGLE_ANIMATION(Meowstic); -#endif //P_FAMILY_ESPURR -#if P_FAMILY_HONEDGE -SINGLE_ANIMATION(Honedge); -SINGLE_ANIMATION(Doublade); -SINGLE_ANIMATION(AegislashShield); -SINGLE_ANIMATION(AegislashBlade); -#endif //P_FAMILY_HONEDGE -#if P_FAMILY_SPRITZEE -SINGLE_ANIMATION(Spritzee); -SINGLE_ANIMATION(Aromatisse); -#endif //P_FAMILY_SPRITZEE -#if P_FAMILY_SWIRLIX -SINGLE_ANIMATION(Swirlix); -SINGLE_ANIMATION(Slurpuff); -#endif //P_FAMILY_SWIRLIX -#if P_FAMILY_INKAY -SINGLE_ANIMATION(Inkay); -SINGLE_ANIMATION(Malamar); -#endif //P_FAMILY_INKAY -#if P_FAMILY_BINACLE -SINGLE_ANIMATION(Binacle); -SINGLE_ANIMATION(Barbaracle); -#endif //P_FAMILY_BINACLE -#if P_FAMILY_SKRELP -SINGLE_ANIMATION(Skrelp); -SINGLE_ANIMATION(Dragalge); -#endif //P_FAMILY_SKRELP -#if P_FAMILY_CLAUNCHER -SINGLE_ANIMATION(Clauncher); -SINGLE_ANIMATION(Clawitzer); -#endif //P_FAMILY_CLAUNCHER -#if P_FAMILY_HELIOPTILE -SINGLE_ANIMATION(Helioptile); -SINGLE_ANIMATION(Heliolisk); -#endif //P_FAMILY_HELIOPTILE -#if P_FAMILY_TYRUNT -SINGLE_ANIMATION(Tyrunt); -SINGLE_ANIMATION(Tyrantrum); -#endif //P_FAMILY_TYRUNT -#if P_FAMILY_AMAURA -SINGLE_ANIMATION(Amaura); -SINGLE_ANIMATION(Aurorus); -#endif //P_FAMILY_AMAURA -#if P_FAMILY_HAWLUCHA -SINGLE_ANIMATION(Hawlucha); -#endif //P_FAMILY_HAWLUCHA -#if P_FAMILY_DEDENNE -SINGLE_ANIMATION(Dedenne); -#endif //P_FAMILY_DEDENNE -#if P_FAMILY_CARBINK -SINGLE_ANIMATION(Carbink); -#endif //P_FAMILY_CARBINK -#if P_FAMILY_GOOMY -SINGLE_ANIMATION(Goomy); -SINGLE_ANIMATION(Sliggoo); -SINGLE_ANIMATION(Goodra); -#endif //P_FAMILY_GOOMY -#if P_FAMILY_KLEFKI -SINGLE_ANIMATION(Klefki); -#endif //P_FAMILY_KLEFKI -#if P_FAMILY_PHANTUMP -SINGLE_ANIMATION(Phantump); -SINGLE_ANIMATION(Trevenant); -#endif //P_FAMILY_PHANTUMP -#if P_FAMILY_PUMPKABOO -SINGLE_ANIMATION(Pumpkaboo); -SINGLE_ANIMATION(Gourgeist); -#endif //P_FAMILY_PUMPKABOO -#if P_FAMILY_BERGMITE -SINGLE_ANIMATION(Bergmite); -SINGLE_ANIMATION(Avalugg); -#endif //P_FAMILY_BERGMITE -#if P_FAMILY_NOIBAT -SINGLE_ANIMATION(Noibat); -SINGLE_ANIMATION(Noivern); -#endif //P_FAMILY_NOIBAT -#if P_FAMILY_XERNEAS -SINGLE_ANIMATION(Xerneas); -#endif //P_FAMILY_XERNEAS -#if P_FAMILY_YVELTAL -SINGLE_ANIMATION(Yveltal); -#endif //P_FAMILY_YVELTAL -#if P_FAMILY_ZYGARDE -SINGLE_ANIMATION(Zygarde50); -SINGLE_ANIMATION(Zygarde10); -SINGLE_ANIMATION(ZygardeComplete); -#endif //P_FAMILY_ZYGARDE -#if P_FAMILY_DIANCIE -SINGLE_ANIMATION(Diancie); -#endif //P_FAMILY_DIANCIE -#if P_FAMILY_HOOPA -SINGLE_ANIMATION(HoopaConfined); -SINGLE_ANIMATION(HoopaUnbound); -#endif //P_FAMILY_HOOPA -#if P_FAMILY_VOLCANION -SINGLE_ANIMATION(Volcanion); -#endif //P_FAMILY_VOLCANION -#if P_FAMILY_ROWLET -SINGLE_ANIMATION(Rowlet); -SINGLE_ANIMATION(Dartrix); -SINGLE_ANIMATION(Decidueye); -#endif //P_FAMILY_ROWLET -#if P_FAMILY_PIKIPEK -SINGLE_ANIMATION(Pikipek); -SINGLE_ANIMATION(Trumbeak); -SINGLE_ANIMATION(Toucannon); -#endif //P_FAMILY_PIKIPEK -#if P_FAMILY_GRUBBIN -SINGLE_ANIMATION(Grubbin); -SINGLE_ANIMATION(Charjabug); -SINGLE_ANIMATION(Vikavolt); -#endif //P_FAMILY_GRUBBIN -#if P_FAMILY_CUTIEFLY -SINGLE_ANIMATION(Cutiefly); -SINGLE_ANIMATION(Ribombee); -#endif //P_FAMILY_CUTIEFLY -#if P_FAMILY_ROCKRUFF -SINGLE_ANIMATION(Rockruff); -SINGLE_ANIMATION(LycanrocMidday); -SINGLE_ANIMATION(LycanrocMidnight); -SINGLE_ANIMATION(LycanrocDusk); -#endif //P_FAMILY_ROCKRUFF -#if P_FAMILY_DEWPIDER -SINGLE_ANIMATION(Dewpider); -SINGLE_ANIMATION(Araquanid); -#endif //P_FAMILY_DEWPIDER -#if P_FAMILY_SALANDIT -SINGLE_ANIMATION(Salandit); -SINGLE_ANIMATION(Salazzle); -#endif //P_FAMILY_SALANDIT -#if P_FAMILY_STUFFUL -SINGLE_ANIMATION(Stufful); -SINGLE_ANIMATION(Bewear); -#endif //P_FAMILY_STUFFUL -#if P_FAMILY_ORANGURU -SINGLE_ANIMATION(Oranguru); -#endif //P_FAMILY_ORANGURU -#if P_FAMILY_PASSIMIAN -SINGLE_ANIMATION(Passimian); -#endif //P_FAMILY_PASSIMIAN -#if P_FAMILY_WIMPOD -SINGLE_ANIMATION(Wimpod); -SINGLE_ANIMATION(Golisopod); -#endif //P_FAMILY_WIMPOD -#if P_FAMILY_PYUKUMUKU -SINGLE_ANIMATION(Pyukumuku); -#endif //P_FAMILY_PYUKUMUKU -#if P_FAMILY_TURTONATOR -SINGLE_ANIMATION(Turtonator); -#endif //P_FAMILY_TURTONATOR -#if P_FAMILY_TOGEDEMARU -SINGLE_ANIMATION(Togedemaru); -#endif //P_FAMILY_TOGEDEMARU -#if P_FAMILY_DRAMPA -SINGLE_ANIMATION(Drampa); -#endif //P_FAMILY_DRAMPA -#if P_FAMILY_JANGMO_O -SINGLE_ANIMATION(Jangmo_O); -SINGLE_ANIMATION(Hakamo_O); -SINGLE_ANIMATION(Kommo_O); -#endif //P_FAMILY_JANGMO_O -#if P_FAMILY_TAPU_KOKO -SINGLE_ANIMATION(TapuKoko); -#endif //P_FAMILY_TAPU_KOKO -#if P_FAMILY_TAPU_LELE -SINGLE_ANIMATION(TapuLele); -#endif //P_FAMILY_TAPU_LELE -#if P_FAMILY_TAPU_BULU -SINGLE_ANIMATION(TapuBulu); -#endif //P_FAMILY_TAPU_BULU -#if P_FAMILY_TAPU_FINI -SINGLE_ANIMATION(TapuFini); -#endif //P_FAMILY_TAPU_FINI -#if P_FAMILY_MARSHADOW -SINGLE_ANIMATION(Marshadow); -#endif //P_FAMILY_MARSHADOW -#if P_FAMILY_ROOKIDEE -SINGLE_ANIMATION(Rookidee); -SINGLE_ANIMATION(Corvisquire); -SINGLE_ANIMATION(Corviknight); -#endif //P_FAMILY_ROOKIDEE -#if P_FAMILY_CHEWTLE -SINGLE_ANIMATION(Chewtle); -SINGLE_ANIMATION(Drednaw); -#endif //P_FAMILY_CHEWTLE -#if P_FAMILY_SIZZLIPEDE -SINGLE_ANIMATION(Sizzlipede); -SINGLE_ANIMATION(Centiskorch); -#endif //P_FAMILY_SIZZLIPEDE -#if P_FAMILY_TERAPAGOS -#endif //P_FAMILY_TERAPAGOS -SINGLE_ANIMATION(Egg); diff --git a/src/pokemon.c b/src/pokemon.c index c8ebdb7fff5d..c43a14b47499 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -675,7 +675,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"