From 5dc27ed441321469803c9539297860e03bd016f6 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 11 Oct 2022 01:39:08 -0300 Subject: [PATCH] Show forms when browsing by weight --- include/constants/species.h | 4 +- src/data/pokemon/pokedex_orders.h | 2105 +++++++++++++++-------------- src/pokedex.c | 71 +- src/pokemon.c | 14 +- 4 files changed, 1103 insertions(+), 1091 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index 4606fec23a..cda546b1af 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1077,7 +1077,8 @@ #define SPECIES_SILVALLY_DRAGON 1023 #define SPECIES_SILVALLY_DARK 1024 #define SPECIES_SILVALLY_FAIRY 1025 -#define SPECIES_MINIOR SPECIES_MINIOR_METEOR_RED +#define SPECIES_MINIOR SPECIES_MINIOR_METEOR +#define SPECIES_MINIOR_METEOR SPECIES_MINIOR_METEOR_RED #define SPECIES_MINIOR_METEOR_RED 1026 #define SPECIES_MINIOR_METEOR_ORANGE 1027 #define SPECIES_MINIOR_METEOR_YELLOW 1028 @@ -1085,6 +1086,7 @@ #define SPECIES_MINIOR_METEOR_BLUE 1030 #define SPECIES_MINIOR_METEOR_INDIGO 1031 #define SPECIES_MINIOR_METEOR_VIOLET 1032 +#define SPECIES_MINIOR_CORE SPECIES_MINIOR_CORE_RED #define SPECIES_MINIOR_CORE_RED 1033 #define SPECIES_MINIOR_CORE_ORANGE 1034 #define SPECIES_MINIOR_CORE_YELLOW 1035 diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index e1d8cc4792..acac686aca 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -935,1066 +935,1081 @@ 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, - NATIONAL_DEX_COSMOG, - NATIONAL_DEX_KARTANA, - NATIONAL_DEX_CUTIEFLY, - NATIONAL_DEX_SINISTEA, - NATIONAL_DEX_ROTOM, - NATIONAL_DEX_UXIE, - NATIONAL_DEX_MESPRIT, - NATIONAL_DEX_AZELF, - NATIONAL_DEX_TYNAMO, - NATIONAL_DEX_WISHIWASHI, // Solo Form - NATIONAL_DEX_COMFEY, - //NATIONAL_DEX_MINIOR, // Core Form - NATIONAL_DEX_MILCERY, - NATIONAL_DEX_POLTEAGEIST, - NATIONAL_DEX_CURSOLA, - NATIONAL_DEX_HOPPIP, - NATIONAL_DEX_SPRITZEE, - NATIONAL_DEX_RIBOMBEE, - NATIONAL_DEX_APPLIN, - NATIONAL_DEX_ALCREMIE, - //NATIONAL_DEX_CORSOLA, // Galarian Form - NATIONAL_DEX_CHINGLING, - NATIONAL_DEX_COTTONEE, - NATIONAL_DEX_JOLTIK, - NATIONAL_DEX_MIMIKYU, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_CASTFORM, - NATIONAL_DEX_FLOETTE, - //NATIONAL_DEX_DIGLETT, // Alolan Form - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_IGGLYBUFF, - NATIONAL_DEX_SKIPLOOM, - NATIONAL_DEX_MISDREAVUS, - NATIONAL_DEX_CHIMECHO, - NATIONAL_DEX_SOLOSIS, - NATIONAL_DEX_FOONGUS, - NATIONAL_DEX_FLAPPLE, - NATIONAL_DEX_ARROKUDA, - NATIONAL_DEX_SIZZLIPEDE, - NATIONAL_DEX_PINCURCHIN, - NATIONAL_DEX_JIRACHI, - NATIONAL_DEX_SHEDINJA, - NATIONAL_DEX_SWABLU, - NATIONAL_DEX_BUDEW, - NATIONAL_DEX_DRIFLOON, - NATIONAL_DEX_PIKIPEK, - NATIONAL_DEX_PYUKUMUKU, - NATIONAL_DEX_MANAPHY, - NATIONAL_DEX_TOGEPI, - NATIONAL_DEX_YAMASK, - //NATIONAL_DEX_YAMASK, // Galarian Form - NATIONAL_DEX_ROWLET, - NATIONAL_DEX_FOMANTIS, - NATIONAL_DEX_MORELULL, - NATIONAL_DEX_SURSKIT, - NATIONAL_DEX_FLETCHLING, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_SUNKERN, - NATIONAL_DEX_POIPOLE, - NATIONAL_DEX_ROOKIDEE, - NATIONAL_DEX_BARBOACH, - NATIONAL_DEX_CHATOT, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_PICHU, - NATIONAL_DEX_NATU, - NATIONAL_DEX_AZURILL, - NATIONAL_DEX_ROSELIA, - NATIONAL_DEX_STARLY, - NATIONAL_DEX_HONEDGE, - //NATIONAL_DEX_RIBOMBEE, // Totem-sized - NATIONAL_DEX_DREEPY, - NATIONAL_DEX_MURKROW, - NATIONAL_DEX_SHAYMIN, // Land Form - NATIONAL_DEX_PIDOVE, - NATIONAL_DEX_WOOBAT, - NATIONAL_DEX_KRICKETOT, - NATIONAL_DEX_DEDENNE, - NATIONAL_DEX_GOSSIFLEUR, - NATIONAL_DEX_TAILLOW, - NATIONAL_DEX_SHUPPET, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_TORCHIC, - NATIONAL_DEX_SEWADDLE, - NATIONAL_DEX_SCATTERBUG, - NATIONAL_DEX_SKWOVET, - NATIONAL_DEX_ELDEGOSS, - NATIONAL_DEX_LOTAD, - NATIONAL_DEX_GOOMY, - //NATIONAL_DEX_MIMIKYU, // Totem-sized - NATIONAL_DEX_CATERPIE, - NATIONAL_DEX_CLEFFA, - NATIONAL_DEX_JUMPLUFF, - NATIONAL_DEX_KLEFKI, - NATIONAL_DEX_MORPEKO, - NATIONAL_DEX_PHIONE, - NATIONAL_DEX_LITWICK, - NATIONAL_DEX_WEEDLE, - NATIONAL_DEX_TOGETIC, - NATIONAL_DEX_BOUNSWEET, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_CHERUBI, - NATIONAL_DEX_TOGEDEMARU, - NATIONAL_DEX_BURMY, - NATIONAL_DEX_ORICORIO, - NATIONAL_DEX_HATENNA, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_ESPURR, - NATIONAL_DEX_SWIRLIX, - NATIONAL_DEX_INKAY, - //NATIONAL_DEX_PUMPKABOO, // Small Size - NATIONAL_DEX_WURMPLE, - NATIONAL_DEX_MASQUERAIN, - //NATIONAL_DEX_RATTATA, // Alolan Form - NATIONAL_DEX_SNOM, - NATIONAL_DEX_QWILFISH, - NATIONAL_DEX_PACHIRISU, - NATIONAL_DEX_GLAMEOW, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_MEW, - NATIONAL_DEX_SEEDOT, - NATIONAL_DEX_VICTINI, - NATIONAL_DEX_DEWPIDER, - NATIONAL_DEX_SOBBLE, - NATIONAL_DEX_CLOBBOPUS, - NATIONAL_DEX_LILLIPUP, - NATIONAL_DEX_MEOWTH, - //NATIONAL_DEX_MEOWTH, // Alolan Form - NATIONAL_DEX_PLUSLE, - NATIONAL_DEX_MINUN, - NATIONAL_DEX_LITTEN, - NATIONAL_DEX_MISMAGIUS, - NATIONAL_DEX_GRUBBIN, - NATIONAL_DEX_SHROOMISH, - NATIONAL_DEX_TYMPOLE, - NATIONAL_DEX_DOUBLADE, - NATIONAL_DEX_SCORBUNNY, - NATIONAL_DEX_SALANDIT, - NATIONAL_DEX_HATTREM, - NATIONAL_DEX_UNOWN, - NATIONAL_DEX_CORSOLA, - NATIONAL_DEX_CELEBI, - NATIONAL_DEX_TREECKO, - NATIONAL_DEX_SPINDA, - NATIONAL_DEX_EMOLGA, - NATIONAL_DEX_BUNNELBY, - NATIONAL_DEX_SLURPUFF, - NATIONAL_DEX_PUMPKABOO, // Average Size - NATIONAL_DEX_GROOKEY, - NATIONAL_DEX_HATTERENE, - NATIONAL_DEX_PIPLUP, - //NATIONAL_DEX_SHAYMIN, // Sky Form - NATIONAL_DEX_VENIPEDE, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_NINCADA, - NATIONAL_DEX_COMBEE, - NATIONAL_DEX_BUNEARY, - NATIONAL_DEX_DUCKLETT, - NATIONAL_DEX_IMPIDIMP, - NATIONAL_DEX_VANILLITE, - NATIONAL_DEX_CARBINK, - NATIONAL_DEX_BELLOSSOM, - NATIONAL_DEX_MINCCINO, - NATIONAL_DEX_GOTHITA, - NATIONAL_DEX_OSHAWOTT, - NATIONAL_DEX_KARRABLAST, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_SENTRET, - NATIONAL_DEX_SMOOCHUM, - NATIONAL_DEX_HELIOPTILE, - NATIONAL_DEX_YUNGOOS, - NATIONAL_DEX_GREEDENT, - NATIONAL_DEX_WOOLOO, - NATIONAL_DEX_CHIMCHAR, - NATIONAL_DEX_SHELLOS, // West Sea - //NATIONAL_DEX_SHELLOS, // East Sea - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_CHIKORITA, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_SWINUB, - NATIONAL_DEX_WORMADAM, // Plant Cloak - //NATIONAL_DEX_WORMADAM, // Sandy Cloak - //NATIONAL_DEX_WORMADAM, // Trash Cloak - NATIONAL_DEX_MELOETTA, // Aria Forme - //NATIONAL_DEX_MELOETTA, // Pirouette Forme - NATIONAL_DEX_RALTS, - NATIONAL_DEX_WHIMSICOTT, - NATIONAL_DEX_PETILIL, - NATIONAL_DEX_STUFFUL, - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_FINNEON, - NATIONAL_DEX_FROAKIE, - NATIONAL_DEX_PHANTUMP, - NATIONAL_DEX_CRABRAWLER, - NATIONAL_DEX_PINECO, - NATIONAL_DEX_SWADLOON, - NATIONAL_DEX_SKRELP, - NATIONAL_DEX_FEEBAS, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_ZUBAT, - //NATIONAL_DEX_MEOWTH, // Galarian Form - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_CINCCINO, - //NATIONAL_DEX_PUMPKABOO, // Large Size - NATIONAL_DEX_POPPLIO, - NATIONAL_DEX_MUDKIP, - NATIONAL_DEX_SILICOBRA, - NATIONAL_DEX_SHELMET, - NATIONAL_DEX_CALYREX, - NATIONAL_DEX_MAREEP, - NATIONAL_DEX_SNUBBULL, - NATIONAL_DEX_CYNDAQUIL, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_DUOSION, - NATIONAL_DEX_PANCHAM, - NATIONAL_DEX_NOIBAT, - NATIONAL_DEX_MAREANIE, - NATIONAL_DEX_MELTAN, - NATIONAL_DEX_BLIPBUG, - NATIONAL_DEX_SNIVY, - NATIONAL_DEX_STEENEE, - NATIONAL_DEX_CLAUNCHER, - NATIONAL_DEX_SPEWPA, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_SPINARAK, - NATIONAL_DEX_MARILL, - NATIONAL_DEX_SUNFLORA, - NATIONAL_DEX_WOOPER, - NATIONAL_DEX_DRILBUR, - NATIONAL_DEX_CUBCHOO, - NATIONAL_DEX_MEOWSTIC, - NATIONAL_DEX_CHEWTLE, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_LUVDISC, - NATIONAL_DEX_TEDDIURSA, - NATIONAL_DEX_DIANCIE, - NATIONAL_DEX_NICKIT, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_ELGYEM, - NATIONAL_DEX_VULLABY, - NATIONAL_DEX_CHESPIN, - NATIONAL_DEX_HOOPA, // Confined - NATIONAL_DEX_RABOOT, - NATIONAL_DEX_ROCKRUFF, - NATIONAL_DEX_CHERRIM, - NATIONAL_DEX_FENNEKIN, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_TOTODILE, - NATIONAL_DEX_WINGULL, - NATIONAL_DEX_SHINX, - NATIONAL_DEX_ARCHEN, - //NATIONAL_DEX_GOURGEIST, // Small Size - NATIONAL_DEX_METAPOD, - NATIONAL_DEX_VULPIX, - //NATIONAL_DEX_VULPIX, // Alolan Form - NATIONAL_DEX_TEPIG, + SPECIES_GASTLY, + SPECIES_HAUNTER, + SPECIES_FLABEBE, + SPECIES_COSMOG, + SPECIES_KARTANA, + SPECIES_CUTIEFLY, + SPECIES_SINISTEA, + SPECIES_ROTOM, + SPECIES_UXIE, + SPECIES_MESPRIT, + SPECIES_AZELF, + SPECIES_TYNAMO, + SPECIES_WISHIWASHI_SOLO, + SPECIES_COMFEY, + SPECIES_MINIOR_CORE, + SPECIES_MILCERY, + SPECIES_POLTEAGEIST, + SPECIES_CURSOLA, + SPECIES_HOPPIP, + SPECIES_SPRITZEE, + SPECIES_RIBOMBEE, + SPECIES_APPLIN, + SPECIES_ALCREMIE, + SPECIES_CORSOLA_GALARIAN, + SPECIES_CHINGLING, + SPECIES_COTTONEE, + SPECIES_JOLTIK, + SPECIES_MIMIKYU, + SPECIES_DIGLETT, + SPECIES_CASTFORM, + SPECIES_FLOETTE, + SPECIES_DIGLETT_ALOLAN, + SPECIES_KOFFING, + SPECIES_IGGLYBUFF, + SPECIES_SKIPLOOM, + SPECIES_MISDREAVUS, + SPECIES_CHIMECHO, + SPECIES_SOLOSIS, + SPECIES_FOONGUS, + SPECIES_FLAPPLE, + SPECIES_ARROKUDA, + SPECIES_SIZZLIPEDE, + SPECIES_PINCURCHIN, + SPECIES_JIRACHI, + SPECIES_SHEDINJA, + SPECIES_SWABLU, + SPECIES_BUDEW, + SPECIES_DRIFLOON, + SPECIES_PIKIPEK, + SPECIES_PYUKUMUKU, + SPECIES_MANAPHY, + SPECIES_TOGEPI, + SPECIES_YAMASK, + SPECIES_YAMASK_GALARIAN, + SPECIES_ROWLET, + SPECIES_FOMANTIS, + SPECIES_MORELULL, + SPECIES_SURSKIT, + SPECIES_FLETCHLING, + SPECIES_PIDGEY, + SPECIES_SUNKERN, + SPECIES_POIPOLE, + SPECIES_ROOKIDEE, + SPECIES_BARBOACH, + SPECIES_CHATOT, + SPECIES_SPEAROW, + SPECIES_PICHU, + SPECIES_NATU, + SPECIES_AZURILL, + SPECIES_ROSELIA, + SPECIES_STARLY, + SPECIES_HONEDGE, + //SPECIES_RIBOMBEE, // Totem-sized + SPECIES_DREEPY, + SPECIES_MURKROW, + SPECIES_SHAYMIN_LAND, + SPECIES_PIDOVE, + SPECIES_WOOBAT, + SPECIES_KRICKETOT, + SPECIES_DEDENNE, + SPECIES_GOSSIFLEUR, + SPECIES_TAILLOW, + SPECIES_SHUPPET, + SPECIES_EXEGGCUTE, + SPECIES_TORCHIC, + SPECIES_SEWADDLE, + SPECIES_SCATTERBUG, + SPECIES_SKWOVET, + SPECIES_ELDEGOSS, + SPECIES_LOTAD, + SPECIES_GOOMY, + //SPECIES_MIMIKYU, // Totem-sized + SPECIES_CATERPIE, + SPECIES_CLEFFA, + SPECIES_JUMPLUFF, + SPECIES_KLEFKI, + SPECIES_MORPEKO, + SPECIES_PHIONE, + SPECIES_LITWICK, + SPECIES_WEEDLE, + SPECIES_TOGETIC, + SPECIES_BOUNSWEET, + SPECIES_DRATINI, + SPECIES_CHERUBI, + SPECIES_TOGEDEMARU, + SPECIES_BURMY, + SPECIES_ORICORIO, + SPECIES_HATENNA, + SPECIES_RATTATA, + SPECIES_ESPURR, + SPECIES_SWIRLIX, + SPECIES_INKAY, + SPECIES_PUMPKABOO_SMALL, + SPECIES_WURMPLE, + SPECIES_MASQUERAIN, + SPECIES_RATTATA_ALOLAN, + SPECIES_SNOM, + SPECIES_QWILFISH, + SPECIES_PACHIRISU, + SPECIES_GLAMEOW, + SPECIES_BELLSPROUT, + SPECIES_SHELLDER, + SPECIES_DITTO, + SPECIES_MEW, + SPECIES_SEEDOT, + SPECIES_VICTINI, + SPECIES_DEWPIDER, + SPECIES_SOBBLE, + SPECIES_CLOBBOPUS, + SPECIES_LILLIPUP, + SPECIES_MEOWTH, + SPECIES_MEOWTH_ALOLAN, + SPECIES_PLUSLE, + SPECIES_MINUN, + SPECIES_LITTEN, + SPECIES_MISMAGIUS, + SPECIES_GRUBBIN, + SPECIES_SHROOMISH, + SPECIES_TYMPOLE, + SPECIES_DOUBLADE, + SPECIES_SCORBUNNY, + SPECIES_SALANDIT, + SPECIES_HATTREM, + SPECIES_UNOWN, + SPECIES_CORSOLA, + SPECIES_CELEBI, + SPECIES_TREECKO, + SPECIES_SPINDA, + SPECIES_EMOLGA, + SPECIES_BUNNELBY, + SPECIES_SLURPUFF, + SPECIES_PUMPKABOO_AVERAGE, + SPECIES_GROOKEY, + SPECIES_HATTERENE, + SPECIES_PIPLUP, + SPECIES_SHAYMIN_SKY, + SPECIES_VENIPEDE, + SPECIES_ODDISH, + SPECIES_PARAS, + SPECIES_JIGGLYPUFF, + SPECIES_NINCADA, + SPECIES_COMBEE, + SPECIES_BUNEARY, + SPECIES_DUCKLETT, + SPECIES_IMPIDIMP, + SPECIES_VANILLITE, + SPECIES_CARBINK, + SPECIES_BELLOSSOM, + SPECIES_MINCCINO, + SPECIES_GOTHITA, + SPECIES_OSHAWOTT, + SPECIES_KARRABLAST, + SPECIES_PIKACHU, + SPECIES_PIKACHU_COSPLAY, + SPECIES_PIKACHU_ROCK_STAR, + SPECIES_PIKACHU_BELLE, + SPECIES_PIKACHU_POP_STAR, + SPECIES_PIKACHU_PH_D, + SPECIES_PIKACHU_LIBRE, + SPECIES_PIKACHU_ORIGINAL_CAP, + SPECIES_PIKACHU_HOENN_CAP, + SPECIES_PIKACHU_SINNOH_CAP, + SPECIES_PIKACHU_UNOVA_CAP, + SPECIES_PIKACHU_KALOS_CAP, + SPECIES_PIKACHU_ALOLA_CAP, + SPECIES_PIKACHU_PARTNER_CAP, + SPECIES_PIKACHU_WORLD_CAP, + SPECIES_MAGNEMITE, + SPECIES_SENTRET, + SPECIES_SMOOCHUM, + SPECIES_HELIOPTILE, + SPECIES_YUNGOOS, + SPECIES_GREEDENT, + SPECIES_WOOLOO, + SPECIES_CHIMCHAR, + SPECIES_SHELLOS_WEST_SEA, + SPECIES_SHELLOS_EAST_SEA, + SPECIES_WEEPINBELL, + SPECIES_CHIKORITA, + SPECIES_KRABBY, + SPECIES_CUBONE, + SPECIES_EEVEE, + SPECIES_SWINUB, + SPECIES_WORMADAM_PLANT_CLOAK, + SPECIES_WORMADAM_SANDY_CLOAK, + SPECIES_WORMADAM_TRASH_CLOAK, + SPECIES_MELOETTA_ARIA, + SPECIES_MELOETTA_PIROUETTE, + SPECIES_RALTS, + SPECIES_WHIMSICOTT, + SPECIES_PETILIL, + SPECIES_STUFFUL, + SPECIES_BULBASAUR, + SPECIES_EKANS, + SPECIES_NIDORAN_F, + SPECIES_FINNEON, + SPECIES_FROAKIE, + SPECIES_PHANTUMP, + SPECIES_CRABRAWLER, + SPECIES_PINECO, + SPECIES_SWADLOON, + SPECIES_SKRELP, + SPECIES_FEEBAS, + SPECIES_CLEFAIRY, + SPECIES_ZUBAT, + SPECIES_MEOWTH_GALARIAN, + SPECIES_OMANYTE, + SPECIES_CINCCINO, + SPECIES_PUMPKABOO_LARGE, + SPECIES_POPPLIO, + SPECIES_MUDKIP, + SPECIES_SILICOBRA, + SPECIES_SHELMET, + SPECIES_CALYREX, + SPECIES_MAREEP, + SPECIES_SNUBBULL, + SPECIES_CYNDAQUIL, + SPECIES_HORSEA, + SPECIES_DUOSION, + SPECIES_PANCHAM, + SPECIES_NOIBAT, + SPECIES_MAREANIE, + SPECIES_MELTAN, + SPECIES_BLIPBUG, + SPECIES_SNIVY, + SPECIES_STEENEE, + SPECIES_CLAUNCHER, + SPECIES_SPEWPA, + SPECIES_CHARMANDER, + SPECIES_SPINARAK, + SPECIES_MARILL, + SPECIES_SUNFLORA, + SPECIES_WOOPER, + SPECIES_DRILBUR, + SPECIES_CUBCHOO, + SPECIES_MEOWSTIC, + SPECIES_CHEWTLE, + SPECIES_GLOOM, + SPECIES_LUVDISC, + SPECIES_TEDDIURSA, + SPECIES_DIANCIE, + SPECIES_NICKIT, + SPECIES_SQUIRTLE, + SPECIES_NIDORAN_M, + SPECIES_ELGYEM, + SPECIES_VULLABY, + SPECIES_CHESPIN, + SPECIES_HOOPA_CONFINED, + SPECIES_RABOOT, + SPECIES_ROCKRUFF, + SPECIES_CHERRIM, + SPECIES_FENNEKIN, + SPECIES_WEEZING, + SPECIES_TOTODILE, + SPECIES_WINGULL, + SPECIES_SHINX, + SPECIES_ARCHEN, + SPECIES_GOURGEIST_SMALL, + SPECIES_METAPOD, + SPECIES_VULPIX, + SPECIES_VULPIX_ALOLAN, + SPECIES_TEPIG, // 22.0 - 44.1 lbs / 10.0 - 20.0 kg - NATIONAL_DEX_KAKUNA, - NATIONAL_DEX_MAGIKARP, - NATIONAL_DEX_SILCOON, - NATIONAL_DEX_FLORGES, - NATIONAL_DEX_PURRLOIN, - NATIONAL_DEX_TURTWIG, - NATIONAL_DEX_PAWNIARD, - NATIONAL_DEX_GULPIN, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_PANSAGE, - NATIONAL_DEX_SWOOBAT, - NATIONAL_DEX_AMOONGUSS, - NATIONAL_DEX_RUFFLET, - NATIONAL_DEX_CHARJABUG, - NATIONAL_DEX_LEDYBA, - NATIONAL_DEX_HOUNDOUR, - NATIONAL_DEX_FROGADIER, - NATIONAL_DEX_SKITTY, - NATIONAL_DEX_SABLEYE, - NATIONAL_DEX_PANSEAR, - NATIONAL_DEX_STUNFISK, - NATIONAL_DEX_TOXEL, - NATIONAL_DEX_DRAKLOAK, - NATIONAL_DEX_MEDITITE, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_AIPOM, - NATIONAL_DEX_CASCOON, - NATIONAL_DEX_MAWILE, - NATIONAL_DEX_CORPHISH, - NATIONAL_DEX_SHIINOTIC, - NATIONAL_DEX_DRIZZILE, - NATIONAL_DEX_PATRAT, - NATIONAL_DEX_SCRAGGY, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_CHINCHOU, - NATIONAL_DEX_REMORAID, - NATIONAL_DEX_NINJASK, - NATIONAL_DEX_SKORUPI, - NATIONAL_DEX_WIMPOD, - NATIONAL_DEX_ROLYCOLY, - NATIONAL_DEX_KUBFU, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_ANORITH, - NATIONAL_DEX_BANETTE, - NATIONAL_DEX_TIMBURR, - NATIONAL_DEX_ZORUA, - NATIONAL_DEX_GOURGEIST, // Average Size - NATIONAL_DEX_MORGREM, - NATIONAL_DEX_IVYSAUR, - //NATIONAL_DEX_VOLTORB, //Hisuian Form - //NATIONAL_DEX_BANETTE, // Mega - NATIONAL_DEX_MIME_JR, - NATIONAL_DEX_LAMPENT, - //NATIONAL_DEX_TOGEDEMARU, // Totem-sized - NATIONAL_DEX_BLACEPHALON, - NATIONAL_DEX_APPLETUN, - NATIONAL_DEX_FLAAFFY, - NATIONAL_DEX_PANPOUR, - NATIONAL_DEX_LITLEO, - NATIONAL_DEX_YAMPER, - NATIONAL_DEX_POOCHYENA, - NATIONAL_DEX_DUNSPARCE, - NATIONAL_DEX_WYNAUT, - NATIONAL_DEX_SIGILYPH, - //NATIONAL_DEX_GOURGEIST, // Large Size - NATIONAL_DEX_THWACKEY, - NATIONAL_DEX_GUMSHOOS, - NATIONAL_DEX_GALVANTULA, - NATIONAL_DEX_ROSERADE, - NATIONAL_DEX_DWEBBLE, - NATIONAL_DEX_BRAIXEN, - NATIONAL_DEX_TOXAPEX, - NATIONAL_DEX_HERDIER, - NATIONAL_DEX_TRUMBEAK, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_XATU, - NATIONAL_DEX_TRAPINCH, - NATIONAL_DEX_DUSKULL, - NATIONAL_DEX_DRIFBLIM, - NATIONAL_DEX_BONSLY, - NATIONAL_DEX_TRANQUILL, - //NATIONAL_DEX_PUMPKABOO, // Super Size - NATIONAL_DEX_ELECTRIKE, - NATIONAL_DEX_SANDILE, - NATIONAL_DEX_VIBRAVA, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_AROMATISSE, - NATIONAL_DEX_BAYLEEF, - //NATIONAL_DEX_WEEZING, // Galarian Form - NATIONAL_DEX_DELIBIRD, - NATIONAL_DEX_SERVINE, - NATIONAL_DEX_FLETCHINDER, - NATIONAL_DEX_DARTRIX, - NATIONAL_DEX_CORVISQUIRE, - NATIONAL_DEX_WHISMUR, - NATIONAL_DEX_LILLIGANT, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_TIRTOUGA, - NATIONAL_DEX_SNORUNT, - NATIONAL_DEX_PALPITOAD, - NATIONAL_DEX_VIVILLON, - NATIONAL_DEX_DEINO, - NATIONAL_DEX_ZIGZAGOON, - //NATIONAL_DEX_ZIGZAGOON, // Galarian Form - NATIONAL_DEX_SLIGGOO, - NATIONAL_DEX_BRIONNE, - NATIONAL_DEX_VOLBEAT, - NATIONAL_DEX_ILLUMISE, - NATIONAL_DEX_ROGGENROLA, - NATIONAL_DEX_BASCULIN, // Red-Striped Form - //NATIONAL_DEX_BASCULIN, // Blue-Striped Form - NATIONAL_DEX_GOTHORITA, - NATIONAL_DEX_AXEW, - NATIONAL_DEX_CRAMORANT, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_LURANTIS, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_TAPU_LELE, - NATIONAL_DEX_FERROSEED, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_QUILAVA, - NATIONAL_DEX_BRUXISH, - NATIONAL_DEX_STUNKY, - //NATIONAL_DEX_LILLIGANT, // Hisuian Form - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_COMBUSKEN, - NATIONAL_DEX_DEERLING, - NATIONAL_DEX_DOTTLER, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_SWELLOW, - NATIONAL_DEX_NINETALES, - //NATIONAL_DEX_NINETALES, // Alolan Form - NATIONAL_DEX_KOMALA, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_BIDOOF, - NATIONAL_DEX_MIENFOO, + SPECIES_KAKUNA, + SPECIES_MAGIKARP, + SPECIES_SILCOON, + SPECIES_FLORGES, + SPECIES_PURRLOIN, + SPECIES_TURTWIG, + SPECIES_PAWNIARD, + SPECIES_GULPIN, + SPECIES_VOLTORB, + SPECIES_PANSAGE, + SPECIES_SWOOBAT, + SPECIES_AMOONGUSS, + SPECIES_RUFFLET, + SPECIES_CHARJABUG, + SPECIES_LEDYBA, + SPECIES_HOUNDOUR, + SPECIES_FROGADIER, + SPECIES_SKITTY, + SPECIES_SABLEYE, + SPECIES_PANSEAR, + SPECIES_STUNFISK, + SPECIES_TOXEL, + SPECIES_DRAKLOAK, + SPECIES_MEDITITE, + SPECIES_KABUTO, + SPECIES_AIPOM, + SPECIES_CASCOON, + SPECIES_MAWILE, + SPECIES_CORPHISH, + SPECIES_SHIINOTIC, + SPECIES_DRIZZILE, + SPECIES_PATRAT, + SPECIES_SCRAGGY, + SPECIES_SANDSHREW, + SPECIES_WIGGLYTUFF, + SPECIES_CHINCHOU, + SPECIES_REMORAID, + SPECIES_NINJASK, + SPECIES_SKORUPI, + SPECIES_WIMPOD, + SPECIES_ROLYCOLY, + SPECIES_KUBFU, + SPECIES_POLIWAG, + SPECIES_VENOMOTH, + SPECIES_ANORITH, + SPECIES_BANETTE, + SPECIES_TIMBURR, + SPECIES_ZORUA, + SPECIES_GOURGEIST_AVERAGE, + SPECIES_MORGREM, + SPECIES_IVYSAUR, + SPECIES_VOLTORB_HISUIAN, + SPECIES_BANETTE_MEGA, + SPECIES_MIME_JR, + SPECIES_LAMPENT, + //SPECIES_TOGEDEMARU, // Totem-sized + SPECIES_BLACEPHALON, + SPECIES_APPLETUN, + SPECIES_FLAAFFY, + SPECIES_PANPOUR, + SPECIES_LITLEO, + SPECIES_YAMPER, + SPECIES_POOCHYENA, + SPECIES_DUNSPARCE, + SPECIES_WYNAUT, + SPECIES_SIGILYPH, + SPECIES_GOURGEIST_LARGE, + SPECIES_THWACKEY, + SPECIES_GUMSHOOS, + SPECIES_GALVANTULA, + SPECIES_ROSERADE, + SPECIES_DWEBBLE, + SPECIES_BRAIXEN, + SPECIES_TOXAPEX, + SPECIES_HERDIER, + SPECIES_TRUMBEAK, + SPECIES_FARFETCHD, + SPECIES_GOLDEEN, + SPECIES_XATU, + SPECIES_TRAPINCH, + SPECIES_DUSKULL, + SPECIES_DRIFBLIM, + SPECIES_BONSLY, + SPECIES_TRANQUILL, + SPECIES_PUMPKABOO_SUPER, + SPECIES_ELECTRIKE, + SPECIES_SANDILE, + SPECIES_VIBRAVA, + SPECIES_VICTREEBEL, + SPECIES_STARAVIA, + SPECIES_AROMATISSE, + SPECIES_BAYLEEF, + SPECIES_WEEZING_GALARIAN, + SPECIES_DELIBIRD, + SPECIES_SERVINE, + SPECIES_FLETCHINDER, + SPECIES_DARTRIX, + SPECIES_CORVISQUIRE, + SPECIES_WHISMUR, + SPECIES_LILLIGANT, + SPECIES_DRAGONAIR, + SPECIES_TIRTOUGA, + SPECIES_SNORUNT, + SPECIES_PALPITOAD, + SPECIES_VIVILLON, + SPECIES_DEINO, + SPECIES_ZIGZAGOON, + SPECIES_ZIGZAGOON_GALARIAN, + SPECIES_SLIGGOO, + SPECIES_BRIONNE, + SPECIES_VOLBEAT, + SPECIES_ILLUMISE, + SPECIES_ROGGENROLA, + SPECIES_BASCULIN_RED_STRIPED, + SPECIES_BASCULIN_BLUE_STRIPED, + SPECIES_BASCULIN_WHITE_STRIPED, + SPECIES_GOTHORITA, + SPECIES_AXEW, + SPECIES_CRAMORANT, + SPECIES_RATICATE, + SPECIES_LURANTIS, + SPECIES_VILEPLUME, + SPECIES_TAPU_LELE, + SPECIES_FERROSEED, + SPECIES_CHARMELEON, + SPECIES_GROWLITHE, + SPECIES_QUILAVA, + SPECIES_BRUXISH, + SPECIES_STUNKY, + SPECIES_LILLIGANT_HISUIAN, + SPECIES_NIDORINO, + SPECIES_ABRA, + SPECIES_MACHOP, + SPECIES_COMBUSKEN, + SPECIES_DEERLING, + SPECIES_DOTTLER, + SPECIES_PSYDUCK, + SPECIES_SWELLOW, + SPECIES_NINETALES, + SPECIES_NINETALES_ALOLAN, + SPECIES_KOMALA, + SPECIES_NIDORINA, + SPECIES_POLIWHIRL, + SPECIES_GEODUDE, + SPECIES_BIDOOF, + SPECIES_MIENFOO, // 44.3 - 54.9 lbs / 20.1 - 24.9 kg - NATIONAL_DEX_REUNICLUS, - NATIONAL_DEX_KIRLIA, - NATIONAL_DEX_RIOLU, - //NATIONAL_DEX_GEODUDE, // Alolan Form - NATIONAL_DEX_AMBIPOM, - NATIONAL_DEX_SHUCKLE, - NATIONAL_DEX_GIBLE, - NATIONAL_DEX_LEAVANNY, - NATIONAL_DEX_TAPU_KOKO, - //NATIONAL_DEX_STUNFISK, // Galarian Form - NATIONAL_DEX_ALTARIA, - //NATIONAL_DEX_ALTARIA, // Mega - NATIONAL_DEX_CARVANHA, - NATIONAL_DEX_TYROGUE, - NATIONAL_DEX_KLINK, - NATIONAL_DEX_HELIOLISK, - //NATIONAL_DEX_RAICHU, // Alolan Form - NATIONAL_DEX_HOOTHOOT, - NATIONAL_DEX_TAPU_FINI, - NATIONAL_DEX_MAGBY, - NATIONAL_DEX_TSAREENA, - NATIONAL_DEX_BALTOY, - NATIONAL_DEX_HAWLUCHA, - NATIONAL_DEX_GROVYLE, - NATIONAL_DEX_KECLEON, - NATIONAL_DEX_MONFERNO, - NATIONAL_DEX_EELEKTRIK, - NATIONAL_DEX_SALAZZLE, - NATIONAL_DEX_MARSHADOW, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_LANTURN, - NATIONAL_DEX_GOREBYSS, - //NATIONAL_DEX_GROWLITHE, //Hisuian Form - NATIONAL_DEX_PRINPLUP, - NATIONAL_DEX_CROAGUNK, - NATIONAL_DEX_MOTHIM, - NATIONAL_DEX_MUNNA, - NATIONAL_DEX_RELICANTH, - NATIONAL_DEX_ELEKID, - //NATIONAL_DEX_MAWILE, // Mega - NATIONAL_DEX_SYLVEON, - NATIONAL_DEX_WHISCASH, - NATIONAL_DEX_LILEEP, - //NATIONAL_DEX_PONYTA, // Galarian Form - NATIONAL_DEX_SLAKOTH, - NATIONAL_DEX_NUMEL, - NATIONAL_DEX_LUMINEON, - NATIONAL_DEX_SWANNA, - NATIONAL_DEX_HAPPINY, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_DEWOTT, - NATIONAL_DEX_TALONFLAME, - NATIONAL_DEX_STARAPTOR, + SPECIES_REUNICLUS, + SPECIES_KIRLIA, + SPECIES_RIOLU, + SPECIES_GEODUDE_ALOLAN, + SPECIES_AMBIPOM, + SPECIES_SHUCKLE, + SPECIES_GIBLE, + SPECIES_LEAVANNY, + SPECIES_TAPU_KOKO, + SPECIES_STUNFISK_GALARIAN, + SPECIES_ALTARIA, + SPECIES_ALTARIA_MEGA, + SPECIES_CARVANHA, + SPECIES_TYROGUE, + SPECIES_KLINK, + SPECIES_HELIOLISK, + SPECIES_RAICHU_ALOLAN, + SPECIES_HOOTHOOT, + SPECIES_TAPU_FINI, + SPECIES_MAGBY, + SPECIES_TSAREENA, + SPECIES_BALTOY, + SPECIES_HAWLUCHA, + SPECIES_GROVYLE, + SPECIES_KECLEON, + SPECIES_MONFERNO, + SPECIES_EELEKTRIK, + SPECIES_SALAZZLE, + SPECIES_MARSHADOW, + SPECIES_WARTORTLE, + SPECIES_LANTURN, + SPECIES_GOREBYSS, + SPECIES_GROWLITHE_HISUIAN, + SPECIES_PRINPLUP, + SPECIES_CROAGUNK, + SPECIES_MOTHIM, + SPECIES_MUNNA, + SPECIES_RELICANTH, + SPECIES_ELEKID, + SPECIES_MAWILE_MEGA, + SPECIES_SYLVEON, + SPECIES_WHISCASH, + SPECIES_LILEEP, + SPECIES_PONYTA_GALARIAN, + SPECIES_SLAKOTH, + SPECIES_NUMEL, + SPECIES_LUMINEON, + SPECIES_SWANNA, + SPECIES_HAPPINY, + SPECIES_JOLTEON, + SPECIES_DEWOTT, + SPECIES_TALONFLAME, + SPECIES_STARAPTOR, // 55.1 - 110.0 lbs / 25.0 - 49.9 kg - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_CROCONAW, - NATIONAL_DEX_TORRACAT, - NATIONAL_DEX_LYCANROC, // Midday Form - //NATIONAL_DEX_LYCANROC, // Midnight Form - //NATIONAL_DEX_LYCANROC, // Dusk Form - NATIONAL_DEX_PHEROMOSA, - NATIONAL_DEX_AMAURA, - NATIONAL_DEX_ACCELGOR, - NATIONAL_DEX_KRICKETUNE, - NATIONAL_DEX_LEAFEON, - //NATIONAL_DEX_RATICATE, // Alolan Form - NATIONAL_DEX_GLACEON, - NATIONAL_DEX_TYRUNT, - NATIONAL_DEX_TOUCANNON, - NATIONAL_DEX_ESPEON, - NATIONAL_DEX_FROSLASS, - NATIONAL_DEX_UMBREON, - //NATIONAL_DEX_SNEASEL, //Hisuian Form - NATIONAL_DEX_HUNTAIL, - NATIONAL_DEX_CARNIVINE, - NATIONAL_DEX_WATCHOG, - NATIONAL_DEX_HONCHKROW, - //NATIONAL_DEX_DIANCIE, // Mega - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_SNEASEL, - NATIONAL_DEX_MARSHTOMP, - NATIONAL_DEX_NUZLEAF, - NATIONAL_DEX_PELIPPER, - NATIONAL_DEX_SIMISEAR, - NATIONAL_DEX_MARACTUS, - NATIONAL_DEX_FURFROU, - NATIONAL_DEX_PERRSERKER, - NATIONAL_DEX_INDEEDEE, - //NATIONAL_DEX_LOPUNNY, // Mega - NATIONAL_DEX_BEAUTIFLY, - NATIONAL_DEX_AZUMARILL, - NATIONAL_DEX_WOBBUFFET, - NATIONAL_DEX_OCTILLERY, - NATIONAL_DEX_LARVESTA, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_SIMIPOUR, - NATIONAL_DEX_UNFEZANT, - NATIONAL_DEX_QUILLADIN, - NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_BUIZEL, - NATIONAL_DEX_JANGMO_O, - NATIONAL_DEX_BLITZLE, - NATIONAL_DEX_GASTRODON, // West Sea - //NATIONAL_DEX_GASTRODON, // East Sea - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_MUK, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_SCRAFTY, - NATIONAL_DEX_BARRASKEWDA, - NATIONAL_DEX_LUXIO, - NATIONAL_DEX_SIMISAGE, - NATIONAL_DEX_SPOINK, - NATIONAL_DEX_DUSCLOPS, - NATIONAL_DEX_AUDINO, - NATIONAL_DEX_TRUBBISH, - NATIONAL_DEX_SKIDDO, - NATIONAL_DEX_BINACLE, - NATIONAL_DEX_MEDICHAM, - NATIONAL_DEX_BIBAREL, - NATIONAL_DEX_CRANIDOS, - NATIONAL_DEX_DUSTOX, - NATIONAL_DEX_ALOMOMOLA, - NATIONAL_DEX_BUTTERFREE, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PRIMEAPE, - //NATIONAL_DEX_AUDINO, // Mega - NATIONAL_DEX_ARCHEOPS, - NATIONAL_DEX_DROWZEE, - NATIONAL_DEX_FURRET, - NATIONAL_DEX_PORYGON2, - NATIONAL_DEX_LINOONE, - //NATIONAL_DEX_LINOONE, // Galarian Form - NATIONAL_DEX_LOMBRE, - NATIONAL_DEX_DELCATTY, - NATIONAL_DEX_CRAWDAUNT, - //NATIONAL_DEX_MEWTWO, // Mega Y - NATIONAL_DEX_ESCAVALIER, - NATIONAL_DEX_FRILLISH, - NATIONAL_DEX_DURANT, - NATIONAL_DEX_CINDERACE, - //NATIONAL_DEX_PERSIAN, // Alolan Form - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_LOPUNNY, - NATIONAL_DEX_KROKOROK, - NATIONAL_DEX_ARIADOS, - NATIONAL_DEX_PHANPY, - NATIONAL_DEX_FLOATZEL, - //NATIONAL_DEX_ZYGARDE, // 10% Forme - NATIONAL_DEX_POLITOED, - //NATIONAL_DEX_MAROWAK, // Alolan Form - NATIONAL_DEX_WEAVILE, - NATIONAL_DEX_PORYGON_Z, - NATIONAL_DEX_BOLTUND, - NATIONAL_DEX_CHANDELURE, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_BEHEEYEM, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_SLUGMA, - NATIONAL_DEX_HOUNDOOM, - NATIONAL_DEX_CLAWITZER, - NATIONAL_DEX_MIENSHAO, - NATIONAL_DEX_LEDIAN, - NATIONAL_DEX_SLOWPOKE, - //NATIONAL_DEX_SLOWPOKE, // Galarian Form - NATIONAL_DEX_FRAXURE, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_DECIDUEYE, - NATIONAL_DEX_MIGHTYENA, - //NATIONAL_DEX_DECIDUEYE, //Hisuian Form - NATIONAL_DEX_LIEPARD, - NATIONAL_DEX_DARUMAKA, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_SUDOWOODO, - NATIONAL_DEX_YANMA, - NATIONAL_DEX_SKUNTANK, - NATIONAL_DEX_TOGEKISS, - NATIONAL_DEX_VESPIQUEN, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_DELPHOX, - //NATIONAL_DEX_GOURGEIST, // Super Size - NATIONAL_DEX_GRAPPLOCT, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_BRELOOM, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_SPHEAL, - NATIONAL_DEX_MANDIBUZZ, - //NATIONAL_DEX_SANDSHREW, // Alolan Form - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_LATIAS, - NATIONAL_DEX_GURDURR, - //NATIONAL_DEX_DARUMAKA, // Galarian Form - NATIONAL_DEX_GRENINJA, - //NATIONAL_DEX_GRENINJA, // Ash-Greninja - NATIONAL_DEX_MINIOR, // Meteor Form - NATIONAL_DEX_TOXTRICITY, - NATIONAL_DEX_DURALUDON, - NATIONAL_DEX_MANECTRIC, - NATIONAL_DEX_ZANGOOSE, - NATIONAL_DEX_EXCADRILL, - //NATIONAL_DEX_BEEDRILL, // Mega - NATIONAL_DEX_GENGAR, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_LOUDRED, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_NOCTOWL, - NATIONAL_DEX_ORBEETLE, - NATIONAL_DEX_VANILLISH, - NATIONAL_DEX_BRAVIARY, - NATIONAL_DEX_GIRAFARIG, - //NATIONAL_DEX_FARFETCHD, // Galarian Form - //NATIONAL_DEX_GRIMER, // Alolan Form - NATIONAL_DEX_LUXRAY, - NATIONAL_DEX_FROSMOTH, - NATIONAL_DEX_BAGON, - NATIONAL_DEX_DIGGERSBY, - NATIONAL_DEX_GLISCOR, - NATIONAL_DEX_DUBWOOL, - NATIONAL_DEX_SNEASLER, - //NATIONAL_DEX_BRAVIARY, //Hisuian Form - NATIONAL_DEX_PURUGLY, - //NATIONAL_DEX_MANECTRIC, // Mega - NATIONAL_DEX_GOTHITELLE, - NATIONAL_DEX_PRIMARINA, - NATIONAL_DEX_TOXICROAK, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_ZERAORA, - NATIONAL_DEX_SPECTRIER, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_VIKAVOLT, - NATIONAL_DEX_INTELEON, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_TAPU_BULU, - NATIONAL_DEX_VOLCARONA, - NATIONAL_DEX_OBSTAGOON, - NATIONAL_DEX_VIGOROTH, - NATIONAL_DEX_BLISSEY, - NATIONAL_DEX_ABSOL, - NATIONAL_DEX_MALAMAR, - NATIONAL_DEX_HAKAMO_O, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_ENAMORUS, - NATIONAL_DEX_GARDEVOIR, - NATIONAL_DEX_KELDEO, - NATIONAL_DEX_GRANBULL, - //NATIONAL_DEX_ABSOL, // Mega - //NATIONAL_DEX_HOUNDOOM, // Mega - NATIONAL_DEX_HIPPOPOTAS, - NATIONAL_DEX_HITMONLEE, + SPECIES_SEADRA, + SPECIES_FLAREON, + SPECIES_CROCONAW, + SPECIES_TORRACAT, + SPECIES_LYCANROC_MIDDAY, + SPECIES_LYCANROC_MIDNIGHT, + SPECIES_LYCANROC_DUSK, + SPECIES_PHEROMOSA, + SPECIES_AMAURA, + SPECIES_ACCELGOR, + SPECIES_KRICKETUNE, + SPECIES_LEAFEON, + SPECIES_RATICATE_ALOLAN, + SPECIES_GLACEON, + SPECIES_TYRUNT, + SPECIES_TOUCANNON, + SPECIES_ESPEON, + SPECIES_FROSLASS, + SPECIES_UMBREON, + SPECIES_SNEASEL_HISUIAN, + SPECIES_HUNTAIL, + SPECIES_CARNIVINE, + SPECIES_WATCHOG, + SPECIES_HONCHKROW, + SPECIES_DIANCIE_MEGA, + SPECIES_MANKEY, + SPECIES_SNEASEL, + SPECIES_MARSHTOMP, + SPECIES_NUZLEAF, + SPECIES_PELIPPER, + SPECIES_SIMISEAR, + SPECIES_MARACTUS, + SPECIES_FURFROU, + SPECIES_PERRSERKER, + SPECIES_INDEEDEE, + SPECIES_LOPUNNY_MEGA, + SPECIES_BEAUTIFLY, + SPECIES_AZUMARILL, + SPECIES_WOBBUFFET, + SPECIES_OCTILLERY, + SPECIES_LARVESTA, + SPECIES_VAPOREON, + SPECIES_SIMIPOUR, + SPECIES_UNFEZANT, + SPECIES_QUILLADIN, + SPECIES_BEEDRILL, + SPECIES_SANDSLASH, + SPECIES_PARASECT, + SPECIES_BUIZEL, + SPECIES_JANGMO_O, + SPECIES_BLITZLE, + SPECIES_GASTRODON_WEST_SEA, + SPECIES_GASTRODON_EAST_SEA, + SPECIES_PIDGEOTTO, + SPECIES_RAICHU, + SPECIES_VENONAT, + SPECIES_PONYTA, + SPECIES_GRIMER, + SPECIES_MUK, + SPECIES_ELECTABUZZ, + SPECIES_SCRAFTY, + SPECIES_BARRASKEWDA, + SPECIES_LUXIO, + SPECIES_SIMISAGE, + SPECIES_SPOINK, + SPECIES_DUSCLOPS, + SPECIES_AUDINO, + SPECIES_TRUBBISH, + SPECIES_SKIDDO, + SPECIES_BINACLE, + SPECIES_MEDICHAM, + SPECIES_BIBAREL, + SPECIES_CRANIDOS, + SPECIES_DUSTOX, + SPECIES_ALOMOMOLA, + SPECIES_BUTTERFREE, + SPECIES_PERSIAN, + SPECIES_PRIMEAPE, + SPECIES_AUDINO_MEGA, + SPECIES_ARCHEOPS, + SPECIES_DROWZEE, + SPECIES_FURRET, + SPECIES_PORYGON2, + SPECIES_LINOONE, + SPECIES_LINOONE_GALARIAN, + SPECIES_LOMBRE, + SPECIES_DELCATTY, + SPECIES_CRAWDAUNT, + SPECIES_MEWTWO_MEGA_Y, + SPECIES_ESCAVALIER, + SPECIES_FRILLISH, + SPECIES_DURANT, + SPECIES_CINDERACE, + SPECIES_PERSIAN_ALOLAN, + SPECIES_DUGTRIO, + SPECIES_LOPUNNY, + SPECIES_KROKOROK, + SPECIES_ARIADOS, + SPECIES_PHANPY, + SPECIES_FLOATZEL, + SPECIES_ZYGARDE_10, + SPECIES_POLITOED, + SPECIES_MAROWAK_ALOLAN, + SPECIES_WEAVILE, + SPECIES_PORYGON_Z, + SPECIES_BOLTUND, + SPECIES_CHANDELURE, + SPECIES_STARYU, + SPECIES_BEHEEYEM, + SPECIES_CHANSEY, + SPECIES_TANGELA, + SPECIES_OMASTAR, + SPECIES_SLUGMA, + SPECIES_HOUNDOOM, + SPECIES_CLAWITZER, + SPECIES_MIENSHAO, + SPECIES_LEDIAN, + SPECIES_SLOWPOKE, + SPECIES_SLOWPOKE_GALARIAN, + SPECIES_FRAXURE, + SPECIES_PORYGON, + SPECIES_DECIDUEYE, + SPECIES_MIGHTYENA, + SPECIES_DECIDUEYE_HISUIAN, + SPECIES_LIEPARD, + SPECIES_DARUMAKA, + SPECIES_FEAROW, + SPECIES_SUDOWOODO, + SPECIES_YANMA, + SPECIES_SKUNTANK, + SPECIES_TOGEKISS, + SPECIES_VESPIQUEN, + SPECIES_SEAKING, + SPECIES_DELPHOX, + SPECIES_GOURGEIST_SUPER, + SPECIES_GRAPPLOCT, + SPECIES_DODUO, + SPECIES_BRELOOM, + SPECIES_PIDGEOT, + SPECIES_SPHEAL, + SPECIES_MANDIBUZZ, + SPECIES_SANDSHREW_ALOLAN, + SPECIES_CLEFABLE, + SPECIES_LATIAS, + SPECIES_GURDURR, + SPECIES_DARUMAKA_GALARIAN, + SPECIES_GRENINJA, + SPECIES_GRENINJA_ASH, + SPECIES_MINIOR_METEOR, + SPECIES_TOXTRICITY, + SPECIES_DURALUDON, + SPECIES_MANECTRIC, + SPECIES_ZANGOOSE, + SPECIES_EXCADRILL, + SPECIES_BEEDRILL_MEGA, + SPECIES_GENGAR, + SPECIES_KABUTOPS, + SPECIES_LOUDRED, + SPECIES_JYNX, + SPECIES_NOCTOWL, + SPECIES_ORBEETLE, + SPECIES_VANILLISH, + SPECIES_BRAVIARY, + SPECIES_GIRAFARIG, + SPECIES_FARFETCHD_GALARIAN, + SPECIES_GRIMER_ALOLAN, + SPECIES_LUXRAY, + SPECIES_FROSMOTH, + SPECIES_BAGON, + SPECIES_DIGGERSBY, + SPECIES_GLISCOR, + SPECIES_DUBWOOL, + SPECIES_SNEASLER, + SPECIES_BRAVIARY_HISUIAN, + SPECIES_PURUGLY, + SPECIES_MANECTRIC_MEGA, + SPECIES_GOTHITELLE, + SPECIES_PRIMARINA, + SPECIES_TOXICROAK, + SPECIES_MAGMAR, + SPECIES_ZERAORA, + SPECIES_SPECTRIER, + SPECIES_MAROWAK, + SPECIES_VIKAVOLT, + SPECIES_INTELEON, + SPECIES_TENTACOOL, + SPECIES_TAPU_BULU, + SPECIES_VOLCARONA, + SPECIES_OBSTAGOON, + SPECIES_VIGOROTH, + SPECIES_BLISSEY, + SPECIES_ABSOL, + SPECIES_MALAMAR, + SPECIES_HAKAMO_O, + SPECIES_ALAKAZAM, + SPECIES_HITMONTOP, + SPECIES_ENAMORUS, + SPECIES_GARDEVOIR, + SPECIES_KELDEO, + SPECIES_GRANBULL, + SPECIES_ABSOL_MEGA, + SPECIES_HOUNDOOM_MEGA, + SPECIES_HIPPOPOTAS, + SPECIES_HITMONLEE, // 110.2 - 132.1 lbs / 50.0 - 59.9 kg - NATIONAL_DEX_ZWEILOUS, - NATIONAL_DEX_DRAGAPULT, - NATIONAL_DEX_HITMONCHAN, - //NATIONAL_DEX_PIDGEOT, // Mega - NATIONAL_DEX_SKARMORY, - NATIONAL_DEX_SNOVER, - NATIONAL_DEX_DARKRAI, - //NATIONAL_DEX_ARTICUNO, // Galarian Form - NATIONAL_DEX_SAWK, - NATIONAL_DEX_KLANG, - NATIONAL_DEX_CACNEA, - NATIONAL_DEX_YANMEGA, - //NATIONAL_DEX_MUK, // Alolan Form - NATIONAL_DEX_BLAZIKEN, - //NATIONAL_DEX_LATIAS, // Mega - NATIONAL_DEX_GALLADE, - NATIONAL_DEX_SCEPTILE, - NATIONAL_DEX_SEVIPER, - NATIONAL_DEX_CLAMPERL, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_AEGISLASH, - //NATIONAL_DEX_CALYREX, // Shadow Rider - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_HERACROSS, - NATIONAL_DEX_LUCARIO, - NATIONAL_DEX_MR_MIME, - //NATIONAL_DEX_SANDSLASH, // Alolan Form - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_MAGCARGO, - NATIONAL_DEX_LUDICOLO, - NATIONAL_DEX_INFERNAPE, - //NATIONAL_DEX_SCEPTILE, // Mega - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_PIGNITE, - NATIONAL_DEX_THROH, - NATIONAL_DEX_NIHILEGO, - NATIONAL_DEX_PILOSWINE, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_GABITE, - //NATIONAL_DEX_GALLADE, // Mega - NATIONAL_DEX_KADABRA, - //NATIONAL_DEX_MR_MIME, // Galarian Form - NATIONAL_DEX_SHIELDON, - //NATIONAL_DEX_LUCARIO, // Mega - NATIONAL_DEX_VANILLUXE, - NATIONAL_DEX_SMEARGLE, - NATIONAL_DEX_HEATMOR, - //NATIONAL_DEX_LURANTIS, // Totem-sized - //NATIONAL_DEX_ZAPDOS, // Galarian Form - //NATIONAL_DEX_SAMUROTT, // Hisuian Form - NATIONAL_DEX_MR_RIME, - NATIONAL_DEX_WHIRLIPEDE, - //NATIONAL_DEX_PINSIR, // Mega - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_SHIFTRY, + SPECIES_ZWEILOUS, + SPECIES_DRAGAPULT, + SPECIES_HITMONCHAN, + SPECIES_PIDGEOT_MEGA, + SPECIES_SKARMORY, + SPECIES_SNOVER, + SPECIES_DARKRAI, + SPECIES_ARTICUNO_GALARIAN, + SPECIES_SAWK, + SPECIES_KLANG, + SPECIES_CACNEA, + SPECIES_YANMEGA, + SPECIES_MUK_ALOLAN, + SPECIES_BLAZIKEN, + SPECIES_LATIAS_MEGA, + SPECIES_GALLADE, + SPECIES_SCEPTILE, + SPECIES_SEVIPER, + SPECIES_CLAMPERL, + SPECIES_ZAPDOS, + SPECIES_AEGISLASH, + SPECIES_CALYREX_SHADOW_RIDER, + SPECIES_POLIWRATH, + SPECIES_HERACROSS, + SPECIES_LUCARIO, + SPECIES_MR_MIME, + SPECIES_SANDSLASH_ALOLAN, + SPECIES_GOLBAT, + SPECIES_TENTACRUEL, + SPECIES_PINSIR, + SPECIES_MAGCARGO, + SPECIES_LUDICOLO, + SPECIES_INFERNAPE, + SPECIES_SCEPTILE_MEGA, + SPECIES_ARTICUNO, + SPECIES_PIGNITE, + SPECIES_THROH, + SPECIES_NIHILEGO, + SPECIES_PILOSWINE, + SPECIES_SCYTHER, + SPECIES_GABITE, + SPECIES_GALLADE_MEGA, + SPECIES_KADABRA, + SPECIES_MR_MIME_GALARIAN, + SPECIES_SHIELDON, + SPECIES_LUCARIO_MEGA, + SPECIES_VANILLUXE, + SPECIES_SMEARGLE, + SPECIES_HEATMOR, + //SPECIES_LURANTIS, // Totem-sized + SPECIES_ZAPDOS_GALARIAN, + SPECIES_SAMUROTT_HISUIAN, + SPECIES_MR_RIME, + SPECIES_WHIRLIPEDE, + SPECIES_PINSIR_MEGA, + SPECIES_AERODACTYL, + SPECIES_SHIFTRY, // 132.3 - 218.0 lbs / 60.0 - 98.9 kg - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_ARON, - NATIONAL_DEX_LATIOS, - //NATIONAL_DEX_GUMSHOOS, // Totem-sized - NATIONAL_DEX_CRADILY, - NATIONAL_DEX_BRONZOR, - NATIONAL_DEX_MUSHARNA, - NATIONAL_DEX_OVERQWIL, - NATIONAL_DEX_DEOXYS, // Normal Forme - //NATIONAL_DEX_DEOXYS, // Attack Forme - //NATIONAL_DEX_DEOXYS, // Defense Forme - //NATIONAL_DEX_DEOXYS, // Speed Forme - NATIONAL_DEX_STOUTLAND, - NATIONAL_DEX_THUNDURUS, - NATIONAL_DEX_GRIMMSNARL, - NATIONAL_DEX_AMPHAROS, - NATIONAL_DEX_DRAPION, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_SEISMITOAD, - NATIONAL_DEX_FALINKS, - //NATIONAL_DEX_HERACROSS, // Mega - NATIONAL_DEX_SERPERIOR, - NATIONAL_DEX_TORNADUS, - NATIONAL_DEX_GLIGAR, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_MANTYKE, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_SANDACONDA, - //NATIONAL_DEX_MOLTRES, // Galarian Form - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_RUNERIGUS, - //NATIONAL_DEX_DUGTRIO, // Alolan Form - NATIONAL_DEX_MAGMORTAR, - NATIONAL_DEX_LANDORUS, - NATIONAL_DEX_ARMALDO, - //NATIONAL_DEX_SLIGGOO, //Hisuian Form - //NATIONAL_DEX_TYPHLOSION, //Hisuian Form - //NATIONAL_DEX_LATIOS, // Mega - NATIONAL_DEX_BISHARP, - NATIONAL_DEX_SANDYGAST, - NATIONAL_DEX_ZARUDE, - NATIONAL_DEX_MACHOKE, - //NATIONAL_DEX_SLOWBRO, // Galarian Form - //NATIONAL_DEX_ELECTRODE //Hisuian Form - NATIONAL_DEX_TREVENANT, - NATIONAL_DEX_STANTLER, - NATIONAL_DEX_GRUMPIG, - NATIONAL_DEX_LARVITAR, - //NATIONAL_DEX_ZOROARK, //Hisuian Form - NATIONAL_DEX_CROBAT, - NATIONAL_DEX_QUAGSIRE, - NATIONAL_DEX_CORVIKNIGHT, - NATIONAL_DEX_MILTANK, - NATIONAL_DEX_HYPNO, - NATIONAL_DEX_ORANGURU, - NATIONAL_DEX_COFAGRIGUS, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_CACTURNE, - NATIONAL_DEX_CARKOL, - NATIONAL_DEX_KOMMO_O, - NATIONAL_DEX_SLOWBRO, - //NATIONAL_DEX_WISHIWASHI, // School Form - //NATIONAL_DEX_AERODACTYL, // Mega - NATIONAL_DEX_TYPHLOSION, - NATIONAL_DEX_SLOWKING, - //NATIONAL_DEX_SLOWKING, // Galarian Form - NATIONAL_DEX_ZEBSTRIKA, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_STARMIE, - NATIONAL_DEX_SWALOT, - //NATIONAL_DEX_RAPIDASH, // Galarian Form - NATIONAL_DEX_TORKOAL, - NATIONAL_DEX_EELEKTROSS, - NATIONAL_DEX_MAGEARNA, - //NATIONAL_DEX_MAGEARNA, // Original Color - NATIONAL_DEX_CARRACOSTA, - NATIONAL_DEX_KLINKLANG, - NATIONAL_DEX_ZOROARK, - //NATIONAL_DEX_SALAZZLE, // Totem-sized - NATIONAL_DEX_PYROAR, - NATIONAL_DEX_DRAGALGE, - NATIONAL_DEX_SWAMPERT, - NATIONAL_DEX_FLYGON, - NATIONAL_DEX_ARAQUANID, - NATIONAL_DEX_GENESECT, - NATIONAL_DEX_PASSIMIAN, - NATIONAL_DEX_INCINEROAR, - NATIONAL_DEX_EXPLOUD, - NATIONAL_DEX_EMPOLEON, - NATIONAL_DEX_NOIVERN, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_BLASTOISE, - NATIONAL_DEX_CRESSELIA, - NATIONAL_DEX_MAKUHITA, - NATIONAL_DEX_CONKELDURR, - NATIONAL_DEX_SEALEO, - NATIONAL_DEX_TAUROS, - NATIONAL_DEX_FERALIGATR, - NATIONAL_DEX_SHARPEDO, - NATIONAL_DEX_EISCUE, - NATIONAL_DEX_KLEAVOR, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_CHESNAUGHT, - NATIONAL_DEX_RILLABOOM, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_GOGOAT, - NATIONAL_DEX_GOLETT, - NATIONAL_DEX_SAWSBUCK, - NATIONAL_DEX_DARMANITAN, - NATIONAL_DEX_BOUFFALANT, - NATIONAL_DEX_SAMUROTT, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_GARCHOMP, - NATIONAL_DEX_WYRDEER, - NATIONAL_DEX_BELDUM, - NATIONAL_DEX_BARBARACLE, - NATIONAL_DEX_KROOKODILE, - NATIONAL_DEX_NOSEPASS, - NATIONAL_DEX_GROTLE, - //NATIONAL_DEX_MAROWAK, // Alolan Form, Totem-sized + SPECIES_NIDOQUEEN, + SPECIES_MAGNETON, + SPECIES_KINGLER, + SPECIES_MOLTRES, + SPECIES_ARON, + SPECIES_LATIOS, + //SPECIES_GUMSHOOS, // Totem-sized + SPECIES_CRADILY, + SPECIES_BRONZOR, + SPECIES_MUSHARNA, + SPECIES_OVERQWIL, + SPECIES_DEOXYS_NORMAL, + SPECIES_DEOXYS_ATTACK, + SPECIES_DEOXYS_DEFENSE, + SPECIES_DEOXYS_SPEED, + SPECIES_STOUTLAND, + SPECIES_THUNDURUS, + SPECIES_GRIMMSNARL, + SPECIES_AMPHAROS, + SPECIES_DRAPION, + SPECIES_NIDOKING, + SPECIES_SEISMITOAD, + SPECIES_FALINKS, + SPECIES_HERACROSS_MEGA, + SPECIES_SERPERIOR, + SPECIES_TORNADUS, + SPECIES_GLIGAR, + SPECIES_ARBOK, + SPECIES_MANTYKE, + SPECIES_LICKITUNG, + SPECIES_SANDACONDA, + SPECIES_MOLTRES_GALARIAN, + SPECIES_ELECTRODE, + SPECIES_RUNERIGUS, + SPECIES_DUGTRIO_ALOLAN, + SPECIES_MAGMORTAR, + SPECIES_LANDORUS, + SPECIES_ARMALDO, + SPECIES_SLIGGOO_HISUIAN, + SPECIES_TYPHLOSION_HISUIAN, + SPECIES_LATIOS_MEGA, + SPECIES_BISHARP, + SPECIES_SANDYGAST, + SPECIES_ZARUDE, + SPECIES_MACHOKE, + SPECIES_SLOWBRO_GALARIAN, + SPECIES_ELECTRODE_HISUIAN, + SPECIES_TREVENANT, + SPECIES_STANTLER, + SPECIES_GRUMPIG, + SPECIES_LARVITAR, + SPECIES_ZOROARK_HISUIAN, + SPECIES_CROBAT, + SPECIES_QUAGSIRE, + SPECIES_CORVIKNIGHT, + SPECIES_MILTANK, + SPECIES_HYPNO, + SPECIES_ORANGURU, + SPECIES_COFAGRIGUS, + SPECIES_GOLDUCK, + SPECIES_CACTURNE, + SPECIES_CARKOL, + SPECIES_KOMMO_O, + SPECIES_SLOWBRO, + SPECIES_WISHIWASHI_SCHOOL, + SPECIES_AERODACTYL_MEGA, + SPECIES_TYPHLOSION, + SPECIES_SLOWKING, + SPECIES_SLOWKING_GALARIAN, + SPECIES_ZEBSTRIKA, + SPECIES_KANGASKHAN, + SPECIES_STARMIE, + SPECIES_SWALOT, + SPECIES_RAPIDASH_GALARIAN, + SPECIES_TORKOAL, + SPECIES_EELEKTROSS, + SPECIES_MAGEARNA, + SPECIES_MAGEARNA_ORIGINAL_COLOR, + SPECIES_CARRACOSTA, + SPECIES_KLINKLANG, + SPECIES_ZOROARK, + //SPECIES_SALAZZLE, // Totem-sized + SPECIES_PYROAR, + SPECIES_DRAGALGE, + SPECIES_SWAMPERT, + SPECIES_FLYGON, + SPECIES_ARAQUANID, + SPECIES_GENESECT, + SPECIES_PASSIMIAN, + SPECIES_INCINEROAR, + SPECIES_EXPLOUD, + SPECIES_EMPOLEON, + SPECIES_NOIVERN, + SPECIES_DODRIO, + SPECIES_BLASTOISE, + SPECIES_CRESSELIA, + SPECIES_MAKUHITA, + SPECIES_CONKELDURR, + SPECIES_SEALEO, + SPECIES_TAUROS, + SPECIES_FERALIGATR, + SPECIES_SHARPEDO, + SPECIES_EISCUE, + SPECIES_KLEAVOR, + SPECIES_SEEL, + SPECIES_CHESNAUGHT, + SPECIES_RILLABOOM, + SPECIES_CHARIZARD, + SPECIES_RAPIDASH, + SPECIES_GOGOAT, + SPECIES_GOLETT, + SPECIES_SAWSBUCK, + SPECIES_DARMANITAN, + SPECIES_BOUFFALANT, + SPECIES_SAMUROTT, + SPECIES_RAPIDASH, + SPECIES_GARCHOMP, + SPECIES_WYRDEER, + SPECIES_BELDUM, + SPECIES_BARBARACLE, + SPECIES_KROOKODILE, + SPECIES_NOSEPASS, + SPECIES_GROTLE, + //SPECIES_MAROWAK, // Alolan Form, Totem-sized // 218.3 - 220.2 lbs / 99.0 - 99.9 kg - NATIONAL_DEX_BERGMITE, + SPECIES_BERGMITE, // 220.5 - 225.5 lbs / 100.0 - 102.3 kg - NATIONAL_DEX_VENUSAUR, - //NATIONAL_DEX_KANGASKHAN, // Mega - NATIONAL_DEX_TROPIUS, - NATIONAL_DEX_XURKITREE, - NATIONAL_DEX_CUFANT, - //NATIONAL_DEX_CHARIZARD, // Mega Y - NATIONAL_DEX_MEGANIUM, - NATIONAL_DEX_SILVALLY, - //NATIONAL_DEX_BLASTOISE, // Mega - //NATIONAL_DEX_SWAMPERT, // Mega - NATIONAL_DEX_BOLDORE, + SPECIES_VENUSAUR, + SPECIES_KANGASKHAN_MEGA, + SPECIES_TROPIUS, + SPECIES_XURKITREE, + SPECIES_CUFANT, + SPECIES_CHARIZARD_MEGA_Y, + SPECIES_MEGANIUM, + SPECIES_SILVALLY, + SPECIES_BLASTOISE_MEGA, + SPECIES_SWAMPERT_MEGA, + SPECIES_BOLDORE, // 225.8 - 330.5 lbs / 102.4 - 149.9 kg - NATIONAL_DEX_RAMPARDOS, - NATIONAL_DEX_SALAMENCE, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_MUNCHLAX, - //NATIONAL_DEX_RATICATE, // Alolan Form, Totem-sized - NATIONAL_DEX_URSHIFU, // Single Strike Style - //NATIONAL_DEX_URSHIFU, // Rapid Strike Style - NATIONAL_DEX_HAXORUS, - NATIONAL_DEX_DUSKNOIR, - NATIONAL_DEX_GARBODOR, - NATIONAL_DEX_CLAYDOL, - NATIONAL_DEX_SPIRITOMB, - NATIONAL_DEX_GOLISOPOD, - //NATIONAL_DEX_GRAVELER, // Alolan Form - NATIONAL_DEX_FERROTHORN, - NATIONAL_DEX_MUDBRAY, - NATIONAL_DEX_ZACIAN, // Hero of Many Battles - NATIONAL_DEX_BASCULEGION, - //NATIONAL_DEX_CHARIZARD, // Mega X - NATIONAL_DEX_SHELGON, - //NATIONAL_DEX_SALAMENCE, // Mega - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_DREDNAW, - NATIONAL_DEX_SIRFETCHD, - NATIONAL_DEX_SCIZOR, - NATIONAL_DEX_DEWGONG, - //NATIONAL_DEX_SLOWBRO, // Mega - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_DONPHAN, - NATIONAL_DEX_LAIRON, - NATIONAL_DEX_LUNALA, - NATIONAL_DEX_CENTISKORCH, - //NATIONAL_DEX_DARMANITAN, // Galarian Form - NATIONAL_DEX_TYPE_NULL, - NATIONAL_DEX_MEWTWO, - //NATIONAL_DEX_SCIZOR, // Mega - NATIONAL_DEX_FORRETRESS, - NATIONAL_DEX_URSARING, - //NATIONAL_DEX_MEWTWO, // Mega X - NATIONAL_DEX_TANGROWTH, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_WAILMER, - //NATIONAL_DEX_SHARPEDO, // Mega - NATIONAL_DEX_SLAKING, - NATIONAL_DEX_CLOYSTER, - NATIONAL_DEX_JELLICENT, - NATIONAL_DEX_BEWEAR, - NATIONAL_DEX_ABOMASNOW, - NATIONAL_DEX_PANGORO, - NATIONAL_DEX_ELECTIVIRE, - NATIONAL_DEX_DRUDDIGON, - NATIONAL_DEX_LICKILICKY, - NATIONAL_DEX_REGIELEKI, - //NATIONAL_DEX_VIKAVOLT, // Totem-sized - NATIONAL_DEX_CRYOGONAL, - NATIONAL_DEX_BASTIODON, + SPECIES_RAMPARDOS, + SPECIES_SALAMENCE, + SPECIES_GRAVELER, + SPECIES_MUNCHLAX, + //SPECIES_RATICATE, // Alolan Form, Totem-sized + SPECIES_URSHIFU_SINGLE_STRIKE_STYLE, + SPECIES_URSHIFU_RAPID_STRIKE_STYLE, + SPECIES_HAXORUS, + SPECIES_DUSKNOIR, + SPECIES_GARBODOR, + SPECIES_CLAYDOL, + SPECIES_SPIRITOMB, + SPECIES_GOLISOPOD, + SPECIES_GRAVELER_ALOLAN, + SPECIES_FERROTHORN, + SPECIES_MUDBRAY, + SPECIES_ZACIAN_HERO_OF_MANY_BATTLES, + SPECIES_BASCULEGION, + SPECIES_CHARIZARD_MEGA_X, + SPECIES_SHELGON, + SPECIES_SALAMENCE_MEGA, + SPECIES_RHYHORN, + SPECIES_DREDNAW, + SPECIES_SIRFETCHD, + SPECIES_SCIZOR, + SPECIES_DEWGONG, + SPECIES_SLOWBRO_MEGA, + SPECIES_EXEGGUTOR, + SPECIES_RHYDON, + SPECIES_DONPHAN, + SPECIES_LAIRON, + SPECIES_LUNALA, + SPECIES_CENTISKORCH, + SPECIES_DARMANITAN_GALARIAN, + SPECIES_TYPE_NULL, + SPECIES_MEWTWO, + SPECIES_SCIZOR_MEGA, + SPECIES_FORRETRESS, + SPECIES_URSARING, + SPECIES_MEWTWO_MEGA_X, + SPECIES_TANGROWTH, + SPECIES_MACHAMP, + SPECIES_WAILMER, + SPECIES_SHARPEDO_MEGA, + SPECIES_SLAKING, + SPECIES_CLOYSTER, + SPECIES_JELLICENT, + SPECIES_BEWEAR, + SPECIES_ABOMASNOW, + SPECIES_PANGORO, + SPECIES_ELECTIVIRE, + SPECIES_DRUDDIGON, + SPECIES_LICKILICKY, + SPECIES_REGIELEKI, + //SPECIES_VIKAVOLT, // Totem-sized + SPECIES_CRYOGONAL, + SPECIES_BASTIODON, // 330.7 - 440.7 lbs / 150.0 - 199.9 kg - NATIONAL_DEX_EMBOAR, - NATIONAL_DEX_NAGANADEL, - NATIONAL_DEX_ARCTOZOLT, - NATIONAL_DEX_GOODRA, - NATIONAL_DEX_WALREIN, - NATIONAL_DEX_KINGDRA, - NATIONAL_DEX_PUPITAR, - NATIONAL_DEX_SOLROCK, - NATIONAL_DEX_ARCANINE, - //NATIONAL_DEX_VENUSAUR, // Mega - NATIONAL_DEX_HYDREIGON, - //NATIONAL_DEX_SABLEYE, // Mega - NATIONAL_DEX_MILOTIC, - //NATIONAL_DEX_ARCANINE, //Hisuian Form - NATIONAL_DEX_LUNATONE, - NATIONAL_DEX_REGICE, - NATIONAL_DEX_ARCTOVISH, - NATIONAL_DEX_RAIKOU, - NATIONAL_DEX_MAGNEZONE, - NATIONAL_DEX_CRABOMINABLE, - //NATIONAL_DEX_ABOMASNOW, // Mega - NATIONAL_DEX_DRAMPA, - NATIONAL_DEX_SUICUNE, - NATIONAL_DEX_BRONZONG, - NATIONAL_DEX_DRACOZOLT, - NATIONAL_DEX_VOLCANION, - NATIONAL_DEX_ENTEI, - NATIONAL_DEX_HO_OH, + SPECIES_EMBOAR, + SPECIES_NAGANADEL, + SPECIES_ARCTOZOLT, + SPECIES_GOODRA, + SPECIES_WALREIN, + SPECIES_KINGDRA, + SPECIES_PUPITAR, + SPECIES_SOLROCK, + SPECIES_ARCANINE, + SPECIES_VENUSAUR_MEGA, + SPECIES_HYDREIGON, + SPECIES_SABLEYE_MEGA, + SPECIES_MILOTIC, + SPECIES_ARCANINE_HISUIAN, + SPECIES_LUNATONE, + SPECIES_REGICE, + SPECIES_ARCTOVISH, + SPECIES_RAIKOU, + SPECIES_MAGNEZONE, + SPECIES_CRABOMINABLE, + SPECIES_ABOMASNOW_MEGA, + SPECIES_DRAMPA, + SPECIES_SUICUNE, + SPECIES_BRONZONG, + SPECIES_DRACOZOLT, + SPECIES_VOLCANION, + SPECIES_ENTEI, + SPECIES_HO_OH, // 440.9 - 451.3 lbs / 200.0 - 204.7 kg - NATIONAL_DEX_CRUSTLE, - NATIONAL_DEX_VIRIZION, - NATIONAL_DEX_REGIDRAGO, - NATIONAL_DEX_SCOLIPEDE, - NATIONAL_DEX_TYRANITAR, - NATIONAL_DEX_METANG, - NATIONAL_DEX_YVELTAL, + SPECIES_CRUSTLE, + SPECIES_VIRIZION, + SPECIES_REGIDRAGO, + SPECIES_SCOLIPEDE, + SPECIES_TYRANITAR, + SPECIES_METANG, + SPECIES_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, - NATIONAL_DEX_ZAMAZENTA, // Hero of Many Battles - NATIONAL_DEX_TURTONATOR, - NATIONAL_DEX_XERNEAS, - NATIONAL_DEX_DRACOVISH, - NATIONAL_DEX_LUGIA, - //NATIONAL_DEX_ARAQUANID, // Totem-sized - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_MANTINE, - NATIONAL_DEX_CAMERUPT, - NATIONAL_DEX_AURORUS, - NATIONAL_DEX_REGIROCK, - NATIONAL_DEX_SOLGALEO, - NATIONAL_DEX_NECROZMA, - //NATIONAL_DEX_NECROZMA, // Ultra - NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_COBALION, - NATIONAL_DEX_PALOSSAND, - NATIONAL_DEX_HARIYAMA, - //NATIONAL_DEX_TYRANITAR, // Mega - NATIONAL_DEX_GLALIE, - NATIONAL_DEX_GIGALITH, - NATIONAL_DEX_BEARTIC, - NATIONAL_DEX_TERRAKION, - //NATIONAL_DEX_AVALUGG, //Hisuian Form - NATIONAL_DEX_TYRANTRUM, - NATIONAL_DEX_RHYPERIOR, - NATIONAL_DEX_URSALUNA, - NATIONAL_DEX_MAMOSWINE, + SPECIES_REGISTEEL, + SPECIES_RAYQUAZA, + //SPECIES_KOMMO_O, // Totem-sized + SPECIES_ONIX, + SPECIES_DRAGONITE, + SPECIES_DHELMISE, + SPECIES_ZAMAZENTA_HERO_OF_MANY_BATTLES, + SPECIES_TURTONATOR, + SPECIES_XERNEAS, + SPECIES_DRACOVISH, + SPECIES_LUGIA, + //SPECIES_ARAQUANID, // Totem-sized + SPECIES_LAPRAS, + SPECIES_MANTINE, + SPECIES_CAMERUPT, + SPECIES_AURORUS, + SPECIES_REGIROCK, + SPECIES_SOLGALEO, + SPECIES_NECROZMA, + SPECIES_NECROZMA_ULTRA, + SPECIES_GYARADOS, + SPECIES_COBALION, + SPECIES_PALOSSAND, + SPECIES_HARIYAMA, + SPECIES_TYRANITAR_MEGA, + SPECIES_GLALIE, + SPECIES_GIGALITH, + SPECIES_BEARTIC, + SPECIES_TERRAKION, + SPECIES_AVALUGG_HISUIAN, + SPECIES_TYRANTRUM, + SPECIES_RHYPERIOR, + SPECIES_URSALUNA, + SPECIES_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 + SPECIES_GOLEM, + SPECIES_HIPPOWDON, + SPECIES_GYARADOS_MEGA, + SPECIES_ZYGARDE_50, // 677.3 - 667.0 lbs / 307.2 - 359.9 kg - NATIONAL_DEX_TORTERRA, - NATIONAL_DEX_COALOSSAL, - //NATIONAL_DEX_GOLEM, // Alolan Form - NATIONAL_DEX_ARCEUS, - //NATIONAL_DEX_CAMERUPT, // Mega - NATIONAL_DEX_KYUREM, - NATIONAL_DEX_GOLURK, - NATIONAL_DEX_RESHIRAM, - NATIONAL_DEX_BUZZWOLE, - //NATIONAL_DEX_GOODRA, //Hisuian Form - NATIONAL_DEX_PALKIA, - NATIONAL_DEX_PROBOPASS, - NATIONAL_DEX_ZEKROM, - //NATIONAL_DEX_NECROZMA, // Dawn Wings - //NATIONAL_DEX_GLALIE, // Mega - NATIONAL_DEX_KYOGRE, - //NATIONAL_DEX_ZACIAN, // Crowned Sword + SPECIES_TORTERRA, + SPECIES_COALOSSAL, + SPECIES_GOLEM_ALOLAN, + SPECIES_ARCEUS, + SPECIES_CAMERUPT_MEGA, + SPECIES_KYUREM, + SPECIES_GOLURK, + SPECIES_RESHIRAM, + SPECIES_BUZZWOLE, + SPECIES_GOODRA_HISUIAN, + SPECIES_PALKIA, + SPECIES_PROBOPASS, + SPECIES_ZEKROM, + SPECIES_NECROZMA_DAWN_WINGS, + SPECIES_GLALIE_MEGA, + SPECIES_KYOGRE, + SPECIES_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, + SPECIES_AGGRON, + SPECIES_RAYQUAZA_MEGA, + SPECIES_AGGRON_MEGA, + SPECIES_WAILORD, + SPECIES_STEELIX, // 903.0 - 2204.4 lbs / 409.6 - 999.9 kg - //NATIONAL_DEX_EXEGGUTOR, // Alolan Form - NATIONAL_DEX_REGIGIGAS, - //NATIONAL_DEX_KYOGRE, // Primal - NATIONAL_DEX_HEATRAN, - NATIONAL_DEX_SNORLAX, - //NATIONAL_DEX_NECROZMA, // Dusk Mane - //NATIONAL_DEX_HOOPA, // Unbound - NATIONAL_DEX_AVALUGG, - NATIONAL_DEX_STONJOURNER, - NATIONAL_DEX_METAGROSS, - //NATIONAL_DEX_ZYGARDE, // Complete Forme - //NATIONAL_DEX_GIRATINA, // Origin Forme - //NATIONAL_DEX_PALKIA, // Origin Form - NATIONAL_DEX_DIALGA, - //NATIONAL_DEX_STEELIX, // Mega - NATIONAL_DEX_GIRATINA, // Altered Forme - //NATIONAL_DEX_ZAMAZENTA, // Crowned Shield - NATIONAL_DEX_MELMETAL, - NATIONAL_DEX_GLASTRIER, - //NATIONAL_DEX_CALYREX, // Ice Rider - NATIONAL_DEX_STAKATAKA, - //NATIONAL_DEX_DIALGA, // Origin Form - NATIONAL_DEX_GUZZLORD, - NATIONAL_DEX_MUDSDALE, - //NATIONAL_DEX_METAGROSS, // Mega - NATIONAL_DEX_GROUDON, - NATIONAL_DEX_ETERNATUS, - //NATIONAL_DEX_GROUDON, // Primal - NATIONAL_DEX_COSMOEM, - NATIONAL_DEX_CELESTEELA, + SPECIES_EXEGGUTOR_ALOLAN, + SPECIES_REGIGIGAS, + SPECIES_KYOGRE_PRIMAL, + SPECIES_HEATRAN, + SPECIES_SNORLAX, + SPECIES_NECROZMA_DUSK_MANE, + SPECIES_HOOPA_UNBOUND, + SPECIES_AVALUGG, + SPECIES_STONJOURNER, + SPECIES_METAGROSS, + SPECIES_ZYGARDE_COMPLETE, + SPECIES_GIRATINA_ORIGIN, + SPECIES_PALKIA_ORIGIN, + SPECIES_DIALGA, + SPECIES_STEELIX_MEGA, + SPECIES_GIRATINA_ALTERED, + SPECIES_ZAMAZENTA_CROWNED_SHIELD, + SPECIES_MELMETAL, + SPECIES_GLASTRIER, + SPECIES_CALYREX_ICE_RIDER, + SPECIES_STAKATAKA, + SPECIES_DIALGA_ORIGIN, + SPECIES_GUZZLORD, + SPECIES_MUDSDALE, + SPECIES_METAGROSS_MEGA, + SPECIES_GROUDON, + SPECIES_ETERNATUS, + SPECIES_GROUDON_PRIMAL, + SPECIES_COSMOEM, + SPECIES_CELESTEELA, }; const u16 gPokedexOrder_Height[] = diff --git a/src/pokedex.c b/src/pokedex.c index d15a1da475..1024ada66d 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -159,7 +159,7 @@ struct PokedexListItem struct PokedexView { - struct PokedexListItem pokedexList[NATIONAL_DEX_COUNT + 1]; + struct PokedexListItem pokedexList[NUM_SPECIES + 1]; u16 pokemonListCount; u16 selectedPokemon; u16 selectedPokemonBackup; @@ -217,7 +217,7 @@ static void Task_ClosePokedexFromSearchResultsStartMenu(u8); static bool8 LoadPokedexListPage(u8); static void LoadPokedexBgPalette(bool8); static void FreeWindowAndBgBuffers(void); -static void CreatePokedexList(u8, u8); +static void CreatePokedexList(u8, u8, bool8); static void CreateMonDexNum(u16, u8, u8, u16); static void CreateCaughtBall(u16, u8, u8, u16); static u8 CreateMonName(u16, u8, u8); @@ -1537,15 +1537,15 @@ static void ResetPokedexView(struct PokedexView *pokedexView) { u16 i; - for (i = 0; i < NATIONAL_DEX_COUNT; i++) + for (i = 0; i < NUM_SPECIES; i++) { pokedexView->pokedexList[i].dexNum = 0xFFFF; pokedexView->pokedexList[i].seenSpecies = SPECIES_NONE; pokedexView->pokedexList[i].owned = FALSE; } - pokedexView->pokedexList[NATIONAL_DEX_COUNT].dexNum = 0; - pokedexView->pokedexList[NATIONAL_DEX_COUNT].seenSpecies = SPECIES_NONE; - pokedexView->pokedexList[NATIONAL_DEX_COUNT].owned = FALSE; + pokedexView->pokedexList[NUM_SPECIES].dexNum = 0; + pokedexView->pokedexList[NUM_SPECIES].seenSpecies = SPECIES_NONE; + pokedexView->pokedexList[NUM_SPECIES].owned = FALSE; pokedexView->pokemonListCount = 0; pokedexView->selectedPokemon = 0; pokedexView->selectedPokemonBackup = 0; @@ -1635,7 +1635,7 @@ void CB2_OpenPokedex(void) EnableInterrupts(1); SetVBlankCallback(VBlankCB_Pokedex); SetMainCallback2(CB2_Pokedex); - CreatePokedexList(sPokedexView->dexMode, sPokedexView->dexOrder); + CreatePokedexList(sPokedexView->dexMode, sPokedexView->dexOrder, FALSE); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x80); break; } @@ -2097,7 +2097,7 @@ static bool8 LoadPokedexListPage(u8 page) break; case 3: if (page == PAGE_MAIN) - CreatePokedexList(sPokedexView->dexMode, sPokedexView->dexOrder); + CreatePokedexList(sPokedexView->dexMode, sPokedexView->dexOrder, FALSE); CreateMonSpritesAtPos(sPokedexView->selectedPokemon, 0xE); sPokedexView->menuIsOpen = FALSE; sPokedexView->menuY = 0; @@ -2170,7 +2170,7 @@ static void FreeWindowAndBgBuffers(void) Free(tilemapBuffer); } -static void CreatePokedexList(u8 dexMode, u8 order) +static void CreatePokedexList(u8 dexMode, u8 order, bool8 showForms) { u32 vars[3]; //I have no idea why three regular variables are stored in an array, but whatever. #define temp_dexCount vars[0] @@ -2255,14 +2255,16 @@ static void CreatePokedexList(u8 dexMode, u8 order) case ORDER_HEAVIEST: for (i = ARRAY_COUNT(gPokedexOrder_Weight) - 1; i >= 0; i--) { - u16 seenSpecies; - temp_dexNum = gPokedexOrder_Weight[i]; - seenSpecies = GetPokedexFlagFirstSeen(temp_dexNum); + u16 species = gPokedexOrder_Weight[i]; + bool8 speciesFlag = GetSetPokedexSeenFlag(species, FLAG_GET_SEEN); + temp_dexNum = SpeciesToNationalPokedexNum(species); - if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) + && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT) + && GetSetPokedexSeenFlag(species, FLAG_GET_SEEN)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = seenSpecies; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = species; sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } @@ -2271,14 +2273,16 @@ static void CreatePokedexList(u8 dexMode, u8 order) case ORDER_LIGHTEST: for (i = 0; i < ARRAY_COUNT(gPokedexOrder_Weight); i++) { - u16 seenSpecies; - temp_dexNum = gPokedexOrder_Weight[i]; - seenSpecies = GetPokedexFlagFirstSeen(temp_dexNum); + u16 species = gPokedexOrder_Weight[i]; + bool8 speciesFlag = GetSetPokedexSeenFlag(species, FLAG_GET_SEEN); + temp_dexNum = SpeciesToNationalPokedexNum(species); - if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) + && GetSetPokedexCaughtFlag(temp_dexNum, FLAG_GET_CAUGHT) + && GetSetPokedexSeenFlag(species, FLAG_GET_SEEN)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; - sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = seenSpecies; + sPokedexView->pokedexList[sPokedexView->pokemonListCount].seenSpecies = species; sPokedexView->pokedexList[sPokedexView->pokemonListCount].owned = TRUE; sPokedexView->pokemonListCount++; } @@ -2318,7 +2322,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) break; } - for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) + for (i = sPokedexView->pokemonListCount; i < NUM_SPECIES; i++) { sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].seenSpecies = SPECIES_NONE; @@ -2350,7 +2354,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored) entryNum = b - 5; for (i = 0; i <= 10; i++) { - if (entryNum < 0 || entryNum >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) + if (entryNum < 0 || entryNum >= NUM_SPECIES || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) { ClearMonListEntry(17, i * 2, ignored); } @@ -2375,7 +2379,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored) break; case 1: // Up entryNum = b - 5; - if (entryNum < 0 || entryNum >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) + if (entryNum < 0 || entryNum >= NUM_SPECIES || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) { ClearMonListEntry(17, sPokedexView->listVOffset * 2, ignored); } @@ -2401,7 +2405,7 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored) vOffset = sPokedexView->listVOffset + 10; if (vOffset >= LIST_SCROLL_STEP) vOffset -= LIST_SCROLL_STEP; - if (entryNum < 0 || entryNum >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) + if (entryNum < 0 || entryNum >= NUM_SPECIES || sPokedexView->pokedexList[entryNum].dexNum == 0xFFFF) ClearMonListEntry(17, vOffset * 2, ignored); else { @@ -2742,8 +2746,7 @@ static u8 ClearMonSprites(void) static u16 GetPokemonSpriteToDisplay(u16 species) { - MgbaPrintf(MGBA_LOG_INFO, "aaaaa:%d", sPokedexView->pokedexList[species].seenSpecies); - if (species >= NATIONAL_DEX_COUNT || sPokedexView->pokedexList[species].dexNum == 0xFFFF) + if (species >= NUM_SPECIES || sPokedexView->pokedexList[species].dexNum == 0xFFFF) return 0xFFFF; else if (sPokedexView->pokedexList[species].seenSpecies != SPECIES_NONE) return sPokedexView->pokedexList[species].seenSpecies; @@ -4320,9 +4323,9 @@ u16 GetPokedexFlagFirstSeen(u16 nationalDexNo) return formTable[formId]; } } - else if (GetSetPokedexSeenFlag(gBaseFormSpeciesIdTable[nationalDexNo], FLAG_GET_SEEN)) + else if (GetSetPokedexSeenFlag(NationalPokedexNumToSpecies(nationalDexNo), FLAG_GET_SEEN)) { - return gBaseFormSpeciesIdTable[nationalDexNo]; + return NationalPokedexNumToSpecies(nationalDexNo); } return SPECIES_NONE; } @@ -4697,9 +4700,9 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t u16 resultsCount; u8 types[2]; - CreatePokedexList(dexMode, order); + CreatePokedexList(dexMode, order, TRUE); - for (i = 0, resultsCount = 0; i < NATIONAL_DEX_COUNT; i++) + for (i = 0, resultsCount = 0; i < NUM_SPECIES; i++) { if (sPokedexView->pokedexList[i].seenSpecies != SPECIES_NONE) { @@ -4716,7 +4719,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t { u8 firstLetter; - species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); + species = sPokedexView->pokedexList[i].seenSpecies; firstLetter = gSpeciesNames[species][0]; if (LETTER_IN_RANGE_UPPER(firstLetter, abcGroup) || LETTER_IN_RANGE_LOWER(firstLetter, abcGroup)) { @@ -4732,7 +4735,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t { for (i = 0, resultsCount = 0; i < sPokedexView->pokemonListCount; i++) { - species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); + species = sPokedexView->pokedexList[i].seenSpecies; if (bodyColor == gBaseStats[species].bodyColor) { @@ -4758,7 +4761,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t { if (sPokedexView->pokedexList[i].owned) { - species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); + species = sPokedexView->pokedexList[i].seenSpecies; types[0] = gBaseStats[species].type1; types[1] = gBaseStats[species].type2; @@ -4776,7 +4779,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t { if (sPokedexView->pokedexList[i].owned) { - species = NationalPokedexNumToSpecies(sPokedexView->pokedexList[i].dexNum); + species = sPokedexView->pokedexList[i].seenSpecies; types[0] = gBaseStats[species].type1; types[1] = gBaseStats[species].type2; @@ -4793,7 +4796,7 @@ static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 t if (sPokedexView->pokemonListCount != 0) { - for (i = sPokedexView->pokemonListCount; i < NATIONAL_DEX_COUNT; i++) + for (i = sPokedexView->pokemonListCount; i < NUM_SPECIES; i++) { sPokedexView->pokedexList[i].dexNum = 0xFFFF; sPokedexView->pokedexList[i].seenSpecies = SPECIES_NONE; diff --git a/src/pokemon.c b/src/pokemon.c index 15667bd4e9..45dcdfd676 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6850,18 +6850,10 @@ u16 NationalPokedexNumToSpecies(u16 nationalNum) { u16 species; - if (!nationalNum) - return 0; + if (!nationalNum || nationalNum > ARRAY_COUNT(gBaseFormSpeciesIdTable)) + return SPECIES_NONE; - species = 0; - - while (species < (NUM_SPECIES - 1) && sSpeciesToNationalPokedexNum[species] != nationalNum) - species++; - - if (species == NUM_SPECIES - 1) - return 0; - - return species + 1; + return gBaseFormSpeciesIdTable[nationalNum]; } u16 NationalToHoennOrder(u16 nationalNum)