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

Minor qol improvements

Browse source 
SAV6/SaveFile: Not use Skip.Take.ToArray() for data accessing,
drastically speeds up pcbin importing and misc data reads
Checks: Indicate GeoLocation MEMORY as illegal, was confused with the
PKM's origin geolocation data.
Main: Reorder buttons so the less used buttons are at the end. Fix
button view bugs:
Visible check doesn't function on load as the entire form is not yet
visible
BerryField button appears for ORAS but has no function (all
randomization is in PokeBlock), so only show for XY.
This commit is contained in:
Kaphotics 2016-08-19 23:36:13 -07:00
parent 0dcd5b22e8
commit 2b9b16ad39
6 changed files with 111 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKHeX/Legality/Checks.cs
View file

@ -594,9 +594,9 @@ namespace PKHeX
if (!pk6.WasEvent && !(pk6.WasLink && (EncounterMatch as EncounterLink)?.OT == false) && (pk6.HT_Name.Length == 0 || pk6.Geo1_Country == 0)) // Is not Traded
{
if (pk6.HT_Name.Length != 0)
return new LegalityCheck(Severity.Invalid, "GeoLocation -- HT Name present but has no previous Country.");
return new LegalityCheck(Severity.Invalid, "GeoLocation Memory -- HT Name present but has no previous Country.");
if (pk6.Geo1_Country != 0)
return new LegalityCheck(Severity.Invalid, "GeoLocation -- Previous country of residence but no Handling Trainer.");
return new LegalityCheck(Severity.Invalid, "GeoLocation Memory -- Previous country of residence but no Handling Trainer.");
if (pk6.HT_Memory != 0)
return new LegalityCheck(Severity.Invalid, "Memory -- Handling Trainer memory present but no Handling Trainer.");
if (pk6.CurrentHandler != 0) // Badly edited; PKHeX doesn't trip this.

142
PKHeX/MainWindow/Main.Designer.cs generated
View file

@ -341,14 +341,10 @@
this.B_VerifyCHK = new System.Windows.Forms.Button();
this.GB_SAVtools = new System.Windows.Forms.GroupBox();
this.FLP_SAVtools = new System.Windows.Forms.FlowLayoutPanel();
this.B_OpenPokepuffs = new System.Windows.Forms.Button();
this.B_OpenItemPouch = new System.Windows.Forms.Button();
this.B_OpenTrainerInfo = new System.Windows.Forms.Button();
this.B_OUTPasserby = new System.Windows.Forms.Button();
this.B_OpenItemPouch = new System.Windows.Forms.Button();
this.B_OpenBoxLayout = new System.Windows.Forms.Button();
this.B_OpenWondercards = new System.Windows.Forms.Button();
this.B_OpenSuperTraining = new System.Windows.Forms.Button();
this.B_OpenHallofFame = new System.Windows.Forms.Button();
this.B_OpenOPowers = new System.Windows.Forms.Button();
this.B_OpenEventFlags = new System.Windows.Forms.Button();
this.B_OpenPokedex = new System.Windows.Forms.Button();
@ -356,6 +352,10 @@
this.B_OpenSecretBase = new System.Windows.Forms.Button();
this.B_Pokeblocks = new System.Windows.Forms.Button();
this.B_LinkInfo = new System.Windows.Forms.Button();
this.B_OpenPokepuffs = new System.Windows.Forms.Button();
this.B_OpenSuperTraining = new System.Windows.Forms.Button();
this.B_OpenHallofFame = new System.Windows.Forms.Button();
this.B_OUTPasserby = new System.Windows.Forms.Button();
this.B_CGearSkin = new System.Windows.Forms.Button();
this.dragout = new System.Windows.Forms.PictureBox();
this.mnuL = new System.Windows.Forms.ContextMenuStrip(this.components);
@ -4363,36 +4363,36 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.FLP_SAVtools.AutoScroll = true;
this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs);
this.FLP_SAVtools.Controls.Add(this.B_OpenItemPouch);
this.FLP_SAVtools.Controls.Add(this.B_OpenTrainerInfo);
this.FLP_SAVtools.Controls.Add(this.B_OUTPasserby);
this.FLP_SAVtools.Controls.Add(this.B_OpenItemPouch);
this.FLP_SAVtools.Controls.Add(this.B_OpenBoxLayout);
this.FLP_SAVtools.Controls.Add(this.B_OpenWondercards);
this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining);
this.FLP_SAVtools.Controls.Add(this.B_OpenHallofFame);
this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers);
this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex);
this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField);
this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase);
this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks);
this.FLP_SAVtools.Controls.Add(this.B_LinkInfo);
this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField);
this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks);
this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase);
this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs);
this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining);
this.FLP_SAVtools.Controls.Add(this.B_OpenHallofFame);
this.FLP_SAVtools.Controls.Add(this.B_OUTPasserby);
this.FLP_SAVtools.Controls.Add(this.B_CGearSkin);
this.FLP_SAVtools.Location = new System.Drawing.Point(6, 10);
this.FLP_SAVtools.Name = "FLP_SAVtools";
this.FLP_SAVtools.Size = new System.Drawing.Size(297, 87);
this.FLP_SAVtools.TabIndex = 101;
//
// B_OpenPokepuffs
// B_OpenTrainerInfo
//
this.B_OpenPokepuffs.Location = new System.Drawing.Point(3, 3);
this.B_OpenPokepuffs.Name = "B_OpenPokepuffs";
this.B_OpenPokepuffs.Size = new System.Drawing.Size(87, 23);
this.B_OpenPokepuffs.TabIndex = 1;
this.B_OpenPokepuffs.Text = "‎Poké Puffs";
this.B_OpenPokepuffs.UseVisualStyleBackColor = true;
this.B_OpenPokepuffs.Click += new System.EventHandler(this.B_OpenPokepuffs_Click);
this.B_OpenTrainerInfo.Location = new System.Drawing.Point(3, 3);
this.B_OpenTrainerInfo.Name = "B_OpenTrainerInfo";
this.B_OpenTrainerInfo.Size = new System.Drawing.Size(87, 23);
this.B_OpenTrainerInfo.TabIndex = 3;
this.B_OpenTrainerInfo.Text = "Trainer Info";
this.B_OpenTrainerInfo.UseVisualStyleBackColor = true;
this.B_OpenTrainerInfo.Click += new System.EventHandler(this.B_OpenTrainerInfo_Click);
//
// B_OpenItemPouch
//
@ -4404,29 +4404,9 @@
this.B_OpenItemPouch.UseVisualStyleBackColor = true;
this.B_OpenItemPouch.Click += new System.EventHandler(this.B_OpenItemPouch_Click);
//
// B_OpenTrainerInfo
//
this.B_OpenTrainerInfo.Location = new System.Drawing.Point(189, 3);
this.B_OpenTrainerInfo.Name = "B_OpenTrainerInfo";
this.B_OpenTrainerInfo.Size = new System.Drawing.Size(87, 23);
this.B_OpenTrainerInfo.TabIndex = 3;
this.B_OpenTrainerInfo.Text = "Trainer Info";
this.B_OpenTrainerInfo.UseVisualStyleBackColor = true;
this.B_OpenTrainerInfo.Click += new System.EventHandler(this.B_OpenTrainerInfo_Click);
//
// B_OUTPasserby
//
this.B_OUTPasserby.Location = new System.Drawing.Point(3, 32);
this.B_OUTPasserby.Name = "B_OUTPasserby";
this.B_OUTPasserby.Size = new System.Drawing.Size(87, 23);
this.B_OUTPasserby.TabIndex = 4;
this.B_OUTPasserby.Text = "Passerby";
this.B_OUTPasserby.UseVisualStyleBackColor = true;
this.B_OUTPasserby.Click += new System.EventHandler(this.B_OUTPasserby_Click);
//
// B_OpenBoxLayout
//
this.B_OpenBoxLayout.Location = new System.Drawing.Point(96, 32);
this.B_OpenBoxLayout.Location = new System.Drawing.Point(189, 3);
this.B_OpenBoxLayout.Name = "B_OpenBoxLayout";
this.B_OpenBoxLayout.Size = new System.Drawing.Size(87, 23);
this.B_OpenBoxLayout.TabIndex = 5;
@ -4436,7 +4416,7 @@
//
// B_OpenWondercards
//
this.B_OpenWondercards.Location = new System.Drawing.Point(189, 32);
this.B_OpenWondercards.Location = new System.Drawing.Point(3, 32);
this.B_OpenWondercards.Name = "B_OpenWondercards";
this.B_OpenWondercards.Size = new System.Drawing.Size(87, 23);
this.B_OpenWondercards.TabIndex = 6;
@ -4444,30 +4424,9 @@
this.B_OpenWondercards.UseVisualStyleBackColor = true;
this.B_OpenWondercards.Click += new System.EventHandler(this.B_OpenWondercards_Click);
//
// B_OpenSuperTraining
//
this.B_OpenSuperTraining.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.B_OpenSuperTraining.Location = new System.Drawing.Point(3, 61);
this.B_OpenSuperTraining.Name = "B_OpenSuperTraining";
this.B_OpenSuperTraining.Size = new System.Drawing.Size(87, 23);
this.B_OpenSuperTraining.TabIndex = 7;
this.B_OpenSuperTraining.Text = "Super Train";
this.B_OpenSuperTraining.UseVisualStyleBackColor = true;
this.B_OpenSuperTraining.Click += new System.EventHandler(this.B_OpenSuperTraining_Click);
//
// B_OpenHallofFame
//
this.B_OpenHallofFame.Location = new System.Drawing.Point(96, 61);
this.B_OpenHallofFame.Name = "B_OpenHallofFame";
this.B_OpenHallofFame.Size = new System.Drawing.Size(87, 23);
this.B_OpenHallofFame.TabIndex = 8;
this.B_OpenHallofFame.Text = "Hall of Fame";
this.B_OpenHallofFame.UseVisualStyleBackColor = true;
this.B_OpenHallofFame.Click += new System.EventHandler(this.B_OUTHallofFame_Click);
//
// B_OpenOPowers
//
this.B_OpenOPowers.Location = new System.Drawing.Point(189, 61);
this.B_OpenOPowers.Location = new System.Drawing.Point(96, 32);
this.B_OpenOPowers.Name = "B_OpenOPowers";
this.B_OpenOPowers.Size = new System.Drawing.Size(87, 23);
this.B_OpenOPowers.TabIndex = 9;
@ -4477,7 +4436,7 @@
//
// B_OpenEventFlags
//
this.B_OpenEventFlags.Location = new System.Drawing.Point(3, 90);
this.B_OpenEventFlags.Location = new System.Drawing.Point(189, 32);
this.B_OpenEventFlags.Name = "B_OpenEventFlags";
this.B_OpenEventFlags.Size = new System.Drawing.Size(87, 23);
this.B_OpenEventFlags.TabIndex = 10;
@ -4487,7 +4446,7 @@
//
// B_OpenPokedex
//
this.B_OpenPokedex.Location = new System.Drawing.Point(96, 90);
this.B_OpenPokedex.Location = new System.Drawing.Point(3, 61);
this.B_OpenPokedex.Name = "B_OpenPokedex";
this.B_OpenPokedex.Size = new System.Drawing.Size(87, 23);
this.B_OpenPokedex.TabIndex = 11;
@ -4497,7 +4456,7 @@
//
// B_OpenBerryField
//
this.B_OpenBerryField.Location = new System.Drawing.Point(189, 90);
this.B_OpenBerryField.Location = new System.Drawing.Point(189, 61);
this.B_OpenBerryField.Name = "B_OpenBerryField";
this.B_OpenBerryField.Size = new System.Drawing.Size(87, 23);
this.B_OpenBerryField.TabIndex = 12;
@ -4507,7 +4466,7 @@
//
// B_OpenSecretBase
//
this.B_OpenSecretBase.Location = new System.Drawing.Point(3, 119);
this.B_OpenSecretBase.Location = new System.Drawing.Point(96, 90);
this.B_OpenSecretBase.Name = "B_OpenSecretBase";
this.B_OpenSecretBase.Size = new System.Drawing.Size(87, 23);
this.B_OpenSecretBase.TabIndex = 21;
@ -4518,7 +4477,7 @@
//
// B_Pokeblocks
//
this.B_Pokeblocks.Location = new System.Drawing.Point(96, 119);
this.B_Pokeblocks.Location = new System.Drawing.Point(3, 90);
this.B_Pokeblocks.Name = "B_Pokeblocks";
this.B_Pokeblocks.Size = new System.Drawing.Size(87, 23);
this.B_Pokeblocks.TabIndex = 22;
@ -4529,7 +4488,7 @@
//
// B_LinkInfo
//
this.B_LinkInfo.Location = new System.Drawing.Point(189, 119);
this.B_LinkInfo.Location = new System.Drawing.Point(96, 61);
this.B_LinkInfo.Name = "B_LinkInfo";
this.B_LinkInfo.Size = new System.Drawing.Size(87, 23);
this.B_LinkInfo.TabIndex = 23;
@ -4537,6 +4496,47 @@
this.B_LinkInfo.UseVisualStyleBackColor = true;
this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click);
//
// B_OpenPokepuffs
//
this.B_OpenPokepuffs.Location = new System.Drawing.Point(189, 90);
this.B_OpenPokepuffs.Name = "B_OpenPokepuffs";
this.B_OpenPokepuffs.Size = new System.Drawing.Size(87, 23);
this.B_OpenPokepuffs.TabIndex = 1;
this.B_OpenPokepuffs.Text = "‎Poké Puffs";
this.B_OpenPokepuffs.UseVisualStyleBackColor = true;
this.B_OpenPokepuffs.Click += new System.EventHandler(this.B_OpenPokepuffs_Click);
//
// B_OpenSuperTraining
//
this.B_OpenSuperTraining.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.B_OpenSuperTraining.Location = new System.Drawing.Point(3, 119);
this.B_OpenSuperTraining.Name = "B_OpenSuperTraining";
this.B_OpenSuperTraining.Size = new System.Drawing.Size(87, 23);
this.B_OpenSuperTraining.TabIndex = 7;
this.B_OpenSuperTraining.Text = "Super Train";
this.B_OpenSuperTraining.UseVisualStyleBackColor = true;
this.B_OpenSuperTraining.Click += new System.EventHandler(this.B_OpenSuperTraining_Click);
//
// B_OpenHallofFame
//
this.B_OpenHallofFame.Location = new System.Drawing.Point(96, 119);
this.B_OpenHallofFame.Name = "B_OpenHallofFame";
this.B_OpenHallofFame.Size = new System.Drawing.Size(87, 23);
this.B_OpenHallofFame.TabIndex = 8;
this.B_OpenHallofFame.Text = "Hall of Fame";
this.B_OpenHallofFame.UseVisualStyleBackColor = true;
this.B_OpenHallofFame.Click += new System.EventHandler(this.B_OUTHallofFame_Click);
//
// B_OUTPasserby
//
this.B_OUTPasserby.Location = new System.Drawing.Point(189, 119);
this.B_OUTPasserby.Name = "B_OUTPasserby";
this.B_OUTPasserby.Size = new System.Drawing.Size(87, 23);
this.B_OUTPasserby.TabIndex = 4;
this.B_OUTPasserby.Text = "Passerby";
this.B_OUTPasserby.UseVisualStyleBackColor = true;
this.B_OUTPasserby.Click += new System.EventHandler(this.B_OUTPasserby_Click);
//
// B_CGearSkin
//
this.B_CGearSkin.Location = new System.Drawing.Point(3, 148);

