From cfea1327b49fde11215456cf8ace25d2002c37c8 Mon Sep 17 00:00:00 2001 From: cawtds <38510667+cawtds@users.noreply.github.com> Date: Thu, 20 Mar 2025 17:54:56 +0100 Subject: [PATCH] update species infos --- src/data/pokemon/species_info.h | 8 +- .../pokemon/species_info/gen_1_families.h | 1099 +++++++++++------ .../pokemon/species_info/gen_2_families.h | 380 ++++-- .../pokemon/species_info/gen_3_families.h | 556 ++++++--- .../pokemon/species_info/gen_4_families.h | 342 +++-- .../pokemon/species_info/gen_5_families.h | 562 ++++++--- .../pokemon/species_info/gen_6_families.h | 273 ++-- .../pokemon/species_info/gen_7_families.h | 331 +++-- .../pokemon/species_info/gen_8_families.h | 317 +++-- .../pokemon/species_info/gen_9_families.h | 493 +++++--- 10 files changed, 2842 insertions(+), 1519 deletions(-) diff --git a/src/data/pokemon/species_info.h b/src/data/pokemon/species_info.h index 9c2fc2450..7bd9e9f1f 100644 --- a/src/data/pokemon/species_info.h +++ b/src/data/pokemon/species_info.h @@ -45,7 +45,7 @@ #define OVERWORLD_PAL_FEMALE(...) #endif //OW_PKMN_OBJECTS_SHARE_PALETTES == FALSE -#define OVERWORLD_DATA(objEventPic, _size, shadow, _tracks, _anims) \ +#define OVERWORLD_DATA(picTable, _size, shadow, _tracks, _anims) \ { \ .tileTag = TAG_NONE, \ .paletteTag = OBJ_EVENT_PAL_TAG_DYNAMIC, \ @@ -61,7 +61,7 @@ .oam = (_size == SIZE_32x32 ? &gObjectEventBaseOam_32x32 : &gObjectEventBaseOam_64x64), \ .subspriteTables = (_size == SIZE_32x32 ? sOamTables_32x32 : sOamTables_64x64), \ .anims = _anims, \ - .images = (const struct SpriteFrameImage[]) { overworld_ascending_frames(objEventPic, SIZE_32x32 ? 4 : 8, SIZE_32x32 ? 4 : 8), }, \ + .images = picTable, \ .affineAnims = gDummySpriteAffineAnimTable, \ } @@ -122,7 +122,9 @@ const struct SpeciesInfo gSpeciesInfo[] = .shinyPalette = gMonShinyPalette_CircledQuestionMark, .iconSprite = gMonIcon_QuestionMark, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, FOOTPRINT(QuestionMark) + SHADOW(-1, 0, SHADOW_SIZE_M) #if OW_POKEMON_OBJECT_EVENTS .overworldData = { .tileTag = TAG_NONE, @@ -139,7 +141,7 @@ const struct SpeciesInfo gSpeciesInfo[] = .oam = &gObjectEventBaseOam_32x32, .subspriteTables = sOamTables_32x32, .anims = sAnimTable_Following, - .images = (const struct SpriteFrameImage[]) { overworld_ascending_frames(gObjectEventPic_Substitute, 4, 4), }, + .images = sPicTable_Substitute, .affineAnims = gDummySpriteAffineAnimTable, }, #endif diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index 2f5afa714..26b1afd7d 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -55,10 +55,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Bulbasaur, .iconSprite = gMonIcon_Bulbasaur, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, -1, SHADOW_SIZE_S) FOOTPRINT(Bulbasaur) OVERWORLD( - gObjectEventPic_Bulbasaur, + sPicTable_Bulbasaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -124,10 +125,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ivysaur, .iconSprite = gMonIcon_Ivysaur, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_L) FOOTPRINT(Ivysaur) OVERWORLD( - gObjectEventPic_Ivysaur, + sPicTable_Ivysaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -204,10 +206,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_VenusaurF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Venusaur) OVERWORLD( - gObjectEventPic_Venusaur, + sPicTable_Venusaur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -216,7 +219,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Venusaur ) OVERWORLD_FEMALE( - gObjectEventPic_VenusaurF, + sPicTable_VenusaurF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -276,11 +279,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VenusaurMega, .iconSprite = gMonIcon_VenusaurMega, .iconPalIndex = 4, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Venusaur) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_VenusaurMega, + sPicTable_VenusaurMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -346,6 +350,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VenusaurGmax, .iconSprite = gMonIcon_VenusaurGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Venusaur) .isGigantamax = TRUE, @@ -364,7 +369,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 52, .baseDefense = 43, .baseSpeed = 65, - .baseSpAttack = 60, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 60 : 50, .baseSpDefense = 50, .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, @@ -409,10 +414,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Charmander, .iconSprite = gMonIcon_Charmander, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Charmander) OVERWORLD( - gObjectEventPic_Charmander, + sPicTable_Charmander, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -432,7 +438,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 64, .baseDefense = 58, .baseSpeed = 80, - .baseSpAttack = 80, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 80 : 65, .baseSpDefense = 65, .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, @@ -478,10 +484,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Charmeleon, .iconSprite = gMonIcon_Charmeleon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Charmeleon) OVERWORLD( - gObjectEventPic_Charmeleon, + sPicTable_Charmeleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -500,7 +507,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 84, .baseDefense = 78, .baseSpeed = 100, - .baseSpAttack = 109, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 109 : 85, .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 45, @@ -550,10 +557,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Charizard, .iconSprite = gMonIcon_Charizard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_L) FOOTPRINT(Charizard) OVERWORLD( - gObjectEventPic_Charizard, + sPicTable_Charizard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -614,11 +622,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_CharizardMegaX, .iconSprite = gMonIcon_CharizardMegaX, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_L) FOOTPRINT(Charizard) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_CharizardMegaX, + sPicTable_CharizardMegaX, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -681,11 +690,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_CharizardMegaY, .iconSprite = gMonIcon_CharizardMegaY, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_L) FOOTPRINT(Charizard) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_CharizardMegaY, + sPicTable_CharizardMegaY, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -709,7 +719,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 84, .baseDefense = 78, .baseSpeed = 100, - .baseSpAttack = 109, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 109 : 85, .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 45, @@ -750,6 +760,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_CharizardGmax, .iconSprite = gMonIcon_CharizardGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Charizard) .isGigantamax = TRUE, @@ -769,7 +780,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 43, .baseSpAttack = 50, - .baseSpDefense = 64, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 64 : 50, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 63 : 66, @@ -814,10 +825,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Squirtle, .iconSprite = gMonIcon_Squirtle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 2, SHADOW_SIZE_S) FOOTPRINT(Squirtle) OVERWORLD( - gObjectEventPic_Squirtle, + sPicTable_Squirtle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -838,7 +850,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 58, .baseSpAttack = 65, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 65, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 142 : 143, @@ -883,10 +895,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Wartortle, .iconSprite = gMonIcon_Wartortle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_M) FOOTPRINT(Wartortle) OVERWORLD( - gObjectEventPic_Wartortle, + sPicTable_Wartortle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -906,7 +919,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 100, .baseSpeed = 78, .baseSpAttack = 85, - .baseSpDefense = 105, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 105 : 85, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -958,10 +971,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Blastoise, .iconSprite = gMonIcon_Blastoise, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Blastoise) OVERWORLD( - gObjectEventPic_Blastoise, + sPicTable_Blastoise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1023,11 +1037,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_BlastoiseMega, .iconSprite = gMonIcon_BlastoiseMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 11, SHADOW_SIZE_L) FOOTPRINT(Blastoise) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_BlastoiseMega, + sPicTable_BlastoiseMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1052,7 +1067,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 100, .baseSpeed = 78, .baseSpAttack = 85, - .baseSpDefense = 105, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 105 : 85, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = 239, @@ -1092,6 +1107,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_BlastoiseGmax, .iconSprite = gMonIcon_BlastoiseGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Blastoise) .isGigantamax = TRUE, @@ -1160,10 +1176,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Caterpie, .iconSprite = gMonIcon_Caterpie, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(4, 1, SHADOW_SIZE_S) FOOTPRINT(Caterpie) OVERWORLD( - gObjectEventPic_Caterpie, + sPicTable_Caterpie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1227,10 +1244,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Metapod, .iconSprite = gMonIcon_Metapod, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, 0, SHADOW_SIZE_S) FOOTPRINT(Metapod) OVERWORLD( - gObjectEventPic_Metapod, + sPicTable_Metapod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1324,10 +1342,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_ButterfreeF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Butterfree) OVERWORLD( - gObjectEventPic_Butterfree, + sPicTable_Butterfree, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1336,7 +1355,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Butterfree ) OVERWORLD_FEMALE( - gObjectEventPic_ButterfreeF, + sPicTable_ButterfreeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1399,6 +1418,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ButterfreeGmax, .iconSprite = gMonIcon_ButterfreeGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 15, SHADOW_SIZE_S) FOOTPRINT(Butterfree) .isGigantamax = TRUE, @@ -1467,10 +1487,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Weedle, .iconSprite = gMonIcon_Weedle, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Weedle) OVERWORLD( - gObjectEventPic_Weedle, + sPicTable_Weedle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1544,10 +1565,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kakuna, .iconSprite = gMonIcon_Kakuna, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Kakuna) OVERWORLD( - gObjectEventPic_Kakuna, + sPicTable_Kakuna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1570,7 +1592,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 40, .baseSpeed = 75, .baseSpAttack = 45, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 45, .types = MON_TYPES(TYPE_BUG, TYPE_POISON), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -1629,10 +1651,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Beedrill, .iconSprite = gMonIcon_Beedrill, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 15, SHADOW_SIZE_M) FOOTPRINT(Beedrill) OVERWORLD( - gObjectEventPic_Beedrill, + sPicTable_Beedrill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1697,11 +1720,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_BeedrillMega, .iconSprite = gMonIcon_BeedrillMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 14, SHADOW_SIZE_S) FOOTPRINT(Beedrill) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_BeedrillMega, + sPicTable_BeedrillMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1776,10 +1800,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pidgey, .iconSprite = gMonIcon_Pidgey, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Pidgey) OVERWORLD( - gObjectEventPic_Pidgey, + sPicTable_Pidgey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1851,10 +1876,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pidgeotto, .iconSprite = gMonIcon_Pidgeotto, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 6, SHADOW_SIZE_M) FOOTPRINT(Pidgeotto) OVERWORLD( - gObjectEventPic_Pidgeotto, + sPicTable_Pidgeotto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1932,10 +1958,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pidgeot, .iconSprite = gMonIcon_Pidgeot, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 14, SHADOW_SIZE_M) FOOTPRINT(Pidgeot) OVERWORLD( - gObjectEventPic_Pidgeot, + sPicTable_Pidgeot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1997,11 +2024,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PidgeotMega, .iconSprite = gMonIcon_PidgeotMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 19, SHADOW_SIZE_M) FOOTPRINT(Pidgeot) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_PidgeotMega, + sPicTable_PidgeotMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2027,7 +2055,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 35, .baseSpeed = 72, .baseSpAttack = 25, - .baseSpDefense = 35, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 35 : 25, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 51 : 57, @@ -2078,10 +2106,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_RattataF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, -3, SHADOW_SIZE_S) FOOTPRINT(Rattata) OVERWORLD( - gObjectEventPic_Rattata, + sPicTable_Rattata, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2090,7 +2119,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Rattata ) OVERWORLD_FEMALE( - gObjectEventPic_RattataF, + sPicTable_RattataF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2110,7 +2139,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 97, .baseSpAttack = 50, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 50, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 127, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 145 : 116, @@ -2169,10 +2198,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_RaticateF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 8, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( - gObjectEventPic_Raticate, + sPicTable_Raticate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2181,7 +2211,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Raticate ) OVERWORLD_FEMALE( - gObjectEventPic_RaticateF, + sPicTable_RaticateF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2241,10 +2271,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RattataAlola, .iconSprite = gMonIcon_RattataAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 2, SHADOW_SIZE_S) FOOTPRINT(Rattata) OVERWORLD( - gObjectEventPic_RattataAlola, + sPicTable_RattataAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2305,10 +2336,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RaticateAlola, .iconSprite = gMonIcon_RaticateAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-4, 3, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( - gObjectEventPic_RaticateAlola, + sPicTable_RaticateAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2366,10 +2398,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RaticateAlola, .iconSprite = gMonIcon_RaticateAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 3, SHADOW_SIZE_L) FOOTPRINT(Raticate) OVERWORLD( - gObjectEventPic_RaticateAlola, + sPicTable_RaticateAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2441,10 +2474,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Spearow, .iconSprite = gMonIcon_Spearow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Spearow) OVERWORLD( - gObjectEventPic_Spearow, + sPicTable_Spearow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2517,10 +2551,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Fearow, .iconSprite = gMonIcon_Fearow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 17, SHADOW_SIZE_M) FOOTPRINT(Fearow) OVERWORLD( - gObjectEventPic_Fearow, + sPicTable_Fearow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2541,7 +2576,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 44, .baseSpeed = 55, .baseSpAttack = 40, - .baseSpDefense = 54, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 54 : 40, .types = MON_TYPES(TYPE_POISON), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 58 : 62, @@ -2589,10 +2624,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ekans, .iconSprite = gMonIcon_Ekans, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Ekans) OVERWORLD( - gObjectEventPic_Ekans, + sPicTable_Ekans, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -2613,7 +2649,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 69, .baseSpeed = 80, .baseSpAttack = 65, - .baseSpDefense = 79, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 79 : 65, .types = MON_TYPES(TYPE_POISON), .catchRate = 90, #if P_UPDATED_EXP_YIELDS >= GEN_7 @@ -2663,10 +2699,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Arbok, .iconSprite = gMonIcon_Arbok, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Arbok) OVERWORLD( - gObjectEventPic_Arbok, + sPicTable_Arbok, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -2731,10 +2768,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pichu, .iconSprite = gMonIcon_Pichu, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Pichu) OVERWORLD( - gObjectEventPic_Pichu, + sPicTable_Pichu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2801,10 +2839,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PichuSpikyEared, .iconSprite = gMonIcon_PichuSpikyEared, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Pichu) OVERWORLD( - gObjectEventPic_PichuSpikyEared, + sPicTable_PichuSpikyEared, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2834,7 +2873,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, .baseSpeed = 90, .baseSpAttack = 50, - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 || P_UPDATED_STATS == GEN_1 ? 50 : 40, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 190, .expYield = PIKACHU_EXP_YIELD, @@ -2887,9 +2926,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconPalIndexFemale = 2, #endif //P_CUSTOM_GENDER_DIFF_ICONS #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) OVERWORLD( - gObjectEventPic_Pikachu, + sPicTable_Pikachu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2898,7 +2938,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Pikachu ) OVERWORLD_FEMALE( - gObjectEventPic_PikachuF, + sPicTable_PikachuF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2958,6 +2998,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuCosplay, .iconSprite = gMonIcon_PikachuCosplay, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3009,6 +3050,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuRockStar, .iconSprite = gMonIcon_PikachuRockStar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3061,6 +3103,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuBelle, .iconSprite = gMonIcon_PikachuBelle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3113,6 +3156,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPopStar, .iconSprite = gMonIcon_PikachuPopStar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3164,6 +3208,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPhD, .iconSprite = gMonIcon_PikachuPhD, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3215,6 +3260,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuLibre, .iconSprite = gMonIcon_PikachuLibre, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3274,6 +3320,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuOriginal, .iconSprite = gMonIcon_PikachuOriginal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3329,6 +3376,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuHoenn, .iconSprite = gMonIcon_PikachuHoenn, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3384,6 +3432,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuSinnoh, .iconSprite = gMonIcon_PikachuSinnoh, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3439,6 +3488,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuUnova, .iconSprite = gMonIcon_PikachuUnova, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3494,6 +3544,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuKalos, .iconSprite = gMonIcon_PikachuKalos, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3549,6 +3600,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuAlola, .iconSprite = gMonIcon_PikachuAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3605,6 +3657,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuPartner, .iconSprite = gMonIcon_PikachuPartner, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3660,6 +3713,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuWorld, .iconSprite = gMonIcon_PikachuWorld, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) .levelUpLearnset = sPikachuLevelUpLearnset, @@ -3677,7 +3731,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = P_UPDATED_STATS >= GEN_6 ? 40 : 30, .baseSpeed = 90, .baseSpAttack = 50, - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 50 : 40, + .baseSpDefense = P_UPDATED_STATS >= GEN_6 || P_UPDATED_STATS == GEN_1 ? 50 : 40, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 190, .expYield = PIKACHU_EXP_YIELD, @@ -3718,6 +3772,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PikachuGmax, .iconSprite = gMonIcon_PikachuGmax, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Pikachu) .isGigantamax = TRUE, @@ -3788,10 +3843,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconPalIndexFemale = 2, #endif #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Pikachu) OVERWORLD( - gObjectEventPic_Pikachu, + sPicTable_Pikachu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3825,7 +3881,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 55, .baseSpeed = RAICHU_SPEED, .baseSpAttack = 90, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 90, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 75, .expYield = RAICHU_EXP_YIELD, @@ -3875,10 +3931,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPicFemale = gMonFrontPic_RaichuF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 10, SHADOW_SIZE_M) FOOTPRINT(Raichu) OVERWORLD( - gObjectEventPic_Raichu, + sPicTable_Raichu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3887,7 +3944,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Raichu ) OVERWORLD_FEMALE( - gObjectEventPic_RaichuF, + sPicTable_RaichuF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3947,10 +4004,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RaichuAlola, .iconSprite = gMonIcon_RaichuAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 15, SHADOW_SIZE_M) FOOTPRINT(Raichu) OVERWORLD( - gObjectEventPic_RaichuAlola, + sPicTable_RaichuAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3973,7 +4031,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 75, .baseDefense = 85, .baseSpeed = 40, - .baseSpAttack = 20, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 20 : 30, .baseSpDefense = 30, .types = MON_TYPES(TYPE_GROUND), .catchRate = 255, @@ -4021,10 +4079,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sandshrew, .iconSprite = gMonIcon_Sandshrew, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 1, SHADOW_SIZE_M) FOOTPRINT(Sandshrew) OVERWORLD( - gObjectEventPic_Sandshrew, + sPicTable_Sandshrew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4045,7 +4104,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 100, .baseDefense = 110, .baseSpeed = 65, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 55, .baseSpDefense = 55, .types = MON_TYPES(TYPE_GROUND), .catchRate = 90, @@ -4093,10 +4152,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sandslash, .iconSprite = gMonIcon_Sandslash, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 4, SHADOW_SIZE_L) FOOTPRINT(Sandslash) OVERWORLD( - gObjectEventPic_Sandslash, + sPicTable_Sandslash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4158,10 +4218,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SandshrewAlola, .iconSprite = gMonIcon_SandshrewAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, -1, SHADOW_SIZE_M) FOOTPRINT(Sandshrew) OVERWORLD( - gObjectEventPic_SandshrewAlola, + sPicTable_SandshrewAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4225,10 +4286,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SandslashAlola, .iconSprite = gMonIcon_SandslashAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_L) FOOTPRINT(Sandslash) OVERWORLD( - gObjectEventPic_SandslashAlola, + sPicTable_SandslashAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4307,10 +4369,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_NidoranF, .iconSprite = gMonIcon_NidoranF, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(NidoranF) OVERWORLD( - gObjectEventPic_NidoranF, + sPicTable_NidoranF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4378,10 +4441,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Nidorina, .iconSprite = gMonIcon_Nidorina, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_M) FOOTPRINT(Nidorina) OVERWORLD( - gObjectEventPic_Nidorina, + sPicTable_Nidorina, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4401,7 +4465,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 87, .baseSpeed = 76, .baseSpAttack = 75, - .baseSpDefense = 85, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 85 : 75, .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -4456,10 +4520,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Nidoqueen, .iconSprite = gMonIcon_Nidoqueen, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Nidoqueen) OVERWORLD( - gObjectEventPic_Nidoqueen, + sPicTable_Nidoqueen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4526,10 +4591,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_NidoranM, .iconSprite = gMonIcon_NidoranM, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(NidoranM) OVERWORLD( - gObjectEventPic_NidoranM, + sPicTable_NidoranM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4598,10 +4664,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Nidorino, .iconSprite = gMonIcon_Nidorino, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 1, SHADOW_SIZE_L) FOOTPRINT(Nidorino) OVERWORLD( - gObjectEventPic_Nidorino, + sPicTable_Nidorino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4620,7 +4687,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = P_UPDATED_STATS >= GEN_6 ? 102 : 92, .baseDefense = 77, .baseSpeed = 85, - .baseSpAttack = 85, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 85 : 75, .baseSpDefense = 75, .types = MON_TYPES(TYPE_POISON, TYPE_GROUND), .catchRate = 45, @@ -4679,10 +4746,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Nidoking, .iconSprite = gMonIcon_Nidoking, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Nidoking) OVERWORLD( - gObjectEventPic_Nidoking, + sPicTable_Nidoking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4761,10 +4829,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Cleffa, .iconSprite = gMonIcon_Cleffa, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, -4, SHADOW_SIZE_S) FOOTPRINT(Cleffa) OVERWORLD( - gObjectEventPic_Cleffa, + sPicTable_Cleffa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4786,7 +4855,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 48, .baseSpeed = 35, .baseSpAttack = 60, - .baseSpDefense = 65, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 65 : 60, .types = CLEFAIRY_FAMILY_TYPES, .catchRate = 150, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 113 : 68, @@ -4836,10 +4905,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Clefairy, .iconSprite = gMonIcon_Clefairy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 1, SHADOW_SIZE_S) FOOTPRINT(Clefairy) OVERWORLD( - gObjectEventPic_Clefairy, + sPicTable_Clefairy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4859,7 +4929,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 73, .baseSpeed = 60, .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 95 : 85, - .baseSpDefense = 90, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 90 : 85, .types = CLEFAIRY_FAMILY_TYPES, .catchRate = 25, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -4917,10 +4987,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Clefable, .iconSprite = gMonIcon_Clefable, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Clefable) OVERWORLD( - gObjectEventPic_Clefable, + sPicTable_Clefable, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4940,7 +5011,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 41, .baseDefense = 40, .baseSpeed = 65, - .baseSpAttack = 50, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 50 : 65, .baseSpDefense = 65, .types = MON_TYPES(TYPE_FIRE), .catchRate = 190, @@ -4988,10 +5059,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Vulpix, .iconSprite = gMonIcon_Vulpix, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Vulpix) OVERWORLD( - gObjectEventPic_Vulpix, + sPicTable_Vulpix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5012,7 +5084,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 76, .baseDefense = 75, .baseSpeed = 100, - .baseSpAttack = 81, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 81 : 100, .baseSpDefense = 100, .types = MON_TYPES(TYPE_FIRE), .catchRate = 75, @@ -5061,10 +5133,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ninetales, .iconSprite = gMonIcon_Ninetales, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Ninetales) OVERWORLD( - gObjectEventPic_Ninetales, + sPicTable_Ninetales, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5126,10 +5199,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VulpixAlola, .iconSprite = gMonIcon_VulpixAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 3, SHADOW_SIZE_M) FOOTPRINT(Vulpix) OVERWORLD( - gObjectEventPic_VulpixAlola, + sPicTable_VulpixAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5194,10 +5268,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_NinetalesAlola, .iconSprite = gMonIcon_NinetalesAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Ninetales) OVERWORLD( - gObjectEventPic_NinetalesAlola, + sPicTable_NinetalesAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5279,10 +5354,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Igglybuff, .iconSprite = gMonIcon_Igglybuff, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -3, SHADOW_SIZE_S) FOOTPRINT(Igglybuff) OVERWORLD( - gObjectEventPic_Igglybuff, + sPicTable_Igglybuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5303,7 +5379,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 45, .baseDefense = 20, .baseSpeed = 20, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 25, .baseSpDefense = 25, .types = JIGGLYPUFF_FAMILY_TYPES, .catchRate = 170, @@ -5356,10 +5432,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Jigglypuff, .iconSprite = gMonIcon_Jigglypuff, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Jigglypuff) OVERWORLD( - gObjectEventPic_Jigglypuff, + sPicTable_Jigglypuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5372,13 +5449,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}), }, +#if P_UPDATED_STATS >= GEN_6 +#define WIGGLYTUFF_SP_ATK 85 +#elif P_UPDATED_STATS >= GEN_2 +#define WIGGLYTUFF_SP_ATK 75 +#else +#define WIGGLYTUFF_SP_ATK 50 +#endif + [SPECIES_WIGGLYTUFF] = { .baseHP = 140, .baseAttack = 70, .baseDefense = 45, .baseSpeed = 45, - .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 85 : 75, + .baseSpAttack = WIGGLYTUFF_SP_ATK, .baseSpDefense = 50, .types = JIGGLYPUFF_FAMILY_TYPES, .catchRate = 50, @@ -5439,10 +5524,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Wigglytuff, .iconSprite = gMonIcon_Wigglytuff, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Wigglytuff) OVERWORLD( - gObjectEventPic_Wigglytuff, + sPicTable_Wigglytuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5462,7 +5548,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 45, .baseDefense = 35, .baseSpeed = 55, - .baseSpAttack = 30, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 30 : 40, .baseSpDefense = 40, .types = MON_TYPES(TYPE_POISON, TYPE_FLYING), .catchRate = 255, @@ -5524,10 +5610,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_ZubatF, .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 11, SHADOW_SIZE_S) FOOTPRINT(Zubat) OVERWORLD( - gObjectEventPic_Zubat, + sPicTable_Zubat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5536,7 +5623,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Zubat ) OVERWORLD_FEMALE( - gObjectEventPic_ZubatF, + sPicTable_ZubatF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5554,7 +5641,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 80, .baseDefense = 70, .baseSpeed = 90, - .baseSpAttack = 65, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 65 : 75, .baseSpDefense = 75, .types = MON_TYPES(TYPE_POISON, TYPE_FLYING), .catchRate = 90, @@ -5622,10 +5709,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_GolbatF, .backPicSizeFemale = MON_COORDS_SIZE(56, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_M) FOOTPRINT(Golbat) OVERWORLD( - gObjectEventPic_Golbat, + sPicTable_Golbat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5634,7 +5722,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Golbat ) OVERWORLD_FEMALE( - gObjectEventPic_GolbatF, + sPicTable_GolbatF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5718,10 +5806,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Crobat, .iconSprite = gMonIcon_Crobat, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_M) FOOTPRINT(Crobat) OVERWORLD( - gObjectEventPic_Crobat, + sPicTable_Crobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -5743,7 +5832,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 55, .baseSpeed = 30, .baseSpAttack = 75, - .baseSpDefense = 65, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 65 : 75, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 64 : 78, @@ -5792,10 +5881,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Oddish, .iconSprite = gMonIcon_Oddish, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -2, SHADOW_SIZE_S) FOOTPRINT(Oddish) OVERWORLD( - gObjectEventPic_Oddish, + sPicTable_Oddish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5816,7 +5906,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 70, .baseSpeed = 40, .baseSpAttack = 85, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 85, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 120, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 138 : 132, @@ -5868,10 +5958,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_GloomF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_M) FOOTPRINT(Gloom) OVERWORLD( - gObjectEventPic_Gloom, + sPicTable_Gloom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5880,7 +5971,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Gloom ) OVERWORLD_FEMALE( - gObjectEventPic_GloomF, + sPicTable_GloomF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5899,7 +5990,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 85, .baseSpeed = 50, .baseSpAttack = P_UPDATED_STATS >= GEN_6 ? 110 : 100, - .baseSpDefense = 90, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 90 : 100, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -5957,10 +6048,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_VileplumeF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_L) FOOTPRINT(Vileplume) OVERWORLD( - gObjectEventPic_Vileplume, + sPicTable_Vileplume, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5969,7 +6061,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Vileplume ) OVERWORLD_FEMALE( - gObjectEventPic_VileplumeF, + sPicTable_VileplumeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6053,10 +6145,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Bellossom, .iconSprite = gMonIcon_Bellossom, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Bellossom) OVERWORLD( - gObjectEventPic_Bellossom, + sPicTable_Bellossom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6077,7 +6170,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 70, .baseDefense = 55, .baseSpeed = 25, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 55, .baseSpDefense = 55, .types = MON_TYPES(TYPE_BUG, TYPE_GRASS), .catchRate = 190, @@ -6142,10 +6235,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Paras, .iconSprite = gMonIcon_Paras, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(7, -11, SHADOW_SIZE_M) FOOTPRINT(Paras) OVERWORLD( - gObjectEventPic_Paras, + sPicTable_Paras, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -6165,7 +6259,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 95, .baseDefense = 80, .baseSpeed = 30, - .baseSpAttack = 60, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 60 : 80, .baseSpDefense = 80, .types = MON_TYPES(TYPE_BUG, TYPE_GRASS), .catchRate = 75, @@ -6221,10 +6315,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Parasect, .iconSprite = gMonIcon_Parasect, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 2, SHADOW_SIZE_L) FOOTPRINT(Parasect) OVERWORLD( - gObjectEventPic_Parasect, + sPicTable_Parasect, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -6245,7 +6340,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 50, .baseSpeed = 45, .baseSpAttack = 40, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 40, .types = MON_TYPES(TYPE_BUG, TYPE_POISON), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 61 : 75, @@ -6297,10 +6392,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Venonat, .iconSprite = gMonIcon_Venonat, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_M) FOOTPRINT(Venonat) OVERWORLD( - gObjectEventPic_Venonat, + sPicTable_Venonat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6321,7 +6417,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 90, .baseSpAttack = 90, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 90, .types = MON_TYPES(TYPE_BUG, TYPE_POISON), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 158 : 138, @@ -6391,10 +6487,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Venomoth, .iconSprite = gMonIcon_Venomoth, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 18, SHADOW_SIZE_M) FOOTPRINT(Venomoth) OVERWORLD( - gObjectEventPic_Venomoth, + sPicTable_Venomoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6417,15 +6514,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define DUGTRIO_EXP_YIELD 153 #endif -#define DUGTRIO_ATTACK (P_UPDATED_STATS >= GEN_7 ? 100 : 80) - [SPECIES_DIGLETT] = { .baseHP = 10, .baseAttack = 55, .baseDefense = 25, .baseSpeed = 95, - .baseSpAttack = 35, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 35 : 45, .baseSpDefense = 45, .types = MON_TYPES(TYPE_GROUND), .catchRate = 255, @@ -6472,10 +6567,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Diglett, .iconSprite = gMonIcon_Diglett, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Diglett) OVERWORLD( - gObjectEventPic_Diglett, + sPicTable_Diglett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6493,10 +6589,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO] = { .baseHP = 35, - .baseAttack = DUGTRIO_ATTACK, + .baseAttack = P_UPDATED_STATS >= GEN_7 ? 100 : 80, .baseDefense = 50, .baseSpeed = 120, - .baseSpAttack = 50, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 50 : 70, .baseSpDefense = 70, .types = MON_TYPES(TYPE_GROUND), .catchRate = 50, @@ -6550,10 +6646,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dugtrio, .iconSprite = gMonIcon_Dugtrio, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Dugtrio) OVERWORLD( - gObjectEventPic_Dugtrio, + sPicTable_Dugtrio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6615,10 +6712,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_DiglettAlola, .iconSprite = gMonIcon_DiglettAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Diglett) OVERWORLD( - gObjectEventPic_DiglettAlola, + sPicTable_DiglettAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6637,7 +6735,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = [SPECIES_DUGTRIO_ALOLA] = { .baseHP = 35, - .baseAttack = DUGTRIO_ATTACK, + .baseAttack = 100, .baseDefense = 60, .baseSpeed = 110, .baseSpAttack = 50, @@ -6683,10 +6781,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_DugtrioAlola, .iconSprite = gMonIcon_DugtrioAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Dugtrio) OVERWORLD( - gObjectEventPic_DugtrioAlola, + sPicTable_DugtrioAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6763,10 +6862,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Meowth, .iconSprite = gMonIcon_Meowth, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Meowth) OVERWORLD( - gObjectEventPic_Meowth, + sPicTable_Meowth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6838,10 +6938,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Persian, .iconSprite = gMonIcon_Persian, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Persian) OVERWORLD( - gObjectEventPic_Persian, + sPicTable_Persian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6903,10 +7004,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthAlola, .iconSprite = gMonIcon_MeowthAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 5, SHADOW_SIZE_M) FOOTPRINT(Meowth) OVERWORLD( - gObjectEventPic_MeowthAlola, + sPicTable_MeowthAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6970,10 +7072,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PersianAlola, .iconSprite = gMonIcon_PersianAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Persian) OVERWORLD( - gObjectEventPic_PersianAlola, + sPicTable_PersianAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7036,10 +7139,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthGalar, .iconSprite = gMonIcon_MeowthGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Meowth) OVERWORLD( - gObjectEventPic_MeowthGalar, + sPicTable_MeowthGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7101,10 +7205,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Perrserker, .iconSprite = gMonIcon_Perrserker, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Perrserker) OVERWORLD( - gObjectEventPic_Perrserker, + sPicTable_Perrserker, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7166,6 +7271,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MeowthGmax, .iconSprite = gMonIcon_MeowthGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Meowth) .isGigantamax = TRUE, @@ -7185,7 +7291,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 52, .baseDefense = 48, .baseSpeed = 55, - .baseSpAttack = 65, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 65 : 50, .baseSpDefense = 50, .types = MON_TYPES(TYPE_WATER), .catchRate = 190, @@ -7232,10 +7338,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Psyduck, .iconSprite = gMonIcon_Psyduck, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 2, SHADOW_SIZE_M) FOOTPRINT(Psyduck) OVERWORLD( - gObjectEventPic_Psyduck, + sPicTable_Psyduck, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7255,7 +7362,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 82, .baseDefense = 78, .baseSpeed = 85, - .baseSpAttack = 95, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 95 : 80, .baseSpDefense = 80, .types = MON_TYPES(TYPE_WATER), .catchRate = 75, @@ -7302,10 +7409,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Golduck, .iconSprite = gMonIcon_Golduck, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_M) FOOTPRINT(Golduck) OVERWORLD( - gObjectEventPic_Golduck, + sPicTable_Golduck, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7326,7 +7434,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 35, .baseSpeed = 70, .baseSpAttack = 35, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 35, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 61 : 74, @@ -7378,10 +7486,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Mankey, .iconSprite = gMonIcon_Mankey, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 1, SHADOW_SIZE_M) FOOTPRINT(Mankey) OVERWORLD( - gObjectEventPic_Mankey, + sPicTable_Mankey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7402,7 +7511,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 95, .baseSpAttack = 60, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 60, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 159 : 149, @@ -7454,10 +7563,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Primeape, .iconSprite = gMonIcon_Primeape, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Primeape) OVERWORLD( - gObjectEventPic_Primeape, + sPicTable_Primeape, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7518,10 +7628,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Annihilape, .iconSprite = gMonIcon_Annihilape, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Annihilape) OVERWORLD( - gObjectEventPic_Annihilape, + sPicTable_Annihilape, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7542,7 +7653,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 70, .baseDefense = 45, .baseSpeed = 60, - .baseSpAttack = 70, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 70 : 50, .baseSpDefense = 50, .types = MON_TYPES(TYPE_FIRE), .catchRate = 190, @@ -7591,10 +7702,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Growlithe, .iconSprite = gMonIcon_Growlithe, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 4, SHADOW_SIZE_M) FOOTPRINT(Growlithe) OVERWORLD( - gObjectEventPic_Growlithe, + sPicTable_Growlithe, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7615,7 +7727,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 110, .baseDefense = 80, .baseSpeed = 95, - .baseSpAttack = 100, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 100 : 80, .baseSpDefense = 80, .types = MON_TYPES(TYPE_FIRE), .catchRate = 75, @@ -7660,10 +7772,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Arcanine, .iconSprite = gMonIcon_Arcanine, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Arcanine) OVERWORLD( - gObjectEventPic_Arcanine, + sPicTable_Arcanine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7724,10 +7837,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GrowlitheHisui, .iconSprite = gMonIcon_GrowlitheHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, -2, SHADOW_SIZE_M) FOOTPRINT(Growlithe) OVERWORLD( - gObjectEventPic_GrowlitheHisui, + sPicTable_GrowlitheHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7789,10 +7903,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ArcanineHisui, .iconSprite = gMonIcon_ArcanineHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Arcanine) OVERWORLD( - gObjectEventPic_ArcanineHisui, + sPicTable_ArcanineHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7861,10 +7976,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Poliwag, .iconSprite = gMonIcon_Poliwag, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 0, SHADOW_SIZE_S) FOOTPRINT(Poliwag) OVERWORLD( - gObjectEventPic_Poliwag, + sPicTable_Poliwag, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7934,10 +8050,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Poliwhirl, .iconSprite = gMonIcon_Poliwhirl, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 4, SHADOW_SIZE_M) FOOTPRINT(Poliwhirl) OVERWORLD( - gObjectEventPic_Poliwhirl, + sPicTable_Poliwhirl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7959,7 +8076,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 95, .baseSpeed = 70, .baseSpAttack = 70, - .baseSpDefense = 90, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 90 : 70, .types = MON_TYPES(TYPE_WATER, TYPE_FIGHTING), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -8012,10 +8129,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Poliwrath, .iconSprite = gMonIcon_Poliwrath, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Poliwrath) OVERWORLD( - gObjectEventPic_Poliwrath, + sPicTable_Poliwrath, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8097,10 +8215,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_PolitoedF, .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Politoed) OVERWORLD( - gObjectEventPic_Politoed, + sPicTable_Politoed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8109,7 +8228,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Politoed ) OVERWORLD_FEMALE( - gObjectEventPic_PolitoedF, + sPicTable_PolitoedF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8129,7 +8248,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 15, .baseSpeed = 90, .baseSpAttack = 105, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 105, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 200, #if P_UPDATED_EXP_YIELDS >= GEN_5 @@ -8182,10 +8301,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Abra, .iconSprite = gMonIcon_Abra, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_L) FOOTPRINT(Abra) OVERWORLD( - gObjectEventPic_Abra, + sPicTable_Abra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8206,7 +8326,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 30, .baseSpeed = 105, .baseSpAttack = 120, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 120, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 100, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 140 : 145, @@ -8258,10 +8378,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_KadabraF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_L) FOOTPRINT(Kadabra) OVERWORLD( - gObjectEventPic_Kadabra, + sPicTable_Kadabra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8270,7 +8391,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Kadabra ) OVERWORLD_FEMALE( - gObjectEventPic_KadabraF, + sPicTable_KadabraF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8282,7 +8403,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = {EVO_ITEM, ITEM_LINKING_CORD, SPECIES_ALAKAZAM}), }, -#define ALAKAZAM_SP_DEF (P_UPDATED_STATS >= GEN_6 ? 95 : 85) +#if P_UPDATED_STATS >= GEN_6 +#define ALAKAZAM_SP_DEF 95 +#elif P_UPDATED_STATS >= GEN_2 +#define ALAKAZAM_SP_DEF 85 +#else +#define ALAKAZAM_SP_DEF 135 +#endif [SPECIES_ALAKAZAM] = { @@ -8350,10 +8477,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_AlakazamF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Alakazam) OVERWORLD( - gObjectEventPic_Alakazam, + sPicTable_Alakazam, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8362,7 +8490,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Alakazam ) OVERWORLD_FEMALE( - gObjectEventPic_AlakazamF, + sPicTable_AlakazamF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8382,7 +8510,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 150, .baseSpAttack = 175, - .baseSpDefense = ALAKAZAM_SP_DEF + 10, + .baseSpDefense = 105, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 50, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_8) ? 300 : 270, @@ -8423,11 +8551,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_AlakazamMega, .iconSprite = gMonIcon_AlakazamMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 18, SHADOW_SIZE_L) FOOTPRINT(Alakazam) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AlakazamMega, + sPicTable_AlakazamMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8510,10 +8639,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Machop, .iconSprite = gMonIcon_Machop, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Machop) OVERWORLD( - gObjectEventPic_Machop, + sPicTable_Machop, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8534,7 +8664,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 70, .baseSpeed = 45, .baseSpAttack = 50, - .baseSpDefense = 60, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 60 : 50, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 142 : 146, @@ -8584,10 +8714,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Machoke, .iconSprite = gMonIcon_Machoke, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_M) FOOTPRINT(Machoke) OVERWORLD( - gObjectEventPic_Machoke, + sPicTable_Machoke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8616,7 +8747,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 55, .baseSpAttack = 65, - .baseSpDefense = 85, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 85 : 65, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = MACHAMP_EXP_YIELD, @@ -8669,10 +8800,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Machamp, .iconSprite = gMonIcon_Machamp, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_L) FOOTPRINT(Machamp) OVERWORLD( - gObjectEventPic_Machamp, + sPicTable_Machamp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8694,7 +8826,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 55, .baseSpAttack = 65, - .baseSpDefense = 85, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 85 : 65, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = MACHAMP_EXP_YIELD, @@ -8739,6 +8871,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MachampGmax, .iconSprite = gMonIcon_MachampGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_L) FOOTPRINT(Machamp) .isGigantamax = TRUE, @@ -8758,7 +8891,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 35, .baseSpeed = 40, .baseSpAttack = 70, - .baseSpDefense = 30, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 30 : 70, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 255, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 60 : 84, @@ -8802,10 +8935,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Bellsprout, .iconSprite = gMonIcon_Bellsprout, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Bellsprout) OVERWORLD( - gObjectEventPic_Bellsprout, + sPicTable_Bellsprout, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8826,7 +8960,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 50, .baseSpeed = 55, .baseSpAttack = 85, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 85, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 120, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 137 : 151, @@ -8875,10 +9009,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Weepinbell, .iconSprite = gMonIcon_Weepinbell, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 3, SHADOW_SIZE_M) FOOTPRINT(Weepinbell) OVERWORLD( - gObjectEventPic_Weepinbell, + sPicTable_Weepinbell, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8891,6 +9026,14 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}), }, +#if P_UPDATED_STATS >= GEN_6 + #define VICTREEBEL_SP_DEF 70 +#elif P_UPDATED_STATS >= GEN_2 + #define VICTREEBEL_SP_DEF 60 +#else + #define VICTREEBEL_SP_DEF 100 +#endif + [SPECIES_VICTREEBEL] = { .baseHP = 80, @@ -8898,7 +9041,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 70, .baseSpAttack = 100, - .baseSpDefense = P_UPDATED_STATS >= GEN_6 ? 70 : 60, + .baseSpDefense = VICTREEBEL_SP_DEF, .types = MON_TYPES(TYPE_GRASS, TYPE_POISON), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -8954,10 +9097,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Victreebel, .iconSprite = gMonIcon_Victreebel, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 8, SHADOW_SIZE_M) FOOTPRINT(Victreebel) OVERWORLD( - gObjectEventPic_Victreebel, + sPicTable_Victreebel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8977,7 +9121,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 40, .baseDefense = 35, .baseSpeed = 70, - .baseSpAttack = 50, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 50 : 100, .baseSpDefense = 100, .types = MON_TYPES(TYPE_WATER, TYPE_POISON), .catchRate = 190, @@ -9025,10 +9169,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tentacool, .iconSprite = gMonIcon_Tentacool, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_M) FOOTPRINT(Tentacool) OVERWORLD( - gObjectEventPic_Tentacool, + sPicTable_Tentacool, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -9048,7 +9193,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 70, .baseDefense = 65, .baseSpeed = 100, - .baseSpAttack = 80, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 80 : 120, .baseSpDefense = 120, .types = MON_TYPES(TYPE_WATER, TYPE_POISON), .catchRate = 60, @@ -9096,10 +9241,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tentacruel, .iconSprite = gMonIcon_Tentacruel, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tentacruel) OVERWORLD( - gObjectEventPic_Tentacruel, + sPicTable_Tentacruel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -9187,10 +9333,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Geodude, .iconSprite = gMonIcon_Geodude, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_M) FOOTPRINT(Geodude) OVERWORLD( - gObjectEventPic_Geodude, + sPicTable_Geodude, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -9259,10 +9406,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Graveler, .iconSprite = gMonIcon_Graveler, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Graveler) OVERWORLD( - gObjectEventPic_Graveler, + sPicTable_Graveler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9284,7 +9432,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 130, .baseSpeed = 45, .baseSpAttack = 55, - .baseSpDefense = 65, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 65 : 55, .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), .catchRate = 45, .expYield = GOLEM_EXP_YIELD, @@ -9331,10 +9479,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Golem, .iconSprite = gMonIcon_Golem, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Golem) OVERWORLD( - gObjectEventPic_Golem, + sPicTable_Golem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9397,10 +9546,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GeodudeAlola, .iconSprite = gMonIcon_GeodudeAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_M) FOOTPRINT(Geodude) OVERWORLD( - gObjectEventPic_GeodudeAlola, + sPicTable_GeodudeAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9464,10 +9614,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GravelerAlola, .iconSprite = gMonIcon_GravelerAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 5, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Graveler) OVERWORLD( - gObjectEventPic_GravelerAlola, + sPicTable_GravelerAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9531,10 +9682,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GolemAlola, .iconSprite = gMonIcon_GolemAlola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Golem) OVERWORLD( - gObjectEventPic_GolemAlola, + sPicTable_GolemAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9602,10 +9754,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ponyta, .iconSprite = gMonIcon_Ponyta, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Ponyta) OVERWORLD( - gObjectEventPic_Ponyta, + sPicTable_Ponyta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9671,10 +9824,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Rapidash, .iconSprite = gMonIcon_Rapidash, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rapidash) OVERWORLD( - gObjectEventPic_Rapidash, + sPicTable_Rapidash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9735,10 +9889,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PonytaGalar, .iconSprite = gMonIcon_PonytaGalar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Ponyta) OVERWORLD( - gObjectEventPic_PonytaGalar, + sPicTable_PonytaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9801,10 +9956,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_RapidashGalar, .iconSprite = gMonIcon_RapidashGalar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rapidash) OVERWORLD( - gObjectEventPic_RapidashGalar, + sPicTable_RapidashGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9873,10 +10029,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowpoke, .iconSprite = gMonIcon_Slowpoke, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, -5, SHADOW_SIZE_L) FOOTPRINT(Slowpoke) OVERWORLD( - gObjectEventPic_Slowpoke, + sPicTable_Slowpoke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9899,7 +10056,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 75, .baseDefense = 110, .baseSpeed = 30, - .baseSpAttack = 100, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 100 : 80, .baseSpDefense = 80, .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .catchRate = 75, @@ -9944,10 +10101,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowbro, .iconSprite = gMonIcon_Slowbro, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_L) FOOTPRINT(Slowbro) OVERWORLD( - gObjectEventPic_Slowbro, + sPicTable_Slowbro, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10014,10 +10172,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Slowking, .iconSprite = gMonIcon_Slowking, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Slowking) OVERWORLD( - gObjectEventPic_Slowking, + sPicTable_Slowking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10080,11 +10239,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowbroMega, .iconSprite = gMonIcon_SlowbroMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Slowbro) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SlowbroMega, + sPicTable_SlowbroMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10149,10 +10309,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowpokeGalar, .iconSprite = gMonIcon_SlowpokeGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, -8, SHADOW_SIZE_L) FOOTPRINT(Slowpoke) OVERWORLD( - gObjectEventPic_SlowpokeGalar, + sPicTable_SlowpokeGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10217,10 +10378,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowbroGalar, .iconSprite = gMonIcon_SlowbroGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 9, SHADOW_SIZE_L) FOOTPRINT(Slowbro) OVERWORLD( - gObjectEventPic_SlowbroGalar, + sPicTable_SlowbroGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10282,10 +10444,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SlowkingGalar, .iconSprite = gMonIcon_SlowkingGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Slowking) OVERWORLD( - gObjectEventPic_SlowkingGalar, + sPicTable_SlowkingGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10310,7 +10473,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 70, .baseSpeed = 45, .baseSpAttack = 95, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 95, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_STEEL), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 89, @@ -10358,10 +10521,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magnemite, .iconSprite = gMonIcon_Magnemite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_S) FOOTPRINT(Magnemite) OVERWORLD( - gObjectEventPic_Magnemite, + sPicTable_Magnemite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -10381,7 +10545,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 95, .baseSpeed = 70, .baseSpAttack = 120, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 120, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_STEEL), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 163 : 161, @@ -10431,10 +10595,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magneton, .iconSprite = gMonIcon_Magneton, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Magneton) OVERWORLD( - gObjectEventPic_Magneton, + sPicTable_Magneton, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -10444,7 +10609,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = ) .levelUpLearnset = sMagnetonLevelUpLearnset, .teachableLearnset = sMagnetonTeachableLearnset, - .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_MAGNEZONE}, + .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_POWER_PLANT, SPECIES_MAGNEZONE}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}), }, @@ -10510,10 +10675,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magnezone, .iconSprite = gMonIcon_Magnezone, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Magnezone) OVERWORLD( - gObjectEventPic_Magnezone, + sPicTable_Magnezone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10545,7 +10711,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 55, .baseSpeed = 60, .baseSpAttack = 58, - .baseSpDefense = 62, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 62 : 58, .types = MON_TYPES(TYPE_NORMAL, TYPE_FLYING), .catchRate = 45, .expYield = FARFETCHD_EXP_YIELD, @@ -10599,10 +10765,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Farfetchd, .iconSprite = gMonIcon_Farfetchd, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Farfetchd) OVERWORLD( - gObjectEventPic_Farfetchd, + sPicTable_Farfetchd, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -10665,10 +10832,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_FarfetchdGalar, .iconSprite = gMonIcon_FarfetchdGalar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 2, SHADOW_SIZE_L) FOOTPRINT(Farfetchd) OVERWORLD( - gObjectEventPic_FarfetchdGalar, + sPicTable_FarfetchdGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10732,10 +10900,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sirfetchd, .iconSprite = gMonIcon_Sirfetchd, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Sirfetchd) OVERWORLD( - gObjectEventPic_Sirfetchd, + sPicTable_Sirfetchd, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10810,10 +10979,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_DoduoF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 5, SHADOW_SIZE_M) FOOTPRINT(Doduo) OVERWORLD( - gObjectEventPic_Doduo, + sPicTable_Doduo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10822,7 +10992,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Doduo ) OVERWORLD_FEMALE( - gObjectEventPic_DoduoF, + sPicTable_DoduoF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10902,10 +11072,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_DodrioF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Dodrio) OVERWORLD( - gObjectEventPic_Dodrio, + sPicTable_Dodrio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10914,7 +11085,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Dodrio ) OVERWORLD_FEMALE( - gObjectEventPic_DodrioF, + sPicTable_DodrioF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10932,7 +11103,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 45, .baseDefense = 55, .baseSpeed = 45, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 70, .baseSpDefense = 70, .types = MON_TYPES(TYPE_WATER), .catchRate = 190, @@ -10982,10 +11153,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Seel, .iconSprite = gMonIcon_Seel, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_L) FOOTPRINT(Seel) OVERWORLD( - gObjectEventPic_Seel, + sPicTable_Seel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -11005,7 +11177,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 70, .baseDefense = 80, .baseSpeed = 70, - .baseSpAttack = 70, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 70 : 95, .baseSpDefense = 95, .types = MON_TYPES(TYPE_WATER, TYPE_ICE), .catchRate = 75, @@ -11054,10 +11226,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dewgong, .iconSprite = gMonIcon_Dewgong, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Dewgong) OVERWORLD( - gObjectEventPic_Dewgong, + sPicTable_Dewgong, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11078,7 +11251,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 50, .baseSpeed = 25, .baseSpAttack = 40, - .baseSpDefense = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 50 : 40, .types = MON_TYPES(TYPE_POISON), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 90, @@ -11125,10 +11298,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Grimer, .iconSprite = gMonIcon_Grimer, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 3, SHADOW_SIZE_M) FOOTPRINT(Grimer) OVERWORLD( - gObjectEventPic_Grimer, + sPicTable_Grimer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -11150,7 +11324,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 75, .baseSpeed = 50, .baseSpAttack = 65, - .baseSpDefense = 100, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 100 : 65, .types = MON_TYPES(TYPE_POISON), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 157, @@ -11199,10 +11373,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Muk, .iconSprite = gMonIcon_Muk, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Muk) OVERWORLD( - gObjectEventPic_Muk, + sPicTable_Muk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -11264,10 +11439,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GrimerAlola, .iconSprite = gMonIcon_GrimerAlola, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 1, SHADOW_SIZE_M) FOOTPRINT(Grimer) OVERWORLD( - gObjectEventPic_GrimerAlola, + sPicTable_GrimerAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11333,10 +11509,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MukAlola, .iconSprite = gMonIcon_MukAlola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Muk) OVERWORLD( - gObjectEventPic_MukAlola, + sPicTable_MukAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11360,7 +11537,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 100, .baseSpeed = 40, .baseSpAttack = 45, - .baseSpDefense = 25, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 25 : 45, .types = MON_TYPES(TYPE_WATER), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 61 : 97, @@ -11412,10 +11589,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Shellder, .iconSprite = gMonIcon_Shellder, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -4, SHADOW_SIZE_S) FOOTPRINT(Shellder) OVERWORLD( - gObjectEventPic_Shellder, + sPicTable_Shellder, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -11436,7 +11614,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 180, .baseSpeed = 70, .baseSpAttack = 85, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 85, .types = MON_TYPES(TYPE_WATER, TYPE_ICE), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 184 : 203, @@ -11487,10 +11665,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Cloyster, .iconSprite = gMonIcon_Cloyster, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_M) FOOTPRINT(Cloyster) OVERWORLD( - gObjectEventPic_Cloyster, + sPicTable_Cloyster, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11511,7 +11690,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 30, .baseSpeed = 80, .baseSpAttack = 100, - .baseSpDefense = 35, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 35 : 100, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 62 : 95, @@ -11560,10 +11739,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Gastly, .iconSprite = gMonIcon_Gastly, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_S) FOOTPRINT(Gastly) OVERWORLD( - gObjectEventPic_Gastly, + sPicTable_Gastly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11584,7 +11764,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 45, .baseSpeed = 95, .baseSpAttack = 115, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 115, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 142 : 126, @@ -11632,10 +11812,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Haunter, .iconSprite = gMonIcon_Haunter, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Haunter) OVERWORLD( - gObjectEventPic_Haunter, + sPicTable_Haunter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11662,7 +11843,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 110, .baseSpAttack = 130, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 130, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -11712,10 +11893,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Gengar, .iconSprite = gMonIcon_Gengar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_L) FOOTPRINT(Gengar) OVERWORLD( - gObjectEventPic_Gengar, + sPicTable_Gengar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11777,11 +11959,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GengarMega, .iconSprite = gMonIcon_GengarMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 1, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gengar) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GengarMega, + sPicTable_GengarMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11806,7 +11989,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 110, .baseSpAttack = 130, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 130, .types = MON_TYPES(TYPE_GHOST, TYPE_POISON), .catchRate = 45, .expYield = 225, @@ -11846,6 +12029,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GengarGmax, .iconSprite = gMonIcon_GengarGmax, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Gengar) .isGigantamax = TRUE, @@ -11865,7 +12049,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 160, .baseSpeed = 70, .baseSpAttack = 30, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 30, .types = MON_TYPES(TYPE_ROCK, TYPE_GROUND), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 77 : 108, @@ -11908,10 +12092,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Onix, .iconSprite = gMonIcon_Onix, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Onix) OVERWORLD( - gObjectEventPic_Onix, + sPicTable_Onix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -11988,10 +12173,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_SteelixF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Steelix) OVERWORLD( - gObjectEventPic_Steelix, + sPicTable_Steelix, SIZE_64x64, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -12000,7 +12186,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Steelix ) OVERWORLD_FEMALE( - gObjectEventPic_SteelixF, + sPicTable_SteelixF, SIZE_64x64, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -12061,11 +12247,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SteelixMega, .iconSprite = gMonIcon_SteelixMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Steelix) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SteelixMega, + sPicTable_SteelixMega, SIZE_64x64, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -12091,7 +12278,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 48, .baseDefense = 45, .baseSpeed = 42, - .baseSpAttack = 43, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 43 : 90, .baseSpDefense = 90, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 190, @@ -12144,10 +12331,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Drowzee, .iconSprite = gMonIcon_Drowzee, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_M) FOOTPRINT(Drowzee) OVERWORLD( - gObjectEventPic_Drowzee, + sPicTable_Drowzee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12167,7 +12355,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 73, .baseDefense = 70, .baseSpeed = 67, - .baseSpAttack = 73, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 73 : 115, .baseSpDefense = 115, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 75, @@ -12227,10 +12415,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_HypnoF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 9, SHADOW_SIZE_L) FOOTPRINT(Hypno) OVERWORLD( - gObjectEventPic_Hypno, + sPicTable_Hypno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12239,7 +12428,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Hypno ) OVERWORLD_FEMALE( - gObjectEventPic_HypnoF, + sPicTable_HypnoF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12305,10 +12494,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Krabby, .iconSprite = gMonIcon_Krabby, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -1, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Krabby) OVERWORLD( - gObjectEventPic_Krabby, + sPicTable_Krabby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12374,10 +12564,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kingler, .iconSprite = gMonIcon_Kingler, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 4, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kingler) OVERWORLD( - gObjectEventPic_Kingler, + sPicTable_Kingler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12440,6 +12631,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_KinglerGmax, .iconSprite = gMonIcon_KinglerGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kingler) .isGigantamax = TRUE, @@ -12514,10 +12706,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Voltorb, .iconSprite = gMonIcon_Voltorb, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -2, SHADOW_SIZE_S) FOOTPRINT(Voltorb) OVERWORLD( - gObjectEventPic_Voltorb, + sPicTable_Voltorb, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -12584,10 +12777,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Electrode, .iconSprite = gMonIcon_Electrode, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_M) FOOTPRINT(Electrode) OVERWORLD( - gObjectEventPic_Electrode, + sPicTable_Electrode, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -12648,10 +12842,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_VoltorbHisui, .iconSprite = gMonIcon_VoltorbHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, -4, SHADOW_SIZE_S) FOOTPRINT(Voltorb) OVERWORLD( - gObjectEventPic_VoltorbHisui, + sPicTable_VoltorbHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12713,10 +12908,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ElectrodeHisui, .iconSprite = gMonIcon_ElectrodeHisui, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 4, SHADOW_SIZE_M) FOOTPRINT(Electrode) OVERWORLD( - gObjectEventPic_ElectrodeHisui, + sPicTable_ElectrodeHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12740,7 +12936,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 40, .baseSpAttack = 60, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 60, .types = MON_TYPES(TYPE_GRASS, TYPE_PSYCHIC), .catchRate = 90, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 65 : 98, @@ -12791,10 +12987,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Exeggcute, .iconSprite = gMonIcon_Exeggcute, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -5, SHADOW_SIZE_L) FOOTPRINT(Exeggcute) OVERWORLD( - gObjectEventPic_Exeggcute, + sPicTable_Exeggcute, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -12817,7 +13014,13 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = #define EXEGGUTOR_EXP_YIELD 212 #endif -#define EXEGGUTOR_SP_DEF (P_UPDATED_STATS >= GEN_7 ? 75 : 65) +#if P_UPDATED_STATS >= GEN_7 + #define EXEGGUTOR_SP_DEF 75 +#elif P_UPDATED_STATS >= GEN_2 + #define EXEGGUTOR_SP_DEF 65 +#else + #define EXEGGUTOR_SP_DEF 125 +#endif [SPECIES_EXEGGUTOR] = { @@ -12869,10 +13072,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Exeggutor, .iconSprite = gMonIcon_Exeggutor, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_L) FOOTPRINT(Exeggutor) OVERWORLD( - gObjectEventPic_Exeggutor, + sPicTable_Exeggutor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12933,10 +13137,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ExeggutorAlola, .iconSprite = gMonIcon_ExeggutorAlola, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Exeggutor) OVERWORLD( - gObjectEventPic_ExeggutorAlola, + sPicTable_ExeggutorAlola, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12960,7 +13165,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 95, .baseSpeed = 35, .baseSpAttack = 40, - .baseSpDefense = 50, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 50 : 40, .types = MON_TYPES(TYPE_GROUND), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 64 : 87, @@ -13009,10 +13214,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Cubone, .iconSprite = gMonIcon_Cubone, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(Cubone) OVERWORLD( - gObjectEventPic_Cubone, + sPicTable_Cubone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13035,7 +13241,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 110, .baseSpeed = 45, .baseSpAttack = 50, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 50, .types = MON_TYPES(TYPE_GROUND), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 149 : 124, @@ -13083,10 +13289,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Marowak, .iconSprite = gMonIcon_Marowak, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 6, SHADOW_SIZE_M) FOOTPRINT(Marowak) OVERWORLD( - gObjectEventPic_Marowak, + sPicTable_Marowak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13144,10 +13351,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MarowakAlola, .iconSprite = gMonIcon_MarowakAlola, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Marowak) OVERWORLD( - gObjectEventPic_MarowakAlola, + sPicTable_MarowakAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13205,10 +13413,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MarowakAlola, .iconSprite = gMonIcon_MarowakAlola, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Marowak) OVERWORLD( - gObjectEventPic_MarowakAlola, + sPicTable_MarowakAlola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13282,10 +13491,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tyrogue, .iconSprite = gMonIcon_Tyrogue, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Tyrogue) OVERWORLD( - gObjectEventPic_Tyrogue, + sPicTable_Tyrogue, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13309,7 +13519,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 53, .baseSpeed = 87, .baseSpAttack = 35, - .baseSpDefense = 110, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 110 : 35, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 159 : 139, @@ -13357,10 +13567,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Hitmonlee, .iconSprite = gMonIcon_Hitmonlee, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_M) FOOTPRINT(Hitmonlee) OVERWORLD( - gObjectEventPic_Hitmonlee, + sPicTable_Hitmonlee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13379,7 +13590,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 79, .baseSpeed = 76, .baseSpAttack = 35, - .baseSpDefense = 110, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 110 : 35, .types = MON_TYPES(TYPE_FIGHTING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 159 : 140, @@ -13435,10 +13646,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Hitmonchan, .iconSprite = gMonIcon_Hitmonchan, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Hitmonchan) OVERWORLD( - gObjectEventPic_Hitmonchan, + sPicTable_Hitmonchan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13508,10 +13720,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Hitmontop, .iconSprite = gMonIcon_Hitmontop, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Hitmontop) OVERWORLD( - gObjectEventPic_Hitmontop, + sPicTable_Hitmontop, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13533,7 +13746,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 75, .baseSpeed = 30, .baseSpAttack = 60, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 60, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 77 : 127, @@ -13577,10 +13790,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Lickitung, .iconSprite = gMonIcon_Lickitung, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 6, SHADOW_SIZE_M) FOOTPRINT(Lickitung) OVERWORLD( - gObjectEventPic_Lickitung, + sPicTable_Lickitung, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13653,10 +13867,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Lickilicky, .iconSprite = gMonIcon_Lickilicky, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_M) FOOTPRINT(Lickilicky) OVERWORLD( - gObjectEventPic_Lickilicky, + sPicTable_Lickilicky, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13678,7 +13893,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 95, .baseSpeed = 35, .baseSpAttack = 60, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 60, .types = MON_TYPES(TYPE_POISON), .catchRate = 190, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 68 : 114, @@ -13730,10 +13945,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Koffing, .iconSprite = gMonIcon_Koffing, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Koffing) OVERWORLD( - gObjectEventPic_Koffing, + sPicTable_Koffing, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -13755,7 +13971,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 120, .baseSpeed = 60, .baseSpAttack = 85, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 85, .types = MON_TYPES(TYPE_POISON), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 173, @@ -13808,10 +14024,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Weezing, .iconSprite = gMonIcon_Weezing, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 14, SHADOW_SIZE_M) FOOTPRINT(Weezing) OVERWORLD( - gObjectEventPic_Weezing, + sPicTable_Weezing, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -13875,10 +14092,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_WeezingGalar, .iconSprite = gMonIcon_WeezingGalar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 17, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Weezing) OVERWORLD( - gObjectEventPic_WeezingGalar, + sPicTable_WeezingGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13954,10 +14172,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_RhyhornF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_L) FOOTPRINT(Rhyhorn) OVERWORLD( - gObjectEventPic_Rhyhorn, + sPicTable_Rhyhorn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13966,7 +14185,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Rhyhorn ) OVERWORLD_FEMALE( - gObjectEventPic_RhyhornF, + sPicTable_RhyhornF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14034,10 +14253,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_RhydonF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rhydon) OVERWORLD( - gObjectEventPic_Rhydon, + sPicTable_Rhydon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14046,7 +14266,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Rhydon ) OVERWORLD_FEMALE( - gObjectEventPic_RhydonF, + sPicTable_RhydonF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14124,10 +14344,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_RhyperiorF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rhyperior) OVERWORLD( - gObjectEventPic_Rhyperior, + sPicTable_Rhyperior, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14136,7 +14357,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Rhyperior ) OVERWORLD_FEMALE( - gObjectEventPic_RhyperiorF, + sPicTable_RhyperiorF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14202,10 +14423,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Happiny, .iconSprite = gMonIcon_Happiny, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Happiny) OVERWORLD( - gObjectEventPic_Happiny, + sPicTable_Happiny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14227,7 +14449,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 5, .baseDefense = 5, .baseSpeed = 50, - .baseSpAttack = 35, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 35 : 105, .baseSpDefense = 105, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 30, @@ -14273,10 +14495,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Chansey, .iconSprite = gMonIcon_Chansey, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_L) FOOTPRINT(Chansey) OVERWORLD( - gObjectEventPic_Chansey, + sPicTable_Chansey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14343,10 +14566,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Blissey, .iconSprite = gMonIcon_Blissey, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 8, SHADOW_SIZE_L) FOOTPRINT(Blissey) OVERWORLD( - gObjectEventPic_Blissey, + sPicTable_Blissey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14368,7 +14592,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 115, .baseSpeed = 60, .baseSpAttack = 100, - .baseSpDefense = 40, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 40 : 100, .types = MON_TYPES(TYPE_GRASS), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 87 : 166, @@ -14416,10 +14640,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tangela, .iconSprite = gMonIcon_Tangela, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 1, SHADOW_SIZE_M) FOOTPRINT(Tangela) OVERWORLD( - gObjectEventPic_Tangela, + sPicTable_Tangela, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14493,10 +14718,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPicFemale = gMonFrontPic_TangrowthF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tangrowth) OVERWORLD( - gObjectEventPic_Tangrowth, + sPicTable_Tangrowth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14505,7 +14731,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Tangrowth ) OVERWORLD_FEMALE( - gObjectEventPic_TangrowthF, + sPicTable_TangrowthF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14525,7 +14751,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 90, .baseSpAttack = 40, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 40, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 172 : 175, @@ -14570,10 +14796,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kangaskhan, .iconSprite = gMonIcon_Kangaskhan, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kangaskhan) OVERWORLD( - gObjectEventPic_Kangaskhan, + sPicTable_Kangaskhan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14636,11 +14863,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_KangaskhanMega, .iconSprite = gMonIcon_KangaskhanMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kangaskhan) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_KangaskhanMega, + sPicTable_KangaskhanMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -14667,7 +14895,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 70, .baseSpeed = 60, .baseSpAttack = 70, - .baseSpDefense = 25, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 25 : 70, .types = MON_TYPES(TYPE_WATER), .catchRate = 225, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 59 : 83, @@ -14718,10 +14946,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Horsea, .iconSprite = gMonIcon_Horsea, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Horsea) OVERWORLD( - gObjectEventPic_Horsea, + sPicTable_Horsea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -14742,7 +14971,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 95, .baseSpeed = 85, .baseSpAttack = 95, - .baseSpDefense = 45, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 45 : 95, .types = MON_TYPES(TYPE_WATER), .catchRate = 75, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 154 : 155, @@ -14794,10 +15023,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Seadra, .iconSprite = gMonIcon_Seadra, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 7, SHADOW_SIZE_M) FOOTPRINT(Seadra) OVERWORLD( - gObjectEventPic_Seadra, + sPicTable_Seadra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -14878,10 +15108,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kingdra, .iconSprite = gMonIcon_Kingdra, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 12, SHADOW_SIZE_M) FOOTPRINT(Kingdra) OVERWORLD( - gObjectEventPic_Kingdra, + sPicTable_Kingdra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -14902,7 +15133,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 67, .baseDefense = 60, .baseSpeed = 63, - .baseSpAttack = 35, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 35 : 50, .baseSpDefense = 50, .types = MON_TYPES(TYPE_WATER), .catchRate = 225, @@ -14960,10 +15191,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_GoldeenF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 0, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Goldeen) OVERWORLD( - gObjectEventPic_Goldeen, + sPicTable_Goldeen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -14972,7 +15204,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Goldeen ) OVERWORLD_FEMALE( - gObjectEventPic_GoldeenF, + sPicTable_GoldeenF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -14990,7 +15222,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 92, .baseDefense = 65, .baseSpeed = 68, - .baseSpAttack = 65, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 65 : 80, .baseSpDefense = 80, .types = MON_TYPES(TYPE_WATER), .catchRate = 60, @@ -15044,10 +15276,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_SeakingF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Seaking) OVERWORLD( - gObjectEventPic_Seaking, + sPicTable_Seaking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -15056,7 +15289,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Seaking ) OVERWORLD_FEMALE( - gObjectEventPic_SeakingF, + sPicTable_SeakingF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -15075,7 +15308,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 55, .baseSpeed = 85, .baseSpAttack = 70, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 70, .types = MON_TYPES(TYPE_WATER), .catchRate = 225, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 68 : 106, @@ -15124,10 +15357,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Staryu, .iconSprite = gMonIcon_Staryu, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 2, SHADOW_SIZE_M) FOOTPRINT(Staryu) OVERWORLD( - gObjectEventPic_Staryu, + sPicTable_Staryu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15147,7 +15381,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 85, .baseSpeed = 115, .baseSpAttack = 100, - .baseSpDefense = 85, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 85 : 100, .types = MON_TYPES(TYPE_WATER, TYPE_PSYCHIC), .catchRate = 60, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 182 : 207, @@ -15195,10 +15429,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Starmie, .iconSprite = gMonIcon_Starmie, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Starmie) OVERWORLD( - gObjectEventPic_Starmie, + sPicTable_Starmie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15275,10 +15510,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MimeJr, .iconSprite = gMonIcon_MimeJr, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-5, 4, SHADOW_SIZE_S) FOOTPRINT(MimeJr) OVERWORLD( - gObjectEventPic_MimeJr, + sPicTable_MimeJr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15301,7 +15537,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 90, .baseSpAttack = 100, - .baseSpDefense = 120, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 120 : 100, #if P_UPDATED_TYPES >= GEN_6 .types = MON_TYPES(TYPE_PSYCHIC, TYPE_FAIRY), #else @@ -15352,10 +15588,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MrMime, .iconSprite = gMonIcon_MrMime, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(MrMime) OVERWORLD( - gObjectEventPic_MrMime, + sPicTable_MrMime, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15417,10 +15654,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MrMimeGalar, .iconSprite = gMonIcon_MrMimeGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(MrMime) OVERWORLD( - gObjectEventPic_MrMimeGalar, + sPicTable_MrMimeGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15482,10 +15720,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MrRime, .iconSprite = gMonIcon_MrRime, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_L) FOOTPRINT(MrRime) OVERWORLD( - gObjectEventPic_MrRime, + sPicTable_MrRime, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15507,7 +15746,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 80, .baseSpeed = 105, .baseSpAttack = 55, - .baseSpDefense = 80, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 80 : 55, .types = MON_TYPES(TYPE_BUG, TYPE_FLYING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 100 : 187, @@ -15565,10 +15804,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPicFemale = gMonFrontPic_ScytherF, .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Scyther) OVERWORLD( - gObjectEventPic_Scyther, + sPicTable_Scyther, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15577,7 +15817,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Scyther ) OVERWORLD_FEMALE( - gObjectEventPic_ScytherF, + sPicTable_ScytherF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15651,10 +15891,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .frontPicFemale = gMonFrontPic_ScizorF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Scizor) OVERWORLD( - gObjectEventPic_Scizor, + sPicTable_Scizor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15663,7 +15904,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Scizor ) OVERWORLD_FEMALE( - gObjectEventPic_ScizorF, + sPicTable_ScizorF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15723,11 +15964,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ScizorMega, .iconSprite = gMonIcon_ScizorMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 15, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Scizor) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_ScizorMega, + sPicTable_ScizorMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15793,10 +16035,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kleavor, .iconSprite = gMonIcon_Kleavor, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kleavor) OVERWORLD( - gObjectEventPic_Kleavor, + sPicTable_Kleavor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15867,10 +16110,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Smoochum, .iconSprite = gMonIcon_Smoochum, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Smoochum) OVERWORLD( - gObjectEventPic_Smoochum, + sPicTable_Smoochum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -15891,7 +16135,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 50, .baseDefense = 35, .baseSpeed = 95, - .baseSpAttack = 115, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 115 : 95, .baseSpDefense = 95, .types = MON_TYPES(TYPE_ICE, TYPE_PSYCHIC), .catchRate = 45, @@ -15942,10 +16186,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Jynx, .iconSprite = gMonIcon_Jynx, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_L) FOOTPRINT(Jynx) OVERWORLD( - gObjectEventPic_Jynx, + sPicTable_Jynx, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16013,10 +16258,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Elekid, .iconSprite = gMonIcon_Elekid, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 1, SHADOW_SIZE_M) FOOTPRINT(Elekid) OVERWORLD( - gObjectEventPic_Elekid, + sPicTable_Elekid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16037,7 +16283,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 83, .baseDefense = 57, .baseSpeed = 105, - .baseSpAttack = 95, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 95 : 85, .baseSpDefense = 85, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, @@ -16086,10 +16332,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Electabuzz, .iconSprite = gMonIcon_Electabuzz, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 9, SHADOW_SIZE_L) FOOTPRINT(Electabuzz) OVERWORLD( - gObjectEventPic_Electabuzz, + sPicTable_Electabuzz, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16162,10 +16409,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Electivire, .iconSprite = gMonIcon_Electivire, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Electivire) OVERWORLD( - gObjectEventPic_Electivire, + sPicTable_Electivire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16235,10 +16483,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magby, .iconSprite = gMonIcon_Magby, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Magby) OVERWORLD( - gObjectEventPic_Magby, + sPicTable_Magby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16259,7 +16508,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 95, .baseDefense = 57, .baseSpeed = 93, - .baseSpAttack = 100, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 100 : 85, .baseSpDefense = 85, .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, @@ -16304,10 +16553,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magmar, .iconSprite = gMonIcon_Magmar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 8, SHADOW_SIZE_L) FOOTPRINT(Magmar) OVERWORLD( - gObjectEventPic_Magmar, + sPicTable_Magmar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16380,10 +16630,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Magmortar, .iconSprite = gMonIcon_Magmortar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Magmortar) OVERWORLD( - gObjectEventPic_Magmortar, + sPicTable_Magmortar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16405,7 +16656,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 100, .baseSpeed = 85, .baseSpAttack = 55, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 55, .types = MON_TYPES(TYPE_BUG), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 175 : 200, @@ -16455,10 +16706,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Pinsir, .iconSprite = gMonIcon_Pinsir, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_L) FOOTPRINT(Pinsir) OVERWORLD( - gObjectEventPic_Pinsir, + sPicTable_Pinsir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16522,11 +16774,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PinsirMega, .iconSprite = gMonIcon_PinsirMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Pinsir) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_PinsirMega, + sPicTable_PinsirMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16552,7 +16805,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 100, .baseDefense = 95, .baseSpeed = 110, - .baseSpAttack = 40, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 40 : 70, .baseSpDefense = 70, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, @@ -16604,10 +16857,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Tauros, .iconSprite = gMonIcon_Tauros, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - gObjectEventPic_Tauros, + sPicTable_Tauros, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16668,10 +16922,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_TaurosPaldeaCombat, .iconSprite = gMonIcon_TaurosPaldeaCombat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - gObjectEventPic_TaurosPaldeaCombat, + sPicTable_TaurosPaldeaCombat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16733,10 +16988,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_TaurosPaldeaBlaze, .iconSprite = gMonIcon_TaurosPaldeaBlaze, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - gObjectEventPic_TaurosPaldeaBlaze, + sPicTable_TaurosPaldeaBlaze, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16798,10 +17054,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_TaurosPaldeaAqua, .iconSprite = gMonIcon_TaurosPaldeaAqua, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Tauros) OVERWORLD( - gObjectEventPic_TaurosPaldeaAqua, + sPicTable_TaurosPaldeaAqua, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -16825,7 +17082,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 10, .baseDefense = 55, .baseSpeed = 80, - .baseSpAttack = 15, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 15 : 20, .baseSpDefense = 20, .types = MON_TYPES(TYPE_WATER), .catchRate = 255, @@ -16882,10 +17139,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_MagikarpF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_M) FOOTPRINT(Magikarp) OVERWORLD( - gObjectEventPic_Magikarp, + sPicTable_Magikarp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -16894,7 +17152,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Magikarp ) OVERWORLD_FEMALE( - gObjectEventPic_MagikarpF, + sPicTable_MagikarpF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -16912,7 +17170,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 125, .baseDefense = 79, .baseSpeed = 81, - .baseSpAttack = 60, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 60 : 100, .baseSpDefense = 100, .types = MON_TYPES(TYPE_WATER, TYPE_FLYING), .catchRate = 45, @@ -16963,10 +17221,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_GyaradosF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gyarados) OVERWORLD( - gObjectEventPic_Gyarados, + sPicTable_Gyarados, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -16975,7 +17234,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Gyarados ) OVERWORLD_FEMALE( - gObjectEventPic_GyaradosF, + sPicTable_GyaradosF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -17036,11 +17295,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_GyaradosMega, .iconSprite = gMonIcon_GyaradosMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 17, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gyarados) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GyaradosMega, + sPicTable_GyaradosMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -17065,7 +17325,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 85, .baseDefense = 80, .baseSpeed = 60, - .baseSpAttack = 85, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 85 : 95, .baseSpDefense = 95, .types = MON_TYPES(TYPE_WATER, TYPE_ICE), .catchRate = 45, @@ -17111,10 +17371,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Lapras, .iconSprite = gMonIcon_Lapras, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Lapras) OVERWORLD( - gObjectEventPic_Lapras, + sPicTable_Lapras, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -17136,7 +17397,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 85, .baseDefense = 80, .baseSpeed = 60, - .baseSpAttack = 85, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 85 : 95, .baseSpDefense = 95, .types = MON_TYPES(TYPE_WATER, TYPE_ICE), .catchRate = 45, @@ -17179,6 +17440,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_LaprasGmax, .iconSprite = gMonIcon_LaprasGmax, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Lapras) .isGigantamax = TRUE, @@ -17246,10 +17508,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Ditto, .iconSprite = gMonIcon_Ditto, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -4, SHADOW_SIZE_M) FOOTPRINT(Ditto) OVERWORLD( - gObjectEventPic_Ditto, + sPicTable_Ditto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -17270,7 +17533,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 55, .baseDefense = 50, .baseSpeed = 55, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 65, .baseSpDefense = 65, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, @@ -17320,10 +17583,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .backPicFemale = gMonBackPic_EeveeF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Eevee) OVERWORLD( - gObjectEventPic_Eevee, + sPicTable_Eevee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17332,7 +17596,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = gShinyOverworldPalette_Eevee ) OVERWORLD_FEMALE( - gObjectEventPic_EeveeF, + sPicTable_EeveeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17362,7 +17626,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 55, .baseDefense = 50, .baseSpeed = 55, - .baseSpAttack = 45, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 45 : 65, .baseSpDefense = 65, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, @@ -17403,6 +17667,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_EeveeGmax, .iconSprite = gMonIcon_EeveeGmax, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_L) FOOTPRINT(Eevee) .isGigantamax = TRUE, @@ -17470,10 +17735,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .iconPalIndexFemale = 2, #endif #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Eevee) OVERWORLD( - gObjectEventPic_Eevee, + sPicTable_Eevee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17496,7 +17762,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 65, .baseSpAttack = 110, - .baseSpDefense = 95, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 95 : 110, .types = MON_TYPES(TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 184 : 196, @@ -17539,10 +17805,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Vaporeon, .iconSprite = gMonIcon_Vaporeon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 3, SHADOW_SIZE_M) FOOTPRINT(Vaporeon) OVERWORLD( - gObjectEventPic_Vaporeon, + sPicTable_Vaporeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17561,7 +17828,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 60, .baseSpeed = 130, .baseSpAttack = 110, - .baseSpDefense = 95, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 95 : 110, .types = MON_TYPES(TYPE_ELECTRIC), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 184 : 197, @@ -17604,10 +17871,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Jolteon, .iconSprite = gMonIcon_Jolteon, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Jolteon) OVERWORLD( - gObjectEventPic_Jolteon, + sPicTable_Jolteon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17625,7 +17893,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 130, .baseDefense = 60, .baseSpeed = 65, - .baseSpAttack = 95, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 95 : 110, .baseSpDefense = 110, .types = MON_TYPES(TYPE_FIRE), .catchRate = 45, @@ -17669,10 +17937,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Flareon, .iconSprite = gMonIcon_Flareon, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 1, SHADOW_SIZE_L) FOOTPRINT(Flareon) OVERWORLD( - gObjectEventPic_Flareon, + sPicTable_Flareon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17736,10 +18005,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Espeon, .iconSprite = gMonIcon_Espeon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Espeon) OVERWORLD( - gObjectEventPic_Espeon, + sPicTable_Espeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17801,10 +18071,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Umbreon, .iconSprite = gMonIcon_Umbreon, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Umbreon) OVERWORLD( - gObjectEventPic_Umbreon, + sPicTable_Umbreon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17869,10 +18140,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Leafeon, .iconSprite = gMonIcon_Leafeon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_M) FOOTPRINT(Leafeon) OVERWORLD( - gObjectEventPic_Leafeon, + sPicTable_Leafeon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -17935,10 +18207,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Glaceon, .iconSprite = gMonIcon_Glaceon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Glaceon) OVERWORLD( - gObjectEventPic_Glaceon, + sPicTable_Glaceon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18004,10 +18277,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Sylveon, .iconSprite = gMonIcon_Sylveon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 9, SHADOW_SIZE_M) FOOTPRINT(Sylveon) OVERWORLD( - gObjectEventPic_Sylveon, + sPicTable_Sylveon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18028,7 +18302,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 60, .baseDefense = 70, .baseSpeed = 40, - .baseSpAttack = 85, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 85 : 75, .baseSpDefense = 75, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 45, @@ -18078,10 +18352,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Porygon, .iconSprite = gMonIcon_Porygon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -2, SHADOW_SIZE_S) FOOTPRINT(Porygon) OVERWORLD( - gObjectEventPic_Porygon, + sPicTable_Porygon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -18154,10 +18429,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Porygon2, .iconSprite = gMonIcon_Porygon2, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Porygon2) OVERWORLD( - gObjectEventPic_Porygon2, + sPicTable_Porygon2, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -18231,10 +18507,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_PorygonZ, .iconSprite = gMonIcon_PorygonZ, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 17, SHADOW_SIZE_S) FOOTPRINT(PorygonZ) OVERWORLD( - gObjectEventPic_PorygonZ, + sPicTable_PorygonZ, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18257,7 +18534,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 100, .baseSpeed = 35, .baseSpAttack = 90, - .baseSpDefense = 55, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 55 : 90, .types = MON_TYPES(TYPE_ROCK, TYPE_WATER), .catchRate = 45, #if P_UPDATED_EXP_YIELDS >= GEN_5 @@ -18312,10 +18589,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Omanyte, .iconSprite = gMonIcon_Omanyte, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -2, SHADOW_SIZE_S) FOOTPRINT(Omanyte) OVERWORLD( - gObjectEventPic_Omanyte, + sPicTable_Omanyte, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -18336,7 +18614,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 125, .baseSpeed = 55, .baseSpAttack = 115, - .baseSpDefense = 70, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 70 : 115, .types = MON_TYPES(TYPE_ROCK, TYPE_WATER), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 173 : 199, @@ -18381,10 +18659,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Omastar, .iconSprite = gMonIcon_Omastar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Omastar) OVERWORLD( - gObjectEventPic_Omastar, + sPicTable_Omastar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18404,7 +18683,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 80, .baseDefense = 90, .baseSpeed = 55, - .baseSpAttack = 55, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 55 : 45, .baseSpDefense = 45, .types = MON_TYPES(TYPE_ROCK, TYPE_WATER), .catchRate = 45, @@ -18460,10 +18739,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kabuto, .iconSprite = gMonIcon_Kabuto, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, -3, SHADOW_SIZE_S) FOOTPRINT(Kabuto) OVERWORLD( - gObjectEventPic_Kabuto, + sPicTable_Kabuto, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -18483,7 +18763,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 115, .baseDefense = 105, .baseSpeed = 80, - .baseSpAttack = 65, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 65 : 70, .baseSpDefense = 70, .types = MON_TYPES(TYPE_ROCK, TYPE_WATER), .catchRate = 45, @@ -18535,10 +18815,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Kabutops, .iconSprite = gMonIcon_Kabutops, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kabutops) OVERWORLD( - gObjectEventPic_Kabutops, + sPicTable_Kabutops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18559,7 +18840,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 130, .baseSpAttack = 60, - .baseSpDefense = 75, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 75 : 60, .types = MON_TYPES(TYPE_ROCK, TYPE_FLYING), .catchRate = 45, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 180 : 202, @@ -18605,10 +18886,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Aerodactyl, .iconSprite = gMonIcon_Aerodactyl, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 16, SHADOW_SIZE_M) FOOTPRINT(Aerodactyl) OVERWORLD( - gObjectEventPic_Aerodactyl, + sPicTable_Aerodactyl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -18671,11 +18953,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_AerodactylMega, .iconSprite = gMonIcon_AerodactylMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 16, SHADOW_SIZE_M) FOOTPRINT(Aerodactyl) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AerodactylMega, + sPicTable_AerodactylMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -18749,10 +19032,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Munchlax, .iconSprite = gMonIcon_Munchlax, .iconPalIndex = 3, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 2, SHADOW_SIZE_M) FOOTPRINT(Munchlax) OVERWORLD( - gObjectEventPic_Munchlax, + sPicTable_Munchlax, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18774,7 +19058,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 30, .baseSpAttack = 65, - .baseSpDefense = 110, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 110 : 65, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 25, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, @@ -18820,10 +19104,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Snorlax, .iconSprite = gMonIcon_Snorlax, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Snorlax) OVERWORLD( - gObjectEventPic_Snorlax, + sPicTable_Snorlax, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -18846,7 +19131,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 65, .baseSpeed = 30, .baseSpAttack = 65, - .baseSpDefense = 110, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 110 : 65, .types = MON_TYPES(TYPE_NORMAL), .catchRate = 25, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 189 : 154, @@ -18888,6 +19173,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_SnorlaxGmax, .iconSprite = gMonIcon_SnorlaxGmax, .iconPalIndex = 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Snorlax) .isGigantamax = TRUE, @@ -18907,7 +19193,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseAttack = 85, .baseDefense = 100, .baseSpeed = 85, - .baseSpAttack = 95, + .baseSpAttack = P_UPDATED_STATS >= GEN_2 ? 95 : 125, .baseSpDefense = 125, .types = MON_TYPES(TYPE_ICE, TYPE_FLYING), .catchRate = 3, @@ -18960,10 +19246,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Articuno, .iconSprite = gMonIcon_Articuno, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_M) FOOTPRINT(Articuno) OVERWORLD( - gObjectEventPic_Articuno, + sPicTable_Articuno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -19027,10 +19314,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ArticunoGalar, .iconSprite = gMonIcon_ArticunoGalar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 14, SHADOW_SIZE_M) FOOTPRINT(Articuno) OVERWORLD( - gObjectEventPic_ArticunoGalar, + sPicTable_ArticunoGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19056,7 +19344,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 85, .baseSpeed = 100, .baseSpAttack = 125, - .baseSpDefense = 90, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 90 : 125, .types = MON_TYPES(TYPE_ELECTRIC, TYPE_FLYING), .catchRate = 3, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -19112,10 +19400,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Zapdos, .iconSprite = gMonIcon_Zapdos, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 15, SHADOW_SIZE_M) FOOTPRINT(Zapdos) OVERWORLD( - gObjectEventPic_Zapdos, + sPicTable_Zapdos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -19178,10 +19467,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_ZapdosGalar, .iconSprite = gMonIcon_ZapdosGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Zapdos) OVERWORLD( - gObjectEventPic_ZapdosGalar, + sPicTable_ZapdosGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19207,7 +19497,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 90, .baseSpeed = 90, .baseSpAttack = 125, - .baseSpDefense = 85, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 85 : 125, .types = MON_TYPES(TYPE_FIRE, TYPE_FLYING), .catchRate = 3, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -19287,10 +19577,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Moltres, .iconSprite = gMonIcon_Moltres, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_M) FOOTPRINT(Moltres) OVERWORLD( - gObjectEventPic_Moltres, + sPicTable_Moltres, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -19353,10 +19644,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MoltresGalar, .iconSprite = gMonIcon_MoltresGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Moltres) OVERWORLD( - gObjectEventPic_MoltresGalar, + sPicTable_MoltresGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19427,10 +19719,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dratini, .iconSprite = gMonIcon_Dratini, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 3, SHADOW_SIZE_L) FOOTPRINT(Dratini) OVERWORLD( - gObjectEventPic_Dratini, + sPicTable_Dratini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -19497,10 +19790,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dragonair, .iconSprite = gMonIcon_Dragonair, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Dragonair) OVERWORLD( - gObjectEventPic_Dragonair, + sPicTable_Dragonair, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -19572,10 +19866,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Dragonite, .iconSprite = gMonIcon_Dragonite, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Dragonite) OVERWORLD( - gObjectEventPic_Dragonite, + sPicTable_Dragonite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -19596,7 +19891,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .baseDefense = 90, .baseSpeed = 130, .baseSpAttack = 154, - .baseSpDefense = 90, + .baseSpDefense = P_UPDATED_STATS >= GEN_2 ? 90 : 154, .types = MON_TYPES(TYPE_PSYCHIC), .catchRate = 3, #if P_UPDATED_EXP_YIELDS >= GEN_8 @@ -19645,10 +19940,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Mewtwo, .iconSprite = gMonIcon_Mewtwo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Mewtwo) OVERWORLD( - gObjectEventPic_Mewtwo, + sPicTable_Mewtwo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19713,11 +20009,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MewtwoMegaX, .iconSprite = gMonIcon_MewtwoMegaX, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Mewtwo) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_MewtwoMegaX, + sPicTable_MewtwoMegaX, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19784,11 +20081,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_MewtwoMegaY, .iconSprite = gMonIcon_MewtwoMegaY, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_S) FOOTPRINT(Mewtwo) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_MewtwoMegaY, + sPicTable_MewtwoMegaY, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -19870,10 +20168,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = .shinyPalette = gMonShinyPalette_Mew, .iconSprite = gMonIcon_Mew, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Mew) OVERWORLD( - gObjectEventPic_Mew, + sPicTable_Mew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index a86367e3f..23a76e189 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -55,10 +55,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Chikorita, .iconSprite = gMonIcon_Chikorita, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 2, SHADOW_SIZE_S) FOOTPRINT(Chikorita) OVERWORLD( - gObjectEventPic_Chikorita, + sPicTable_Chikorita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -123,10 +124,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Bayleef, .iconSprite = gMonIcon_Bayleef, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_M) FOOTPRINT(Bayleef) OVERWORLD( - gObjectEventPic_Bayleef, + sPicTable_Bayleef, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -202,10 +204,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_MeganiumF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Meganium) OVERWORLD( - gObjectEventPic_Meganium, + sPicTable_Meganium, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -214,7 +217,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Meganium ) OVERWORLD_FEMALE( - gObjectEventPic_MeganiumF, + sPicTable_MeganiumF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -278,10 +281,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Cyndaquil, .iconSprite = gMonIcon_Cyndaquil, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -1, SHADOW_SIZE_S) FOOTPRINT(Cyndaquil) OVERWORLD( - gObjectEventPic_Cyndaquil, + sPicTable_Cyndaquil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -346,10 +350,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Quilava, .iconSprite = gMonIcon_Quilava, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Quilava) OVERWORLD( - gObjectEventPic_Quilava, + sPicTable_Quilava, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -422,10 +427,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Typhlosion, .iconSprite = gMonIcon_Typhlosion, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_L) FOOTPRINT(Typhlosion) OVERWORLD( - gObjectEventPic_Typhlosion, + sPicTable_Typhlosion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -486,10 +492,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_TyphlosionHisui, .iconSprite = gMonIcon_TyphlosionHisui, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_L) FOOTPRINT(Typhlosion) OVERWORLD( - gObjectEventPic_TyphlosionHisui, + sPicTable_TyphlosionHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -560,10 +567,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Totodile, .iconSprite = gMonIcon_Totodile, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Totodile) OVERWORLD( - gObjectEventPic_Totodile, + sPicTable_Totodile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -629,10 +637,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Croconaw, .iconSprite = gMonIcon_Croconaw, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_M) FOOTPRINT(Croconaw) OVERWORLD( - gObjectEventPic_Croconaw, + sPicTable_Croconaw, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -705,10 +714,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Feraligatr, .iconSprite = gMonIcon_Feraligatr, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Feraligatr) OVERWORLD( - gObjectEventPic_Feraligatr, + sPicTable_Feraligatr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -774,10 +784,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Sentret, .iconSprite = gMonIcon_Sentret, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_S) FOOTPRINT(Sentret) OVERWORLD( - gObjectEventPic_Sentret, + sPicTable_Sentret, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -841,10 +852,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Furret, .iconSprite = gMonIcon_Furret, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_M) FOOTPRINT(Furret) OVERWORLD( - gObjectEventPic_Furret, + sPicTable_Furret, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -918,10 +930,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Hoothoot, .iconSprite = gMonIcon_Hoothoot, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Hoothoot) OVERWORLD( - gObjectEventPic_Hoothoot, + sPicTable_Hoothoot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -991,10 +1004,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Noctowl, .iconSprite = gMonIcon_Noctowl, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_S) FOOTPRINT(Noctowl) OVERWORLD( - gObjectEventPic_Noctowl, + sPicTable_Noctowl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1066,10 +1080,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_LedybaF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Ledyba) OVERWORLD( - gObjectEventPic_Ledyba, + sPicTable_Ledyba, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1078,7 +1093,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Ledyba ) OVERWORLD_FEMALE( - gObjectEventPic_LedybaF, + sPicTable_LedybaF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1149,10 +1164,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_LedianF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Ledian) OVERWORLD( - gObjectEventPic_Ledian, + sPicTable_Ledian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1161,7 +1177,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Ledian ) OVERWORLD_FEMALE( - gObjectEventPic_LedianF, + sPicTable_LedianF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1229,10 +1245,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Spinarak, .iconSprite = gMonIcon_Spinarak, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -8, SHADOW_SIZE_M) FOOTPRINT(Spinarak) OVERWORLD( - gObjectEventPic_Spinarak, + sPicTable_Spinarak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1304,10 +1321,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Ariados, .iconSprite = gMonIcon_Ariados, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 3, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Ariados) OVERWORLD( - gObjectEventPic_Ariados, + sPicTable_Ariados, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1375,10 +1393,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Chinchou, .iconSprite = gMonIcon_Chinchou, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 1, SHADOW_SIZE_M) FOOTPRINT(Chinchou) OVERWORLD( - gObjectEventPic_Chinchou, + sPicTable_Chinchou, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1446,10 +1465,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Lanturn, .iconSprite = gMonIcon_Lanturn, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 4, SHADOW_SIZE_M) FOOTPRINT(Lanturn) OVERWORLD( - gObjectEventPic_Lanturn, + sPicTable_Lanturn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -1516,10 +1536,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Togepi, .iconSprite = gMonIcon_Togepi, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -3, SHADOW_SIZE_S) FOOTPRINT(Togepi) OVERWORLD( - gObjectEventPic_Togepi, + sPicTable_Togepi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1584,10 +1605,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Togetic, .iconSprite = gMonIcon_Togetic, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Togetic) OVERWORLD( - gObjectEventPic_Togetic, + sPicTable_Togetic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1665,10 +1687,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Togekiss, .iconSprite = gMonIcon_Togekiss, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 15, SHADOW_SIZE_M) FOOTPRINT(Togekiss) OVERWORLD( - gObjectEventPic_Togekiss, + sPicTable_Togekiss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1737,10 +1760,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Natu, .iconSprite = gMonIcon_Natu, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, -4, SHADOW_SIZE_S) FOOTPRINT(Natu) OVERWORLD( - gObjectEventPic_Natu, + sPicTable_Natu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1814,10 +1838,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicFemale = gMonFrontPic_XatuF, .frontPicSizeFemale = MON_COORDS_SIZE(40, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Xatu) OVERWORLD( - gObjectEventPic_Xatu, + sPicTable_Xatu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1826,7 +1851,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Xatu ) OVERWORLD_FEMALE( - gObjectEventPic_XatuF, + sPicTable_XatuF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1893,10 +1918,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Mareep, .iconSprite = gMonIcon_Mareep, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 1, SHADOW_SIZE_M) FOOTPRINT(Mareep) OVERWORLD( - gObjectEventPic_Mareep, + sPicTable_Mareep, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1963,10 +1989,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Flaaffy, .iconSprite = gMonIcon_Flaaffy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Flaaffy) OVERWORLD( - gObjectEventPic_Flaaffy, + sPicTable_Flaaffy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2041,10 +2068,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Ampharos, .iconSprite = gMonIcon_Ampharos, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 11, SHADOW_SIZE_M) FOOTPRINT(Ampharos) OVERWORLD( - gObjectEventPic_Ampharos, + sPicTable_Ampharos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2106,11 +2134,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_AmpharosMega, .iconSprite = gMonIcon_AmpharosMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 13, SHADOW_SIZE_M) FOOTPRINT(Ampharos) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AmpharosMega, + sPicTable_AmpharosMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2189,10 +2218,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Azurill, .iconSprite = gMonIcon_Azurill, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 3, SHADOW_SIZE_S) FOOTPRINT(Azurill) OVERWORLD( - gObjectEventPic_Azurill, + sPicTable_Azurill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2262,10 +2292,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Marill, .iconSprite = gMonIcon_Marill, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 0, SHADOW_SIZE_S) FOOTPRINT(Marill) OVERWORLD( - gObjectEventPic_Marill, + sPicTable_Marill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2344,10 +2375,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Azumarill, .iconSprite = gMonIcon_Azumarill, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 8, SHADOW_SIZE_S) FOOTPRINT(Azumarill) OVERWORLD( - gObjectEventPic_Azumarill, + sPicTable_Azumarill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2415,10 +2447,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Bonsly, .iconSprite = gMonIcon_Bonsly, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 4, SHADOW_SIZE_S) FOOTPRINT(Bonsly) OVERWORLD( - gObjectEventPic_Bonsly, + sPicTable_Bonsly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2493,10 +2526,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_SudowoodoF, .backPicSizeFemale = MON_COORDS_SIZE(48, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Sudowoodo) OVERWORLD( - gObjectEventPic_Sudowoodo, + sPicTable_Sudowoodo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2505,7 +2539,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Sudowoodo ) OVERWORLD_FEMALE( - gObjectEventPic_SudowoodoF, + sPicTable_SudowoodoF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2575,10 +2609,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Hoppip, .iconSprite = gMonIcon_Hoppip, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_S) FOOTPRINT(Hoppip) OVERWORLD( - gObjectEventPic_Hoppip, + sPicTable_Hoppip, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2653,10 +2688,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Skiploom, .iconSprite = gMonIcon_Skiploom, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_S) FOOTPRINT(Skiploom) OVERWORLD( - gObjectEventPic_Skiploom, + sPicTable_Skiploom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2736,10 +2772,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Jumpluff, .iconSprite = gMonIcon_Jumpluff, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Jumpluff) OVERWORLD( - gObjectEventPic_Jumpluff, + sPicTable_Jumpluff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2809,10 +2846,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_AipomF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Aipom) OVERWORLD( - gObjectEventPic_Aipom, + sPicTable_Aipom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2821,7 +2859,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Aipom ) OVERWORLD_FEMALE( - gObjectEventPic_AipomF, + sPicTable_AipomF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2891,10 +2929,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_AmbipomF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Ambipom) OVERWORLD( - gObjectEventPic_Ambipom, + sPicTable_Ambipom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2903,7 +2942,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Ambipom ) OVERWORLD_FEMALE( - gObjectEventPic_AmbipomF, + sPicTable_AmbipomF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2974,10 +3013,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Sunkern, .iconSprite = gMonIcon_Sunkern, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -4, SHADOW_SIZE_S) FOOTPRINT(Sunkern) OVERWORLD( - gObjectEventPic_Sunkern, + sPicTable_Sunkern, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -3046,10 +3086,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Sunflora, .iconSprite = gMonIcon_Sunflora, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_S) FOOTPRINT(Sunflora) OVERWORLD( - gObjectEventPic_Sunflora, + sPicTable_Sunflora, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3135,10 +3176,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Yanma, .iconSprite = gMonIcon_Yanma, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_S) FOOTPRINT(Yanma) OVERWORLD( - gObjectEventPic_Yanma, + sPicTable_Yanma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3229,10 +3271,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Yanmega, .iconSprite = gMonIcon_Yanmega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_M) FOOTPRINT(Yanmega) OVERWORLD( - gObjectEventPic_Yanmega, + sPicTable_Yanmega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3304,10 +3347,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_WooperF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, -2, SHADOW_SIZE_S) FOOTPRINT(Wooper) OVERWORLD( - gObjectEventPic_Wooper, + sPicTable_Wooper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3316,7 +3360,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Wooper ) OVERWORLD_FEMALE( - gObjectEventPic_WooperF, + sPicTable_WooperF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3385,10 +3429,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_QuagsireF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_M) FOOTPRINT(Quagsire) OVERWORLD( - gObjectEventPic_Quagsire, + sPicTable_Quagsire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3397,7 +3442,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Quagsire ) OVERWORLD_FEMALE( - gObjectEventPic_QuagsireF, + sPicTable_QuagsireF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3455,10 +3500,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_WooperPaldea, .iconSprite = gMonIcon_WooperPaldea, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Wooper) OVERWORLD( - gObjectEventPic_WooperPaldea, + sPicTable_WooperPaldea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3521,10 +3567,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Clodsire, .iconSprite = gMonIcon_Clodsire, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 3, SHADOW_SIZE_L) FOOTPRINT(Clodsire) OVERWORLD( - gObjectEventPic_Clodsire, + sPicTable_Clodsire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3600,10 +3647,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_MurkrowF, .backPicSizeFemale = MON_COORDS_SIZE(40, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_S) FOOTPRINT(Murkrow) OVERWORLD( - gObjectEventPic_Murkrow, + sPicTable_Murkrow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3612,7 +3660,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Murkrow ) OVERWORLD_FEMALE( - gObjectEventPic_MurkrowF, + sPicTable_MurkrowF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3677,10 +3725,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Honchkrow, .iconSprite = gMonIcon_Honchkrow, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_M) FOOTPRINT(Honchkrow) OVERWORLD( - gObjectEventPic_Honchkrow, + sPicTable_Honchkrow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3755,10 +3804,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Misdreavus, .iconSprite = gMonIcon_Misdreavus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_S) FOOTPRINT(Misdreavus) OVERWORLD( - gObjectEventPic_Misdreavus, + sPicTable_Misdreavus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3833,10 +3883,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Mismagius, .iconSprite = gMonIcon_Mismagius, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_M) FOOTPRINT(Mismagius) OVERWORLD( - gObjectEventPic_Mismagius, + sPicTable_Mismagius, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3897,10 +3948,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Unown, \ .iconSprite = gMonIcon_Unown ##letter, \ .iconPalIndex = 0, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(0, 3, SHADOW_SIZE_S) \ FOOTPRINT(Unown) \ OVERWORLD( \ - gObjectEventPic_Unown ##letter, \ + sPicTable_Unown ##letter, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_NONE, \ @@ -4000,10 +4052,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Wynaut, .iconSprite = gMonIcon_Wynaut, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 2, SHADOW_SIZE_S) FOOTPRINT(Wynaut) OVERWORLD( - gObjectEventPic_Wynaut, + sPicTable_Wynaut, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4081,10 +4134,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .iconPalIndexFemale = 0, #endif #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 8, SHADOW_SIZE_M) FOOTPRINT(Wobbuffet) OVERWORLD( - gObjectEventPic_Wobbuffet, + sPicTable_Wobbuffet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4093,7 +4147,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Wobbuffet ) OVERWORLD_FEMALE( - gObjectEventPic_WobbuffetF, + sPicTable_WobbuffetF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4163,10 +4217,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_GirafarigF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Girafarig) OVERWORLD( - gObjectEventPic_Girafarig, + sPicTable_Girafarig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4175,7 +4230,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Girafarig ) OVERWORLD_FEMALE( - gObjectEventPic_GirafarigF, + sPicTable_GirafarigF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4235,10 +4290,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Farigiraf, .iconSprite = gMonIcon_Farigiraf, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(11, 13, SHADOW_SIZE_L) FOOTPRINT(Farigiraf) OVERWORLD( - gObjectEventPic_Farigiraf, + sPicTable_Farigiraf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4309,10 +4365,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Pineco, .iconSprite = gMonIcon_Pineco, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Pineco) OVERWORLD( - gObjectEventPic_Pineco, + sPicTable_Pineco, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -4378,10 +4435,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Forretress, .iconSprite = gMonIcon_Forretress, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_L) FOOTPRINT(Forretress) OVERWORLD( - gObjectEventPic_Forretress, + sPicTable_Forretress, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -4454,10 +4512,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Dunsparce, .iconSprite = gMonIcon_Dunsparce, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -4, SHADOW_SIZE_M) FOOTPRINT(Dunsparce) OVERWORLD( - gObjectEventPic_Dunsparce, + sPicTable_Dunsparce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -4520,10 +4579,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Dudunsparce, .iconSprite = gMonIcon_Dudunsparce, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_L) FOOTPRINT(Dudunsparce) OVERWORLD( - gObjectEventPic_DudunsparceTwoSegment, + sPicTable_DudunsparceTwoSegment, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -4583,10 +4643,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Dudunsparce, .iconSprite = gMonIcon_Dudunsparce, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 4, SHADOW_SIZE_L) FOOTPRINT(Dudunsparce) OVERWORLD( - gObjectEventPic_DudunsparceThreeSegment, + sPicTable_DudunsparceThreeSegment, SIZE_64x64, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -4659,10 +4720,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_GligarF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Gligar) OVERWORLD( - gObjectEventPic_Gligar, + sPicTable_Gligar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -4671,7 +4733,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Gligar ) OVERWORLD_FEMALE( - gObjectEventPic_GligarF, + sPicTable_GligarF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -4738,10 +4800,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Gliscor, .iconSprite = gMonIcon_Gliscor, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Gliscor) OVERWORLD( - gObjectEventPic_Gliscor, + sPicTable_Gliscor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4810,10 +4873,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Snubbull, .iconSprite = gMonIcon_Snubbull, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Snubbull) OVERWORLD( - gObjectEventPic_Snubbull, + sPicTable_Snubbull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4885,10 +4949,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Granbull, .iconSprite = gMonIcon_Granbull, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_L) FOOTPRINT(Granbull) OVERWORLD( - gObjectEventPic_Granbull, + sPicTable_Granbull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4968,10 +5033,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Qwilfish, .iconSprite = gMonIcon_Qwilfish, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Qwilfish) OVERWORLD( - gObjectEventPic_Qwilfish, + sPicTable_Qwilfish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -5035,10 +5101,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_QwilfishHisui, .iconSprite = gMonIcon_QwilfishHisui, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 4, SHADOW_SIZE_S) FOOTPRINT(Qwilfish) OVERWORLD( - gObjectEventPic_QwilfishHisui, + sPicTable_QwilfishHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5100,10 +5167,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Overqwil, .iconSprite = gMonIcon_Overqwil, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Overqwil) OVERWORLD( - gObjectEventPic_Overqwil, + sPicTable_Overqwil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5176,10 +5244,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Shuckle, .iconSprite = gMonIcon_Shuckle, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 3, SHADOW_SIZE_M) FOOTPRINT(Shuckle) OVERWORLD( - gObjectEventPic_Shuckle, + sPicTable_Shuckle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5253,10 +5322,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_HeracrossF, .backPicSizeFemale = MON_COORDS_SIZE(48, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_M) FOOTPRINT(Heracross) OVERWORLD( - gObjectEventPic_Heracross, + sPicTable_Heracross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5265,7 +5335,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Heracross ) OVERWORLD_FEMALE( - gObjectEventPic_HeracrossF, + sPicTable_HeracrossF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5326,11 +5396,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_HeracrossMega, .iconSprite = gMonIcon_HeracrossMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Heracross) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_HeracrossMega, + sPicTable_HeracrossMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5412,10 +5483,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_SneaselF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Sneasel) OVERWORLD( - gObjectEventPic_Sneasel, + sPicTable_Sneasel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5424,7 +5496,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Sneasel ) OVERWORLD_FEMALE( - gObjectEventPic_SneaselF, + sPicTable_SneaselF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5497,10 +5569,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_WeavileF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 10, SHADOW_SIZE_M) FOOTPRINT(Weavile) OVERWORLD( - gObjectEventPic_Weavile, + sPicTable_Weavile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5509,7 +5582,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Weavile ) OVERWORLD_FEMALE( - gObjectEventPic_WeavileF, + sPicTable_WeavileF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5576,10 +5649,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_SneaselHisuiF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Sneasel) OVERWORLD( - gObjectEventPic_SneaselHisui, + sPicTable_SneaselHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5588,7 +5662,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_SneaselHisui ) OVERWORLD_FEMALE( - gObjectEventPic_SneaselHisuiF, + sPicTable_SneaselHisuiF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5649,10 +5723,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Sneasler, .iconSprite = gMonIcon_Sneasler, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Sneasler) OVERWORLD( - gObjectEventPic_Sneasler, + sPicTable_Sneasler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5723,10 +5798,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Teddiursa, .iconSprite = gMonIcon_Teddiursa, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Teddiursa) OVERWORLD( - gObjectEventPic_Teddiursa, + sPicTable_Teddiursa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5800,10 +5876,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_UrsaringF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 14, SHADOW_SIZE_L) FOOTPRINT(Ursaring) OVERWORLD( - gObjectEventPic_Ursaring, + sPicTable_Ursaring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5812,7 +5889,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Ursaring ) OVERWORLD_FEMALE( - gObjectEventPic_UrsaringF, + sPicTable_UrsaringF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5871,10 +5948,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Ursaluna, .iconSprite = gMonIcon_Ursaluna, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Ursaluna) OVERWORLD( - gObjectEventPic_Ursaluna, + sPicTable_Ursaluna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5934,6 +6012,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_UrsalunaBloodmoon, .iconSprite = gMonIcon_UrsalunaBloodmoon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 11, SHADOW_SIZE_L) FOOTPRINT(Ursaluna) .levelUpLearnset = sUrsalunaBloodmoonLevelUpLearnset, @@ -5997,10 +6076,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Slugma, .iconSprite = gMonIcon_Slugma, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Slugma) OVERWORLD( - gObjectEventPic_Slugma, + sPicTable_Slugma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6074,10 +6154,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Magcargo, .iconSprite = gMonIcon_Magcargo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Magcargo) OVERWORLD( - gObjectEventPic_Magcargo, + sPicTable_Magcargo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6147,10 +6228,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Swinub, .iconSprite = gMonIcon_Swinub, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, -6, SHADOW_SIZE_S) FOOTPRINT(Swinub) OVERWORLD( - gObjectEventPic_Swinub, + sPicTable_Swinub, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6227,10 +6309,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_PiloswineF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_M) FOOTPRINT(Piloswine) OVERWORLD( - gObjectEventPic_Piloswine, + sPicTable_Piloswine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6239,7 +6322,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Piloswine ) OVERWORLD_FEMALE( - gObjectEventPic_PiloswineF, + sPicTable_PiloswineF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6312,10 +6395,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .frontPicFemale = gMonFrontPic_MamoswineF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 7, SHADOW_SIZE_L) FOOTPRINT(Mamoswine) OVERWORLD( - gObjectEventPic_Mamoswine, + sPicTable_Mamoswine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6324,7 +6408,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Mamoswine ) OVERWORLD_FEMALE( - gObjectEventPic_MamoswineF, + sPicTable_MamoswineF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6402,10 +6486,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Corsola, .iconSprite = gMonIcon_Corsola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_M) FOOTPRINT(Corsola) OVERWORLD( - gObjectEventPic_Corsola, + sPicTable_Corsola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6467,10 +6552,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_CorsolaGalar, .iconSprite = gMonIcon_CorsolaGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Corsola) OVERWORLD( - gObjectEventPic_CorsolaGalar, + sPicTable_CorsolaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6533,10 +6619,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Cursola, .iconSprite = gMonIcon_Cursola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Cursola) OVERWORLD( - gObjectEventPic_Cursola, + sPicTable_Cursola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6606,10 +6693,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Remoraid, .iconSprite = gMonIcon_Remoraid, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Remoraid) OVERWORLD( - gObjectEventPic_Remoraid, + sPicTable_Remoraid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -6687,10 +6775,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_OctilleryF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Octillery) OVERWORLD( - gObjectEventPic_Octillery, + sPicTable_Octillery, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6699,7 +6788,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Octillery ) OVERWORLD_FEMALE( - gObjectEventPic_OctilleryF, + sPicTable_OctilleryF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6761,10 +6850,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Delibird, .iconSprite = gMonIcon_Delibird, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Delibird) OVERWORLD( - gObjectEventPic_Delibird, + sPicTable_Delibird, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6832,10 +6922,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Mantyke, .iconSprite = gMonIcon_Mantyke, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_S) FOOTPRINT(Mantyke) OVERWORLD( - gObjectEventPic_Mantyke, + sPicTable_Mantyke, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6909,10 +7000,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Mantine, .iconSprite = gMonIcon_Mantine, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Mantine) OVERWORLD( - gObjectEventPic_Mantine, + sPicTable_Mantine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6978,10 +7070,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Skarmory, .iconSprite = gMonIcon_Skarmory, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 9, SHADOW_SIZE_M) FOOTPRINT(Skarmory) OVERWORLD( - gObjectEventPic_Skarmory, + sPicTable_Skarmory, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7046,10 +7139,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Houndour, .iconSprite = gMonIcon_Houndour, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 4, SHADOW_SIZE_M) FOOTPRINT(Houndour) OVERWORLD( - gObjectEventPic_Houndour, + sPicTable_Houndour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7119,10 +7213,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_HoundoomF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 13, SHADOW_SIZE_L) FOOTPRINT(Houndoom) OVERWORLD( - gObjectEventPic_Houndoom, + sPicTable_Houndoom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7131,7 +7226,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Houndoom ) OVERWORLD_FEMALE( - gObjectEventPic_HoundoomF, + sPicTable_HoundoomF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7190,11 +7285,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_HoundoomMega, .iconSprite = gMonIcon_HoundoomMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 13, SHADOW_SIZE_L) FOOTPRINT(Houndoom) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_HoundoomMega, + sPicTable_HoundoomMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7268,10 +7364,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Phanpy, .iconSprite = gMonIcon_Phanpy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, -2, SHADOW_SIZE_M) FOOTPRINT(Phanpy) OVERWORLD( - gObjectEventPic_Phanpy, + sPicTable_Phanpy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7343,10 +7440,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .backPicFemale = gMonBackPic_DonphanF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 2, SHADOW_SIZE_L) FOOTPRINT(Donphan) OVERWORLD( - gObjectEventPic_Donphan, + sPicTable_Donphan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7355,7 +7453,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = gShinyOverworldPalette_Donphan ) OVERWORLD_FEMALE( - gObjectEventPic_DonphanF, + sPicTable_DonphanF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7421,10 +7519,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Stantler, .iconSprite = gMonIcon_Stantler, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 13, SHADOW_SIZE_M) FOOTPRINT(Stantler) OVERWORLD( - gObjectEventPic_Stantler, + sPicTable_Stantler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7487,10 +7586,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Wyrdeer, .iconSprite = gMonIcon_Wyrdeer, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Wyrdeer) OVERWORLD( - gObjectEventPic_Wyrdeer, + sPicTable_Wyrdeer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7561,10 +7661,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Smeargle, .iconSprite = gMonIcon_Smeargle, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 7, SHADOW_SIZE_S) FOOTPRINT(Smeargle) OVERWORLD( - gObjectEventPic_Smeargle, + sPicTable_Smeargle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7635,10 +7736,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Miltank, .iconSprite = gMonIcon_Miltank, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 4, SHADOW_SIZE_M) FOOTPRINT(Miltank) OVERWORLD( - gObjectEventPic_Miltank, + sPicTable_Miltank, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7715,10 +7817,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Raikou, .iconSprite = gMonIcon_Raikou, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 7, SHADOW_SIZE_L) FOOTPRINT(Raikou) OVERWORLD( - gObjectEventPic_Raikou, + sPicTable_Raikou, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7795,10 +7898,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Entei, .iconSprite = gMonIcon_Entei, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_L) FOOTPRINT(Entei) OVERWORLD( - gObjectEventPic_Entei, + sPicTable_Entei, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7875,10 +7979,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Suicune, .iconSprite = gMonIcon_Suicune, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Suicune) OVERWORLD( - gObjectEventPic_Suicune, + sPicTable_Suicune, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7946,10 +8051,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Larvitar, .iconSprite = gMonIcon_Larvitar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Larvitar) OVERWORLD( - gObjectEventPic_Larvitar, + sPicTable_Larvitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8013,10 +8119,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Pupitar, .iconSprite = gMonIcon_Pupitar, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 3, SHADOW_SIZE_S) FOOTPRINT(Pupitar) OVERWORLD( - gObjectEventPic_Pupitar, + sPicTable_Pupitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8087,10 +8194,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Tyranitar, .iconSprite = gMonIcon_Tyranitar, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_L) FOOTPRINT(Tyranitar) OVERWORLD( - gObjectEventPic_Tyranitar, + sPicTable_Tyranitar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8152,11 +8260,12 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_TyranitarMega, .iconSprite = gMonIcon_TyranitarMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tyranitar) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_TyranitarMega, + sPicTable_TyranitarMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8243,10 +8352,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Lugia, .iconSprite = gMonIcon_Lugia, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 17, SHADOW_SIZE_L) FOOTPRINT(Lugia) OVERWORLD( - gObjectEventPic_Lugia, + sPicTable_Lugia, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -8322,10 +8432,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_HoOh, .iconSprite = gMonIcon_HoOh, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 17, SHADOW_SIZE_L) FOOTPRINT(HoOh) OVERWORLD( - gObjectEventPic_HoOh, + sPicTable_HoOh, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -8403,10 +8514,11 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .shinyPalette = gMonShinyPalette_Celebi, .iconSprite = gMonIcon_Celebi, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_S) FOOTPRINT(Celebi) OVERWORLD( - gObjectEventPic_Celebi, + sPicTable_Celebi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index ebdca4498..3b9343f01 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -57,10 +57,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Treecko, .iconSprite = gMonIcon_Treecko, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 4, SHADOW_SIZE_S) FOOTPRINT(Treecko) OVERWORLD( - gObjectEventPic_Treecko, + sPicTable_Treecko, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -127,10 +128,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Grovyle, .iconSprite = gMonIcon_Grovyle, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_M) FOOTPRINT(Grovyle) OVERWORLD( - gObjectEventPic_Grovyle, + sPicTable_Grovyle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -200,10 +202,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sceptile, .iconSprite = gMonIcon_Sceptile, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Sceptile) OVERWORLD( - gObjectEventPic_Sceptile, + sPicTable_Sceptile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -265,11 +268,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SceptileMega, .iconSprite = gMonIcon_SceptileMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 11, SHADOW_SIZE_L) FOOTPRINT(Sceptile) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SceptileMega, + sPicTable_SceptileMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -347,10 +351,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_TorchicF, .backPicSizeFemale = MON_COORDS_SIZE(40, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Torchic) OVERWORLD( - gObjectEventPic_Torchic, + sPicTable_Torchic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -359,7 +364,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Torchic ) OVERWORLD_FEMALE( - gObjectEventPic_TorchicF, + sPicTable_TorchicF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -429,10 +434,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_CombuskenF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Combusken) OVERWORLD( - gObjectEventPic_Combusken, + sPicTable_Combusken, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -441,7 +447,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Combusken ) OVERWORLD_FEMALE( - gObjectEventPic_CombuskenF, + sPicTable_CombuskenF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -517,10 +523,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_BlazikenF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_M) FOOTPRINT(Blaziken) OVERWORLD( - gObjectEventPic_Blaziken, + sPicTable_Blaziken, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -529,7 +536,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Blaziken ) OVERWORLD_FEMALE( - gObjectEventPic_BlazikenF, + sPicTable_BlazikenF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -589,11 +596,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_BlazikenMega, .iconSprite = gMonIcon_BlazikenMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Blaziken) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_BlazikenMega, + sPicTable_BlazikenMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -665,10 +673,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Mudkip, .iconSprite = gMonIcon_Mudkip, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 1, SHADOW_SIZE_S) FOOTPRINT(Mudkip) OVERWORLD( - gObjectEventPic_Mudkip, + sPicTable_Mudkip, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -739,10 +748,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Marshtomp, .iconSprite = gMonIcon_Marshtomp, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Marshtomp) OVERWORLD( - gObjectEventPic_Marshtomp, + sPicTable_Marshtomp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -814,10 +824,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Swampert, .iconSprite = gMonIcon_Swampert, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_L) FOOTPRINT(Swampert) OVERWORLD( - gObjectEventPic_Swampert, + sPicTable_Swampert, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -879,11 +890,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SwampertMega, .iconSprite = gMonIcon_SwampertMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Swampert) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SwampertMega, + sPicTable_SwampertMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -963,10 +975,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Poochyena, .iconSprite = gMonIcon_Poochyena, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_M) FOOTPRINT(Poochyena) OVERWORLD( - gObjectEventPic_Poochyena, + sPicTable_Poochyena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1037,10 +1050,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Mightyena, .iconSprite = gMonIcon_Mightyena, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 6, SHADOW_SIZE_L) FOOTPRINT(Mightyena) OVERWORLD( - gObjectEventPic_Mightyena, + sPicTable_Mightyena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1121,10 +1135,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Zigzagoon, .iconSprite = gMonIcon_Zigzagoon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-4, 0, SHADOW_SIZE_M) FOOTPRINT(Zigzagoon) OVERWORLD( - gObjectEventPic_Zigzagoon, + sPicTable_Zigzagoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1198,10 +1213,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Linoone, .iconSprite = gMonIcon_Linoone, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-6, 0, SHADOW_SIZE_L) FOOTPRINT(Linoone) OVERWORLD( - gObjectEventPic_Linoone, + sPicTable_Linoone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1262,10 +1278,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_ZigzagoonGalar, .iconSprite = gMonIcon_ZigzagoonGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-5, 0, SHADOW_SIZE_M) FOOTPRINT(Zigzagoon) OVERWORLD( - gObjectEventPic_ZigzagoonGalar, + sPicTable_ZigzagoonGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1328,10 +1345,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LinooneGalar, .iconSprite = gMonIcon_LinooneGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-4, 0, SHADOW_SIZE_L) FOOTPRINT(Linoone) OVERWORLD( - gObjectEventPic_LinooneGalar, + sPicTable_LinooneGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1393,10 +1411,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Obstagoon, .iconSprite = gMonIcon_Obstagoon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Obstagoon) OVERWORLD( - gObjectEventPic_Obstagoon, + sPicTable_Obstagoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1470,10 +1489,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Wurmple, .iconSprite = gMonIcon_Wurmple, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Wurmple) OVERWORLD( - gObjectEventPic_Wurmple, + sPicTable_Wurmple, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1539,10 +1559,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Silcoon, .iconSprite = gMonIcon_Silcoon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -4, SHADOW_SIZE_M) FOOTPRINT(Silcoon) OVERWORLD( - gObjectEventPic_Silcoon, + sPicTable_Silcoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1629,10 +1650,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_BeautiflyF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_S) FOOTPRINT(Beautifly) OVERWORLD( - gObjectEventPic_Beautifly, + sPicTable_Beautifly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1641,7 +1663,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Beautifly ) OVERWORLD_FEMALE( - gObjectEventPic_BeautiflyF, + sPicTable_BeautiflyF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1710,10 +1732,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Cascoon, .iconSprite = gMonIcon_Cascoon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -4, SHADOW_SIZE_M) FOOTPRINT(Cascoon) OVERWORLD( - gObjectEventPic_Cascoon, + sPicTable_Cascoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -1808,10 +1831,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_DustoxF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Dustox) OVERWORLD( - gObjectEventPic_Dustox, + sPicTable_Dustox, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1820,7 +1844,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Dustox ) OVERWORLD_FEMALE( - gObjectEventPic_DustoxF, + sPicTable_DustoxF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -1884,10 +1908,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Lotad, .iconSprite = gMonIcon_Lotad, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 4, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, -3, SHADOW_SIZE_S) FOOTPRINT(Lotad) OVERWORLD( - gObjectEventPic_Lotad, + sPicTable_Lotad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1955,10 +1980,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Lombre, .iconSprite = gMonIcon_Lombre, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 2, SHADOW_SIZE_S) FOOTPRINT(Lombre) OVERWORLD( - gObjectEventPic_Lombre, + sPicTable_Lombre, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2039,10 +2065,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_LudicoloF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_M) FOOTPRINT(Ludicolo) OVERWORLD( - gObjectEventPic_Ludicolo, + sPicTable_Ludicolo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2051,7 +2078,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Ludicolo ) OVERWORLD_FEMALE( - gObjectEventPic_LudicoloF, + sPicTable_LudicoloF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2121,10 +2148,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Seedot, .iconSprite = gMonIcon_Seedot, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Seedot) OVERWORLD( - gObjectEventPic_Seedot, + sPicTable_Seedot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2202,10 +2230,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_NuzleafF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 5, SHADOW_SIZE_S) FOOTPRINT(Nuzleaf) OVERWORLD( - gObjectEventPic_Nuzleaf, + sPicTable_Nuzleaf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2214,7 +2243,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Nuzleaf ) OVERWORLD_FEMALE( - gObjectEventPic_NuzleafF, + sPicTable_NuzleafF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2293,10 +2322,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_ShiftryF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Shiftry) OVERWORLD( - gObjectEventPic_Shiftry, + sPicTable_Shiftry, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2305,7 +2335,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Shiftry ) OVERWORLD_FEMALE( - gObjectEventPic_ShiftryF, + sPicTable_ShiftryF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2374,10 +2404,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Taillow, .iconSprite = gMonIcon_Taillow, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Taillow) OVERWORLD( - gObjectEventPic_Taillow, + sPicTable_Taillow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2448,10 +2479,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Swellow, .iconSprite = gMonIcon_Swellow, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 7, SHADOW_SIZE_M) FOOTPRINT(Swellow) OVERWORLD( - gObjectEventPic_Swellow, + sPicTable_Swellow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2522,10 +2554,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Wingull, .iconSprite = gMonIcon_Wingull, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 15, SHADOW_SIZE_S) FOOTPRINT(Wingull) OVERWORLD( - gObjectEventPic_Wingull, + sPicTable_Wingull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2608,10 +2641,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Pelipper, .iconSprite = gMonIcon_Pelipper, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 17, SHADOW_SIZE_M) FOOTPRINT(Pelipper) OVERWORLD( - gObjectEventPic_Pelipper, + sPicTable_Pelipper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2684,10 +2718,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Ralts, .iconSprite = gMonIcon_Ralts, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Ralts) OVERWORLD( - gObjectEventPic_Ralts, + sPicTable_Ralts, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2752,10 +2787,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Kirlia, .iconSprite = gMonIcon_Kirlia, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Kirlia) OVERWORLD( - gObjectEventPic_Kirlia, + sPicTable_Kirlia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2826,10 +2862,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Gardevoir, .iconSprite = gMonIcon_Gardevoir, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_L) FOOTPRINT(Gardevoir) OVERWORLD( - gObjectEventPic_Gardevoir, + sPicTable_Gardevoir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2891,11 +2928,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GardevoirMega, .iconSprite = gMonIcon_GardevoirMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 14, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gardevoir) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GardevoirMega, + sPicTable_GardevoirMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2973,10 +3011,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Gallade, .iconSprite = gMonIcon_Gallade, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 13, SHADOW_SIZE_L) FOOTPRINT(Gallade) OVERWORLD( - gObjectEventPic_Gallade, + sPicTable_Gallade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3038,11 +3077,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GalladeMega, .iconSprite = gMonIcon_GalladeMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_L) FOOTPRINT(Gallade) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GalladeMega, + sPicTable_GalladeMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3116,10 +3156,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Surskit, .iconSprite = gMonIcon_Surskit, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -3, SHADOW_SIZE_S) FOOTPRINT(Surskit) OVERWORLD( - gObjectEventPic_Surskit, + sPicTable_Surskit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -3199,10 +3240,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Masquerain, .iconSprite = gMonIcon_Masquerain, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 17, SHADOW_SIZE_M) FOOTPRINT(Masquerain) OVERWORLD( - gObjectEventPic_Masquerain, + sPicTable_Masquerain, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3281,10 +3323,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Shroomish, .iconSprite = gMonIcon_Shroomish, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Shroomish) OVERWORLD( - gObjectEventPic_Shroomish, + sPicTable_Shroomish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3357,10 +3400,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Breloom, .iconSprite = gMonIcon_Breloom, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 9, SHADOW_SIZE_M) FOOTPRINT(Breloom) OVERWORLD( - gObjectEventPic_Breloom, + sPicTable_Breloom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3428,10 +3472,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Slakoth, .iconSprite = gMonIcon_Slakoth, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, -4, SHADOW_SIZE_M) FOOTPRINT(Slakoth) OVERWORLD( - gObjectEventPic_Slakoth, + sPicTable_Slakoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3500,10 +3545,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Vigoroth, .iconSprite = gMonIcon_Vigoroth, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 6, SHADOW_SIZE_M) FOOTPRINT(Vigoroth) OVERWORLD( - gObjectEventPic_Vigoroth, + sPicTable_Vigoroth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3577,10 +3623,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Slaking, .iconSprite = gMonIcon_Slaking, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Slaking) OVERWORLD( - gObjectEventPic_Slaking, + sPicTable_Slaking, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3648,10 +3695,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Nincada, .iconSprite = gMonIcon_Nincada, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, -3, SHADOW_SIZE_M) FOOTPRINT(Nincada) OVERWORLD( - gObjectEventPic_Nincada, + sPicTable_Nincada, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -3733,10 +3781,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Ninjask, .iconSprite = gMonIcon_Ninjask, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_S) FOOTPRINT(Ninjask) OVERWORLD( - gObjectEventPic_Ninjask, + sPicTable_Ninjask, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3802,10 +3851,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Shedinja, .iconSprite = gMonIcon_Shedinja, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 9, SHADOW_SIZE_S) FOOTPRINT(Shedinja) OVERWORLD( - gObjectEventPic_Shedinja, + sPicTable_Shedinja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3877,10 +3927,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Whismur, .iconSprite = gMonIcon_Whismur, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(Whismur) OVERWORLD( - gObjectEventPic_Whismur, + sPicTable_Whismur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3947,10 +3998,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Loudred, .iconSprite = gMonIcon_Loudred, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Loudred) OVERWORLD( - gObjectEventPic_Loudred, + sPicTable_Loudred, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4022,10 +4074,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Exploud, .iconSprite = gMonIcon_Exploud, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_L) FOOTPRINT(Exploud) OVERWORLD( - gObjectEventPic_Exploud, + sPicTable_Exploud, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4097,10 +4150,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Makuhita, .iconSprite = gMonIcon_Makuhita, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 5, SHADOW_SIZE_M) FOOTPRINT(Makuhita) OVERWORLD( - gObjectEventPic_Makuhita, + sPicTable_Makuhita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4167,10 +4221,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Hariyama, .iconSprite = gMonIcon_Hariyama, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 9, SHADOW_SIZE_L) FOOTPRINT(Hariyama) OVERWORLD( - gObjectEventPic_Hariyama, + sPicTable_Hariyama, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4240,10 +4295,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Nosepass, .iconSprite = gMonIcon_Nosepass, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_M) FOOTPRINT(Nosepass) OVERWORLD( - gObjectEventPic_Nosepass, + sPicTable_Nosepass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4254,7 +4310,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .levelUpLearnset = sNosepassLevelUpLearnset, .teachableLearnset = sNosepassTeachableLearnset, .eggMoveLearnset = sNosepassEggMoveLearnset, - .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_NEW_MAUVILLE, SPECIES_PROBOPASS}, + .evolutions = EVOLUTION({EVO_MAPSEC, MAPSEC_POWER_PLANT, SPECIES_PROBOPASS}, {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}), }, @@ -4315,10 +4371,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Probopass, .iconSprite = gMonIcon_Probopass, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_L) FOOTPRINT(Probopass) OVERWORLD( - gObjectEventPic_Probopass, + sPicTable_Probopass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4388,10 +4445,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Skitty, .iconSprite = gMonIcon_Skitty, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Skitty) OVERWORLD( - gObjectEventPic_Skitty, + sPicTable_Skitty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4467,10 +4525,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Delcatty, .iconSprite = gMonIcon_Delcatty, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Delcatty) OVERWORLD( - gObjectEventPic_Delcatty, + sPicTable_Delcatty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4543,10 +4602,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sableye, .iconSprite = gMonIcon_Sableye, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(2, 3, SHADOW_SIZE_S) FOOTPRINT(Sableye) OVERWORLD( - gObjectEventPic_Sableye, + sPicTable_Sableye, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4609,11 +4669,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SableyeMega, .iconSprite = gMonIcon_SableyeMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 7, SHADOW_SIZE_S) FOOTPRINT(Sableye) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SableyeMega, + sPicTable_SableyeMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4696,10 +4757,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Mawile, .iconSprite = gMonIcon_Mawile, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 4, SHADOW_SIZE_L) FOOTPRINT(Mawile) OVERWORLD( - gObjectEventPic_Mawile, + sPicTable_Mawile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4763,11 +4825,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MawileMega, .iconSprite = gMonIcon_MawileMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Mawile) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_MawileMega, + sPicTable_MawileMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4841,10 +4904,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Aron, .iconSprite = gMonIcon_Aron, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, -3, SHADOW_SIZE_S) FOOTPRINT(Aron) OVERWORLD( - gObjectEventPic_Aron, + sPicTable_Aron, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4912,10 +4976,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Lairon, .iconSprite = gMonIcon_Lairon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 2, SHADOW_SIZE_L) FOOTPRINT(Lairon) OVERWORLD( - gObjectEventPic_Lairon, + sPicTable_Lairon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4986,10 +5051,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Aggron, .iconSprite = gMonIcon_Aggron, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 12, SHADOW_SIZE_L) FOOTPRINT(Aggron) OVERWORLD( - gObjectEventPic_Aggron, + sPicTable_Aggron, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5052,11 +5118,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AggronMega, .iconSprite = gMonIcon_AggronMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Aggron) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AggronMega, + sPicTable_AggronMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5132,10 +5199,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_MedititeF, .backPicSizeFemale = MON_COORDS_SIZE(48, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Meditite) OVERWORLD( - gObjectEventPic_Meditite, + sPicTable_Meditite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5144,7 +5212,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Meditite ) OVERWORLD_FEMALE( - gObjectEventPic_MedititeF, + sPicTable_MedititeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5217,10 +5285,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_MedichamF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_S) FOOTPRINT(Medicham) OVERWORLD( - gObjectEventPic_Medicham, + sPicTable_Medicham, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5229,7 +5298,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Medicham ) OVERWORLD_FEMALE( - gObjectEventPic_MedichamF, + sPicTable_MedichamF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5289,11 +5358,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MedichamMega, .iconSprite = gMonIcon_MedichamMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_S) FOOTPRINT(Medicham) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_MedichamMega, + sPicTable_MedichamMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5365,10 +5435,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Electrike, .iconSprite = gMonIcon_Electrike, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, -1, SHADOW_SIZE_M) FOOTPRINT(Electrike) OVERWORLD( - gObjectEventPic_Electrike, + sPicTable_Electrike, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5435,10 +5506,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Manectric, .iconSprite = gMonIcon_Manectric, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_M) FOOTPRINT(Manectric) OVERWORLD( - gObjectEventPic_Manectric, + sPicTable_Manectric, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5499,11 +5571,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_ManectricMega, .iconSprite = gMonIcon_ManectricMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Manectric) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_ManectricMega, + sPicTable_ManectricMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5580,10 +5653,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Plusle, .iconSprite = gMonIcon_Plusle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 3, SHADOW_SIZE_S) FOOTPRINT(Plusle) OVERWORLD( - gObjectEventPic_Plusle, + sPicTable_Plusle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5656,10 +5730,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Minun, .iconSprite = gMonIcon_Minun, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-4, 3, SHADOW_SIZE_S) FOOTPRINT(Minun) OVERWORLD( - gObjectEventPic_Minun, + sPicTable_Minun, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5736,10 +5811,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Volbeat, .iconSprite = gMonIcon_Volbeat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Volbeat) OVERWORLD( - gObjectEventPic_Volbeat, + sPicTable_Volbeat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -5816,10 +5892,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Illumise, .iconSprite = gMonIcon_Illumise, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Illumise) OVERWORLD( - gObjectEventPic_Illumise, + sPicTable_Illumise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -5888,10 +5965,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Budew, .iconSprite = gMonIcon_Budew, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 0, SHADOW_SIZE_S) FOOTPRINT(Budew) OVERWORLD( - gObjectEventPic_Budew, + sPicTable_Budew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5965,10 +6043,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_RoseliaF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Roselia) OVERWORLD( - gObjectEventPic_Roselia, + sPicTable_Roselia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5977,7 +6056,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Roselia ) OVERWORLD_FEMALE( - gObjectEventPic_RoseliaF, + sPicTable_RoseliaF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6056,10 +6135,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_RoseradeF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Roserade) OVERWORLD( - gObjectEventPic_Roserade, + sPicTable_Roserade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6068,7 +6148,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Roserade ) OVERWORLD_FEMALE( - gObjectEventPic_RoseradeF, + sPicTable_RoseradeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6142,10 +6222,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_GulpinF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, -2, SHADOW_SIZE_S) FOOTPRINT(Gulpin) OVERWORLD( - gObjectEventPic_Gulpin, + sPicTable_Gulpin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -6154,7 +6235,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Gulpin ) OVERWORLD_FEMALE( - gObjectEventPic_GulpinF, + sPicTable_GulpinF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -6226,10 +6307,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_SwalotF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 3, SHADOW_SIZE_L) FOOTPRINT(Swalot) OVERWORLD( - gObjectEventPic_Swalot, + sPicTable_Swalot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6238,7 +6320,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Swalot ) OVERWORLD_FEMALE( - gObjectEventPic_SwalotF, + sPicTable_SwalotF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6308,10 +6390,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Carvanha, .iconSprite = gMonIcon_Carvanha, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_S) FOOTPRINT(Carvanha) OVERWORLD( - gObjectEventPic_Carvanha, + sPicTable_Carvanha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6383,10 +6466,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sharpedo, .iconSprite = gMonIcon_Sharpedo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Sharpedo) OVERWORLD( - gObjectEventPic_Sharpedo, + sPicTable_Sharpedo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6450,11 +6534,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SharpedoMega, .iconSprite = gMonIcon_SharpedoMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Sharpedo) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SharpedoMega, + sPicTable_SharpedoMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6528,10 +6613,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Wailmer, .iconSprite = gMonIcon_Wailmer, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_L) FOOTPRINT(Wailmer) OVERWORLD( - gObjectEventPic_Wailmer, + sPicTable_Wailmer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -6597,10 +6683,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Wailord, .iconSprite = gMonIcon_Wailord, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Wailord) OVERWORLD( - gObjectEventPic_Wailord, + sPicTable_Wailord, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -6677,10 +6764,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_NumelF, .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(4, 2, SHADOW_SIZE_S) FOOTPRINT(Numel) OVERWORLD( - gObjectEventPic_Numel, + sPicTable_Numel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6689,7 +6777,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Numel ) OVERWORLD_FEMALE( - gObjectEventPic_NumelF, + sPicTable_NumelF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6767,10 +6855,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_CameruptF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_L) FOOTPRINT(Camerupt) OVERWORLD( - gObjectEventPic_Camerupt, + sPicTable_Camerupt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6779,7 +6868,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Camerupt ) OVERWORLD_FEMALE( - gObjectEventPic_CameruptF, + sPicTable_CameruptF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6840,11 +6929,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CameruptMega, .iconSprite = gMonIcon_CameruptMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Camerupt) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_CameruptMega, + sPicTable_CameruptMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6921,10 +7011,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Torkoal, .iconSprite = gMonIcon_Torkoal, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 7, SHADOW_SIZE_L) FOOTPRINT(Torkoal) OVERWORLD( - gObjectEventPic_Torkoal, + sPicTable_Torkoal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6998,10 +7089,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Spoink, .iconSprite = gMonIcon_Spoink, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Spoink) OVERWORLD( - gObjectEventPic_Spoink, + sPicTable_Spoink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -7069,10 +7161,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Grumpig, .iconSprite = gMonIcon_Grumpig, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Grumpig) OVERWORLD( - gObjectEventPic_Grumpig, + sPicTable_Grumpig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7144,10 +7237,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Spinda, .iconSprite = gMonIcon_Spinda, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 6, SHADOW_SIZE_S) FOOTPRINT(Spinda) OVERWORLD( - gObjectEventPic_Spinda, + sPicTable_Spinda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7220,10 +7314,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Trapinch, .iconSprite = gMonIcon_Trapinch, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(4, -1, SHADOW_SIZE_S) FOOTPRINT(Trapinch) OVERWORLD( - gObjectEventPic_Trapinch, + sPicTable_Trapinch, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7297,10 +7392,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Vibrava, .iconSprite = gMonIcon_Vibrava, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 0, SHADOW_SIZE_L) FOOTPRINT(Vibrava) OVERWORLD( - gObjectEventPic_Vibrava, + sPicTable_Vibrava, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7380,10 +7476,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Flygon, .iconSprite = gMonIcon_Flygon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 17, SHADOW_SIZE_M) FOOTPRINT(Flygon) OVERWORLD( - gObjectEventPic_Flygon, + sPicTable_Flygon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7457,10 +7554,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Cacnea, .iconSprite = gMonIcon_Cacnea, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Cacnea) OVERWORLD( - gObjectEventPic_Cacnea, + sPicTable_Cacnea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7533,10 +7631,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .frontPicFemale = gMonFrontPic_CacturneF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_M) FOOTPRINT(Cacturne) OVERWORLD( - gObjectEventPic_Cacturne, + sPicTable_Cacturne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7545,7 +7644,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Cacturne ) OVERWORLD_FEMALE( - gObjectEventPic_CacturneF, + sPicTable_CacturneF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7613,10 +7712,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Swablu, .iconSprite = gMonIcon_Swablu, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 0, SHADOW_SIZE_S) FOOTPRINT(Swablu) OVERWORLD( - gObjectEventPic_Swablu, + sPicTable_Swablu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7684,10 +7784,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Altaria, .iconSprite = gMonIcon_Altaria, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_L) FOOTPRINT(Altaria) OVERWORLD( - gObjectEventPic_Altaria, + sPicTable_Altaria, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7750,11 +7851,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AltariaMega, .iconSprite = gMonIcon_AltariaMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 17, SHADOW_SIZE_L) FOOTPRINT(Altaria) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AltariaMega, + sPicTable_AltariaMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7830,10 +7932,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Zangoose, .iconSprite = gMonIcon_Zangoose, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Zangoose) OVERWORLD( - gObjectEventPic_Zangoose, + sPicTable_Zangoose, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7906,10 +8009,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Seviper, .iconSprite = gMonIcon_Seviper, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 7, SHADOW_SIZE_L) FOOTPRINT(Seviper) OVERWORLD( - gObjectEventPic_Seviper, + sPicTable_Seviper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BIKE_TIRE, @@ -7986,10 +8090,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Lunatone, .iconSprite = gMonIcon_Lunatone, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Lunatone) OVERWORLD( - gObjectEventPic_Lunatone, + sPicTable_Lunatone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8065,10 +8170,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Solrock, .iconSprite = gMonIcon_Solrock, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_M) FOOTPRINT(Solrock) OVERWORLD( - gObjectEventPic_Solrock, + sPicTable_Solrock, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8148,10 +8254,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Barboach, .iconSprite = gMonIcon_Barboach, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Barboach) OVERWORLD( - gObjectEventPic_Barboach, + sPicTable_Barboach, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8230,10 +8337,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Whiscash, .iconSprite = gMonIcon_Whiscash, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_L) FOOTPRINT(Whiscash) OVERWORLD( - gObjectEventPic_Whiscash, + sPicTable_Whiscash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8302,10 +8410,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Corphish, .iconSprite = gMonIcon_Corphish, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 5, SHADOW_SIZE_M) FOOTPRINT(Corphish) OVERWORLD( - gObjectEventPic_Corphish, + sPicTable_Corphish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8372,10 +8481,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Crawdaunt, .iconSprite = gMonIcon_Crawdaunt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 9, SHADOW_SIZE_M) FOOTPRINT(Crawdaunt) OVERWORLD( - gObjectEventPic_Crawdaunt, + sPicTable_Crawdaunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8446,10 +8556,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Baltoy, .iconSprite = gMonIcon_Baltoy, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 1 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Baltoy) OVERWORLD( - gObjectEventPic_Baltoy, + sPicTable_Baltoy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8519,10 +8630,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Claydol, .iconSprite = gMonIcon_Claydol, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 18, SHADOW_SIZE_M) FOOTPRINT(Claydol) OVERWORLD( - gObjectEventPic_Claydol, + sPicTable_Claydol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -8596,10 +8708,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Lileep, .iconSprite = gMonIcon_Lileep, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Lileep) OVERWORLD( - gObjectEventPic_Lileep, + sPicTable_Lileep, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -8675,10 +8788,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Cradily, .iconSprite = gMonIcon_Cradily, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Cradily) OVERWORLD( - gObjectEventPic_Cradily, + sPicTable_Cradily, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -8753,10 +8867,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Anorith, .iconSprite = gMonIcon_Anorith, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Anorith) OVERWORLD( - gObjectEventPic_Anorith, + sPicTable_Anorith, SIZE_32x32, SHADOW_SIZE_M, TRACKS_BUG, @@ -8829,10 +8944,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Armaldo, .iconSprite = gMonIcon_Armaldo, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 0 : 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_L) FOOTPRINT(Armaldo) OVERWORLD( - gObjectEventPic_Armaldo, + sPicTable_Armaldo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8905,10 +9021,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Feebas, .iconSprite = gMonIcon_Feebas, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Feebas) OVERWORLD( - gObjectEventPic_Feebas, + sPicTable_Feebas, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -8990,10 +9107,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_MiloticF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Milotic) OVERWORLD( - gObjectEventPic_Milotic, + sPicTable_Milotic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -9002,7 +9120,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Milotic ) OVERWORLD_FEMALE( - gObjectEventPic_MiloticF, + sPicTable_MiloticF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -9070,10 +9188,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformNormal, .iconSprite = gMonIcon_CastformNormal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_S) FOOTPRINT(Castform) OVERWORLD( - gObjectEventPic_CastformNormal, + sPicTable_CastformNormal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9146,10 +9265,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformSunny, .iconSprite = gMonIcon_CastformSunny, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Castform) OVERWORLD( - gObjectEventPic_CastformSunny, + sPicTable_CastformSunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9220,10 +9340,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformRainy, .iconSprite = gMonIcon_CastformRainy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Castform) OVERWORLD( - gObjectEventPic_CastformRainy, + sPicTable_CastformRainy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9294,10 +9415,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_CastformSnowy, .iconSprite = gMonIcon_CastformSnowy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_S) FOOTPRINT(Castform) OVERWORLD( - gObjectEventPic_CastformSnowy, + sPicTable_CastformSnowy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9372,10 +9494,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Kecleon, .iconSprite = gMonIcon_Kecleon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_S) FOOTPRINT(Kecleon) OVERWORLD( - gObjectEventPic_Kecleon, + sPicTable_Kecleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9451,10 +9574,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Shuppet, .iconSprite = gMonIcon_Shuppet, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 12, SHADOW_SIZE_S) FOOTPRINT(Shuppet) OVERWORLD( - gObjectEventPic_Shuppet, + sPicTable_Shuppet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9529,10 +9653,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Banette, .iconSprite = gMonIcon_Banette, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Banette) OVERWORLD( - gObjectEventPic_Banette, + sPicTable_Banette, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9595,11 +9720,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_BanetteMega, .iconSprite = gMonIcon_BanetteMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_M) FOOTPRINT(Banette) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_BanetteMega, + sPicTable_BanetteMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9678,10 +9804,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Duskull, .iconSprite = gMonIcon_Duskull, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_S) FOOTPRINT(Duskull) OVERWORLD( - gObjectEventPic_Duskull, + sPicTable_Duskull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -9755,10 +9882,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Dusclops, .iconSprite = gMonIcon_Dusclops, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Dusclops) OVERWORLD( - gObjectEventPic_Dusclops, + sPicTable_Dusclops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9844,10 +9972,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Dusknoir, .iconSprite = gMonIcon_Dusknoir, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 13, SHADOW_SIZE_M) FOOTPRINT(Dusknoir) OVERWORLD( - gObjectEventPic_Dusknoir, + sPicTable_Dusknoir, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9919,10 +10048,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Tropius, .iconSprite = gMonIcon_Tropius, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 13, SHADOW_SIZE_L) FOOTPRINT(Tropius) OVERWORLD( - gObjectEventPic_Tropius, + sPicTable_Tropius, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9995,10 +10125,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Chingling, .iconSprite = gMonIcon_Chingling, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Chingling) OVERWORLD( - gObjectEventPic_Chingling, + sPicTable_Chingling, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10079,10 +10210,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Chimecho, .iconSprite = gMonIcon_Chimecho, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 16, SHADOW_SIZE_S) FOOTPRINT(Chimecho) OVERWORLD( - gObjectEventPic_Chimecho, + sPicTable_Chimecho, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -10156,10 +10288,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Absol, .iconSprite = gMonIcon_Absol, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 6, SHADOW_SIZE_L) FOOTPRINT(Absol) OVERWORLD( - gObjectEventPic_Absol, + sPicTable_Absol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10223,11 +10356,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_AbsolMega, .iconSprite = gMonIcon_AbsolMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 7, SHADOW_SIZE_L) FOOTPRINT(Absol) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AbsolMega, + sPicTable_AbsolMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10306,10 +10440,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Snorunt, .iconSprite = gMonIcon_Snorunt, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Snorunt) OVERWORLD( - gObjectEventPic_Snorunt, + sPicTable_Snorunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10382,10 +10517,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Glalie, .iconSprite = gMonIcon_Glalie, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 15, SHADOW_SIZE_M) FOOTPRINT(Glalie) OVERWORLD( - gObjectEventPic_Glalie, + sPicTable_Glalie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10447,11 +10583,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GlalieMega, .iconSprite = gMonIcon_GlalieMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 18, SHADOW_SIZE_L) FOOTPRINT(Glalie) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GlalieMega, + sPicTable_GlalieMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10521,10 +10658,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Froslass, .iconSprite = gMonIcon_Froslass, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_S) FOOTPRINT(Froslass) OVERWORLD( - gObjectEventPic_Froslass, + sPicTable_Froslass, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10600,10 +10738,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Spheal, .iconSprite = gMonIcon_Spheal, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Spheal) OVERWORLD( - gObjectEventPic_Spheal, + sPicTable_Spheal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10674,10 +10813,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Sealeo, .iconSprite = gMonIcon_Sealeo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 2, SHADOW_SIZE_L) FOOTPRINT(Sealeo) OVERWORLD( - gObjectEventPic_Sealeo, + sPicTable_Sealeo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10753,10 +10893,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Walrein, .iconSprite = gMonIcon_Walrein, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_L) FOOTPRINT(Walrein) OVERWORLD( - gObjectEventPic_Walrein, + sPicTable_Walrein, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10825,10 +10966,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Clamperl, .iconSprite = gMonIcon_Clamperl, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 1, SHADOW_SIZE_M) FOOTPRINT(Clamperl) OVERWORLD( - gObjectEventPic_Clamperl, + sPicTable_Clamperl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -10900,10 +11042,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Huntail, .iconSprite = gMonIcon_Huntail, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 7, SHADOW_SIZE_L) FOOTPRINT(Huntail) OVERWORLD( - gObjectEventPic_Huntail, + sPicTable_Huntail, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -10969,10 +11112,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Gorebyss, .iconSprite = gMonIcon_Gorebyss, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_M) FOOTPRINT(Gorebyss) OVERWORLD( - gObjectEventPic_Gorebyss, + sPicTable_Gorebyss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -11047,10 +11191,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .backPicFemale = gMonBackPic_RelicanthF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Relicanth) OVERWORLD( - gObjectEventPic_Relicanth, + sPicTable_Relicanth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11059,7 +11204,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = gShinyOverworldPalette_Relicanth ) OVERWORLD_FEMALE( - gObjectEventPic_RelicanthF, + sPicTable_RelicanthF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11126,10 +11271,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Luvdisc, .iconSprite = gMonIcon_Luvdisc, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Luvdisc) OVERWORLD( - gObjectEventPic_Luvdisc, + sPicTable_Luvdisc, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SPOT, @@ -11198,10 +11344,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Bagon, .iconSprite = gMonIcon_Bagon, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(4, 3, SHADOW_SIZE_S) FOOTPRINT(Bagon) OVERWORLD( - gObjectEventPic_Bagon, + sPicTable_Bagon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11269,10 +11416,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Shelgon, .iconSprite = gMonIcon_Shelgon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_M) FOOTPRINT(Shelgon) OVERWORLD( - gObjectEventPic_Shelgon, + sPicTable_Shelgon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11346,10 +11494,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Salamence, .iconSprite = gMonIcon_Salamence, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 8, SHADOW_SIZE_L) FOOTPRINT(Salamence) OVERWORLD( - gObjectEventPic_Salamence, + sPicTable_Salamence, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11412,11 +11561,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_SalamenceMega, .iconSprite = gMonIcon_SalamenceMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 8, SHADOW_SIZE_L) FOOTPRINT(Salamence) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_SalamenceMega, + sPicTable_SalamenceMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11490,10 +11640,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Beldum, .iconSprite = gMonIcon_Beldum, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Beldum) OVERWORLD( - gObjectEventPic_Beldum, + sPicTable_Beldum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11561,10 +11712,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Metang, .iconSprite = gMonIcon_Metang, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_M) FOOTPRINT(Metang) OVERWORLD( - gObjectEventPic_Metang, + sPicTable_Metang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -11637,10 +11789,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Metagross, .iconSprite = gMonIcon_Metagross, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, -2, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Metagross) OVERWORLD( - gObjectEventPic_Metagross, + sPicTable_Metagross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11703,11 +11856,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_MetagrossMega, .iconSprite = gMonIcon_MetagrossMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 15, SHADOW_SIZE_L) FOOTPRINT(Metagross) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_MetagrossMega, + sPicTable_MetagrossMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11786,10 +11940,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Regirock, .iconSprite = gMonIcon_Regirock, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Regirock) OVERWORLD( - gObjectEventPic_Regirock, + sPicTable_Regirock, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11864,10 +12019,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Regice, .iconSprite = gMonIcon_Regice, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Regice) OVERWORLD( - gObjectEventPic_Regice, + sPicTable_Regice, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11943,10 +12099,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Registeel, .iconSprite = gMonIcon_Registeel, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_L) FOOTPRINT(Registeel) OVERWORLD( - gObjectEventPic_Registeel, + sPicTable_Registeel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12022,10 +12179,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Latias, .iconSprite = gMonIcon_Latias, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 15, SHADOW_SIZE_M) FOOTPRINT(Latias) OVERWORLD( - gObjectEventPic_Latias, + sPicTable_Latias, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -12090,11 +12248,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LatiasMega, .iconSprite = gMonIcon_LatiasMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 19, SHADOW_SIZE_L) FOOTPRINT(Latias) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_LatiasMega, + sPicTable_LatiasMega, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12175,10 +12334,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Latios, .iconSprite = gMonIcon_Latios, .iconPalIndex = P_GBA_STYLE_SPECIES_ICONS ? 2 : 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 17, SHADOW_SIZE_M) FOOTPRINT(Latios) OVERWORLD( - gObjectEventPic_Latios, + sPicTable_Latios, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -12243,11 +12403,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_LatiosMega, .iconSprite = gMonIcon_LatiosMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 19, SHADOW_SIZE_L) FOOTPRINT(Latios) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_LatiosMega, + sPicTable_LatiosMega, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12328,10 +12489,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Kyogre, .iconSprite = gMonIcon_Kyogre, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kyogre) OVERWORLD( - gObjectEventPic_Kyogre, + sPicTable_Kyogre, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12395,11 +12557,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_KyogrePrimal, .iconSprite = gMonIcon_KyogrePrimal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Kyogre) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_KyogrePrimal, + sPicTable_KyogrePrimal, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12480,10 +12643,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Groudon, .iconSprite = gMonIcon_Groudon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Groudon) OVERWORLD( - gObjectEventPic_Groudon, + sPicTable_Groudon, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12548,11 +12712,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_GroudonPrimal, .iconSprite = gMonIcon_GroudonPrimal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Groudon) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GroudonPrimal, + sPicTable_GroudonPrimal, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12636,10 +12801,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Rayquaza, .iconSprite = gMonIcon_Rayquaza, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 17, SHADOW_SIZE_L) FOOTPRINT(Rayquaza) OVERWORLD( - gObjectEventPic_Rayquaza, + sPicTable_Rayquaza, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12706,11 +12872,12 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_RayquazaMega, .iconSprite = gMonIcon_RayquazaMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_L) FOOTPRINT(Rayquaza) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_RayquazaMega, + sPicTable_RayquazaMega, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -12799,10 +12966,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_Jirachi, .iconSprite = gMonIcon_Jirachi, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_S) FOOTPRINT(Jirachi) OVERWORLD( - gObjectEventPic_Jirachi, + sPicTable_Jirachi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -12878,10 +13046,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysNormal, .iconSprite = gMonIcon_DeoxysNormal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Deoxys) OVERWORLD( - gObjectEventPic_DeoxysNormal, + sPicTable_DeoxysNormal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12948,9 +13117,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysAttack, .iconSprite = gMonIcon_DeoxysAttack, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) OVERWORLD( - gObjectEventPic_DeoxysAttack, + sPicTable_DeoxysAttack, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13017,10 +13187,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysDefense, .iconSprite = gMonIcon_DeoxysDefense, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Deoxys) OVERWORLD( - gObjectEventPic_DeoxysDefense, + sPicTable_DeoxysDefense, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13087,10 +13258,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = .shinyPalette = gMonShinyPalette_DeoxysSpeed, .iconSprite = gMonIcon_DeoxysSpeed, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 13, SHADOW_SIZE_M) FOOTPRINT(Deoxys) OVERWORLD( - gObjectEventPic_DeoxysSpeed, + sPicTable_DeoxysSpeed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, diff --git a/src/data/pokemon/species_info/gen_4_families.h b/src/data/pokemon/species_info/gen_4_families.h index b51ab180a..a7f15ffc9 100644 --- a/src/data/pokemon/species_info/gen_4_families.h +++ b/src/data/pokemon/species_info/gen_4_families.h @@ -55,10 +55,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Turtwig, .iconSprite = gMonIcon_Turtwig, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Turtwig) OVERWORLD( - gObjectEventPic_Turtwig, + sPicTable_Turtwig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -124,10 +125,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Grotle, .iconSprite = gMonIcon_Grotle, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_L) FOOTPRINT(Grotle) OVERWORLD( - gObjectEventPic_Grotle, + sPicTable_Grotle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -198,10 +200,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Torterra, .iconSprite = gMonIcon_Torterra, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Torterra) OVERWORLD( - gObjectEventPic_Torterra, + sPicTable_Torterra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -270,10 +273,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Chimchar, .iconSprite = gMonIcon_Chimchar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(4, 3, SHADOW_SIZE_S) FOOTPRINT(Chimchar) OVERWORLD( - gObjectEventPic_Chimchar, + sPicTable_Chimchar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -342,10 +346,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Monferno, .iconSprite = gMonIcon_Monferno, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 6, SHADOW_SIZE_S) FOOTPRINT(Monferno) OVERWORLD( - gObjectEventPic_Monferno, + sPicTable_Monferno, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -417,10 +422,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Infernape, .iconSprite = gMonIcon_Infernape, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_L) FOOTPRINT(Infernape) OVERWORLD( - gObjectEventPic_Infernape, + sPicTable_Infernape, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -489,10 +495,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Piplup, .iconSprite = gMonIcon_Piplup, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, -1, SHADOW_SIZE_S) FOOTPRINT(Piplup) OVERWORLD( - gObjectEventPic_Piplup, + sPicTable_Piplup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -567,10 +574,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Prinplup, .iconSprite = gMonIcon_Prinplup, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Prinplup) OVERWORLD( - gObjectEventPic_Prinplup, + sPicTable_Prinplup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -644,10 +652,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Empoleon, .iconSprite = gMonIcon_Empoleon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 12, SHADOW_SIZE_M) FOOTPRINT(Empoleon) OVERWORLD( - gObjectEventPic_Empoleon, + sPicTable_Empoleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -724,10 +733,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_StarlyF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Starly) OVERWORLD( - gObjectEventPic_Starly, + sPicTable_Starly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -736,7 +746,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Starly ) OVERWORLD_FEMALE( - gObjectEventPic_StarlyF, + sPicTable_StarlyF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -804,10 +814,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_StaraviaF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Staravia) OVERWORLD( - gObjectEventPic_Staravia, + sPicTable_Staravia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -816,7 +827,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Staravia ) OVERWORLD_FEMALE( - gObjectEventPic_StaraviaF, + sPicTable_StaraviaF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -889,10 +900,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPicFemale = gMonFrontPic_StaraptorF, .frontPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_M) FOOTPRINT(Staraptor) OVERWORLD( - gObjectEventPic_Staraptor, + sPicTable_Staraptor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -901,7 +913,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Staraptor ) OVERWORLD_FEMALE( - gObjectEventPic_StaraptorF, + sPicTable_StaraptorF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -974,10 +986,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_BidoofF, .backPicSizeFemale = MON_COORDS_SIZE(64, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 1, SHADOW_SIZE_M) FOOTPRINT(Bidoof) OVERWORLD( - gObjectEventPic_Bidoof, + sPicTable_Bidoof, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -986,7 +999,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Bidoof ) OVERWORLD_FEMALE( - gObjectEventPic_BidoofF, + sPicTable_BidoofF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1055,10 +1068,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPicFemale = gMonFrontPic_BibarelF, .frontPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 5, SHADOW_SIZE_M) FOOTPRINT(Bibarel) OVERWORLD( - gObjectEventPic_Bibarel, + sPicTable_Bibarel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1067,7 +1081,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Bibarel ) OVERWORLD_FEMALE( - gObjectEventPic_BibarelF, + sPicTable_BibarelF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1150,10 +1164,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_KricketotF, .backPicSizeFemale = MON_COORDS_SIZE(48, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-5, 2, SHADOW_SIZE_S) FOOTPRINT(Kricketot) OVERWORLD( - gObjectEventPic_Kricketot, + sPicTable_Kricketot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1162,7 +1177,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Kricketot ) OVERWORLD_FEMALE( - gObjectEventPic_KricketotF, + sPicTable_KricketotF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1236,10 +1251,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_KricketuneF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 6, SHADOW_SIZE_S) FOOTPRINT(Kricketune) OVERWORLD( - gObjectEventPic_Kricketune, + sPicTable_Kricketune, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1248,7 +1264,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Kricketune ) OVERWORLD_FEMALE( - gObjectEventPic_KricketuneF, + sPicTable_KricketuneF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1317,10 +1333,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_ShinxF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Shinx) OVERWORLD( - gObjectEventPic_Shinx, + sPicTable_Shinx, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1329,7 +1346,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Shinx ) OVERWORLD_FEMALE( - gObjectEventPic_ShinxF, + sPicTable_ShinxF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1397,10 +1414,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_LuxioF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 2, SHADOW_SIZE_M) FOOTPRINT(Luxio) OVERWORLD( - gObjectEventPic_Luxio, + sPicTable_Luxio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1409,7 +1427,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Luxio ) OVERWORLD_FEMALE( - gObjectEventPic_LuxioF, + sPicTable_LuxioF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1485,10 +1503,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_LuxrayF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_L) FOOTPRINT(Luxray) OVERWORLD( - gObjectEventPic_Luxray, + sPicTable_Luxray, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1497,7 +1516,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Luxray ) OVERWORLD_FEMALE( - gObjectEventPic_LuxrayF, + sPicTable_LuxrayF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1559,10 +1578,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Cranidos, .iconSprite = gMonIcon_Cranidos, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 4, SHADOW_SIZE_S) FOOTPRINT(Cranidos) OVERWORLD( - gObjectEventPic_Cranidos, + sPicTable_Cranidos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1629,10 +1649,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Rampardos, .iconSprite = gMonIcon_Rampardos, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 11, SHADOW_SIZE_L) FOOTPRINT(Rampardos) OVERWORLD( - gObjectEventPic_Rampardos, + sPicTable_Rampardos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1697,10 +1718,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Shieldon, .iconSprite = gMonIcon_Shieldon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(3, -1, SHADOW_SIZE_S) FOOTPRINT(Shieldon) OVERWORLD( - gObjectEventPic_Shieldon, + sPicTable_Shieldon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1765,10 +1787,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Bastiodon, .iconSprite = gMonIcon_Bastiodon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_L) FOOTPRINT(Bastiodon) OVERWORLD( - gObjectEventPic_Bastiodon, + sPicTable_Bastiodon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1830,10 +1853,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_BurmyPlant, .iconSprite = gMonIcon_BurmyPlant, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_S) FOOTPRINT(Burmy) OVERWORLD( - gObjectEventPic_BurmyPlant, + sPicTable_BurmyPlant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1898,10 +1922,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_BurmySandy, .iconSprite = gMonIcon_BurmySandy, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Burmy) OVERWORLD( - gObjectEventPic_BurmySandy, + sPicTable_BurmySandy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1966,10 +1991,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_BurmyTrash, .iconSprite = gMonIcon_BurmyTrash, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Burmy) OVERWORLD( - gObjectEventPic_BurmyTrash, + sPicTable_BurmyTrash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2035,10 +2061,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_WormadamPlant, .iconSprite = gMonIcon_WormadamPlant, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_S) FOOTPRINT(Wormadam) OVERWORLD( - gObjectEventPic_WormadamPlant, + sPicTable_WormadamPlant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2100,10 +2127,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_WormadamSandy, .iconSprite = gMonIcon_WormadamSandy, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Wormadam) OVERWORLD( - gObjectEventPic_WormadamSandy, + sPicTable_WormadamSandy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2166,10 +2194,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_WormadamTrash, .iconSprite = gMonIcon_WormadamTrash, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_S) FOOTPRINT(Wormadam) OVERWORLD( - gObjectEventPic_WormadamTrash, + sPicTable_WormadamTrash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2228,10 +2257,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Mothim, \ .iconSprite = gMonIcon_Mothim, \ .iconPalIndex = 0, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(-1, 9, SHADOW_SIZE_S) \ FOOTPRINT(Mothim) \ - OVERWORLD( \ - gObjectEventPic_Mothim, \ + OVERWORLD( \ + sPicTable_Mothim, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -2311,10 +2341,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .paletteFemale = gMonPalette_CombeeF, .shinyPaletteFemale = gMonShinyPalette_CombeeF, #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 10, SHADOW_SIZE_S) FOOTPRINT(Combee) OVERWORLD( - gObjectEventPic_Combee, + sPicTable_Combee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2323,7 +2354,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Combee ) OVERWORLD_FEMALE( - gObjectEventPic_CombeeF, + sPicTable_CombeeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2395,10 +2426,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Vespiquen, .iconSprite = gMonIcon_Vespiquen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_L) FOOTPRINT(Vespiquen) OVERWORLD( - gObjectEventPic_Vespiquen, + sPicTable_Vespiquen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2473,10 +2505,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPicFemale = gMonFrontPic_PachirisuF, .frontPicSizeFemale = MON_COORDS_SIZE(48, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Pachirisu) OVERWORLD( - gObjectEventPic_Pachirisu, + sPicTable_Pachirisu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2485,7 +2518,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Pachirisu ) OVERWORLD_FEMALE( - gObjectEventPic_PachirisuF, + sPicTable_PachirisuF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2553,10 +2586,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_BuizelF, .backPicSizeFemale = MON_COORDS_SIZE(64, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 4, SHADOW_SIZE_S) FOOTPRINT(Buizel) OVERWORLD( - gObjectEventPic_Buizel, + sPicTable_Buizel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2565,7 +2599,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Buizel ) OVERWORLD_FEMALE( - gObjectEventPic_BuizelF, + sPicTable_BuizelF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2635,10 +2669,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_FloatzelF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 10, SHADOW_SIZE_M) FOOTPRINT(Floatzel) OVERWORLD( - gObjectEventPic_Floatzel, + sPicTable_Floatzel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2647,7 +2682,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Floatzel ) OVERWORLD_FEMALE( - gObjectEventPic_FloatzelF, + sPicTable_FloatzelF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2717,10 +2752,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Cherubi, .iconSprite = gMonIcon_Cherubi, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-4, -2, SHADOW_SIZE_S) FOOTPRINT(Cherubi) OVERWORLD( - gObjectEventPic_Cherubi, + sPicTable_Cherubi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2788,10 +2824,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_CherrimOvercast, .iconSprite = gMonIcon_CherrimOvercast, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Cherrim) OVERWORLD( - gObjectEventPic_CherrimOvercast, + sPicTable_CherrimOvercast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2860,6 +2897,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_CherrimSunshine, .iconSprite = gMonIcon_CherrimSunshine, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Cherrim) .levelUpLearnset = sCherrimLevelUpLearnset, @@ -2917,10 +2955,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShellosWestSea, .iconSprite = gMonIcon_ShellosWestSea, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(Shellos) OVERWORLD( - gObjectEventPic_ShellosWestSea, + sPicTable_ShellosWestSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2982,10 +3021,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShellosEast, .iconSprite = gMonIcon_ShellosEast, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, -1, SHADOW_SIZE_S) FOOTPRINT(Shellos) OVERWORLD( - gObjectEventPic_ShellosEast, + sPicTable_ShellosEast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3047,10 +3087,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GastrodonWestSea, .iconSprite = gMonIcon_GastrodonWestSea, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 3, SHADOW_SIZE_M) FOOTPRINT(Gastrodon) OVERWORLD( - gObjectEventPic_GastrodonWestSea, + sPicTable_GastrodonWestSea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3110,10 +3151,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GastrodonEast, .iconSprite = gMonIcon_GastrodonEast, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Gastrodon) OVERWORLD( - gObjectEventPic_GastrodonEast, + sPicTable_GastrodonEast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3181,10 +3223,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Drifloon, .iconSprite = gMonIcon_Drifloon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 9, SHADOW_SIZE_S) FOOTPRINT(Drifloon) OVERWORLD( - gObjectEventPic_Drifloon, + sPicTable_Drifloon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3253,10 +3296,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Drifblim, .iconSprite = gMonIcon_Drifblim, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_M) FOOTPRINT(Drifblim) OVERWORLD( - gObjectEventPic_Drifblim, + sPicTable_Drifblim, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3320,10 +3364,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Buneary, .iconSprite = gMonIcon_Buneary, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, 5, SHADOW_SIZE_S) FOOTPRINT(Buneary) OVERWORLD( - gObjectEventPic_Buneary, + sPicTable_Buneary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3388,10 +3433,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Lopunny, .iconSprite = gMonIcon_Lopunny, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_S) FOOTPRINT(Lopunny) OVERWORLD( - gObjectEventPic_Lopunny, + sPicTable_Lopunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3453,11 +3499,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_LopunnyMega, .iconSprite = gMonIcon_LopunnyMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Lopunny) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_LopunnyMega, + sPicTable_LopunnyMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3527,10 +3574,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Glameow, .iconSprite = gMonIcon_Glameow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 6, SHADOW_SIZE_S) FOOTPRINT(Glameow) OVERWORLD( - gObjectEventPic_Glameow, + sPicTable_Glameow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3599,10 +3647,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Purugly, .iconSprite = gMonIcon_Purugly, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_L) FOOTPRINT(Purugly) OVERWORLD( - gObjectEventPic_Purugly, + sPicTable_Purugly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3669,10 +3718,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Stunky, .iconSprite = gMonIcon_Stunky, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 0, SHADOW_SIZE_M) FOOTPRINT(Stunky) OVERWORLD( - gObjectEventPic_Stunky, + sPicTable_Stunky, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3737,10 +3787,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Skuntank, .iconSprite = gMonIcon_Skuntank, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 6, SHADOW_SIZE_L) FOOTPRINT(Skuntank) OVERWORLD( - gObjectEventPic_Skuntank, + sPicTable_Skuntank, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3814,10 +3865,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Bronzor, .iconSprite = gMonIcon_Bronzor, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Bronzor) OVERWORLD( - gObjectEventPic_Bronzor, + sPicTable_Bronzor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3886,10 +3938,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Bronzong, .iconSprite = gMonIcon_Bronzong, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 12, SHADOW_SIZE_M) FOOTPRINT(Bronzong) OVERWORLD( - gObjectEventPic_Bronzong, + sPicTable_Bronzong, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3968,10 +4021,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Chatot, .iconSprite = gMonIcon_Chatot, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_S) FOOTPRINT(Chatot) OVERWORLD( - gObjectEventPic_Chatot, + sPicTable_Chatot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4037,10 +4091,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Spiritomb, .iconSprite = gMonIcon_Spiritomb, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_L) FOOTPRINT(Spiritomb) OVERWORLD( - gObjectEventPic_Spiritomb, + sPicTable_Spiritomb, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4112,10 +4167,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_GibleF, .backPicSizeFemale = MON_COORDS_SIZE(56, 48), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 5, SHADOW_SIZE_M) FOOTPRINT(Gible) OVERWORLD( - gObjectEventPic_Gible, + sPicTable_Gible, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4124,7 +4180,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Gible ) OVERWORLD_FEMALE( - gObjectEventPic_GibleF, + sPicTable_GibleF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4192,10 +4248,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_GabiteF, .backPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 8, SHADOW_SIZE_M) FOOTPRINT(Gabite) OVERWORLD( - gObjectEventPic_Gabite, + sPicTable_Gabite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4204,7 +4261,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Gabite ) OVERWORLD_FEMALE( - gObjectEventPic_GabiteF, + sPicTable_GabiteF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4279,10 +4336,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPicFemale = gMonFrontPic_GarchompF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 11, SHADOW_SIZE_L) FOOTPRINT(Garchomp) OVERWORLD( - gObjectEventPic_Garchomp, + sPicTable_Garchomp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4291,7 +4349,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Garchomp ) OVERWORLD_FEMALE( - gObjectEventPic_GarchompF, + sPicTable_GarchompF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4351,11 +4409,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GarchompMega, .iconSprite = gMonIcon_GarchompMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_L) FOOTPRINT(Garchomp) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_GarchompMega, + sPicTable_GarchompMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4426,10 +4485,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Riolu, .iconSprite = gMonIcon_Riolu, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, 3, SHADOW_SIZE_S) FOOTPRINT(Riolu) OVERWORLD( - gObjectEventPic_Riolu, + sPicTable_Riolu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4494,10 +4554,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Lucario, .iconSprite = gMonIcon_Lucario, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Lucario) OVERWORLD( - gObjectEventPic_Lucario, + sPicTable_Lucario, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4560,11 +4621,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_LucarioMega, .iconSprite = gMonIcon_LucarioMega, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_M) FOOTPRINT(Lucario) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_LucarioMega, + sPicTable_LucarioMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4642,10 +4704,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconPalIndexFemale = 1, #endif #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, -1, SHADOW_SIZE_L) FOOTPRINT(Hippopotas) OVERWORLD( - gObjectEventPic_Hippopotas, + sPicTable_Hippopotas, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4654,7 +4717,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Hippopotas ) OVERWORLD_FEMALE( - gObjectEventPic_HippopotasF, + sPicTable_HippopotasF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4724,10 +4787,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .iconPalIndexFemale = 1, #endif #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Hippowdon) OVERWORLD( - gObjectEventPic_Hippowdon, + sPicTable_Hippowdon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4810,10 +4874,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Skorupi, .iconSprite = gMonIcon_Skorupi, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Skorupi) OVERWORLD( - gObjectEventPic_Skorupi, + sPicTable_Skorupi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4885,10 +4950,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Drapion, .iconSprite = gMonIcon_Drapion, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 6, SHADOW_SIZE_L) FOOTPRINT(Drapion) OVERWORLD( - gObjectEventPic_Drapion, + sPicTable_Drapion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4961,10 +5027,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_CroagunkF, .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Croagunk) OVERWORLD( - gObjectEventPic_Croagunk, + sPicTable_Croagunk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4973,7 +5040,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Croagunk ) OVERWORLD_FEMALE( - gObjectEventPic_CroagunkF, + sPicTable_CroagunkF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5045,10 +5112,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_ToxicroakF, .backPicSizeFemale = MON_COORDS_SIZE(56, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 7, SHADOW_SIZE_M) FOOTPRINT(Toxicroak) OVERWORLD( - gObjectEventPic_Toxicroak, + sPicTable_Toxicroak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5057,7 +5125,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Toxicroak ) OVERWORLD_FEMALE( - gObjectEventPic_ToxicroakF, + sPicTable_ToxicroakF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5130,10 +5198,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Carnivine, .iconSprite = gMonIcon_Carnivine, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Carnivine) OVERWORLD( - gObjectEventPic_Carnivine, + sPicTable_Carnivine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5210,10 +5279,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_FinneonF, .backPicSizeFemale = MON_COORDS_SIZE(56, 40), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Finneon) OVERWORLD( - gObjectEventPic_Finneon, + sPicTable_Finneon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5222,7 +5292,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Finneon ) OVERWORLD_FEMALE( - gObjectEventPic_FinneonF, + sPicTable_FinneonF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5294,10 +5364,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_LumineonF, .backPicSizeFemale = MON_COORDS_SIZE(56, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Lumineon) OVERWORLD( - gObjectEventPic_Lumineon, + sPicTable_Lumineon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5306,7 +5377,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Lumineon ) OVERWORLD_FEMALE( - gObjectEventPic_LumineonF, + sPicTable_LumineonF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5376,10 +5447,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .backPicFemale = gMonBackPic_SnoverF, .backPicSizeFemale = MON_COORDS_SIZE(64, 56), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Snover) OVERWORLD( - gObjectEventPic_Snover, + sPicTable_Snover, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5388,7 +5460,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Snover ) OVERWORLD_FEMALE( - gObjectEventPic_SnoverF, + sPicTable_SnoverF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5457,10 +5529,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .frontPicFemale = gMonFrontPic_AbomasnowF, .frontPicSizeFemale = MON_COORDS_SIZE(64, 64), #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_L) FOOTPRINT(Abomasnow) OVERWORLD( - gObjectEventPic_Abomasnow, + sPicTable_Abomasnow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5469,7 +5542,7 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = gShinyOverworldPalette_Abomasnow ) OVERWORLD_FEMALE( - gObjectEventPic_AbomasnowF, + sPicTable_AbomasnowF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5531,11 +5604,12 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_AbomasnowMega, .iconSprite = gMonIcon_AbomasnowMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Abomasnow) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AbomasnowMega, + sPicTable_AbomasnowMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5609,10 +5683,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Rotom, .iconSprite = gMonIcon_Rotom, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_S) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_Rotom, + sPicTable_Rotom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5687,10 +5762,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomHeat, .iconSprite = gMonIcon_RotomHeat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_RotomHeat, + sPicTable_RotomHeat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5758,10 +5834,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomWash, .iconSprite = gMonIcon_RotomWash, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_M) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_RotomWash, + sPicTable_RotomWash, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5827,10 +5904,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomFrost, .iconSprite = gMonIcon_RotomFrost, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_RotomFrost, + sPicTable_RotomFrost, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5921,10 +5999,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomFan, .iconSprite = gMonIcon_RotomFan, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 9, SHADOW_SIZE_S) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_RotomFan, + sPicTable_RotomFan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5993,10 +6072,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_RotomMow, .iconSprite = gMonIcon_RotomMow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_M) FOOTPRINT(Rotom) OVERWORLD( - gObjectEventPic_RotomMow, + sPicTable_RotomMow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6071,10 +6151,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Uxie, .iconSprite = gMonIcon_Uxie, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_S) FOOTPRINT(Uxie) OVERWORLD( - gObjectEventPic_Uxie, + sPicTable_Uxie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6155,10 +6236,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Mesprit, .iconSprite = gMonIcon_Mesprit, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Mesprit) OVERWORLD( - gObjectEventPic_Mesprit, + sPicTable_Mesprit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6233,10 +6315,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Azelf, .iconSprite = gMonIcon_Azelf, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 17, SHADOW_SIZE_S) FOOTPRINT(Azelf) OVERWORLD( - gObjectEventPic_Azelf, + sPicTable_Azelf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6310,10 +6393,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Dialga, .iconSprite = gMonIcon_Dialga, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 12, SHADOW_SIZE_L) FOOTPRINT(Dialga) OVERWORLD( - gObjectEventPic_Dialga, + sPicTable_Dialga, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6377,10 +6461,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_DialgaOrigin, .iconSprite = gMonIcon_DialgaOrigin, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Dialga) OVERWORLD( - gObjectEventPic_DialgaOrigin, + sPicTable_DialgaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -6457,10 +6542,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Palkia, .iconSprite = gMonIcon_Palkia, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_L) FOOTPRINT(Palkia) OVERWORLD( - gObjectEventPic_Palkia, + sPicTable_Palkia, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6524,10 +6610,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_PalkiaOrigin, .iconSprite = gMonIcon_PalkiaOrigin, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_L) FOOTPRINT(Palkia) OVERWORLD( - gObjectEventPic_PalkiaOrigin, + sPicTable_PalkiaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -6603,10 +6690,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Heatran, .iconSprite = gMonIcon_Heatran, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 2, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Heatran) OVERWORLD( - gObjectEventPic_Heatran, + sPicTable_Heatran, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6678,10 +6766,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Regigigas, .iconSprite = gMonIcon_Regigigas, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Regigigas) OVERWORLD( - gObjectEventPic_Regigigas, + sPicTable_Regigigas, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6756,10 +6845,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GiratinaAltered, .iconSprite = gMonIcon_GiratinaAltered, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 11, SHADOW_SIZE_L) FOOTPRINT(GiratinaAltered) OVERWORLD( - gObjectEventPic_GiratinaAltered, + sPicTable_GiratinaAltered, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6830,10 +6920,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_GiratinaOrigin, .iconSprite = gMonIcon_GiratinaOrigin, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 18, SHADOW_SIZE_L) FOOTPRINT(GiratinaOrigin) OVERWORLD( - gObjectEventPic_GiratinaOrigin, + sPicTable_GiratinaOrigin, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6913,10 +7004,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Cresselia, .iconSprite = gMonIcon_Cresselia, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Cresselia) OVERWORLD( - gObjectEventPic_Cresselia, + sPicTable_Cresselia, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6990,10 +7082,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Phione, .iconSprite = gMonIcon_Phione, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Phione) OVERWORLD( - gObjectEventPic_Phione, + sPicTable_Phione, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7066,10 +7159,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Manaphy, .iconSprite = gMonIcon_Manaphy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 8, SHADOW_SIZE_S) FOOTPRINT(Manaphy) OVERWORLD( - gObjectEventPic_Manaphy, + sPicTable_Manaphy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7145,10 +7239,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_Darkrai, .iconSprite = gMonIcon_Darkrai, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 12, SHADOW_SIZE_M) FOOTPRINT(Darkrai) OVERWORLD( - gObjectEventPic_Darkrai, + sPicTable_Darkrai, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7226,10 +7321,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShayminLand, .iconSprite = gMonIcon_ShayminLand, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, -3, SHADOW_SIZE_S) FOOTPRINT(Shaymin) OVERWORLD( - gObjectEventPic_ShayminLand, + sPicTable_ShayminLand, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7304,10 +7400,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .shinyPalette = gMonShinyPalette_ShayminSky, .iconSprite = gMonIcon_ShayminSky, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 7, SHADOW_SIZE_M) FOOTPRINT(Shaymin) OVERWORLD( - gObjectEventPic_ShayminSky, + sPicTable_ShayminSky, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7385,10 +7482,11 @@ const struct SpeciesInfo gSpeciesInfoGen4[] = .palette = gMonPalette_Arceus ##typeName, \ .shinyPalette = gMonShinyPalette_Arceus ##typeName, \ ARCEUS_ICON(typeName, iconPal) \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(-1, 15, SHADOW_SIZE_XL_BATTLE_ONLY) \ FOOTPRINT(Arceus) \ OVERWORLD( \ - gObjectEventPic_Arceus ##typeName, \ + sPicTable_Arceus ##typeName, \ SIZE_64x64, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index f914259f1..58fab8324 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -55,10 +55,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Victini, .iconSprite = gMonIcon_Victini, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_S) FOOTPRINT(Victini) OVERWORLD( - gObjectEventPic_Victini, + sPicTable_Victini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -126,10 +127,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Snivy, .iconSprite = gMonIcon_Snivy, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Snivy) OVERWORLD( - gObjectEventPic_Snivy, + sPicTable_Snivy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -198,10 +200,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Servine, .iconSprite = gMonIcon_Servine, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Servine) OVERWORLD( - gObjectEventPic_Servine, + sPicTable_Servine, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -267,10 +270,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Serperior, .iconSprite = gMonIcon_Serperior, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Serperior) OVERWORLD( - gObjectEventPic_Serperior, + sPicTable_Serperior, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -337,10 +341,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Tepig, .iconSprite = gMonIcon_Tepig, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -2, SHADOW_SIZE_S) FOOTPRINT(Tepig) OVERWORLD( - gObjectEventPic_Tepig, + sPicTable_Tepig, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -405,10 +410,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Pignite, .iconSprite = gMonIcon_Pignite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_M) FOOTPRINT(Pignite) OVERWORLD( - gObjectEventPic_Pignite, + sPicTable_Pignite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -492,10 +498,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Emboar, .iconSprite = gMonIcon_Emboar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_L) FOOTPRINT(Emboar) OVERWORLD( - gObjectEventPic_Emboar, + sPicTable_Emboar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -564,10 +571,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Oshawott, .iconSprite = gMonIcon_Oshawott, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 0, SHADOW_SIZE_S) FOOTPRINT(Oshawott) OVERWORLD( - gObjectEventPic_Oshawott, + sPicTable_Oshawott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -634,10 +642,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Dewott, .iconSprite = gMonIcon_Dewott, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 6, SHADOW_SIZE_S) FOOTPRINT(Dewott) OVERWORLD( - gObjectEventPic_Dewott, + sPicTable_Dewott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -701,10 +710,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Samurott, .iconSprite = gMonIcon_Samurott, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_L) FOOTPRINT(Samurott) OVERWORLD( - gObjectEventPic_Samurott, + sPicTable_Samurott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -765,10 +775,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SamurottHisui, .iconSprite = gMonIcon_SamurottHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_L) FOOTPRINT(Samurott) OVERWORLD( - gObjectEventPic_SamurottHisui, + sPicTable_SamurottHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -835,10 +846,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Patrat, .iconSprite = gMonIcon_Patrat, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Patrat) OVERWORLD( - gObjectEventPic_Patrat, + sPicTable_Patrat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -907,10 +919,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Watchog, .iconSprite = gMonIcon_Watchog, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 11, SHADOW_SIZE_S) FOOTPRINT(Watchog) OVERWORLD( - gObjectEventPic_Watchog, + sPicTable_Watchog, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -979,10 +992,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Lillipup, .iconSprite = gMonIcon_Lillipup, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 1, SHADOW_SIZE_S) FOOTPRINT(Lillipup) OVERWORLD( - gObjectEventPic_Lillipup, + sPicTable_Lillipup, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1050,10 +1064,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Herdier, .iconSprite = gMonIcon_Herdier, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_M) FOOTPRINT(Herdier) OVERWORLD( - gObjectEventPic_Herdier, + sPicTable_Herdier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1125,10 +1140,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Stoutland, .iconSprite = gMonIcon_Stoutland, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 9, SHADOW_SIZE_L) FOOTPRINT(Stoutland) OVERWORLD( - gObjectEventPic_Stoutland, + sPicTable_Stoutland, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1193,10 +1209,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Purrloin, .iconSprite = gMonIcon_Purrloin, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Purrloin) OVERWORLD( - gObjectEventPic_Purrloin, + sPicTable_Purrloin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1261,10 +1278,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Liepard, .iconSprite = gMonIcon_Liepard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_M) FOOTPRINT(Liepard) OVERWORLD( - gObjectEventPic_Liepard, + sPicTable_Liepard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1331,10 +1349,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Pansage, .iconSprite = gMonIcon_Pansage, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Pansage) OVERWORLD( - gObjectEventPic_Pansage, + sPicTable_Pansage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1399,10 +1418,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Simisage, .iconSprite = gMonIcon_Simisage, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Simisage) OVERWORLD( - gObjectEventPic_Simisage, + sPicTable_Simisage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1467,10 +1487,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Pansear, .iconSprite = gMonIcon_Pansear, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 3, SHADOW_SIZE_S) FOOTPRINT(Pansear) OVERWORLD( - gObjectEventPic_Pansear, + sPicTable_Pansear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1538,10 +1559,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Simisear, .iconSprite = gMonIcon_Simisear, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Simisear) OVERWORLD( - gObjectEventPic_Simisear, + sPicTable_Simisear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1606,10 +1628,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Panpour, .iconSprite = gMonIcon_Panpour, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 4, SHADOW_SIZE_S) FOOTPRINT(Panpour) OVERWORLD( - gObjectEventPic_Panpour, + sPicTable_Panpour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1673,10 +1696,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Simipour, .iconSprite = gMonIcon_Simipour, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Simipour) OVERWORLD( - gObjectEventPic_Simipour, + sPicTable_Simipour, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1747,10 +1771,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Munna, .iconSprite = gMonIcon_Munna, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Munna) OVERWORLD( - gObjectEventPic_Munna, + sPicTable_Munna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1818,10 +1843,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Musharna, .iconSprite = gMonIcon_Musharna, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 10, SHADOW_SIZE_M) FOOTPRINT(Musharna) OVERWORLD( - gObjectEventPic_Musharna, + sPicTable_Musharna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1886,10 +1912,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Pidove, .iconSprite = gMonIcon_Pidove, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Pidove) OVERWORLD( - gObjectEventPic_Pidove, + sPicTable_Pidove, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1954,10 +1981,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Tranquill, .iconSprite = gMonIcon_Tranquill, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Tranquill) OVERWORLD( - gObjectEventPic_Tranquill, + sPicTable_Tranquill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2037,10 +2065,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSpriteFemale = gMonIcon_UnfezantF, .iconPalIndexFemale = 1, #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(Unfezant) OVERWORLD( - gObjectEventPic_Unfezant, + sPicTable_Unfezant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2049,7 +2078,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = gShinyOverworldPalette_Unfezant ) OVERWORLD_FEMALE( - gObjectEventPic_UnfezantF, + sPicTable_UnfezantF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2117,10 +2146,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Blitzle, .iconSprite = gMonIcon_Blitzle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_M) FOOTPRINT(Blitzle) OVERWORLD( - gObjectEventPic_Blitzle, + sPicTable_Blitzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2185,10 +2215,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zebstrika, .iconSprite = gMonIcon_Zebstrika, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_M) FOOTPRINT(Zebstrika) OVERWORLD( - gObjectEventPic_Zebstrika, + sPicTable_Zebstrika, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2259,10 +2290,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Roggenrola, .iconSprite = gMonIcon_Roggenrola, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Roggenrola) OVERWORLD( - gObjectEventPic_Roggenrola, + sPicTable_Roggenrola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2337,10 +2369,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Boldore, .iconSprite = gMonIcon_Boldore, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 3, SHADOW_SIZE_L) FOOTPRINT(Boldore) OVERWORLD( - gObjectEventPic_Boldore, + sPicTable_Boldore, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2417,10 +2450,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Gigalith, .iconSprite = gMonIcon_Gigalith, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gigalith) OVERWORLD( - gObjectEventPic_Gigalith, + sPicTable_Gigalith, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2502,10 +2536,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Woobat, .iconSprite = gMonIcon_Woobat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_S) FOOTPRINT(Woobat) OVERWORLD( - gObjectEventPic_Woobat, + sPicTable_Woobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2574,10 +2609,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Swoobat, .iconSprite = gMonIcon_Swoobat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 17, SHADOW_SIZE_M) FOOTPRINT(Swoobat) OVERWORLD( - gObjectEventPic_Swoobat, + sPicTable_Swoobat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2645,10 +2681,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Drilbur, .iconSprite = gMonIcon_Drilbur, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Drilbur) OVERWORLD( - gObjectEventPic_Drilbur, + sPicTable_Drilbur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2715,10 +2752,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Excadrill, .iconSprite = gMonIcon_Excadrill, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 8, SHADOW_SIZE_L) FOOTPRINT(Excadrill) OVERWORLD( - gObjectEventPic_Excadrill, + sPicTable_Excadrill, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2785,10 +2823,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Audino, .iconSprite = gMonIcon_Audino, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_S) FOOTPRINT(Audino) OVERWORLD( - gObjectEventPic_Audino, + sPicTable_Audino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2853,11 +2892,12 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_AudinoMega, .iconSprite = gMonIcon_AudinoMega, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Audino) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_AudinoMega, + sPicTable_AudinoMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2928,10 +2968,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Timburr, .iconSprite = gMonIcon_Timburr, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 2, SHADOW_SIZE_S) FOOTPRINT(Timburr) OVERWORLD( - gObjectEventPic_Timburr, + sPicTable_Timburr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3000,10 +3041,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Gurdurr, .iconSprite = gMonIcon_Gurdurr, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Gurdurr) OVERWORLD( - gObjectEventPic_Gurdurr, + sPicTable_Gurdurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3067,10 +3109,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Conkeldurr, .iconSprite = gMonIcon_Conkeldurr, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Conkeldurr) OVERWORLD( - gObjectEventPic_Conkeldurr, + sPicTable_Conkeldurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3134,10 +3177,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Tympole, .iconSprite = gMonIcon_Tympole, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Tympole) OVERWORLD( - gObjectEventPic_Tympole, + sPicTable_Tympole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3204,10 +3248,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Palpitoad, .iconSprite = gMonIcon_Palpitoad, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_S) FOOTPRINT(Palpitoad) OVERWORLD( - gObjectEventPic_Palpitoad, + sPicTable_Palpitoad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3281,10 +3326,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Seismitoad, .iconSprite = gMonIcon_Seismitoad, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 10, SHADOW_SIZE_L) FOOTPRINT(Seismitoad) OVERWORLD( - gObjectEventPic_Seismitoad, + sPicTable_Seismitoad, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3351,10 +3397,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Throh, .iconSprite = gMonIcon_Throh, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 4, SHADOW_SIZE_M) FOOTPRINT(Throh) OVERWORLD( - gObjectEventPic_Throh, + sPicTable_Throh, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3420,10 +3467,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Sawk, .iconSprite = gMonIcon_Sawk, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(Sawk) OVERWORLD( - gObjectEventPic_Sawk, + sPicTable_Sawk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3491,10 +3539,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Sewaddle, .iconSprite = gMonIcon_Sewaddle, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 0, SHADOW_SIZE_S) FOOTPRINT(Sewaddle) OVERWORLD( - gObjectEventPic_Sewaddle, + sPicTable_Sewaddle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3561,10 +3610,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Swadloon, .iconSprite = gMonIcon_Swadloon, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 1, SHADOW_SIZE_L) FOOTPRINT(Swadloon) OVERWORLD( - gObjectEventPic_Swadloon, + sPicTable_Swadloon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3635,10 +3685,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Leavanny, .iconSprite = gMonIcon_Leavanny, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_S) FOOTPRINT(Leavanny) OVERWORLD( - gObjectEventPic_Leavanny, + sPicTable_Leavanny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3712,10 +3763,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Venipede, .iconSprite = gMonIcon_Venipede, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -3, SHADOW_SIZE_M) FOOTPRINT(Venipede) OVERWORLD( - gObjectEventPic_Venipede, + sPicTable_Venipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3788,10 +3840,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Whirlipede, .iconSprite = gMonIcon_Whirlipede, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Whirlipede) OVERWORLD( - gObjectEventPic_Whirlipede, + sPicTable_Whirlipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3865,10 +3918,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Scolipede, .iconSprite = gMonIcon_Scolipede, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_L) FOOTPRINT(Scolipede) OVERWORLD( - gObjectEventPic_Scolipede, + sPicTable_Scolipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3946,10 +4000,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cottonee, .iconSprite = gMonIcon_Cottonee, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -5, SHADOW_SIZE_M) FOOTPRINT(Cottonee) OVERWORLD( - gObjectEventPic_Cottonee, + sPicTable_Cottonee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4015,10 +4070,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Whimsicott, .iconSprite = gMonIcon_Whimsicott, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Whimsicott) OVERWORLD( - gObjectEventPic_Whimsicott, + sPicTable_Whimsicott, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4087,10 +4143,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Petilil, .iconSprite = gMonIcon_Petilil, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 6, SHADOW_SIZE_S) FOOTPRINT(Petilil) OVERWORLD( - gObjectEventPic_Petilil, + sPicTable_Petilil, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4158,10 +4215,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Lilligant, .iconSprite = gMonIcon_Lilligant, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_M) FOOTPRINT(Lilligant) OVERWORLD( - gObjectEventPic_Lilligant, + sPicTable_Lilligant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4225,10 +4283,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_LilligantHisui, .iconSprite = gMonIcon_LilligantHisui, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Lilligant) OVERWORLD( - gObjectEventPic_LilligantHisui, + sPicTable_LilligantHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4294,10 +4353,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BasculinRedStriped, .iconSprite = gMonIcon_BasculinRedStriped, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Basculin) OVERWORLD( - gObjectEventPic_BasculinRedStriped, + sPicTable_BasculinRedStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4360,10 +4420,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BasculinBlueStriped, .iconSprite = gMonIcon_BasculinBlueStriped, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Basculin) OVERWORLD( - gObjectEventPic_BasculinBlueStriped, + sPicTable_BasculinBlueStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4427,10 +4488,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BasculinWhiteStriped, .iconSprite = gMonIcon_BasculinWhiteStriped, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Basculin) OVERWORLD( - gObjectEventPic_BasculinWhiteStriped, + sPicTable_BasculinWhiteStriped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4493,10 +4555,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BasculegionM, .iconSprite = gMonIcon_BasculegionM, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_M) FOOTPRINT(Basculegion) OVERWORLD( - gObjectEventPic_BasculegionM, + sPicTable_BasculegionM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4556,10 +4619,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BasculegionF, .iconSprite = gMonIcon_BasculegionF, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_M) FOOTPRINT(Basculegion) OVERWORLD( - gObjectEventPic_BasculegionF, + sPicTable_BasculegionF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4627,10 +4691,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Sandile, .iconSprite = gMonIcon_Sandile, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(4, -5, SHADOW_SIZE_M) FOOTPRINT(Sandile) OVERWORLD( - gObjectEventPic_Sandile, + sPicTable_Sandile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4695,10 +4760,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Krokorok, .iconSprite = gMonIcon_Krokorok, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Krokorok) OVERWORLD( - gObjectEventPic_Krokorok, + sPicTable_Krokorok, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4771,10 +4837,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Krookodile, .iconSprite = gMonIcon_Krookodile, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Krookodile) OVERWORLD( - gObjectEventPic_Krookodile, + sPicTable_Krookodile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4839,10 +4906,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Darumaka, .iconSprite = gMonIcon_Darumaka, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Darumaka) OVERWORLD( - gObjectEventPic_Darumaka, + sPicTable_Darumaka, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4909,10 +4977,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanStandard, .iconSprite = gMonIcon_DarmanitanStandard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_L) FOOTPRINT(Darmanitan) OVERWORLD( - gObjectEventPic_DarmanitanStandard, + sPicTable_DarmanitanStandard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4975,6 +5044,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanZen, .iconSprite = gMonIcon_DarmanitanZen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Darmanitan) .levelUpLearnset = sDarmanitanLevelUpLearnset, @@ -5031,10 +5101,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarumakaGalar, .iconSprite = gMonIcon_DarumakaGalar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, -1, SHADOW_SIZE_S) FOOTPRINT(Darumaka) OVERWORLD( - gObjectEventPic_DarumakaGalar, + sPicTable_DarumakaGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5097,10 +5168,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanGalarStandard, .iconSprite = gMonIcon_DarmanitanGalarStandard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_L) FOOTPRINT(Darmanitan) OVERWORLD( - gObjectEventPic_DarmanitanGalarStandard, + sPicTable_DarmanitanGalarStandard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5162,6 +5234,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DarmanitanGalarZen, .iconSprite = gMonIcon_DarmanitanGalarZen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_S) FOOTPRINT(Darmanitan) .isGalarianForm = TRUE, @@ -5230,10 +5303,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Maractus, .iconSprite = gMonIcon_Maractus, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Maractus) OVERWORLD( - gObjectEventPic_Maractus, + sPicTable_Maractus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5306,10 +5380,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Dwebble, .iconSprite = gMonIcon_Dwebble, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Dwebble) OVERWORLD( - gObjectEventPic_Dwebble, + sPicTable_Dwebble, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5378,10 +5453,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Crustle, .iconSprite = gMonIcon_Crustle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 8, SHADOW_SIZE_L) FOOTPRINT(Crustle) OVERWORLD( - gObjectEventPic_Crustle, + sPicTable_Crustle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5447,10 +5523,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Scraggy, .iconSprite = gMonIcon_Scraggy, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 2, SHADOW_SIZE_S) FOOTPRINT(Scraggy) OVERWORLD( - gObjectEventPic_Scraggy, + sPicTable_Scraggy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5517,10 +5594,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Scrafty, .iconSprite = gMonIcon_Scrafty, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 9, SHADOW_SIZE_M) FOOTPRINT(Scrafty) OVERWORLD( - gObjectEventPic_Scrafty, + sPicTable_Scrafty, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5591,10 +5669,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Sigilyph, .iconSprite = gMonIcon_Sigilyph, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 18, SHADOW_SIZE_S) FOOTPRINT(Sigilyph) OVERWORLD( - gObjectEventPic_Sigilyph, + sPicTable_Sigilyph, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5664,10 +5743,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Yamask, .iconSprite = gMonIcon_Yamask, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_S) FOOTPRINT(Yamask) OVERWORLD( - gObjectEventPic_Yamask, + sPicTable_Yamask, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5734,10 +5814,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cofagrigus, .iconSprite = gMonIcon_Cofagrigus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 12, SHADOW_SIZE_M) FOOTPRINT(Cofagrigus) OVERWORLD( - gObjectEventPic_Cofagrigus, + sPicTable_Cofagrigus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5798,10 +5879,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_YamaskGalar, .iconSprite = gMonIcon_YamaskGalar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Yamask) OVERWORLD( - gObjectEventPic_YamaskGalar, + sPicTable_YamaskGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5864,10 +5946,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Runerigus, .iconSprite = gMonIcon_Runerigus, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(14, 14, SHADOW_SIZE_M) FOOTPRINT(Runerigus) OVERWORLD( - gObjectEventPic_Runerigus, + sPicTable_Runerigus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5934,10 +6017,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Tirtouga, .iconSprite = gMonIcon_Tirtouga, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -3, SHADOW_SIZE_M) FOOTPRINT(Tirtouga) OVERWORLD( - gObjectEventPic_Tirtouga, + sPicTable_Tirtouga, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6009,10 +6093,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Carracosta, .iconSprite = gMonIcon_Carracosta, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_L) FOOTPRINT(Carracosta) OVERWORLD( - gObjectEventPic_Carracosta, + sPicTable_Carracosta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6077,10 +6162,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Archen, .iconSprite = gMonIcon_Archen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, -2, SHADOW_SIZE_S) FOOTPRINT(Archen) OVERWORLD( - gObjectEventPic_Archen, + sPicTable_Archen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6151,10 +6237,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Archeops, .iconSprite = gMonIcon_Archeops, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 18, SHADOW_SIZE_M) FOOTPRINT(Archeops) OVERWORLD( - gObjectEventPic_Archeops, + sPicTable_Archeops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6220,10 +6307,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Trubbish, .iconSprite = gMonIcon_Trubbish, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Trubbish) OVERWORLD( - gObjectEventPic_Trubbish, + sPicTable_Trubbish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6291,10 +6379,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Garbodor, .iconSprite = gMonIcon_Garbodor, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Garbodor) OVERWORLD( - gObjectEventPic_Garbodor, + sPicTable_Garbodor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6359,6 +6448,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_GarbodorGmax, .iconSprite = gMonIcon_GarbodorGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Garbodor) .isGigantamax = TRUE, @@ -6424,10 +6514,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zorua, .iconSprite = gMonIcon_Zorua, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Zorua) OVERWORLD( - gObjectEventPic_Zorua, + sPicTable_Zorua, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6495,10 +6586,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zoroark, .iconSprite = gMonIcon_Zoroark, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 8, SHADOW_SIZE_L) FOOTPRINT(Zoroark) OVERWORLD( - gObjectEventPic_Zoroark, + sPicTable_Zoroark, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6559,10 +6651,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ZoruaHisui, .iconSprite = gMonIcon_ZoruaHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 12, SHADOW_SIZE_S) FOOTPRINT(Zorua) OVERWORLD( - gObjectEventPic_ZoruaHisui, + sPicTable_ZoruaHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6624,10 +6717,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ZoroarkHisui, .iconSprite = gMonIcon_ZoroarkHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(11, 13, SHADOW_SIZE_L) FOOTPRINT(Zoroark) OVERWORLD( - gObjectEventPic_ZoroarkHisui, + sPicTable_ZoroarkHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6695,10 +6789,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Minccino, .iconSprite = gMonIcon_Minccino, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 3, SHADOW_SIZE_S) FOOTPRINT(Minccino) OVERWORLD( - gObjectEventPic_Minccino, + sPicTable_Minccino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6766,10 +6861,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cinccino, .iconSprite = gMonIcon_Cinccino, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 6, SHADOW_SIZE_M) FOOTPRINT(Cinccino) OVERWORLD( - gObjectEventPic_Cinccino, + sPicTable_Cinccino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6839,10 +6935,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Gothita, .iconSprite = gMonIcon_Gothita, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 2, SHADOW_SIZE_S) FOOTPRINT(Gothita) OVERWORLD( - gObjectEventPic_Gothita, + sPicTable_Gothita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6913,10 +7010,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Gothorita, .iconSprite = gMonIcon_Gothorita, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Gothorita) OVERWORLD( - gObjectEventPic_Gothorita, + sPicTable_Gothorita, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6985,10 +7083,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Gothitelle, .iconSprite = gMonIcon_Gothitelle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Gothitelle) OVERWORLD( - gObjectEventPic_Gothitelle, + sPicTable_Gothitelle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7056,10 +7155,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Solosis, .iconSprite = gMonIcon_Solosis, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_S) FOOTPRINT(Solosis) OVERWORLD( - gObjectEventPic_Solosis, + sPicTable_Solosis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7126,10 +7226,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Duosion, .iconSprite = gMonIcon_Duosion, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(Duosion) OVERWORLD( - gObjectEventPic_Duosion, + sPicTable_Duosion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7196,10 +7297,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Reuniclus, .iconSprite = gMonIcon_Reuniclus, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_M) FOOTPRINT(Reuniclus) OVERWORLD( - gObjectEventPic_Reuniclus, + sPicTable_Reuniclus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7268,10 +7370,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Ducklett, .iconSprite = gMonIcon_Ducklett, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 2, SHADOW_SIZE_S) FOOTPRINT(Ducklett) OVERWORLD( - gObjectEventPic_Ducklett, + sPicTable_Ducklett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7335,10 +7438,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Swanna, .iconSprite = gMonIcon_Swanna, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Swanna) OVERWORLD( - gObjectEventPic_Swanna, + sPicTable_Swanna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7410,10 +7514,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Vanillite, .iconSprite = gMonIcon_Vanillite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Vanillite) OVERWORLD( - gObjectEventPic_Vanillite, + sPicTable_Vanillite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7483,10 +7588,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Vanillish, .iconSprite = gMonIcon_Vanillish, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 9, SHADOW_SIZE_S) FOOTPRINT(Vanillish) OVERWORLD( - gObjectEventPic_Vanillish, + sPicTable_Vanillish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7555,10 +7661,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Vanilluxe, .iconSprite = gMonIcon_Vanilluxe, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_M) FOOTPRINT(Vanilluxe) OVERWORLD( - gObjectEventPic_Vanilluxe, + sPicTable_Vanilluxe, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7619,10 +7726,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DeerlingSpring, .iconSprite = gMonIcon_DeerlingSpring, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Deerling) OVERWORLD( - gObjectEventPic_DeerlingSpring, + sPicTable_DeerlingSpring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7684,10 +7792,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DeerlingSummer, .iconSprite = gMonIcon_DeerlingSummer, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Deerling) OVERWORLD( - gObjectEventPic_DeerlingSummer, + sPicTable_DeerlingSummer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7749,10 +7858,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DeerlingAutumn, .iconSprite = gMonIcon_DeerlingAutumn, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Deerling) OVERWORLD( - gObjectEventPic_DeerlingAutumn, + sPicTable_DeerlingAutumn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7814,10 +7924,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_DeerlingWinter, .iconSprite = gMonIcon_DeerlingWinter, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Deerling) OVERWORLD( - gObjectEventPic_DeerlingWinter, + sPicTable_DeerlingWinter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7879,10 +7990,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SawsbuckSpring, .iconSprite = gMonIcon_SawsbuckSpring, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_M) FOOTPRINT(Sawsbuck) OVERWORLD( - gObjectEventPic_SawsbuckSpring, + sPicTable_SawsbuckSpring, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7942,10 +8054,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SawsbuckSummer, .iconSprite = gMonIcon_SawsbuckSummer, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_M) FOOTPRINT(Sawsbuck) OVERWORLD( - gObjectEventPic_SawsbuckSummer, + sPicTable_SawsbuckSummer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8005,10 +8118,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SawsbuckAutumn, .iconSprite = gMonIcon_SawsbuckAutumn, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_M) FOOTPRINT(Sawsbuck) OVERWORLD( - gObjectEventPic_SawsbuckAutumn, + sPicTable_SawsbuckAutumn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8068,10 +8182,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_SawsbuckWinter, .iconSprite = gMonIcon_SawsbuckWinter, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 13, SHADOW_SIZE_M) FOOTPRINT(Sawsbuck) OVERWORLD( - gObjectEventPic_SawsbuckWinter, + sPicTable_SawsbuckWinter, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8140,10 +8255,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Emolga, .iconSprite = gMonIcon_Emolga, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Emolga) OVERWORLD( - gObjectEventPic_Emolga, + sPicTable_Emolga, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8208,10 +8324,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Karrablast, .iconSprite = gMonIcon_Karrablast, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 0, SHADOW_SIZE_S) FOOTPRINT(Karrablast) OVERWORLD( - gObjectEventPic_Karrablast, + sPicTable_Karrablast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8276,10 +8393,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Escavalier, .iconSprite = gMonIcon_Escavalier, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_M) FOOTPRINT(Escavalier) OVERWORLD( - gObjectEventPic_Escavalier, + sPicTable_Escavalier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8348,10 +8466,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Foongus, .iconSprite = gMonIcon_Foongus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -3, SHADOW_SIZE_S) FOOTPRINT(Foongus) OVERWORLD( - gObjectEventPic_Foongus, + sPicTable_Foongus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8422,10 +8541,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Amoonguss, .iconSprite = gMonIcon_Amoonguss, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 5, SHADOW_SIZE_M) FOOTPRINT(Amoonguss) OVERWORLD( - gObjectEventPic_Amoonguss, + sPicTable_Amoonguss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8501,10 +8621,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSpriteFemale = gMonIcon_FrillishF, .iconPalIndexFemale = 1, #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Frillish) OVERWORLD( - gObjectEventPic_Frillish, + sPicTable_Frillish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8513,7 +8634,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = gShinyOverworldPalette_Frillish ) OVERWORLD_FEMALE( - gObjectEventPic_FrillishF, + sPicTable_FrillishF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8590,10 +8711,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .iconSpriteFemale = gMonIcon_JellicentF, .iconPalIndexFemale = 1, #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_M) FOOTPRINT(Jellicent) OVERWORLD( - gObjectEventPic_Jellicent, + sPicTable_Jellicent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8602,7 +8724,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = gShinyOverworldPalette_Jellicent ) OVERWORLD_FEMALE( - gObjectEventPic_JellicentF, + sPicTable_JellicentF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8667,10 +8789,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Alomomola, .iconSprite = gMonIcon_Alomomola, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_S) FOOTPRINT(Alomomola) OVERWORLD( - gObjectEventPic_Alomomola, + sPicTable_Alomomola, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8738,10 +8861,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Joltik, .iconSprite = gMonIcon_Joltik, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -5, SHADOW_SIZE_S) FOOTPRINT(Joltik) OVERWORLD( - gObjectEventPic_Joltik, + sPicTable_Joltik, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8811,10 +8935,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Galvantula, .iconSprite = gMonIcon_Galvantula, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -2, SHADOW_SIZE_L) FOOTPRINT(Galvantula) OVERWORLD( - gObjectEventPic_Galvantula, + sPicTable_Galvantula, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8882,10 +9007,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Ferroseed, .iconSprite = gMonIcon_Ferroseed, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Ferroseed) OVERWORLD( - gObjectEventPic_Ferroseed, + sPicTable_Ferroseed, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8958,10 +9084,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Ferrothorn, .iconSprite = gMonIcon_Ferrothorn, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 17, SHADOW_SIZE_M) FOOTPRINT(Ferrothorn) OVERWORLD( - gObjectEventPic_Ferrothorn, + sPicTable_Ferrothorn, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9029,10 +9156,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Klink, .iconSprite = gMonIcon_Klink, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Klink) OVERWORLD( - gObjectEventPic_Klink, + sPicTable_Klink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9099,10 +9227,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Klang, .iconSprite = gMonIcon_Klang, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_M) FOOTPRINT(Klang) OVERWORLD( - gObjectEventPic_Klang, + sPicTable_Klang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9169,10 +9298,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Klinklang, .iconSprite = gMonIcon_Klinklang, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Klinklang) OVERWORLD( - gObjectEventPic_Klinklang, + sPicTable_Klinklang, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9251,10 +9381,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Tynamo, .iconSprite = gMonIcon_Tynamo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 5, SHADOW_SIZE_S) FOOTPRINT(Tynamo) OVERWORLD( - gObjectEventPic_Tynamo, + sPicTable_Tynamo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9322,10 +9453,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Eelektrik, .iconSprite = gMonIcon_Eelektrik, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Eelektrik) OVERWORLD( - gObjectEventPic_Eelektrik, + sPicTable_Eelektrik, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9393,10 +9525,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Eelektross, .iconSprite = gMonIcon_Eelektross, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 13, SHADOW_SIZE_M) FOOTPRINT(Eelektross) OVERWORLD( - gObjectEventPic_Eelektross, + sPicTable_Eelektross, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9466,10 +9599,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Elgyem, .iconSprite = gMonIcon_Elgyem, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Elgyem) OVERWORLD( - gObjectEventPic_Elgyem, + sPicTable_Elgyem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9533,10 +9667,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Beheeyem, .iconSprite = gMonIcon_Beheeyem, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_M) FOOTPRINT(Beheeyem) OVERWORLD( - gObjectEventPic_Beheeyem, + sPicTable_Beheeyem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9607,10 +9742,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Litwick, .iconSprite = gMonIcon_Litwick, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, -1, SHADOW_SIZE_S) FOOTPRINT(Litwick) OVERWORLD( - gObjectEventPic_Litwick, + sPicTable_Litwick, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9681,10 +9817,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Lampent, .iconSprite = gMonIcon_Lampent, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_S) FOOTPRINT(Lampent) OVERWORLD( - gObjectEventPic_Lampent, + sPicTable_Lampent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9753,10 +9890,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Chandelure, .iconSprite = gMonIcon_Chandelure, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_S) FOOTPRINT(Chandelure) OVERWORLD( - gObjectEventPic_Chandelure, + sPicTable_Chandelure, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9820,10 +9958,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Axew, .iconSprite = gMonIcon_Axew, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 1, SHADOW_SIZE_S) FOOTPRINT(Axew) OVERWORLD( - gObjectEventPic_Axew, + sPicTable_Axew, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9887,10 +10026,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Fraxure, .iconSprite = gMonIcon_Fraxure, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_L) FOOTPRINT(Fraxure) OVERWORLD( - gObjectEventPic_Fraxure, + sPicTable_Fraxure, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -9955,10 +10095,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Haxorus, .iconSprite = gMonIcon_Haxorus, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 9, SHADOW_SIZE_L) FOOTPRINT(Haxorus) OVERWORLD( - gObjectEventPic_Haxorus, + sPicTable_Haxorus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10027,10 +10168,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cubchoo, .iconSprite = gMonIcon_Cubchoo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 0, SHADOW_SIZE_S) FOOTPRINT(Cubchoo) OVERWORLD( - gObjectEventPic_Cubchoo, + sPicTable_Cubchoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10100,10 +10242,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Beartic, .iconSprite = gMonIcon_Beartic, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Beartic) OVERWORLD( - gObjectEventPic_Beartic, + sPicTable_Beartic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10172,10 +10315,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cryogonal, .iconSprite = gMonIcon_Cryogonal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Cryogonal) OVERWORLD( - gObjectEventPic_Cryogonal, + sPicTable_Cryogonal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10242,10 +10386,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Shelmet, .iconSprite = gMonIcon_Shelmet, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -1, SHADOW_SIZE_S) FOOTPRINT(Shelmet) OVERWORLD( - gObjectEventPic_Shelmet, + sPicTable_Shelmet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10309,10 +10454,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Accelgor, .iconSprite = gMonIcon_Accelgor, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-14, 8, SHADOW_SIZE_S) FOOTPRINT(Accelgor) OVERWORLD( - gObjectEventPic_Accelgor, + sPicTable_Accelgor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10377,10 +10523,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Stunfisk, .iconSprite = gMonIcon_Stunfisk, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Stunfisk) OVERWORLD( - gObjectEventPic_Stunfisk, + sPicTable_Stunfisk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10442,10 +10589,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_StunfiskGalar, .iconSprite = gMonIcon_StunfiskGalar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Stunfisk) OVERWORLD( - gObjectEventPic_StunfiskGalar, + sPicTable_StunfiskGalar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10513,10 +10661,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Mienfoo, .iconSprite = gMonIcon_Mienfoo, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Mienfoo) OVERWORLD( - gObjectEventPic_Mienfoo, + sPicTable_Mienfoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10585,10 +10734,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Mienshao, .iconSprite = gMonIcon_Mienshao, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_M) FOOTPRINT(Mienshao) OVERWORLD( - gObjectEventPic_Mienshao, + sPicTable_Mienshao, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10658,10 +10808,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Druddigon, .iconSprite = gMonIcon_Druddigon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_M) FOOTPRINT(Druddigon) OVERWORLD( - gObjectEventPic_Druddigon, + sPicTable_Druddigon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10729,10 +10880,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Golett, .iconSprite = gMonIcon_Golett, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 7, SHADOW_SIZE_M) FOOTPRINT(Golett) OVERWORLD( - gObjectEventPic_Golett, + sPicTable_Golett, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10797,10 +10949,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Golurk, .iconSprite = gMonIcon_Golurk, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_L) FOOTPRINT(Golurk) OVERWORLD( - gObjectEventPic_Golurk, + sPicTable_Golurk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10870,10 +11023,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Pawniard, .iconSprite = gMonIcon_Pawniard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(4, 4, SHADOW_SIZE_S) FOOTPRINT(Pawniard) OVERWORLD( - gObjectEventPic_Pawniard, + sPicTable_Pawniard, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -10938,10 +11092,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Bisharp, .iconSprite = gMonIcon_Bisharp, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Bisharp) OVERWORLD( - gObjectEventPic_Bisharp, + sPicTable_Bisharp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11002,10 +11157,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Kingambit, .iconSprite = gMonIcon_Kingambit, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Kingambit) OVERWORLD( - gObjectEventPic_Kingambit, + sPicTable_Kingambit, SIZE_64x64, SHADOW_SIZE_L, TRACKS_NONE, @@ -11071,10 +11227,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Bouffalant, .iconSprite = gMonIcon_Bouffalant, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(8, 7, SHADOW_SIZE_M) FOOTPRINT(Bouffalant) OVERWORLD( - gObjectEventPic_Bouffalant, + sPicTable_Bouffalant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11142,10 +11299,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Rufflet, .iconSprite = gMonIcon_Rufflet, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Rufflet) OVERWORLD( - gObjectEventPic_Rufflet, + sPicTable_Rufflet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11211,10 +11369,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Braviary, .iconSprite = gMonIcon_Braviary, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 16, SHADOW_SIZE_M) FOOTPRINT(Braviary) OVERWORLD( - gObjectEventPic_Braviary, + sPicTable_Braviary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11275,10 +11434,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_BraviaryHisui, .iconSprite = gMonIcon_BraviaryHisui, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Braviary) OVERWORLD( - gObjectEventPic_BraviaryHisui, + sPicTable_BraviaryHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11346,10 +11506,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Vullaby, .iconSprite = gMonIcon_Vullaby, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_M) FOOTPRINT(Vullaby) OVERWORLD( - gObjectEventPic_Vullaby, + sPicTable_Vullaby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11414,10 +11575,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Mandibuzz, .iconSprite = gMonIcon_Mandibuzz, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Mandibuzz) OVERWORLD( - gObjectEventPic_Mandibuzz, + sPicTable_Mandibuzz, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11481,10 +11643,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Heatmor, .iconSprite = gMonIcon_Heatmor, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_L) FOOTPRINT(Heatmor) OVERWORLD( - gObjectEventPic_Heatmor, + sPicTable_Heatmor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11564,10 +11727,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Durant, .iconSprite = gMonIcon_Durant, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -3, SHADOW_SIZE_L) FOOTPRINT(Durant) OVERWORLD( - gObjectEventPic_Durant, + sPicTable_Durant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11633,10 +11797,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Deino, .iconSprite = gMonIcon_Deino, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 3, SHADOW_SIZE_S) FOOTPRINT(Deino) OVERWORLD( - gObjectEventPic_Deino, + sPicTable_Deino, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11700,10 +11865,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zweilous, .iconSprite = gMonIcon_Zweilous, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_L) FOOTPRINT(Zweilous) OVERWORLD( - gObjectEventPic_Zweilous, + sPicTable_Zweilous, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11773,10 +11939,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Hydreigon, .iconSprite = gMonIcon_Hydreigon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 16, SHADOW_SIZE_M) FOOTPRINT(Hydreigon) OVERWORLD( - gObjectEventPic_Hydreigon, + sPicTable_Hydreigon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11849,10 +12016,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Larvesta, .iconSprite = gMonIcon_Larvesta, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Larvesta) OVERWORLD( - gObjectEventPic_Larvesta, + sPicTable_Larvesta, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11921,10 +12089,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Volcarona, .iconSprite = gMonIcon_Volcarona, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 14, SHADOW_SIZE_M) FOOTPRINT(Volcarona) OVERWORLD( - gObjectEventPic_Volcarona, + sPicTable_Volcarona, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -11989,10 +12158,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Cobalion, .iconSprite = gMonIcon_Cobalion, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_M) FOOTPRINT(Cobalion) OVERWORLD( - gObjectEventPic_Cobalion, + sPicTable_Cobalion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12063,10 +12233,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Terrakion, .iconSprite = gMonIcon_Terrakion, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 6, SHADOW_SIZE_L) FOOTPRINT(Terrakion) OVERWORLD( - gObjectEventPic_Terrakion, + sPicTable_Terrakion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12132,10 +12303,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Virizion, .iconSprite = gMonIcon_Virizion, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Virizion) OVERWORLD( - gObjectEventPic_Virizion, + sPicTable_Virizion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12222,10 +12394,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_TornadusIncarnate, .iconSprite = gMonIcon_TornadusIncarnate, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 17, SHADOW_SIZE_M) FOOTPRINT(Tornadus) OVERWORLD( - gObjectEventPic_TornadusIncarnate, + sPicTable_TornadusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12294,10 +12467,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_TornadusTherian, .iconSprite = gMonIcon_TornadusTherian, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_L) FOOTPRINT(Tornadus) OVERWORLD( - gObjectEventPic_TornadusTherian, + sPicTable_TornadusTherian, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12386,10 +12560,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ThundurusIncarnate, .iconSprite = gMonIcon_ThundurusIncarnate, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 17, SHADOW_SIZE_M) FOOTPRINT(Thundurus) OVERWORLD( - gObjectEventPic_ThundurusIncarnate, + sPicTable_ThundurusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12470,10 +12645,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_ThundurusTherian, .iconSprite = gMonIcon_ThundurusTherian, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 16, SHADOW_SIZE_M) FOOTPRINT(Thundurus) OVERWORLD( - gObjectEventPic_ThundurusTherian, + sPicTable_ThundurusTherian, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12541,10 +12717,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Reshiram, .iconSprite = gMonIcon_Reshiram, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_L) FOOTPRINT(Reshiram) OVERWORLD( - gObjectEventPic_Reshiram, + sPicTable_Reshiram, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12611,10 +12788,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Zekrom, .iconSprite = gMonIcon_Zekrom, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_L) FOOTPRINT(Zekrom) OVERWORLD( - gObjectEventPic_Zekrom, + sPicTable_Zekrom, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12702,10 +12880,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_LandorusIncarnate, .iconSprite = gMonIcon_LandorusIncarnate, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 17, SHADOW_SIZE_M) FOOTPRINT(Landorus) OVERWORLD( - gObjectEventPic_LandorusIncarnate, + sPicTable_LandorusIncarnate, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12774,10 +12953,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_LandorusTherian, .iconSprite = gMonIcon_LandorusTherian, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Landorus) OVERWORLD( - gObjectEventPic_LandorusTherian, + sPicTable_LandorusTherian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12850,10 +13030,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_Kyurem, .iconSprite = gMonIcon_Kyurem, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_L) FOOTPRINT(Kyurem) OVERWORLD( - gObjectEventPic_Kyurem, + sPicTable_Kyurem, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -12927,10 +13108,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KyuremWhite, .iconSprite = gMonIcon_KyuremWhite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-8, 14, SHADOW_SIZE_L) FOOTPRINT(Kyurem) OVERWORLD( - gObjectEventPic_KyuremWhite, + sPicTable_KyuremWhite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13004,10 +13186,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KyuremBlack, .iconSprite = gMonIcon_KyuremBlack, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_L) FOOTPRINT(Kyurem) OVERWORLD( - gObjectEventPic_KyuremBlack, + sPicTable_KyuremBlack, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13077,10 +13260,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KeldeoOrdinary, .iconSprite = gMonIcon_KeldeoOrdinary, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Keldeo) OVERWORLD( - gObjectEventPic_KeldeoOrdinary, + sPicTable_KeldeoOrdinary, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13149,6 +13333,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_KeldeoResolute, .iconSprite = gMonIcon_KeldeoResolute, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Keldeo) .isMythical = TRUE, @@ -13223,10 +13408,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_MeloettaAria, .iconSprite = gMonIcon_MeloettaAria, .iconPalIndex = 4, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_S) FOOTPRINT(Meloetta) OVERWORLD( - gObjectEventPic_MeloettaAria, + sPicTable_MeloettaAria, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13302,10 +13488,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_MeloettaPirouette, .iconSprite = gMonIcon_MeloettaPirouette, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_S) FOOTPRINT(Meloetta) OVERWORLD( - gObjectEventPic_MeloettaPirouette, + sPicTable_MeloettaPirouette, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -13369,10 +13556,11 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .shinyPalette = gMonShinyPalette_##form, \ .iconSprite = gMonIcon_Genesect, \ .iconPalIndex = 2, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(5, 13, SHADOW_SIZE_L) \ FOOTPRINT(Genesect) \ OVERWORLD( \ - gObjectEventPic_Genesect, \ + sPicTable_Genesect, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 8568bd901..5df5e2580 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -57,10 +57,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Chespin, .iconSprite = gMonIcon_Chespin, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 3, SHADOW_SIZE_S) FOOTPRINT(Chespin) OVERWORLD( - gObjectEventPic_Chespin, + sPicTable_Chespin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -127,10 +128,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Quilladin, .iconSprite = gMonIcon_Quilladin, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 4, SHADOW_SIZE_M) FOOTPRINT(Quilladin) OVERWORLD( - gObjectEventPic_Quilladin, + sPicTable_Quilladin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -194,10 +196,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Chesnaught, .iconSprite = gMonIcon_Chesnaught, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 10, SHADOW_SIZE_L) FOOTPRINT(Chesnaught) OVERWORLD( - gObjectEventPic_Chesnaught, + sPicTable_Chesnaught, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -266,10 +269,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Fennekin, .iconSprite = gMonIcon_Fennekin, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 4, SHADOW_SIZE_S) FOOTPRINT(Fennekin) OVERWORLD( - gObjectEventPic_Fennekin, + sPicTable_Fennekin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -334,10 +338,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Braixen, .iconSprite = gMonIcon_Braixen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_M) FOOTPRINT(Braixen) OVERWORLD( - gObjectEventPic_Braixen, + sPicTable_Braixen, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -405,10 +410,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Delphox, .iconSprite = gMonIcon_Delphox, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 14, SHADOW_SIZE_M) FOOTPRINT(Delphox) OVERWORLD( - gObjectEventPic_Delphox, + sPicTable_Delphox, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -477,10 +483,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Froakie, .iconSprite = gMonIcon_Froakie, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Froakie) OVERWORLD( - gObjectEventPic_Froakie, + sPicTable_Froakie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -544,10 +551,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Frogadier, .iconSprite = gMonIcon_Frogadier, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Frogadier) OVERWORLD( - gObjectEventPic_Frogadier, + sPicTable_Frogadier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -604,10 +612,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 6, SHADOW_SIZE_L) FOOTPRINT(Greninja) OVERWORLD( - gObjectEventPic_Greninja, + sPicTable_Greninja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -664,10 +673,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Greninja, .iconSprite = gMonIcon_Greninja, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 6, SHADOW_SIZE_L) FOOTPRINT(Greninja) OVERWORLD( - gObjectEventPic_Greninja, + sPicTable_Greninja, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -731,6 +741,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_GreninjaAsh, .iconSprite = gMonIcon_GreninjaAsh, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_L) FOOTPRINT(Greninja) .levelUpLearnset = sGreninjaLevelUpLearnset, @@ -791,10 +802,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Bunnelby, .iconSprite = gMonIcon_Bunnelby, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, 9, SHADOW_SIZE_S) FOOTPRINT(Bunnelby) OVERWORLD( - gObjectEventPic_Bunnelby, + sPicTable_Bunnelby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -858,10 +870,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Diggersby, .iconSprite = gMonIcon_Diggersby, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(8, 10, SHADOW_SIZE_M) FOOTPRINT(Diggersby) OVERWORLD( - gObjectEventPic_Diggersby, + sPicTable_Diggersby, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -929,10 +942,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Fletchling, .iconSprite = gMonIcon_Fletchling, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 0, SHADOW_SIZE_S) FOOTPRINT(Fletchling) OVERWORLD( - gObjectEventPic_Fletchling, + sPicTable_Fletchling, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1003,10 +1017,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Fletchinder, .iconSprite = gMonIcon_Fletchinder, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_S) FOOTPRINT(Fletchinder) OVERWORLD( - gObjectEventPic_Fletchinder, + sPicTable_Fletchinder, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1070,10 +1085,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Talonflame, .iconSprite = gMonIcon_Talonflame, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 17, SHADOW_SIZE_M) FOOTPRINT(Talonflame) OVERWORLD( - gObjectEventPic_Talonflame, + sPicTable_Talonflame, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1130,10 +1146,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Scatterbug, \ .iconSprite = gMonIcon_Scatterbug, \ .iconPalIndex = 1, \ + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, \ SHADOW(1, 1, SHADOW_SIZE_S) \ FOOTPRINT(Scatterbug) \ OVERWORLD( \ - gObjectEventPic_Scatterbug, \ + sPicTable_Scatterbug, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -1213,10 +1230,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Spewpa, \ .iconSprite = gMonIcon_Spewpa, \ .iconPalIndex = 1, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, \ SHADOW(0, 2, SHADOW_SIZE_M) \ FOOTPRINT(Spewpa) \ OVERWORLD( \ - gObjectEventPic_Spewpa, \ + sPicTable_Spewpa, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -1296,10 +1314,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Vivillon ##form, \ .iconSprite = gMonIcon_Vivillon ##form, \ .iconPalIndex = iconPal, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(0, 20, SHADOW_SIZE_M) \ FOOTPRINT(Vivillon) \ OVERWORLD( \ - gObjectEventPic_Vivillon ##form, \ + sPicTable_Vivillon ##form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -1545,10 +1564,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Litleo, .iconSprite = gMonIcon_Litleo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 3, SHADOW_SIZE_S) FOOTPRINT(Litleo) OVERWORLD( - gObjectEventPic_Litleo, + sPicTable_Litleo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1620,10 +1640,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .iconSpriteFemale = gMonIcon_PyroarF, .iconPalIndexFemale = 2, #endif //P_GENDER_DIFFERENCES + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Pyroar) OVERWORLD( - gObjectEventPic_Pyroar, + sPicTable_Pyroar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1632,7 +1653,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = gShinyOverworldPalette_Pyroar ) OVERWORLD_FEMALE( - gObjectEventPic_PyroarF, + sPicTable_PyroarF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1686,14 +1707,15 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Flabebe##Form, \ .iconSprite = gMonIcon_Flabebe##Form, \ .iconPalIndex = iconPal, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(0, 11, SHADOW_SIZE_S) \ FOOTPRINT(Flabebe) \ OVERWORLD( \ - gObjectEventPic_Flabebe##Form, \ + sPicTable_Flabebe##Form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ - sAnimTable_Following, \ + sAnimTable_Following, \ gOverworldPalette_Flabebe##Form, \ gShinyOverworldPalette_Flabebe##Form \ ) \ @@ -1775,10 +1797,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Floette ##form, \ .iconSprite = gMonIcon_Floette##form, \ .iconPalIndex = iconPal, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(-3, 12, SHADOW_SIZE_S) \ FOOTPRINT(Floette) \ OVERWORLD( \ - gObjectEventPic_Floette ##form, \ + sPicTable_Floette ##form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -1924,10 +1947,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Florges##Form, \ .iconSprite = gMonIcon_Florges##Form, \ .iconPalIndex = iconPal, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(-5, 15, SHADOW_SIZE_M) \ FOOTPRINT(Florges) \ OVERWORLD( \ - gObjectEventPic_Florges ##Form, \ + sPicTable_Florges ##Form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -2036,10 +2060,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Skiddo, .iconSprite = gMonIcon_Skiddo, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 7, SHADOW_SIZE_M) FOOTPRINT(Skiddo) OVERWORLD( - gObjectEventPic_Skiddo, + sPicTable_Skiddo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2104,10 +2129,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Gogoat, .iconSprite = gMonIcon_Gogoat, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Gogoat) OVERWORLD( - gObjectEventPic_Gogoat, + sPicTable_Gogoat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2176,10 +2202,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pancham, .iconSprite = gMonIcon_Pancham, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Pancham) OVERWORLD( - gObjectEventPic_Pancham, + sPicTable_Pancham, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2248,10 +2275,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pangoro, .iconSprite = gMonIcon_Pangoro, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Pangoro) OVERWORLD( - gObjectEventPic_Pangoro, + sPicTable_Pangoro, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2309,10 +2337,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Furfrou##_form, \ .iconSprite = gMonIcon_Furfrou##_form, \ .iconPalIndex = _iconIdx, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(3, 10, SHADOW_SIZE_XL_BATTLE_ONLY) \ FOOTPRINT(Furfrou) \ OVERWORLD( \ - gObjectEventPic_Furfrou##_form, \ + sPicTable_Furfrou##_form, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -2395,10 +2424,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Espurr, .iconSprite = gMonIcon_Espurr, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 4, SHADOW_SIZE_S) FOOTPRINT(Espurr) OVERWORLD( - gObjectEventPic_Espurr, + sPicTable_Espurr, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2460,10 +2490,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_MeowsticM, .iconSprite = gMonIcon_MeowsticM, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 11, SHADOW_SIZE_S) FOOTPRINT(Meowstic) OVERWORLD( - gObjectEventPic_MeowsticM, + sPicTable_MeowsticM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2523,10 +2554,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_MeowsticF, .iconSprite = gMonIcon_MeowsticF, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 12, SHADOW_SIZE_S) FOOTPRINT(Meowstic) OVERWORLD( - gObjectEventPic_MeowsticF, + sPicTable_MeowsticF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2593,10 +2625,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Honedge, .iconSprite = gMonIcon_Honedge, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-10, 11, SHADOW_SIZE_S) FOOTPRINT(Honedge) OVERWORLD( - gObjectEventPic_Honedge, + sPicTable_Honedge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2664,10 +2697,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Doublade, .iconSprite = gMonIcon_Doublade, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(8, 11, SHADOW_SIZE_M) FOOTPRINT(Doublade) OVERWORLD( - gObjectEventPic_Doublade, + sPicTable_Doublade, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2737,10 +2771,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AegislashShield, .iconSprite = gMonIcon_AegislashShield, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Aegislash) OVERWORLD( - gObjectEventPic_AegislashShield, + sPicTable_AegislashShield, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2814,6 +2849,7 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AegislashBlade, .iconSprite = gMonIcon_AegislashBlade, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Aegislash) .levelUpLearnset = sAegislashLevelUpLearnset, @@ -2879,10 +2915,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Spritzee, .iconSprite = gMonIcon_Spritzee, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Spritzee) OVERWORLD( - gObjectEventPic_Spritzee, + sPicTable_Spritzee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2947,10 +2984,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Aromatisse, .iconSprite = gMonIcon_Aromatisse, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_M) FOOTPRINT(Aromatisse) OVERWORLD( - gObjectEventPic_Aromatisse, + sPicTable_Aromatisse, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3019,10 +3057,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Swirlix, .iconSprite = gMonIcon_Swirlix, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -1, SHADOW_SIZE_S) FOOTPRINT(Swirlix) OVERWORLD( - gObjectEventPic_Swirlix, + sPicTable_Swirlix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3090,10 +3129,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Slurpuff, .iconSprite = gMonIcon_Slurpuff, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_M) FOOTPRINT(Slurpuff) OVERWORLD( - gObjectEventPic_Slurpuff, + sPicTable_Slurpuff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3160,10 +3200,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Inkay, .iconSprite = gMonIcon_Inkay, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_S) FOOTPRINT(Inkay) OVERWORLD( - gObjectEventPic_Inkay, + sPicTable_Inkay, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3229,10 +3270,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Malamar, .iconSprite = gMonIcon_Malamar, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 14, SHADOW_SIZE_M) FOOTPRINT(Malamar) OVERWORLD( - gObjectEventPic_Malamar, + sPicTable_Malamar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3300,10 +3342,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Binacle, .iconSprite = gMonIcon_Binacle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 5, SHADOW_SIZE_M) FOOTPRINT(Binacle) OVERWORLD( - gObjectEventPic_Binacle, + sPicTable_Binacle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3368,10 +3411,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Barbaracle, .iconSprite = gMonIcon_Barbaracle, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_L) FOOTPRINT(Barbaracle) OVERWORLD( - gObjectEventPic_Barbaracle, + sPicTable_Barbaracle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3441,10 +3485,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Skrelp, .iconSprite = gMonIcon_Skrelp, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 5, SHADOW_SIZE_S) FOOTPRINT(Skrelp) OVERWORLD( - gObjectEventPic_Skrelp, + sPicTable_Skrelp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3510,10 +3555,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Dragalge, .iconSprite = gMonIcon_Dragalge, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_M) FOOTPRINT(Dragalge) OVERWORLD( - gObjectEventPic_Dragalge, + sPicTable_Dragalge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3581,10 +3627,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Clauncher, .iconSprite = gMonIcon_Clauncher, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(4, -6, SHADOW_SIZE_M) FOOTPRINT(Clauncher) OVERWORLD( - gObjectEventPic_Clauncher, + sPicTable_Clauncher, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3655,10 +3702,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Clawitzer, .iconSprite = gMonIcon_Clawitzer, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 1, SHADOW_SIZE_L) FOOTPRINT(Clawitzer) OVERWORLD( - gObjectEventPic_Clawitzer, + sPicTable_Clawitzer, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3723,10 +3771,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Helioptile, .iconSprite = gMonIcon_Helioptile, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Helioptile) OVERWORLD( - gObjectEventPic_Helioptile, + sPicTable_Helioptile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3792,10 +3841,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Heliolisk, .iconSprite = gMonIcon_Heliolisk, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_M) FOOTPRINT(Heliolisk) OVERWORLD( - gObjectEventPic_Heliolisk, + sPicTable_Heliolisk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3861,10 +3911,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Tyrunt, .iconSprite = gMonIcon_Tyrunt, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 2, SHADOW_SIZE_M) FOOTPRINT(Tyrunt) OVERWORLD( - gObjectEventPic_Tyrunt, + sPicTable_Tyrunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3928,10 +3979,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Tyrantrum, .iconSprite = gMonIcon_Tyrantrum, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_L) FOOTPRINT(Tyrantrum) OVERWORLD( - gObjectEventPic_Tyrantrum, + sPicTable_Tyrantrum, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4003,10 +4055,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Amaura, .iconSprite = gMonIcon_Amaura, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_S) FOOTPRINT(Amaura) OVERWORLD( - gObjectEventPic_Amaura, + sPicTable_Amaura, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4070,10 +4123,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Aurorus, .iconSprite = gMonIcon_Aurorus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 14, SHADOW_SIZE_L) FOOTPRINT(Aurorus) OVERWORLD( - gObjectEventPic_Aurorus, + sPicTable_Aurorus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4143,10 +4197,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Hawlucha, .iconSprite = gMonIcon_Hawlucha, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 6, SHADOW_SIZE_S) FOOTPRINT(Hawlucha) OVERWORLD( - gObjectEventPic_Hawlucha, + sPicTable_Hawlucha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4212,10 +4267,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Dedenne, .iconSprite = gMonIcon_Dedenne, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 1, SHADOW_SIZE_S) FOOTPRINT(Dedenne) OVERWORLD( - gObjectEventPic_Dedenne, + sPicTable_Dedenne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4289,10 +4345,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Carbink, .iconSprite = gMonIcon_Carbink, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Carbink) OVERWORLD( - gObjectEventPic_Carbink, + sPicTable_Carbink, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4358,10 +4415,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Goomy, .iconSprite = gMonIcon_Goomy, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Goomy) OVERWORLD( - gObjectEventPic_Goomy, + sPicTable_Goomy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4428,10 +4486,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Sliggoo, .iconSprite = gMonIcon_Sliggoo, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 6, SHADOW_SIZE_S) FOOTPRINT(Sliggoo) OVERWORLD( - gObjectEventPic_Sliggoo, + sPicTable_Sliggoo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4499,10 +4558,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Goodra, .iconSprite = gMonIcon_Goodra, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Goodra) OVERWORLD( - gObjectEventPic_Goodra, + sPicTable_Goodra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4564,10 +4624,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_SliggooHisui, .iconSprite = gMonIcon_SliggooHisui, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 6, SHADOW_SIZE_M) FOOTPRINT(Sliggoo) OVERWORLD( - gObjectEventPic_SliggooHisui, + sPicTable_SliggooHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4630,10 +4691,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_GoodraHisui, .iconSprite = gMonIcon_GoodraHisui, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Goodra) OVERWORLD( - gObjectEventPic_GoodraHisui, + sPicTable_GoodraHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4709,10 +4771,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Klefki, .iconSprite = gMonIcon_Klefki, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Klefki) OVERWORLD( - gObjectEventPic_Klefki, + sPicTable_Klefki, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4779,10 +4842,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Phantump, .iconSprite = gMonIcon_Phantump, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Phantump) OVERWORLD( - gObjectEventPic_Phantump, + sPicTable_Phantump, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4851,10 +4915,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Trevenant, .iconSprite = gMonIcon_Trevenant, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Trevenant) OVERWORLD( - gObjectEventPic_Trevenant, + sPicTable_Trevenant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4915,10 +4980,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pumpkaboo, .iconSprite = gMonIcon_Pumpkaboo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Pumpkaboo) OVERWORLD( - gObjectEventPic_PumpkabooAverage, + sPicTable_PumpkabooAverage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4980,10 +5046,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pumpkaboo, .iconSprite = gMonIcon_Pumpkaboo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -1, SHADOW_SIZE_S) FOOTPRINT(Pumpkaboo) OVERWORLD( - gObjectEventPic_PumpkabooSmall, + sPicTable_PumpkabooSmall, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5045,10 +5112,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pumpkaboo, .iconSprite = gMonIcon_Pumpkaboo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Pumpkaboo) OVERWORLD( - gObjectEventPic_PumpkabooLarge, + sPicTable_PumpkabooLarge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5112,10 +5180,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Pumpkaboo, .iconSprite = gMonIcon_Pumpkaboo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 4, SHADOW_SIZE_S) FOOTPRINT(Pumpkaboo) OVERWORLD( - gObjectEventPic_PumpkabooSuper, + sPicTable_PumpkabooSuper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5178,10 +5247,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Gourgeist, .iconSprite = gMonIcon_Gourgeist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_M) FOOTPRINT(Gourgeist) OVERWORLD( - gObjectEventPic_GourgeistAverage, + sPicTable_GourgeistAverage, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5241,10 +5311,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Gourgeist, .iconSprite = gMonIcon_Gourgeist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 9, SHADOW_SIZE_S) FOOTPRINT(Gourgeist) OVERWORLD( - gObjectEventPic_GourgeistSmall, + sPicTable_GourgeistSmall, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5304,10 +5375,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Gourgeist, .iconSprite = gMonIcon_Gourgeist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 12, SHADOW_SIZE_M) FOOTPRINT(Gourgeist) OVERWORLD( - gObjectEventPic_GourgeistLarge, + sPicTable_GourgeistLarge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5369,10 +5441,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Gourgeist, .iconSprite = gMonIcon_Gourgeist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_M) FOOTPRINT(Gourgeist) OVERWORLD( - gObjectEventPic_GourgeistSuper, + sPicTable_GourgeistSuper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5446,10 +5519,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Bergmite, .iconSprite = gMonIcon_Bergmite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, -1, SHADOW_SIZE_S) FOOTPRINT(Bergmite) OVERWORLD( - gObjectEventPic_Bergmite, + sPicTable_Bergmite, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5516,10 +5590,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Avalugg, .iconSprite = gMonIcon_Avalugg, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, -1, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Avalugg) OVERWORLD( - gObjectEventPic_Avalugg, + sPicTable_Avalugg, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5579,10 +5654,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_AvaluggHisui, .iconSprite = gMonIcon_AvaluggHisui, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, -2, SHADOW_SIZE_L) FOOTPRINT(Avalugg) OVERWORLD( - gObjectEventPic_AvaluggHisui, + sPicTable_AvaluggHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5660,10 +5736,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Noibat, .iconSprite = gMonIcon_Noibat, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Noibat) OVERWORLD( - gObjectEventPic_Noibat, + sPicTable_Noibat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5731,10 +5808,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Noivern, .iconSprite = gMonIcon_Noivern, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 10, SHADOW_SIZE_L) FOOTPRINT(Noivern) OVERWORLD( - gObjectEventPic_Noivern, + sPicTable_Noivern, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5791,10 +5869,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_XerneasNeutral, .iconSprite = gMonIcon_XerneasNeutral, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 14, SHADOW_SIZE_M) FOOTPRINT(Xerneas) OVERWORLD( - gObjectEventPic_XerneasNeutral, + sPicTable_XerneasNeutral, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5854,10 +5933,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_XerneasActive, .iconSprite = gMonIcon_XerneasActive, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 14, SHADOW_SIZE_M) FOOTPRINT(Xerneas) OVERWORLD( - gObjectEventPic_XerneasActive, + sPicTable_XerneasActive, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5929,10 +6009,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Yveltal, .iconSprite = gMonIcon_Yveltal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_L) FOOTPRINT(Yveltal) OVERWORLD( - gObjectEventPic_Yveltal, + sPicTable_Yveltal, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5993,10 +6074,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde50, .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Zygarde) OVERWORLD( - gObjectEventPic_Zygarde50, + sPicTable_Zygarde50, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6056,10 +6138,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde50, .iconSprite = gMonIcon_Zygarde50, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Zygarde) OVERWORLD( - gObjectEventPic_Zygarde50, + sPicTable_Zygarde50, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6119,10 +6202,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde10, .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Zygarde) OVERWORLD( - gObjectEventPic_Zygarde10, + sPicTable_Zygarde10, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6183,10 +6267,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Zygarde10, .iconSprite = gMonIcon_Zygarde10, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Zygarde) OVERWORLD( - gObjectEventPic_Zygarde10, + sPicTable_Zygarde10, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6255,10 +6340,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_ZygardeComplete, .iconSprite = gMonIcon_ZygardeComplete, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Zygarde) OVERWORLD( - gObjectEventPic_ZygardeComplete, + sPicTable_ZygardeComplete, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6329,10 +6415,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Diancie, .iconSprite = gMonIcon_Diancie, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Diancie) OVERWORLD( - gObjectEventPic_Diancie, + sPicTable_Diancie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6398,11 +6485,12 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_DiancieMega, .iconSprite = gMonIcon_DiancieMega, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Diancie) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_DiancieMega, + sPicTable_DiancieMega, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6482,10 +6570,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_HoopaConfined, .iconSprite = gMonIcon_HoopaConfined, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Hoopa) OVERWORLD( - gObjectEventPic_HoopaConfined, + sPicTable_HoopaConfined, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6553,10 +6642,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_HoopaUnbound, .iconSprite = gMonIcon_HoopaUnbound, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 14, SHADOW_SIZE_L) FOOTPRINT(Hoopa) OVERWORLD( - gObjectEventPic_HoopaUnbound, + sPicTable_HoopaUnbound, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6625,10 +6715,11 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = .shinyPalette = gMonShinyPalette_Volcanion, .iconSprite = gMonIcon_Volcanion, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Volcanion) OVERWORLD( - gObjectEventPic_Volcanion, + sPicTable_Volcanion, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index 269ddf29a..b27692340 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -54,10 +54,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Rowlet, .iconSprite = gMonIcon_Rowlet, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 1, SHADOW_SIZE_S) FOOTPRINT(Rowlet) OVERWORLD( - gObjectEventPic_Rowlet, + sPicTable_Rowlet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -122,10 +123,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Dartrix, .iconSprite = gMonIcon_Dartrix, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Dartrix) OVERWORLD( - gObjectEventPic_Dartrix, + sPicTable_Dartrix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -189,10 +191,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Decidueye, .iconSprite = gMonIcon_Decidueye, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Decidueye) OVERWORLD( - gObjectEventPic_Decidueye, + sPicTable_Decidueye, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -253,10 +256,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_DecidueyeHisui, .iconSprite = gMonIcon_DecidueyeHisui, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_L) FOOTPRINT(Decidueye) OVERWORLD( - gObjectEventPic_DecidueyeHisui, + sPicTable_DecidueyeHisui, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -320,10 +324,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Litten, .iconSprite = gMonIcon_Litten, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 1, SHADOW_SIZE_S) FOOTPRINT(Litten) OVERWORLD( - gObjectEventPic_Litten, + sPicTable_Litten, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -384,10 +389,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Torracat, .iconSprite = gMonIcon_Torracat, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(5, 7, SHADOW_SIZE_M) FOOTPRINT(Torracat) OVERWORLD( - gObjectEventPic_Torracat, + sPicTable_Torracat, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -447,10 +453,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Incineroar, .iconSprite = gMonIcon_Incineroar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_L) FOOTPRINT(Incineroar) OVERWORLD( - gObjectEventPic_Incineroar, + sPicTable_Incineroar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -511,10 +518,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Popplio, .iconSprite = gMonIcon_Popplio, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Popplio) OVERWORLD( - gObjectEventPic_Popplio, + sPicTable_Popplio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -575,10 +583,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Brionne, .iconSprite = gMonIcon_Brionne, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-5, 6, SHADOW_SIZE_M) FOOTPRINT(Brionne) OVERWORLD( - gObjectEventPic_Brionne, + sPicTable_Brionne, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -638,10 +647,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Primarina, .iconSprite = gMonIcon_Primarina, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 11, SHADOW_SIZE_L) FOOTPRINT(Primarina) OVERWORLD( - gObjectEventPic_Primarina, + sPicTable_Primarina, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -707,10 +717,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Pikipek, .iconSprite = gMonIcon_Pikipek, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Pikipek) OVERWORLD( - gObjectEventPic_Pikipek, + sPicTable_Pikipek, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -777,10 +788,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Trumbeak, .iconSprite = gMonIcon_Trumbeak, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 8, SHADOW_SIZE_S) FOOTPRINT(Trumbeak) OVERWORLD( - gObjectEventPic_Trumbeak, + sPicTable_Trumbeak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -844,10 +856,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Toucannon, .iconSprite = gMonIcon_Toucannon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(9, 12, SHADOW_SIZE_M) FOOTPRINT(Toucannon) OVERWORLD( - gObjectEventPic_Toucannon, + sPicTable_Toucannon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -909,10 +922,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Yungoos, .iconSprite = gMonIcon_Yungoos, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-9, 1, SHADOW_SIZE_M) FOOTPRINT(Yungoos) OVERWORLD( - gObjectEventPic_Yungoos, + sPicTable_Yungoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -970,10 +984,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Gumshoos, .iconSprite = gMonIcon_Gumshoos, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Gumshoos) OVERWORLD( - gObjectEventPic_Gumshoos, + sPicTable_Gumshoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1030,10 +1045,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Gumshoos, .iconSprite = gMonIcon_Gumshoos, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_M) FOOTPRINT(Gumshoos) OVERWORLD( - gObjectEventPic_Gumshoos, + sPicTable_Gumshoos, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1097,10 +1113,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Grubbin, .iconSprite = gMonIcon_Grubbin, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -4, SHADOW_SIZE_M) FOOTPRINT(Grubbin) OVERWORLD( - gObjectEventPic_Grubbin, + sPicTable_Grubbin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1166,10 +1183,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Charjabug, .iconSprite = gMonIcon_Charjabug, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, NO_SHADOW FOOTPRINT(Charjabug) OVERWORLD( - gObjectEventPic_Charjabug, + sPicTable_Charjabug, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1228,10 +1246,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Vikavolt, .iconSprite = gMonIcon_Vikavolt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 16, SHADOW_SIZE_S) FOOTPRINT(Vikavolt) OVERWORLD( - gObjectEventPic_Vikavolt, + sPicTable_Vikavolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1296,10 +1315,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Vikavolt, .iconSprite = gMonIcon_Vikavolt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 16, SHADOW_SIZE_S) FOOTPRINT(Vikavolt) OVERWORLD( - gObjectEventPic_Vikavolt, + sPicTable_Vikavolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1364,10 +1384,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Crabrawler, .iconSprite = gMonIcon_Crabrawler, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(7, 6, SHADOW_SIZE_M) FOOTPRINT(Crabrawler) OVERWORLD( - gObjectEventPic_Crabrawler, + sPicTable_Crabrawler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1430,10 +1451,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Crabominable, .iconSprite = gMonIcon_Crabominable, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 14, SHADOW_SIZE_L) FOOTPRINT(Crabominable) OVERWORLD( - gObjectEventPic_Crabominable, + sPicTable_Crabominable, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1495,10 +1517,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_OricorioBaile, .iconSprite = gMonIcon_OricorioBaile, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 9, SHADOW_SIZE_S) FOOTPRINT(Oricorio) OVERWORLD( - gObjectEventPic_OricorioBaile, + sPicTable_OricorioBaile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1561,10 +1584,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_OricorioPomPom, .iconSprite = gMonIcon_OricorioPomPom, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 8, SHADOW_SIZE_S) FOOTPRINT(Oricorio) OVERWORLD( - gObjectEventPic_OricorioPomPom, + sPicTable_OricorioPomPom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1627,10 +1651,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_OricorioPau, .iconSprite = gMonIcon_OricorioPau, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 11, SHADOW_SIZE_S) FOOTPRINT(Oricorio) OVERWORLD( - gObjectEventPic_OricorioPau, + sPicTable_OricorioPau, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1693,10 +1718,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_OricorioSensu, .iconSprite = gMonIcon_OricorioSensu, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 10, SHADOW_SIZE_S) FOOTPRINT(Oricorio) OVERWORLD( - gObjectEventPic_OricorioSensu, + sPicTable_OricorioSensu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1795,10 +1821,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Cutiefly, .iconSprite = gMonIcon_Cutiefly, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Cutiefly) OVERWORLD( - gObjectEventPic_Cutiefly, + sPicTable_Cutiefly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1858,10 +1885,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Ribombee, .iconSprite = gMonIcon_Ribombee, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Ribombee) OVERWORLD( - gObjectEventPic_Ribombee, + sPicTable_Ribombee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1919,10 +1947,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Ribombee, .iconSprite = gMonIcon_Ribombee, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Ribombee) OVERWORLD( - gObjectEventPic_Ribombee, + sPicTable_Ribombee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1982,10 +2011,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Rockruff, .iconSprite = gMonIcon_Rockruff, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Rockruff) OVERWORLD( - gObjectEventPic_Rockruff, + sPicTable_Rockruff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2044,10 +2074,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Rockruff, .iconSprite = gMonIcon_Rockruff, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Rockruff) OVERWORLD( - gObjectEventPic_Rockruff, + sPicTable_Rockruff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2112,10 +2143,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_LycanrocMidday, .iconSprite = gMonIcon_LycanrocMidday, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_L) FOOTPRINT(Lycanroc) OVERWORLD( - gObjectEventPic_LycanrocMidday, + sPicTable_LycanrocMidday, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2178,10 +2210,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_LycanrocMidnight, .iconSprite = gMonIcon_LycanrocMidnight, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 13, SHADOW_SIZE_L) FOOTPRINT(Lycanroc) OVERWORLD( - gObjectEventPic_LycanrocMidnight, + sPicTable_LycanrocMidnight, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2244,10 +2277,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_LycanrocDusk, .iconSprite = gMonIcon_LycanrocDusk, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 7, SHADOW_SIZE_L) FOOTPRINT(Lycanroc) OVERWORLD( - gObjectEventPic_LycanrocDusk, + sPicTable_LycanrocDusk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2310,10 +2344,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_WishiwashiSolo, .iconSprite = gMonIcon_WishiwashiSolo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 3, SHADOW_SIZE_S) FOOTPRINT(Wishiwashi) OVERWORLD( - gObjectEventPic_WishiwashiSolo, + sPicTable_WishiwashiSolo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2375,6 +2410,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_WishiwashiSchool, .iconSprite = gMonIcon_WishiwashiSchool, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 7, SHADOW_SIZE_L) FOOTPRINT(Wishiwashi) .levelUpLearnset = sWishiwashiLevelUpLearnset, @@ -2434,10 +2470,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Mareanie, .iconSprite = gMonIcon_Mareanie, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Mareanie) OVERWORLD( - gObjectEventPic_Mareanie, + sPicTable_Mareanie, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2499,10 +2536,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Toxapex, .iconSprite = gMonIcon_Toxapex, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Toxapex) OVERWORLD( - gObjectEventPic_Toxapex, + sPicTable_Toxapex, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2564,10 +2602,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Mudbray, .iconSprite = gMonIcon_Mudbray, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 6, SHADOW_SIZE_M) FOOTPRINT(Mudbray) OVERWORLD( - gObjectEventPic_Mudbray, + sPicTable_Mudbray, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2629,10 +2668,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Mudsdale, .iconSprite = gMonIcon_Mudsdale, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 13, SHADOW_SIZE_L) FOOTPRINT(Mudsdale) OVERWORLD( - gObjectEventPic_Mudsdale, + sPicTable_Mudsdale, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2701,10 +2741,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Dewpider, .iconSprite = gMonIcon_Dewpider, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 2, SHADOW_SIZE_S) FOOTPRINT(Dewpider) OVERWORLD( - gObjectEventPic_Dewpider, + sPicTable_Dewpider, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2763,10 +2804,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Araquanid, .iconSprite = gMonIcon_Araquanid, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Araquanid) OVERWORLD( - gObjectEventPic_Araquanid, + sPicTable_Araquanid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2823,10 +2865,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Araquanid, .iconSprite = gMonIcon_Araquanid, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_S) FOOTPRINT(Araquanid) OVERWORLD( - gObjectEventPic_Araquanid, + sPicTable_Araquanid, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2891,10 +2934,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Fomantis, .iconSprite = gMonIcon_Fomantis, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 3, SHADOW_SIZE_S) FOOTPRINT(Fomantis) OVERWORLD( - gObjectEventPic_Fomantis, + sPicTable_Fomantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2953,10 +2997,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Lurantis, .iconSprite = gMonIcon_Lurantis, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Lurantis) OVERWORLD( - gObjectEventPic_Lurantis, + sPicTable_Lurantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3013,10 +3058,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Lurantis, .iconSprite = gMonIcon_Lurantis, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Lurantis) OVERWORLD( - gObjectEventPic_Lurantis, + sPicTable_Lurantis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3082,10 +3128,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Morelull, .iconSprite = gMonIcon_Morelull, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 4, SHADOW_SIZE_S) FOOTPRINT(Morelull) OVERWORLD( - gObjectEventPic_Morelull, + sPicTable_Morelull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3148,10 +3195,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Shiinotic, .iconSprite = gMonIcon_Shiinotic, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_S) FOOTPRINT(Shiinotic) OVERWORLD( - gObjectEventPic_Shiinotic, + sPicTable_Shiinotic, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3217,10 +3265,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Salandit, .iconSprite = gMonIcon_Salandit, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(3, 1, SHADOW_SIZE_M) FOOTPRINT(Salandit) OVERWORLD( - gObjectEventPic_Salandit, + sPicTable_Salandit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3279,10 +3328,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Salazzle, .iconSprite = gMonIcon_Salazzle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Salazzle) OVERWORLD( - gObjectEventPic_Salazzle, + sPicTable_Salazzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3339,10 +3389,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Salazzle, .iconSprite = gMonIcon_Salazzle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Salazzle) OVERWORLD( - gObjectEventPic_Salazzle, + sPicTable_Salazzle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3410,10 +3461,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Stufful, .iconSprite = gMonIcon_Stufful, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Stufful) OVERWORLD( - gObjectEventPic_Stufful, + sPicTable_Stufful, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3478,10 +3530,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Bewear, .iconSprite = gMonIcon_Bewear, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Bewear) OVERWORLD( - gObjectEventPic_Bewear, + sPicTable_Bewear, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3543,10 +3596,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Bounsweet, .iconSprite = gMonIcon_Bounsweet, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, -3, SHADOW_SIZE_S) FOOTPRINT(Bounsweet) OVERWORLD( - gObjectEventPic_Bounsweet, + sPicTable_Bounsweet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3609,10 +3663,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Steenee, .iconSprite = gMonIcon_Steenee, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 7, SHADOW_SIZE_S) FOOTPRINT(Steenee) OVERWORLD( - gObjectEventPic_Steenee, + sPicTable_Steenee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3674,10 +3729,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Tsareena, .iconSprite = gMonIcon_Tsareena, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_M) FOOTPRINT(Tsareena) OVERWORLD( - gObjectEventPic_Tsareena, + sPicTable_Tsareena, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3741,10 +3797,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Comfey, .iconSprite = gMonIcon_Comfey, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_M) FOOTPRINT(Comfey) OVERWORLD( - gObjectEventPic_Comfey, + sPicTable_Comfey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3809,10 +3866,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Oranguru, .iconSprite = gMonIcon_Oranguru, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 6, SHADOW_SIZE_M) FOOTPRINT(Oranguru) OVERWORLD( - gObjectEventPic_Oranguru, + sPicTable_Oranguru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3877,10 +3935,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Passimian, .iconSprite = gMonIcon_Passimian, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 12, SHADOW_SIZE_L) FOOTPRINT(Passimian) OVERWORLD( - gObjectEventPic_Passimian, + sPicTable_Passimian, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3946,10 +4005,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Wimpod, .iconSprite = gMonIcon_Wimpod, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-4, -3, SHADOW_SIZE_S) FOOTPRINT(Wimpod) OVERWORLD( - gObjectEventPic_Wimpod, + sPicTable_Wimpod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4014,10 +4074,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Golisopod, .iconSprite = gMonIcon_Golisopod, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_L) FOOTPRINT(Golisopod) OVERWORLD( - gObjectEventPic_Golisopod, + sPicTable_Golisopod, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4079,10 +4140,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Sandygast, .iconSprite = gMonIcon_Sandygast, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Sandygast) OVERWORLD( - gObjectEventPic_Sandygast, + sPicTable_Sandygast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4144,10 +4206,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Palossand, .iconSprite = gMonIcon_Palossand, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Palossand) OVERWORLD( - gObjectEventPic_Palossand, + sPicTable_Palossand, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4212,10 +4275,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Pyukumuku, .iconSprite = gMonIcon_Pyukumuku, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, -3, SHADOW_SIZE_S) FOOTPRINT(Pyukumuku) OVERWORLD( - gObjectEventPic_Pyukumuku, + sPicTable_Pyukumuku, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4277,10 +4341,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_TypeNull, .iconSprite = gMonIcon_TypeNull, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Type_Null) OVERWORLD( - gObjectEventPic_TypeNull, + sPicTable_TypeNull, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4340,10 +4405,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Silvally##_palette, \ .iconSprite = gMonIcon_Silvally, \ .iconPalIndex = 0, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(1, 13, SHADOW_SIZE_L) \ FOOTPRINT(Silvally) \ OVERWORLD( \ - gObjectEventPic_Silvally, \ + sPicTable_Silvally, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -4433,9 +4499,10 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MiniorMeteor, \ .iconSprite = gMonIcon_MiniorMeteor, \ .iconPalIndex = 0, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(0, 14, SHADOW_SIZE_S) \ OVERWORLD( \ - gObjectEventPic_MiniorMeteor, \ + sPicTable_MiniorMeteor, \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -4471,6 +4538,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MiniorCore, \ .iconSprite = gMonIcon_MiniorCore##Form, \ .iconPalIndex = iconPal, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ SHADOW(-2, 12, SHADOW_SIZE_S) \ .formChangeTable = sMinior ##Form##FormChangeTable, \ MINIOR_MISC_INFO(color), \ @@ -4540,10 +4608,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Komala, .iconSprite = gMonIcon_Komala, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 0, SHADOW_SIZE_S) FOOTPRINT(Komala) OVERWORLD( - gObjectEventPic_Komala, + sPicTable_Komala, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4610,10 +4679,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Turtonator, .iconSprite = gMonIcon_Turtonator, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 12, SHADOW_SIZE_L) FOOTPRINT(Turtonator) OVERWORLD( - gObjectEventPic_Turtonator, + sPicTable_Turtonator, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4672,10 +4742,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Togedemaru, .iconSprite = gMonIcon_Togedemaru, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 4, SHADOW_SIZE_S) FOOTPRINT(Togedemaru) OVERWORLD( - gObjectEventPic_Togedemaru, + sPicTable_Togedemaru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4733,10 +4804,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Togedemaru, .iconSprite = gMonIcon_Togedemaru, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 4, SHADOW_SIZE_S) FOOTPRINT(Togedemaru) OVERWORLD( - gObjectEventPic_Togedemaru, + sPicTable_Togedemaru, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4798,10 +4870,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuDisguised, .iconSprite = gMonIcon_MimikyuDisguised, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Mimikyu) OVERWORLD( - gObjectEventPic_MimikyuDisguised, + sPicTable_MimikyuDisguised, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4860,6 +4933,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuBusted, .iconSprite = gMonIcon_MimikyuBusted, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Mimikyu) .levelUpLearnset = sMimikyuLevelUpLearnset, @@ -4913,10 +4987,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuDisguised, .iconSprite = gMonIcon_MimikyuDisguised, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Mimikyu) OVERWORLD( - gObjectEventPic_MimikyuDisguised, + sPicTable_MimikyuDisguised, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4977,6 +5052,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MimikyuBusted, .iconSprite = gMonIcon_MimikyuBusted, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Mimikyu) .isTotem = TRUE, @@ -5038,10 +5114,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Bruxish, .iconSprite = gMonIcon_Bruxish, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Bruxish) OVERWORLD( - gObjectEventPic_Bruxish, + sPicTable_Bruxish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5107,10 +5184,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Drampa, .iconSprite = gMonIcon_Drampa, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Drampa) OVERWORLD( - gObjectEventPic_Drampa, + sPicTable_Drampa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5174,10 +5252,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Dhelmise, .iconSprite = gMonIcon_Dhelmise, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_M) FOOTPRINT(Dhelmise) OVERWORLD( - gObjectEventPic_Dhelmise, + sPicTable_Dhelmise, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5242,10 +5321,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_JangmoO, .iconSprite = gMonIcon_JangmoO, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(JangmoO) OVERWORLD( - gObjectEventPic_JangmoO, + sPicTable_JangmoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5310,10 +5390,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_HakamoO, .iconSprite = gMonIcon_HakamoO, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_M) FOOTPRINT(HakamoO) OVERWORLD( - gObjectEventPic_HakamoO, + sPicTable_HakamoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5371,10 +5452,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_KommoO, .iconSprite = gMonIcon_KommoO, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(KommoO) OVERWORLD( - gObjectEventPic_KommoO, + sPicTable_KommoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5437,10 +5519,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_KommoO, .iconSprite = gMonIcon_KommoO, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(KommoO) OVERWORLD( - gObjectEventPic_KommoO, + sPicTable_KommoO, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5513,10 +5596,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_TapuKoko, .iconSprite = gMonIcon_TapuKoko, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 19, SHADOW_SIZE_M) FOOTPRINT(TapuKoko) OVERWORLD( - gObjectEventPic_TapuKoko, + sPicTable_TapuKoko, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5584,10 +5668,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_TapuLele, .iconSprite = gMonIcon_TapuLele, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(TapuLele) OVERWORLD( - gObjectEventPic_TapuLele, + sPicTable_TapuLele, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5657,10 +5742,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_TapuBulu, .iconSprite = gMonIcon_TapuBulu, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 16, SHADOW_SIZE_M) FOOTPRINT(TapuBulu) OVERWORLD( - gObjectEventPic_TapuBulu, + sPicTable_TapuBulu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5729,10 +5815,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_TapuFini, .iconSprite = gMonIcon_TapuFini, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 15, SHADOW_SIZE_M) FOOTPRINT(TapuFini) OVERWORLD( - gObjectEventPic_TapuFini, + sPicTable_TapuFini, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5796,10 +5883,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Cosmog, .iconSprite = gMonIcon_Cosmog, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_S) FOOTPRINT(Cosmog) OVERWORLD( - gObjectEventPic_Cosmog, + sPicTable_Cosmog, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5865,10 +5953,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Cosmoem, .iconSprite = gMonIcon_Cosmoem, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Cosmoem) OVERWORLD( - gObjectEventPic_Cosmoem, + sPicTable_Cosmoem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5933,10 +6022,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Solgaleo, .iconSprite = gMonIcon_Solgaleo, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Solgaleo) OVERWORLD( - gObjectEventPic_Solgaleo, + sPicTable_Solgaleo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5999,10 +6089,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Lunala, .iconSprite = gMonIcon_Lunala, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 17, SHADOW_SIZE_L) FOOTPRINT(Lunala) OVERWORLD( - gObjectEventPic_Lunala, + sPicTable_Lunala, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6067,10 +6158,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Nihilego, .iconSprite = gMonIcon_Nihilego, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_S) FOOTPRINT(Nihilego) OVERWORLD( - gObjectEventPic_Nihilego, + sPicTable_Nihilego, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6134,10 +6226,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Buzzwole, .iconSprite = gMonIcon_Buzzwole, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Buzzwole) OVERWORLD( - gObjectEventPic_Buzzwole, + sPicTable_Buzzwole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6200,10 +6293,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Pheromosa, .iconSprite = gMonIcon_Pheromosa, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_S) FOOTPRINT(Pheromosa) OVERWORLD( - gObjectEventPic_Pheromosa, + sPicTable_Pheromosa, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6266,10 +6360,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Xurkitree, .iconSprite = gMonIcon_Xurkitree, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Xurkitree) OVERWORLD( - gObjectEventPic_Xurkitree, + sPicTable_Xurkitree, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6334,10 +6429,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Celesteela, .iconSprite = gMonIcon_Celesteela, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_M) FOOTPRINT(Celesteela) OVERWORLD( - gObjectEventPic_Celesteela, + sPicTable_Celesteela, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6401,10 +6497,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Kartana, .iconSprite = gMonIcon_Kartana, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_M) FOOTPRINT(Kartana) OVERWORLD( - gObjectEventPic_Kartana, + sPicTable_Kartana, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6467,10 +6564,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Guzzlord, .iconSprite = gMonIcon_Guzzlord, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Guzzlord) OVERWORLD( - gObjectEventPic_Guzzlord, + sPicTable_Guzzlord, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6536,10 +6634,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Necrozma, .iconSprite = gMonIcon_Necrozma, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 15, SHADOW_SIZE_M) FOOTPRINT(Necrozma) OVERWORLD( - gObjectEventPic_Necrozma, + sPicTable_Necrozma, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6604,10 +6703,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaDuskMane, .iconSprite = gMonIcon_NecrozmaDuskMane, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Necrozma) OVERWORLD( - gObjectEventPic_NecrozmaDuskMane, + sPicTable_NecrozmaDuskMane, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6674,10 +6774,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaDawnWings, .iconSprite = gMonIcon_NecrozmaDawnWings, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 17, SHADOW_SIZE_L) FOOTPRINT(Necrozma) OVERWORLD( - gObjectEventPic_NecrozmaDawnWings, + sPicTable_NecrozmaDawnWings, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6747,11 +6848,12 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_NecrozmaUltra, .iconSprite = gMonIcon_NecrozmaUltra, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 16, SHADOW_SIZE_L) FOOTPRINT(Necrozma) #if OW_BATTLE_ONLY_FORMS OVERWORLD( - gObjectEventPic_NecrozmaUltra, + sPicTable_NecrozmaUltra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6821,10 +6923,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Magearna, .iconSprite = gMonIcon_Magearna, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Magearna) OVERWORLD( - gObjectEventPic_Magearna, + sPicTable_Magearna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6886,10 +6989,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MagearnaOriginal, .iconSprite = gMonIcon_MagearnaOriginal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Magearna) OVERWORLD( - gObjectEventPic_MagearnaOriginal, + sPicTable_MagearnaOriginal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6960,10 +7064,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Marshadow, .iconSprite = gMonIcon_Marshadow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Marshadow) OVERWORLD( - gObjectEventPic_Marshadow, + sPicTable_Marshadow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7027,10 +7132,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Poipole, .iconSprite = gMonIcon_Poipole, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Poipole) OVERWORLD( - gObjectEventPic_Poipole, + sPicTable_Poipole, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7092,10 +7198,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Naganadel, .iconSprite = gMonIcon_Naganadel, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(7, 17, SHADOW_SIZE_M) FOOTPRINT(Naganadel) OVERWORLD( - gObjectEventPic_Naganadel, + sPicTable_Naganadel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7158,10 +7265,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Stakataka, .iconSprite = gMonIcon_Stakataka, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 15, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Stakataka) OVERWORLD( - gObjectEventPic_Stakataka, + sPicTable_Stakataka, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7224,10 +7332,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Blacephalon, .iconSprite = gMonIcon_Blacephalon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Blacephalon) OVERWORLD( - gObjectEventPic_Blacephalon, + sPicTable_Blacephalon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7289,10 +7398,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Zeraora, .iconSprite = gMonIcon_Zeraora, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Zeraora) OVERWORLD( - gObjectEventPic_Zeraora, + sPicTable_Zeraora, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7355,10 +7465,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Meltan, .iconSprite = gMonIcon_Meltan, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 2, SHADOW_SIZE_S) FOOTPRINT(Meltan) OVERWORLD( - gObjectEventPic_Meltan, + sPicTable_Meltan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7397,7 +7508,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .natDexNum = NATIONAL_DEX_MELMETAL, .categoryName = _("Hex Nut"), .height = 25, - .weight = 800, + .weight = 8000, .description = COMPOUND_STRING( "Revered long ago for its capacity to\n" "create iron from nothing, for some reason\n" @@ -7419,10 +7530,11 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_Melmetal, .iconSprite = gMonIcon_Melmetal, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 10, SHADOW_SIZE_L) FOOTPRINT(Melmetal) OVERWORLD( - gObjectEventPic_Melmetal, + sPicTable_Melmetal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7487,6 +7599,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .shinyPalette = gMonShinyPalette_MelmetalGmax, .iconSprite = gMonIcon_MelmetalGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Melmetal) .isMythical = TRUE, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 9898b4da9..f803864cf 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -51,10 +51,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Grookey, .iconSprite = gMonIcon_Grookey, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 1, SHADOW_SIZE_S) FOOTPRINT(Grookey) OVERWORLD( - gObjectEventPic_Grookey, + sPicTable_Grookey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -114,10 +115,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Thwackey, .iconSprite = gMonIcon_Thwackey, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(5, 6, SHADOW_SIZE_M) FOOTPRINT(Thwackey) OVERWORLD( - gObjectEventPic_Thwackey, + sPicTable_Thwackey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -176,10 +178,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Rillaboom, .iconSprite = gMonIcon_Rillaboom, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_L) FOOTPRINT(Rillaboom) OVERWORLD( - gObjectEventPic_Rillaboom, + sPicTable_Rillaboom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -240,6 +243,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_RillaboomGmax, .iconSprite = gMonIcon_RillaboomGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Rillaboom) .isGigantamax = TRUE, @@ -299,10 +303,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Scorbunny, .iconSprite = gMonIcon_Scorbunny, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, 6, SHADOW_SIZE_S) FOOTPRINT(Scorbunny) OVERWORLD( - gObjectEventPic_Scorbunny, + sPicTable_Scorbunny, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -362,10 +367,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Raboot, .iconSprite = gMonIcon_Raboot, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-4, 5, SHADOW_SIZE_S) FOOTPRINT(Raboot) OVERWORLD( - gObjectEventPic_Raboot, + sPicTable_Raboot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -425,10 +431,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Cinderace, .iconSprite = gMonIcon_Cinderace, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Cinderace) OVERWORLD( - gObjectEventPic_Cinderace, + sPicTable_Cinderace, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -490,6 +497,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CinderaceGmax, .iconSprite = gMonIcon_CinderaceGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Cinderace) .isGigantamax = TRUE, @@ -550,10 +558,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sobble, .iconSprite = gMonIcon_Sobble, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 3, SHADOW_SIZE_S) FOOTPRINT(Sobble) OVERWORLD( - gObjectEventPic_Sobble, + sPicTable_Sobble, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -613,10 +622,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Drizzile, .iconSprite = gMonIcon_Drizzile, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 5, SHADOW_SIZE_M) FOOTPRINT(Drizzile) OVERWORLD( - gObjectEventPic_Drizzile, + sPicTable_Drizzile, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -676,10 +686,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Inteleon, .iconSprite = gMonIcon_Inteleon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_S) FOOTPRINT(Inteleon) OVERWORLD( - gObjectEventPic_Inteleon, + sPicTable_Inteleon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -741,6 +752,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_InteleonGmax, .iconSprite = gMonIcon_InteleonGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_L) FOOTPRINT(Inteleon) .isGigantamax = TRUE, @@ -800,10 +812,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Skwovet, .iconSprite = gMonIcon_Skwovet, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-7, 5, SHADOW_SIZE_S) FOOTPRINT(Skwovet) OVERWORLD( - gObjectEventPic_Skwovet, + sPicTable_Skwovet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -865,10 +878,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Greedent, .iconSprite = gMonIcon_Greedent, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-11, 10, SHADOW_SIZE_M) FOOTPRINT(Greedent) OVERWORLD( - gObjectEventPic_Greedent, + sPicTable_Greedent, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -937,10 +951,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Rookidee, .iconSprite = gMonIcon_Rookidee, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -3, SHADOW_SIZE_S) FOOTPRINT(Rookidee) OVERWORLD( - gObjectEventPic_Rookidee, + sPicTable_Rookidee, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1010,10 +1025,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Corvisquire, .iconSprite = gMonIcon_Corvisquire, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 16, SHADOW_SIZE_S) FOOTPRINT(Corvisquire) OVERWORLD( - gObjectEventPic_Corvisquire, + sPicTable_Corvisquire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1077,10 +1093,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Corviknight, .iconSprite = gMonIcon_Corviknight, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Corviknight) OVERWORLD( - gObjectEventPic_Corviknight, + sPicTable_Corviknight, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1142,6 +1159,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CorviknightGmax, .iconSprite = gMonIcon_CorviknightGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_L) FOOTPRINT(Corviknight) .isGigantamax = TRUE, @@ -1200,10 +1218,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Blipbug, .iconSprite = gMonIcon_Blipbug, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 1, SHADOW_SIZE_S) FOOTPRINT(Blipbug) OVERWORLD( - gObjectEventPic_Blipbug, + sPicTable_Blipbug, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1266,10 +1285,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dottler, .iconSprite = gMonIcon_Dottler, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 0, SHADOW_SIZE_M) FOOTPRINT(Dottler) OVERWORLD( - gObjectEventPic_Dottler, + sPicTable_Dottler, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1331,10 +1351,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Orbeetle, .iconSprite = gMonIcon_Orbeetle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_M) FOOTPRINT(Orbeetle) OVERWORLD( - gObjectEventPic_Orbeetle, + sPicTable_Orbeetle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1397,6 +1418,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_OrbeetleGmax, .iconSprite = gMonIcon_OrbeetleGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Orbeetle) .isGigantamax = TRUE, @@ -1456,10 +1478,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Nickit, .iconSprite = gMonIcon_Nickit, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 4, SHADOW_SIZE_M) FOOTPRINT(Nickit) OVERWORLD( - gObjectEventPic_Nickit, + sPicTable_Nickit, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1520,10 +1543,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Thievul, .iconSprite = gMonIcon_Thievul, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-9, 7, SHADOW_SIZE_M) FOOTPRINT(Thievul) OVERWORLD( - gObjectEventPic_Thievul, + sPicTable_Thievul, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1584,10 +1608,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Gossifleur, .iconSprite = gMonIcon_Gossifleur, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Gossifleur) OVERWORLD( - gObjectEventPic_Gossifleur, + sPicTable_Gossifleur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1648,10 +1673,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Eldegoss, .iconSprite = gMonIcon_Eldegoss, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, 8, SHADOW_SIZE_S) FOOTPRINT(Eldegoss) OVERWORLD( - gObjectEventPic_Eldegoss, + sPicTable_Eldegoss, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1712,10 +1738,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Wooloo, .iconSprite = gMonIcon_Wooloo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, 1, SHADOW_SIZE_S) FOOTPRINT(Wooloo) OVERWORLD( - gObjectEventPic_Wooloo, + sPicTable_Wooloo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1776,10 +1803,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dubwool, .iconSprite = gMonIcon_Dubwool, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_M) FOOTPRINT(Dubwool) OVERWORLD( - gObjectEventPic_Dubwool, + sPicTable_Dubwool, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1843,10 +1871,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Chewtle, .iconSprite = gMonIcon_Chewtle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(3, 1, SHADOW_SIZE_S) FOOTPRINT(Chewtle) OVERWORLD( - gObjectEventPic_Chewtle, + sPicTable_Chewtle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1910,10 +1939,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Drednaw, .iconSprite = gMonIcon_Drednaw, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 4, SHADOW_SIZE_L) FOOTPRINT(Drednaw) OVERWORLD( - gObjectEventPic_Drednaw, + sPicTable_Drednaw, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1975,6 +2005,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_DrednawGmax, .iconSprite = gMonIcon_DrednawGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Drednaw) .isGigantamax = TRUE, @@ -2034,10 +2065,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Yamper, .iconSprite = gMonIcon_Yamper, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 2, SHADOW_SIZE_M) FOOTPRINT(Yamper) OVERWORLD( - gObjectEventPic_Yamper, + sPicTable_Yamper, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2098,10 +2130,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Boltund, .iconSprite = gMonIcon_Boltund, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Boltund) OVERWORLD( - gObjectEventPic_Boltund, + sPicTable_Boltund, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2162,10 +2195,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Rolycoly, .iconSprite = gMonIcon_Rolycoly, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -3, SHADOW_SIZE_S) FOOTPRINT(Rolycoly) OVERWORLD( - gObjectEventPic_Rolycoly, + sPicTable_Rolycoly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2225,10 +2259,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Carkol, .iconSprite = gMonIcon_Carkol, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_M) FOOTPRINT(Carkol) OVERWORLD( - gObjectEventPic_Carkol, + sPicTable_Carkol, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2288,10 +2323,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Coalossal, .iconSprite = gMonIcon_Coalossal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_L) FOOTPRINT(Coalossal) OVERWORLD( - gObjectEventPic_Coalossal, + sPicTable_Coalossal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2353,6 +2389,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CoalossalGmax, .iconSprite = gMonIcon_CoalossalGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Coalossal) .isGigantamax = TRUE, @@ -2412,10 +2449,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Applin, .iconSprite = gMonIcon_Applin, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, -3, SHADOW_SIZE_S) FOOTPRINT(Applin) OVERWORLD( - gObjectEventPic_Applin, + sPicTable_Applin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2479,10 +2517,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Flapple, .iconSprite = gMonIcon_Flapple, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 11, SHADOW_SIZE_S) FOOTPRINT(Flapple) OVERWORLD( - gObjectEventPic_Flapple, + sPicTable_Flapple, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2544,6 +2583,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_FlappleGmax, .iconSprite = gMonIcon_FlappleGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Flapple) .isGigantamax = TRUE, @@ -2600,10 +2640,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Appletun, .iconSprite = gMonIcon_Appletun, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(5, 6, SHADOW_SIZE_L) FOOTPRINT(Appletun) OVERWORLD( - gObjectEventPic_Appletun, + sPicTable_Appletun, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2665,6 +2706,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_AppletunGmax, .iconSprite = gMonIcon_AppletunGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Appletun) .isGigantamax = TRUE, @@ -2722,10 +2764,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dipplin, .iconSprite = gMonIcon_Dipplin, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 8, SHADOW_SIZE_S) FOOTPRINT(Dipplin) OVERWORLD( - gObjectEventPic_Dipplin, + sPicTable_Dipplin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2785,10 +2828,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Hydrapple, .iconSprite = gMonIcon_Hydrapple, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_L) FOOTPRINT(Hydrapple) OVERWORLD( - gObjectEventPic_Hydrapple, + sPicTable_Hydrapple, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2849,10 +2893,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Silicobra, .iconSprite = gMonIcon_Silicobra, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 1, SHADOW_SIZE_M) FOOTPRINT(Silicobra) OVERWORLD( - gObjectEventPic_Silicobra, + sPicTable_Silicobra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2913,10 +2958,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sandaconda, .iconSprite = gMonIcon_Sandaconda, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, -1, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Sandaconda) OVERWORLD( - gObjectEventPic_Sandaconda, + sPicTable_Sandaconda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2978,6 +3024,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_SandacondaGmax, .iconSprite = gMonIcon_SandacondaGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_M) FOOTPRINT(Sandaconda) .isGigantamax = TRUE, @@ -3036,10 +3083,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Cramorant, .iconSprite = gMonIcon_Cramorant, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 14, SHADOW_SIZE_M) FOOTPRINT(Cramorant) OVERWORLD( - gObjectEventPic_Cramorant, + sPicTable_Cramorant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3101,6 +3149,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CramorantGulping, .iconSprite = gMonIcon_CramorantGulping, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 14, SHADOW_SIZE_M) FOOTPRINT(Cramorant) .levelUpLearnset = sCramorantLevelUpLearnset, @@ -3157,6 +3206,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CramorantGorging, .iconSprite = gMonIcon_CramorantGorging, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 14, SHADOW_SIZE_M) FOOTPRINT(Cramorant) .levelUpLearnset = sCramorantLevelUpLearnset, @@ -3215,10 +3265,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Arrokuda, .iconSprite = gMonIcon_Arrokuda, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, -5, SHADOW_SIZE_S) FOOTPRINT(Arrokuda) OVERWORLD( - gObjectEventPic_Arrokuda, + sPicTable_Arrokuda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3279,10 +3330,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Barraskewda, .iconSprite = gMonIcon_Barraskewda, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 5, SHADOW_SIZE_M) FOOTPRINT(Barraskewda) OVERWORLD( - gObjectEventPic_Barraskewda, + sPicTable_Barraskewda, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3343,10 +3395,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Toxel, .iconSprite = gMonIcon_Toxel, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 1, SHADOW_SIZE_M) FOOTPRINT(Toxel) OVERWORLD( - gObjectEventPic_Toxel, + sPicTable_Toxel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3408,10 +3461,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ToxtricityAmped, .iconSprite = gMonIcon_ToxtricityAmped, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 13, SHADOW_SIZE_M) FOOTPRINT(Toxtricity) OVERWORLD( - gObjectEventPic_ToxtricityAmped, + sPicTable_ToxtricityAmped, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3469,6 +3523,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ToxtricityGmax, .iconSprite = gMonIcon_ToxtricityGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Toxtricity) .isGigantamax = TRUE, @@ -3525,10 +3580,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ToxtricityLowKey, .iconSprite = gMonIcon_ToxtricityLowKey, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 12, SHADOW_SIZE_M) FOOTPRINT(Toxtricity) OVERWORLD( - gObjectEventPic_ToxtricityLowKey, + sPicTable_ToxtricityLowKey, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3586,6 +3642,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ToxtricityGmax, .iconSprite = gMonIcon_ToxtricityGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Toxtricity) .isGigantamax = TRUE, @@ -3648,10 +3705,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sizzlipede, .iconSprite = gMonIcon_Sizzlipede, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(6, -4, SHADOW_SIZE_S) FOOTPRINT(Sizzlipede) OVERWORLD( - gObjectEventPic_Sizzlipede, + sPicTable_Sizzlipede, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3716,10 +3774,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Centiskorch, .iconSprite = gMonIcon_Centiskorch, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 7, SHADOW_SIZE_M) FOOTPRINT(Centiskorch) OVERWORLD( - gObjectEventPic_Centiskorch, + sPicTable_Centiskorch, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3781,6 +3840,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CentiskorchGmax, .iconSprite = gMonIcon_CentiskorchGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 9, SHADOW_SIZE_L) FOOTPRINT(Centiskorch) .isGigantamax = TRUE, @@ -3840,10 +3900,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Clobbopus, .iconSprite = gMonIcon_Clobbopus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(1, -2, SHADOW_SIZE_S) FOOTPRINT(Clobbopus) OVERWORLD( - gObjectEventPic_Clobbopus, + sPicTable_Clobbopus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3903,10 +3964,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Grapploct, .iconSprite = gMonIcon_Grapploct, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 9, SHADOW_SIZE_M) FOOTPRINT(Grapploct) OVERWORLD( - gObjectEventPic_Grapploct, + sPicTable_Grapploct, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3967,10 +4029,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sinistea, .iconSprite = gMonIcon_Sinistea, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 3, SHADOW_SIZE_S) FOOTPRINT(Sinistea) OVERWORLD( - gObjectEventPic_Sinistea, + sPicTable_Sinistea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4032,10 +4095,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Sinistea, .iconSprite = gMonIcon_Sinistea, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 4, SHADOW_SIZE_S) FOOTPRINT(Sinistea) OVERWORLD( - gObjectEventPic_Sinistea, + sPicTable_Sinistea, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4096,10 +4160,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Polteageist, .iconSprite = gMonIcon_Polteageist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_S) FOOTPRINT(Polteageist) OVERWORLD( - gObjectEventPic_Polteageist, + sPicTable_Polteageist, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4160,10 +4225,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Polteageist, .iconSprite = gMonIcon_Polteageist, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_S) FOOTPRINT(Polteageist) OVERWORLD( - gObjectEventPic_Polteageist, + sPicTable_Polteageist, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4225,10 +4291,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Hatenna, .iconSprite = gMonIcon_Hatenna, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 1, SHADOW_SIZE_M) FOOTPRINT(Hatenna) OVERWORLD( - gObjectEventPic_Hatenna, + sPicTable_Hatenna, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4288,10 +4355,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Hattrem, .iconSprite = gMonIcon_Hattrem, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Hattrem) OVERWORLD( - gObjectEventPic_Hattrem, + sPicTable_Hattrem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4350,10 +4418,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Hatterene, .iconSprite = gMonIcon_Hatterene, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 13, SHADOW_SIZE_S) FOOTPRINT(Hatterene) OVERWORLD( - gObjectEventPic_Hatterene, + sPicTable_Hatterene, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4415,6 +4484,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_HattereneGmax, .iconSprite = gMonIcon_HattereneGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_S) FOOTPRINT(Hatterene) .isGigantamax = TRUE, @@ -4474,10 +4544,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Impidimp, .iconSprite = gMonIcon_Impidimp, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Impidimp) OVERWORLD( - gObjectEventPic_Impidimp, + sPicTable_Impidimp, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4537,10 +4608,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Morgrem, .iconSprite = gMonIcon_Morgrem, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Morgrem) OVERWORLD( - gObjectEventPic_Morgrem, + sPicTable_Morgrem, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4600,10 +4672,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Grimmsnarl, .iconSprite = gMonIcon_Grimmsnarl, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 11, SHADOW_SIZE_L) FOOTPRINT(Grimmsnarl) OVERWORLD( - gObjectEventPic_Grimmsnarl, + sPicTable_Grimmsnarl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4665,6 +4738,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_GrimmsnarlGmax, .iconSprite = gMonIcon_GrimmsnarlGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Grimmsnarl) .isGigantamax = TRUE, @@ -4724,10 +4798,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Milcery, .iconSprite = gMonIcon_Milcery, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_S) FOOTPRINT(Milcery) OVERWORLD( - gObjectEventPic_Milcery, + sPicTable_Milcery, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4795,10 +4870,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Alcremie ##sweet, \ .iconSprite = gMonIcon_AlcremieStrawberryVanillaCream, /*AlcremieStrawberry##cream##*/ \ .iconPalIndex = 1, \ + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, \ SHADOW(0, 5, SHADOW_SIZE_S) \ FOOTPRINT(Alcremie) \ OVERWORLD( \ - gObjectEventPic_AlcremieStrawberry, /*Alcremie ##sweet*/ \ + sPicTable_AlcremieStrawberry, /*Alcremie ##sweet*/ \ SIZE_32x32, \ SHADOW_SIZE_M, \ TRACKS_FOOT, \ @@ -4907,6 +4983,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_AlcremieGmax, .iconSprite = gMonIcon_AlcremieGmax, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_L) FOOTPRINT(Alcremie) .isGigantamax = TRUE, @@ -4965,10 +5042,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Falinks, .iconSprite = gMonIcon_Falinks, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 5, SHADOW_SIZE_S) FOOTPRINT(Falinks) OVERWORLD( - gObjectEventPic_Falinks, + sPicTable_Falinks, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5028,10 +5106,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Pincurchin, .iconSprite = gMonIcon_Pincurchin, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -4, SHADOW_SIZE_S) FOOTPRINT(Pincurchin) OVERWORLD( - gObjectEventPic_Pincurchin, + sPicTable_Pincurchin, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5094,10 +5173,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Snom, .iconSprite = gMonIcon_Snom, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-2, -7, SHADOW_SIZE_S) FOOTPRINT(Snom) OVERWORLD( - gObjectEventPic_Snom, + sPicTable_Snom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5159,10 +5239,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Frosmoth, .iconSprite = gMonIcon_Frosmoth, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Frosmoth) OVERWORLD( - gObjectEventPic_Frosmoth, + sPicTable_Frosmoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5223,10 +5304,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Stonjourner, .iconSprite = gMonIcon_Stonjourner, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 10, SHADOW_SIZE_L) FOOTPRINT(Stonjourner) OVERWORLD( - gObjectEventPic_Stonjourner, + sPicTable_Stonjourner, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5288,10 +5370,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EiscueIce, .iconSprite = gMonIcon_EiscueIce, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Eiscue) OVERWORLD( - gObjectEventPic_EiscueIce, + sPicTable_EiscueIce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5353,6 +5436,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EiscueNoice, .iconSprite = gMonIcon_EiscueNoice, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 13, SHADOW_SIZE_S) FOOTPRINT(Eiscue) .levelUpLearnset = sEiscueLevelUpLearnset, @@ -5411,10 +5495,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_IndeedeeM, .iconSprite = gMonIcon_IndeedeeM, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Indeedee) OVERWORLD( - gObjectEventPic_IndeedeeM, + sPicTable_IndeedeeM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5474,10 +5559,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_IndeedeeF, .iconSprite = gMonIcon_IndeedeeF, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 4, SHADOW_SIZE_S) FOOTPRINT(Indeedee) OVERWORLD( - gObjectEventPic_IndeedeeF, + sPicTable_IndeedeeF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5540,10 +5626,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_MorpekoFullBelly, .iconSprite = gMonIcon_MorpekoFullBelly, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Morpeko) OVERWORLD( - gObjectEventPic_MorpekoFullBelly, + sPicTable_MorpekoFullBelly, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5605,6 +5692,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_MorpekoHangry, .iconSprite = gMonIcon_MorpekoHangry, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 0, SHADOW_SIZE_S) FOOTPRINT(Morpeko) .levelUpLearnset = sMorpekoLevelUpLearnset, @@ -5664,10 +5752,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Cufant, .iconSprite = gMonIcon_Cufant, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 2, SHADOW_SIZE_M) FOOTPRINT(Cufant) OVERWORLD( - gObjectEventPic_Cufant, + sPicTable_Cufant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5728,10 +5817,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Copperajah, .iconSprite = gMonIcon_Copperajah, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 7, SHADOW_SIZE_L) FOOTPRINT(Copperajah) OVERWORLD( - gObjectEventPic_Copperajah, + sPicTable_Copperajah, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5794,6 +5884,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CopperajahGmax, .iconSprite = gMonIcon_CopperajahGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_L) FOOTPRINT(Copperajah) .isGigantamax = TRUE, @@ -5853,10 +5944,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dracozolt, .iconSprite = gMonIcon_Dracozolt, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 10, SHADOW_SIZE_L) FOOTPRINT(Dracozolt) OVERWORLD( - gObjectEventPic_Dracozolt, + sPicTable_Dracozolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5916,10 +6008,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Arctozolt, .iconSprite = gMonIcon_Arctozolt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 11, SHADOW_SIZE_M) FOOTPRINT(Arctozolt) OVERWORLD( - gObjectEventPic_Arctozolt, + sPicTable_Arctozolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5980,10 +6073,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dracovish, .iconSprite = gMonIcon_Dracovish, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(Dracovish) OVERWORLD( - gObjectEventPic_Dracovish, + sPicTable_Dracovish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6044,10 +6138,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Arctovish, .iconSprite = gMonIcon_Arctovish, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_L) FOOTPRINT(Arctovish) OVERWORLD( - gObjectEventPic_Arctovish, + sPicTable_Arctovish, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6111,10 +6206,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Duraludon, .iconSprite = gMonIcon_Duraludon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_L) FOOTPRINT(Duraludon) OVERWORLD( - gObjectEventPic_Duraludon, + sPicTable_Duraludon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6178,6 +6274,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_DuraludonGmax, .iconSprite = gMonIcon_DuraludonGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 12, SHADOW_SIZE_L) FOOTPRINT(Duraludon) .isGigantamax = TRUE, @@ -6237,10 +6334,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Archaludon, .iconSprite = gMonIcon_Archaludon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Archaludon) OVERWORLD( - gObjectEventPic_Archaludon, + sPicTable_Archaludon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6303,10 +6401,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dreepy, .iconSprite = gMonIcon_Dreepy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 2, SHADOW_SIZE_S) FOOTPRINT(Dreepy) OVERWORLD( - gObjectEventPic_Dreepy, + sPicTable_Dreepy, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6367,10 +6466,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Drakloak, .iconSprite = gMonIcon_Drakloak, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 9, SHADOW_SIZE_M) FOOTPRINT(Drakloak) OVERWORLD( - gObjectEventPic_Drakloak, + sPicTable_Drakloak, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6431,10 +6531,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dragapult, .iconSprite = gMonIcon_Dragapult, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_M) FOOTPRINT(Dragapult) OVERWORLD( - gObjectEventPic_Dragapult, + sPicTable_Dragapult, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6494,10 +6595,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZacianHero, .iconSprite = gMonIcon_ZacianHero, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_L) FOOTPRINT(Zacian) OVERWORLD( - gObjectEventPic_ZacianHero, + sPicTable_ZacianHero, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6561,10 +6663,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZacianCrowned, .iconSprite = gMonIcon_ZacianCrowned, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 12, SHADOW_SIZE_L) FOOTPRINT(Zacian) OVERWORLD( - gObjectEventPic_ZacianCrowned, + sPicTable_ZacianCrowned, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6630,10 +6733,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZamazentaHero, .iconSprite = gMonIcon_ZamazentaHero, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_L) FOOTPRINT(Zamazenta) OVERWORLD( - gObjectEventPic_ZamazentaHero, + sPicTable_ZamazentaHero, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6697,10 +6801,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZamazentaCrowned, .iconSprite = gMonIcon_ZamazentaCrowned, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_L) FOOTPRINT(Zamazenta) OVERWORLD( - gObjectEventPic_ZamazentaCrowned, + sPicTable_ZamazentaCrowned, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6767,10 +6872,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Eternatus, .iconSprite = gMonIcon_Eternatus, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_L) FOOTPRINT(Eternatus) OVERWORLD( - gObjectEventPic_Eternatus, + sPicTable_Eternatus, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6834,6 +6940,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EternatusEternamax, .iconSprite = gMonIcon_EternatusEternamax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 20, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Eternatus) .isLegendary = TRUE, @@ -6892,10 +6999,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Kubfu, .iconSprite = gMonIcon_Kubfu, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Kubfu) OVERWORLD( - gObjectEventPic_Kubfu, + sPicTable_Kubfu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6960,10 +7068,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuSingleStrike, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_L) FOOTPRINT(Urshifu) OVERWORLD( - gObjectEventPic_Urshifu, + sPicTable_Urshifu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7027,6 +7136,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuSingleStrikeGmax, .iconSprite = gMonIcon_UrshifuSingleStrikeGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Urshifu) .isLegendary = TRUE, @@ -7085,10 +7195,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuRapidStrike, .iconSprite = gMonIcon_Urshifu, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_M) FOOTPRINT(Urshifu) OVERWORLD( - gObjectEventPic_Urshifu, + sPicTable_Urshifu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7152,6 +7263,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_UrshifuRapidStrikeGmax, .iconSprite = gMonIcon_UrshifuRapidStrikeGmax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_M) FOOTPRINT(Urshifu) .isLegendary = TRUE, @@ -7213,10 +7325,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Zarude, .iconSprite = gMonIcon_Zarude, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 11, SHADOW_SIZE_L) FOOTPRINT(Zarude) OVERWORLD( - gObjectEventPic_Zarude, + sPicTable_Zarude, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7278,6 +7391,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_ZarudeDada, .iconSprite = gMonIcon_ZarudeDada, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 11, SHADOW_SIZE_L) FOOTPRINT(Zarude) .isMythical = TRUE, @@ -7338,10 +7452,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Regieleki, .iconSprite = gMonIcon_Regieleki, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_S) FOOTPRINT(Regieleki) OVERWORLD( - gObjectEventPic_Regieleki, + sPicTable_Regieleki, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7405,10 +7520,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Regidrago, .iconSprite = gMonIcon_Regidrago, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_M) FOOTPRINT(Regidrago) OVERWORLD( - gObjectEventPic_Regidrago, + sPicTable_Regidrago, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7470,10 +7586,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Glastrier, .iconSprite = gMonIcon_Glastrier, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 11, SHADOW_SIZE_L) FOOTPRINT(Glastrier) OVERWORLD( - gObjectEventPic_Glastrier, + sPicTable_Glastrier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7536,10 +7653,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Spectrier, .iconSprite = gMonIcon_Spectrier, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 12, SHADOW_SIZE_L) FOOTPRINT(Spectrier) OVERWORLD( - gObjectEventPic_Spectrier, + sPicTable_Spectrier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7602,10 +7720,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Calyrex, .iconSprite = gMonIcon_Calyrex, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 12, SHADOW_SIZE_S) FOOTPRINT(Calyrex) OVERWORLD( - gObjectEventPic_Calyrex, + sPicTable_Calyrex, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7669,10 +7788,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CalyrexIce, .iconSprite = gMonIcon_CalyrexIce, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 11, SHADOW_SIZE_L) FOOTPRINT(Calyrex) OVERWORLD( - gObjectEventPic_CalyrexIce, + sPicTable_CalyrexIce, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7736,10 +7856,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_CalyrexShadow, .iconSprite = gMonIcon_CalyrexShadow, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 12, SHADOW_SIZE_L) FOOTPRINT(Calyrex) OVERWORLD( - gObjectEventPic_CalyrexShadow, + sPicTable_CalyrexShadow, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7807,10 +7928,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EnamorusIncarnate, .iconSprite = gMonIcon_EnamorusIncarnate, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 19, SHADOW_SIZE_M) FOOTPRINT(Enamorus) OVERWORLD( - gObjectEventPic_EnamorusIncarnate, + sPicTable_EnamorusIncarnate, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -7873,10 +7995,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_EnamorusTherian, .iconSprite = gMonIcon_EnamorusTherian, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_L) FOOTPRINT(Enamorus) OVERWORLD( - gObjectEventPic_EnamorusTherian, + sPicTable_EnamorusTherian, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 020ec03ac..9e5046958 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -51,10 +51,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Sprigatito, .iconSprite = gMonIcon_Sprigatito, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Sprigatito) OVERWORLD( - gObjectEventPic_Sprigatito, + sPicTable_Sprigatito, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -115,10 +116,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Floragato, .iconSprite = gMonIcon_Floragato, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 11, SHADOW_SIZE_M) FOOTPRINT(Floragato) OVERWORLD( - gObjectEventPic_Floragato, + sPicTable_Floragato, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -178,10 +180,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Meowscarada, .iconSprite = gMonIcon_Meowscarada, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 14, SHADOW_SIZE_S) FOOTPRINT(Meowscarada) OVERWORLD( - gObjectEventPic_Meowscarada, + sPicTable_Meowscarada, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -242,10 +245,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Fuecoco, .iconSprite = gMonIcon_Fuecoco, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 5, SHADOW_SIZE_S) FOOTPRINT(Fuecoco) OVERWORLD( - gObjectEventPic_Fuecoco, + sPicTable_Fuecoco, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -306,10 +310,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Crocalor, .iconSprite = gMonIcon_Crocalor, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_M) FOOTPRINT(Crocalor) OVERWORLD( - gObjectEventPic_Crocalor, + sPicTable_Crocalor, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -369,10 +374,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Skeledirge, .iconSprite = gMonIcon_Skeledirge, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Skeledirge) OVERWORLD( - gObjectEventPic_Skeledirge, + sPicTable_Skeledirge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -433,10 +439,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Quaxly, .iconSprite = gMonIcon_Quaxly, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Quaxly) OVERWORLD( - gObjectEventPic_Quaxly, + sPicTable_Quaxly, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -497,10 +504,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Quaxwell, .iconSprite = gMonIcon_Quaxwell, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 10, SHADOW_SIZE_S) FOOTPRINT(Quaxwell) OVERWORLD( - gObjectEventPic_Quaxwell, + sPicTable_Quaxwell, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -560,10 +568,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Quaquaval, .iconSprite = gMonIcon_Quaquaval, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-7, 13, SHADOW_SIZE_M) FOOTPRINT(Quaquaval) OVERWORLD( - gObjectEventPic_Quaquaval, + sPicTable_Quaquaval, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -624,10 +633,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Lechonk, .iconSprite = gMonIcon_Lechonk, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Lechonk) OVERWORLD( - gObjectEventPic_Lechonk, + sPicTable_Lechonk, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -688,10 +698,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_OinkologneM, .iconSprite = gMonIcon_OinkologneM, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 6, SHADOW_SIZE_M) FOOTPRINT(Oinkologne) OVERWORLD( - gObjectEventPic_OinkologneM, + sPicTable_OinkologneM, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -751,10 +762,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_OinkologneF, .iconSprite = gMonIcon_OinkologneF, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 7, SHADOW_SIZE_M) FOOTPRINT(Oinkologne) OVERWORLD( - gObjectEventPic_OinkologneF, + sPicTable_OinkologneF, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -816,10 +828,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tarountula, .iconSprite = gMonIcon_Tarountula, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 2, SHADOW_SIZE_M) FOOTPRINT(Tarountula) OVERWORLD( - gObjectEventPic_Tarountula, + sPicTable_Tarountula, SIZE_32x32, SHADOW_SIZE_S, TRACKS_BUG, @@ -880,10 +893,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Spidops, .iconSprite = gMonIcon_Spidops, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 8, SHADOW_SIZE_L) FOOTPRINT(Spidops) OVERWORLD( - gObjectEventPic_Spidops, + sPicTable_Spidops, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -944,10 +958,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Nymble, .iconSprite = gMonIcon_Nymble, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 3, SHADOW_SIZE_M) FOOTPRINT(Nymble) OVERWORLD( - gObjectEventPic_Nymble, + sPicTable_Nymble, SIZE_32x32, SHADOW_SIZE_S, TRACKS_BUG, @@ -1008,10 +1023,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Lokix, .iconSprite = gMonIcon_Lokix, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_M) FOOTPRINT(Lokix) OVERWORLD( - gObjectEventPic_Lokix, + sPicTable_Lokix, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1072,10 +1088,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pawmi, .iconSprite = gMonIcon_Pawmi, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Pawmi) OVERWORLD( - gObjectEventPic_Pawmi, + sPicTable_Pawmi, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1136,10 +1153,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pawmo, .iconSprite = gMonIcon_Pawmo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 10, SHADOW_SIZE_S) FOOTPRINT(Pawmo) OVERWORLD( - gObjectEventPic_Pawmo, + sPicTable_Pawmo, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1199,10 +1217,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pawmot, .iconSprite = gMonIcon_Pawmot, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_M) FOOTPRINT(Pawmot) OVERWORLD( - gObjectEventPic_Pawmot, + sPicTable_Pawmot, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1263,10 +1282,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tandemaus, .iconSprite = gMonIcon_Tandemaus, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Tandemaus) OVERWORLD( - gObjectEventPic_Tandemaus, + sPicTable_Tandemaus, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1328,10 +1348,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdThree, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(4, -1, SHADOW_SIZE_L) FOOTPRINT(MausholdThree) OVERWORLD( - gObjectEventPic_MausholdThree, + sPicTable_MausholdThree, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1390,10 +1411,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdFour, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, -1, SHADOW_SIZE_L) FOOTPRINT(MausholdFour) OVERWORLD( - gObjectEventPic_MausholdFour, + sPicTable_MausholdFour, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1455,10 +1477,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Fidough, .iconSprite = gMonIcon_Fidough, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(4, 0, SHADOW_SIZE_S) FOOTPRINT(Fidough) OVERWORLD( - gObjectEventPic_Fidough, + sPicTable_Fidough, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1519,10 +1542,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Dachsbun, .iconSprite = gMonIcon_Dachsbun, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 7, SHADOW_SIZE_L) FOOTPRINT(Dachsbun) OVERWORLD( - gObjectEventPic_Dachsbun, + sPicTable_Dachsbun, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1583,10 +1607,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Smoliv, .iconSprite = gMonIcon_Smoliv, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Smoliv) OVERWORLD( - gObjectEventPic_Smoliv, + sPicTable_Smoliv, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1647,10 +1672,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Dolliv, .iconSprite = gMonIcon_Dolliv, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Dolliv) OVERWORLD( - gObjectEventPic_Dolliv, + sPicTable_Dolliv, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -1710,10 +1736,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Arboliva, .iconSprite = gMonIcon_Arboliva, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_L) FOOTPRINT(Arboliva) OVERWORLD( - gObjectEventPic_Arboliva, + sPicTable_Arboliva, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -1774,10 +1801,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SquawkabillyGreen, .iconSprite = gMonIcon_SquawkabillyGreen, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - gObjectEventPic_SquawkabillyGreen, + sPicTable_SquawkabillyGreen, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -1838,10 +1866,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SquawkabillyBlue, .iconSprite = gMonIcon_SquawkabillyBlue, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - gObjectEventPic_SquawkabillyBlue, + sPicTable_SquawkabillyBlue, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -1902,10 +1931,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SquawkabillyYellow, .iconSprite = gMonIcon_SquawkabillyYellow, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - gObjectEventPic_SquawkabillyYellow, + sPicTable_SquawkabillyYellow, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -1966,10 +1996,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SquawkabillyWhite, .iconSprite = gMonIcon_SquawkabillyWhite, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 9, SHADOW_SIZE_M) FOOTPRINT(Squawkabilly) OVERWORLD( - gObjectEventPic_SquawkabillyWhite, + sPicTable_SquawkabillyWhite, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -2032,10 +2063,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Nacli, .iconSprite = gMonIcon_Nacli, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Nacli) OVERWORLD( - gObjectEventPic_Nacli, + sPicTable_Nacli, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -2096,10 +2128,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Naclstack, .iconSprite = gMonIcon_Naclstack, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 5, SHADOW_SIZE_L) FOOTPRINT(Naclstack) OVERWORLD( - gObjectEventPic_Naclstack, + sPicTable_Naclstack, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2159,10 +2192,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Garganacl, .iconSprite = gMonIcon_Garganacl, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 13, SHADOW_SIZE_L) FOOTPRINT(Garganacl) OVERWORLD( - gObjectEventPic_Garganacl, + sPicTable_Garganacl, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2223,10 +2257,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Charcadet, .iconSprite = gMonIcon_Charcadet, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Charcadet) OVERWORLD( - gObjectEventPic_Charcadet, + sPicTable_Charcadet, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -2288,10 +2323,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Armarouge, .iconSprite = gMonIcon_Armarouge, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_L) FOOTPRINT(Armarouge) OVERWORLD( - gObjectEventPic_Armarouge, + sPicTable_Armarouge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2350,10 +2386,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Ceruledge, .iconSprite = gMonIcon_Ceruledge, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(9, 14, SHADOW_SIZE_L) FOOTPRINT(Ceruledge) OVERWORLD( - gObjectEventPic_Ceruledge, + sPicTable_Ceruledge, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2415,10 +2452,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tadbulb, .iconSprite = gMonIcon_Tadbulb, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 19, SHADOW_SIZE_S) FOOTPRINT(Tadbulb) OVERWORLD( - gObjectEventPic_Tadbulb, + sPicTable_Tadbulb, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -2479,10 +2517,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Bellibolt, .iconSprite = gMonIcon_Bellibolt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(Bellibolt) OVERWORLD( - gObjectEventPic_Bellibolt, + sPicTable_Bellibolt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2543,10 +2582,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Wattrel, .iconSprite = gMonIcon_Wattrel, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 0, SHADOW_SIZE_S) FOOTPRINT(Wattrel) OVERWORLD( - gObjectEventPic_Wattrel, + sPicTable_Wattrel, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -2607,10 +2647,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Kilowattrel, .iconSprite = gMonIcon_Kilowattrel, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-6, 6, SHADOW_SIZE_M) FOOTPRINT(Kilowattrel) OVERWORLD( - gObjectEventPic_Kilowattrel, + sPicTable_Kilowattrel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -2671,10 +2712,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maschiff, .iconSprite = gMonIcon_Maschiff, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 5, SHADOW_SIZE_L) FOOTPRINT(Maschiff) OVERWORLD( - gObjectEventPic_Maschiff, + sPicTable_Maschiff, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -2735,10 +2777,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Mabosstiff, .iconSprite = gMonIcon_Mabosstiff, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 5, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Mabosstiff) OVERWORLD( - gObjectEventPic_Mabosstiff, + sPicTable_Mabosstiff, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2799,10 +2842,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Shroodle, .iconSprite = gMonIcon_Shroodle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -6, SHADOW_SIZE_S) FOOTPRINT(Shroodle) OVERWORLD( - gObjectEventPic_Shroodle, + sPicTable_Shroodle, SIZE_32x32, SHADOW_SIZE_S, TRACKS_BUG, @@ -2863,10 +2907,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Grafaiai, .iconSprite = gMonIcon_Grafaiai, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Grafaiai) OVERWORLD( - gObjectEventPic_Grafaiai, + sPicTable_Grafaiai, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -2927,10 +2972,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Bramblin, .iconSprite = gMonIcon_Bramblin, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Bramblin) OVERWORLD( - gObjectEventPic_Bramblin, + sPicTable_Bramblin, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -2991,10 +3037,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Brambleghast, .iconSprite = gMonIcon_Brambleghast, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 6, SHADOW_SIZE_M) FOOTPRINT(Brambleghast) OVERWORLD( - gObjectEventPic_Brambleghast, + sPicTable_Brambleghast, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -3057,10 +3104,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Toedscool, .iconSprite = gMonIcon_Toedscool, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 10, SHADOW_SIZE_M) FOOTPRINT(Toedscool) OVERWORLD( - gObjectEventPic_Toedscool, + sPicTable_Toedscool, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -3123,10 +3171,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Toedscruel, .iconSprite = gMonIcon_Toedscruel, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 8, SHADOW_SIZE_L) FOOTPRINT(Toedscruel) OVERWORLD( - gObjectEventPic_Toedscruel, + sPicTable_Toedscruel, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3187,10 +3236,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Klawf, .iconSprite = gMonIcon_Klawf, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Klawf) OVERWORLD( - gObjectEventPic_Klawf, + sPicTable_Klawf, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3252,10 +3302,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Capsakid, .iconSprite = gMonIcon_Capsakid, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Capsakid) OVERWORLD( - gObjectEventPic_Capsakid, + sPicTable_Capsakid, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -3316,10 +3367,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Scovillain, .iconSprite = gMonIcon_Scovillain, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 11, SHADOW_SIZE_M) FOOTPRINT(Scovillain) OVERWORLD( - gObjectEventPic_Scovillain, + sPicTable_Scovillain, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3380,10 +3432,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Rellor, .iconSprite = gMonIcon_Rellor, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(4, -3, SHADOW_SIZE_L) FOOTPRINT(Rellor) OVERWORLD( - gObjectEventPic_Rellor, + sPicTable_Rellor, SIZE_32x32, SHADOW_SIZE_S, TRACKS_BUG, @@ -3444,10 +3497,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Rabsca, .iconSprite = gMonIcon_Rabsca, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 14, SHADOW_SIZE_M) FOOTPRINT(Rabsca) OVERWORLD( - gObjectEventPic_Rabsca, + sPicTable_Rabsca, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -3508,10 +3562,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Flittle, .iconSprite = gMonIcon_Flittle, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 2, SHADOW_SIZE_S) FOOTPRINT(Flittle) OVERWORLD( - gObjectEventPic_Flittle, + sPicTable_Flittle, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -3572,10 +3627,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Espathra, .iconSprite = gMonIcon_Espathra, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 10, SHADOW_SIZE_M) FOOTPRINT(Espathra) OVERWORLD( - gObjectEventPic_Espathra, + sPicTable_Espathra, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3636,10 +3692,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkatink, .iconSprite = gMonIcon_Tinkatink, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Tinkatink) OVERWORLD( - gObjectEventPic_Tinkatink, + sPicTable_Tinkatink, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -3700,10 +3757,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkatuff, .iconSprite = gMonIcon_Tinkatuff, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 5, SHADOW_SIZE_L) FOOTPRINT(Tinkatuff) OVERWORLD( - gObjectEventPic_Tinkatuff, + sPicTable_Tinkatuff, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -3763,10 +3821,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkaton, .iconSprite = gMonIcon_Tinkaton, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-5, 15, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tinkaton) OVERWORLD( - gObjectEventPic_Tinkaton, + sPicTable_Tinkaton, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -3826,10 +3885,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Wiglett, .iconSprite = gMonIcon_Wiglett, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Wiglett) OVERWORLD( - gObjectEventPic_Wiglett, + sPicTable_Wiglett, SIZE_32x32, SHADOW_SIZE_S, TRACKS_SLITHER, @@ -3889,10 +3949,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Wugtrio, .iconSprite = gMonIcon_Wugtrio, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, NO_SHADOW FOOTPRINT(Wugtrio) OVERWORLD( - gObjectEventPic_Wugtrio, + sPicTable_Wugtrio, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -3954,10 +4015,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Bombirdier, .iconSprite = gMonIcon_Bombirdier, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 18, SHADOW_SIZE_M) FOOTPRINT(Bombirdier) OVERWORLD( - gObjectEventPic_Bombirdier, + sPicTable_Bombirdier, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -4018,10 +4080,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Finizen, .iconSprite = gMonIcon_Finizen, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Finizen) OVERWORLD( - gObjectEventPic_Finizen, + sPicTable_Finizen, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -4082,10 +4145,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_PalafinZero, .iconSprite = gMonIcon_PalafinZero, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Palafin) OVERWORLD( - gObjectEventPic_PalafinZero, + sPicTable_PalafinZero, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -4146,10 +4210,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_PalafinHero, .iconSprite = gMonIcon_PalafinHero, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 13, SHADOW_SIZE_M) FOOTPRINT(Palafin) OVERWORLD( - gObjectEventPic_PalafinHero, + sPicTable_PalafinHero, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -4212,10 +4277,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Varoom, .iconSprite = gMonIcon_Varoom, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 0, SHADOW_SIZE_M) FOOTPRINT(Varoom) OVERWORLD( - gObjectEventPic_Varoom, + sPicTable_Varoom, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -4276,10 +4342,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Revavroom, .iconSprite = gMonIcon_Revavroom, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 7, SHADOW_SIZE_L) FOOTPRINT(Revavroom) OVERWORLD( - gObjectEventPic_Revavroom, + sPicTable_Revavroom, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -4340,10 +4407,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Cyclizar, .iconSprite = gMonIcon_Cyclizar, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 9, SHADOW_SIZE_M) FOOTPRINT(Cyclizar) OVERWORLD( - gObjectEventPic_Cyclizar, + sPicTable_Cyclizar, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4405,10 +4473,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Orthworm, .iconSprite = gMonIcon_Orthworm, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(6, 10, SHADOW_SIZE_L) FOOTPRINT(Orthworm) OVERWORLD( - gObjectEventPic_Orthworm, + sPicTable_Orthworm, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -4471,10 +4540,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Glimmet, .iconSprite = gMonIcon_Glimmet, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 6, SHADOW_SIZE_S) FOOTPRINT(Glimmet) OVERWORLD( - gObjectEventPic_Glimmet, + sPicTable_Glimmet, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -4536,10 +4606,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Glimmora, .iconSprite = gMonIcon_Glimmora, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 17, SHADOW_SIZE_M) FOOTPRINT(Glimmora) OVERWORLD( - gObjectEventPic_Glimmora, + sPicTable_Glimmora, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -4600,10 +4671,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Greavard, .iconSprite = gMonIcon_Greavard, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 2, SHADOW_SIZE_M) FOOTPRINT(Greavard) OVERWORLD( - gObjectEventPic_Greavard, + sPicTable_Greavard, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -4664,10 +4736,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Houndstone, .iconSprite = gMonIcon_Houndstone, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 6, SHADOW_SIZE_L) FOOTPRINT(Houndstone) OVERWORLD( - gObjectEventPic_Houndstone, + sPicTable_Houndstone, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4728,10 +4801,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Flamigo, .iconSprite = gMonIcon_Flamigo, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_S) FOOTPRINT(Flamigo) OVERWORLD( - gObjectEventPic_Flamigo, + sPicTable_Flamigo, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -4793,10 +4867,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Cetoddle, .iconSprite = gMonIcon_Cetoddle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 0, SHADOW_SIZE_M) FOOTPRINT(Cetoddle) OVERWORLD( - gObjectEventPic_Cetoddle, + sPicTable_Cetoddle, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -4857,10 +4932,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Cetitan, .iconSprite = gMonIcon_Cetitan, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 10, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Cetitan) OVERWORLD( - gObjectEventPic_Cetitan, + sPicTable_Cetitan, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -4922,10 +4998,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Veluza, .iconSprite = gMonIcon_Veluza, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 5, SHADOW_SIZE_M) FOOTPRINT(Veluza) OVERWORLD( - gObjectEventPic_Veluza, + sPicTable_Veluza, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -4988,10 +5065,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Dondozo, .iconSprite = gMonIcon_Dondozo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Dondozo) OVERWORLD( - gObjectEventPic_Dondozo, + sPicTable_Dondozo, SIZE_64x64, SHADOW_SIZE_L, TRACKS_NONE, @@ -5053,10 +5131,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriCurly, .iconSprite = gMonIcon_TatsugiriCurly, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( - gObjectEventPic_TatsugiriCurly, + sPicTable_TatsugiriCurly, SIZE_32x32, SHADOW_SIZE_S, TRACKS_SLITHER, @@ -5116,10 +5195,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriDroopy, .iconSprite = gMonIcon_TatsugiriDroopy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( - gObjectEventPic_TatsugiriDroopy, + sPicTable_TatsugiriDroopy, SIZE_32x32, SHADOW_SIZE_S, TRACKS_SLITHER, @@ -5179,10 +5259,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriStretchy, .iconSprite = gMonIcon_TatsugiriStretchy, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( - gObjectEventPic_TatsugiriStretchy, + sPicTable_TatsugiriStretchy, SIZE_32x32, SHADOW_SIZE_S, TRACKS_SLITHER, @@ -5246,10 +5327,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GreatTusk, .iconSprite = gMonIcon_GreatTusk, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 6, SHADOW_SIZE_L) FOOTPRINT(GreatTusk) OVERWORLD( - gObjectEventPic_GreatTusk, + sPicTable_GreatTusk, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5312,10 +5394,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_ScreamTail, .iconSprite = gMonIcon_ScreamTail, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 3, SHADOW_SIZE_L) FOOTPRINT(ScreamTail) OVERWORLD( - gObjectEventPic_ScreamTail, + sPicTable_ScreamTail, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5378,10 +5461,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_BruteBonnet, .iconSprite = gMonIcon_BruteBonnet, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 7, SHADOW_SIZE_L) FOOTPRINT(BruteBonnet) OVERWORLD( - gObjectEventPic_BruteBonnet, + sPicTable_BruteBonnet, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5447,10 +5531,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_FlutterMane, .iconSprite = gMonIcon_FlutterMane, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 20, SHADOW_SIZE_S) FOOTPRINT(FlutterMane) OVERWORLD( - gObjectEventPic_FlutterMane, + sPicTable_FlutterMane, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -5512,10 +5597,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SlitherWing, .iconSprite = gMonIcon_SlitherWing, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-5, 13, SHADOW_SIZE_M) FOOTPRINT(SlitherWing) OVERWORLD( - gObjectEventPic_SlitherWing, + sPicTable_SlitherWing, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -5578,10 +5664,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_SandyShocks, .iconSprite = gMonIcon_SandyShocks, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(SandyShocks) OVERWORLD( - gObjectEventPic_SandyShocks, + sPicTable_SandyShocks, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5644,10 +5731,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronTreads, .iconSprite = gMonIcon_IronTreads, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 3, SHADOW_SIZE_L) FOOTPRINT(IronTreads) OVERWORLD( - gObjectEventPic_IronTreads, + sPicTable_IronTreads, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5710,10 +5798,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronBundle, .iconSprite = gMonIcon_IronBundle, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(IronBundle) OVERWORLD( - gObjectEventPic_IronBundle, + sPicTable_IronBundle, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5776,10 +5865,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronHands, .iconSprite = gMonIcon_IronHands, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-2, 8, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(IronHands) OVERWORLD( - gObjectEventPic_IronHands, + sPicTable_IronHands, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5843,10 +5933,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronJugulis, .iconSprite = gMonIcon_IronJugulis, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 15, SHADOW_SIZE_M) FOOTPRINT(IronJugulis) OVERWORLD( - gObjectEventPic_IronJugulis, + sPicTable_IronJugulis, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -5910,10 +6001,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronMoth, .iconSprite = gMonIcon_IronMoth, .iconPalIndex = 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 14, SHADOW_SIZE_M) FOOTPRINT(IronMoth) OVERWORLD( - gObjectEventPic_IronMoth, + sPicTable_IronMoth, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -5976,10 +6068,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronThorns, .iconSprite = gMonIcon_IronThorns, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-9, 12, SHADOW_SIZE_L) FOOTPRINT(IronThorns) OVERWORLD( - gObjectEventPic_IronThorns, + sPicTable_IronThorns, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6041,10 +6134,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Frigibax, .iconSprite = gMonIcon_Frigibax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Frigibax) OVERWORLD( - gObjectEventPic_Frigibax, + sPicTable_Frigibax, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -6105,10 +6199,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Arctibax, .iconSprite = gMonIcon_Arctibax, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 8, SHADOW_SIZE_M) FOOTPRINT(Arctibax) OVERWORLD( - gObjectEventPic_Arctibax, + sPicTable_Arctibax, SIZE_32x32, SHADOW_SIZE_S, TRACKS_FOOT, @@ -6168,10 +6263,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Baxcalibur, .iconSprite = gMonIcon_Baxcalibur, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(5, 12, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Baxcalibur) OVERWORLD( - gObjectEventPic_Baxcalibur, + sPicTable_Baxcalibur, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6232,10 +6328,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GimmighoulChest, .iconSprite = gMonIcon_GimmighoulChest, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(GimmighoulChest) OVERWORLD( - gObjectEventPic_GimmighoulChest, + sPicTable_GimmighoulChest, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -6296,6 +6393,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GimmighoulRoaming, .iconSprite = gMonIcon_GimmighoulRoaming, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, -4, SHADOW_SIZE_S) FOOTPRINT(GimmighoulRoaming) .levelUpLearnset = sGimmighoulLevelUpLearnset, @@ -6351,10 +6449,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Gholdengo, .iconSprite = gMonIcon_Gholdengo, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 13, SHADOW_SIZE_M) FOOTPRINT(Gholdengo) OVERWORLD( - gObjectEventPic_Gholdengo, + sPicTable_Gholdengo, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6415,10 +6514,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_WoChien, .iconSprite = gMonIcon_WoChien, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(WoChien) OVERWORLD( - gObjectEventPic_WoChien, + sPicTable_WoChien, SIZE_32x32, SHADOW_SIZE_M, TRACKS_SLITHER, @@ -6481,10 +6581,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_ChienPao, .iconSprite = gMonIcon_ChienPao, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 8, SHADOW_SIZE_L) FOOTPRINT(ChienPao) OVERWORLD( - gObjectEventPic_ChienPao, + sPicTable_ChienPao, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6547,10 +6648,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TingLu, .iconSprite = gMonIcon_TingLu, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(12, 13, SHADOW_SIZE_L) FOOTPRINT(TingLu) OVERWORLD( - gObjectEventPic_TingLu, + sPicTable_TingLu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6614,10 +6716,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_ChiYu, .iconSprite = gMonIcon_ChiYu, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 16, SHADOW_SIZE_S) FOOTPRINT(ChiYu) OVERWORLD( - gObjectEventPic_ChiYu, + sPicTable_ChiYu, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -6682,10 +6785,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_RoaringMoon, .iconSprite = gMonIcon_RoaringMoon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(3, 9, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(RoaringMoon) OVERWORLD( - gObjectEventPic_RoaringMoon, + sPicTable_RoaringMoon, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6747,10 +6851,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronValiant, .iconSprite = gMonIcon_IronValiant, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 14, SHADOW_SIZE_L) FOOTPRINT(IronValiant) OVERWORLD( - gObjectEventPic_IronValiant, + sPicTable_IronValiant, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -6812,10 +6917,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Koraidon, .iconSprite = gMonIcon_Koraidon, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 13, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Koraidon) OVERWORLD( - gObjectEventPic_Koraidon, + sPicTable_Koraidon, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -6879,10 +6985,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Miraidon, .iconSprite = gMonIcon_Miraidon, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(10, 14, SHADOW_SIZE_L) FOOTPRINT(Miraidon) OVERWORLD( - gObjectEventPic_Miraidon, + sPicTable_Miraidon, SIZE_64x64, SHADOW_SIZE_M, TRACKS_NONE, @@ -6946,10 +7053,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_WalkingWake, .iconSprite = gMonIcon_WalkingWake, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 13, SHADOW_SIZE_L) FOOTPRINT(WalkingWake) OVERWORLD( - gObjectEventPic_WalkingWake, + sPicTable_WalkingWake, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7011,10 +7119,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronLeaves, .iconSprite = gMonIcon_IronLeaves, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 11, SHADOW_SIZE_M) FOOTPRINT(IronLeaves) OVERWORLD( - gObjectEventPic_IronLeaves, + sPicTable_IronLeaves, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7077,10 +7186,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Poltchageist, .iconSprite = gMonIcon_Poltchageist, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_S) FOOTPRINT(Poltchageist) OVERWORLD( - gObjectEventPic_Poltchageist, + sPicTable_Poltchageist, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -7141,10 +7251,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Poltchageist, .iconSprite = gMonIcon_Poltchageist, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 14, SHADOW_SIZE_S) FOOTPRINT(Poltchageist) OVERWORLD( - gObjectEventPic_Poltchageist, + sPicTable_Poltchageist, SIZE_32x32, SHADOW_SIZE_S, TRACKS_NONE, @@ -7206,10 +7317,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Sinistcha, .iconSprite = gMonIcon_Sinistcha, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_M) FOOTPRINT(Sinistcha) OVERWORLD( - gObjectEventPic_Sinistcha, + sPicTable_Sinistcha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7269,10 +7381,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Sinistcha, .iconSprite = gMonIcon_Sinistcha, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 11, SHADOW_SIZE_M) FOOTPRINT(Sinistcha) OVERWORLD( - gObjectEventPic_Sinistcha, + sPicTable_Sinistcha, SIZE_32x32, SHADOW_SIZE_M, TRACKS_NONE, @@ -7334,10 +7447,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Okidogi, .iconSprite = gMonIcon_Okidogi, .iconPalIndex = 1, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 11, SHADOW_SIZE_L) FOOTPRINT(Okidogi) OVERWORLD( - gObjectEventPic_Okidogi, + sPicTable_Okidogi, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7400,10 +7514,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Munkidori, .iconSprite = gMonIcon_Munkidori, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(1, 8, SHADOW_SIZE_S) FOOTPRINT(Munkidori) OVERWORLD( - gObjectEventPic_Munkidori, + sPicTable_Munkidori, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7466,10 +7581,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Fezandipiti, .iconSprite = gMonIcon_Fezandipiti, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-3, 10, SHADOW_SIZE_M) FOOTPRINT(Fezandipiti) OVERWORLD( - gObjectEventPic_Fezandipiti, + sPicTable_Fezandipiti, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7485,68 +7601,69 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = #endif //P_FAMILY_FEZANDIPITI #if P_FAMILY_OGERPON -#define OGERPON_SPECIES_INFO(Form1, Form2, type, ability, color, frontYOffset, backYOffset, iconpalette, isTeraform) \ - { \ - .baseHP = 80, \ - .baseAttack = 120, \ - .baseDefense = 84, \ - .baseSpeed = 110, \ - .baseSpAttack = 60, \ - .baseSpDefense = 96, \ - .types = MON_TYPES(TYPE_GRASS, type), \ - .forceTeraType = type, \ - .catchRate = 5, \ - .expYield = 275, \ - .evYield_Attack = 3, \ - .genderRatio = MON_FEMALE, \ - .eggCycles = 10, \ - .friendship = STANDARD_FRIENDSHIP, \ - .growthRate = GROWTH_SLOW, \ - .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ - .abilities = { ability, ABILITY_NONE }, \ - .bodyColor = color, \ - .speciesName = _("Ogerpon"), \ - .cryId = CRY_OGERPON, \ - .natDexNum = NATIONAL_DEX_OGERPON, \ - .categoryName = _("Mask"), \ - .height = 12, \ - .weight = 398, \ - .description = gOgerpon##Form1##MaskPokedexText, \ - .pokemonScale = 356, \ - .pokemonOffset = 17, \ - .trainerScale = 256, \ - .trainerOffset = 0, \ - .frontPic = gMonFrontPic_Ogerpon##Form2, \ - .frontPicSize = MON_COORDS_SIZE(64, 64), \ - .frontPicYOffset = frontYOffset, \ - .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ - /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ - .backPic = gMonBackPic_Ogerpon##Form2, \ - .backPicSize = MON_COORDS_SIZE(64, 64), \ - .backPicYOffset = backYOffset, \ - /*.backAnimId = BACK_ANIM_NONE,*/ \ - .palette = gMonPalette_Ogerpon##Form2, \ - .shinyPalette = gMonShinyPalette_Ogerpon##Form2, \ - .iconSprite = gMonIcon_Ogerpon##Form1, \ - .iconPalIndex = iconpalette, \ - SHADOW(7, 13, SHADOW_SIZE_L) \ - FOOTPRINT(Ogerpon) \ - OVERWORLD( \ - gObjectEventPic_Ogerpon##Form2, \ - SIZE_32x32, \ - SHADOW_SIZE_M, \ - TRACKS_FOOT, \ - sAnimTable_Following, \ - gOverworldPalette_Ogerpon##Form2, \ - gShinyOverworldPalette_Ogerpon##Form2 \ - ) \ - .levelUpLearnset = sOgerponLevelUpLearnset, \ - .teachableLearnset = sOgerponTeachableLearnset, \ - .formSpeciesIdTable = sOgerponFormSpeciesIdTable, \ - .formChangeTable = sOgerponFormChangeTable, \ - .isLegendary = TRUE, \ - .isTeraForm = isTeraform, \ - .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \ +#define OGERPON_SPECIES_INFO(Form1, Form2, type, ability, color, frontYOffset, backYOffset, iconpalette, isTeraform) \ + { \ + .baseHP = 80, \ + .baseAttack = 120, \ + .baseDefense = 84, \ + .baseSpeed = 110, \ + .baseSpAttack = 60, \ + .baseSpDefense = 96, \ + .types = MON_TYPES(TYPE_GRASS, type), \ + .forceTeraType = type, \ + .catchRate = 5, \ + .expYield = 275, \ + .evYield_Attack = 3, \ + .genderRatio = MON_FEMALE, \ + .eggCycles = 10, \ + .friendship = STANDARD_FRIENDSHIP, \ + .growthRate = GROWTH_SLOW, \ + .eggGroups = MON_EGG_GROUPS(EGG_GROUP_NO_EGGS_DISCOVERED), \ + .abilities = { ability, ABILITY_NONE }, \ + .bodyColor = color, \ + .speciesName = _("Ogerpon"), \ + .cryId = CRY_OGERPON, \ + .natDexNum = NATIONAL_DEX_OGERPON, \ + .categoryName = _("Mask"), \ + .height = 12, \ + .weight = 398, \ + .description = gOgerpon##Form1##MaskPokedexText, \ + .pokemonScale = 356, \ + .pokemonOffset = 17, \ + .trainerScale = 256, \ + .trainerOffset = 0, \ + .frontPic = gMonFrontPic_Ogerpon##Form2, \ + .frontPicSize = MON_COORDS_SIZE(64, 64), \ + .frontPicYOffset = frontYOffset, \ + .frontAnimFrames = sAnims_SingleFramePlaceHolder, \ + /*.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE,*/ \ + .backPic = gMonBackPic_Ogerpon##Form2, \ + .backPicSize = MON_COORDS_SIZE(64, 64), \ + .backPicYOffset = backYOffset, \ + /*.backAnimId = BACK_ANIM_NONE,*/ \ + .palette = gMonPalette_Ogerpon##Form2, \ + .shinyPalette = gMonShinyPalette_Ogerpon##Form2, \ + .iconSprite = gMonIcon_Ogerpon##Form1, \ + .iconPalIndex = iconpalette, \ + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, \ + SHADOW(7, 13, SHADOW_SIZE_L) \ + FOOTPRINT(Ogerpon) \ + OVERWORLD( \ + sPicTable_Ogerpon##Form2, \ + SIZE_32x32, \ + SHADOW_SIZE_M, \ + TRACKS_FOOT, \ + sAnimTable_Following, \ + gOverworldPalette_Ogerpon##Form2, \ + gShinyOverworldPalette_Ogerpon##Form2 \ + ) \ + .levelUpLearnset = sOgerponLevelUpLearnset, \ + .teachableLearnset = sOgerponTeachableLearnset, \ + .formSpeciesIdTable = sOgerponFormSpeciesIdTable, \ + .formChangeTable = sOgerponFormChangeTable, \ + .isLegendary = TRUE, \ + .isTeraForm = isTeraform, \ + .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, \ } [SPECIES_OGERPON_TEAL] = OGERPON_SPECIES_INFO(Teal, Teal, TYPE_GRASS, ABILITY_DEFIANT, BODY_COLOR_GREEN, 1, 7, 1, FALSE), @@ -7611,10 +7728,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GougingFire, .iconSprite = gMonIcon_GougingFire, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-1, 6, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(GougingFire) OVERWORLD( - gObjectEventPic_GougingFire, + sPicTable_GougingFire, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7677,10 +7795,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_RagingBolt, .iconSprite = gMonIcon_RagingBolt, .iconPalIndex = 2, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 14, SHADOW_SIZE_L) FOOTPRINT(RagingBolt) OVERWORLD( - gObjectEventPic_RagingBolt, + sPicTable_RagingBolt, SIZE_64x64, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7742,10 +7861,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronBoulder, .iconSprite = gMonIcon_IronBoulder, .iconPalIndex = 5, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(4, 7, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(IronBoulder) OVERWORLD( - gObjectEventPic_IronBoulder, + sPicTable_IronBoulder, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7808,10 +7928,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronCrown, .iconSprite = gMonIcon_IronCrown, .iconPalIndex = 3, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 14, SHADOW_SIZE_L) FOOTPRINT(IronCrown) OVERWORLD( - gObjectEventPic_IronCrown, + sPicTable_IronCrown, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7875,10 +7996,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TerapagosNormal, .iconSprite = gMonIcon_TerapagosNormal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 13, SHADOW_SIZE_L) FOOTPRINT(TerapagosNormal) OVERWORLD( - gObjectEventPic_TerapagosNormal, + sPicTable_TerapagosNormal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -7945,10 +8067,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TerapagosTerastal, .iconSprite = gMonIcon_TerapagosTerastal, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(-4, 4, SHADOW_SIZE_L) FOOTPRINT(TerapagosTerastal) OVERWORLD( - gObjectEventPic_TerapagosTerastal, + sPicTable_TerapagosTerastal, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT, @@ -8013,6 +8136,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TerapagosStellar, .iconSprite = gMonIcon_TerapagosStellar, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(0, 12, SHADOW_SIZE_L) FOOTPRINT(TerapagosStellar) .isLegendary = TRUE, @@ -8074,10 +8198,11 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pecharunt, .iconSprite = gMonIcon_Pecharunt, .iconPalIndex = 0, + .pokemonJumpType = PKMN_JUMP_TYPE_NONE, SHADOW(2, 1, SHADOW_SIZE_L) FOOTPRINT(Pecharunt) OVERWORLD( - gObjectEventPic_Pecharunt, + sPicTable_Pecharunt, SIZE_32x32, SHADOW_SIZE_M, TRACKS_FOOT,