diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 6adbd2663..be44b1635 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -2174,7 +2174,7 @@ private void getForms(int species) // Mega List int[] mspec = { // XY - 3, 9, 65, 94, 115, 127, 130, 142, 154, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 380, 381, 445, 448, 460, 469, + 3, 9, 65, 94, 115, 127, 130, 142, 181, 212, 214, 229, 248, 257, 282, 303, 306, 308, 310, 354, 359, 380, 381, 445, 448, 460, 469, // ORAS // 254, 260, 376, 719, }; @@ -6024,10 +6024,12 @@ private void loadBoxesFromDB(string path) // Clear out the box data array. // Array.Clear(savefile, offset, size * 30 * 31); - byte[] ezeros = encryptArray(new Byte[232]); - for (int i = ctr; i < 30 * 31; i++) - Array.Copy(ezeros, 0, savefile, offset + i * 232, 232); - + if (MessageBox.Show("Clear subsequent boxes when importing data?\n\nIf you only want to overwrite for new data, press no.","Alert",MessageBoxButtons.YesNo) == DialogResult.Yes) + { + byte[] ezeros = encryptArray(new Byte[232]); + for (int i = ctr; i < 30 * 31; i++) + Array.Copy(ezeros, 0, savefile, offset + i * 232, 232); + } string[] filepaths = Directory.GetFiles(path, "*.*", SearchOption.TopDirectoryOnly); var Converter = new PKHeX.pk2pk(); diff --git a/Resources/text/changelog.txt b/Resources/text/changelog.txt index ddab8a315..4dbb42836 100644 --- a/Resources/text/changelog.txt +++ b/Resources/text/changelog.txt @@ -329,4 +329,8 @@ http://projectpokemon.org/forums/showthread.php?36986 - Fixed: Nice Recieved is actually @ 0x0EC. Added "People Met Online" @ 0x0F4. - Fixed: Load Boxes from Folder will no longer give bad eggs in empty slots. - Fixed: Can no longer set illegal Dex entries (either manually or via Give All) - - Misc: Cleaned up some code, reduced file size. \ No newline at end of file + - Misc: Cleaned up some code, reduced file size. + +09/XX/14 - New Update: + - Added: Box Import will start at the current box. + - Added: Box Import can be instructed to clear all boxes or just overwrite individual slots. \ No newline at end of file