4
PKHeX/MainWindow/Main.cs
View file

@ -787,7 +787,7 @@ namespace PKHeX
PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox;
Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox;
if (GB_SAVtools.Visible)
if (path != null) // Actual save file
{
PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = SAV.HasBattleBox;
GB_Daycare.Visible = SAV.HasDaycare;
@ -802,7 +802,7 @@ namespace PKHeX
B_OpenHallofFame.Visible = SAV.HasHoF;
B_OpenOPowers.Visible = SAV.HasOPower;
B_OpenPokedex.Visible = SAV.HasPokeDex;
B_OpenBerryField.Visible = SAV.HasBerryField;
B_OpenBerryField.Visible = SAV.HasBerryField && SAV.XY;
B_Pokeblocks.Visible = SAV.HasPokeBlock;
B_JPEG.Visible = SAV.HasJPEG;
B_OpenEventFlags.Visible = SAV.HasEvents;

32
PKHeX/MainWindow/Main.resx
View file

@ -1261,16 +1261,10 @@
<metadata name="FLP_SAVtools.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenPokepuffs.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenItemPouch.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenTrainerInfo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OUTPasserby.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="B_OpenItemPouch.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenBoxLayout.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@ -1279,12 +1273,6 @@
<metadata name="B_OpenWondercards.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenSuperTraining.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenHallofFame.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenOPowers.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -1294,16 +1282,28 @@
<metadata name="B_OpenPokedex.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenBerryField.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="B_LinkInfo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenSecretBase.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="B_OpenBerryField.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_Pokeblocks.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_LinkInfo.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="B_OpenSecretBase.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenPokepuffs.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenSuperTraining.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OpenHallofFame.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_OUTPasserby.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="B_CGearSkin.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

9
PKHeX/Saves/SAV6.cs
View file

@ -98,7 +98,8 @@ namespace PKHeX
// Apply checksums
for (int i = 0; i < Blocks.Length; i++)
{
byte[] array = Data.Skip(Blocks[i].Offset).Take(Blocks[i].Length).ToArray();
byte[] array = new byte[Blocks[i].Length];
Array.Copy(Data, Blocks[i].Offset, array, 0, array.Length);
BitConverter.GetBytes(SaveUtil.ccitt16(array)).CopyTo(Data, BlockInfoOffset + 6 + i * 8);
}
}
@ -108,7 +109,8 @@ namespace PKHeX
{
for (int i = 0; i < Blocks.Length; i++)
{
byte[] array = Data.Skip(Blocks[i].Offset).Take(Blocks[i].Length).ToArray();
byte[] array = new byte[Blocks[i].Length];
Array.Copy(Data, Blocks[i].Offset, array, 0, array.Length);
if (SaveUtil.ccitt16(array) != BitConverter.ToUInt16(Data, BlockInfoOffset + 6 + i * 8))
return false;
}
@ -123,7 +125,8 @@ namespace PKHeX
string rv = "";
for (int i = 0; i < Blocks.Length; i++)
{
byte[] array = Data.Skip(Blocks[i].Offset).Take(Blocks[i].Length).ToArray();
byte[] array = new byte[Blocks[i].Length];
Array.Copy(Data, Blocks[i].Offset, array, 0, array.Length);
if (SaveUtil.ccitt16(array) == BitConverter.ToUInt16(Data, BlockInfoOffset + 6 + i * 8))
continue;

17
PKHeX/Saves/SaveFile.cs
View file

@ -450,7 +450,10 @@ namespace PKHeX
// split up data to individual pkm
byte[][] pkdata = new byte[data.Length/SIZE_STORED][];
for (int i = 0; i < data.Length; i += SIZE_STORED)
pkdata[i/SIZE_STORED] = data.Skip(i).Take(SIZE_STORED).ToArray();
{
pkdata[i/SIZE_STORED] = new byte[SIZE_STORED];
Array.Copy(data, i, pkdata[i/SIZE_STORED], 0, SIZE_STORED);
}
PKM[] pkms = BoxData;
for (int i = 0; i < pkms.Length; i++)
@ -465,7 +468,10 @@ namespace PKHeX
byte[][] pkdata = new byte[data.Length / SIZE_STORED][];
for (int i = 0; i < data.Length; i += SIZE_STORED)
pkdata[i/SIZE_STORED] = data.Skip(i).Take(SIZE_STORED).ToArray();
{
pkdata[i/SIZE_STORED] = new byte[SIZE_STORED];
Array.Copy(data, i, pkdata[i/SIZE_STORED], 0, SIZE_STORED);
}
PKM[] pkms = BoxData;
for (int i = 0; i < 30; i++)
@ -479,7 +485,12 @@ namespace PKHeX
public byte[] getData(int Offset, int Length)
{
return Data.Skip(Offset).Take(Length).ToArray();
if (Offset + Length > Data.Length)
return null;
byte[] data = new byte[Length];
Array.Copy(Data, Offset, data, 0, Length);
return data;
}
public void setData(byte[] input, int Offset)
{