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

Tweak detection of pk6 party file

Browse source
This commit is contained in:
Kaphotics 2016-07-03 18:27:12 -07:00
parent 1779420af1
commit 1e2ef19d9a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
PKM/PKMConverter.cs
View file

@ -40,16 +40,17 @@ namespace PKHeX
case PKX.SIZE_6PARTY: // collision with PGT, same size. case PKX.SIZE_6PARTY: // collision with PGT, same size.
if (BitConverter.ToUInt16(data, 0x4) != 0) // Bad Sanity? if (BitConverter.ToUInt16(data, 0x4) != 0) // Bad Sanity?
return -1; return -1;
if (BitConverter.ToUInt32(data, 0x06) == PKX.getCHK(data))
return 6;
if (BitConverter.ToUInt16(data, 0x58) != 0) // Encrypted? if (BitConverter.ToUInt16(data, 0x58) != 0) // Encrypted?
{ {
PKX.getCHK(data);
for (int i = data.Length - 0x10; i < data.Length; i++) // 0x10 of 00's at the end != PK6 for (int i = data.Length - 0x10; i < data.Length; i++) // 0x10 of 00's at the end != PK6
if (data[i] != 0) if (data[i] != 0)
break;
return 6; return 6;
}
return -1; return -1;
} }
return 6;
}
return -1; return -1;
} }
internal static PKM getPKMfromBytes(byte[] data, string ident = null) internal static PKM getPKMfromBytes(byte[] data, string ident = null)