From f4952faa6f09734c64b13c7faad7bda9f1edcc70 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 21 Mar 2020 10:48:26 -0700
Subject: [PATCH] Add zh2 trade localization

ye it's different from the zh strings, resulting in different nick/OT

ty @Lusamine !

add another gyarados location while we're here
---
 .../Legality/Encounters/Data/Encounters8.cs   |  4 ++--
 PKHeX.Core/PKHeX.Core.csproj                  |  2 ++
 .../Resources/text/zh/text_tradeswsh_zh2.txt  | 22 +++++++++++++++++++
 PKHeX.Core/Util/DataUtil.cs                   |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 PKHeX.Core/Resources/text/zh/text_tradeswsh_zh2.txt

diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
index c3a46edc1..8a52d9597 100644
--- a/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
+++ b/PKHeX.Core/Legality/Encounters/Data/Encounters8.cs
@@ -165,7 +165,7 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
             new EncounterStatic8S{ Species = 091, Level = 46, Locations = new[] {128, 130}, }, // Cloyster at East/West Lake Axewell (in a Wild Area)
             new EncounterStatic8S{ Species = 131, Level = 56, Locations = new[] {128, 130, 134, 138, 154 }, }, // Lapras at North/East/South/West Lake Miloch/Axwell, the Lake of Outrage (in a Wild Area)
             new EncounterStatic8S{ Species = 119, Level = 46, Locations = new[] {128, 130, 134, 138, 142, 154 }, }, // Seaking in Bridge Field, at North/East/South/West Lake Miloch/Axwell, at the Lake of Outrage (in a Wild Area)
-            new EncounterStatic8S{ Species = 130, Level = 56, Locations = new[] {128, 146}, }, // Gyarados in East Lake Axewell, Dusty Bowl (in a Wild Area)
+            new EncounterStatic8S{ Species = 130, Level = 56, Locations = new[] {128, 142, 146}, }, // Gyarados in East Lake Axewell, in Bridge Field, Dusty Bowl (in a Wild Area)
             new EncounterStatic8S{ Species = 279, Level = 46, Locations = new[] {128, 142}, }, // Pelipper in East Lake Axewell, Bridge Field (in a Wild Area)
             new EncounterStatic8 { Species = 853, Level = 56, Location = 130, }, // Grapploct at West Lake Axewell (in a Wild Area)
             new EncounterStatic8S{ Species = 593, Level = 46, Locations = new[] {128, 130, 134, 138, 142, 154 }, }, // Jellicent at North/East/South/West Lake Miloch/Axwell, the Lake of Outrage, Bridge Field (in a Wild Area)
@@ -346,7 +346,7 @@ private static void CopyBerryTreeFromBridgeFieldToStony(IReadOnlyList<EncounterA
         };
 
         private const string tradeSWSH = "tradeswsh";
-        private static readonly string[][] TradeSWSH = Util.GetLanguageStrings10(tradeSWSH);
+        private static readonly string[][] TradeSWSH = Util.GetLanguageStrings10(tradeSWSH, "zh2");
         private static readonly int[] TradeIVs = {15, 15, 15, 15, 15, 15};
 
         internal static readonly EncounterTrade8[] TradeGift_SWSH =
diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj
index ebdd883db..8d3f204d2 100644
--- a/PKHeX.Core/PKHeX.Core.csproj
+++ b/PKHeX.Core/PKHeX.Core.csproj
@@ -816,6 +816,7 @@
     <None Remove="Resources\text\zh\text_tradeao_zh.txt" />
     <None Remove="Resources\text\zh\text_tradesm_zh.txt" />
     <None Remove="Resources\text\zh\text_tradeswsh_zh.txt" />
+    <None Remove="Resources\text\zh\text_tradeswsh_zh2.txt" />
     <None Remove="Resources\text\zh\text_tradeusum_zh.txt" />
     <None Remove="Resources\text\zh\text_tradexy_zh.txt" />
     <None Remove="Resources\text\zh\text_TrainingBag_zh.txt" />
@@ -1628,6 +1629,7 @@
     <EmbeddedResource Include="Resources\text\zh\text_tradeao_zh.txt" />
     <EmbeddedResource Include="Resources\text\zh\text_tradesm_zh.txt" />
     <EmbeddedResource Include="Resources\text\zh\text_tradeswsh_zh.txt" />
+    <EmbeddedResource Include="Resources\text\zh\text_tradeswsh_zh2.txt" />
     <EmbeddedResource Include="Resources\text\zh\text_tradeusum_zh.txt" />
     <EmbeddedResource Include="Resources\text\zh\text_tradexy_zh.txt" />
     <EmbeddedResource Include="Resources\text\zh\text_TrainingBag_zh.txt" />
diff --git a/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh2.txt b/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh2.txt
new file mode 100644
index 000000000..1056a53a9
--- /dev/null
+++ b/PKHeX.Core/Resources/text/zh/text_tradeswsh_zh2.txt
@@ -0,0 +1,22 @@
+金小判
+嘟嘟臉
+棉花糖
+背心
+瀏海
+大眼兒
+賈面
+紅投鬼
+藍擊鬼
+巴里桑
+直線
+喬班尼
+初美
+麥克企
+寶兒
+羅密歐
+羅密歐
+伊芙
+白雪
+白雪
+田邊
+卡浦爾
diff --git a/PKHeX.Core/Util/DataUtil.cs b/PKHeX.Core/Util/DataUtil.cs
index 1bd03f072..6eb6a0b87 100644
--- a/PKHeX.Core/Util/DataUtil.cs
+++ b/PKHeX.Core/Util/DataUtil.cs
@@ -106,7 +106,7 @@ public static string[][] GetLanguageStrings8(string fileName)
             };
         }
 
-        public static string[][] GetLanguageStrings10(string fileName)
+        public static string[][] GetLanguageStrings10(string fileName, string zh2 = "zh")
         {
             return new[]
             {
@@ -120,7 +120,7 @@ public static string[][] GetLanguageStrings10(string fileName)
                 GetStringList(fileName, "es"), // 7
                 GetStringList(fileName, "ko"), // 8
                 GetStringList(fileName, "zh"), // 9
-                GetStringList(fileName, "zh"), // 10
+                GetStringList(fileName, zh2), // 10
             };
         }