diff --git a/PKHeX.Core/Game/GameInfo.cs b/PKHeX.Core/Game/GameInfo.cs index dcfcbdf92..e56917fc0 100644 --- a/PKHeX.Core/Game/GameInfo.cs +++ b/PKHeX.Core/Game/GameInfo.cs @@ -183,6 +183,8 @@ namespace PKHeX.Core itemlist[771] += " (3)"; // Meteorite itemlist[772] += " (4)"; // Meteorite itemlist[842] += " (SM)"; // Fishing Rod + itemlist[945] += " (2)"; // Used Solarizer + itemlist[946] += " (2)"; // Used Lunarizer // Append Z-Crystal flagging foreach (var i in Legal.Pouch_ZCrystal_USUM) diff --git a/PKHeX.Core/Legality/Tables7.cs b/PKHeX.Core/Legality/Tables7.cs index 2c0b89754..ee2d059ca 100644 --- a/PKHeX.Core/Legality/Tables7.cs +++ b/PKHeX.Core/Legality/Tables7.cs @@ -12,10 +12,10 @@ namespace PKHeX.Core internal const int MaxBallID_7 = 0x1A; // 26 internal const int MaxGameID_7 = 41; // Crystal (VC?) - internal const int MaxSpeciesID_7_USUM = 807; // 807 todo - internal const int MaxMoveID_7_USUM = 728; // 728 todo - internal const int MaxItemID_7_USUM = 959; // 959 todo - internal const int MaxAbilityID_7_USUM = 233; // 233 todo + internal const int MaxSpeciesID_7_USUM = 807; + internal const int MaxMoveID_7_USUM = 728; + internal const int MaxItemID_7_USUM = 959; + internal const int MaxAbilityID_7_USUM = 233; #region Met Locations @@ -93,11 +93,11 @@ namespace PKHeX.Core 705, 706, 765, 773, 797, 841, 842, 843, 845, 847, 850, 857, 858, 860, }; - internal static readonly ushort[] Pouch_Key_USUM = { - // todo - }; + internal static readonly ushort[] Pouch_Key_USUM = Pouch_Key_SM.Concat(new ushort[] { + 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, 947, 948 + }).ToArray(); internal static readonly ushort[] Pouch_Roto_USUM = { - //949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959 + 949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959 }; internal static readonly ushort[] Pouch_TMHM_SM = { // 02 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, @@ -123,16 +123,16 @@ namespace PKHeX.Core 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836 }; internal static readonly ushort[] Pouch_ZCrystal_USUM = Pouch_ZCrystal_SM.Concat(new ushort[] { // Bead - //927, 928, 929, 930, 931, 932 + 927, 928, 929, 930, 931, 932 }).ToArray(); internal static readonly ushort[] Pouch_ZCrystalHeld_USUM = Pouch_ZCrystalHeld_SM.Concat(new ushort[] { // Piece - //921, 922, 923, 924, 925, 926 + 921, 922, 923, 924, 925, 926 }).ToArray(); public static readonly Dictionary ZCrystalDictionary = Pouch_ZCrystal_USUM .Zip(Pouch_ZCrystalHeld_USUM, (k, v) => new { Key = (int)k, Value = (int)v }) .ToDictionary(x => x.Key, x => x.Value); internal static readonly ushort[] HeldItems_SM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_SM).ToArray(); - internal static readonly ushort[] HeldItems_USUM = HeldItems_SM; // todo + internal static readonly ushort[] HeldItems_USUM = new ushort[1].Concat(Pouch_Items_SM).Concat(Pouch_Berries_SM).Concat(Pouch_Medicine_SM).Concat(Pouch_ZCrystalHeld_USUM).ToArray(); private static readonly HashSet WildPokeballs7 = new HashSet { 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, diff --git a/PKHeX.Core/Resources/text/de/text_Abilities_de.txt b/PKHeX.Core/Resources/text/de/text_Abilities_de.txt index 07e757f7f..3c7567acd 100644 --- a/PKHeX.Core/Resources/text/de/text_Abilities_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Abilities_de.txt @@ -231,4 +231,4 @@ Gras-Erzeuger Metallprotektor Phantomschutz Prismarüstung -Zerebralmacht +Zerebralmacht \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Games_de.txt b/PKHeX.Core/Resources/text/de/text_Games_de.txt index fd2e7673b..6da84df98 100644 --- a/PKHeX.Core/Resources/text/de/text_Games_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Games_de.txt @@ -30,8 +30,8 @@ Omega Rubin Sonne Mond - - +Ultrasonne +Ultramond GO Rote Blaue [INT]/Grüne [JP] diff --git a/PKHeX.Core/Resources/text/de/text_Items_de.txt b/PKHeX.Core/Resources/text/de/text_Items_de.txt index 31ff1343d..a0432a7cb 100644 --- a/PKHeX.Core/Resources/text/de/text_Items_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Items_de.txt @@ -1,4 +1,4 @@ -Kein Item +Kein Meisterball Hyperball Superball @@ -957,4 +957,4 @@ Schutzbon KP-Bon AP-Bon Statuswertebon -Fangbon +Fangbon \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Moves_de.txt b/PKHeX.Core/Resources/text/de/text_Moves_de.txt index 369c8c6bf..568ddb78d 100644 --- a/PKHeX.Core/Resources/text/de/text_Moves_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Moves_de.txt @@ -726,4 +726,4 @@ Schmetternde Sonnenwalze Geballter Mondlaser Herzliche Knuddelkloppe Fataler Steinregen -Rasselnder Seelentanz +Rasselnder Seelentanz \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_Species_de.txt b/PKHeX.Core/Resources/text/de/text_Species_de.txt index 347832e98..27a20de1e 100644 --- a/PKHeX.Core/Resources/text/de/text_Species_de.txt +++ b/PKHeX.Core/Resources/text/de/text_Species_de.txt @@ -805,4 +805,4 @@ Venicro Agoyon Muramura Kopplosio -Zeraora +Zeraora \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_sm_00000_de.txt b/PKHeX.Core/Resources/text/de/text_sm_00000_de.txt index 1812fe8a0..6260035dd 100644 --- a/PKHeX.Core/Resources/text/de/text_sm_00000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_sm_00000_de.txt @@ -230,4 +230,4 @@ Pikachu-Tal Route 1 Trainerschule -Spaltberg-Tunnel +Spaltberg-Tunnel \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_sm_30000_de.txt b/PKHeX.Core/Resources/text/de/text_sm_30000_de.txt index 83b9a3aec..6a5fd3a04 100644 --- a/PKHeX.Core/Resources/text/de/text_sm_30000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_sm_30000_de.txt @@ -14,4 +14,4 @@ Kanto-Region Hoenn-Region Alola-Region Pokémon-Resort -Johto-Region +Johto-Region \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_sm_40000_de.txt b/PKHeX.Core/Resources/text/de/text_sm_40000_de.txt index 7e8fb4da1..cc4e30bb8 100644 --- a/PKHeX.Core/Resources/text/de/text_sm_40000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_sm_40000_de.txt @@ -85,4 +85,4 @@ Pokémon GO Pokémon Bank Pokémon-Geschäft Demo-Version -Pokémon Trainer Club +Pokémon Trainer Club \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/de/text_sm_60000_de.txt b/PKHeX.Core/Resources/text/de/text_sm_60000_de.txt index ff8c3c2c7..1c2f57288 100644 --- a/PKHeX.Core/Resources/text/de/text_sm_60000_de.txt +++ b/PKHeX.Core/Resources/text/de/text_sm_60000_de.txt @@ -1,4 +1,4 @@ Ferne Person Hortleiterinnen Schatzsucher -Dame der Heißen Quellen +Dame der Heißen Quellen \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Abilities_en.txt b/PKHeX.Core/Resources/text/en/text_Abilities_en.txt index 101e2adcf..7383e9b68 100644 --- a/PKHeX.Core/Resources/text/en/text_Abilities_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Abilities_en.txt @@ -231,4 +231,4 @@ Grassy Surge Full Metal Body Shadow Shield Prism Armor -Neuroforce +Neuroforce \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Forms_en.txt b/PKHeX.Core/Resources/text/en/text_Forms_en.txt index da9790512..4ae5cab82 100644 Binary files a/PKHeX.Core/Resources/text/en/text_Forms_en.txt and b/PKHeX.Core/Resources/text/en/text_Forms_en.txt differ diff --git a/PKHeX.Core/Resources/text/en/text_Items_en.txt b/PKHeX.Core/Resources/text/en/text_Items_en.txt index 674fa7012..5e688928b 100644 --- a/PKHeX.Core/Resources/text/en/text_Items_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Items_en.txt @@ -957,4 +957,4 @@ Roto Stealth Roto HP Restore Roto PP Restore Roto Boost -Roto Catch +Roto Catch \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Moves_en.txt b/PKHeX.Core/Resources/text/en/text_Moves_en.txt index b93aaafc6..10ea28009 100644 --- a/PKHeX.Core/Resources/text/en/text_Moves_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Moves_en.txt @@ -726,4 +726,4 @@ Searing Sunraze Smash Menacing Moonraze Maelstrom Let’s Snuggle Forever Splintered Stormshards -Clangorous Soulblaze +Clangorous Soulblaze \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_Species_en.txt b/PKHeX.Core/Resources/text/en/text_Species_en.txt index f54520242..5f493d52d 100644 --- a/PKHeX.Core/Resources/text/en/text_Species_en.txt +++ b/PKHeX.Core/Resources/text/en/text_Species_en.txt @@ -805,4 +805,4 @@ Poipole Naganadel Stakataka Blacephalon -Zeraora +Zeraora \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_sm_00000_en.txt b/PKHeX.Core/Resources/text/en/text_sm_00000_en.txt index 6f0a6e327..7895879ad 100644 --- a/PKHeX.Core/Resources/text/en/text_sm_00000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_sm_00000_en.txt @@ -230,4 +230,4 @@ Pikachu Valley Route 1 Trainers’ School -Dividing Peak Tunnel +Dividing Peak Tunnel \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_sm_30000_en.txt b/PKHeX.Core/Resources/text/en/text_sm_30000_en.txt index 511db4abe..739123c6f 100644 --- a/PKHeX.Core/Resources/text/en/text_sm_30000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_sm_30000_en.txt @@ -14,4 +14,4 @@ the Kanto region the Hoenn region the Alola region Poké Pelago -the Johto region +the Johto region \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_sm_40000_en.txt b/PKHeX.Core/Resources/text/en/text_sm_40000_en.txt index 67e60d5e7..9b28a4ea9 100644 --- a/PKHeX.Core/Resources/text/en/text_sm_40000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_sm_40000_en.txt @@ -85,4 +85,4 @@ Pokémon GO Pokémon Bank a Pokémon shop a demo version -the Pokémon Trainer Club +the Pokémon Trainer Club \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/en/text_sm_60000_en.txt b/PKHeX.Core/Resources/text/en/text_sm_60000_en.txt index 65b3397a9..163860679 100644 --- a/PKHeX.Core/Resources/text/en/text_sm_60000_en.txt +++ b/PKHeX.Core/Resources/text/en/text_sm_60000_en.txt @@ -1,4 +1,4 @@ a stranger Nursery helpers a treasure hunter -an old hot-springs visitor +an old hot-springs visitor \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Abilities_es.txt b/PKHeX.Core/Resources/text/es/text_Abilities_es.txt index 2a3e2b26a..2411dfd37 100644 --- a/PKHeX.Core/Resources/text/es/text_Abilities_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Abilities_es.txt @@ -231,4 +231,4 @@ Herbogénesis Guardia Metálica Guardia Espectro Armadura Prisma -Fuerza Cerebral +Fuerza Cerebral \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Forms_es.txt b/PKHeX.Core/Resources/text/es/text_Forms_es.txt index 6f611953c..19d08369f 100644 Binary files a/PKHeX.Core/Resources/text/es/text_Forms_es.txt and b/PKHeX.Core/Resources/text/es/text_Forms_es.txt differ diff --git a/PKHeX.Core/Resources/text/es/text_Games_es.txt b/PKHeX.Core/Resources/text/es/text_Games_es.txt index 5de73b3da..722830ade 100644 --- a/PKHeX.Core/Resources/text/es/text_Games_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Games_es.txt @@ -30,8 +30,8 @@ Rubí Omega Sol Luna - - +Ultrasol +Ultraluna GO Roja Azul [INT]/Verde [JP] diff --git a/PKHeX.Core/Resources/text/es/text_Items_es.txt b/PKHeX.Core/Resources/text/es/text_Items_es.txt index 03fd13677..f9852659f 100644 --- a/PKHeX.Core/Resources/text/es/text_Items_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Items_es.txt @@ -1,4 +1,4 @@ -Ningún objeto +Ningún Master Ball Ultra Ball Super Ball @@ -957,4 +957,4 @@ Cupón Sigilo Cupón PS Cupón PP Cupón Refuerzo -Cupón Captura +Cupón Captura \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Moves_es.txt b/PKHeX.Core/Resources/text/es/text_Moves_es.txt index 728cfc1b1..8403b31ac 100644 --- a/PKHeX.Core/Resources/text/es/text_Moves_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Moves_es.txt @@ -726,4 +726,4 @@ Embestida Solar Deflagración Lunar Somanta Amistosa Tempestad Rocosa -Estruendo Implacable +Estruendo Implacable \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_Species_es.txt b/PKHeX.Core/Resources/text/es/text_Species_es.txt index 9a0cfe43f..95bb7dfc5 100644 --- a/PKHeX.Core/Resources/text/es/text_Species_es.txt +++ b/PKHeX.Core/Resources/text/es/text_Species_es.txt @@ -805,4 +805,4 @@ Poipole Naganadel Stakataka Blacephalon -Zeraora +Zeraora \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_sm_00000_es.txt b/PKHeX.Core/Resources/text/es/text_sm_00000_es.txt index 7962f8cea..e706ac678 100644 --- a/PKHeX.Core/Resources/text/es/text_sm_00000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_sm_00000_es.txt @@ -230,4 +230,4 @@ Valle de los Pikachu Ruta 1 Escuela Entrenadores -Túnel del Volcán +Túnel del Volcán \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_sm_30000_es.txt b/PKHeX.Core/Resources/text/es/text_sm_30000_es.txt index 9fc4655c9..b58bdf48a 100644 --- a/PKHeX.Core/Resources/text/es/text_sm_30000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_sm_30000_es.txt @@ -14,4 +14,4 @@ Kanto Hoenn Alola Poké Resort -Johto +Johto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_sm_40000_es.txt b/PKHeX.Core/Resources/text/es/text_sm_40000_es.txt index 768aa8720..06983c773 100644 --- a/PKHeX.Core/Resources/text/es/text_sm_40000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_sm_40000_es.txt @@ -85,4 +85,4 @@ Pokémon GO Banco de Pokémon Establecimiento Pokémon versión de prueba -Club de Entrenadores Pokémon +Club de Entrenadores Pokémon \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/es/text_sm_60000_es.txt b/PKHeX.Core/Resources/text/es/text_sm_60000_es.txt index f9a8cb461..f7fb9df7e 100644 --- a/PKHeX.Core/Resources/text/es/text_sm_60000_es.txt +++ b/PKHeX.Core/Resources/text/es/text_sm_60000_es.txt @@ -1,4 +1,4 @@ Persona lejana Cuidados Pokémon Buscatesoros -Anciana del Balneario +Anciana del Balneario \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt b/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt index 7748c4dc4..1b8095166 100644 --- a/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Abilities_fr.txt @@ -231,4 +231,4 @@ Créa-Herbe Métallo-Garde Spectro-Bouclier Prisme-Armure -Cérébro-Force +Cérébro-Force \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt index c04d0e453..d03d6ae13 100644 Binary files a/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt and b/PKHeX.Core/Resources/text/fr/text_Forms_fr.txt differ diff --git a/PKHeX.Core/Resources/text/fr/text_Games_fr.txt b/PKHeX.Core/Resources/text/fr/text_Games_fr.txt index e1a9d5181..d8d36d888 100644 --- a/PKHeX.Core/Resources/text/fr/text_Games_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Games_fr.txt @@ -30,8 +30,8 @@ Rubis Oméga Soleil Lune - - +Ultra-Soleil +Ultra-Lune GO Rouge Bleue [INT]/Vert [JP] diff --git a/PKHeX.Core/Resources/text/fr/text_Items_fr.txt b/PKHeX.Core/Resources/text/fr/text_Items_fr.txt index 4c06f48f8..0cb9e6542 100644 --- a/PKHeX.Core/Resources/text/fr/text_Items_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Items_fr.txt @@ -1,4 +1,4 @@ -Aucun objet +Aucun Master Ball Hyper Ball Super Ball @@ -957,4 +957,4 @@ Moti-Camouflage Moti-Récup’ PV Moti-Récup’ PP Moti-Soutien -Moti-Capture +Moti-Capture \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt b/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt index e8efd511f..3d76e09ef 100644 --- a/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Moves_fr.txt @@ -726,4 +726,4 @@ Hélio-Choc Dévastateur Rayons Séléno-Explosifs Patati-Patattrape Hurlement des Roches-Lames -Dracacophonie Flamboyante +Dracacophonie Flamboyante \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt index eddb57d7c..95b6b3920 100644 --- a/PKHeX.Core/Resources/text/fr/text_Species_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_Species_fr.txt @@ -805,4 +805,4 @@ Vémini Mandrillon Ama-Ama Pierroteknik -Zeraora +Zeraora \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_sm_00000_fr.txt b/PKHeX.Core/Resources/text/fr/text_sm_00000_fr.txt index 1c9aeee81..1a895809e 100644 --- a/PKHeX.Core/Resources/text/fr/text_sm_00000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_sm_00000_fr.txt @@ -230,4 +230,4 @@ Plaine des Pikachu Route 1 École de Dresseurs -Tunnel Perce-Mont +Tunnel Perce-Mont \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_sm_30000_fr.txt b/PKHeX.Core/Resources/text/fr/text_sm_30000_fr.txt index 9085e7ca8..922c10d6c 100644 --- a/PKHeX.Core/Resources/text/fr/text_sm_30000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_sm_30000_fr.txt @@ -14,4 +14,4 @@ Kanto Hoenn Alola Poké Loisir -Johto +Johto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_sm_40000_fr.txt b/PKHeX.Core/Resources/text/fr/text_sm_40000_fr.txt index 5f762ecc3..e1ede65e3 100644 --- a/PKHeX.Core/Resources/text/fr/text_sm_40000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_sm_40000_fr.txt @@ -85,4 +85,4 @@ Pokémon GO Banque Pokémon Boutique Pokémon Démo -Club des Dresseurs Pokémon +Club des Dresseurs Pokémon \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/fr/text_sm_60000_fr.txt b/PKHeX.Core/Resources/text/fr/text_sm_60000_fr.txt index fba807b13..a80b9a525 100644 --- a/PKHeX.Core/Resources/text/fr/text_sm_60000_fr.txt +++ b/PKHeX.Core/Resources/text/fr/text_sm_60000_fr.txt @@ -1,4 +1,4 @@ Personne lointaine Responsable de la Garderie Chercheur de Trésors -Dame des Eaux Thermales +Dame des Eaux Thermales \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Abilities_it.txt b/PKHeX.Core/Resources/text/it/text_Abilities_it.txt index b7fd86a51..56080541a 100644 --- a/PKHeX.Core/Resources/text/it/text_Abilities_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Abilities_it.txt @@ -231,4 +231,4 @@ Erbogenesi Metalprotezione Spettroguardia Scudoprisma -Cerebroforza +Cerebroforza \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Forms_it.txt b/PKHeX.Core/Resources/text/it/text_Forms_it.txt index d910f5cbb..12c3de6b2 100644 Binary files a/PKHeX.Core/Resources/text/it/text_Forms_it.txt and b/PKHeX.Core/Resources/text/it/text_Forms_it.txt differ diff --git a/PKHeX.Core/Resources/text/it/text_Games_it.txt b/PKHeX.Core/Resources/text/it/text_Games_it.txt index 765016b58..bdc33cbd4 100644 --- a/PKHeX.Core/Resources/text/it/text_Games_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Games_it.txt @@ -30,8 +30,8 @@ Rubino Omega Sole Luna - - +Ultrasole +Ultraluna GO Rossa Blu [INT]/Verde [JP] diff --git a/PKHeX.Core/Resources/text/it/text_Items_it.txt b/PKHeX.Core/Resources/text/it/text_Items_it.txt index 1339a7e84..338ed77de 100644 --- a/PKHeX.Core/Resources/text/it/text_Items_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Items_it.txt @@ -957,4 +957,4 @@ Repelle’n’roll PS’n’roll PP’n’roll Stat’n’roll -Acchiappa’n’roll +Acchiappa’n’roll \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Moves_it.txt b/PKHeX.Core/Resources/text/it/text_Moves_it.txt index c84439c90..0f6526199 100644 --- a/PKHeX.Core/Resources/text/it/text_Moves_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Moves_it.txt @@ -726,4 +726,4 @@ Supercollisione Solare Deflagrazione Lunare Dolcesacco di Botte Litotempesta Radiale -Dracofonia Divampante +Dracofonia Divampante \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_Species_it.txt b/PKHeX.Core/Resources/text/it/text_Species_it.txt index 300512b3a..5a749c8f1 100644 --- a/PKHeX.Core/Resources/text/it/text_Species_it.txt +++ b/PKHeX.Core/Resources/text/it/text_Species_it.txt @@ -805,4 +805,4 @@ Poipole Naganadel Stakataka Blacephalon -Zeraora +Zeraora \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_sm_00000_it.txt b/PKHeX.Core/Resources/text/it/text_sm_00000_it.txt index ecdebf24e..d1441d63b 100644 --- a/PKHeX.Core/Resources/text/it/text_sm_00000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_sm_00000_it.txt @@ -230,4 +230,4 @@ Valle dei Pikachu Percorso 1 Scuola Allenatori -Tunnel del Vulcano +Tunnel del Vulcano \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_sm_30000_it.txt b/PKHeX.Core/Resources/text/it/text_sm_30000_it.txt index 5299f7991..a2720a06c 100644 --- a/PKHeX.Core/Resources/text/it/text_sm_30000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_sm_30000_it.txt @@ -14,4 +14,4 @@ Kanto Hoenn Alola Poké Resort -Johto +Johto \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_sm_40000_it.txt b/PKHeX.Core/Resources/text/it/text_sm_40000_it.txt index ff3df182b..4fddf692a 100644 --- a/PKHeX.Core/Resources/text/it/text_sm_40000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_sm_40000_it.txt @@ -85,4 +85,4 @@ Pokémon GO Banca Pokémon Negozio Pokémon Demo -Club Allenatori di Pokémon +Club Allenatori di Pokémon \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/it/text_sm_60000_it.txt b/PKHeX.Core/Resources/text/it/text_sm_60000_it.txt index 6d2fa05e7..b1d6e817f 100644 --- a/PKHeX.Core/Resources/text/it/text_sm_60000_it.txt +++ b/PKHeX.Core/Resources/text/it/text_sm_60000_it.txt @@ -1,4 +1,4 @@ Persona lontana Ostello Pokémon Cercatesori -Vecchina delle terme +Vecchina delle terme \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt b/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt index cc9dcf000..3a5488a8d 100644 --- a/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Abilities_ja.txt @@ -231,4 +231,4 @@ メタルプロテクト ファントムガード プリズムアーマー -ブレインフォース +ブレインフォース \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt index 9f824fd12..0dc15ff56 100644 Binary files a/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt and b/PKHeX.Core/Resources/text/ja/text_Forms_ja.txt differ diff --git a/PKHeX.Core/Resources/text/ja/text_Games_ja.txt b/PKHeX.Core/Resources/text/ja/text_Games_ja.txt index ef06a74e5..c82f35352 100644 --- a/PKHeX.Core/Resources/text/ja/text_Games_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Games_ja.txt @@ -30,8 +30,8 @@ Y サン ムーン - - +ウルトラサン +ウルトラムーン GO 赤 青 [INT]/緑 [JP] diff --git a/PKHeX.Core/Resources/text/ja/text_Items_ja.txt b/PKHeX.Core/Resources/text/ja/text_Items_ja.txt index c5439eb59..70d026889 100644 --- a/PKHeX.Core/Resources/text/ja/text_Items_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Items_ja.txt @@ -957,4 +957,4 @@ ＨＰかいふくポン ＰＰかいふくポン おうえんポン -つかまえポン +つかまえポン \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt b/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt index 0f69f3b2a..eb1f33576 100644 --- a/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Moves_ja.txt @@ -726,4 +726,4 @@ ムーンライトブラスター ぽかぼかフレンドタイム ラジアルエッジストーム -ブレイジングソウルビート +ブレイジングソウルビート \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_Species_ja.txt b/PKHeX.Core/Resources/text/ja/text_Species_ja.txt index e3ba49981..6c0715891 100644 --- a/PKHeX.Core/Resources/text/ja/text_Species_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_Species_ja.txt @@ -805,4 +805,4 @@ アーゴヨン ツンデツンデ ズガドーン -ゼラオラ +ゼラオラ \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_sm_00000_ja.txt b/PKHeX.Core/Resources/text/ja/text_sm_00000_ja.txt index 056445d85..80d49ef76 100644 --- a/PKHeX.Core/Resources/text/ja/text_sm_00000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_sm_00000_ja.txt @@ -230,4 +230,4 @@ １ばんどうろ トレーナーズスクール -ワカツダケトンネル +ワカツダケトンネル \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_sm_30000_ja.txt b/PKHeX.Core/Resources/text/ja/text_sm_30000_ja.txt index 5a572b26a..866efe1c1 100644 --- a/PKHeX.Core/Resources/text/ja/text_sm_30000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_sm_30000_ja.txt @@ -14,4 +14,4 @@ Pokémon GO ホウエンちほう アローラちほう ポケリゾート -ジョウトちほう +ジョウトちほう \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_sm_40000_ja.txt b/PKHeX.Core/Resources/text/ja/text_sm_40000_ja.txt index f31f3428e..ce3805d67 100644 --- a/PKHeX.Core/Resources/text/ja/text_sm_40000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_sm_40000_ja.txt @@ -85,4 +85,4 @@ Pokémon GO ポケモンバンク ポケモンのショップ たいけんばん -the Pokémon Trainer Club +the Pokémon Trainer Club \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ja/text_sm_60000_ja.txt b/PKHeX.Core/Resources/text/ja/text_sm_60000_ja.txt index d6fdf6304..e7c50304f 100644 --- a/PKHeX.Core/Resources/text/ja/text_sm_60000_ja.txt +++ b/PKHeX.Core/Resources/text/ja/text_sm_60000_ja.txt @@ -1,4 +1,4 @@ とおくにいるひと あずかりやさん トレジャーハンター -おんせんばあさん +おんせんばあさん \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt b/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt index d5483239c..b2161fd33 100644 --- a/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Abilities_ko.txt @@ -231,4 +231,4 @@ AR시스템 메탈프로텍트 스펙터가드 프리즘아머 -브레인포스 +브레인포스 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt index cd2dc70dc..a2dd618d4 100644 Binary files a/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt and b/PKHeX.Core/Resources/text/ko/text_Forms_ko.txt differ diff --git a/PKHeX.Core/Resources/text/ko/text_Games_ko.txt b/PKHeX.Core/Resources/text/ko/text_Games_ko.txt index 314da6930..008c433a8 100644 --- a/PKHeX.Core/Resources/text/ko/text_Games_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Games_ko.txt @@ -30,8 +30,8 @@ Y 썬 문 - - +울트라썬 +울트라문 고 레드 블루 [INT]/그린 [JP] diff --git a/PKHeX.Core/Resources/text/ko/text_Items_ko.txt b/PKHeX.Core/Resources/text/ko/text_Items_ko.txt index 784f20e57..365c58faf 100644 --- a/PKHeX.Core/Resources/text/ko/text_Items_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Items_ko.txt @@ -957,4 +957,4 @@ Z파워링 HP회복캡슐토이 PP회복캡슐토이 응원캡슐토이 -잡기캡슐토이 +잡기캡슐토이 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt b/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt index 34b378523..17f6ee7bd 100644 --- a/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Moves_ko.txt @@ -726,4 +726,4 @@ DD래리어트 문라이트블래스터 투닥투닥프렌드타임 레이디얼에지스톰 -브레이징소울비트 +브레이징소울비트 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt index aa51238d8..ca7896921 100644 --- a/PKHeX.Core/Resources/text/ko/text_Species_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_Species_ko.txt @@ -805,4 +805,4 @@ 아고용 차곡차곡 두파팡 -제라오라 +제라오라 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_sm_00000_ko.txt b/PKHeX.Core/Resources/text/ko/text_sm_00000_ko.txt index 4a0ee246b..9f27d01f3 100644 --- a/PKHeX.Core/Resources/text/ko/text_sm_00000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_sm_00000_ko.txt @@ -230,4 +230,4 @@ 1번도로 트레이너스쿨 -경계터널 +경계터널 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_sm_30000_ko.txt b/PKHeX.Core/Resources/text/ko/text_sm_30000_ko.txt index 08c2a3174..aef7e43c0 100644 --- a/PKHeX.Core/Resources/text/ko/text_sm_30000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_sm_30000_ko.txt @@ -14,4 +14,4 @@ Pokémon GO 호연지방 알로라지방 포켓리조트 -성도지방 +성도지방 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_sm_40000_ko.txt b/PKHeX.Core/Resources/text/ko/text_sm_40000_ko.txt index a9681360a..d0754fbdf 100644 --- a/PKHeX.Core/Resources/text/ko/text_sm_40000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_sm_40000_ko.txt @@ -85,4 +85,4 @@ Pokémon GO 포켓몬 뱅크 a Pokémon shop 체험판 -the Pokémon Trainer Club +the Pokémon Trainer Club \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/ko/text_sm_60000_ko.txt b/PKHeX.Core/Resources/text/ko/text_sm_60000_ko.txt index 5984ba23d..09e457a80 100644 --- a/PKHeX.Core/Resources/text/ko/text_sm_60000_ko.txt +++ b/PKHeX.Core/Resources/text/ko/text_sm_60000_ko.txt @@ -1,4 +1,4 @@ 멀리 있는 사람 맡기미집 트레져헌터 -온천할머니 +온천할머니 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt b/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt index dbcab6a83..289c55092 100644 --- a/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Abilities_zh.txt @@ -231,4 +231,4 @@ 金属防护 幻影防守 棱镜装甲 -脑核之力 +脑核之力 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt b/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt index 4d7a66488..2a1079fc1 100644 Binary files a/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt and b/PKHeX.Core/Resources/text/zh/text_Forms_zh.txt differ diff --git a/PKHeX.Core/Resources/text/zh/text_Games_zh.txt b/PKHeX.Core/Resources/text/zh/text_Games_zh.txt index f68732254..12f5a04c6 100644 --- a/PKHeX.Core/Resources/text/zh/text_Games_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Games_zh.txt @@ -30,8 +30,8 @@ Y 太阳 月亮 - - +究極之日 +究極之月 GO 红 蓝 [国际]/绿 [日] diff --git a/PKHeX.Core/Resources/text/zh/text_Items_zh.txt b/PKHeX.Core/Resources/text/zh/text_Items_zh.txt index d25134997..057723abf 100644 --- a/PKHeX.Core/Resources/text/zh/text_Items_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Items_zh.txt @@ -957,4 +957,4 @@ ＨＰ回复碰碰 ＰＰ回复碰碰 加油碰碰 -捕捉碰碰 +捕捉碰碰 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt b/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt index 67c09607e..aa9877ec3 100644 --- a/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Moves_zh.txt @@ -726,4 +726,4 @@ 月华飞溅落灵霄 亲密无间大乱揍 狼啸石牙飓风暴 -炽魂热舞烈音爆 +炽魂热舞烈音爆 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Species_zh.txt b/PKHeX.Core/Resources/text/zh/text_Species_zh.txt index 89481951b..26428a6d3 100644 --- a/PKHeX.Core/Resources/text/zh/text_Species_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_Species_zh.txt @@ -1,808 +1,808 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +蛋 +妙蛙种子 +妙蛙草 +妙蛙花 +小火龙 +火恐龙 +喷火龙 +杰尼龟 +卡咪龟 +水箭龟 +绿毛虫 +铁甲蛹 +巴大蝶 +独角虫 +铁壳蛹 +大针蜂 +波波 +比比鸟 +大比鸟 +小拉达 +拉达 +烈雀 +大嘴雀 +阿柏蛇 +阿柏怪 +皮卡丘 +雷丘 +穿山鼠 +穿山王 +尼多兰 +尼多娜 +尼多后 +尼多朗 +尼多力诺 +尼多王 +皮皮 +皮可西 +六尾 +九尾 +胖丁 +胖可丁 +超音蝠 +大嘴蝠 +走路草 +臭臭花 +霸王花 +派拉斯 +派拉斯特 +毛球 +摩鲁蛾 +地鼠 +三地鼠 +喵喵 +猫老大 +可达鸭 +哥达鸭 +猴怪 +火暴猴 +卡蒂狗 +风速狗 +蚊香蝌蚪 +蚊香君 +蚊香泳士 +凯西 +勇基拉 +胡地 +腕力 +豪力 +怪力 +喇叭芽 +口呆花 +大食花 +玛瑙水母 +毒刺水母 +小拳石 +隆隆石 +隆隆岩 +小火马 +烈焰马 +呆呆兽 +呆壳兽 +小磁怪 +三合一磁怪 +大葱鸭 +嘟嘟 +嘟嘟利 +小海狮 +白海狮 +臭泥 +臭臭泥 +大舌贝 +刺甲贝 +鬼斯 +鬼斯通 +耿鬼 +大岩蛇 +催眠貘 +引梦貘人 +大钳蟹 +巨钳蟹 +霹雳电球 +顽皮雷弹 +蛋蛋 +椰蛋树 +卡拉卡拉 +嘎啦嘎啦 +飞腿郎 +快拳郎 +大舌头 +瓦斯弹 +双弹瓦斯 +独角犀牛 +钻角犀兽 +吉利蛋 +蔓藤怪 +袋兽 +墨海马 +海刺龙 +角金鱼 +金鱼王 +海星星 +宝石海星 +魔墙人偶 +飞天螳螂 +迷唇姐 +电击兽 +鸭嘴火兽 +凯罗斯 +肯泰罗 +鲤鱼王 +暴鲤龙 +拉普拉斯 +百变怪 +伊布 +水伊布 +雷伊布 +火伊布 +多边兽 +菊石兽 +多刺菊石兽 +化石盔 +镰刀盔 +化石翼龙 +卡比兽 +急冻鸟 +闪电鸟 +火焰鸟 +迷你龙 +哈克龙 +快龙 +超梦 +梦幻 +菊草叶 +月桂叶 +大竺葵 +火球鼠 +火岩鼠 +火暴兽 +小锯鳄 +蓝鳄 +大力鳄 +尾立 +大尾立 +咕咕 +猫头夜鹰 +芭瓢虫 +安瓢虫 +圆丝蛛 +阿利多斯 +叉字蝠 +灯笼鱼 +电灯怪 +皮丘 +皮宝宝 +宝宝丁 +波克比 +波克基古 +天然雀 +天然鸟 +咩利羊 +茸茸羊 +电龙 +美丽花 +玛力露 +玛力露丽 +树才怪 +蚊香蛙皇 +毽子草 +毽子花 +毽子棉 +长尾怪手 +向日种子 +向日花怪 +蜻蜻蜓 +乌波 +沼王 +太阳伊布 +月亮伊布 +黑暗鸦 +呆呆王 +梦妖 +未知图腾 +果然翁 +麒麟奇 +榛果球 +佛烈托斯 +土龙弟弟 +天蝎 +大钢蛇 +布鲁 +布鲁皇 +千针鱼 +巨钳螳螂 +壶壶 +赫拉克罗斯 +狃拉 +熊宝宝 +圈圈熊 +熔岩虫 +熔岩蜗牛 +小山猪 +长毛猪 +太阳珊瑚 +铁炮鱼 +章鱼桶 +信使鸟 +巨翅飞鱼 +盔甲鸟 +戴鲁比 +黑鲁加 +刺龙王 +小小象 +顿甲 +多边兽Ⅱ +惊角鹿 +图图犬 +无畏小子 +战舞郎 +迷唇娃 +电击怪 +鸭嘴宝宝 +大奶罐 +幸福蛋 +雷公 +炎帝 +水君 +幼基拉斯 +沙基拉斯 +班基拉斯 +洛奇亚 +凤王 +时拉比 +木守宫 +森林蜥蜴 +蜥蜴王 +火稚鸡 +力壮鸡 +火焰鸡 +水跃鱼 +沼跃鱼 +巨沼怪 +土狼犬 +大狼犬 +蛇纹熊 +直冲熊 +刺尾虫 +甲壳茧 +狩猎凤蝶 +盾甲茧 +毒粉蛾 +莲叶童子 +莲帽小童 +乐天河童 +橡实果 +长鼻叶 +狡猾天狗 +傲骨燕 +大王燕 +长翅鸥 +大嘴鸥 +拉鲁拉丝 +奇鲁莉安 +沙奈朵 +溜溜糖球 +雨翅蛾 +蘑蘑菇 +斗笠菇 +懒人獭 +过动猿 +请假王 +土居忍士 +铁面忍者 +脱壳忍者 +咕妞妞 +吼爆弹 +爆音怪 +幕下力士 +铁掌力士 +露力丽 +朝北鼻 +向尾喵 +优雅猫 +勾魂眼 +大嘴娃 +可可多拉 +可多拉 +波士可多拉 +玛沙那 +恰雷姆 +落雷兽 +雷电兽 +正电拍拍 +负电拍拍 +电萤虫 +甜甜萤 +毒蔷薇 +溶食兽 +吞食兽 +利牙鱼 +巨牙鲨 +吼吼鲸 +吼鲸王 +呆火驼 +喷火驼 +煤炭龟 +跳跳猪 +噗噗猪 +晃晃斑 +大颚蚁 +超音波幼虫 +沙漠蜻蜓 +刺球仙人掌 +梦歌仙人掌 +青绵鸟 +七夕青鸟 +猫鼬斩 +饭匙蛇 +月石 +太阳岩 +泥泥鳅 +鲶鱼王 +龙虾小兵 +铁螯龙虾 +天秤偶 +念力土偶 +触手百合 +摇篮百合 +太古羽虫 +太古盔甲 +丑丑鱼 +美纳斯 +飘浮泡泡 +变隐龙 +怨影娃娃 +诅咒娃娃 +夜巡灵 +彷徨夜灵 +热带龙 +风铃铃 +阿勃梭鲁 +小果然 +雪童子 +冰鬼护 +海豹球 +海魔狮 +帝牙海狮 +珍珠贝 +猎斑鱼 +樱花鱼 +古空棘鱼 +爱心鱼 +宝贝龙 +甲壳龙 +暴飞龙 +铁哑铃 +金属怪 +巨金怪 +雷吉洛克 +雷吉艾斯 +雷吉斯奇鲁 +拉帝亚斯 +拉帝欧斯 +盖欧卡 +固拉多 +烈空坐 +基拉祈 +代欧奇希斯 +草苗龟 +树林龟 +土台龟 +小火焰猴 +猛火猴 +烈焰猴 +波加曼 +波皇子 +帝王拿波 +姆克儿 +姆克鸟 +姆克鹰 +大牙狸 +大尾狸 +圆法师 +音箱蟀 +小猫怪 +勒克猫 +伦琴猫 +含羞苞 +罗丝雷朵 +头盖龙 +战槌龙 +盾甲龙 +护城龙 +结草儿 +结草贵妇 +绅士蛾 +三蜜蜂 +蜂女王 +帕奇利兹 +泳圈鼬 +浮潜鼬 +樱花宝 +樱花儿 +无壳海兔 +海兔兽 +双尾怪手 +飘飘球 +随风球 +卷卷耳 +长耳兔 +梦妖魔 +乌鸦头头 +魅力喵 +东施喵 +铃铛响 +臭鼬噗 +坦克臭鼬 +铜镜怪 +青铜钟 +盆才怪 +魔尼尼 +小福蛋 +聒噪鸟 +花岩怪 +圆陆鲨 +尖牙陆鲨 +烈咬陆鲨 +小卡比兽 +利欧路 +路卡利欧 +沙河马 +河马兽 +钳尾蝎 +龙王蝎 +不良蛙 +毒骷蛙 +尖牙笼 +荧光鱼 +霓虹鱼 +小球飞鱼 +雪笠怪 +暴雪王 +玛狃拉 +自爆磁怪 +大舌舔 +超甲狂犀 +巨蔓藤 +电击魔兽 +鸭嘴炎兽 +波克基斯 +远古巨蜓 +叶伊布 +冰伊布 +天蝎王 +象牙猪 +多边兽Ｚ +艾路雷朵 +大朝北鼻 +黑夜魔灵 +雪妖女 +洛托姆 +由克希 +艾姆利多 +亚克诺姆 +帝牙卢卡 +帕路奇亚 +席多蓝恩 +雷吉奇卡斯 +骑拉帝纳 +克雷色利亚 +霏欧纳 +玛纳霏 +达克莱伊 +谢米 +阿尔宙斯 +比克提尼 +藤藤蛇 +青藤蛇 +君主蛇 +暖暖猪 +炒炒猪 +炎武王 +水水獭 +双刃丸 +大剑鬼 +探探鼠 +步哨鼠 +小约克 +哈约克 +长毛狗 +扒手猫 +酷豹 +花椰猴 +花椰猿 +爆香猴 +爆香猿 +冷水猴 +冷水猿 +食梦梦 +梦梦蚀 +豆豆鸽 +咕咕鸽 +高傲雉鸡 +斑斑马 +雷电斑马 +石丸子 +地幔岩 +庞岩怪 +滚滚蝙蝠 +心蝙蝠 +螺钉地鼠 +龙头地鼠 +差不多娃娃 +搬运小匠 +铁骨土人 +修建老匠 +圆蝌蚪 +蓝蟾蜍 +蟾蜍王 +投摔鬼 +打击鬼 +虫宝包 +宝包茧 +保姆虫 +百足蜈蚣 +车轮球 +蜈蚣王 +木棉球 +风妖精 +百合根娃娃 +裙儿小姐 +野蛮鲈鱼 +黑眼鳄 +混混鳄 +流氓鳄 +火红不倒翁 +达摩狒狒 +沙铃仙人掌 +石居蟹 +岩殿居蟹 +滑滑小子 +头巾混混 +象征鸟 +哭哭面具 +死神棺 +原盖海龟 +肋骨海龟 +始祖小鸟 +始祖大鸟 +破破袋 +灰尘山 +索罗亚 +索罗亚克 +泡沫栗鼠 +奇诺栗鼠 +哥德宝宝 +哥德小童 +哥德小姐 +单卵细胞球 +双卵细胞球 +人造细胞卵 +鸭宝宝 +舞天鹅 +迷你冰 +多多冰 +双倍多多冰 +四季鹿 +萌芽鹿 +电飞鼠 +盖盖虫 +骑士蜗牛 +哎呀球菇 +败露球菇 +轻飘飘 +胖嘟嘟 +保姆曼波 +电电虫 +电蜘蛛 +种子铁球 +坚果哑铃 +齿轮儿 +齿轮组 +齿轮怪 +麻麻小鱼 +麻麻鳗 +麻麻鳗鱼王 +小灰怪 +大宇怪 +烛光灵 +灯火幽灵 +水晶灯火灵 +牙牙 +斧牙龙 +双斧战龙 +喷嚏熊 +冻原熊 +几何雪花 +小嘴蜗 +敏捷虫 +泥巴鱼 +功夫鼬 +师父鼬 +赤面龙 +泥偶小人 +泥偶巨人 +驹刀小兵 +劈斩司令 +爆炸头水牛 +毛头小鹰 +勇士雄鹰 +秃鹰丫头 +秃鹰娜 +熔蚁兽 +铁蚁 +单首龙 +双首暴龙 +三首恶龙 +燃烧虫 +火神蛾 +勾帕路翁 +代拉基翁 +毕力吉翁 +龙卷云 +雷电云 +莱希拉姆 +捷克罗姆 +土地云 +酋雷姆 +凯路迪欧 +美洛耶塔 +盖诺赛克特 +哈力栗 +胖胖哈力 +布里卡隆 +火狐狸 +长尾火狐 +妖火红狐 +呱呱泡蛙 +呱头蛙 +甲贺忍蛙 +掘掘兔 +掘地兔 +小箭雀 +火箭雀 +烈箭鹰 +粉蝶虫 +粉蝶蛹 +彩粉蝶 +小狮狮 +火炎狮 +花蓓蓓 +花叶蒂 +花洁夫人 +坐骑小羊 +坐骑山羊 +顽皮熊猫 +流氓熊猫 +多丽米亚 +妙喵 +超能妙喵 +独剑鞘 +双剑鞘 +坚盾剑怪 +粉香香 +芳香精 +绵绵泡芙 +胖甜妮 +好啦鱿 +乌贼王 +龟脚脚 +龟足巨铠 +垃垃藻 +毒藻龙 +铁臂枪虾 +钢炮臂虾 +伞电蜥 +光电伞蜥 +宝宝暴龙 +怪颚龙 +冰雪龙 +冰雪巨龙 +仙子伊布 +摔角鹰人 +咚咚鼠 +小碎钻 +黏黏宝 +黏美儿 +黏美龙 +钥圈儿 +小木灵 +朽木妖 +南瓜精 +南瓜怪人 +冰宝 +冰岩怪 +嗡蝠 +音波龙 +哲尔尼亚斯 +伊裴尔塔尔 +基格尔德 +蒂安希 +胡帕 +波尔凯尼恩 +木木枭 +投羽枭 +狙射树枭 +火斑喵 +炎热喵 +炽焰咆哮虎 +球球海狮 +花漾海狮 +西狮海壬 +小笃儿 +喇叭啄鸟 +铳嘴大鸟 +猫鼬少 +猫鼬探长 +强颚鸡母虫 +虫电宝 +锹农炮虫 +好胜蟹 +好胜毛蟹 +花舞鸟 +萌虻 +蝶结萌虻 +岩狗狗 +鬃岩狼人 +弱丁鱼 +好坏星 +超坏星 +泥驴仔 +重泥挽马 +滴蛛 +滴蛛霸 +伪螳草 +兰螳花 +睡睡菇 +灯罩夜菇 +夜盗火蜥 +焰后蜥 +童偶熊 +穿着熊 +甜竹竹 +甜舞妮 +甜冷美后 +花疗环环 +智挥猩 +投掷猴 +胆小虫 +具甲武者 +沙丘娃 +噬沙堡爷 +拳海参 +属性：空 +银伴战兽 +小陨星 +树枕尾熊 +爆焰龟兽 +托戈德玛尔 +谜拟Ｑ +磨牙彩皮鱼 +老翁龙 +破破舵轮 +心鳞宝 +鳞甲龙 +杖尾鳞甲龙 +卡璞・鸣鸣 +卡璞・蝶蝶 +卡璞・哞哞 +卡璞・鳍鳍 +科斯莫古 +科斯莫姆 +索尔迦雷欧 +露奈雅拉 +虚吾伊德 +爆肌蚊 +费洛美螂 +电束木 +铁火辉夜 +纸御剑 +恶食大王 +奈克洛兹玛 +玛机雅娜 +玛夏多 +803 +804 +805 +806 +807 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_Species_zh2.txt b/PKHeX.Core/Resources/text/zh/text_Species_zh2.txt index 5690ddffe..8b74583bc 100644 --- a/PKHeX.Core/Resources/text/zh/text_Species_zh2.txt +++ b/PKHeX.Core/Resources/text/zh/text_Species_zh2.txt @@ -1,808 +1,808 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Ｑ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +蛋 +妙蛙種子 +妙蛙草 +妙蛙花 +小火龍 +火恐龍 +噴火龍 +傑尼龜 +卡咪龜 +水箭龜 +綠毛蟲 +鐵甲蛹 +巴大蝶 +獨角蟲 +鐵殼蛹 +大針蜂 +波波 +比比鳥 +大比鳥 +小拉達 +拉達 +烈雀 +大嘴雀 +阿柏蛇 +阿柏怪 +皮卡丘 +雷丘 +穿山鼠 +穿山王 +尼多蘭 +尼多娜 +尼多后 +尼多朗 +尼多力諾 +尼多王 +皮皮 +皮可西 +六尾 +九尾 +胖丁 +胖可丁 +超音蝠 +大嘴蝠 +走路草 +臭臭花 +霸王花 +派拉斯 +派拉斯特 +毛球 +摩魯蛾 +地鼠 +三地鼠 +喵喵 +貓老大 +可達鴨 +哥達鴨 +猴怪 +火爆猴 +卡蒂狗 +風速狗 +蚊香蝌蚪 +蚊香君 +蚊香泳士 +凱西 +勇基拉 +胡地 +腕力 +豪力 +怪力 +喇叭芽 +口呆花 +大食花 +瑪瑙水母 +毒刺水母 +小拳石 +隆隆石 +隆隆岩 +小火馬 +烈焰馬 +呆呆獸 +呆殼獸 +小磁怪 +三合一磁怪 +大蔥鴨 +嘟嘟 +嘟嘟利 +小海獅 +白海獅 +臭泥 +臭臭泥 +大舌貝 +刺甲貝 +鬼斯 +鬼斯通 +耿鬼 +大岩蛇 +催眠貘 +引夢貘人 +大鉗蟹 +巨鉗蟹 +霹靂電球 +頑皮雷彈 +蛋蛋 +椰蛋樹 +卡拉卡拉 +嘎啦嘎啦 +飛腿郎 +快拳郎 +大舌頭 +瓦斯彈 +雙彈瓦斯 +獨角犀牛 +鑽角犀獸 +吉利蛋 +蔓藤怪 +袋獸 +墨海馬 +海刺龍 +角金魚 +金魚王 +海星星 +寶石海星 +魔牆人偶 +飛天螳螂 +迷唇姐 +電擊獸 +鴨嘴火獸 +凱羅斯 +肯泰羅 +鯉魚王 +暴鯉龍 +拉普拉斯 +百變怪 +伊布 +水伊布 +雷伊布 +火伊布 +多邊獸 +菊石獸 +多刺菊石獸 +化石盔 +鐮刀盔 +化石翼龍 +卡比獸 +急凍鳥 +閃電鳥 +火焰鳥 +迷你龍 +哈克龍 +快龍 +超夢 +夢幻 +菊草葉 +月桂葉 +大竺葵 +火球鼠 +火岩鼠 +火爆獸 +小鋸鱷 +藍鱷 +大力鱷 +尾立 +大尾立 +咕咕 +貓頭夜鷹 +芭瓢蟲 +安瓢蟲 +圓絲蛛 +阿利多斯 +叉字蝠 +燈籠魚 +電燈怪 +皮丘 +皮寶寶 +寶寶丁 +波克比 +波克基古 +天然雀 +天然鳥 +咩利羊 +茸茸羊 +電龍 +美麗花 +瑪力露 +瑪力露麗 +樹才怪 +蚊香蛙皇 +毽子草 +毽子花 +毽子棉 +長尾怪手 +向日種子 +向日花怪 +蜻蜻蜓 +烏波 +沼王 +太陽伊布 +月亮伊布 +黑暗鴉 +呆呆王 +夢妖 +未知圖騰 +果然翁 +麒麟奇 +榛果球 +佛烈托斯 +土龍弟弟 +天蠍 +大鋼蛇 +布魯 +布魯皇 +千針魚 +巨鉗螳螂 +壺壺 +赫拉克羅斯 +狃拉 +熊寶寶 +圈圈熊 +熔岩蟲 +熔岩蝸牛 +小山豬 +長毛豬 +太陽珊瑚 +鐵炮魚 +章魚桶 +信使鳥 +巨翅飛魚 +盔甲鳥 +戴魯比 +黑魯加 +刺龍王 +小小象 +頓甲 +多邊獸Ⅱ +驚角鹿 +圖圖犬 +無畏小子 +戰舞郎 +迷唇娃 +電擊怪 +鴨嘴寶寶 +大奶罐 +幸福蛋 +雷公 +炎帝 +水君 +幼基拉斯 +沙基拉斯 +班基拉斯 +洛奇亞 +鳳王 +時拉比 +木守宮 +森林蜥蜴 +蜥蜴王 +火稚雞 +力壯雞 +火焰雞 +水躍魚 +沼躍魚 +巨沼怪 +土狼犬 +大狼犬 +蛇紋熊 +直衝熊 +刺尾蟲 +甲殼繭 +狩獵鳳蝶 +盾甲繭 +毒粉蛾 +蓮葉童子 +蓮帽小童 +樂天河童 +橡實果 +長鼻葉 +狡猾天狗 +傲骨燕 +大王燕 +長翅鷗 +大嘴鷗 +拉魯拉絲 +奇魯莉安 +沙奈朵 +溜溜糖球 +雨翅蛾 +蘑蘑菇 +斗笠菇 +懶人獺 +過動猿 +請假王 +土居忍士 +鐵面忍者 +脫殼忍者 +咕妞妞 +吼爆彈 +爆音怪 +幕下力士 +鐵掌力士 +露力麗 +朝北鼻 +向尾喵 +優雅貓 +勾魂眼 +大嘴娃 +可可多拉 +可多拉 +波士可多拉 +瑪沙那 +恰雷姆 +落雷獸 +雷電獸 +正電拍拍 +負電拍拍 +電螢蟲 +甜甜螢 +毒薔薇 +溶食獸 +吞食獸 +利牙魚 +巨牙鯊 +吼吼鯨 +吼鯨王 +呆火駝 +噴火駝 +煤炭龜 +跳跳豬 +噗噗豬 +晃晃斑 +大顎蟻 +超音波幼蟲 +沙漠蜻蜓 +刺球仙人掌 +夢歌仙人掌 +青綿鳥 +七夕青鳥 +貓鼬斬 +飯匙蛇 +月石 +太陽岩 +泥泥鰍 +鯰魚王 +龍蝦小兵 +鐵螯龍蝦 +天秤偶 +念力土偶 +觸手百合 +搖籃百合 +太古羽蟲 +太古盔甲 +醜醜魚 +美納斯 +飄浮泡泡 +變隱龍 +怨影娃娃 +詛咒娃娃 +夜巡靈 +彷徨夜靈 +熱帶龍 +風鈴鈴 +阿勃梭魯 +小果然 +雪童子 +冰鬼護 +海豹球 +海魔獅 +帝牙海獅 +珍珠貝 +獵斑魚 +櫻花魚 +古空棘魚 +愛心魚 +寶貝龍 +甲殼龍 +暴飛龍 +鐵啞鈴 +金屬怪 +巨金怪 +雷吉洛克 +雷吉艾斯 +雷吉斯奇魯 +拉帝亞斯 +拉帝歐斯 +蓋歐卡 +固拉多 +烈空坐 +基拉祈 +代歐奇希斯 +草苗龜 +樹林龜 +土台龜 +小火焰猴 +猛火猴 +烈焰猴 +波加曼 +波皇子 +帝王拿波 +姆克兒 +姆克鳥 +姆克鷹 +大牙狸 +大尾狸 +圓法師 +音箱蟀 +小貓怪 +勒克貓 +倫琴貓 +含羞苞 +羅絲雷朵 +頭蓋龍 +戰槌龍 +盾甲龍 +護城龍 +結草兒 +結草貴婦 +紳士蛾 +三蜜蜂 +蜂女王 +帕奇利茲 +泳圈鼬 +浮潛鼬 +櫻花寶 +櫻花兒 +無殼海兔 +海兔獸 +雙尾怪手 +飄飄球 +隨風球 +捲捲耳 +長耳兔 +夢妖魔 +烏鴉頭頭 +魅力喵 +東施喵 +鈴鐺響 +臭鼬噗 +坦克臭鼬 +銅鏡怪 +青銅鐘 +盆才怪 +魔尼尼 +小福蛋 +聒噪鳥 +花岩怪 +圓陸鯊 +尖牙陸鯊 +烈咬陸鯊 +小卡比獸 +利歐路 +路卡利歐 +沙河馬 +河馬獸 +鉗尾蠍 +龍王蠍 +不良蛙 +毒骷蛙 +尖牙籠 +螢光魚 +霓虹魚 +小球飛魚 +雪笠怪 +暴雪王 +瑪狃拉 +自爆磁怪 +大舌舔 +超甲狂犀 +巨蔓藤 +電擊魔獸 +鴨嘴炎獸 +波克基斯 +遠古巨蜓 +葉伊布 +冰伊布 +天蠍王 +象牙豬 +多邊獸Ｚ +艾路雷朵 +大朝北鼻 +黑夜魔靈 +雪妖女 +洛托姆 +由克希 +艾姆利多 +亞克諾姆 +帝牙盧卡 +帕路奇亞 +席多藍恩 +雷吉奇卡斯 +騎拉帝納 +克雷色利亞 +霏歐納 +瑪納霏 +達克萊伊 +謝米 +阿爾宙斯 +比克提尼 +藤藤蛇 +青藤蛇 +君主蛇 +暖暖豬 +炒炒豬 +炎武王 +水水獺 +雙刃丸 +大劍鬼 +探探鼠 +步哨鼠 +小約克 +哈約克 +長毛狗 +扒手貓 +酷豹 +花椰猴 +花椰猿 +爆香猴 +爆香猿 +冷水猴 +冷水猿 +食夢夢 +夢夢蝕 +豆豆鴿 +咕咕鴿 +高傲雉雞 +斑斑馬 +雷電斑馬 +石丸子 +地幔岩 +龐岩怪 +滾滾蝙蝠 +心蝙蝠 +螺釘地鼠 +龍頭地鼠 +差不多娃娃 +搬運小匠 +鐵骨土人 +修建老匠 +圓蝌蚪 +藍蟾蜍 +蟾蜍王 +投摔鬼 +打擊鬼 +蟲寶包 +寶包繭 +保母蟲 +百足蜈蚣 +車輪毬 +蜈蚣王 +木棉球 +風妖精 +百合根娃娃 +裙兒小姐 +野蠻鱸魚 +黑眼鱷 +混混鱷 +流氓鱷 +火紅不倒翁 +達摩狒狒 +沙鈴仙人掌 +石居蟹 +岩殿居蟹 +滑滑小子 +頭巾混混 +象徵鳥 +哭哭面具 +死神棺 +原蓋海龜 +肋骨海龜 +始祖小鳥 +始祖大鳥 +破破袋 +灰塵山 +索羅亞 +索羅亞克 +泡沫栗鼠 +奇諾栗鼠 +哥德寶寶 +哥德小童 +哥德小姐 +單卵細胞球 +雙卵細胞球 +人造細胞卵 +鴨寶寶 +舞天鵝 +迷你冰 +多多冰 +雙倍多多冰 +四季鹿 +萌芽鹿 +電飛鼠 +蓋蓋蟲 +騎士蝸牛 +哎呀球菇 +敗露球菇 +輕飄飄 +胖嘟嘟 +保母曼波 +電電蟲 +電蜘蛛 +種子鐵球 +堅果啞鈴 +齒輪兒 +齒輪組 +齒輪怪 +麻麻小魚 +麻麻鰻 +麻麻鰻魚王 +小灰怪 +大宇怪 +燭光靈 +燈火幽靈 +水晶燈火靈 +牙牙 +斧牙龍 +雙斧戰龍 +噴嚏熊 +凍原熊 +幾何雪花 +小嘴蝸 +敏捷蟲 +泥巴魚 +功夫鼬 +師父鼬 +赤面龍 +泥偶小人 +泥偶巨人 +駒刀小兵 +劈斬司令 +爆炸頭水牛 +毛頭小鷹 +勇士雄鷹 +禿鷹丫頭 +禿鷹娜 +熔蟻獸 +鐵蟻 +單首龍 +雙首暴龍 +三首惡龍 +燃燒蟲 +火神蛾 +勾帕路翁 +代拉基翁 +畢力吉翁 +龍捲雲 +雷電雲 +萊希拉姆 +捷克羅姆 +土地雲 +酋雷姆 +凱路迪歐 +美洛耶塔 +蓋諾賽克特 +哈力栗 +胖胖哈力 +布里卡隆 +火狐狸 +長尾火狐 +妖火紅狐 +呱呱泡蛙 +呱頭蛙 +甲賀忍蛙 +掘掘兔 +掘地兔 +小箭雀 +火箭雀 +烈箭鷹 +粉蝶蟲 +粉蝶蛹 +彩粉蝶 +小獅獅 +火炎獅 +花蓓蓓 +花葉蒂 +花潔夫人 +坐騎小羊 +坐騎山羊 +頑皮熊貓 +流氓熊貓 +多麗米亞 +妙喵 +超能妙喵 +獨劍鞘 +雙劍鞘 +堅盾劍怪 +粉香香 +芳香精 +綿綿泡芙 +胖甜妮 +好啦魷 +烏賊王 +龜腳腳 +龜足巨鎧 +垃垃藻 +毒藻龍 +鐵臂槍蝦 +鋼炮臂蝦 +傘電蜥 +光電傘蜥 +寶寶暴龍 +怪顎龍 +冰雪龍 +冰雪巨龍 +仙子伊布 +摔角鷹人 +咚咚鼠 +小碎鑽 +黏黏寶 +黏美兒 +黏美龍 +鑰圈兒 +小木靈 +朽木妖 +南瓜精 +南瓜怪人 +冰寶 +冰岩怪 +嗡蝠 +音波龍 +哲爾尼亞斯 +伊裴爾塔爾 +基格爾德 +蒂安希 +胡帕 +波爾凱尼恩 +木木梟 +投羽梟 +狙射樹梟 +火斑喵 +炎熱喵 +熾焰咆哮虎 +球球海獅 +花漾海獅 +西獅海壬 +小篤兒 +喇叭啄鳥 +銃嘴大鳥 +貓鼬少 +貓鼬探長 +強顎雞母蟲 +蟲電寶 +鍬農炮蟲 +好勝蟹 +好勝毛蟹 +花舞鳥 +萌虻 +蝶結萌虻 +岩狗狗 +鬃岩狼人 +弱丁魚 +好壞星 +超壞星 +泥驢仔 +重泥挽馬 +滴蛛 +滴蛛霸 +偽螳草 +蘭螳花 +睡睡菇 +燈罩夜菇 +夜盜火蜥 +焰后蜥 +童偶熊 +穿著熊 +甜竹竹 +甜舞妮 +甜冷美后 +花療環環 +智揮猩 +投擲猴 +膽小蟲 +具甲武者 +沙丘娃 +噬沙堡爺 +拳海參 +屬性：空 +銀伴戰獸 +小隕星 +樹枕尾熊 +爆焰龜獸 +托戈德瑪爾 +謎擬Ｑ +磨牙彩皮魚 +老翁龍 +破破舵輪 +心鱗寶 +鱗甲龍 +杖尾鱗甲龍 +卡璞・鳴鳴 +卡璞・蝶蝶 +卡璞・哞哞 +卡璞・鰭鰭 +科斯莫古 +科斯莫姆 +索爾迦雷歐 +露奈雅拉 +虛吾伊德 +爆肌蚊 +費洛美螂 +電束木 +鐵火輝夜 +紙御劍 +惡食大王 +奈克洛茲瑪 +瑪機雅娜 +瑪夏多 +803 +804 +805 +806 +807 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_sm_00000_zh.txt b/PKHeX.Core/Resources/text/zh/text_sm_00000_zh.txt index 07376f1c4..472fa0dbe 100644 --- a/PKHeX.Core/Resources/text/zh/text_sm_00000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_sm_00000_zh.txt @@ -230,4 +230,4 @@ １号道路 训练家学校 -分隔岭隧道 +分隔岭隧道 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_sm_30000_zh.txt b/PKHeX.Core/Resources/text/zh/text_sm_30000_zh.txt index 95cc88d8a..b17960bd4 100644 --- a/PKHeX.Core/Resources/text/zh/text_sm_30000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_sm_30000_zh.txt @@ -14,4 +14,4 @@ Pokémon GO 丰缘地区 阿罗拉地区 宝可度假地 -城都地区 +城都地区 \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_sm_40000_zh.txt b/PKHeX.Core/Resources/text/zh/text_sm_40000_zh.txt index 4df63ede7..953945097 100644 --- a/PKHeX.Core/Resources/text/zh/text_sm_40000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_sm_40000_zh.txt @@ -85,4 +85,4 @@ Pokémon GO 宝可梦虚拟银行 宝可梦的店 体验版 -the Pokémon Trainer Club +the Pokémon Trainer Club \ No newline at end of file diff --git a/PKHeX.Core/Resources/text/zh/text_sm_60000_zh.txt b/PKHeX.Core/Resources/text/zh/text_sm_60000_zh.txt index 2f86bc038..c54fc68a7 100644 --- a/PKHeX.Core/Resources/text/zh/text_sm_60000_zh.txt +++ b/PKHeX.Core/Resources/text/zh/text_sm_60000_zh.txt @@ -1,4 +1,4 @@ 远处的人 寄放屋 寻宝猎人 -温泉婆婆 +温泉婆婆 \ No newline at end of file diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index 40b1fb436..177137c61 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -740,6 +740,12 @@ + + + + + + diff --git a/PKHeX.WinForms/Properties/Resources.Designer.cs b/PKHeX.WinForms/Properties/Resources.Designer.cs index 975089ab0..8783c677c 100644 --- a/PKHeX.WinForms/Properties/Resources.Designer.cs +++ b/PKHeX.WinForms/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace PKHeX.WinForms.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -17308,6 +17308,66 @@ namespace PKHeX.WinForms.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_921 { + get { + object obj = ResourceManager.GetObject("item_921", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_922 { + get { + object obj = ResourceManager.GetObject("item_922", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_923 { + get { + object obj = ResourceManager.GetObject("item_923", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_924 { + get { + object obj = ResourceManager.GetObject("item_924", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_925 { + get { + object obj = ResourceManager.GetObject("item_925", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap item_926 { + get { + object obj = ResourceManager.GetObject("item_926", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/PKHeX.WinForms/Properties/Resources.resx b/PKHeX.WinForms/Properties/Resources.resx index 70130507c..563cc474e 100644 --- a/PKHeX.WinForms/Properties/Resources.resx +++ b/PKHeX.WinForms/Properties/Resources.resx @@ -5989,4 +5989,22 @@ ..\Resources\img\Pokemon Sprites\807.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\img\item\item_921.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_922.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_923.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_924.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_925.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\img\item\item_926.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/PKHeX.WinForms/Resources/img/item/item_921.png b/PKHeX.WinForms/Resources/img/item/item_921.png new file mode 100644 index 000000000..be2b15131 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_921.png differ diff --git a/PKHeX.WinForms/Resources/img/item/item_922.png b/PKHeX.WinForms/Resources/img/item/item_922.png new file mode 100644 index 000000000..556c671e5 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_922.png differ diff --git a/PKHeX.WinForms/Resources/img/item/item_923.png b/PKHeX.WinForms/Resources/img/item/item_923.png new file mode 100644 index 000000000..a678676e3 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_923.png differ diff --git a/PKHeX.WinForms/Resources/img/item/item_924.png b/PKHeX.WinForms/Resources/img/item/item_924.png new file mode 100644 index 000000000..872fc4e58 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_924.png differ diff --git a/PKHeX.WinForms/Resources/img/item/item_925.png b/PKHeX.WinForms/Resources/img/item/item_925.png new file mode 100644 index 000000000..d29501ac0 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_925.png differ diff --git a/PKHeX.WinForms/Resources/img/item/item_926.png b/PKHeX.WinForms/Resources/img/item/item_926.png new file mode 100644 index 000000000..da184d978 Binary files /dev/null and b/PKHeX.WinForms/Resources/img/item/item_926.png differ