From 39536741e00b4987fa4c46ef47a3459c0c7545d5 Mon Sep 17 00:00:00 2001 From: Skeli Date: Mon, 26 Apr 2021 14:47:00 -0400 Subject: [PATCH] Fix Saved Regional Pokedex Order --- src/Pokedex_Orders.c | 602 +++++++++++++++++++++++++++++++++---------- 1 file changed, 472 insertions(+), 130 deletions(-) diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index 4c5072f..5e4fd86 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -3,157 +3,498 @@ const u16 gPokedexOrder_Regional[] = { - SPECIES_BULBASAUR, - SPECIES_IVYSAUR, - SPECIES_VENUSAUR, - SPECIES_CHARMANDER, - SPECIES_CHARMELEON, - SPECIES_CHARIZARD, - SPECIES_SQUIRTLE, - SPECIES_WARTORTLE, - SPECIES_BLASTOISE, + SPECIES_SNORUNT, + SPECIES_GLALIE, + SPECIES_FROSLASS, + SPECIES_VANILLITE, + SPECIES_VANILLISH, + SPECIES_VANILLUXE, + SPECIES_DELIBIRD, + SPECIES_MINIOR_SHIELD, + SPECIES_SNEASEL, + SPECIES_WEAVILE, + SPECIES_ZUBAT, + SPECIES_GOLBAT, + SPECIES_CROBAT, + SPECIES_MAKUHITA, + SPECIES_HARIYAMA, + SPECIES_SPHEAL, + SPECIES_SEALEO, + SPECIES_WALREIN, + SPECIES_SMOOCHUM, + SPECIES_JYNX, + SPECIES_ROGGENROLA, + SPECIES_BOLDORE, + SPECIES_GIGALITH, + SPECIES_SWINUB, + SPECIES_PILOSWINE, + SPECIES_MAMOSWINE, + SPECIES_BERGMITE, + SPECIES_AVALUGG, + SPECIES_DRILBUR, + SPECIES_EXCADRILL, + SPECIES_MAWILE, + SPECIES_SANDSHREW_A, + SPECIES_SANDSLASH_A, + SPECIES_STARLY, + SPECIES_STARAVIA, + SPECIES_STARAPTOR, + SPECIES_HOOTHOOT, + SPECIES_NOCTOWL, + SPECIES_PATRAT, + SPECIES_WATCHOG, + SPECIES_RATTATA, + SPECIES_RATICATE, + SPECIES_BUDEW, + SPECIES_ROSELIA, + SPECIES_ROSERADE, + SPECIES_SWABLU, + SPECIES_ALTARIA, + SPECIES_ELECTRIKE, + SPECIES_MANECTRIC, + SPECIES_AZURILL, + SPECIES_MARILL, + SPECIES_AZUMARILL, + SPECIES_STUFFUL, + SPECIES_BEWEAR, + SPECIES_SCRAGGY, + SPECIES_SCRAFTY, + SPECIES_RIOLU, + SPECIES_LUCARIO, + SPECIES_POOCHYENA, + SPECIES_MIGHTYENA, + SPECIES_WINGULL, + SPECIES_PELIPPER, + SPECIES_SENTRET, + SPECIES_FURRET, + SPECIES_BIDOOF, + SPECIES_BIBAREL, + SPECIES_BUIZEL, + SPECIES_FLOATZEL, + SPECIES_SHELLOS, + SPECIES_GASTRODON, + SPECIES_DEWPIDER, + SPECIES_ARAQUANID, + SPECIES_SURSKIT, + SPECIES_MASQUERAIN, + SPECIES_KRABBY, + SPECIES_KINGLER, + SPECIES_SANDYGAST, + SPECIES_PALOSSAND, + SPECIES_BURMY, + SPECIES_WORMADAM, + SPECIES_MOTHIM, + SPECIES_FLABEBE, + SPECIES_FLOETTE, + SPECIES_FLORGES, + SPECIES_CUTIEFLY, + SPECIES_RIBOMBEE, + SPECIES_ORICORIO, + SPECIES_PANSAGE, + SPECIES_SIMISAGE, + SPECIES_PANSEAR, + SPECIES_SIMISEAR, + SPECIES_PANPOUR, + SPECIES_SIMIPOUR, + SPECIES_COMBEE, + SPECIES_VESPIQUEN, + SPECIES_COMFEY, + SPECIES_CHERUBI, + SPECIES_CHERRIM, SPECIES_CATERPIE, SPECIES_METAPOD, SPECIES_BUTTERFREE, SPECIES_WEEDLE, SPECIES_KAKUNA, SPECIES_BEEDRILL, - SPECIES_PIDGEY, - SPECIES_PIDGEOTTO, - SPECIES_PIDGEOT, - SPECIES_RATTATA, - SPECIES_RATICATE, - SPECIES_SPEAROW, - SPECIES_FEAROW, - SPECIES_EKANS, - SPECIES_ARBOK, - SPECIES_PIKACHU, - SPECIES_RAICHU, - SPECIES_SANDSHREW, - SPECIES_SANDSLASH, - SPECIES_NIDORAN_F, - SPECIES_NIDORINA, - SPECIES_NIDOQUEEN, - SPECIES_NIDORAN_M, - SPECIES_NIDORINO, - SPECIES_NIDOKING, - SPECIES_CLEFAIRY, - SPECIES_CLEFABLE, - SPECIES_VULPIX, - SPECIES_NINETALES, - SPECIES_JIGGLYPUFF, - SPECIES_WIGGLYTUFF, - SPECIES_ZUBAT, - SPECIES_GOLBAT, - SPECIES_ODDISH, - SPECIES_GLOOM, - SPECIES_VILEPLUME, - SPECIES_PARAS, - SPECIES_PARASECT, - SPECIES_VENONAT, - SPECIES_VENOMOTH, - SPECIES_DIGLETT, - SPECIES_DUGTRIO, - SPECIES_MEOWTH, - SPECIES_PERSIAN, - SPECIES_PSYDUCK, - SPECIES_GOLDUCK, - SPECIES_MANKEY, - SPECIES_PRIMEAPE, - SPECIES_GROWLITHE, - SPECIES_ARCANINE, - SPECIES_POLIWAG, - SPECIES_POLIWHIRL, - SPECIES_POLIWRATH, - SPECIES_ABRA, - SPECIES_KADABRA, - SPECIES_ALAKAZAM, - SPECIES_MACHOP, - SPECIES_MACHOKE, - SPECIES_MACHAMP, - SPECIES_BELLSPROUT, - SPECIES_WEEPINBELL, - SPECIES_VICTREEBEL, - SPECIES_TENTACOOL, - SPECIES_TENTACRUEL, - SPECIES_GEODUDE, - SPECIES_GRAVELER, - SPECIES_GOLEM, - SPECIES_PONYTA, - SPECIES_RAPIDASH, - SPECIES_SLOWPOKE, - SPECIES_SLOWBRO, - SPECIES_MAGNEMITE, - SPECIES_MAGNETON, - SPECIES_FARFETCHD, - SPECIES_DODUO, - SPECIES_DODRIO, - SPECIES_SEEL, - SPECIES_DEWGONG, - SPECIES_GRIMER, - SPECIES_MUK, - SPECIES_SHELLDER, - SPECIES_CLOYSTER, + SPECIES_SEEDOT, + SPECIES_NUZLEAF, + SPECIES_SHIFTRY, + SPECIES_PUMPKABOO, + SPECIES_GOURGEIST, SPECIES_GASTLY, SPECIES_HAUNTER, SPECIES_GENGAR, - SPECIES_ONIX, + SPECIES_SHUPPET, + SPECIES_BANETTE, + SPECIES_DUSKULL, + SPECIES_DUSCLOPS, + SPECIES_DUSKNOIR, + SPECIES_PHANTUMP, + SPECIES_TREVENANT, + SPECIES_NINCADA, + SPECIES_NINJASK, + SPECIES_SHEDINJA, + SPECIES_PIKIPEK, + SPECIES_TRUMBEAK, + SPECIES_TOUCANNON, + SPECIES_LILLIPUP, + SPECIES_HERDIER, + SPECIES_STOUTLAND, + SPECIES_EKANS, + SPECIES_ARBOK, + SPECIES_NUMEL, + SPECIES_CAMERUPT, + SPECIES_MANKEY, + SPECIES_PRIMEAPE, + SPECIES_RALTS, + SPECIES_KIRLIA, + SPECIES_GARDEVOIR, + SPECIES_GALLADE, + SPECIES_LITLEO, + SPECIES_PYROAR, + SPECIES_WOOBAT, + SPECIES_SWOOBAT, + SPECIES_SLUGMA, + SPECIES_MAGCARGO, + SPECIES_SALANDIT, + SPECIES_SALAZZLE, + SPECIES_GEODUDE, + SPECIES_GRAVELER, + SPECIES_GOLEM, + SPECIES_TORKOAL, + SPECIES_MAGBY, + SPECIES_MAGMAR, + SPECIES_MAGMORTAR, + SPECIES_HEATMOR, + SPECIES_VULPIX, + SPECIES_NINETALES, + SPECIES_TAILLOW, + SPECIES_SWELLOW, + SPECIES_MURKROW, + SPECIES_HONCHKROW, + SPECIES_BUNNELBY, + SPECIES_DIGGERSBY, + SPECIES_NIDORAN_M, + SPECIES_NIDORINO, + SPECIES_NIDOKING, + SPECIES_NIDORAN_F, + SPECIES_NIDORINA, + SPECIES_NIDOQUEEN, + SPECIES_GROWLITHE, + SPECIES_ARCANINE, + SPECIES_HOUNDOUR, + SPECIES_HOUNDOOM, + SPECIES_DEDENNE, + SPECIES_PURRLOIN, + SPECIES_LIEPARD, + SPECIES_ARON, + SPECIES_LAIRON, + SPECIES_AGGRON, + SPECIES_NOSEPASS, + SPECIES_PROBOPASS, + SPECIES_NOIBAT, + SPECIES_NOIVERN, + SPECIES_PHANPY, + SPECIES_DONPHAN, + SPECIES_GLIGAR, + SPECIES_GLISCOR, + SPECIES_DUNSPARCE, + SPECIES_ZIGZAGOON, + SPECIES_LINOONE, + SPECIES_LEDYBA, + SPECIES_LEDIAN, + SPECIES_SPINARAK, + SPECIES_ARIADOS, + SPECIES_SHINX, + SPECIES_LUXIO, + SPECIES_LUXRAY, + SPECIES_DEERLING, + SPECIES_SAWSBUCK, + SPECIES_SUNKERN, + SPECIES_SUNFLORA, + SPECIES_KRICKETOT, + SPECIES_KRICKETUNE, + SPECIES_SMEARGLE, + SPECIES_YUNGOOS, + SPECIES_GUMSHOOS, + SPECIES_DODUO, + SPECIES_DODRIO, + SPECIES_BUNEARY, + SPECIES_LOPUNNY, + SPECIES_ABRA, + SPECIES_KADABRA, + SPECIES_ALAKAZAM, + SPECIES_MAREEP, + SPECIES_FLAAFFY, + SPECIES_AMPHAROS, + SPECIES_ESPURR, + SPECIES_MEOWSTIC, SPECIES_DROWZEE, SPECIES_HYPNO, - SPECIES_KRABBY, - SPECIES_KINGLER, - SPECIES_VOLTORB, - SPECIES_ELECTRODE, - SPECIES_EXEGGCUTE, - SPECIES_EXEGGUTOR, - SPECIES_CUBONE, - SPECIES_MAROWAK, - SPECIES_HITMONLEE, - SPECIES_HITMONCHAN, - SPECIES_LICKITUNG, - SPECIES_KOFFING, - SPECIES_WEEZING, - SPECIES_RHYHORN, - SPECIES_RHYDON, - SPECIES_CHANSEY, - SPECIES_TANGELA, - SPECIES_KANGASKHAN, - SPECIES_HORSEA, - SPECIES_SEADRA, - SPECIES_GOLDEEN, - SPECIES_SEAKING, - SPECIES_STARYU, - SPECIES_STARMIE, + SPECIES_MIME_JR, SPECIES_MR_MIME, - SPECIES_SCYTHER, - SPECIES_JYNX, - SPECIES_ELECTABUZZ, - SPECIES_MAGMAR, - SPECIES_PINSIR, - SPECIES_TAUROS, SPECIES_MAGIKARP, SPECIES_GYARADOS, - SPECIES_LAPRAS, - SPECIES_DITTO, + SPECIES_BRONZOR, + SPECIES_BRONZONG, + SPECIES_ONIX, + SPECIES_STEELIX, + SPECIES_CRYOGONAL, + SPECIES_CARBINK, + SPECIES_SNOVER, + SPECIES_ABOMASNOW, + SPECIES_CUBCHOO, + SPECIES_BEARTIC, + SPECIES_STANTLER, + SPECIES_CRABRAWLER, + SPECIES_CRABOMINABLE, + SPECIES_SPEAROW, + SPECIES_FEAROW, + SPECIES_GRUBBIN, + SPECIES_CHARJABUG, + SPECIES_VIKAVOLT, + SPECIES_SHROOMISH, + SPECIES_BRELOOM, + SPECIES_SKORUPI, + SPECIES_DRAPION, + SPECIES_HAPPINY, + SPECIES_CHANSEY, + SPECIES_BLISSEY, + SPECIES_KARRABLAST, + SPECIES_ESCAVALIER, + SPECIES_LOTAD, + SPECIES_LOMBRE, + SPECIES_LUDICOLO, + SPECIES_TYMPOLE, + SPECIES_PALPITOAD, + SPECIES_SEISMITOAD, + SPECIES_MILTANK, + SPECIES_LICKITUNG, + SPECIES_GOOMY, + SPECIES_SLIGGOO, + SPECIES_GOODRA, + SPECIES_SHELMET, + SPECIES_ACCELGOR, + SPECIES_EXEGGCUTE, + SPECIES_EXEGGUTOR, + SPECIES_MEOWTH, + SPECIES_PERSIAN, + SPECIES_YANMA, + SPECIES_YANMEGA, + SPECIES_VENONAT, + SPECIES_VENOMOTH, + SPECIES_SPOINK, + SPECIES_GRUMPIG, + SPECIES_MEDITITE, + SPECIES_MEDICHAM, + SPECIES_ABSOL, + SPECIES_GLAMEOW, + SPECIES_PURUGLY, + SPECIES_SEEL, + SPECIES_DEWGONG, + SPECIES_SHELLDER, + SPECIES_CLOYSTER, + SPECIES_STARYU, + SPECIES_STARMIE, + SPECIES_CORPHISH, + SPECIES_CRAWDAUNT, + SPECIES_GOLDEEN, + SPECIES_SEAKING, + SPECIES_REMORAID, + SPECIES_OCTILLERY, + SPECIES_WISHIWASHI, + SPECIES_CARVANHA, + SPECIES_SHARPEDO, + SPECIES_LUVDISC, + SPECIES_BARBOACH, + SPECIES_WHISCASH, + SPECIES_MAGNEMITE, + SPECIES_MAGNETON, + SPECIES_MAGNEZONE, + SPECIES_CUBONE, + SPECIES_MAROWAK, + SPECIES_KLINK, + SPECIES_KLANG, + SPECIES_KLINKLANG, + SPECIES_ELEKID, + SPECIES_ELECTABUZZ, + SPECIES_ELECTIVIRE, + SPECIES_TYNAMO, + SPECIES_EELEKTRIK, + SPECIES_EELEKTROSS, + SPECIES_TIMBURR, + SPECIES_GURDURR, + SPECIES_CONKELDURR, + SPECIES_JOLTIK, + SPECIES_GALVANTULA, + SPECIES_FERROSEED, + SPECIES_FERROTHORN, + SPECIES_CHINCHOU, + SPECIES_LANTURN, + SPECIES_MACHOP, + SPECIES_MACHOKE, + SPECIES_MACHAMP, + SPECIES_WOOPER, + SPECIES_QUAGSIRE, + SPECIES_MISDREAVUS, + SPECIES_MISMAGIUS, + SPECIES_POLIWAG, + SPECIES_POLIWHIRL, + SPECIES_POLITOED, + SPECIES_PSYDUCK, + SPECIES_GOLDUCK, + SPECIES_FLETCHLING, + SPECIES_FLETCHINDER, + SPECIES_TALONFLAME, + SPECIES_ROCKRUFF, + SPECIES_LYCANROC, + SPECIES_INKAY, + SPECIES_MALAMAR, + SPECIES_PONYTA, + SPECIES_RAPIDASH, + SPECIES_SNUBBULL, + SPECIES_GRANBULL, + SPECIES_MIENFOO, + SPECIES_MIENSHAO, + SPECIES_TOGEDEMARU, + SPECIES_SWIRLIX, + SPECIES_SLURPUFF, + SPECIES_SPRITZEE, + SPECIES_AROMATISSE, + SPECIES_WAILMER, + SPECIES_WAILORD, SPECIES_EEVEE, SPECIES_VAPOREON, SPECIES_JOLTEON, SPECIES_FLAREON, - SPECIES_PORYGON, - SPECIES_OMANYTE, - SPECIES_OMASTAR, - SPECIES_KABUTO, - SPECIES_KABUTOPS, - SPECIES_AERODACTYL, - SPECIES_SNORLAX, - SPECIES_ARTICUNO, - SPECIES_ZAPDOS, - SPECIES_MOLTRES, + SPECIES_ESPEON, + SPECIES_UMBREON, + SPECIES_LEAFEON, + SPECIES_GLACEON, + SPECIES_SYLVEON, SPECIES_DRATINI, SPECIES_DRAGONAIR, SPECIES_DRAGONITE, - SPECIES_MEWTWO, - SPECIES_MEW, + SPECIES_PORYGON, + SPECIES_PORYGON2, + SPECIES_PORYGON_Z, + SPECIES_EMOLGA, + SPECIES_HAWLUCHA, + SPECIES_KLEFKI, + SPECIES_GOLETT, + SPECIES_GOLURK, + SPECIES_CHINGLING, + SPECIES_CHIMECHO, + SPECIES_HORSEA, + SPECIES_SEADRA, + SPECIES_KINGDRA, + SPECIES_BALTOY, + SPECIES_CLAYDOL, + SPECIES_YAMASK, + SPECIES_COFAGRIGUS, + SPECIES_SABLEYE, + SPECIES_LUNATONE, + SPECIES_SOLROCK, + SPECIES_SIGILYPH, + SPECIES_TENTACOOL, + SPECIES_TENTACRUEL, + SPECIES_LAPRAS, + SPECIES_BASCULIN_RED, + SPECIES_MANTYKE, + SPECIES_MANTINE, + SPECIES_PYUKUMUKU, + SPECIES_FINNEON, + SPECIES_LUMINEON, + SPECIES_STUNFISK, + SPECIES_ALOMOMOLA, + SPECIES_SKRELP, + SPECIES_DRAGALGE, + SPECIES_CLAUNCHER, + SPECIES_CLAWITZER, + SPECIES_SLOWPOKE, + SPECIES_SLOWBRO, + SPECIES_SLOWKING, + SPECIES_BELLSPROUT, + SPECIES_WEEPINBELL, + SPECIES_VICTREEBEL, + SPECIES_ODDISH, + SPECIES_GLOOM, + SPECIES_VILEPLUME, + SPECIES_BELLOSSOM, + SPECIES_DWEBBLE, + SPECIES_CRUSTLE, + SPECIES_SANDILE, + SPECIES_KROKOROK, + SPECIES_KROOKODILE, + SPECIES_CACNEA, + SPECIES_CACTURNE, + SPECIES_DARUMAKA, + SPECIES_DARMANITAN, + SPECIES_HIPPOPOTAS, + SPECIES_HIPPOWDON, + SPECIES_TRAPINCH, + SPECIES_VIBRAVA, + SPECIES_FLYGON, + SPECIES_MARACTUS, + SPECIES_WURMPLE, + SPECIES_SILCOON, + SPECIES_BEAUTIFLY, + SPECIES_CASCOON, + SPECIES_DUSTOX, + SPECIES_SCATTERBUG, + SPECIES_SPEWPA, + SPECIES_VIVILLON, + SPECIES_COTTONEE, + SPECIES_WHIMSICOTT, + SPECIES_PETILIL, + SPECIES_LILLIGANT, + SPECIES_FOONGUS, + SPECIES_PARAS, + SPECIES_PARASECT, + SPECIES_AMOONGUSS, + SPECIES_MORELULL, + SPECIES_SHIINOTIC, + SPECIES_PICHU, + SPECIES_PIKACHU, + SPECIES_RAICHU, + SPECIES_TANGELA, + SPECIES_TANGROWTH, + SPECIES_GIRAFARIG, + SPECIES_PANCHAM, + SPECIES_PANGORO, + SPECIES_PAWNIARD, + SPECIES_BISHARP, + SPECIES_CHATOT, + SPECIES_THROH, + SPECIES_SAWK, + SPECIES_GOTHITA, + SPECIES_GOTHORITA, + SPECIES_GOTHITELLE, + SPECIES_SOLOSIS, + SPECIES_DUOSION, + SPECIES_REUNICLUS, + SPECIES_GRIMER, + SPECIES_MUK, + SPECIES_KOFFING, + SPECIES_WEEZING, + SPECIES_HOPPIP, + SPECIES_SKIPLOOM, + SPECIES_JUMPLUFF, + SPECIES_TROPIUS, + SPECIES_FARFETCHD, + SPECIES_ZANGOOSE, + SPECIES_SEVIPER, + SPECIES_BAGON, + SPECIES_SHELGON, + SPECIES_SALAMENCE, + SPECIES_VOLBEAT, + SPECIES_ILLUMISE, + SPECIES_ARTICUNO, + SPECIES_ZAPDOS, + SPECIES_MOLTRES, + SPECIES_REGIROCK, + SPECIES_REGICE, + SPECIES_REGISTEEL, + SPECIES_REGIGIGAS, + SPECIES_KYOGRE, + SPECIES_GROUDON, + SPECIES_RAYQUAZA, + SPECIES_HEATRAN, + SPECIES_SHAYMIN, + SPECIES_MAGEARNA, + SPECIES_ZERAORA, + SPECIES_HOOPA, }; const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional); @@ -703,6 +1044,7 @@ const u16 gPokedexOrder_Alphabetical[] = SPECIES_OMASTAR, SPECIES_ONIX, SPECIES_ORANGURU, + SPECIES_ORBEETLE, SPECIES_ORICORIO, SPECIES_OSHAWOTT, SPECIES_PACHIRISU,