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 refactoring

Browse source 
Cleaned up a little bit of code and used more magic references.
This commit is contained in:
Kurt 2015-11-29 12:59:13 -08:00
parent 62f0d9e7aa
commit c9dad89e11
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Misc/PKX.cs
View file

@ -600,7 +600,7 @@ namespace PKHeX
// Dynamic handling of checksums regardless of save size. // Dynamic handling of checksums regardless of save size.
int verificationOffset = savefile.Length - 0x200 + 0x10; int verificationOffset = savefile.Length - 0x200 + 0x10;
if (BitConverter.ToUInt32(savefile, verificationOffset) != 0x42454546) if (BitConverter.ToUInt32(savefile, verificationOffset) != SAV6.BEEF)
verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future? verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future?
int count = (savefile.Length - verificationOffset - 0x8) / 8; int count = (savefile.Length - verificationOffset - 0x8) / 8;
@ -644,7 +644,7 @@ namespace PKHeX
// Dynamic handling of checksums regardless of save size. // Dynamic handling of checksums regardless of save size.
int verificationOffset = savefile.Length - 0x200 + 0x10; int verificationOffset = savefile.Length - 0x200 + 0x10;
if (BitConverter.ToUInt32(savefile, verificationOffset) != 0x42454546) if (BitConverter.ToUInt32(savefile, verificationOffset) != SAV6.BEEF)
verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future? verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future?
int count = (savefile.Length - verificationOffset - 0x8) / 8; int count = (savefile.Length - verificationOffset - 0x8) / 8;
@ -690,7 +690,7 @@ namespace PKHeX
// Dynamic handling of checksums regardless of save size. // Dynamic handling of checksums regardless of save size.
int verificationOffset = savefile.Length - 0x200 + 0x10; int verificationOffset = savefile.Length - 0x200 + 0x10;
if (BitConverter.ToUInt32(savefile, verificationOffset) != 0x42454546) if (BitConverter.ToUInt32(savefile, verificationOffset) != SAV6.BEEF)
verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future? verificationOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future?
int count = (savefile.Length - verificationOffset - 0x8) / 8; int count = (savefile.Length - verificationOffset - 0x8) / 8;

6
Misc/SAV6.cs
View file

