From be79360778498746e58434a40dab8187bedbd802 Mon Sep 17 00:00:00 2001 From: Kurt Date: Tue, 11 Jun 2024 08:25:20 -0500 Subject: [PATCH] Flag slotnumber instead of Tile Oops pk8: check for SV for met location loss --- .../Encounters/Generator/ByGeneration/EncounterGenerator3.cs | 2 +- .../Encounters/Generator/ByGeneration/EncounterGenerator4.cs | 2 +- PKHeX.Core/PKM/PK8.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs index 3ea7d1667..6fcae19d6 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs @@ -122,7 +122,7 @@ public sealed class EncounterGenerator3 : IEncounterGenerator yield break; if (defer.Type is DeferralType.PIDIV) info.ManualFlag = EncounterYieldFlag.InvalidPIDIV; - else if (defer.Type is DeferralType.Tile) + else if (defer.Type is DeferralType.SlotNumber) info.ManualFlag = EncounterYieldFlag.InvalidFrame; yield return lastResort; } diff --git a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs index 84879e13c..13482648b 100644 --- a/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs +++ b/PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs @@ -107,7 +107,7 @@ public sealed class EncounterGenerator4 : IEncounterGenerator yield break; if (defer.Type is DeferralType.PIDIV) info.ManualFlag = EncounterYieldFlag.InvalidPIDIV; - else if (defer.Type is DeferralType.Tile) + else if (defer.Type is DeferralType.SlotNumber) info.ManualFlag = EncounterYieldFlag.InvalidFrame; yield return lastResort; } diff --git a/PKHeX.Core/PKM/PK8.cs b/PKHeX.Core/PKM/PK8.cs index 0a64a7d42..ef551d01a 100644 --- a/PKHeX.Core/PKM/PK8.cs +++ b/PKHeX.Core/PKM/PK8.cs @@ -119,7 +119,7 @@ public sealed class PK8 : G8PKM, IHandlerUpdate public override bool SV => MetLocation is LocationsHOME.SWSL or LocationsHOME.SHVL; public override bool BDSP => MetLocation is LocationsHOME.SWBD or LocationsHOME.SHSP; public override bool LA => MetLocation is LocationsHOME.SWLA; - public override bool HasOriginalMetLocation => base.HasOriginalMetLocation && !(BDSP || LA); + public override bool HasOriginalMetLocation => base.HasOriginalMetLocation && !IsSideTransfer; public override string GetString(ReadOnlySpan data) => StringConverter8.GetString(data);