Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix sort writeback for locked slots

Browse source 
clear flag, update properties
#2235
This commit is contained in:
Kurt 2019-01-08 18:31:14 -08:00
parent 6bd0e87ea3
commit bc8b48eb88
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/PKM/PKM.cs
View file

@ -276,7 +276,8 @@ namespace PKHeX.Core
public int SpecForm { get => Species + (AltForm << 11); set { Species = value & 0x7FF; AltForm = value >> 11; } }
public virtual int SpriteItem => HeldItem;
public virtual bool IsShiny => TSV == PSV;
public virtual bool Locked { get => false; set { } }
public StorageSlotFlag StorageFlags { get; internal set; }
public bool Locked => StorageFlags.HasFlagFast(StorageSlotFlag.Locked);
public int TrainerID7 { get => (int)((uint)(TID | (SID << 16)) % 1000000); set => SetID7(TrainerSID7, value); }
public int TrainerSID7 { get => (int)((uint)(TID | (SID << 16)) / 1000000); set => SetID7(value, TrainerID7); }

15
PKHeX.Core/Saves/SaveFile.cs
View file

@ -179,8 +179,9 @@ namespace PKHeX.Core
int ofs = GetBoxOffset(box);
for (int slot = 0; slot < BoxSlotCount; slot++, ofs += SIZE_STORED)
{
if (!GetSlotFlags(box, slot).IsOverwriteProtected())
SetStoredSlot(value[index + slot], ofs);
var pk = value[index + slot];
if (!pk.StorageFlags.IsOverwriteProtected())
SetStoredSlot(pk, ofs);
}
}
@ -202,7 +203,7 @@ namespace PKHeX.Core
data[i].Identifier = $"{boxName}:{slot + 1:00}";
data[i].Box = box + 1;
data[i].Slot = slot + 1;
data[i].Locked = GetSlotFlags(box, slot).HasFlagFast(StorageSlotFlag.Locked);
data[i].StorageFlags = GetSlotFlags(box, slot);
}
}
@ -243,7 +244,8 @@ namespace PKHeX.Core
for (int i = 0; i < data.Length; i++)
{
data[i] = GetStoredSlot(BattleBox + (SIZE_STORED * i));
data[i].Locked = BattleBoxLocked;
if (BattleBoxLocked)
data[i].StorageFlags |= StorageSlotFlag.Locked;
if (data[i].Species != 0)
continue;
Array.Resize(ref data, i);
@ -699,6 +701,11 @@ namespace PKHeX.Core
result.CopyTo(boxclone, skip, start);
SlotPointerUtil.UpdateRepointFrom(boxclone, BD, 0, SlotPointers);
// clear storage flags to ensure all data is written back
foreach (var pk in result)
pk.StorageFlags = StorageSlotFlag.None;
BoxData = boxclone;
}