@ -20,6 +20,10 @@ namespace PKHeX
} }
public class SAV6 : PKX public class SAV6 : PKX
{ {
internal static readonly int SIZE_XY = 0x65600;
internal static readonly int SIZE_ORAS = 0x76000;
internal static readonly int BEEF = 0x42454546;
// Global Settings // Global Settings
internal static bool SetUpdateDex = true; internal static bool SetUpdateDex = true;
internal static bool SetUpdatePK6 = true; internal static bool SetUpdatePK6 = true;
@ -182,7 +186,7 @@ namespace PKHeX
private void getBlockInfo() private void getBlockInfo()
{ {
BlockInfoOffset = Data.Length - 0x200 + 0x10; BlockInfoOffset = Data.Length - 0x200 + 0x10;
if (BitConverter.ToUInt32(Data, BlockInfoOffset) != 0x42454546) // BEEF, nice! if (BitConverter.ToUInt32(Data, BlockInfoOffset) != BEEF)
BlockInfoOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future? BlockInfoOffset -= 0x200; // No savegames have more than 0x3D blocks, maybe in the future?
int count = (Data.Length - BlockInfoOffset - 0x8) / 8; int count = (Data.Length - BlockInfoOffset - 0x8) / 8;
BlockInfoOffset += 4; BlockInfoOffset += 4;

44
PKX/f1-Main.cs
View file

@ -138,7 +138,7 @@ namespace PKHeX
#region Global Variables: Always Visible! #region Global Variables: Always Visible!
public static readonly byte[] blankEK6 = PKX.encryptArray(new byte[PK6.SIZE_PARTY]); 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 PK6 pk6 = new PK6(new byte[PK6.SIZE_PARTY]); // Tab Pokemon Data Storage
public static SAV6 SAV = new SAV6(new byte[0x760000]); public static SAV6 SAV = new SAV6(new byte[SAV6.SIZE_ORAS]);
public static byte[] originalSAV; // original save for CyberGadget Codes public static byte[] originalSAV; // original save for CyberGadget Codes
public static byte[] ramsav; // original ramsav for ramsav exporting public static byte[] ramsav; // original ramsav for ramsav exporting
public string pathSDF; public string pathSDF;
@ -458,9 +458,9 @@ namespace PKHeX
#endregion #endregion
#region Saves #region Saves
if ((input.Length == 0x76000) && BitConverter.ToUInt32(input, 0x75E10) == 0x42454546) // ORAS if ((input.Length == SAV6.SIZE_ORAS) && BitConverter.ToUInt32(input, SAV6.SIZE_ORAS - 0x1F0) == SAV6.BEEF) // ORAS
openMAIN(input, path); openMAIN(input, path);
else if ((input.Length == 0x65600) && BitConverter.ToUInt32(input, 0x65410) == 0x42454546) // XY else if ((input.Length == SAV6.SIZE_XY) && BitConverter.ToUInt32(input, SAV6.SIZE_XY - 0x1F0) == SAV6.BEEF) // XY
openMAIN(input, path); openMAIN(input, path);
// Verify the Data Input Size is Proper // Verify the Data Input Size is Proper
else if (input.Length == 0x100000) else if (input.Length == 0x100000)
@ -476,10 +476,10 @@ namespace PKHeX
savshift += 0x7F000; savshift += 0x7F000;
if (sdr == DialogResult.Cancel) if (sdr == DialogResult.Cancel)
return; return;
byte[] psdata = input.Skip(0x5400 + savshift).Take(0x76000).ToArray(); byte[] psdata = input.Skip(0x5400 + savshift).Take(SAV6.SIZE_ORAS).ToArray();
if (BitConverter.ToUInt32(psdata, psdata.Length - 0x1F0) != 0x42454546) if (BitConverter.ToUInt32(psdata, psdata.Length - 0x1F0) != SAV6.BEEF)
Array.Resize(ref psdata, 0x65600); Array.Resize(ref psdata, SAV6.SIZE_XY);
if (BitConverter.ToUInt32(psdata, psdata.Length - 0x1F0) != 0x42454546) if (BitConverter.ToUInt32(psdata, psdata.Length - 0x1F0) != SAV6.BEEF)
return; return;
openMAIN(psdata, path); openMAIN(psdata, path);
@ -573,7 +573,7 @@ namespace PKHeX
if (input.Length == 0x80000) if (input.Length == 0x80000)
// Scan for FEEB in XY location, 3DS only overwrites data if file already exists. // Scan for FEEB in XY location, 3DS only overwrites data if file already exists.
for (int i = 0x60000; i < 0x64000; i+=4) for (int i = 0x60000; i < 0x64000; i+=4)
if (BitConverter.ToUInt32(input, i) == 0x42454546) { Array.Resize(ref input, 0x70000); break; } if (BitConverter.ToUInt32(input, i) == SAV6.BEEF) { Array.Resize(ref input, 0x70000); break; }
ramsav = (byte[])input.Clone(); ramsav = (byte[])input.Clone();
try { openMAIN(ram2sav.getMAIN(input), path, true); } try { openMAIN(ram2sav.getMAIN(input), path, true); }
@ -630,7 +630,7 @@ namespace PKHeX
{ {
// Detection of stored Decryption XORpads: // Detection of stored Decryption XORpads:
if (ModifierKeys == Keys.Control) return false; // no xorpad compatible if (ModifierKeys == Keys.Control) return false; // no xorpad compatible
byte[] savID = new byte[0x10]; Array.Copy(input, 0x10, savID, 0, 0x10); byte[] savID = input.Take(0x10).ToArray();
string exepath = Application.StartupPath; string exepath = Application.StartupPath;
string xorpath = exepath.Clone().ToString(); string xorpath = exepath.Clone().ToString();
string[] XORpads = Directory.GetFiles(xorpath); string[] XORpads = Directory.GetFiles(xorpath);
@ -640,29 +640,25 @@ namespace PKHeX
{ {
// Fix xorpad alignment // Fix xorpad alignment
byte[] xorpad = data; byte[] xorpad = data;
if (xorpad.Length == 0x10009C) if (xorpad.Length == 0x10009C) // Trim off Powersaves' header
{ xorpad = xorpad.Skip(0x9C).ToArray(); // returns 0x100000
Array.Copy(xorpad, 0x9C, xorpad, 0, 0x100000);
Array.Resize(ref xorpad, 0x100000); if (!xorpad.Take(0x10).SequenceEqual(savID)) continue;
}
byte[] xorID = new byte[0x10]; Array.Copy(xorpad, 0x10, xorID, 0, 0x10);
if (!xorID.SequenceEqual(savID)) continue;
// Set up Decrypted File // Set up Decrypted File
byte[] decryptedPS = new byte[0x76000]; byte[] decryptedPS = input.Skip(0x5400).Take(SAV6.SIZE_ORAS).ToArray();
Array.Copy(input, 0x5400, decryptedPS, 0, 0x76000);
// xor through and decrypt // xor through and decrypt
for (int z = 0; z < 0x76000; z++) for (int z = 0; z < decryptedPS.Length; z++)
decryptedPS[z] ^= xorpad[0x5400 + z]; decryptedPS[z] ^= xorpad[0x5400 + z];
// Weakly check the validity of the decrypted content // Weakly check the validity of the decrypted content
if (BitConverter.ToUInt32(decryptedPS, 0x76000 - 0x1F0) != 0x42454546) // Not OR/AS if (BitConverter.ToUInt32(decryptedPS, SAV6.SIZE_ORAS - 0x1F0) != SAV6.BEEF) // Not OR/AS
if (BitConverter.ToUInt32(decryptedPS, 0x65600 - 0x1F0) != 0x42454546) if (BitConverter.ToUInt32(decryptedPS, SAV6.SIZE_XY - 0x1F0) != SAV6.BEEF) // Not X/Y
continue; // Not X/Y, so continue. continue;
else else
Array.Resize(ref decryptedPS, 0x65600); // set to X/Y size Array.Resize(ref decryptedPS, SAV6.SIZE_XY); // set to X/Y size
else Array.Resize(ref decryptedPS, 0x76000); // set to ORAS size just in case else Array.Resize(ref decryptedPS, SAV6.SIZE_ORAS); // set to ORAS size just in case
// Save file is now decrypted! // Save file is now decrypted!