Fix Confusing Pokedex Order Defines

This commit is contained in:
Skeli
2020-07-02 17:57:14 +03:00
parent 559430ab56
commit 833fcdc33b

View File

@@ -3,157 +3,157 @@
const u16 gPokedexOrder_Regional[] =
{
NATIONAL_DEX_BULBASAUR,
NATIONAL_DEX_IVYSAUR,
NATIONAL_DEX_VENUSAUR,
NATIONAL_DEX_CHARMANDER,
NATIONAL_DEX_CHARMELEON,
NATIONAL_DEX_CHARIZARD,
NATIONAL_DEX_SQUIRTLE,
NATIONAL_DEX_WARTORTLE,
NATIONAL_DEX_BLASTOISE,
NATIONAL_DEX_CATERPIE,
NATIONAL_DEX_METAPOD,
NATIONAL_DEX_BUTTERFREE,
NATIONAL_DEX_WEEDLE,
NATIONAL_DEX_KAKUNA,
NATIONAL_DEX_BEEDRILL,
NATIONAL_DEX_PIDGEY,
NATIONAL_DEX_PIDGEOTTO,
NATIONAL_DEX_PIDGEOT,
NATIONAL_DEX_RATTATA,
NATIONAL_DEX_RATICATE,
NATIONAL_DEX_SPEAROW,
NATIONAL_DEX_FEAROW,
NATIONAL_DEX_EKANS,
NATIONAL_DEX_ARBOK,
NATIONAL_DEX_PIKACHU,
NATIONAL_DEX_RAICHU,
NATIONAL_DEX_SANDSHREW,
NATIONAL_DEX_SANDSLASH,
NATIONAL_DEX_NIDORAN_F,
NATIONAL_DEX_NIDORINA,
NATIONAL_DEX_NIDOQUEEN,
NATIONAL_DEX_NIDORAN_M,
NATIONAL_DEX_NIDORINO,
NATIONAL_DEX_NIDOKING,
NATIONAL_DEX_CLEFAIRY,
NATIONAL_DEX_CLEFABLE,
NATIONAL_DEX_VULPIX,
NATIONAL_DEX_NINETALES,
NATIONAL_DEX_JIGGLYPUFF,
NATIONAL_DEX_WIGGLYTUFF,
NATIONAL_DEX_ZUBAT,
NATIONAL_DEX_GOLBAT,
NATIONAL_DEX_ODDISH,
NATIONAL_DEX_GLOOM,
NATIONAL_DEX_VILEPLUME,
NATIONAL_DEX_PARAS,
NATIONAL_DEX_PARASECT,
NATIONAL_DEX_VENONAT,
NATIONAL_DEX_VENOMOTH,
NATIONAL_DEX_DIGLETT,
NATIONAL_DEX_DUGTRIO,
NATIONAL_DEX_MEOWTH,
NATIONAL_DEX_PERSIAN,
NATIONAL_DEX_PSYDUCK,
NATIONAL_DEX_GOLDUCK,
NATIONAL_DEX_MANKEY,
NATIONAL_DEX_PRIMEAPE,
NATIONAL_DEX_GROWLITHE,
NATIONAL_DEX_ARCANINE,
NATIONAL_DEX_POLIWAG,
NATIONAL_DEX_POLIWHIRL,
NATIONAL_DEX_POLIWRATH,
NATIONAL_DEX_ABRA,
NATIONAL_DEX_KADABRA,
NATIONAL_DEX_ALAKAZAM,
NATIONAL_DEX_MACHOP,
NATIONAL_DEX_MACHOKE,
NATIONAL_DEX_MACHAMP,
NATIONAL_DEX_BELLSPROUT,
NATIONAL_DEX_WEEPINBELL,
NATIONAL_DEX_VICTREEBEL,
NATIONAL_DEX_TENTACOOL,
NATIONAL_DEX_TENTACRUEL,
NATIONAL_DEX_GEODUDE,
NATIONAL_DEX_GRAVELER,
NATIONAL_DEX_GOLEM,
NATIONAL_DEX_PONYTA,
NATIONAL_DEX_RAPIDASH,
NATIONAL_DEX_SLOWPOKE,
NATIONAL_DEX_SLOWBRO,
NATIONAL_DEX_MAGNEMITE,
NATIONAL_DEX_MAGNETON,
NATIONAL_DEX_FARFETCHD,
NATIONAL_DEX_DODUO,
NATIONAL_DEX_DODRIO,
NATIONAL_DEX_SEEL,
NATIONAL_DEX_DEWGONG,
NATIONAL_DEX_GRIMER,
NATIONAL_DEX_MUK,
NATIONAL_DEX_SHELLDER,
NATIONAL_DEX_CLOYSTER,
NATIONAL_DEX_GASTLY,
NATIONAL_DEX_HAUNTER,
NATIONAL_DEX_GENGAR,
NATIONAL_DEX_ONIX,
NATIONAL_DEX_DROWZEE,
NATIONAL_DEX_HYPNO,
NATIONAL_DEX_KRABBY,
NATIONAL_DEX_KINGLER,
NATIONAL_DEX_VOLTORB,
NATIONAL_DEX_ELECTRODE,
NATIONAL_DEX_EXEGGCUTE,
NATIONAL_DEX_EXEGGUTOR,
NATIONAL_DEX_CUBONE,
NATIONAL_DEX_MAROWAK,
NATIONAL_DEX_HITMONLEE,
NATIONAL_DEX_HITMONCHAN,
NATIONAL_DEX_LICKITUNG,
NATIONAL_DEX_KOFFING,
NATIONAL_DEX_WEEZING,
NATIONAL_DEX_RHYHORN,
NATIONAL_DEX_RHYDON,
NATIONAL_DEX_CHANSEY,
NATIONAL_DEX_TANGELA,
NATIONAL_DEX_KANGASKHAN,
NATIONAL_DEX_HORSEA,
NATIONAL_DEX_SEADRA,
NATIONAL_DEX_GOLDEEN,
NATIONAL_DEX_SEAKING,
NATIONAL_DEX_STARYU,
NATIONAL_DEX_STARMIE,
NATIONAL_DEX_MR_MIME,
NATIONAL_DEX_SCYTHER,
NATIONAL_DEX_JYNX,
NATIONAL_DEX_ELECTABUZZ,
NATIONAL_DEX_MAGMAR,
NATIONAL_DEX_PINSIR,
NATIONAL_DEX_TAUROS,
NATIONAL_DEX_MAGIKARP,
NATIONAL_DEX_GYARADOS,
NATIONAL_DEX_LAPRAS,
NATIONAL_DEX_DITTO,
NATIONAL_DEX_EEVEE,
NATIONAL_DEX_VAPOREON,
NATIONAL_DEX_JOLTEON,
NATIONAL_DEX_FLAREON,
NATIONAL_DEX_PORYGON,
NATIONAL_DEX_OMANYTE,
NATIONAL_DEX_OMASTAR,
NATIONAL_DEX_KABUTO,
NATIONAL_DEX_KABUTOPS,
NATIONAL_DEX_AERODACTYL,
NATIONAL_DEX_SNORLAX,
NATIONAL_DEX_ARTICUNO,
NATIONAL_DEX_ZAPDOS,
NATIONAL_DEX_MOLTRES,
NATIONAL_DEX_DRATINI,
NATIONAL_DEX_DRAGONAIR,
NATIONAL_DEX_DRAGONITE,
NATIONAL_DEX_MEWTWO,
NATIONAL_DEX_MEW,
SPECIES_BULBASAUR,
SPECIES_IVYSAUR,
SPECIES_VENUSAUR,
SPECIES_CHARMANDER,
SPECIES_CHARMELEON,
SPECIES_CHARIZARD,
SPECIES_SQUIRTLE,
SPECIES_WARTORTLE,
SPECIES_BLASTOISE,
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_GASTLY,
SPECIES_HAUNTER,
SPECIES_GENGAR,
SPECIES_ONIX,
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_MR_MIME,
SPECIES_SCYTHER,
SPECIES_JYNX,
SPECIES_ELECTABUZZ,
SPECIES_MAGMAR,
SPECIES_PINSIR,
SPECIES_TAUROS,
SPECIES_MAGIKARP,
SPECIES_GYARADOS,
SPECIES_LAPRAS,
SPECIES_DITTO,
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_DRATINI,
SPECIES_DRAGONAIR,
SPECIES_DRAGONITE,
SPECIES_MEWTWO,
SPECIES_MEW,
};
const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional);