Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-12-04 01:39:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add Current Box Changed flag for sav1/2

Browse source 
Flag not set causes the game to clear all boxes (except current box) to clear garbage sram if saves never cleared. Yay deferred execution?
This commit is contained in:
Kurt 2022-05-02 23:47:41 -07:00
parent b51cdfe72f
commit d58aed109d
2 changed files with 63 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
PKHeX.Core/Saves/SAV1.cs
View file

@ -62,33 +62,18 @@ namespace PKHeX.Core
// Stash boxes after the save file's end. // Stash boxes after the save file's end.
int stored = SIZE_STOREDBOX; int stored = SIZE_STOREDBOX;
int baseDest = Data.Length - SIZE_RESERVED;
var capacity = Japanese ? PokeListType.StoredJP : PokeListType.Stored; var capacity = Japanese ? PokeListType.StoredJP : PokeListType.Stored;
for (int i = 0; i < BoxCount; i++) int baseDest = Data.Length - SIZE_RESERVED;
for (int box = 0; box < BoxCount; box++)
{ {
int ofs = GetBoxRawDataOffset(i); int boxOfs = GetBoxRawDataOffset(box);
var box = GetData(ofs, stored); UnpackBox(boxOfs, baseDest, stored, box, capacity);
var boxDest = baseDest + (i * SIZE_BOX);
var boxPL = new PokeList1(box, capacity, Japanese);
for (int j = 0; j < boxPL.Pokemon.Length; j++)
{
var dest = boxDest + (j * SIZE_STORED);
var pkDat = (j < boxPL.Count)
? new PokeList1(boxPL[j]).Write()
: new byte[PokeList1.GetDataLength(PokeListType.Single, Japanese)];
pkDat.CopyTo(Data, dest);
}
} }
var current = GetData(Offsets.CurrentBox, SIZE_STOREDBOX); if ((uint)CurrentBox < BoxCount)
var curBoxPL = new PokeList1(current, capacity, Japanese);
for (int i = 0; i < curBoxPL.Pokemon.Length; i++)
{ {
var dest = Data.Length - SIZE_RESERVED + (CurrentBox * SIZE_BOX) + (i * SIZE_STORED); // overwrite previously cached box data.
var pkDat = i < curBoxPL.Count UnpackBox(Offsets.CurrentBox, baseDest, stored, CurrentBox, capacity);
? new PokeList1(curBoxPL[i]).Write()
: new byte[PokeList1.GetDataLength(PokeListType.Single, Japanese)];
pkDat.CopyTo(Data, dest);
} }
var party = GetData(Offsets.Party, SIZE_STOREDPARTY); var party = GetData(Offsets.Party, SIZE_STOREDPARTY);
@ -119,6 +104,45 @@ namespace PKHeX.Core
PokeDex = 0; PokeDex = 0;
} }
private void UnpackBox(int srcOfs, int destOfs, int boxSize, int boxIndex, PokeListType boxCapacity)
{
var boxData = GetData(srcOfs, boxSize);
var boxDest = destOfs + (boxIndex * SIZE_BOX);
var boxPL = new PokeList1(boxData, boxCapacity, Japanese);
for (int i = 0; i < boxPL.Pokemon.Length; i++)
{
var slotOfs = boxDest + (i * SIZE_STORED);
var slotData = Data.AsSpan(slotOfs, SIZE_STORED);
if (i < boxPL.Count)
new PokeList1(boxPL[i]).Write().CopyTo(slotData);
else
slotData.Clear();
}
}
private void PackBox(int boxDest, int boxIndex, PokeListType boxCapacity)
{
var boxPL = new PokeList1(boxCapacity, Japanese);
int slot = 0;
for (int i = 0; i < boxPL.Pokemon.Length; i++)
{
var slotOfs = boxDest + (i * SIZE_STORED);
var slotData = Data.AsSpan(slotOfs, SIZE_STORED);
PK1 pk = (PK1)GetPKM(slotData.ToArray());
if (pk.Species > 0)
boxPL[slot++] = pk;
}
// copy to box location
var boxData = boxPL.Write();
int boxSrc = GetBoxRawDataOffset(boxIndex);
SetData(Data, boxData, boxSrc);
// copy to active loc if current box
if (boxIndex == CurrentBox)
SetData(Data, boxData, Offsets.CurrentBox);
}
private const int SIZE_RESERVED = 0x8000; // unpacked box data private const int SIZE_RESERVED = 0x8000; // unpacked box data
private readonly SAV1Offsets Offsets; private readonly SAV1Offsets Offsets;
@ -141,25 +165,10 @@ namespace PKHeX.Core
protected override byte[] GetFinalData() protected override byte[] GetFinalData()
{ {
var capacity = Japanese ? PokeListType.StoredJP : PokeListType.Stored; var capacity = Japanese ? PokeListType.StoredJP : PokeListType.Stored;
for (int i = 0; i < BoxCount; i++) for (int box = 0; box < BoxCount; box++)
{ {
var boxPL = new PokeList1(capacity, Japanese); var boxOfs = GetBoxOffset(box);
int slot = 0; PackBox(boxOfs, box, capacity);
for (int j = 0; j < boxPL.Pokemon.Length; j++)
{
PK1 boxPK = (PK1)GetPKM(GetData(GetBoxOffset(i) + (j * SIZE_STORED), SIZE_STORED));
if (boxPK.Species > 0)
boxPL[slot++] = boxPK;
}
// copy to box location
var boxdata = boxPL.Write();
int ofs = GetBoxRawDataOffset(i);
SetData(boxdata, ofs);
// copy to active loc if current box
if (i == CurrentBox)
SetData(boxdata, Offsets.CurrentBox);
} }
var partyPL = new PokeList1(PokeListType.Party, Japanese); var partyPL = new PokeList1(PokeListType.Party, Japanese);
@ -456,6 +465,12 @@ namespace PKHeX.Core
set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.CurrentBoxIndex] & 0x80) | (value & 0x7F)); set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.CurrentBoxIndex] & 0x80) | (value & 0x7F));
} }
public bool CurrentBoxChanged
{
get => (Data[Offsets.CurrentBoxIndex] & 0x80) != 0;
set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.CurrentBoxIndex] & 0x7F) | (byte)(value ? 0x80 : 0));
}
public override string GetBoxName(int box) public override string GetBoxName(int box)
{ {
return $"BOX {box + 1}"; return $"BOX {box + 1}";

9
PKHeX.Core/Saves/SAV2.cs
View file

@ -539,7 +539,14 @@ namespace PKHeX.Core
public override int CurrentBox public override int CurrentBox
{ {
get => Data[Offsets.CurrentBoxIndex] & 0x7F; set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.OtherCurrentBox] & 0x80) | (value & 0x7F)); get => Data[Offsets.CurrentBoxIndex] & 0x7F;
set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.CurrentBoxIndex] & 0x80) | (value & 0x7F));
}
public bool CurrentBoxChanged
{
get => (Data[Offsets.CurrentBoxIndex] & 0x80) != 0;
set => Data[Offsets.CurrentBoxIndex] = (byte)((Data[Offsets.CurrentBoxIndex] & 0x7F) | (byte)(value ? 0x80 : 0));
} }
public override string GetBoxName(int box) public override string GetBoxName(int box)