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

Minor bugfixes and cleanup

Browse source 
Added an Edited property for the save
blank slot (encrypted) is initialized once and can be used elsewhere
instead of constantly being recreated for no reason.
Fixed having 32 boxes for non-saves

All SAV editing forms now set the Edited flag when saving->close.
This commit is contained in:
Kurt 2015-10-24 16:33:44 -07:00
parent 1b514bc84f
commit 101c0ad80f
13 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Misc/SAV6.cs
View file

@ -26,6 +26,7 @@ namespace PKHeX
// Save Data Attributes
public byte[] Data;
public bool Exportable;
public bool Edited;
public SAV6(byte[] data)
{
Exportable = !data.SequenceEqual(new byte[data.Length]);
@ -226,7 +227,7 @@ namespace PKHeX
setChecksums();
return Data;
}
public int CurrentBox { get { return Data[LastViewedBox] & 0x1F; } set { Data[LastViewedBox] = (byte)value; } }
public int CurrentBox { get { return Data[LastViewedBox]; } set { Data[LastViewedBox] = (byte)value; } }
// Player Information
public ushort TID { get { return BitConverter.ToUInt16(Data, TrainerCard + 0); } }
@ -310,6 +311,7 @@ namespace PKHeX
byte[] ek6 = encryptArray(pk6.Data);
Array.Resize(ref ek6, PK6.SIZE_PARTY);
setData(ek6, offset);
Edited = true;
}
public void setPK6Stored(PK6 pk6, int offset, bool? trade = null, bool? dex = null)
{
@ -321,6 +323,7 @@ namespace PKHeX
byte[] ek6 = encryptArray(pk6.Data);
Array.Resize(ref ek6, PK6.SIZE_STORED);
setData(ek6, offset);
Edited = true;
}
public void setEK6Stored(byte[] ek6, int offset, bool? trade = null, bool? dex = null)
{
@ -332,6 +335,7 @@ namespace PKHeX
Array.Resize(ref ek6, PK6.SIZE_STORED);
setData(ek6, offset);
Edited = true;
}
// Meta
@ -397,6 +401,10 @@ namespace PKHeX
{
return 1 + Data[BoxWallpapers + box];
}
public string getBoxName(int box)
{
return Encoding.Unicode.GetString(Data, PCLayout + 0x22*box, 0x22).Trim();
}
public void setParty()
{
byte partymembers = 0; // start off with a ctr of 0

44
PKX/f1-Main.cs
View file

@ -46,9 +46,8 @@ namespace PKHeX
Width = shortWidth;
// Initialize Boxes
byte[] ezeros = PKX.encryptArray(new byte[PK6.SIZE_STORED]);
for (int i = 0; i < 30*31; i++)
SAV.setEK6Stored(ezeros, SAV.Box + i*PK6.SIZE_STORED);
SAV.setEK6Stored(blankEK6, SAV.Box + i*PK6.SIZE_STORED);
// Initialize Tab Storage with Default Data (to skip Move check)
pk6.Move1 = 1;
@ -188,11 +187,11 @@ namespace PKHeX
}
#region Global Variables: Always Visible!
public static readonly byte[] blankEK6 = PKX.encryptArray(new byte[PK6.SIZE_PARTY]);
public static PK6 pk6 = new PK6(new byte[PK6.SIZE_PARTY]); // Tab Pokemon Data Storage
public static SAV6 SAV = new SAV6(new byte[0x760000]);
public static byte[] originalSAV; // original save
public static byte[] ramsav;
public static bool savedited;
public static byte[] originalSAV; // original save for CyberGadget Codes
public static byte[] ramsav; // original ramsav for ramsav exporting
public string pathSDF;
public string path3DS;
public pk2pk Converter = new pk2pk();
@ -232,10 +231,7 @@ namespace PKHeX
public static string[] wallpapernames, puffs, itempouch = { };
public static string curlanguage = "en";
public static bool unicode;
public ToolTip Tip1 = new ToolTip();
public ToolTip Tip2 = new ToolTip();
public ToolTip Tip3 = new ToolTip();
public ToolTip NatureTip = new ToolTip();
public ToolTip Tip1 = new ToolTip(), Tip2 = new ToolTip(), Tip3 = new ToolTip(), NatureTip = new ToolTip();
public static List<Util.cbItem> MoveDataSource, ItemDataSource, SpeciesDataSource, BallDataSource, NatureDataSource, AbilityDataSource, VersionDataSource;
private PictureBox[] SlotPictureBoxes;
#endregion
@ -432,7 +428,7 @@ namespace PKHeX
{
try
{
byte[] blank = PKX.encryptArray(new byte[PK6.SIZE_PARTY]);
byte[] blank = (byte[])blankEK6.Clone();
for (int i = 0; i < PK6.SIZE_STORED; i++)
blank[i] ^= input[i];
@ -664,7 +660,7 @@ namespace PKHeX
GB_SAVtools.Enabled =
B_JPEG.Enabled = true;
savedited = false;
SAV.Edited = false;
Menu_ToggleBoxUI.Visible = false;
B_VerifyCHK.Enabled = ramsav == null;
@ -677,7 +673,7 @@ namespace PKHeX
GB_SUBE.Visible = !oras;
B_OpenSecretBase.Visible = oras;
int startBox = SAV.CurrentBox;
int startBox = SAV.CurrentBox; // FF if BattleBox
if (startBox > 30) { tabBoxMulti.SelectedIndex = 1; CB_BoxSelect.SelectedIndex = 0; }
else { tabBoxMulti.SelectedIndex = 0; CB_BoxSelect.SelectedIndex = startBox; }
@ -1231,7 +1227,7 @@ namespace PKHeX
: 0).ToString();
}
else
(new[] {TB_HPIV, TB_ATKIV, TB_DEFIV, TB_SPAIV, TB_SPDIV, TB_SPEIV})[index].Text =
new[] {TB_HPIV, TB_ATKIV, TB_DEFIV, TB_SPAIV, TB_SPDIV, TB_SPEIV}[index].Text =
((e.Button == MouseButtons.Left) ? 31 : 0).ToString();
}
private void clickIV(object sender, EventArgs e)
@ -2387,7 +2383,7 @@ namespace PKHeX
// Integrity Checks //
private void clickVerifyCHK(object sender, EventArgs e)
{
if (savedited) { Util.Alert("Save has been edited. Cannot integrity check."); return; }
if (SAV.Edited) { Util.Alert("Save has been edited. Cannot integrity check."); return; }
RTB_S.Text += PKX.verifyG6CHK(SAV.Data);
}
@ -2527,7 +2523,7 @@ namespace PKHeX
{
try
{
byte[] blank = PKX.encryptArray(new byte[PK6.SIZE_STORED]);
byte[] blank = (byte[])blankEK6.Clone();
for (int i = 0; i < PK6.SIZE_STORED; i++)
blank[i] = (byte)(pk6.Data[i] ^ blank[i]);
@ -2634,7 +2630,12 @@ namespace PKHeX
}
// Write final value back to the save
SAV.DaycareRNGSeed = Convert.ToUInt64(TB_RNGSeed.Text, 16);
ulong value = Convert.ToUInt64(TB_RNGSeed.Text, 16);
if (value != SAV.DaycareRNGSeed)
{
SAV.DaycareRNGSeed = value;
SAV.Edited = true;
}
}
private void refreshTrainerInfo()
{
@ -2746,12 +2747,12 @@ namespace PKHeX
{
CB_BoxSelect.Items.Clear();
for (int i = 0; i < 31; i++)
CB_BoxSelect.Items.Add(Encoding.Unicode.GetString(SAV.Data, SAV.PCLayout + 0x22 * i, 0x22));
CB_BoxSelect.Items.Add(SAV.getBoxName(i));
}
catch
{
CB_BoxSelect.Items.Clear();
for (int i = 1; i < 32; i++)
for (int i = 1; i < 31; i++)
CB_BoxSelect.Items.Add("Box " + i);
}
CB_BoxSelect.SelectedIndex = selectedbox; // restore selected box
@ -2914,9 +2915,8 @@ namespace PKHeX
if (dr == DialogResult.Cancel) return;
if (dr == DialogResult.Yes)
{
byte[] ezeros = PKX.encryptArray(new byte[PK6.SIZE_STORED]);
for (int i = ctr; i < 30 * 31; i++)
SAV.setEK6Stored(ezeros, offset + i * PK6.SIZE_STORED);
SAV.setEK6Stored(blankEK6, offset + i * PK6.SIZE_STORED);
}
string[] filepaths = Directory.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly);
@ -3399,14 +3399,14 @@ namespace PKHeX
pkm_from_offset = 0; // Clear offset value
}
savedited = true;
SAV.Edited = true;
}
private void pbBoxSlot_DragEnter(object sender, DragEventArgs e)
{
if (e.Data != null)
e.Effect = DragDropEffects.Move;
}
private byte[] pkm_from = PKX.encryptArray(new byte[PK6.SIZE_STORED]);
private byte[] pkm_from = (byte[])blankEK6.Clone();
private int pkm_from_offset;
private int pkm_from_slot = -1;
#endregion

