Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-20 14:21:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flag slotnumber instead of Tile

Browse source 
Oops
pk8: check for SV for met location loss
This commit is contained in:
Kurt 2024-06-11 08:25:20 -05:00
parent 4f23efd939
commit be79360778
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator3.cs
View file

@ -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;
}

2
PKHeX.Core/Legality/Encounters/Generator/ByGeneration/EncounterGenerator4.cs
View file

@ -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;
}

2
PKHeX.Core/PKM/PK8.cs
View file

@ -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<byte> data)
=> StringConverter8.GetString(data);