From 8d5866f1183da91261b47cb366c6bd687e15f8a9 Mon Sep 17 00:00:00 2001
From: Manu <52102823+Manu098vm@users.noreply.github.com>
Date: Tue, 4 Feb 2025 05:17:58 +0100
Subject: [PATCH] Handle Arbok Mainland China wondercard (#4436)

* Add Arbok wondercard to Mainland China Gifts

* Always pick CHS OT/nickname for Mainland China gifts
---
 PKHeX.Core/MysteryGifts/WB7.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/PKHeX.Core/MysteryGifts/WB7.cs b/PKHeX.Core/MysteryGifts/WB7.cs
index f1d17f748..740b12511 100644
--- a/PKHeX.Core/MysteryGifts/WB7.cs
+++ b/PKHeX.Core/MysteryGifts/WB7.cs
@@ -315,13 +315,10 @@ public override string OriginalTrainerName
     /// <remarks>
     /// Gifts received can be locally traded to the international release, so there is no need to consider residence or transferability.
     /// </remarks>
-    public bool IsMainlandChinaGift => CardID is (1501);
+    public bool IsMainlandChinaGift => CardID is (1501 or 1503);
 
     public int GetLanguage(int redeemLanguage)
     {
-        if (IsMainlandChinaGift)
-            return (int)LanguageID.ChineseS;
-
         var languageOffset = GetLanguageIndex(redeemLanguage);
         var value = Data[0x1D8 + languageOffset];
         if (value != 0) // Fixed receiving language
@@ -366,7 +363,7 @@ public override PB7 ConvertToPKM(ITrainerInfo tr, EncounterCriteria criteria)
         var metLevel = MetLevel > 0 ? MetLevel : currentLevel;
         var pi = PersonalTable.GG.GetFormEntry(Species, Form);
 
-        var redeemLanguage = tr.Language;
+        var redeemLanguage = IsMainlandChinaGift ? (int)LanguageID.ChineseS : tr.Language;
         var language = GetLanguage(redeemLanguage);
         bool hasOT = GetHasOT(redeemLanguage);