mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-17 20:17:38 +01:00
Added missing National Dex association.
This commit is contained in:
Eduardo Quezada
parent
2c098d8294
commit
dbd382e61b
348
src/pokemon.c
348
src/pokemon.c
@ -332,16 +332,13 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(PIDGEOTTO),
|
||||
SPECIES_TO_NATIONAL(PIDGEOT),
|
||||
SPECIES_TO_NATIONAL(RATTATA),
|
||||
[SPECIES_ALOLAN_RATTATA - 1] = NATIONAL_DEX_RATTATA,
|
||||
SPECIES_TO_NATIONAL(RATICATE),
|
||||
[SPECIES_ALOLAN_RATICATE - 1] = NATIONAL_DEX_RATICATE,
|
||||
SPECIES_TO_NATIONAL(SPEAROW),
|
||||
SPECIES_TO_NATIONAL(FEAROW),
|
||||
SPECIES_TO_NATIONAL(EKANS),
|
||||
SPECIES_TO_NATIONAL(ARBOK),
|
||||
SPECIES_TO_NATIONAL(PIKACHU),
|
||||
SPECIES_TO_NATIONAL(RAICHU),
|
||||
[SPECIES_ALOLAN_RAICHU - 1] = NATIONAL_DEX_RAICHU,
|
||||
SPECIES_TO_NATIONAL(SANDSHREW),
|
||||
SPECIES_TO_NATIONAL(SANDSLASH),
|
||||
SPECIES_TO_NATIONAL(NIDORAN_F),
|
||||
@ -353,9 +350,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(CLEFAIRY),
|
||||
SPECIES_TO_NATIONAL(CLEFABLE),
|
||||
SPECIES_TO_NATIONAL(VULPIX),
|
||||
[SPECIES_ALOLAN_VULPIX - 1] = NATIONAL_DEX_VULPIX,
|
||||
SPECIES_TO_NATIONAL(NINETALES),
|
||||
[SPECIES_ALOLAN_NINETALES - 1] = NATIONAL_DEX_NINETALES,
|
||||
SPECIES_TO_NATIONAL(JIGGLYPUFF),
|
||||
SPECIES_TO_NATIONAL(WIGGLYTUFF),
|
||||
SPECIES_TO_NATIONAL(ZUBAT),
|
||||
@ -368,13 +363,9 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(VENONAT),
|
||||
SPECIES_TO_NATIONAL(VENOMOTH),
|
||||
SPECIES_TO_NATIONAL(DIGLETT),
|
||||
[SPECIES_ALOLAN_DIGLETT - 1] = NATIONAL_DEX_DIGLETT,
|
||||
SPECIES_TO_NATIONAL(DUGTRIO),
|
||||
[SPECIES_ALOLAN_DUGTRIO - 1] = NATIONAL_DEX_DUGTRIO,
|
||||
SPECIES_TO_NATIONAL(MEOWTH),
|
||||
[SPECIES_ALOLAN_MEOWTH - 1] = NATIONAL_DEX_MEOWTH,
|
||||
SPECIES_TO_NATIONAL(PERSIAN),
|
||||
[SPECIES_ALOLAN_PERSIAN - 1] = NATIONAL_DEX_PERSIAN,
|
||||
SPECIES_TO_NATIONAL(PSYDUCK),
|
||||
SPECIES_TO_NATIONAL(GOLDUCK),
|
||||
SPECIES_TO_NATIONAL(MANKEY),
|
||||
@ -396,11 +387,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(TENTACOOL),
|
||||
SPECIES_TO_NATIONAL(TENTACRUEL),
|
||||
SPECIES_TO_NATIONAL(GEODUDE),
|
||||
[SPECIES_ALOLAN_GEODUDE - 1] = NATIONAL_DEX_GEODUDE,
|
||||
SPECIES_TO_NATIONAL(GRAVELER),
|
||||
[SPECIES_ALOLAN_GRAVELER - 1] = NATIONAL_DEX_GRAVELER,
|
||||
SPECIES_TO_NATIONAL(GOLEM),
|
||||
[SPECIES_ALOLAN_GOLEM - 1] = NATIONAL_DEX_GOLEM,
|
||||
SPECIES_TO_NATIONAL(PONYTA),
|
||||
SPECIES_TO_NATIONAL(RAPIDASH),
|
||||
SPECIES_TO_NATIONAL(SLOWPOKE),
|
||||
@ -413,9 +401,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(SEEL),
|
||||
SPECIES_TO_NATIONAL(DEWGONG),
|
||||
SPECIES_TO_NATIONAL(GRIMER),
|
||||
[SPECIES_ALOLAN_GRIMER - 1] = NATIONAL_DEX_GRIMER,
|
||||
SPECIES_TO_NATIONAL(MUK),
|
||||
[SPECIES_ALOLAN_MUK - 1] = NATIONAL_DEX_MUK,
|
||||
SPECIES_TO_NATIONAL(SHELLDER),
|
||||
SPECIES_TO_NATIONAL(CLOYSTER),
|
||||
SPECIES_TO_NATIONAL(GASTLY),
|
||||
@ -430,10 +416,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(ELECTRODE),
|
||||
SPECIES_TO_NATIONAL(EXEGGCUTE),
|
||||
SPECIES_TO_NATIONAL(EXEGGUTOR),
|
||||
[SPECIES_ALOLAN_EXEGGUTOR - 1] = NATIONAL_DEX_EXEGGUTOR,
|
||||
SPECIES_TO_NATIONAL(CUBONE),
|
||||
SPECIES_TO_NATIONAL(MAROWAK),
|
||||
[SPECIES_ALOLAN_MAROWAK - 1] = NATIONAL_DEX_MAROWAK,
|
||||
SPECIES_TO_NATIONAL(HITMONLEE),
|
||||
SPECIES_TO_NATIONAL(HITMONCHAN),
|
||||
SPECIES_TO_NATIONAL(LICKITUNG),
|
||||
@ -741,11 +725,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(SHIELDON),
|
||||
SPECIES_TO_NATIONAL(BASTIODON),
|
||||
SPECIES_TO_NATIONAL(BURMY),
|
||||
[SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY,
|
||||
[SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY,
|
||||
SPECIES_TO_NATIONAL(WORMADAM),
|
||||
[SPECIES_WORMADAM_SANDY_CLOAK - 1] = NATIONAL_DEX_WORMADAM,
|
||||
[SPECIES_WORMADAM_TRASH_CLOAK - 1] = NATIONAL_DEX_WORMADAM,
|
||||
SPECIES_TO_NATIONAL(MOTHIM),
|
||||
SPECIES_TO_NATIONAL(COMBEE),
|
||||
SPECIES_TO_NATIONAL(VESPIQUEN),
|
||||
@ -812,11 +792,6 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(DUSKNOIR),
|
||||
SPECIES_TO_NATIONAL(FROSLASS),
|
||||
SPECIES_TO_NATIONAL(ROTOM),
|
||||
[SPECIES_ROTOM_HEAT - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_WASH - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM,
|
||||
SPECIES_TO_NATIONAL(UXIE),
|
||||
SPECIES_TO_NATIONAL(MESPRIT),
|
||||
SPECIES_TO_NATIONAL(AZELF),
|
||||
@ -984,8 +959,6 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(ZEKROM),
|
||||
SPECIES_TO_NATIONAL(LANDORUS),
|
||||
SPECIES_TO_NATIONAL(KYUREM),
|
||||
[SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM,
|
||||
[SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM,
|
||||
SPECIES_TO_NATIONAL(KELDEO),
|
||||
SPECIES_TO_NATIONAL(MELOETTA),
|
||||
SPECIES_TO_NATIONAL(GENESECT),
|
||||
@ -1018,7 +991,6 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(FURFROU),
|
||||
SPECIES_TO_NATIONAL(ESPURR),
|
||||
SPECIES_TO_NATIONAL(MEOWSTIC),
|
||||
[SPECIES_MEOWSTIC_F - 1] = NATIONAL_DEX_MEOWSTIC,
|
||||
SPECIES_TO_NATIONAL(HONEDGE),
|
||||
SPECIES_TO_NATIONAL(DOUBLADE),
|
||||
SPECIES_TO_NATIONAL(AEGISLASH),
|
||||
@ -1086,8 +1058,6 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(RIBOMBEE),
|
||||
SPECIES_TO_NATIONAL(ROCKRUFF),
|
||||
SPECIES_TO_NATIONAL(LYCANROC),
|
||||
[SPECIES_LYCANROC_MIDNIGHT - 1] = NATIONAL_DEX_LYCANROC,
|
||||
[SPECIES_LYCANROC_DUSK - 1] = NATIONAL_DEX_LYCANROC,
|
||||
SPECIES_TO_NATIONAL(WISHIWASHI),
|
||||
SPECIES_TO_NATIONAL(MAREANIE),
|
||||
SPECIES_TO_NATIONAL(TOXAPEX),
|
||||
@ -1121,7 +1091,6 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(TURTONATOR),
|
||||
SPECIES_TO_NATIONAL(TOGEDEMARU),
|
||||
SPECIES_TO_NATIONAL(MIMIKYU),
|
||||
[SPECIES_MIMIKYU_BUSTED - 1] = NATIONAL_DEX_MIMIKYU,
|
||||
SPECIES_TO_NATIONAL(BRUXISH),
|
||||
SPECIES_TO_NATIONAL(DRAMPA),
|
||||
SPECIES_TO_NATIONAL(DHELMISE),
|
||||
@ -1153,6 +1122,321 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
|
||||
SPECIES_TO_NATIONAL(ZERAORA),
|
||||
SPECIES_TO_NATIONAL(MELTAN),
|
||||
SPECIES_TO_NATIONAL(MELMETAL),
|
||||
|
||||
// Megas
|
||||
[SPECIES_MEGA_VENUSAUR - 1] = NATIONAL_DEX_VENUSAUR,
|
||||
[SPECIES_MEGA_CHARIZARD_X - 1] = NATIONAL_DEX_CHARIZARD,
|
||||
[SPECIES_MEGA_CHARIZARD_Y - 1] = NATIONAL_DEX_CHARIZARD,
|
||||
[SPECIES_MEGA_BLASTOISE - 1] = NATIONAL_DEX_BLASTOISE,
|
||||
[SPECIES_MEGA_BEEDRILL - 1] = NATIONAL_DEX_BEEDRILL,
|
||||
[SPECIES_MEGA_PIDGEOT - 1] = NATIONAL_DEX_PIDGEOT,
|
||||
[SPECIES_MEGA_ALAKAZAM - 1] = NATIONAL_DEX_ALAKAZAM,
|
||||
[SPECIES_MEGA_SLOWBRO - 1] = NATIONAL_DEX_SLOWBRO,
|
||||
[SPECIES_MEGA_GENGAR - 1] = NATIONAL_DEX_GENGAR,
|
||||
[SPECIES_MEGA_KANGASKHAN - 1] = NATIONAL_DEX_KANGASKHAN,
|
||||
[SPECIES_MEGA_PINSIR - 1] = NATIONAL_DEX_PINSIR,
|
||||
[SPECIES_MEGA_GYARADOS - 1] = NATIONAL_DEX_GYARADOS,
|
||||
[SPECIES_MEGA_AERODACTYL - 1] = NATIONAL_DEX_AERODACTYL,
|
||||
[SPECIES_MEGA_MEWTWO_X - 1] = NATIONAL_DEX_MEWTWO,
|
||||
[SPECIES_MEGA_MEWTWO_Y - 1] = NATIONAL_DEX_MEWTWO,
|
||||
[SPECIES_MEGA_AMPHAROS - 1] = NATIONAL_DEX_AMPHAROS,
|
||||
[SPECIES_MEGA_STEELIX - 1] = NATIONAL_DEX_STEELIX,
|
||||
[SPECIES_MEGA_SCIZOR - 1] = NATIONAL_DEX_SCIZOR,
|
||||
[SPECIES_MEGA_HERACROSS - 1] = NATIONAL_DEX_HERACROSS,
|
||||
[SPECIES_MEGA_HOUNDOOM - 1] = NATIONAL_DEX_HOUNDOOM,
|
||||
[SPECIES_MEGA_TYRANITAR - 1] = NATIONAL_DEX_TYRANITAR,
|
||||
[SPECIES_MEGA_SCEPTILE - 1] = NATIONAL_DEX_SCEPTILE,
|
||||
[SPECIES_MEGA_BLAZIKEN - 1] = NATIONAL_DEX_BLAZIKEN,
|
||||
[SPECIES_MEGA_SWAMPERT - 1] = NATIONAL_DEX_SWAMPERT,
|
||||
[SPECIES_MEGA_GARDEVOIR - 1] = NATIONAL_DEX_GARDEVOIR,
|
||||
[SPECIES_MEGA_SABLEYE - 1] = NATIONAL_DEX_SABLEYE,
|
||||
[SPECIES_MEGA_MAWILE - 1] = NATIONAL_DEX_MAWILE,
|
||||
[SPECIES_MEGA_AGGRON - 1] = NATIONAL_DEX_AGGRON,
|
||||
[SPECIES_MEGA_MEDICHAM - 1] = NATIONAL_DEX_MEDICHAM,
|
||||
[SPECIES_MEGA_MANECTRIC - 1] = NATIONAL_DEX_MANECTRIC,
|
||||
[SPECIES_MEGA_SHARPEDO - 1] = NATIONAL_DEX_SHARPEDO,
|
||||
[SPECIES_MEGA_CAMERUPT - 1] = NATIONAL_DEX_CAMERUPT,
|
||||
[SPECIES_MEGA_ALTARIA - 1] = NATIONAL_DEX_ALTARIA,
|
||||
[SPECIES_MEGA_BANETTE - 1] = NATIONAL_DEX_BANETTE,
|
||||
[SPECIES_MEGA_ABSOL - 1] = NATIONAL_DEX_ABSOL,
|
||||
[SPECIES_MEGA_GLALIE - 1] = NATIONAL_DEX_GLALIE,
|
||||
[SPECIES_MEGA_SALAMENCE - 1] = NATIONAL_DEX_SALAMENCE,
|
||||
[SPECIES_MEGA_METAGROSS - 1] = NATIONAL_DEX_METAGROSS,
|
||||
[SPECIES_MEGA_LATIAS - 1] = NATIONAL_DEX_LATIAS,
|
||||
[SPECIES_MEGA_LATIOS - 1] = NATIONAL_DEX_LATIOS,
|
||||
[SPECIES_MEGA_LOPUNNY - 1] = NATIONAL_DEX_LOPUNNY,
|
||||
[SPECIES_MEGA_GARCHOMP - 1] = NATIONAL_DEX_GARCHOMP,
|
||||
[SPECIES_MEGA_LUCARIO - 1] = NATIONAL_DEX_LUCARIO,
|
||||
[SPECIES_MEGA_ABOMASNOW - 1] = NATIONAL_DEX_ABOMASNOW,
|
||||
[SPECIES_MEGA_GALLADE - 1] = NATIONAL_DEX_GALLADE,
|
||||
[SPECIES_MEGA_AUDINO - 1] = NATIONAL_DEX_AUDINO,
|
||||
[SPECIES_MEGA_DIANCIE - 1] = NATIONAL_DEX_DIANCIE,
|
||||
// Special Mega + Primals
|
||||
[SPECIES_MEGA_RAYQUAZA - 1] = NATIONAL_DEX_RAYQUAZA,
|
||||
[SPECIES_PRIMAL_KYOGRE - 1] = NATIONAL_DEX_KYOGRE,
|
||||
[SPECIES_PRIMAL_GROUDON - 1] = NATIONAL_DEX_GROUDON,
|
||||
// Alolan Forms
|
||||
[SPECIES_ALOLAN_RATTATA - 1] = NATIONAL_DEX_RATTATA,
|
||||
[SPECIES_ALOLAN_RATICATE - 1] = NATIONAL_DEX_RATICATE,
|
||||
[SPECIES_ALOLAN_RAICHU - 1] = NATIONAL_DEX_RAICHU,
|
||||
[SPECIES_ALOLAN_VULPIX - 1] = NATIONAL_DEX_VULPIX,
|
||||
[SPECIES_ALOLAN_NINETALES - 1] = NATIONAL_DEX_NINETALES,
|
||||
[SPECIES_ALOLAN_DIGLETT - 1] = NATIONAL_DEX_DIGLETT,
|
||||
[SPECIES_ALOLAN_DUGTRIO - 1] = NATIONAL_DEX_DUGTRIO,
|
||||
[SPECIES_ALOLAN_MEOWTH - 1] = NATIONAL_DEX_MEOWTH,
|
||||
[SPECIES_ALOLAN_PERSIAN - 1] = NATIONAL_DEX_PERSIAN,
|
||||
[SPECIES_ALOLAN_GEODUDE - 1] = NATIONAL_DEX_GEODUDE,
|
||||
[SPECIES_ALOLAN_GRAVELER - 1] = NATIONAL_DEX_GRAVELER,
|
||||
[SPECIES_ALOLAN_GOLEM - 1] = NATIONAL_DEX_GOLEM,
|
||||
[SPECIES_ALOLAN_GRIMER - 1] = NATIONAL_DEX_GRIMER,
|
||||
[SPECIES_ALOLAN_MUK - 1] = NATIONAL_DEX_MUK,
|
||||
[SPECIES_ALOLAN_EXEGGUTOR - 1] = NATIONAL_DEX_EXEGGUTOR,
|
||||
[SPECIES_ALOLAN_MAROWAK - 1] = NATIONAL_DEX_MAROWAK,
|
||||
// Cosplay Pikachu
|
||||
[SPECIES_PIKACHU_COSPLAY - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_ROCK_STAR - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_BELLE - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_POP_STAR - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_PH_D - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_LIBRE - 1] = NATIONAL_DEX_PIKACHU,
|
||||
// Cap Pikachu
|
||||
[SPECIES_PIKACHU_ORIGINAL_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_HOENN_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_SINNOH_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_UNOVA_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_KALOS_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_ALOLA_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
[SPECIES_PIKACHU_PARTNER_CAP - 1] = NATIONAL_DEX_PIKACHU,
|
||||
// Pichu
|
||||
[SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU,
|
||||
// Unown
|
||||
[SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_C - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_D - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_E - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_F - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_G - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_H - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_I - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_J - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_K - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_L - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_M - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_N - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_O - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_P - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_Q - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_R - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_S - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_T - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_U - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_V - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_W - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_X - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_Y - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_Z - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_QMARK - 1] = NATIONAL_DEX_UNOWN,
|
||||
[SPECIES_UNOWN_EMARK - 1] = NATIONAL_DEX_UNOWN,
|
||||
// Castform
|
||||
[SPECIES_CASTFORM_SUNNY - 1] = NATIONAL_DEX_CASTFORM,
|
||||
[SPECIES_CASTFORM_RAINY - 1] = NATIONAL_DEX_CASTFORM,
|
||||
[SPECIES_CASTFORM_SNOWY - 1] = NATIONAL_DEX_CASTFORM,
|
||||
// Deoxys
|
||||
[SPECIES_DEOXYS_ATTACK - 1] = NATIONAL_DEX_DEOXYS,
|
||||
[SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS,
|
||||
[SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS,
|
||||
// Burmy
|
||||
[SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY,
|
||||
[SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY,
|
||||
// Wormadam
|
||||
[SPECIES_WORMADAM_SANDY_CLOAK - 1] = NATIONAL_DEX_WORMADAM,
|
||||
[SPECIES_WORMADAM_TRASH_CLOAK - 1] = NATIONAL_DEX_WORMADAM,
|
||||
// Cherrim
|
||||
[SPECIES_CHERRIM_SUNSHINE - 1] = NATIONAL_DEX_CHERRIM,
|
||||
// Shellos
|
||||
[SPECIES_SHELLOS_EAST_SEA - 1] = NATIONAL_DEX_SHELLOS,
|
||||
// Gastrodon
|
||||
[SPECIES_GASTRODON_EAST_SEA - 1] = NATIONAL_DEX_GASTRODON,
|
||||
// Rotom
|
||||
[SPECIES_ROTOM_HEAT - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_WASH - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_FROST - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_FAN - 1] = NATIONAL_DEX_ROTOM,
|
||||
[SPECIES_ROTOM_MOW - 1] = NATIONAL_DEX_ROTOM,
|
||||
// Giratina
|
||||
[SPECIES_GIRATINA_ORIGIN - 1] = NATIONAL_DEX_GIRATINA,
|
||||
// Shaymin
|
||||
[SPECIES_SHAYMIN_SKY - 1] = NATIONAL_DEX_SHAYMIN,
|
||||
// Arceus
|
||||
[SPECIES_ARCEUS_FIGHTING - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_FLYING - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_POISON - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_GROUND - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_ROCK - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_BUG - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_GHOST - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_STEEL - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_FIRE - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_WATER - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_GRASS - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_ELECTRIC - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_PSYCHIC - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_ICE - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_DRAGON - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_DARK - 1] = NATIONAL_DEX_ARCEUS,
|
||||
[SPECIES_ARCEUS_FAIRY - 1] = NATIONAL_DEX_ARCEUS,
|
||||
// Basculin
|
||||
[SPECIES_BASCULIN_BLUE_STRIPED - 1] = NATIONAL_DEX_BASCULIN,
|
||||
// Darmanitan
|
||||
[SPECIES_DARMANITAN_ZEN_MODE - 1] = NATIONAL_DEX_DARMANITAN,
|
||||
// Deerling
|
||||
[SPECIES_DEERLING_SUMMER - 1] = NATIONAL_DEX_DEERLING,
|
||||
[SPECIES_DEERLING_AUTUMN - 1] = NATIONAL_DEX_DEERLING,
|
||||
[SPECIES_DEERLING_WINTER - 1] = NATIONAL_DEX_DEERLING,
|
||||
// Sawsbuck
|
||||
[SPECIES_SAWSBUCK_SUMMER - 1] = NATIONAL_DEX_SAWSBUCK,
|
||||
[SPECIES_SAWSBUCK_AUTUMN - 1] = NATIONAL_DEX_SAWSBUCK,
|
||||
[SPECIES_SAWSBUCK_WINTER - 1] = NATIONAL_DEX_SAWSBUCK,
|
||||
// Therian Forms
|
||||
[SPECIES_TORNADUS_THERIAN - 1] = NATIONAL_DEX_TORNADUS,
|
||||
[SPECIES_THUNDURUS_THERIAN - 1] = NATIONAL_DEX_THUNDURUS,
|
||||
[SPECIES_LANDORUS_THERIAN - 1] = NATIONAL_DEX_LANDORUS,
|
||||
// Kyurem
|
||||
[SPECIES_KYUREM_BLACK - 1] = NATIONAL_DEX_KYUREM,
|
||||
[SPECIES_KYUREM_WHITE - 1] = NATIONAL_DEX_KYUREM,
|
||||
// Keldeo
|
||||
[SPECIES_KELDEO_RESOLUTE - 1] = NATIONAL_DEX_KELDEO,
|
||||
// Meloetta
|
||||
[SPECIES_MELOETTA_PIROUETTE - 1] = NATIONAL_DEX_MELOETTA,
|
||||
// Genesect
|
||||
[SPECIES_GENESECT_DOUSE_DRIVE - 1] = NATIONAL_DEX_GENESECT,
|
||||
[SPECIES_GENESECT_SHOCK_DRIVE - 1] = NATIONAL_DEX_GENESECT,
|
||||
[SPECIES_GENESECT_BURN_DRIVE - 1] = NATIONAL_DEX_GENESECT,
|
||||
[SPECIES_GENESECT_CHILL_DRIVE - 1] = NATIONAL_DEX_GENESECT,
|
||||
// Greninja
|
||||
[SPECIES_GRENINJA_BATTLE_BOND - 1] = NATIONAL_DEX_GRENINJA,
|
||||
[SPECIES_GRENINJA_ASH - 1] = NATIONAL_DEX_GRENINJA,
|
||||
// Vivillon
|
||||
[SPECIES_VIVILLON_POLAR - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_TUNDRA - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_CONTINENTAL - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_GARDEN - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_ELEGANT - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_MEADOW - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_MODERN - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_MARINE - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_ARCHIPELAGO - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_HIGH_PLAINS - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_SANDSTORM - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_RIVER - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_MONSOON - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_SAVANNA - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_SUN - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_OCEAN - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_JUNGLE - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VIVILLON_POKE_BALL - 1] = NATIONAL_DEX_VIVILLON,
|
||||
// Flabébé
|
||||
[SPECIES_FLABEBE_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLABEBE,
|
||||
[SPECIES_FLABEBE_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLABEBE,
|
||||
[SPECIES_FLABEBE_BLUE_FLOWER - 1] = NATIONAL_DEX_FLABEBE,
|
||||
[SPECIES_FLABEBE_WHITE_FLOWER - 1] = NATIONAL_DEX_FLABEBE,
|
||||
// Floette
|
||||
[SPECIES_FLOETTE_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLOETTE,
|
||||
[SPECIES_FLOETTE_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLOETTE,
|
||||
[SPECIES_FLOETTE_BLUE_FLOWER - 1] = NATIONAL_DEX_FLOETTE,
|
||||
[SPECIES_FLOETTE_WHITE_FLOWER - 1] = NATIONAL_DEX_FLOETTE,
|
||||
[SPECIES_FLOETTE_ETERNAL_FLOWER - 1] = NATIONAL_DEX_FLOETTE,
|
||||
// Florges
|
||||
[SPECIES_FLORGES_YELLOW_FLOWER - 1] = NATIONAL_DEX_FLORGES,
|
||||
[SPECIES_FLORGES_ORANGE_FLOWER - 1] = NATIONAL_DEX_FLORGES,
|
||||
[SPECIES_FLORGES_BLUE_FLOWER - 1] = NATIONAL_DEX_FLORGES,
|
||||
[SPECIES_FLORGES_WHITE_FLOWER - 1] = NATIONAL_DEX_FLORGES,
|
||||
// Furfrou
|
||||
[SPECIES_FURFROU_HEART_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_STAR_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_DIAMOND_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_DEBUTANTE_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_MATRON_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_DANDY_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_LA_REINE_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_KABUKI_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_PHARAOH_TRIM - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_VIVILLON_HIGH_PLAINS - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_VIVILLON_HIGH_PLAINS - 1] = NATIONAL_DEX_FURFROU,
|
||||
// Meowstic
|
||||
[SPECIES_MEOWSTIC_F - 1] = NATIONAL_DEX_MEOWSTIC,
|
||||
// Aegislash
|
||||
[SPECIES_AEGISLASH_BLADE - 1] = NATIONAL_DEX_AEGISLASH,
|
||||
// Pumpkaboo
|
||||
[SPECIES_PUMPKABOO_SMALL - 1] = NATIONAL_DEX_PUMPKABOO,
|
||||
[SPECIES_PUMPKABOO_LARGE - 1] = NATIONAL_DEX_PUMPKABOO,
|
||||
[SPECIES_PUMPKABOO_SUPER - 1] = NATIONAL_DEX_PUMPKABOO,
|
||||
// Gourgeist
|
||||
[SPECIES_GOURGEIST_SMALL - 1] = NATIONAL_DEX_GOURGEIST,
|
||||
[SPECIES_GOURGEIST_LARGE - 1] = NATIONAL_DEX_GOURGEIST,
|
||||
[SPECIES_GOURGEIST_SUPER - 1] = NATIONAL_DEX_GOURGEIST,
|
||||
// Xerneas
|
||||
[SPECIES_XERNEAS_ACTIVE - 1] = NATIONAL_DEX_XERNEAS,
|
||||
// Zygarde
|
||||
[SPECIES_ZYGARDE_10 - 1] = NATIONAL_DEX_ZYGARDE,
|
||||
[SPECIES_ZYGARDE_10_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE,
|
||||
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT - 1] = NATIONAL_DEX_ZYGARDE,
|
||||
[SPECIES_ZYGARDE_COMPLETE - 1] = NATIONAL_DEX_ZYGARDE,
|
||||
// Hoopa
|
||||
[SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA,
|
||||
// Oricorio
|
||||
[SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO,
|
||||
[SPECIES_ORICORIO_PA_U - 1] = NATIONAL_DEX_ORICORIO,
|
||||
[SPECIES_ORICORIO_SENSU - 1] = NATIONAL_DEX_ORICORIO,
|
||||
// Rockruff
|
||||
[SPECIES_ROCKRUFF_OWN_TEMPO - 1] = NATIONAL_DEX_ROCKRUFF,
|
||||
// Lycanroc
|
||||
[SPECIES_LYCANROC_MIDNIGHT - 1] = NATIONAL_DEX_LYCANROC,
|
||||
[SPECIES_LYCANROC_DUSK - 1] = NATIONAL_DEX_LYCANROC,
|
||||
// Wishiwashi
|
||||
[SPECIES_WISHIWASHI_SCHOOL - 1] = NATIONAL_DEX_WISHIWASHI,
|
||||
// Silvally
|
||||
[SPECIES_SILVALLY_FIGHTING - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_FLYING - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_POISON - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_GROUND - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_ROCK - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_BUG - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_GHOST - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_STEEL - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_FIRE - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_WATER - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_GRASS - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_ELECTRIC - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_PSYCHIC - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_ICE - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_DRAGON - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_DARK - 1] = NATIONAL_DEX_SILVALLY,
|
||||
[SPECIES_SILVALLY_FAIRY - 1] = NATIONAL_DEX_SILVALLY,
|
||||
// Minior
|
||||
[SPECIES_MINIOR_METEOR_ORANGE - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_METEOR_YELLOW - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_METEOR_GREEN - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_METEOR_BLUE - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_METEOR_INDIGO - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_METEOR_VIOLET - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_RED - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_ORANGE - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_YELLOW - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_GREEN - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_BLUE - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_INDIGO - 1] = NATIONAL_DEX_MINIOR,
|
||||
[SPECIES_MINIOR_CORE_VIOLET - 1] = NATIONAL_DEX_MINIOR,
|
||||
// Mimikyu
|
||||
[SPECIES_MIMIKYU_BUSTED - 1] = NATIONAL_DEX_MIMIKYU,
|
||||
// Necrozma
|
||||
[SPECIES_NECROZMA_DUSK_MANE - 1] = NATIONAL_DEX_NECROZMA,
|
||||
[SPECIES_NECROZMA_DAWN_WINGS - 1] = NATIONAL_DEX_NECROZMA,
|
||||
[SPECIES_NECROZMA_ULTRA - 1] = NATIONAL_DEX_NECROZMA,
|
||||
// Magearna
|
||||
[SPECIES_MAGEARNA_ORIGINAL_COLOR - 1] = NATIONAL_DEX_MAGEARNA,
|
||||
|
||||
};
|
||||
|
||||
const u16 gHoennToNationalOrder[HOENN_DEX_COUNT] = // Assigns Hoenn Dex Pokémon (Using National Dex Index)
|
||||
@ -7360,7 +7644,7 @@ u8 *sub_806F4F8(u8 id, u8 arg1)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
if (arg1 >= structPtr->field_0_0)
|
||||
arg1 = 0;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user