diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs
index 5777864c0..45ee38c91 100644
--- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs
+++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic2.cs
@@ -44,8 +44,8 @@ namespace PKHeX.Core
                 {
                     case 0 when pkm.Met_Location != 0:
                         return false;
-                    case 1 when pkm.Met_Location == 0:
-                        return false;
+                    case 1: // 0 = second floor of every Pokémon Center, valid
+                        return true;
                     default:
                         if (pkm.Met_Location == 0 && pkm.Met_Level != 0)
                             return false;
diff --git a/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterEggGenerator2.cs b/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterEggGenerator2.cs
index b51b72e50..8db0dceb0 100644
--- a/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterEggGenerator2.cs
+++ b/PKHeX.Core/Legality/Encounters/Generator/Specific/EncounterEggGenerator2.cs
@@ -53,7 +53,9 @@ namespace PKHeX.Core
             // Check if the met data is present or could have been erased.
             if (pkm.Format > 2)
                 return true; // doesn't have original met location
-            if (pkm.Met_Location != 0)
+            if (pkm.IsEgg)
+                return true; // doesn't have location yet
+            if (pkm.Met_Level == 1) // Met location of 0 is valid -- second floor of every Pokémon Center 
                 return true; // has original met location
             if (species < Legal.MaxSpeciesID_1)
                 return true; // can trade RBY to wipe location
diff --git a/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs b/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs
index 06ae1dbfc..50358e769 100644
--- a/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs
+++ b/PKHeX.Core/Legality/Verifiers/TrainerNameVerifier.cs
@@ -122,7 +122,7 @@ namespace PKHeX.Core
 
             if (pkm.OT_Gender == 1)
             {
-                if ((pkm.Format == 2 && pkm.Met_Location == 0) || (pkm.Format > 2 && pkm.VC1) || data is {EncounterOriginal: {Generation:1} or EncounterStatic2E {IsGift:true}})
+                if (pkm is ICaughtData2 {CaughtData:0} || (pkm.Format > 2 && pkm.VC1) || data is {EncounterOriginal: {Generation:1} or EncounterStatic2E {IsGift:true}})
                     data.AddLine(GetInvalid(LG1OTGender));
             }
         }