2
SAV/SAV_BoxLayout.cs
View file

@ -64,7 +64,7 @@ namespace PKHeX
private void B_Save_Click(object sender, EventArgs e)
{
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}

1
SAV/SAV_HallOfFame.cs
View file

@ -100,6 +100,7 @@ namespace PKHeX
private void B_Close_Click(object sender, EventArgs e)
{
Array.Copy(data, 0, Main.SAV.Data, Main.SAV.HoF, data.Length);
Main.SAV.Edited = true;
Close();
}
private void displayEntry(object sender, EventArgs e)

2
SAV/SAV_Inventory.cs
View file

@ -282,7 +282,7 @@ namespace PKHeX
{
saveBag(sender);
Array.Copy(sav, Main.SAV.Data, Main.SAV.Data.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}
}

1
SAV/SAV_OPower.cs
View file

@ -98,6 +98,7 @@ namespace PKHeX
Main.SAV.Data[o + 0x19] = Convert.ToByte(CHK_6.Checked);
Main.SAV.Data[o + 0x26] = Convert.ToByte(CHK_7.Checked);
Main.SAV.Data[o + 0x2B] = Convert.ToByte(CHK_8.Checked);
Main.SAV.Edited = true;
}
private int getIndex(int o, int l)
{

1
SAV/SAV_PokedexORAS.cs
View file

@ -173,6 +173,7 @@ namespace PKHeX
// Return back to the parent savefile
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.SAV.Edited = true;
Close();
}
private void saveChanges()

