From 0836d3c6703dc0d095171700eb76d6b015bb3e84 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Mon, 13 May 2024 18:16:26 -0500
Subject: [PATCH] Mirror handler check to bulk checks

---
 PKHeX.Core/Legality/Bulk/HandlerChecker.cs    | 37 +++++++++++++------
 .../Legality/Verifiers/HistoryVerifier.cs     |  3 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/PKHeX.Core/Legality/Bulk/HandlerChecker.cs b/PKHeX.Core/Legality/Bulk/HandlerChecker.cs
index 7fed3341f..d3dcc4c05 100644
--- a/PKHeX.Core/Legality/Bulk/HandlerChecker.cs
+++ b/PKHeX.Core/Legality/Bulk/HandlerChecker.cs
@@ -1,5 +1,6 @@
 using System;
 using static PKHeX.Core.CheckIdentifier;
+using static PKHeX.Core.LegalityCheckStrings;
 
 namespace PKHeX.Core.Bulk;
 
@@ -16,33 +17,45 @@ private static void CheckHandlerFlag(BulkAnalysis input)
     {
         for (var i = 0; i < input.AllData.Count; i++)
         {
-            if (!input.AllAnalysis[i].Valid)
+            var la = input.AllAnalysis[i];
+            if (!la.Valid)
                 continue;
             var cs = input.AllData[i];
-            Verify(input, cs);
+            Verify(input, cs, la);
         }
     }
 
-    private static void Verify(BulkAnalysis input, SlotCache cs)
+    private static void Verify(BulkAnalysis input, SlotCache cs, LegalityAnalysis la)
     {
         var pk = cs.Entity;
         var tr = cs.SAV;
-        var withOT = tr.IsFromTrainer(pk);
-        var flag = pk.CurrentHandler;
-        var expect = withOT ? 0 : 1;
-        if (flag != expect)
-            input.AddLine(cs, LegalityCheckStrings.LTransferCurrentHandlerInvalid, Trainer);
+        var current = pk.CurrentHandler;
 
-        if (flag != 1)
-            return;
+        var shouldBe0 = tr.IsFromTrainer(pk);
+        byte expect = shouldBe0 ? (byte)0 : (byte)1;
+        if (!HistoryVerifier.IsHandlerStateCorrect(la.EncounterOriginal, pk, current, expect))
+            input.AddLine(cs, LTransferCurrentHandlerInvalid, Trainer);
 
+        if (current == 1)
+            CheckHandlingTrainerEquals(input, pk, tr, cs);
+    }
+
+    /// <summary> <see cref="HistoryVerifier.CheckHandlingTrainerEquals"/> </summary>
+    private static void CheckHandlingTrainerEquals(BulkAnalysis data, PKM pk, SaveFile tr, SlotCache cs)
+    {
         Span<char> ht = stackalloc char[pk.TrashCharCountTrainer];
         var len = pk.LoadString(pk.HandlingTrainerTrash, ht);
         ht = ht[..len];
 
         if (!ht.SequenceEqual(tr.OT))
-            input.AddLine(cs, LegalityCheckStrings.LTransferHTMismatchName, Trainer);
+            data.AddLine(cs, LTransferHTMismatchName, Trainer);
+        if (pk.HandlingTrainerGender != tr.Gender)
+            data.AddLine(cs, LTransferHTMismatchGender, Trainer);
+
+        // If the format exposes a language, check if it matches.
+        // Can be mismatched as the game only checks OT/Gender equivalence -- if it matches, don't update everything else.
+        // Statistically unlikely that players will play in different languages, but it's technically possible.
         if (pk is IHandlerLanguage h && h.HandlingTrainerLanguage != tr.Language)
-            input.AddLine(cs, LegalityCheckStrings.LTransferHTMismatchLanguage, Trainer);
+            data.AddLine(cs, LTransferHTMismatchLanguage, Trainer, Severity.Fishy);
     }
 }
diff --git a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs
index bf04f8d4c..5b315576e 100644
--- a/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/HistoryVerifier.cs
@@ -77,7 +77,7 @@ private void VerifyHandlerState(LegalityAnalysis data, bool neverOT)
             data.AddLine(GetInvalid(LTransferCurrentHandlerInvalid));
     }
 
-    private static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte current, byte expect)
+    public static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte current, byte expect)
     {
         if (current == expect)
             return true;
@@ -87,6 +87,7 @@ private static bool IsHandlerStateCorrect(IEncounterTemplate enc, PKM pk, byte c
         return false; // HT [1] should be OT [0].
     }
 
+    /// <summary> <see cref="Bulk.HandlerChecker.CheckHandlingTrainerEquals"/> </summary>
     private void CheckHandlingTrainerEquals(LegalityAnalysis data, PKM pk, ITrainerInfo tr)
     {
         Span<char> ht = stackalloc char[pk.TrashCharCountTrainer];