From b11f4a1d04362ff526121f15acde6d0b5b9b90d1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 29 Oct 2024 11:43:31 -0300 Subject: [PATCH] Unified object event data macros for oveworld mon --- src/data/pokemon/species_info.h | 38 +++------ .../pokemon/species_info/gen_1_families.h | 84 ++++++++++++------- .../pokemon/species_info/gen_2_families.h | 69 ++++++++++----- .../pokemon/species_info/gen_3_families.h | 57 ++++++++----- .../pokemon/species_info/gen_4_families.h | 72 ++++++++++------ .../pokemon/species_info/gen_5_families.h | 3 + .../pokemon/species_info/gen_6_families.h | 3 +- 7 files changed, 204 insertions(+), 122 deletions(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index ecb3dee5d2a2..08482c28b9c3 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -42,10 +42,8 @@ #define OVERWORLD_PAL_FEMALE(...) #endif //OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE -#define OVERWORLD_TEMP() - -#define OVERWORLD(objEventPic, _size, shadow, _tracks, _anims, ...) \ -.overworldData = { \ +#define OVERWORLD_DATA(objEventPic, _size, shadow, _tracks, _anims) \ +{ \ .tileTag = TAG_NONE, \ .paletteTag = OBJ_EVENT_PAL_TAG_DYNAMIC, \ .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, \ @@ -62,37 +60,23 @@ .anims = _anims, \ .images = (const struct SpriteFrameImage[]) { overworld_ascending_frames(objEventPic, 4, 4), }, \ .affineAnims = gDummySpriteAffineAnimTable, \ -}, \ +} + +#define OVERWORLD(objEventPic, _size, shadow, _tracks, _anims, ...) \ + .overworldData = OVERWORLD_DATA(objEventPic, _size, shadow, _tracks, _anims), \ OVERWORLD_PAL(__VA_ARGS__) #if P_GENDER_DIFFERENCES -#define OVERWORLD_FEMALE(objEventPic, _size, shadow, _tracks, ...) \ -.overworldDataFemale = { \ - .tileTag = TAG_NONE, \ - .paletteTag = OBJ_EVENT_PAL_TAG_DYNAMIC, \ - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, \ - .size = (_size == SIZE_32x32 ? 512 : 2048), \ - .width = (_size == SIZE_32x32 ? 32 : 64), \ - .height = (_size == SIZE_32x32 ? 32 : 64), \ - .paletteSlot = PALSLOT_NPC_1, \ - .shadowSize = shadow, \ - .inanimate = FALSE, \ - .compressed = COMP, \ - .tracks = _tracks, \ - .oam = (_size == SIZE_32x32 ? &gObjectEventBaseOam_32x32 : &gObjectEventBaseOam_64x64), \ - .subspriteTables = (_size == SIZE_32x32 ? sOamTables_32x32 : sOamTables_64x64), \ - .anims = sAnimTable_Following, \ - .images = (const struct SpriteFrameImage[]) { overworld_ascending_frames(objEventPic, 4, 4), }, \ - .affineAnims = gDummySpriteAffineAnimTable, \ -}, \ +#define OVERWORLD_FEMALE(objEventPic, _size, shadow, _tracks, _anims, ...) \ + .overworldDataFemale = OVERWORLD_DATA(objEventPic, _size, shadow, _tracks, _anims), \ OVERWORLD_PAL_FEMALE(__VA_ARGS__) #else -#define OVERWORLD_FEMALE(picTable, _size, shadow, _tracks, ...) +#define OVERWORLD_FEMALE(...) #endif //P_GENDER_DIFFERENCES #else -#define OVERWORLD(picTable, _size, shadow, _tracks, _anims, ...) -#define OVERWORLD_FEMALE(picTable, _size, shadow, _tracks, ...) +#define OVERWORLD(...) +#define OVERWORLD_FEMALE(...) #define OVERWORLD_PAL(...) #define OVERWORLD_PAL_FEMALE(...) #endif //OW_POKEMON_OBJECT_EVENTS diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index e497b415f038..6857ce699a95 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -207,7 +207,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_VenusaurF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sVenusaurLevelUpLearnset, .teachableLearnset = sVenusaurTeachableLearnset, @@ -1231,7 +1232,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_ButterfreeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sButterfreeLevelUpLearnset, .teachableLearnset = sButterfreeTeachableLearnset, @@ -1916,7 +1918,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RattataF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRattataLevelUpLearnset, .teachableLearnset = sRattataTeachableLearnset, @@ -1993,7 +1996,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RaticateF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRaticateLevelUpLearnset, .teachableLearnset = sRaticateTeachableLearnset, @@ -2665,7 +2669,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_PikachuF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3642,7 +3647,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RaichuF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRaichuLevelUpLearnset, .teachableLearnset = sRaichuTeachableLearnset, @@ -5192,7 +5198,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_ZubatF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sZubatLevelUpLearnset, .teachableLearnset = sZubatTeachableLearnset, @@ -5269,7 +5276,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_GolbatF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGolbatLevelUpLearnset, .teachableLearnset = sGolbatTeachableLearnset, @@ -5483,7 +5491,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_GloomF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGloomLevelUpLearnset, .teachableLearnset = sGloomTeachableLearnset, @@ -5568,7 +5577,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_VileplumeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sVileplumeLevelUpLearnset, .teachableLearnset = sVileplumeTeachableLearnset, @@ -7554,7 +7564,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_PolitoedF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sPolitoedLevelUpLearnset, .teachableLearnset = sPolitoedTeachableLearnset, @@ -7704,7 +7715,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_KadabraF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sKadabraLevelUpLearnset, .teachableLearnset = sKadabraTeachableLearnset, @@ -7791,7 +7803,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_AlakazamF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sAlakazamLevelUpLearnset, .teachableLearnset = sAlakazamTeachableLearnset, @@ -10105,7 +10118,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_DoduoF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sDoduoLevelUpLearnset, .teachableLearnset = sDoduoTeachableLearnset, @@ -10188,7 +10202,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_DodrioF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sDodrioLevelUpLearnset, .teachableLearnset = sDodrioTeachableLearnset, @@ -11204,7 +11219,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_SteelixF, SIZE_64x64, SHADOW_SIZE_M, - TRACKS_SLITHER + TRACKS_SLITHER, + sAnimTable_Following ) .levelUpLearnset = sSteelixLevelUpLearnset, .teachableLearnset = sSteelixTeachableLearnset, @@ -11416,7 +11432,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_HypnoF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sHypnoLevelUpLearnset, .teachableLearnset = sHypnoTeachableLearnset, @@ -13038,7 +13055,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RhyhornF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRhyhornLevelUpLearnset, .teachableLearnset = sRhyhornTeachableLearnset, @@ -13114,7 +13132,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RhydonF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRhydonLevelUpLearnset, .teachableLearnset = sRhydonTeachableLearnset, @@ -13197,7 +13216,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_RhyperiorF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRhyperiorLevelUpLearnset, .teachableLearnset = sRhyperiorTeachableLearnset, @@ -13541,7 +13561,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_TangrowthF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sTangrowthLevelUpLearnset, .teachableLearnset = sTangrowthTeachableLearnset, @@ -13963,7 +13984,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_GoldeenF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SPOT + TRACKS_SPOT, + sAnimTable_Following ) .levelUpLearnset = sGoldeenLevelUpLearnset, .teachableLearnset = sGoldeenTeachableLearnset, @@ -14040,7 +14062,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_SeakingF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SPOT + TRACKS_SPOT, + sAnimTable_Following ) .levelUpLearnset = sSeakingLevelUpLearnset, .teachableLearnset = sSeakingTeachableLearnset, @@ -14525,7 +14548,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_ScytherF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sScytherLevelUpLearnset, .teachableLearnset = sScytherTeachableLearnset, @@ -14607,7 +14631,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_ScizorF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sScizorLevelUpLearnset, .teachableLearnset = sScizorTeachableLearnset, @@ -15760,7 +15785,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_MagikarpF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SPOT + TRACKS_SPOT, + sAnimTable_Following ) .tmIlliterate = TRUE, .levelUpLearnset = sMagikarpLevelUpLearnset, @@ -15836,7 +15862,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_GyaradosF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SLITHER + TRACKS_SLITHER, + sAnimTable_Following ) .levelUpLearnset = sGyaradosLevelUpLearnset, .teachableLearnset = sGyaradosTeachableLearnset, @@ -16170,7 +16197,8 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gObjectEventPic_EeveeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sEeveeLevelUpLearnset, .teachableLearnset = sEeveeTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index f7e55fc98df2..be8bc85275dd 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -207,7 +207,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_MeganiumF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sMeganiumLevelUpLearnset, .teachableLearnset = sMeganiumTeachableLearnset, @@ -1015,7 +1016,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_LedybaF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_BUG + TRACKS_BUG, + sAnimTable_Following ) .levelUpLearnset = sLedybaLevelUpLearnset, .teachableLearnset = sLedybaTeachableLearnset, @@ -1092,7 +1094,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_LedianF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sLedianLevelUpLearnset, .teachableLearnset = sLedianTeachableLearnset, @@ -1700,7 +1703,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_XatuF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sXatuLevelUpLearnset, .teachableLearnset = sXatuTeachableLearnset, @@ -2319,7 +2323,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_SudowoodoF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sSudowoodoLevelUpLearnset, .teachableLearnset = sSudowoodoTeachableLearnset, @@ -2610,7 +2615,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_AipomF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sAipomLevelUpLearnset, .teachableLearnset = sAipomTeachableLearnset, @@ -2687,7 +2693,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_AmbipomF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sAmbipomLevelUpLearnset, .teachableLearnset = sAmbipomTeachableLearnset, @@ -3034,7 +3041,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_WooperF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sWooperLevelUpLearnset, .teachableLearnset = sWooperTeachableLearnset, @@ -3111,7 +3119,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_QuagsireF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sQuagsireLevelUpLearnset, .teachableLearnset = sQuagsireTeachableLearnset, @@ -3322,7 +3331,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_MurkrowF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sMurkrowLevelUpLearnset, .teachableLearnset = sMurkrowTeachableLearnset, @@ -3763,7 +3773,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_WobbuffetF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .tmIlliterate = TRUE, .levelUpLearnset = sWobbuffetLevelUpLearnset, @@ -3840,7 +3851,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_GirafarigF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGirafarigLevelUpLearnset, .teachableLearnset = sGirafarigTeachableLearnset, @@ -4313,7 +4325,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_GligarF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sGligarLevelUpLearnset, .teachableLearnset = sGligarTeachableLearnset, @@ -4877,7 +4890,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_HeracrossF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sHeracrossLevelUpLearnset, .teachableLearnset = sHeracrossTeachableLearnset, @@ -5017,7 +5031,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_SneaselF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sSneaselLevelUpLearnset, .teachableLearnset = sSneaselTeachableLearnset, @@ -5098,7 +5113,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_WeavileF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sWeavileLevelUpLearnset, .teachableLearnset = sWeavileTeachableLearnset, @@ -5176,7 +5192,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_SneaselHisuiF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .isHisuianForm = TRUE, .levelUpLearnset = sSneaselHisuiLevelUpLearnset, @@ -5393,7 +5410,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_UrsaringF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sUrsaringLevelUpLearnset, .teachableLearnset = sUrsaringTeachableLearnset, @@ -5797,7 +5815,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_PiloswineF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sPiloswineLevelUpLearnset, .teachableLearnset = sPiloswineTeachableLearnset, @@ -5877,7 +5896,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_MamoswineF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sMamoswineLevelUpLearnset, .teachableLearnset = sMamoswineTeachableLearnset, @@ -6236,7 +6256,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_OctilleryF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SLITHER + TRACKS_SLITHER, + sAnimTable_Following ) .levelUpLearnset = sOctilleryLevelUpLearnset, .teachableLearnset = sOctilleryTeachableLearnset, @@ -6645,7 +6666,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_HoundoomF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sHoundoomLevelUpLearnset, .teachableLearnset = sHoundoomTeachableLearnset, @@ -6845,7 +6867,8 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gObjectEventPic_DonphanF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sDonphanLevelUpLearnset, .teachableLearnset = sDonphanTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index b0448dabd329..144e75b371a5 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -327,7 +327,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_TorchicF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sTorchicLevelUpLearnset, .teachableLearnset = sTorchicTeachableLearnset, @@ -404,7 +405,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_CombuskenF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sCombuskenLevelUpLearnset, .teachableLearnset = sCombuskenTeachableLearnset, @@ -485,7 +487,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_BlazikenF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sBlazikenLevelUpLearnset, .teachableLearnset = sBlazikenTeachableLearnset, @@ -1512,7 +1515,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_BeautiflyF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sBeautiflyLevelUpLearnset, .teachableLearnset = sBeautiflyTeachableLearnset, @@ -1668,7 +1672,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_DustoxF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sDustoxLevelUpLearnset, .teachableLearnset = sDustoxTeachableLearnset, @@ -1880,7 +1885,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_LudicoloF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sLudicoloLevelUpLearnset, .teachableLearnset = sLudicoloTeachableLearnset, @@ -2022,7 +2028,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_NuzleafF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sNuzleafLevelUpLearnset, .teachableLearnset = sNuzleafTeachableLearnset, @@ -2108,7 +2115,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_ShiftryF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sShiftryLevelUpLearnset, .teachableLearnset = sShiftryTeachableLearnset, @@ -4668,7 +4676,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_MedititeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sMedititeLevelUpLearnset, .teachableLearnset = sMedititeTeachableLearnset, @@ -4744,7 +4753,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_MedichamF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sMedichamLevelUpLearnset, .teachableLearnset = sMedichamTeachableLearnset, @@ -5423,7 +5433,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_RoseliaF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRoseliaLevelUpLearnset, .teachableLearnset = sRoseliaTeachableLearnset, @@ -5510,7 +5521,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_RoseradeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sRoseradeLevelUpLearnset, .teachableLearnset = sRoseradeTeachableLearnset, @@ -5589,7 +5601,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_GulpinF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SPOT + TRACKS_SPOT, + sAnimTable_Following ) .levelUpLearnset = sGulpinLevelUpLearnset, .teachableLearnset = sGulpinTeachableLearnset, @@ -5667,7 +5680,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_SwalotF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SLITHER + TRACKS_SLITHER, + sAnimTable_Following ) .levelUpLearnset = sSwalotLevelUpLearnset, .teachableLearnset = sSwalotTeachableLearnset, @@ -6068,7 +6082,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_NumelF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sNumelLevelUpLearnset, .teachableLearnset = sNumelTeachableLearnset, @@ -6149,7 +6164,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_CameruptF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sCameruptLevelUpLearnset, .teachableLearnset = sCameruptTeachableLearnset, @@ -6833,7 +6849,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_CacturneF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sCacturneLevelUpLearnset, .teachableLearnset = sCacturneTeachableLearnset, @@ -8134,7 +8151,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_MiloticF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_SLITHER + TRACKS_SLITHER, + sAnimTable_Following ) .levelUpLearnset = sMiloticLevelUpLearnset, .teachableLearnset = sMiloticTeachableLearnset, @@ -9994,7 +10012,8 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gObjectEventPic_RelicanthF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_NONE + TRACKS_NONE, + sAnimTable_Following ) .levelUpLearnset = sRelicanthLevelUpLearnset, .teachableLearnset = sRelicanthTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index 961c759b7e72..d80310a2ff4d 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -687,7 +687,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_StarlyF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sStarlyLevelUpLearnset, .teachableLearnset = sStarlyTeachableLearnset, @@ -763,7 +764,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_StaraviaF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sStaraviaLevelUpLearnset, .teachableLearnset = sStaraviaTeachableLearnset, @@ -844,7 +846,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_StaraptorF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sStaraptorLevelUpLearnset, .teachableLearnset = sStaraptorTeachableLearnset, @@ -920,7 +923,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_BidoofF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sBidoofLevelUpLearnset, .teachableLearnset = sBidoofTeachableLearnset, @@ -994,7 +998,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_BibarelF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sBibarelLevelUpLearnset, .teachableLearnset = sBibarelTeachableLearnset, @@ -1071,7 +1076,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_KricketotF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .tmIlliterate = TRUE, .levelUpLearnset = sKricketotLevelUpLearnset, @@ -1148,7 +1154,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_KricketuneF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sKricketuneLevelUpLearnset, .teachableLearnset = sKricketuneTeachableLearnset, @@ -1224,7 +1231,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_ShinxF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sShinxLevelUpLearnset, .teachableLearnset = sShinxTeachableLearnset, @@ -1300,7 +1308,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_LuxioF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sLuxioLevelUpLearnset, .teachableLearnset = sLuxioTeachableLearnset, @@ -1381,7 +1390,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_LuxrayF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sLuxrayLevelUpLearnset, .teachableLearnset = sLuxrayTeachableLearnset, @@ -2181,7 +2191,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_CombeeF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .tmIlliterate = TRUE, .levelUpLearnset = sCombeeLevelUpLearnset, @@ -2322,7 +2333,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_PachirisuF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sPachirisuLevelUpLearnset, .teachableLearnset = sPachirisuTeachableLearnset, @@ -2397,7 +2409,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_BuizelF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sBuizelLevelUpLearnset, .teachableLearnset = sBuizelTeachableLearnset, @@ -2471,7 +2484,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_FloatzelF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sFloatzelLevelUpLearnset, .teachableLearnset = sFloatzelTeachableLearnset, @@ -3831,7 +3845,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_GibleF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGibleLevelUpLearnset, .teachableLearnset = sGibleTeachableLearnset, @@ -3907,7 +3922,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_GabiteF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGabiteLevelUpLearnset, .teachableLearnset = sGabiteTeachableLearnset, @@ -3986,7 +4002,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_GarchompF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sGarchompLevelUpLearnset, .teachableLearnset = sGarchompTeachableLearnset, @@ -4314,7 +4331,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_HippopotasF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sHippopotasLevelUpLearnset, .teachableLearnset = sHippopotasTeachableLearnset, @@ -4597,7 +4615,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_CroagunkF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sCroagunkLevelUpLearnset, .teachableLearnset = sCroagunkTeachableLearnset, @@ -4674,7 +4693,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_ToxicroakF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sToxicroakLevelUpLearnset, .teachableLearnset = sToxicroakTeachableLearnset, @@ -4816,7 +4836,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_FinneonF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sFinneonLevelUpLearnset, .teachableLearnset = sFinneonTeachableLearnset, @@ -4892,7 +4913,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_LumineonF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sLumineonLevelUpLearnset, .teachableLearnset = sLumineonTeachableLearnset, @@ -4969,7 +4991,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_SnoverF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sSnoverLevelUpLearnset, .teachableLearnset = sSnoverTeachableLearnset, @@ -5045,7 +5068,8 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gObjectEventPic_AbomasnowF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sAbomasnowLevelUpLearnset, .teachableLearnset = sAbomasnowTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 6df576f694bc..d665761665af 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -1888,6 +1888,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, + sAnimTable_Following, gOverworldPalette_UnfezantF, gShinyOverworldPalette_UnfezantF ) @@ -7952,6 +7953,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, + sAnimTable_Following, gOverworldPalette_FrillishF, gShinyOverworldPalette_FrillishF ) @@ -8034,6 +8036,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, + sAnimTable_Following, gOverworldPalette_JellicentF, gShinyOverworldPalette_JellicentF ) diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 9d7abe563b17..35af532e6026 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -1550,7 +1550,8 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = gObjectEventPic_PyroarF, SIZE_32x32, SHADOW_SIZE_M, - TRACKS_FOOT + TRACKS_FOOT, + sAnimTable_Following ) .levelUpLearnset = sPyroarLevelUpLearnset, .teachableLearnset = sPyroarTeachableLearnset,