Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-09-20 22:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Misc CXD improvements, exporting/reading fixes

Browse source 
Add XD checksum fixing/checking, now implemented
Fix XD xk3 r/w sizes. Was using colo size
Fix XD xk3 filename checksum. getCHK does checksum over 8-232, XD is too
short. just use ccitt16 for the random identification piece of both
xk3's and ck3's.
This commit is contained in:
Kaphotics 2016-09-28 18:32:20 -07:00
parent 6d025833ca
commit f1a504e676
4 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKHeX/PKM/CK3.cs
View file

@ -41,7 +41,7 @@ namespace PKHeX
// Silly Attributes
public override ushort Sanity { get { return 0; } set { } } // valid flag set in pkm structure.
public override ushort Checksum { get { return PKX.getCHK(Data); } set { } } // totally false, just a way to get a 'random' ident for the pkm.
public override ushort Checksum { get { return SaveUtil.ccitt16(Data); } set { } } // totally false, just a way to get a 'random' ident for the pkm.
public override int Species { get { return PKX.getG4Species(BigEndian.ToUInt16(Data, 0x00)); } set { BigEndian.GetBytes((ushort)PKX.getG3Species(value)).CopyTo(Data, 0x00); } }
// 02-04 unused

6
PKHeX/PKM/XK3.cs
View file

@ -12,8 +12,8 @@ namespace PKHeX
0x7A, 0x7B,
0x7E, 0x7F
};
public sealed override int SIZE_PARTY => PKX.SIZE_3CSTORED;
public override int SIZE_STORED => PKX.SIZE_3CSTORED;
public sealed override int SIZE_PARTY => PKX.SIZE_3XSTORED;
public override int SIZE_STORED => PKX.SIZE_3XSTORED;
public override int Format => 3;
public XK3(byte[] decryptedData = null, string ident = null)
{
@ -40,7 +40,7 @@ namespace PKHeX
// Silly Attributes
public override ushort Sanity { get { return 0; } set { } } // valid flag set in pkm structure.
public override ushort Checksum { get { return PKX.getCHK(Data); } set { } } // totally false, just a way to get a 'random' ident for the pkm.
public override ushort Checksum { get { return SaveUtil.ccitt16(Data); } set { } } // totally false, just a way to get a 'random' ident for the pkm.
public override int Species { get { return PKX.getG4Species(BigEndian.ToUInt16(Data, 0x00)); } set { BigEndian.GetBytes((ushort)PKX.getG3Species(value)).CopyTo(Data, 0x00); } }
public override int HeldItem { get { return PKX.getG4Item((ushort)G3Item); } set { } }

2
PKHeX/Saves/SAV3Colosseum.cs
View file

@ -28,7 +28,7 @@ namespace PKHeX
private readonly int OFS_PouchCologne;
public SAV3Colosseum(byte[] data = null)
{
Data = data == null ? new byte[SaveUtil.SIZE_G3BOX] : (byte[])data.Clone();
Data = data == null ? new byte[SaveUtil.SIZE_G3COLO] : (byte[])data.Clone();
BAK = (byte[])Data.Clone();
Exportable = !Data.SequenceEqual(new byte[Data.Length]);

63
PKHeX/Saves/SAV3XD.cs
View file

@ -17,9 +17,10 @@ namespace PKHeX
private readonly int SaveIndex = -1;
private readonly ushort[] LegalItems, LegalKeyItems, LegalBalls, LegalTMHMs, LegalBerries, LegalCologne, LegalDisc;
private readonly int OFS_PouchCologne, OFS_PouchDisc;
private readonly int[] subOffsets = new int[16];
public SAV3XD(byte[] data = null)
{
Data = data == null ? new byte[SaveUtil.SIZE_G3BOX] : (byte[])data.Clone();
Data = data == null ? new byte[SaveUtil.SIZE_G3XD] : (byte[])data.Clone();
BAK = (byte[])Data.Clone();
Exportable = !Data.SequenceEqual(new byte[Data.Length]);
@ -56,7 +57,6 @@ namespace PKHeX
// Get Offset Info
ushort[] subLength = new ushort[16];
int[] subOffsets = new int[16];
for (int i = 0; i < 16; i++)
{
subLength[i] = BigEndian.ToUInt16(Data, 0x20 + 2*i);
@ -140,17 +140,62 @@ namespace PKHeX
// Checksums
protected override void setChecksums()
{
}
public override bool ChecksumsValid
{
get { return false; }
Data = setXDChecksums(Data, subOffsets[0]);
}
public override bool ChecksumsValid => !ChecksumInfo.Contains("Invalid");
public override string ChecksumInfo
{
get { return ""; }
}
get
{
byte[] data = setXDChecksums(Data, subOffsets[0]);
const int start = 0xA8; // 0x88 + 0x20
int oldHC = BigEndian.ToInt32(Data, start + subOffsets[0] + 0x38);
int newHC = BigEndian.ToInt32(data, start + subOffsets[0] + 0x38);
bool header = newHC == oldHC;
var oldCHK = Data.Skip(0x10).Take(0x10);
var newCHK = data.Skip(0x10).Take(0x10);
bool body = newCHK.SequenceEqual(oldCHK);
return $"Header Checksum {(header ? "V" : "Inv")}alid, Body Checksum {(body ? "V" : "Inv")}alid.";
}
}
private static byte[] setXDChecksums(byte[] input, int subOffset0)
{
if (input.Length != 0x28000)
throw new ArgumentException("Input should be a slot, not the entire save binary.");
byte[] data = (byte[])input.Clone();
const int start = 0xA8; // 0x88 + 0x20
// Header Checksum
int newHC = 0;
for (int i = 0; i < 8; i++)
newHC += data[i];
BigEndian.GetBytes(newHC).CopyTo(data, start + subOffset0 + 0x38);
// Body Checksum
new byte[16].CopyTo(data, 0x10); // Clear old Checksum Data
uint[] checksum = new uint[4];
int dt = 8;
for (int i = 0; i < 4; i++)
for (int j = 0; j < 0x9FF4; j += 2, dt += 2)
checksum[i] += BigEndian.ToUInt16(data, dt);
ushort[] newchks = new ushort[8];
for (int i = 0; i < 4; i++)
{
newchks[i*2] = (ushort)(checksum[i] >> 16);
newchks[i*2+1] = (ushort)checksum[i];
}
Array.Reverse(newchks);
for (int i = 0; i < newchks.Length; i++)
BigEndian.GetBytes(newchks[i]).CopyTo(data, 0x10 + 2*i);
return data;
}
// Trainer Info
public override GameVersion Version { get { return GameVersion.XD; } protected set { } }
public override string OT { get { return PKX.getColoStr(Data, Trainer1 + 0x00, 10); } set { PKX.setColoStr(value, 10).CopyTo(Data, Trainer1 + 0x00); } }