From 21669d3f7763da8fa6b92ce962b7dc6d39e3f87c Mon Sep 17 00:00:00 2001 From: Kurt Date: Mon, 23 Nov 2020 13:24:02 -0800 Subject: [PATCH] Update EncounterTrade1.cs --- .../Encounters/EncounterTrade/EncounterTrade1.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade1.cs b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade1.cs index 4a79998ed..7da2737a3 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade1.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterTrade/EncounterTrade1.cs @@ -49,7 +49,16 @@ internal bool IsNicknameValid(PKM pkm) // Converted string 1/2->7 to language specific value // Nicknames can be from any of the languages it can trade between. - return pkm.Language == 1 ? Nicknames[1] == nick : GetNicknameIndex(nick) >= 2; + int lang = pkm.Language; + if (lang == 1) + { + // Special consideration for Hiragana strings that are transferred + if (Version == GameVersion.YW && Species == (int)Core.Species.Dugtrio) + return nick == "ぐりお"; + return nick == Nicknames[1]; + } + + return GetNicknameIndex(nick) >= 2; } internal bool IsTrainerNameValid(PKM pkm)