From 2964cc3828983777af272825fa9f0e8434ead0dd Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 26 Oct 2020 22:53:31 -0300 Subject: [PATCH] Filled missing form names. --- src/data/text/species_names.h | 262 ++++++++++++++++++++++++++++++---- 1 file changed, 237 insertions(+), 25 deletions(-) diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 5d78a09ac..2d62f2fac 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -412,11 +412,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_SHIELDON] = _("Shieldon"), [SPECIES_BASTIODON] = _("Bastiodon"), [SPECIES_BURMY] = _("Burmy"), - [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), - [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), [SPECIES_WORMADAM] = _("Wormadam"), - [SPECIES_WORMADAM_SANDY_CLOAK] = _("Wormadam"), - [SPECIES_WORMADAM_TRASH_CLOAK] = _("Wormadam"), [SPECIES_MOTHIM] = _("Mothim"), [SPECIES_COMBEE] = _("Combee"), [SPECIES_VESPIQUEN] = _("Vespiquen"), @@ -483,11 +479,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DUSKNOIR] = _("Dusknoir"), [SPECIES_FROSLASS] = _("Froslass"), [SPECIES_ROTOM] = _("Rotom"), - [SPECIES_ROTOM_HEAT] = _("Rotom"), - [SPECIES_ROTOM_FAN] = _("Rotom"), - [SPECIES_ROTOM_FROST] = _("Rotom"), - [SPECIES_ROTOM_MOW] = _("Rotom"), - [SPECIES_ROTOM_WASH] = _("Rotom"), [SPECIES_UXIE] = _("Uxie"), [SPECIES_MESPRIT] = _("Mesprit"), [SPECIES_AZELF] = _("Azelf"), @@ -655,8 +646,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ZEKROM] = _("Zekrom"), [SPECIES_LANDORUS] = _("Landorus"), [SPECIES_KYUREM] = _("Kyurem"), - [SPECIES_KYUREM_BLACK] = _("Kyurem"), - [SPECIES_KYUREM_WHITE] = _("Kyurem"), [SPECIES_KELDEO] = _("Keldeo"), [SPECIES_MELOETTA] = _("Meloetta"), [SPECIES_GENESECT] = _("Genesect"), @@ -689,7 +678,6 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_FURFROU] = _("Furfrou"), [SPECIES_ESPURR] = _("Espurr"), [SPECIES_MEOWSTIC] = _("Meowstic"), - [SPECIES_MEOWSTIC_F] = _("Meowstic"), [SPECIES_HONEDGE] = _("Honedge"), [SPECIES_DOUBLADE] = _("Doublade"), [SPECIES_AEGISLASH] = _("Aegislash"), @@ -822,6 +810,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MELTAN] = _("Meltan"), [SPECIES_MELMETAL] = _("Melmetal"), + // Megas [SPECIES_MEGA_VENUSAUR] = _("Venusaur"), [SPECIES_MEGA_CHARIZARD_X] = _("Charizard"), [SPECIES_MEGA_CHARIZARD_Y] = _("Charizard"), @@ -869,11 +858,12 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_MEGA_GALLADE] = _("Gallade"), [SPECIES_MEGA_AUDINO] = _("Audino"), [SPECIES_MEGA_DIANCIE] = _("Diancie"), - + // Special Mega + Primals [SPECIES_MEGA_RAYQUAZA] = _("Rayquaza"), [SPECIES_PRIMAL_KYOGRE] = _("Kyogre"), [SPECIES_PRIMAL_GROUDON] = _("Groudon"), + // Alolan Forms [SPECIES_ALOLAN_RATTATA] = _("Rattata"), [SPECIES_ALOLAN_RATICATE] = _("Raticate"), [SPECIES_ALOLAN_RAICHU] = _("Raichu"), @@ -892,24 +882,246 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_ALOLAN_MUK] = _("Muk"), [SPECIES_ALOLAN_EXEGGUTOR] = _("Exeggutor"), [SPECIES_ALOLAN_MAROWAK] = _("Marowak"), - - [SPECIES_SHAYMIN_SKY] = _("Shaymin"), + // Cosplay Pikachu + [SPECIES_PIKACHU_COSPLAY] = _("Pikachu"), + [SPECIES_PIKACHU_ROCK_STAR] = _("Pikachu"), + [SPECIES_PIKACHU_BELLE] = _("Pikachu"), + [SPECIES_PIKACHU_POP_STAR] = _("Pikachu"), + [SPECIES_PIKACHU_PH_D] = _("Pikachu"), + [SPECIES_PIKACHU_LIBRE] = _("Pikachu"), + // Cap Pikachu + [SPECIES_PIKACHU_ORIGINAL_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_HOENN_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_SINNOH_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_UNOVA_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_KALOS_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_ALOLA_CAP] = _("Pikachu"), + [SPECIES_PIKACHU_PARTNER_CAP] = _("Pikachu"), + // Pichu + [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), + // Unown + [SPECIES_UNOWN_B] = _("Unown"), + [SPECIES_UNOWN_C] = _("Unown"), + [SPECIES_UNOWN_D] = _("Unown"), + [SPECIES_UNOWN_E] = _("Unown"), + [SPECIES_UNOWN_F] = _("Unown"), + [SPECIES_UNOWN_G] = _("Unown"), + [SPECIES_UNOWN_H] = _("Unown"), + [SPECIES_UNOWN_I] = _("Unown"), + [SPECIES_UNOWN_J] = _("Unown"), + [SPECIES_UNOWN_K] = _("Unown"), + [SPECIES_UNOWN_L] = _("Unown"), + [SPECIES_UNOWN_M] = _("Unown"), + [SPECIES_UNOWN_N] = _("Unown"), + [SPECIES_UNOWN_O] = _("Unown"), + [SPECIES_UNOWN_P] = _("Unown"), + [SPECIES_UNOWN_Q] = _("Unown"), + [SPECIES_UNOWN_R] = _("Unown"), + [SPECIES_UNOWN_S] = _("Unown"), + [SPECIES_UNOWN_T] = _("Unown"), + [SPECIES_UNOWN_U] = _("Unown"), + [SPECIES_UNOWN_V] = _("Unown"), + [SPECIES_UNOWN_W] = _("Unown"), + [SPECIES_UNOWN_X] = _("Unown"), + [SPECIES_UNOWN_Y] = _("Unown"), + [SPECIES_UNOWN_Z] = _("Unown"), + [SPECIES_UNOWN_QMARK] = _("Unown"), + [SPECIES_UNOWN_EMARK] = _("Unown"), + // Castform + [SPECIES_CASTFORM_SUNNY] = _("Castform"), + [SPECIES_CASTFORM_RAINY] = _("Castform"), + [SPECIES_CASTFORM_SNOWY] = _("Castform"), + // Deoxys + [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), + [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), + [SPECIES_DEOXYS_SPEED] = _("Deoxys"), + // Burmy + [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), + [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), + // Wormadam + [SPECIES_WORMADAM_SANDY_CLOAK] = _("Wormadam"), + [SPECIES_WORMADAM_TRASH_CLOAK] = _("Wormadam"), + // Cherrim + [SPECIES_CHERRIM_SUNSHINE] = _("Cherrim"), + // Shellos + [SPECIES_SHELLOS_EAST_SEA] = _("Shellos"), + // Gastrodon + [SPECIES_GASTRODON_EAST_SEA] = _("Gastrodon"), + // Rotom + [SPECIES_ROTOM_HEAT] = _("Rotom"), + [SPECIES_ROTOM_FAN] = _("Rotom"), + [SPECIES_ROTOM_FROST] = _("Rotom"), + [SPECIES_ROTOM_MOW] = _("Rotom"), + [SPECIES_ROTOM_WASH] = _("Rotom"), + // Giratina [SPECIES_GIRATINA_ORIGIN] = _("Giratina"), + // Shaymin + [SPECIES_SHAYMIN_SKY] = _("Shaymin"), + // Arceus + [SPECIES_ARCEUS_FIGHTING] = _("Arceus"), + [SPECIES_ARCEUS_FLYING] = _("Arceus"), + [SPECIES_ARCEUS_POISON] = _("Arceus"), + [SPECIES_ARCEUS_GROUND] = _("Arceus"), + [SPECIES_ARCEUS_ROCK] = _("Arceus"), + [SPECIES_ARCEUS_BUG] = _("Arceus"), + [SPECIES_ARCEUS_GHOST] = _("Arceus"), + [SPECIES_ARCEUS_STEEL] = _("Arceus"), + [SPECIES_ARCEUS_FIRE] = _("Arceus"), + [SPECIES_ARCEUS_WATER] = _("Arceus"), + [SPECIES_ARCEUS_GRASS] = _("Arceus"), + [SPECIES_ARCEUS_ELECTRIC] = _("Arceus"), + [SPECIES_ARCEUS_PSYCHIC] = _("Arceus"), + [SPECIES_ARCEUS_ICE] = _("Arceus"), + [SPECIES_ARCEUS_DRAGON] = _("Arceus"), + [SPECIES_ARCEUS_DARK] = _("Arceus"), + [SPECIES_ARCEUS_FAIRY] = _("Arceus"), + // Basculin + [SPECIES_BASCULIN_BLUE_STRIPED] = _("Basculin"), + // Darmanitan [SPECIES_DARMANITAN_ZEN_MODE] = _("Darmanitan"), + // Deerling + [SPECIES_DEERLING_SUMMER] = _("Deerling"), + [SPECIES_DEERLING_AUTUMN] = _("Deerling"), + [SPECIES_DEERLING_WINTER] = _("Deerling"), + // Sawsbuck + [SPECIES_SAWSBUCK_SUMMER] = _("Sawsbuck"), + [SPECIES_SAWSBUCK_AUTUMN] = _("Sawsbuck"), + [SPECIES_SAWSBUCK_WINTER] = _("Sawsbuck"), + // Therian Forms [SPECIES_TORNADUS_THERIAN] = _("Tornadus"), [SPECIES_THUNDURUS_THERIAN] = _("Thundurus"), [SPECIES_LANDORUS_THERIAN] = _("Landorus"), + // Kyurem + [SPECIES_KYUREM_BLACK] = _("Kyurem"), + [SPECIES_KYUREM_WHITE] = _("Kyurem"), + // Keldeo + [SPECIES_KELDEO_RESOLUTE] = _("Keldeo"), + // Meloetta [SPECIES_MELOETTA_PIROUETTE] = _("Meloetta"), + // Genesect + [SPECIES_GENESECT_DOUSE_DRIVE] = _("Genesect"), + [SPECIES_GENESECT_SHOCK_DRIVE] = _("Genesect"), + [SPECIES_GENESECT_BURN_DRIVE] = _("Genesect"), + [SPECIES_GENESECT_CHILL_DRIVE] = _("Genesect"), + // Greninja + [SPECIES_GRENINJA_BATTLE_BOND] = _("Giratina"), + [SPECIES_GRENINJA_ASH] = _("Giratina"), + // Vivillon + [SPECIES_VIVILLON_POLAR] = _("Vivillon"), + [SPECIES_VIVILLON_TUNDRA] = _("Vivillon"), + [SPECIES_VIVILLON_CONTINENTAL] = _("Vivillon"), + [SPECIES_VIVILLON_GARDEN] = _("Vivillon"), + [SPECIES_VIVILLON_ELEGANT] = _("Vivillon"), + [SPECIES_VIVILLON_MEADOW] = _("Vivillon"), + [SPECIES_VIVILLON_MODERN] = _("Vivillon"), + [SPECIES_VIVILLON_MARINE] = _("Vivillon"), + [SPECIES_VIVILLON_ARCHIPELAGO] = _("Vivillon"), + [SPECIES_VIVILLON_HIGH_PLAINS] = _("Vivillon"), + [SPECIES_VIVILLON_SANDSTORM] = _("Vivillon"), + [SPECIES_VIVILLON_RIVER] = _("Vivillon"), + [SPECIES_VIVILLON_MONSOON] = _("Vivillon"), + [SPECIES_VIVILLON_SAVANNA] = _("Vivillon"), + [SPECIES_VIVILLON_SUN] = _("Vivillon"), + [SPECIES_VIVILLON_OCEAN] = _("Vivillon"), + [SPECIES_VIVILLON_JUNGLE] = _("Vivillon"), + [SPECIES_VIVILLON_FANCY] = _("Vivillon"), + [SPECIES_VIVILLON_POKE_BALL] = _("Vivillon"), + // Flabébé + [SPECIES_FLABEBE_YELLOW_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_ORANGE_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_BLUE_FLOWER] = _("Flabébé"), + [SPECIES_FLABEBE_WHITE_FLOWER] = _("Flabébé"), + // Floette + [SPECIES_FLOETTE_YELLOW_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_ORANGE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_BLUE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_WHITE_FLOWER] = _("Floette"), + [SPECIES_FLOETTE_ETERNAL_FLOWER] = _("Floette"), + // Florges + [SPECIES_FLORGES_YELLOW_FLOWER] = _("Florges"), + [SPECIES_FLORGES_ORANGE_FLOWER] = _("Florges"), + [SPECIES_FLORGES_BLUE_FLOWER] = _("Florges"), + [SPECIES_FLORGES_WHITE_FLOWER] = _("Florges"), + // Furfrou + [SPECIES_FURFROU_HEART_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_STAR_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DIAMOND_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DEBUTANTE_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_MATRON_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_DANDY_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_LA_REINE_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_KABUKI_TRIM] = _("Furfrou"), + [SPECIES_FURFROU_PHARAOH_TRIM] = _("Furfrou"), + // Meowstic + [SPECIES_MEOWSTIC_F] = _("Meowstic"), + // Aegislash [SPECIES_AEGISLASH_BLADE] = _("Aegislash"), - [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), - [SPECIES_MINIOR_CORE_RED] = _("Minior"), - [SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"), - [SPECIES_MIMIKYU_BUSTED] = _("Mimikyu"), - [SPECIES_LYCANROC_MIDNIGHT] = _("Lycanroc"), - [SPECIES_LYCANROC_DUSK] = _("Lycanroc"), + // Pumpkaboo + [SPECIES_PUMPKABOO_SMALL] = _("Pumpkaboo"), + [SPECIES_PUMPKABOO_LARGE] = _("Pumpkaboo"), + [SPECIES_PUMPKABOO_SUPER] = _("Pumpkaboo"), + // Gourgeist + [SPECIES_GOURGEIST_SMALL] = _("Gourgeist"), + [SPECIES_GOURGEIST_LARGE] = _("Gourgeist"), + [SPECIES_GOURGEIST_SUPER] = _("Gourgeist"), + // Xerneas + [SPECIES_XERNEAS_ACTIVE] = _("Xerneas"), + // Zygarde [SPECIES_ZYGARDE_10] = _("Zygarde"), - [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), - [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), - [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), - [SPECIES_DEOXYS_SPEED] = _("Deoxys"), + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = _("Zygarde"), + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = _("Zygarde"), + [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), + // Hoopa + [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), + // Oricorio + [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), + [SPECIES_ORICORIO_PA_U] = _("Oricorio"), + [SPECIES_ORICORIO_SENSU] = _("Oricorio"), + // Rockruff + [SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"), + // Lycanroc + [SPECIES_LYCANROC_MIDNIGHT] = _("Lycanroc"), + [SPECIES_LYCANROC_DUSK] = _("Lycanroc"), + // Wishiwashi + [SPECIES_WISHIWASHI_SCHOOL] = _("Wishiwashi"), + // Silvally + [SPECIES_SILVALLY_FIGHTING] = _("Silvally"), + [SPECIES_SILVALLY_FLYING] = _("Silvally"), + [SPECIES_SILVALLY_POISON] = _("Silvally"), + [SPECIES_SILVALLY_GROUND] = _("Silvally"), + [SPECIES_SILVALLY_ROCK] = _("Silvally"), + [SPECIES_SILVALLY_BUG] = _("Silvally"), + [SPECIES_SILVALLY_GHOST] = _("Silvally"), + [SPECIES_SILVALLY_STEEL] = _("Silvally"), + [SPECIES_SILVALLY_FIRE] = _("Silvally"), + [SPECIES_SILVALLY_WATER] = _("Silvally"), + [SPECIES_SILVALLY_GRASS] = _("Silvally"), + [SPECIES_SILVALLY_ELECTRIC] = _("Silvally"), + [SPECIES_SILVALLY_PSYCHIC] = _("Silvally"), + [SPECIES_SILVALLY_ICE] = _("Silvally"), + [SPECIES_SILVALLY_DRAGON] = _("Silvally"), + [SPECIES_SILVALLY_DARK] = _("Silvally"), + [SPECIES_SILVALLY_FAIRY] = _("Silvally"), + // Minior + [SPECIES_MINIOR_METEOR_ORANGE] = _("Minior"), + [SPECIES_MINIOR_METEOR_YELLOW] = _("Minior"), + [SPECIES_MINIOR_METEOR_GREEN] = _("Minior"), + [SPECIES_MINIOR_METEOR_BLUE] = _("Minior"), + [SPECIES_MINIOR_METEOR_INDIGO] = _("Minior"), + [SPECIES_MINIOR_METEOR_VIOLET] = _("Minior"), + [SPECIES_MINIOR_CORE_RED] = _("Minior"), + [SPECIES_MINIOR_CORE_ORANGE] = _("Minior"), + [SPECIES_MINIOR_CORE_YELLOW] = _("Minior"), + [SPECIES_MINIOR_CORE_GREEN] = _("Minior"), + [SPECIES_MINIOR_CORE_BLUE] = _("Minior"), + [SPECIES_MINIOR_CORE_INDIGO] = _("Minior"), + [SPECIES_MINIOR_CORE_VIOLET] = _("Minior"), + // Mimikyu + [SPECIES_MIMIKYU_BUSTED] = _("Mimikyu"), + // Necrozma + [SPECIES_NECROZMA_DUSK_MANE] = _("Necrozma"), + [SPECIES_NECROZMA_DAWN_WINGS] = _("Necrozma"), + [SPECIES_NECROZMA_ULTRA] = _("Necrozma"), + // Magearna + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = _("Magearna"), };