diff --git a/include/pokemon.h b/include/pokemon.h index 49fc767ceb32..88e77b6cf566 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -427,7 +427,7 @@ struct SpeciesInfo /*0xC4*/ #else u8 paddingF:3; #endif //P_GENDER_DIFFERENCES - u8 pokemonJumpType:2; // According to the clerk, the Pokémon allowed in Pokémon Jump are all <= 28 inches, and do not only swim, burrow, or fly. + u8 pokemonJumpType:2; // According to the clerk, the Pokémon allowed in Pokémon Jump are all <= 28 inches/71 cm, and do not only swim, burrow, or fly. /* 0x7B */ u8 enemyMonElevation; // This determines how much higher above the usual position the enemy Pokémon is during battle. Species that float or fly have nonzero values. // Flags /* 0x7C */ u32 isLegendary:1; diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 741c2fe7c2cc..4c652197e2ab 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -2736,7 +2736,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = .shinyPalette = gMonShinyPalette_Dipplin, .iconSprite = gMonIcon_Dipplin, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 8, SHADOW_SIZE_S) FOOTPRINT(Dipplin) OVERWORLD( diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index 1db2c72c8b65..8aa5f9340210 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -51,7 +51,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Sprigatito, .iconSprite = gMonIcon_Sprigatito, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Sprigatito) OVERWORLD( @@ -245,7 +245,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Fuecoco, .iconSprite = gMonIcon_Fuecoco, .iconPalIndex = 2, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 5, SHADOW_SIZE_S) FOOTPRINT(Fuecoco) OVERWORLD( @@ -439,7 +439,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Quaxly, .iconSprite = gMonIcon_Quaxly, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, 5, SHADOW_SIZE_S) FOOTPRINT(Quaxly) OVERWORLD( @@ -633,7 +633,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Lechonk, .iconSprite = gMonIcon_Lechonk, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 1, SHADOW_SIZE_S) FOOTPRINT(Lechonk) OVERWORLD( @@ -958,7 +958,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Nymble, .iconSprite = gMonIcon_Nymble, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 3, SHADOW_SIZE_M) FOOTPRINT(Nymble) OVERWORLD( @@ -1088,7 +1088,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pawmi, .iconSprite = gMonIcon_Pawmi, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(1, 4, SHADOW_SIZE_M) FOOTPRINT(Pawmi) OVERWORLD( @@ -1153,7 +1153,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Pawmo, .iconSprite = gMonIcon_Pawmo, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-3, 10, SHADOW_SIZE_S) FOOTPRINT(Pawmo) OVERWORLD( @@ -1282,7 +1282,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tandemaus, .iconSprite = gMonIcon_Tandemaus, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(0, -1, SHADOW_SIZE_M) FOOTPRINT(Tandemaus) OVERWORLD( @@ -1348,7 +1348,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdThree, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(4, -1, SHADOW_SIZE_L) FOOTPRINT(MausholdThree) OVERWORLD( @@ -1411,7 +1411,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maushold, .iconSprite = gMonIcon_MausholdFour, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(0, -1, SHADOW_SIZE_L) FOOTPRINT(MausholdFour) OVERWORLD( @@ -1477,7 +1477,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Fidough, .iconSprite = gMonIcon_Fidough, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(4, 0, SHADOW_SIZE_S) FOOTPRINT(Fidough) OVERWORLD( @@ -1542,7 +1542,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Dachsbun, .iconSprite = gMonIcon_Dachsbun, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 7, SHADOW_SIZE_L) FOOTPRINT(Dachsbun) OVERWORLD( @@ -1607,7 +1607,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Smoliv, .iconSprite = gMonIcon_Smoliv, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, -2, SHADOW_SIZE_S) FOOTPRINT(Smoliv) OVERWORLD( @@ -1672,7 +1672,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Dolliv, .iconSprite = gMonIcon_Dolliv, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(1, 9, SHADOW_SIZE_M) FOOTPRINT(Dolliv) OVERWORLD( @@ -2063,7 +2063,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Nacli, .iconSprite = gMonIcon_Nacli, .iconPalIndex = 2, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Nacli) OVERWORLD( @@ -2128,7 +2128,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Naclstack, .iconSprite = gMonIcon_Naclstack, .iconPalIndex = 2, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 5, SHADOW_SIZE_L) FOOTPRINT(Naclstack) OVERWORLD( @@ -2257,7 +2257,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Charcadet, .iconSprite = gMonIcon_Charcadet, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-1, 5, SHADOW_SIZE_S) FOOTPRINT(Charcadet) OVERWORLD( @@ -2712,7 +2712,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Maschiff, .iconSprite = gMonIcon_Maschiff, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 5, SHADOW_SIZE_L) FOOTPRINT(Maschiff) OVERWORLD( @@ -2842,7 +2842,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Shroodle, .iconSprite = gMonIcon_Shroodle, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, -6, SHADOW_SIZE_S) FOOTPRINT(Shroodle) OVERWORLD( @@ -2907,7 +2907,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Grafaiai, .iconSprite = gMonIcon_Grafaiai, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(-2, 5, SHADOW_SIZE_S) FOOTPRINT(Grafaiai) OVERWORLD( @@ -2972,7 +2972,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Bramblin, .iconSprite = gMonIcon_Bramblin, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Bramblin) OVERWORLD( @@ -3302,7 +3302,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Capsakid, .iconSprite = gMonIcon_Capsakid, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(2, 0, SHADOW_SIZE_S) FOOTPRINT(Capsakid) OVERWORLD( @@ -3432,7 +3432,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Rellor, .iconSprite = gMonIcon_Rellor, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(4, -3, SHADOW_SIZE_L) FOOTPRINT(Rellor) OVERWORLD( @@ -3692,7 +3692,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkatink, .iconSprite = gMonIcon_Tinkatink, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-3, 1, SHADOW_SIZE_S) FOOTPRINT(Tinkatink) OVERWORLD( @@ -3757,7 +3757,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkatuff, .iconSprite = gMonIcon_Tinkatuff, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-4, 5, SHADOW_SIZE_L) FOOTPRINT(Tinkatuff) OVERWORLD( @@ -3821,7 +3821,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Tinkaton, .iconSprite = gMonIcon_Tinkaton, .iconPalIndex = 1, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-5, 15, SHADOW_SIZE_XL_BATTLE_ONLY) FOOTPRINT(Tinkaton) OVERWORLD( @@ -4671,7 +4671,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Greavard, .iconSprite = gMonIcon_Greavard, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 2, SHADOW_SIZE_M) FOOTPRINT(Greavard) OVERWORLD( @@ -5131,7 +5131,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriCurly, .iconSprite = gMonIcon_TatsugiriCurly, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( @@ -5195,7 +5195,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriDroopy, .iconSprite = gMonIcon_TatsugiriDroopy, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( @@ -5259,7 +5259,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TatsugiriStretchy, .iconSprite = gMonIcon_TatsugiriStretchy, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-2, -1, SHADOW_SIZE_S) FOOTPRINT(Tatsugiri) OVERWORLD( @@ -5798,7 +5798,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_IronBundle, .iconSprite = gMonIcon_IronBundle, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(-1, 6, SHADOW_SIZE_M) FOOTPRINT(IronBundle) OVERWORLD( @@ -6134,7 +6134,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_Frigibax, .iconSprite = gMonIcon_Frigibax, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 7, SHADOW_SIZE_S) FOOTPRINT(Frigibax) OVERWORLD( @@ -6328,7 +6328,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GimmighoulChest, .iconSprite = gMonIcon_GimmighoulChest, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_SLOW, SHADOW(0, 7, SHADOW_SIZE_M) FOOTPRINT(GimmighoulChest) OVERWORLD( @@ -6393,7 +6393,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_GimmighoulRoaming, .iconSprite = gMonIcon_GimmighoulRoaming, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_FAST, SHADOW(-1, -4, SHADOW_SIZE_S) FOOTPRINT(GimmighoulRoaming) .levelUpLearnset = sGimmighoulLevelUpLearnset, @@ -7992,7 +7992,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .shinyPalette = gMonShinyPalette_TerapagosNormal, .iconSprite = gMonIcon_TerapagosNormal, .iconPalIndex = 0, - .pokemonJumpType = PKMN_JUMP_TYPE_NONE, + .pokemonJumpType = PKMN_JUMP_TYPE_NORMAL, SHADOW(3, 13, SHADOW_SIZE_L) FOOTPRINT(TerapagosNormal) OVERWORLD(