Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-09-12 06:07:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revisit slot loading logic

Browse Source 
savLoaded is useless now
This commit is contained in:
Kurt
2015-10-14 18:33:51 -07:00
parent 77b4f9cc0f
commit 9d9250fbc1
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PKX/f1-Main.cs
View File

@@ -192,7 +192,6 @@ public Main()
public static byte[] powersave; // raw Powersave file
public static byte[] ramsav;
public static bool ramsavloaded;
public bool savLoaded;
public static bool savedited;
public string pathSDF;
public string path3DS;
@@ -705,7 +704,6 @@ private void openSave(bool oras)
else { tabBoxMulti.SelectedIndex = 0; CB_BoxSelect.SelectedIndex = startBox; }
Width = largeWidth;
savLoaded = true;
// Refresh instance of pk2pk
refreshTrainerInfo();
@@ -2963,9 +2961,14 @@ private void getSlotFiller(int offset, PictureBox pb)
{
byte[] slotdata = new byte[0xE8];
Array.Copy(savefile, offset, slotdata, 0, 0xE8); // Fill Our EKX Slot
if (slotdata.SequenceEqual(new byte[0xE8]))
{
pb.Image = null;
pb.BackColor = Color.Transparent;
return;
}
PK6 p = new PK6(PKX.decryptArray(slotdata));
if (p.Sanity != 0 || p.Checksum != p.CalculateChecksum()
|| (!savLoaded && !slotdata.SequenceEqual(new byte[0xE8]))) // Invalid
if (p.Sanity != 0 || p.Checksum != p.CalculateChecksum()) // Invalid
{
// Bad Egg present in slot.
pb.Image = null;