From 822fc47dc413c2edfbd9ac2d10d5e8ef23795edc Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 6 Sep 2016 19:52:03 -0700 Subject: [PATCH] Remove invalid pk sizes export always is in list format for gen1/2, these were introduced in https://github.com/kwsch/PKHeX/commit/9b6552d3146f73c2a33f5254f0b673f8f08d9891 which was an incorrect 'fix' for getting files dumped from dumpBoxesToDB to show up in SAV_Database. This underlying issue has been resolved with the two previous commits. --- PKHeX/PKM/PKMConverter.cs | 4 ---- PKHeX/PKM/PKX.cs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PKHeX/PKM/PKMConverter.cs b/PKHeX/PKM/PKMConverter.cs index bd3e14b73..7ab96784a 100644 --- a/PKHeX/PKM/PKMConverter.cs +++ b/PKHeX/PKM/PKMConverter.cs @@ -33,13 +33,9 @@ public static int getPKMDataFormat(byte[] data) { case PKX.SIZE_1JLIST: case PKX.SIZE_1ULIST: - case PKX.SIZE_1PARTY: - case PKX.SIZE_1STORED: return 1; case PKX.SIZE_2ULIST: case PKX.SIZE_2JLIST: - case PKX.SIZE_2PARTY: - case PKX.SIZE_2STORED: return 2; case PKX.SIZE_3PARTY: case PKX.SIZE_3STORED: diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs index 1c9a62d9f..73c066406 100644 --- a/PKHeX/PKM/PKX.cs +++ b/PKHeX/PKM/PKX.cs @@ -45,8 +45,8 @@ public static bool getIsPKM(long len) { return new[] { - SIZE_1JLIST, SIZE_1ULIST, SIZE_1PARTY, SIZE_1STORED, - SIZE_2ULIST, SIZE_2JLIST, SIZE_2PARTY, SIZE_2STORED, + SIZE_1JLIST, SIZE_1ULIST, + SIZE_2ULIST, SIZE_2JLIST, SIZE_3STORED, SIZE_3PARTY, SIZE_4STORED, SIZE_4PARTY, SIZE_5PARTY,