From c4ba9439fca26767b95b6ee4a59854251c6838b8 Mon Sep 17 00:00:00 2001 From: professorleondias <57677889+professorleondias@users.noreply.github.com> Date: Thu, 21 May 2020 16:11:45 -0400 Subject: [PATCH] Update Pokedex_Orders.c --- src/Pokedex_Orders.c | 178 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 8 deletions(-) diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index 12103c4..88f682f 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -1959,6 +1959,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_CUTIEFLY, SPECIES_COMFEY, SPECIES_COSMOEM, + SPECIES_SINISTEA, SPECIES_DIGLETT, SPECIES_NATU, SPECIES_AZURILL, @@ -1978,6 +1979,10 @@ const u16 gPokedexOrder_Height[] = SPECIES_MIMIKYU, SPECIES_COSMOG, SPECIES_MELTAN, + SPECIES_ROOKIDEE, + SPECIES_APPLIN, + SPECIES_POLTEAGEIST, + SPECIES_MILCERY, SPECIES_CATERPIE, SPECIES_WEEDLE, SPECIES_PIDGEY, @@ -2032,6 +2037,18 @@ const u16 gPokedexOrder_Height[] = SPECIES_MINIOR_SHIELD, SPECIES_TOGEDEMARU, SPECIES_KARTANA, + SPECIES_GROOKEY, + SPECIES_SCORBUNNY, + SPECIES_SOBBLE, + SPECIES_SKWOVET, + SPECIES_CHEWTLE, + SPECIES_YAMPER, + SPECIES_ROLYCOLY, + SPECIES_FLAPPLE, + SPECIES_ALCREMIE_STRAWBERRY, + SPECIES_PINCURCHIN, + SPECIES_SNOM, + SPECIES_MORPEKO, SPECIES_PIKACHU, SPECIES_NIDORAN_F, SPECIES_MEOWTH, @@ -2094,6 +2111,14 @@ const u16 gPokedexOrder_Height[] = SPECIES_GRUBBIN, SPECIES_MAREANIE, SPECIES_KOMALA, + SPECIES_BLIPBUG, + SPECIES_DOTTLER, + SPECIES_ORBEETLE, + SPECIES_GOSSIFLEUR, + SPECIES_APPLETUN, + SPECIES_TOXEL, + SPECIES_HATENNA, + SPECIES_IMPIDIMP, SPECIES_SQUIRTLE, SPECIES_NIDORAN_M, SPECIES_JIGGLYPUFF, @@ -2155,6 +2180,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_STUFFUL, SPECIES_WIMPOD, SPECIES_SANDYGAST, + SPECIES_ELDEGOSS, + SPECIES_ARROKUDA, + SPECIES_DREEPY, SPECIES_CHARMANDER, SPECIES_KAKUNA, SPECIES_SANDSHREW, @@ -2228,6 +2256,13 @@ const u16 gPokedexOrder_Height[] = SPECIES_SALANDIT, SPECIES_JANGMO_O, SPECIES_POIPOLE, + SPECIES_RABOOT, + SPECIES_GREEDENT, + SPECIES_NICKIT, + SPECIES_WOOLOO, + SPECIES_CLOBBOPUS, + SPECIES_HATTREM, + SPECIES_KUBFU, SPECIES_BULBASAUR, SPECIES_METAPOD, SPECIES_RATICATE, @@ -2268,6 +2303,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_TOXAPEX, SPECIES_STEENEE, SPECIES_MARSHADOW, + SPECIES_THWACKEY, + SPECIES_DRIZZILE, + SPECIES_SIZZLIPEDE, SPECIES_RAICHU, SPECIES_NIDORINA, SPECIES_ZUBAT, @@ -2312,6 +2350,11 @@ const u16 gPokedexOrder_Height[] = SPECIES_HAWLUCHA, SPECIES_SLIGGOO, SPECIES_LYCANROC, + SPECIES_CORVISQUIRE, + SPECIES_CRAMORANT, + SPECIES_MORGREM, + SPECIES_PERRSERKER, + SPECIES_SIRFETCHD, SPECIES_NIDORINO, SPECIES_ABRA, SPECIES_TENTACOOL, @@ -2346,6 +2389,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_GOURGEIST, SPECIES_LURANTIS, SPECIES_BRUXISH, + SPECIES_INDEEDEE, SPECIES_IVYSAUR, SPECIES_WARTORTLE, SPECIES_BEEDRILL, @@ -2407,6 +2451,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_MUDBRAY, SPECIES_SHIINOTIC, SPECIES_MAGEARNA, + SPECIES_DREDNAW, + SPECIES_BOLTUND, + SPECIES_CURSOLA, SPECIES_CHARMELEON, SPECIES_BUTTERFREE, SPECIES_PIDGEOTTO, @@ -2444,6 +2491,8 @@ const u16 gPokedexOrder_Height[] = SPECIES_LARVESTA, SPECIES_FLORGES, SPECIES_TOUCANNON, + SPECIES_CARKOL, + SPECIES_CALYREX, SPECIES_FEAROW, SPECIES_VILEPLUME, SPECIES_SLOWPOKE, @@ -2494,6 +2543,8 @@ const u16 gPokedexOrder_Height[] = SPECIES_HAKAMO_O, SPECIES_TAPU_LELE, SPECIES_NIHILEGO, + SPECIES_THIEVUL, + SPECIES_CUFANT, SPECIES_NIDOQUEEN, SPECIES_CLEFABLE, SPECIES_POLIWRATH, @@ -2523,6 +2574,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_AMAURA, SPECIES_PALOSSAND, SPECIES_TAPU_FINI, + SPECIES_DUBWOOL, + SPECIES_BARRASKEWDA, + SPECIES_FROSMOTH, SPECIES_NIDOKING, SPECIES_GOLEM, SPECIES_DODUO, @@ -2552,6 +2606,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_HEATMOR, SPECIES_ZWEILOUS, SPECIES_KELDEO, + SPECIES_CINDERACE, + SPECIES_EISCUE, + SPECIES_DRAKLOAK, SPECIES_PIDGEOT, SPECIES_VENOMOTH, SPECIES_ALAKAZAM, @@ -2596,6 +2653,8 @@ const u16 gPokedexOrder_Height[] = SPECIES_VIKAVOLT, SPECIES_ORANGURU, SPECIES_ZERAORA, + SPECIES_GRIMMSNARL, + SPECIES_MR_RIME, SPECIES_BLASTOISE, SPECIES_GOLBAT, SPECIES_MACHAMP, @@ -2621,6 +2680,10 @@ const u16 gPokedexOrder_Height[] = SPECIES_CHESNAUGHT, SPECIES_DECIDUEYE, SPECIES_KOMMO_O, + SPECIES_TOXTRICITY, + SPECIES_GRAPPLOCT, + SPECIES_OBSTAGOON, + SPECIES_RUNERIGUS, SPECIES_CHARIZARD, SPECIES_GOLDUCK, SPECIES_VICTREEBEL, @@ -2665,6 +2728,9 @@ const u16 gPokedexOrder_Height[] = SPECIES_TAPU_KOKO, SPECIES_PHEROMOSA, SPECIES_BLACEPHALON, + SPECIES_DRACOZOLT, + SPECIES_DURALUDON, + SPECIES_ZARUDE, SPECIES_ARCANINE, SPECIES_RHYDON, SPECIES_RAIKOU, @@ -2678,6 +2744,8 @@ const u16 gPokedexOrder_Height[] = SPECIES_TERRAKION, SPECIES_TYPE_NULL, SPECIES_TAPU_BULU, + SPECIES_INTELEON, + SPECIES_URSHIFU_SINGLE, SPECIES_VENUSAUR, SPECIES_EKANS, SPECIES_EXEGGUTOR, @@ -2700,6 +2768,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_PASSIMIAN, SPECIES_GOLISOPOD, SPECIES_TURTONATOR, + SPECIES_ARCTOVISH, SPECIES_SNORLAX, SPECIES_MANTINE, SPECIES_ENTEI, @@ -2708,15 +2777,21 @@ const u16 gPokedexOrder_Height[] = SPECIES_COBALION, SPECIES_PANGORO, SPECIES_BEWEAR, + SPECIES_RILLABOOM, + SPECIES_HATTERENE, SPECIES_KANGASKHAN, SPECIES_DRAGONITE, SPECIES_TORTERRA, SPECIES_ABOMASNOW, SPECIES_DUSKNOIR, SPECIES_JELLICENT, + SPECIES_CORVIKNIGHT, + SPECIES_SILICOBRA, SPECIES_FERALIGATR, SPECIES_HARIYAMA, SPECIES_SILVALLY, + SPECIES_ARCTOZOLT, + SPECIES_DRACOVISH, SPECIES_RHYPERIOR, SPECIES_BUZZWOLE, SPECIES_NECROZMA, @@ -2726,14 +2801,22 @@ const u16 gPokedexOrder_Height[] = SPECIES_TYRANTRUM, SPECIES_MUDSDALE, SPECIES_MELMETAL, + SPECIES_STONJOURNER, SPECIES_BEARTIC, SPECIES_SEVIPER, SPECIES_AURORUS, SPECIES_GOLURK, + SPECIES_COALOSSAL, + SPECIES_ZACIAN, SPECIES_ZEKROM, + SPECIES_ZAMAZENTA, SPECIES_KYUREM, SPECIES_XERNEAS, SPECIES_DRAMPA, + SPECIES_CENTISKORCH, + SPECIES_FALINKS, + SPECIES_COPPERAJAH, + SPECIES_DRAGAPULT, SPECIES_ARCEUS, SPECIES_RESHIRAM, SPECIES_SERPERIOR, @@ -2744,6 +2827,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_REGIGIGAS, SPECIES_HO_OH, SPECIES_XURKITREE, + SPECIES_SANDACONDA, SPECIES_DHELMISE, SPECIES_DRAGONAIR, SPECIES_LUNALA, @@ -2763,6 +2847,7 @@ const u16 gPokedexOrder_Height[] = SPECIES_STEELIX, SPECIES_CELESTEELA, SPECIES_WAILORD, + SPECIES_ETERNATUS, }; const u16 gPokedexOrderHeightCount = ARRAY_COUNT(gPokedexOrder_Height); @@ -2834,7 +2919,10 @@ const u16 gPokedexOrder_Type[] = SPECIES_TYPE_NULL, SPECIES_SILVALLY, SPECIES_KOMALA, - SPECIES_MELOETTA_PIROUETTE, + SPECIES_SKWOVET, + SPECIES_GREEDENT, + SPECIES_WOOLOO, + SPECIES_DUBWOOL, SPECIES_STUFFUL, SPECIES_BEWEAR, SPECIES_PIDGEY, @@ -2897,6 +2985,12 @@ const u16 gPokedexOrder_Type[] = SPECIES_PANCHAM, SPECIES_CRABRAWLER, SPECIES_PASSIMIAN, + SPECIES_CLOBBOPUS, + SPECIES_GRAPPLOCT, + SPECIES_SIRFETCHD, + SPECIES_FALINKS, + SPECIES_ZAMAZENTA, + SPECIES_KUBFU, SPECIES_HAWLUCHA, SPECIES_MARSHADOW, SPECIES_LUCARIO, @@ -2904,7 +2998,12 @@ const u16 gPokedexOrder_Type[] = SPECIES_MEDICHAM, SPECIES_CRABOMINABLE, SPECIES_PANGORO, + SPECIES_URSHIFU_SINGLE, SPECIES_TORNADUS, + SPECIES_ROOKIDEE, + SPECIES_CORVISQUIRE, + SPECIES_CORVIKNIGHT, + SPECIES_CRAMORANT, SPECIES_NOIBAT, SPECIES_NOIVERN, SPECIES_EKANS, @@ -2938,6 +3037,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_TOXAPEX, SPECIES_DRAGALGE, SPECIES_NAGANADEL, + SPECIES_ETERNATUS, SPECIES_STUNKY, SPECIES_SKUNTANK, SPECIES_DRAPION, @@ -2956,6 +3056,8 @@ const u16 gPokedexOrder_Type[] = SPECIES_DRILBUR, SPECIES_MUDBRAY, SPECIES_MUDSDALE, + SPECIES_SILICOBRA, + SPECIES_SANDACONDA, SPECIES_GLIGAR, SPECIES_GLISCOR, SPECIES_LANDORUS, @@ -2964,6 +3066,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_RHYPERIOR, SPECIES_GOLETT, SPECIES_GOLURK, + SPECIES_RUNERIGUS, SPECIES_EXCADRILL, SPECIES_STUNFISK, SPECIES_BALTOY, @@ -2984,6 +3087,8 @@ const u16 gPokedexOrder_Type[] = SPECIES_GIGALITH, SPECIES_ROCKRUFF, SPECIES_LYCANROC, + SPECIES_ROLYCOLY, + SPECIES_STONJOURNER, SPECIES_TERRAKION, SPECIES_AERODACTYL, SPECIES_ARCHEN, @@ -3002,6 +3107,8 @@ const u16 gPokedexOrder_Type[] = SPECIES_BASTIODON, SPECIES_PROBOPASS, SPECIES_STAKATAKA, + SPECIES_CARKOL, + SPECIES_COALOSSAL, SPECIES_OMANYTE, SPECIES_OMASTAR, SPECIES_KABUTO, @@ -3037,6 +3144,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_SCATTERBUG, SPECIES_SPEWPA, SPECIES_GRUBBIN, + SPECIES_BLIPBUG, SPECIES_HERACROSS, SPECIES_BUZZWOLE, SPECIES_PHEROMOSA, @@ -3065,14 +3173,12 @@ const u16 gPokedexOrder_Type[] = SPECIES_WHIRLIPEDE, SPECIES_SCOLIPEDE, SPECIES_NINCADA, - SPECIES_WORMADAM_SANDY, SPECIES_SHUCKLE, SPECIES_DWEBBLE, SPECIES_CRUSTLE, SPECIES_SHEDINJA, SPECIES_FORRETRESS, SPECIES_SCIZOR, - SPECIES_WORMADAM_TRASH, SPECIES_ESCAVALIER, SPECIES_DURANT, SPECIES_GENESECT, @@ -3091,6 +3197,8 @@ const u16 gPokedexOrder_Type[] = SPECIES_GALVANTULA, SPECIES_CHARJABUG, SPECIES_VIKAVOLT, + SPECIES_DOTTLER, + SPECIES_ORBEETLE, SPECIES_CUTIEFLY, SPECIES_RIBOMBEE, SPECIES_MISDREAVUS, @@ -3102,6 +3210,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_DUSKNOIR, SPECIES_YAMASK, SPECIES_COFAGRIGUS, + SPECIES_SINISTEA, + SPECIES_POLETEAGEIST, + SPECIES_CURSOLA, SPECIES_DRIFLOON, SPECIES_DRIFBLIM, SPECIES_GASTLY, @@ -3126,6 +3237,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_KLINKLANG, SPECIES_MELTAN, SPECIES_MELMETAL, + SPECIES_PERRSERKER, + SPECIES_CUFANT, + SPECIES_COPPERAJAH, SPECIES_COBALION, SPECIES_SKARMORY, SPECIES_CELESTEELA, @@ -3143,6 +3257,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_BRONZOR, SPECIES_BRONZONG, SPECIES_DIALGA, + SPECIES_DURALUDON, SPECIES_MAWILE, SPECIES_KLEFKI, SPECIES_MAGEARNA, @@ -3176,6 +3291,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_BRAIXEN, SPECIES_LITTEN, SPECIES_TORRACAT, + SPECIES_SCORBUNNY, + SPECIES_RABOOT, + SPECIES_CINDERACE, SPECIES_LITLEO, SPECIES_PYROAR, SPECIES_COMBUSKEN, @@ -3193,6 +3311,8 @@ const u16 gPokedexOrder_Type[] = SPECIES_NUMEL, SPECIES_CAMERUPT, SPECIES_MAGCARGO, + SPECIES_SIZZLIPEDE, + SPECIES_CENTISKORCH, SPECIES_BLACEPHALON, SPECIES_HEATRAN, SPECIES_VOLCANION, @@ -3261,6 +3381,12 @@ const u16 gPokedexOrder_Type[] = SPECIES_BRIONNE, SPECIES_WISHIWASHI, SPECIES_PYUKUMUKU, + SPECIES_SOBBLE, + SPECIES_DRIZZILE, + SPECIES_INTELEON, + SPECIES_CHEWTLE, + SPECIES_ARROKUDA, + SPECIES_BARRASKEWDA, SPECIES_POLIWRATH, SPECIES_KELDEO, SPECIES_GYARADOS, @@ -3286,6 +3412,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_RELICANTH, SPECIES_TIRTOUGA, SPECIES_CARRACOSTA, + SPECIES_DREDNAW, SPECIES_DEWPIDER, SPECIES_ARAQUANID, SPECIES_FRILLISH, @@ -3304,8 +3431,10 @@ const u16 gPokedexOrder_Type[] = SPECIES_DEWGONG, SPECIES_CLOYSTER, SPECIES_LAPRAS, + SPECIES_ARCTOVISH, SPECIES_KINGDRA, SPECIES_PALKIA, + SPECIES_DRACOVISH, SPECIES_CARVANHA, SPECIES_SHARPEDO, SPECIES_CRAWDAUNT, @@ -3352,6 +3481,11 @@ const u16 gPokedexOrder_Type[] = SPECIES_BOUNSWEET, SPECIES_STEENEE, SPECIES_TSAREENA, + SPECIES_GROOKEY, + SPECIES_THWACKEY, + SPECIES_RILLABOOM, + SPECIES_GOSSIFLEUR, + SPECIES_ELDEGOSS, SPECIES_BRELOOM, SPECIES_VIRIZION, SPECIES_CHESNAUGHT, @@ -3385,6 +3519,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_EXEGGUTOR, SPECIES_SNOVER, SPECIES_ABOMASNOW, + SPECIES_APPLIN, + SPECIES_FLAPPLE, + SPECIES_APPLETUN, SPECIES_NUZLEAF, SPECIES_SHIFTRY, SPECIES_CACTURNE, @@ -3421,21 +3558,24 @@ const u16 gPokedexOrder_Type[] = SPECIES_EELEKTROSS, SPECIES_XURKITREE, SPECIES_ZERAORA, + SPECIES_YAMPER, + SPECIES_BOLTUND, + SPECIES_PINCURCHIN, SPECIES_HELIOPTILE, SPECIES_HELIOLISK, SPECIES_ZAPDOS, - SPECIES_ROTOM_FAN, SPECIES_EMOLGA, SPECIES_THUNDURUS, + SPECIES_TOXEL, + SPECIES_TOXTRICITY, SPECIES_ROTOM, SPECIES_MAGNEMITE, SPECIES_MAGNETON, SPECIES_MAGNEZONE, SPECIES_TOGEDEMARU, - SPECIES_ROTOM_HEAT, - SPECIES_ROTOM_WASH, - SPECIES_ROTOM_MOW, - SPECIES_ROTOM_FROST, + SPECIES_ARCTOZOLT, + SPECIES_DRACOZOLT, + SPECIES_MORPEKO, SPECIES_DEDENNE, SPECIES_TAPU_KOKO, SPECIES_ABRA, @@ -3473,6 +3613,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_COSMOG, SPECIES_COSMOEM, SPECIES_NECROZMA, + SPECIES_HATENNA, + SPECIES_HATTREM, + SPECIES_INDEEDEE, SPECIES_GALLADE, SPECIES_NATU, SPECIES_XATU, @@ -3485,12 +3628,14 @@ const u16 gPokedexOrder_Type[] = SPECIES_SOLGALEO, SPECIES_VICTINI, SPECIES_CELEBI, + SPECIES_CALYREX, SPECIES_MR_MIME, SPECIES_RALTS, SPECIES_KIRLIA, SPECIES_GARDEVOIR, SPECIES_MIME_JR, SPECIES_TAPU_LELE, + SPECIES_HATTERENE, SPECIES_SNORUNT, SPECIES_GLALIE, SPECIES_REGICE, @@ -3503,17 +3648,21 @@ const u16 gPokedexOrder_Type[] = SPECIES_CRYOGONAL, SPECIES_BERGMITE, SPECIES_AVALUGG, + SPECIES_EISCUE, SPECIES_ARTICUNO, SPECIES_DELIBIRD, SPECIES_SWINUB, SPECIES_PILOSWINE, SPECIES_MAMOSWINE, + SPECIES_SNOM, + SPECIES_FROSMOTH, SPECIES_FROSLASS, SPECIES_SPHEAL, SPECIES_SEALEO, SPECIES_WALREIN, SPECIES_JYNX, SPECIES_SMOOCHUM, + SPECIES_MR_RIME, SPECIES_DRATINI, SPECIES_DRAGONAIR, SPECIES_BAGON, @@ -3536,6 +3685,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_GABITE, SPECIES_GARCHOMP, SPECIES_ZYGARDE, + SPECIES_DREEPY, + SPECIES_DRAKLOAK, + SPECIES_DRAGAPULT, SPECIES_RESHIRAM, SPECIES_ZEKROM, SPECIES_LATIAS, @@ -3550,6 +3702,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_LIEPARD, SPECIES_ZORUA, SPECIES_ZOROARK, + SPECIES_NICKIT, + SPECIES_THIEVUL, + SPECIES_OBSTAGOON, SPECIES_SCRAGGY, SPECIES_SCRAFTY, SPECIES_MURKROW, @@ -3562,6 +3717,7 @@ const u16 gPokedexOrder_Type[] = SPECIES_BISHARP, SPECIES_HOUNDOUR, SPECIES_HOUNDOOM, + SPECIES_ZARUDE, SPECIES_INKAY, SPECIES_MALAMAR, SPECIES_SNEASEL, @@ -3570,6 +3726,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_ZWEILOUS, SPECIES_HYDREIGON, SPECIES_GUZZLORD, + SPECIES_IMPIDIMP, + SPECIES_MORGREM, + SPECIES_GRIMMSNARL, SPECIES_CLEFAIRY, SPECIES_CLEFABLE, SPECIES_CLEFFA, @@ -3586,6 +3745,9 @@ const u16 gPokedexOrder_Type[] = SPECIES_SYLVEON, SPECIES_XERNEAS, SPECIES_COMFEY, + SPECIES_MILCERY, + SPECIES_ALCREMIE_STRAWBERRY, + SPECIES_ZACIAN, SPECIES_TOGETIC, SPECIES_TOGEKISS, };