1
SAV/SAV_PokedexXY.cs
View file

@ -184,6 +184,7 @@ namespace PKHeX
// Return back to the parent savefile
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.SAV.Edited = true;
Close();
}
private void saveChanges()

2
SAV/SAV_Pokepuff.cs
View file

@ -150,7 +150,7 @@ namespace PKHeX
}
Array.Copy(puffarray, 0, sav, Main.SAV.Puff, 100);
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}
}

2
SAV/SAV_SecretBase.cs
View file

@ -206,7 +206,7 @@ namespace PKHeX
Array.Copy(BitConverter.GetBytes(flags), 0, sav, Main.SAV.PSSStats + 0x140, 4); // write pss
Array.Copy(BitConverter.GetBytes(flags), 0, sav, Main.SAV.SecretBase + 0x62C, 4); // write counter
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}
private void B_GiveDecor_Click(object sender, EventArgs e)

2
SAV/SAV_SuperTrain.cs
View file

@ -150,7 +150,7 @@ namespace PKHeX
}
Array.Copy(bagarray, 0, sav, Main.SAV.SuperTrain + 0x308, 12);
Array.Copy(sav, Main.SAV.Data, Main.SAV.Data.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}
private void B_Cancel_Click(object sender, EventArgs e)

2
SAV/SAV_Trainer.cs
View file

@ -600,7 +600,7 @@ namespace PKHeX
{
save();
Array.Copy(sav, Main.SAV.Data, Main.SAV.Data.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}
private void B_MaxCash_Click(object sender, EventArgs e)

2
SAV/SAV_Wondercard.cs
View file

@ -180,7 +180,7 @@ namespace PKHeX
}
Array.Copy(sav, Main.SAV.Data, sav.Length);
Main.savedited = true;
Main.SAV.Edited = true;
Close();
}