From 5fc72c2bfe6556654742a564d45e2fbe13430e60 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sat, 9 Apr 2022 22:40:36 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Heights=20and=20weights=20in=20Pok=C3=A9dex?= =?UTF-8?q?=20Orders=20lists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/pokemon/pokedex_orders.h | 130 ++++++++++++++++++------------ 1 file changed, 78 insertions(+), 52 deletions(-) diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 68b09bf9e..f51bdeb44 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -927,6 +927,7 @@ const u16 gPokedexOrder_Alphabetical[] = const u16 gPokedexOrder_Weight[] = { + // 0.0 - 21.8 lbs / 0.0 - 9.9 kg NATIONAL_DEX_GASTLY, NATIONAL_DEX_HAUNTER, NATIONAL_DEX_FLABEBE, @@ -1195,7 +1196,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_VULPIX, //NATIONAL_DEX_VULPIX, // Alolan Form NATIONAL_DEX_TEPIG, - + // 22.0 - 44.1 lbs / 10.0 - 20.0 kg NATIONAL_DEX_KAKUNA, NATIONAL_DEX_MAGIKARP, NATIONAL_DEX_SILCOON, @@ -1339,7 +1340,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GEODUDE, NATIONAL_DEX_BIDOOF, NATIONAL_DEX_MIENFOO, - + // 44.3 - 54.9 lbs / 20.1 - 24.9 kg NATIONAL_DEX_REUNICLUS, NATIONAL_DEX_KIRLIA, NATIONAL_DEX_RIOLU, @@ -1392,7 +1393,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_DEWOTT, NATIONAL_DEX_TALONFLAME, NATIONAL_DEX_STARAPTOR, - + // 55.1 - 110.0 lbs / 25.0 - 49.9 kg NATIONAL_DEX_SEADRA, NATIONAL_DEX_FLAREON, NATIONAL_DEX_CROCONAW, @@ -1592,7 +1593,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_HOUNDOOM, // Mega NATIONAL_DEX_HIPPOPOTAS, NATIONAL_DEX_HITMONLEE, - + // 110.2 - 132.1 lbs / 50.0 - 59.9 kg NATIONAL_DEX_ZWEILOUS, NATIONAL_DEX_DRAGAPULT, NATIONAL_DEX_HITMONCHAN, @@ -1649,7 +1650,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_PINSIR, // Mega NATIONAL_DEX_AERODACTYL, NATIONAL_DEX_SHIFTRY, - + // 132.3 - 218.0 lbs / 60.0 - 98.9 kg NATIONAL_DEX_NIDOQUEEN, NATIONAL_DEX_MAGNETON, NATIONAL_DEX_KINGLER, @@ -1767,9 +1768,9 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_NOSEPASS, NATIONAL_DEX_GROTLE, //NATIONAL_DEX_MAROWAK, // Alolan Form, Totem-sized - + // 218.3 - 220.2 lbs / 99.0 - 99.9 kg NATIONAL_DEX_BERGMITE, - + // 220.5 - 225.5 lbs / 100.0 - 102.3 kg NATIONAL_DEX_VENUSAUR, //NATIONAL_DEX_KANGASKHAN, // Mega NATIONAL_DEX_TROPIUS, @@ -1781,7 +1782,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_BLASTOISE, // Mega //NATIONAL_DEX_SWAMPERT, // Mega NATIONAL_DEX_BOLDORE, - + // 225.8 - 330.5 lbs / 102.4 - 149.9 kg NATIONAL_DEX_RAMPARDOS, NATIONAL_DEX_SALAMENCE, NATIONAL_DEX_GRAVELER, @@ -1838,7 +1839,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_VIKAVOLT, // Totem-sized NATIONAL_DEX_CRYOGONAL, NATIONAL_DEX_BASTIODON, - + // 330.7 - 440.7 lbs / 150.0 - 199.9 kg NATIONAL_DEX_EMBOAR, NATIONAL_DEX_NAGANADEL, NATIONAL_DEX_ARCTOZOLT, @@ -1866,7 +1867,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_VOLCANION, NATIONAL_DEX_ENTEI, NATIONAL_DEX_HO_OH, - + // 440.9 - 451.3 lbs / 200.0 - 204.7 kg NATIONAL_DEX_CRUSTLE, NATIONAL_DEX_VIRIZION, NATIONAL_DEX_REGIDRAGO, @@ -1874,11 +1875,10 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_TYRANITAR, NATIONAL_DEX_METANG, NATIONAL_DEX_YVELTAL, - + // 451.5 - 661.2 lbs / 204.8 - 299.9 kg NATIONAL_DEX_REGISTEEL, NATIONAL_DEX_RAYQUAZA, //NATIONAL_DEX_KOMMO_O, // Totem-sized - NATIONAL_DEX_ONIX, NATIONAL_DEX_DRAGONITE, NATIONAL_DEX_DHELMISE, @@ -1906,15 +1906,14 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_BEARTIC, NATIONAL_DEX_TERRAKION, NATIONAL_DEX_TYRANTRUM, - NATIONAL_DEX_RHYPERIOR, NATIONAL_DEX_MAMOSWINE, - + // 661.4 - 667.0 lbs / 300.0 - 307.1 kg NATIONAL_DEX_GOLEM, NATIONAL_DEX_HIPPOWDON, //NATIONAL_DEX_GYARADOS, // Mega NATIONAL_DEX_ZYGARDE, // 50% Forme - + // 677.3 - 667.0 lbs / 307.2 - 359.9 kg NATIONAL_DEX_TORTERRA, NATIONAL_DEX_COALOSSAL, //NATIONAL_DEX_GOLEM, // Alolan Form @@ -1931,13 +1930,13 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_GLALIE, // Mega NATIONAL_DEX_KYOGRE, //NATIONAL_DEX_ZACIAN, // Crowned Sword - + // 793.7 - 902.8 lbs / 360.0 - 409.5 kg NATIONAL_DEX_AGGRON, //NATIONAL_DEX_RAYQUAZA, // Mega //NATIONAL_DEX_AGGRON, // Mega NATIONAL_DEX_WAILORD, NATIONAL_DEX_STEELIX, - + // 903.0 - 2204.4 lbs / 409.6 - 999.9 kg //NATIONAL_DEX_EXEGGUTOR, // Alolan Form NATIONAL_DEX_REGIGIGAS, //NATIONAL_DEX_KYOGRE, // Primal @@ -1970,12 +1969,14 @@ const u16 gPokedexOrder_Weight[] = const u16 gPokedexOrder_Height[] = { + // 0'04" / 0.1m NATIONAL_DEX_JOLTIK, NATIONAL_DEX_FLABEBE, NATIONAL_DEX_CUTIEFLY, NATIONAL_DEX_COMFEY, NATIONAL_DEX_COSMOEM, NATIONAL_DEX_SINISTEA, + // 0'08" / 0.2m NATIONAL_DEX_DIGLETT, //NATIONAL_DEX_DIGLETT, // Alolan Form NATIONAL_DEX_NATU, @@ -2000,7 +2001,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_APPLIN, NATIONAL_DEX_POLTEAGEIST, NATIONAL_DEX_MILCERY, - + // 1'00" / 0.3m NATIONAL_DEX_CATERPIE, NATIONAL_DEX_WEEDLE, NATIONAL_DEX_PIDGEY, @@ -2147,7 +2148,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_TOXEL, NATIONAL_DEX_HATENNA, NATIONAL_DEX_IMPIDIMP, - + // 1'08" / 0.5m NATIONAL_DEX_SQUIRTLE, NATIONAL_DEX_NIDORAN_M, NATIONAL_DEX_JIGGLYPUFF, @@ -2217,7 +2218,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_ELDEGOSS, NATIONAL_DEX_ARROKUDA, NATIONAL_DEX_DREEPY, - + // 2'00" / 0.6m NATIONAL_DEX_CHARMANDER, NATIONAL_DEX_KAKUNA, NATIONAL_DEX_SANDSHREW, @@ -2303,7 +2304,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CLOBBOPUS, NATIONAL_DEX_HATTREM, NATIONAL_DEX_KUBFU, - + // 2'04" / 0.7m NATIONAL_DEX_BULBASAUR, NATIONAL_DEX_METAPOD, NATIONAL_DEX_RATICATE, @@ -2355,7 +2356,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_THWACKEY, NATIONAL_DEX_DRIZZILE, NATIONAL_DEX_SIZZLIPEDE, - + // 2'07" / 0.8m NATIONAL_DEX_RAICHU, NATIONAL_DEX_NIDORINA, NATIONAL_DEX_ZUBAT, @@ -2409,6 +2410,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MORGREM, NATIONAL_DEX_PERRSERKER, NATIONAL_DEX_SIRFETCHD, + // 2'11" / 0.9m NATIONAL_DEX_NIDORINO, NATIONAL_DEX_ABRA, NATIONAL_DEX_TENTACOOL, @@ -2445,7 +2447,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_LURANTIS, NATIONAL_DEX_BRUXISH, NATIONAL_DEX_INDEEDEE, - + // 3'03" / 1.0m NATIONAL_DEX_IVYSAUR, NATIONAL_DEX_WARTORTLE, NATIONAL_DEX_BEEDRILL, @@ -2516,6 +2518,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DREDNAW, NATIONAL_DEX_BOLTUND, NATIONAL_DEX_CURSOLA, + // 3'07" / 1.1m NATIONAL_DEX_CHARMELEON, NATIONAL_DEX_BUTTERFREE, NATIONAL_DEX_PIDGEOTTO, @@ -2560,6 +2563,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_LYCANROC, // Midnight Form NATIONAL_DEX_CARKOL, NATIONAL_DEX_CALYREX, + // 3'11" / 1.2m NATIONAL_DEX_FEAROW, //NATIONAL_DEX_SANDSLASH, // Alolan Form NATIONAL_DEX_VILEPLUME, @@ -2619,7 +2623,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_THIEVUL, NATIONAL_DEX_CUFANT, NATIONAL_DEX_REGIELEKI, - + // 4'03" / 1.3m NATIONAL_DEX_NIDOQUEEN, NATIONAL_DEX_CLEFABLE, NATIONAL_DEX_POLIWRATH, @@ -2656,6 +2660,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DUBWOOL, NATIONAL_DEX_BARRASKEWDA, NATIONAL_DEX_FROSMOTH, + // 4'07" / 1.4m //NATIONAL_DEX_BEEDRILL, // Mega //NATIONAL_DEX_RATICATE, // Alolan Form, Totem-sized NATIONAL_DEX_NIDOKING, @@ -2695,6 +2700,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CINDERACE, NATIONAL_DEX_EISCUE, NATIONAL_DEX_DRAKLOAK, + // 4'11" / 1.5m NATIONAL_DEX_PIDGEOT, NATIONAL_DEX_VENOMOTH, NATIONAL_DEX_ALAKAZAM, @@ -2747,7 +2753,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_ZERAORA, NATIONAL_DEX_GRIMMSNARL, NATIONAL_DEX_MR_RIME, - + // 5'03" / 1.6m NATIONAL_DEX_BLASTOISE, //NATIONAL_DEX_BLASTOISE, // Mega NATIONAL_DEX_GOLBAT, @@ -2782,6 +2788,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_GRAPPLOCT, NATIONAL_DEX_OBSTAGOON, NATIONAL_DEX_RUNERIGUS, + // 5'07" / 1.7m NATIONAL_DEX_CHARIZARD, //NATIONAL_DEX_CHARIZARD, // Mega X //NATIONAL_DEX_CHARIZARD, // Mega Y @@ -2816,6 +2823,7 @@ const u16 gPokedexOrder_Height[] = //NATIONAL_DEX_GOURGEIST, // Super Size NATIONAL_DEX_VOLCANION, NATIONAL_DEX_CRABOMINABLE, + // 5'11" / 1.8m NATIONAL_DEX_DODRIO, NATIONAL_DEX_AERODACTYL, NATIONAL_DEX_DRATINI, @@ -2845,7 +2853,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DRACOZOLT, NATIONAL_DEX_DURALUDON, NATIONAL_DEX_ZARUDE, - + // 6'03" / 1.9m NATIONAL_DEX_ARCANINE, NATIONAL_DEX_RHYDON, //NATIONAL_DEX_HOUNDOOM, // Mega @@ -2867,6 +2875,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_INTELEON, NATIONAL_DEX_URSHIFU, // Single Strike Style //NATIONAL_DEX_URSHIFU, // Rapid Strike Style + // 6'07" / 2.0m NATIONAL_DEX_VENUSAUR, NATIONAL_DEX_EKANS, //NATIONAL_DEX_SLOWBRO, // Mega @@ -2894,6 +2903,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_TURTONATOR, NATIONAL_DEX_ARCTOVISH, NATIONAL_DEX_SPECTRIER, + // 6'11" / 2.1m //NATIONAL_DEX_AERODACTYL, // Mega NATIONAL_DEX_SNORLAX, NATIONAL_DEX_MANTINE, @@ -2908,7 +2918,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_RILLABOOM, NATIONAL_DEX_HATTERENE, NATIONAL_DEX_REGIDRAGO, - + // 7'03" / 2.2m //NATIONAL_DEX_PIDGEOT, // Mega NATIONAL_DEX_KANGASKHAN, //NATIONAL_DEX_KANGASKHAN, // Mega @@ -2922,6 +2932,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_CORVIKNIGHT, NATIONAL_DEX_SILICOBRA, NATIONAL_DEX_GLASTRIER, + // 7'07" / 2.3m //NATIONAL_DEX_MEWTWO, // Mega X NATIONAL_DEX_FERALIGATR, NATIONAL_DEX_HARIYAMA, @@ -2929,13 +2940,14 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_SILVALLY, NATIONAL_DEX_ARCTOZOLT, NATIONAL_DEX_DRACOVISH, + // 7'10" / 2.4m //NATIONAL_DEX_VENUSAUR, // Mega NATIONAL_DEX_RHYPERIOR, NATIONAL_DEX_BUZZWOLE, NATIONAL_DEX_NECROZMA, //NATIONAL_DEX_CALYREX, // Ice Rider //NATIONAL_DEX_CALYREX, // Shadow Rider - + // 8'02" / 2.5m NATIONAL_DEX_LAPRAS, //NATIONAL_DEX_TYRANITAR, // Mega //NATIONAL_DEX_SHARPEDO, // Mega @@ -2947,19 +2959,23 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MUDSDALE, NATIONAL_DEX_MELMETAL, NATIONAL_DEX_STONJOURNER, + // 8'06" / 2.6m NATIONAL_DEX_BEARTIC, //NATIONAL_DEX_VIKAVOLT, // Totem-sized + // 8'10" / 2.7m NATIONAL_DEX_SEVIPER, //NATIONAL_DEX_ABOMASNOW, // Mega NATIONAL_DEX_AURORUS, - + // 9'02" / 2.8m NATIONAL_DEX_GOLURK, NATIONAL_DEX_COALOSSAL, NATIONAL_DEX_ZACIAN, // Hero of Many Battles //NATIONAL_DEX_ZACIAN, // Crowned Sword + // 9'06" / 2.9m NATIONAL_DEX_ZEKROM, NATIONAL_DEX_ZAMAZENTA, // Hero of Many Battles //NATIONAL_DEX_ZAMAZENTA, // Crowned Shield + // 9'10" / 3.0m //NATIONAL_DEX_WEEZING, // Galarian Form //NATIONAL_DEX_THUNDURUS, // Therian Form NATIONAL_DEX_KYUREM, @@ -2969,74 +2985,84 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_FALINKS, NATIONAL_DEX_COPPERAJAH, NATIONAL_DEX_DRAGAPULT, - + // 10'02" / 3.1m //NATIONAL_DEX_ARAQUANID, // Totem-sized + // 10'06" / 3.2m NATIONAL_DEX_ARCEUS, NATIONAL_DEX_RESHIRAM, + // 10'10" / 3.3m NATIONAL_DEX_SERPERIOR, //NATIONAL_DEX_KYUREM, // Black - + // 11'02" / 3.4m NATIONAL_DEX_SOLGALEO, + // 11'06" / 3.5m NATIONAL_DEX_ARBOK, NATIONAL_DEX_GROUDON, + // 11'10" / 3.6m //NATIONAL_DEX_KYUREM, // White NATIONAL_DEX_NAGANADEL, - + // 12'02" / 3.7m NATIONAL_DEX_REGIGIGAS, + // 12'06" / 3.8m NATIONAL_DEX_HO_OH, NATIONAL_DEX_XURKITREE, //NATIONAL_DEX_NECROZMA, // Dusk Mane NATIONAL_DEX_SANDACONDA, + // 12'10" / 3.9m NATIONAL_DEX_DHELMISE, - + // 13'01" / 4.0m NATIONAL_DEX_DRAGONAIR, NATIONAL_DEX_LUNALA, + // 13'09" / 4.2m NATIONAL_DEX_PALKIA, //NATIONAL_DEX_NECROZMA, // Dawn Wings - + // 14'09" / 4.5m NATIONAL_DEX_KYOGRE, NATIONAL_DEX_GIRATINA, // Altered Forme //NATIONAL_DEX_ZYGARDE, // Complete Forme - + // 16'05" / 5.0m //NATIONAL_DEX_GROUDON, // Primal NATIONAL_DEX_ZYGARDE, // 50% Forme - + // 17'01" / 5.2m NATIONAL_DEX_LUGIA, + // 17'09" / 5.4m NATIONAL_DEX_DIALGA, - + // 18'01" / 5.5m NATIONAL_DEX_GUZZLORD, NATIONAL_DEX_STAKATAKA, - + // 19'00" / 5.8m NATIONAL_DEX_YVELTAL, - + // 20'04" / 6.2m NATIONAL_DEX_MILOTIC, - + // 21'04" / 6.5m NATIONAL_DEX_GYARADOS, //NATIONAL_DEX_GYARADOS, // Mega //NATIONAL_DEX_HOOPA, // Unbound - + // 22'08" / 6.9m //NATIONAL_DEX_GIRATINA, // Origin Forme - + // 23'00" / 7.0m NATIONAL_DEX_RAYQUAZA, - + // 24'07" / 7.5m //NATIONAL_DEX_NECROZMA, // Ultra - + // 26'11" / 8.2m //NATIONAL_DEX_WISHIWASHI, // School Form - + // 28'10" / 8.8m NATIONAL_DEX_ONIX, - + // 30'02" / 9.2m NATIONAL_DEX_STEELIX, NATIONAL_DEX_CELESTEELA, - + // 32'02" / 9.8m //NATIONAL_DEX_KYOGRE, // Primal - + // 34'05" / 10.5m //NATIONAL_DEX_STEELIX, // Mega - + // 35'05" / 10.8m //NATIONAL_DEX_RAYQUAZA, // Mega - + // 35'09" / 10.9m //NATIONAL_DEX_EXEGGUTOR, // Alolan Form - + // 47'07" / 14.5m NATIONAL_DEX_WAILORD, - + // 65'07" / 20m NATIONAL_DEX_ETERNATUS, + // 328'01" / 100m + //NATIONAL_DEX_ETERNATUS, // Eternamax }; From 17f5f96f74e87236add433cd9bbed40469eaf254 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 10 Apr 2022 15:45:23 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Added=20Pok=C3=A9mon=20Jump=20data.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pokemon_jump.c | 182 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index ddf300e15..81f1eccca 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -434,17 +434,37 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATTATA_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RATICATE_ALOLAN, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_COSPLAY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ROCK_STAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_BELLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_POP_STAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PH_D, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_LIBRE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ORIGINAL_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_HOENN_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_SINNOH_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_UNOVA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_KALOS_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_ALOLA_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_PARTNER_CAP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PIKACHU_WORLD_CAP, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SANDSHREW_ALOLAN, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VULPIX_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_ALOLAN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWTH_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST, }, @@ -463,6 +483,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_TOTODILE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SPINARAK, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_PICHU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PICHU_SPIKY_EARED, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_CLEFFA, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_IGGLYBUFF, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_TOGEPI, .jumpType = JUMP_TYPE_SLOW, }, @@ -491,7 +512,9 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ZIGZAGOON_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LINOONE_GALARIAN, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW, }, @@ -506,6 +529,7 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_AZURILL, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_SKITTY, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_SABLEYE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SABLEYE_MEGA, .jumpType = JUMP_TYPE_SLOW, }, { .species = SPECIES_MAWILE, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_ARON, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_MEDITITE, .jumpType = JUMP_TYPE_SLOW, }, @@ -526,6 +550,164 @@ static const struct PokemonJumpMons sPokeJumpMons[] = { .species = SPECIES_SNORUNT, .jumpType = JUMP_TYPE_NORMAL, }, { .species = SPECIES_CLAMPERL, .jumpType = JUMP_TYPE_FAST, }, { .species = SPECIES_BAGON, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TURTWIG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CHIMCHAR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PIPLUP, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BIDOOF, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KRICKETOT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHINX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BUDEW, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHIELDON, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PACHIRISU, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BUIZEL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CHERUBI, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHERRIM, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHERRIM_SUNSHINE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHELLOS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SHELLOS_EAST_SEA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BUNEARY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GLAMEOW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_STUNKY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BONSLY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MIME_JR, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_HAPPINY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GIBLE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MUNCHLAX, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_RIOLU, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CROAGUNK, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHAYMIN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SNIVY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TEPIG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_OSHAWOTT, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PATRAT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_LILLIPUP, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PURRLOIN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PANSAGE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PANSEAR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_PANPOUR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROGGENROLA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DRILBUR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_EXCADRILL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TIMBURR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SEWADDLE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SWADLOON, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_VENIPEDE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PETILIL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SANDILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DARUMAKA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DARUMAKA_GALARIAN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DWEBBLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SCRAGGY, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ARCHEN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_TRUBBISH, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ZORUA, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MINCCINO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CINCCINO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_GOTHITA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_GOTHORITA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DEERLING, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_SUMMER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_AUTUMN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DEERLING_WINTER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_KARRABLAST, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FOONGUS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_AMOONGUSS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_JOLTIK, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_LITWICK, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_AXEW, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CUBCHOO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SHELMET, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_STUNFISK, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_STUNFISK_GALARIAN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PAWNIARD, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_DURANT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CHESPIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_QUILLADIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_FENNEKIN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FROAKIE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_FROGADIER, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_BUNNELBY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SCATTERBUG, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SPEWPA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LITLEO, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PANCHAM, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_ESPURR, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWSTIC, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MEOWSTIC_FEMALE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BINACLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CLAUNCHER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_HELIOPTILE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DEDENNE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GOOMY, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ROWLET, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_DARTRIX, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_LITTEN, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_TORRACAT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_POPPLIO, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BRIONNE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_YUNGOOS, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GUMSHOOS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_GRUBBIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CHARJABUG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_CRABRAWLER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ROCKRUFF, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROCKRUFF_OWN_TEMPO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MAREANIE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DEWPIDER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_FOMANTIS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MORELULL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SALANDIT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_STUFFUL, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_BOUNSWEET, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_STEENEE, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_WIMPOD, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_PYUKUMUKU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_KOMALA, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TOGEDEMARU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MIMIKYU, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MIMIKYU_BUSTED, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_JANGMO_O, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_MARSHADOW, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MELTAN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_GROOKEY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_THWACKEY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_SCORBUNNY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_RABOOT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SOBBLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DRIZZILE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SKWOVET, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_BLIPBUG, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_DOTTLER, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_NICKIT, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_GOSSIFLEUR, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ELDEGOSS, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_WOOLOO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_CHEWTLE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_YAMPER, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_ROLYCOLY, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_APPLIN, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_APPLETUN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_TOXEL, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_SIZZLIPEDE, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_CLOBBOPUS, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_HATENNA, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_HATTREM, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_IMPIDIMP, .jumpType = JUMP_TYPE_FAST, }, + { .species = SPECIES_ALCREMIE, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_RUBY_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_MATCHA_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_MINT_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_LEMON_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_SALTED_CREAM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_RUBY_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_CARAMEL_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_ALCREMIE_RAINBOW_SWIRL, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_PINCURCHIN, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_SNOM, .jumpType = JUMP_TYPE_SLOW, }, + { .species = SPECIES_MORPEKO, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_MORPEKO_HANGRY, .jumpType = JUMP_TYPE_NORMAL, }, + { .species = SPECIES_KUBFU, .jumpType = JUMP_TYPE_FAST, }, }; void StartPokemonJump(u16 partyId, MainCallback exitCallback)