From b4edc389bbae5ea44c2b03e140b8ab6b8da058a2 Mon Sep 17 00:00:00 2001
From: Kurt <kwsch@users.noreply.github.com>
Date: Sat, 12 Jul 2025 01:29:37 -0500
Subject: [PATCH] Rearrange gen3/4 deferral enum

null check necessary for unset deferral needing to ignore max
---
 .../Generator/ByGeneration/EncounterGenerator3.cs         | 6 +++---
 .../Generator/ByGeneration/EncounterGenerator4.cs         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs
index 2371bae0b..1f74126db 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs
@@ -28,11 +28,11 @@ private enum DeferralType
         // Legal
         None,
         PIDIVDefer,
+        SlotNumber,
 
         // Illegal
-        PIDIV,
         Ball,
-        SlotNumber,
+        PIDIV,
     }
 
     private struct Deferral
@@ -42,7 +42,7 @@ private struct Deferral
 
         public void Update(DeferralType type, IEncounterable enc)
         {
-            if (Type >= type)
+            if (type >= Type && Encounter is not null)
                 return;
             Type = type;
             Encounter = enc;
diff --git a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs
index 5104cd6ac..4f6de1ec8 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs
@@ -35,10 +35,10 @@ private enum DeferralType
         PIDIVDefer,
 
         // Illegal
-        PIDIV,
-        Tile,
-        Ball,
         SlotNumber,
+        Ball,
+        Tile,
+        PIDIV,
     }
 
     private struct Deferral
@@ -48,7 +48,7 @@ private struct Deferral
 
         public void Update(DeferralType type, IEncounterable enc)
         {
-            if (Type >= type)
+            if (type >= Type && Encounter is not null)
                 return;
             Type = type;
             Encounter = enc;