From 543736d56826024d2ab91bb3f90103a251fd2dec Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 8 Nov 2017 00:34:32 -0800
Subject: [PATCH] Early rough USUM compatibility

need to dump string resources, sprites, and repoint the form list string
fetch later. tons more to do

no guarantee of any working functions
---
 PKHeX.Core/Legality/Tables7.cs                |   7 +-
 PKHeX.Core/Resources/byte/personal_uu         | Bin 80724 -> 81984 bytes
 PKHeX.Core/Saves/SAV7.cs                      | 179 ++++++----
 PKHeX.Core/Saves/SaveUtil.cs                  |   2 +-
 .../Gen7/SAV_Trainer7.Designer.cs             | 329 +++++++++---------
 5 files changed, 273 insertions(+), 244 deletions(-)

diff --git a/PKHeX.Core/Legality/Tables7.cs b/PKHeX.Core/Legality/Tables7.cs
index 08379a5f9..bb3b6a197 100644
--- a/PKHeX.Core/Legality/Tables7.cs
+++ b/PKHeX.Core/Legality/Tables7.cs
@@ -93,6 +93,9 @@ public static partial class Legal
         internal static readonly ushort[] Pouch_Key_USUM = {
             // todo
         };
+        internal static readonly ushort[] Pouch_Roto_USUM = {
+            //949, 950, 951, 952, 953, 954, 955, 956, 957, 958, 959
+        };
         internal static readonly ushort[] Pouch_TMHM_SM = { // 02
             328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345,
             346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
@@ -117,10 +120,10 @@ public static partial class Legal
             776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 798, 799, 800, 801, 802, 803, 804, 805, 806, 836
         };
         internal static readonly ushort[] Pouch_ZCrystal_USUM = Pouch_ZCrystal_SM.Concat(new ushort[] { // Bead
-            // todo
+            //927, 928, 929, 930, 931, 932
         }).ToArray();
         internal static readonly ushort[] Pouch_ZCrystalHeld_USUM = Pouch_ZCrystalHeld_SM.Concat(new ushort[] { // Piece
-            // todo
+            //921, 922, 923, 924, 925, 926
         }).ToArray();
         public static readonly Dictionary<int, int> ZCrystalDictionary = Pouch_ZCrystal_USUM
             .Zip(Pouch_ZCrystalHeld_USUM, (k, v) => new { Key = (int)k, Value = (int)v })
diff --git a/PKHeX.Core/Resources/byte/personal_uu b/PKHeX.Core/Resources/byte/personal_uu
index 57989e926fdf01978c8aba8152e170d6de994be8..9c1235132f6496d50204fd5e6b6807514401beb5 100644
GIT binary patch
delta 16816
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

delta 12208
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
XO}Mf3<#n2ENJ0n3&G59K<fG|dShGXq

diff --git a/PKHeX.Core/Saves/SAV7.cs b/PKHeX.Core/Saves/SAV7.cs
index 8c153e6bb..283b0dd38 100644
--- a/PKHeX.Core/Saves/SAV7.cs
+++ b/PKHeX.Core/Saves/SAV7.cs
@@ -194,82 +194,94 @@ public override string ChecksumInfo
 
         private void GetSAVOffsets()
         {
-            if (SM)
-            {
-                /* 00 */ Bag            = 0x00000;  // [DE0]    MyItem
-                /* 01 */ Trainer1       = 0x00E00;  // [07C]    Situation
-                /* 02 */            //  = 0x01000;  // [014]    RandomGroup
-                /* 03 */ TrainerCard    = 0x01200;  // [0C0]    MyStatus
-                /* 04 */ Party          = 0x01400;  // [61C]    PokePartySave
-                /* 05 */ EventConst     = 0x01C00;  // [E00]    EventWork
-                /* 06 */ PokeDex        = 0x02A00;  // [F78]    ZukanData
-                /* 07 */ GTS            = 0x03A00;  // [228]    GtsData
-                /* 08 */ Fused          = 0x03E00;  // [104]    UnionPokemon 
-                /* 09 */ Misc           = 0x04000;  // [200]    Misc
-                /* 10 */ Trainer2       = 0x04200;  // [020]    FieldMenu
-                /* 11 */ ConfigSave     = 0x04400;  // [004]    ConfigSave
-                /* 12 */ AdventureInfo  = 0x04600;  // [058]    GameTime
-                /* 13 */ PCLayout       = 0x04800;  // [5E6]    BOX
-                /* 14 */ Box            = 0x04E00;  // [36600]  BoxPokemon
-                /* 15 */ Resort         = 0x3B400;  // [572C]   ResortSave
-                /* 16 */ PlayTime       = 0x40C00;  // [008]    PlayTime
-                /* 17 */ Overworld      = 0x40E00;  // [1080]   FieldMoveModelSave
-                /* 18 */ Fashion        = 0x42000;  // [1A08]   Fashion
-                /* 19 */            //  = 0x43C00;  // [6408]   JoinFestaPersonalSave
-                /* 20 */            //  = 0x4A200;  // [6408]   JoinFestaPersonalSave
-                /* 21 */ JoinFestaData  = 0x50800;  // [3998]   JoinFestaDataSave
-                /* 22 */            //  = 0x54200;  // [100]    BerrySpot
-                /* 23 */            //  = 0x54400;  // [100]    FishingSpot
-                /* 24 */            //  = 0x54600;  // [10528]  LiveMatchData
-                /* 25 */            //  = 0x64C00;  // [204]    BattleSpotData
-                /* 26 */ PokeFinderSave = 0x65000;  // [B60]    PokeFinderSave
-                /* 27 */ WondercardFlags= 0x65C00;  // [3F50]   MysteryGiftSave
-                /* 28 */ Record         = 0x69C00;  // [358]    Record
-                /* 29 */            //  = 0x6A000;  // [728]    ValidationSave
-                /* 30 */            //  = 0x6A800;  // [200]    GameSyncSave
-                /* 31 */            //  = 0x6AA00;  // [718]    PokeDiarySave
-                /* 32 */ BattleTree     = 0x6B200;  // [1FC]    BattleInstSave
-                /* 33 */ Daycare        = 0x6B400;  // [200]    Sodateya
-                /* 34 */            //  = 0x6B600;  // [120]    WeatherSave
-                /* 35 */ QRSaveData     = 0x6B800;  // [1C8]    QRReaderSaveData
-                /* 36 */            //  = 0x6BA00;  // [200]    TurtleSalmonSave
-
-                EventFlag = EventConst + 0x7D0;
-
-                OFS_PouchHeldItem =     Bag + 0; // 430 (Case 0)
-                OFS_PouchKeyItem =      Bag + 0x6B8; // 184 (Case 4)
-                OFS_PouchTMHM =         Bag + 0x998; // 108 (Case 2)
-                OFS_PouchMedicine =     Bag + 0xB48; // 64 (Case 1)
-                OFS_PouchBerry =        Bag + 0xC48; // 72 (Case 3)
-                OFS_PouchZCrystals =    Bag + 0xD68; // 30 (Case 5)
-
-                PokeDexLanguageFlags =  PokeDex + 0x550;
-                WondercardData = WondercardFlags + 0x100;
-
-                BattleBoxFlags =        PCLayout + 0x4C4;
-                PCBackgrounds =         PCLayout + 0x5C0;
-                LastViewedBox =         PCLayout + 0x5E3;
-                PCFlags =               PCLayout + 0x5E0;
-
-                HoF = 0x25C0; // Inside EventWork (const/flag) block
-
-                FashionLength = 0x1A08;
-
-                TeamCount = 6;
-                LockedSlots = new int[6*TeamCount];
-                TeamSlots = new int[6*TeamCount];
-            }
-            else if (USUM)
-            {
-                // todo
-                TeamCount = 6;
-                LockedSlots = new int[6*TeamCount];
-                TeamSlots = new int[6*TeamCount];
-            }
-            else // Empty input
+            if (!Exportable) // Empty input
             {
                 Party = 0x0;
                 Box = Party + SIZE_PARTY * 6 + 0x1000;
+
+                PCLayout = Party + SIZE_PARTY * 6;
+                BattleBoxFlags = PCLayout + 0x4C4;
+                PCBackgrounds = PCLayout + 0x5C0;
+                LastViewedBox = PCLayout + 0x5E3;
+                PCFlags = PCLayout + 0x5E0;
+                return;
+            }
+
+            /* 00 */ Bag            = Blocks[00].Offset; // 0x00000  // [DE0]    MyItem
+            /* 01 */ Trainer1       = Blocks[01].Offset; // 0x00E00  // [07C]    Situation
+            /* 02 */            //  = Blocks[02].Offset; // 0x01000  // [014]    RandomGroup
+            /* 03 */ TrainerCard    = Blocks[03].Offset; // 0x01200  // [0C0]    MyStatus
+            /* 04 */ Party          = Blocks[04].Offset; // 0x01400  // [61C]    PokePartySave
+            /* 05 */ EventConst     = Blocks[05].Offset; // 0x01C00  // [E00]    EventWork
+            /* 06 */ PokeDex        = Blocks[06].Offset; // 0x02A00  // [F78]    ZukanData
+            /* 07 */ GTS            = Blocks[07].Offset; // 0x03A00  // [228]    GtsData
+            /* 08 */ Fused          = Blocks[08].Offset; // 0x03E00  // [104]    UnionPokemon 
+            /* 09 */ Misc           = Blocks[09].Offset; // 0x04000  // [200]    Misc
+            /* 10 */ Trainer2       = Blocks[10].Offset; // 0x04200  // [020]    FieldMenu
+            /* 11 */ ConfigSave     = Blocks[11].Offset; // 0x04400  // [004]    ConfigSave
+            /* 12 */ AdventureInfo  = Blocks[12].Offset; // 0x04600  // [058]    GameTime
+            /* 13 */ PCLayout       = Blocks[13].Offset; // 0x04800  // [5E6]    BOX
+            /* 14 */ Box            = Blocks[14].Offset; // 0x04E00  // [36600]  BoxPokemon
+            /* 15 */ Resort         = Blocks[15].Offset; // 0x3B400  // [572C]   ResortSave
+            /* 16 */ PlayTime       = Blocks[16].Offset; // 0x40C00  // [008]    PlayTime
+            /* 17 */ Overworld      = Blocks[17].Offset; // 0x40E00  // [1080]   FieldMoveModelSave
+            /* 18 */ Fashion        = Blocks[18].Offset; // 0x42000  // [1A08]   Fashion
+            /* 19 */            //  = Blocks[19].Offset; // 0x43C00  // [6408]   JoinFestaPersonalSave
+            /* 20 */            //  = Blocks[20].Offset; // 0x4A200  // [6408]   JoinFestaPersonalSave
+            /* 21 */ JoinFestaData  = Blocks[21].Offset; // 0x50800  // [3998]   JoinFestaDataSave
+            /* 22 */            //  = Blocks[22].Offset; // 0x54200  // [100]    BerrySpot
+            /* 23 */            //  = Blocks[23].Offset; // 0x54400  // [100]    FishingSpot
+            /* 24 */            //  = Blocks[24].Offset; // 0x54600  // [10528]  LiveMatchData
+            /* 25 */            //  = Blocks[25].Offset; // 0x64C00  // [204]    BattleSpotData
+            /* 26 */ PokeFinderSave = Blocks[26].Offset; // 0x65000  // [B60]    PokeFinderSave
+            /* 27 */ WondercardFlags= Blocks[27].Offset; // 0x65C00  // [3F50]   MysteryGiftSave
+            /* 28 */ Record         = Blocks[28].Offset; // 0x69C00  // [358]    Record
+            /* 29 */            //  = Blocks[29].Offset; // 0x6A000  // [728]    ValidationSave
+            /* 30 */            //  = Blocks[30].Offset; // 0x6A800  // [200]    GameSyncSave
+            /* 31 */            //  = Blocks[31].Offset; // 0x6AA00  // [718]    PokeDiarySave
+            /* 32 */ BattleTree     = Blocks[32].Offset; // 0x6B200  // [1FC]    BattleInstSave
+            /* 33 */ Daycare        = Blocks[33].Offset; // 0x6B400  // [200]    Sodateya
+            /* 34 */            //  = Blocks[34].Offset; // 0x6B600  // [120]    WeatherSave
+            /* 35 */ QRSaveData     = Blocks[35].Offset; // 0x6B800  // [1C8]    QRReaderSaveData
+            /* 36 */            //  = Blocks[36].Offset; // 0x6BA00  // [200]    TurtleSalmonSave
+
+            EventFlag = EventConst + 0x7D0;
+
+            OFS_PouchHeldItem =     Bag + 0; // 430 (Case 0)
+            OFS_PouchKeyItem =      Bag + 0x6B8; // 184 (Case 4)
+            OFS_PouchTMHM =         Bag + 0x998; // 108 (Case 2)
+            OFS_PouchMedicine =     Bag + 0xB48; // 64 (Case 1)
+            OFS_PouchBerry =        Bag + 0xC48; // 72 (Case 3)
+            OFS_PouchZCrystals =    Bag + 0xD68; // 30 (Case 5)
+
+            PokeDexLanguageFlags =  PokeDex + 0x550;
+            WondercardData = WondercardFlags + 0x100;
+
+            BattleBoxFlags =        PCLayout + 0x4C4;
+            PCBackgrounds =         PCLayout + 0x5C0;
+            LastViewedBox =         PCLayout + 0x5E3;
+            PCFlags =               PCLayout + 0x5E0;
+
+            HoF = 0x25C0; // Inside EventWork (const/flag) block
+
+            FashionLength = 0x1A08;
+
+            TeamCount = 6;
+            LockedSlots = new int[6*TeamCount];
+            TeamSlots = new int[6*TeamCount];
+            if (USUM)
+            {
+                // slight differences
+                /* 37 */            //  = Blocks[37].Offset;   BattleFesSave
+                /* 38 */            //  = Blocks[38].Offset;   FinderStudioSave
+
+                OFS_PouchHeldItem =     Bag + 0; // 427 (Case 0)
+                OFS_PouchKeyItem = OFS_PouchHeldItem + 4*427; // 198 (Case 4)
+                OFS_PouchTMHM = OFS_PouchKeyItem + 4*198; // 108 (Case 2)
+                OFS_PouchMedicine = OFS_PouchTMHM + 4*108; // 60 (Case 1)
+                OFS_PouchBerry = OFS_PouchMedicine + 4*60; // 67 (Case 3)
+                OFS_PouchZCrystals = OFS_PouchBerry + 4*67; // 35 (Case 5)
+                OFS_BattleItems = OFS_PouchZCrystals + 4*35; // 11 (Case 6)
             }
         }
 
@@ -331,6 +343,8 @@ public override GameVersion Version
                 {
                     case 30: return GameVersion.SN;
                     case 31: return GameVersion.MN;
+                    case 32: return GameVersion.US;
+                    case 33: return GameVersion.UM;
                 }
                 return GameVersion.Unknown;
             }
@@ -812,14 +826,27 @@ public override InventoryPouch[] Inventory
         {
             get
             {
-                InventoryPouch[] pouch =
+                InventoryPouch[] pouch;
+                if (SM)
+                pouch = new[]
                 {
                     new InventoryPouch(InventoryType.Medicine, Legal.Pouch_Medicine_SM, 999, OFS_PouchMedicine),
                     new InventoryPouch(InventoryType.Items, Legal.Pouch_Items_SM, 999, OFS_PouchHeldItem),
                     new InventoryPouch(InventoryType.TMHMs, Legal.Pouch_TMHM_SM, 1, OFS_PouchTMHM),
                     new InventoryPouch(InventoryType.Berries, Legal.Pouch_Berries_SM, 999, OFS_PouchBerry),
-                    new InventoryPouch(InventoryType.KeyItems, USUM ? Legal.Pouch_Key_USUM : Legal.Pouch_Key_SM, 1, OFS_PouchKeyItem),
-                    new InventoryPouch(InventoryType.ZCrystals, USUM ? Legal.Pouch_ZCrystal_USUM : Legal.Pouch_ZCrystal_SM, 1, OFS_PouchZCrystals),
+                    new InventoryPouch(InventoryType.KeyItems, Legal.Pouch_Key_SM, 1, OFS_PouchKeyItem),
+                    new InventoryPouch(InventoryType.ZCrystals, Legal.Pouch_ZCrystal_SM, 1, OFS_PouchZCrystals),
+                };
+                else // USUM
+                pouch = new[]
+                {
+                    new InventoryPouch(InventoryType.Medicine, Legal.Pouch_Medicine_SM, 999, OFS_PouchMedicine),
+                    new InventoryPouch(InventoryType.Items, Legal.Pouch_Items_SM, 999, OFS_PouchHeldItem),
+                    new InventoryPouch(InventoryType.TMHMs, Legal.Pouch_TMHM_SM, 1, OFS_PouchTMHM),
+                    new InventoryPouch(InventoryType.Berries, Legal.Pouch_Berries_SM, 999, OFS_PouchBerry),
+                    new InventoryPouch(InventoryType.KeyItems,  Legal.Pouch_Key_USUM, 1, OFS_PouchKeyItem),
+                    new InventoryPouch(InventoryType.ZCrystals, Legal.Pouch_ZCrystal_USUM, 1, OFS_PouchZCrystals),
+                    new InventoryPouch(InventoryType.BattleItems, Legal.Pouch_Roto_USUM, 999, OFS_BattleItems),
                 };
                 foreach (var p in pouch)
                     p.GetPouch7(ref Data);
diff --git a/PKHeX.Core/Saves/SaveUtil.cs b/PKHeX.Core/Saves/SaveUtil.cs
index 1b392a468..155f8d493 100644
--- a/PKHeX.Core/Saves/SaveUtil.cs
+++ b/PKHeX.Core/Saves/SaveUtil.cs
@@ -13,7 +13,7 @@ public static class SaveUtil
     {
         public const int BEEF = 0x42454546;
 
-        public const int SIZE_G7USUM = 999_999_999;
+        public const int SIZE_G7USUM = 0x6CC00;
         public const int SIZE_G7SM = 0x6BE00;
         public const int SIZE_G6XY = 0x65600;
         public const int SIZE_G6ORAS = 0x76000;
diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs
index 5825998ad..9577a1f4a 100644
--- a/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs	
+++ b/PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_Trainer7.Designer.cs	
@@ -104,6 +104,8 @@ private void InitializeComponent()
             this.L_SinglesC = new System.Windows.Forms.Label();
             this.TC_Editor = new System.Windows.Forms.TabControl();
             this.Tab_Overview = new System.Windows.Forms.TabPage();
+            this.CB_Vivillon = new System.Windows.Forms.ComboBox();
+            this.L_Vivillon = new System.Windows.Forms.Label();
             this.B_GenTID = new System.Windows.Forms.Button();
             this.L_G7TID = new System.Windows.Forms.Label();
             this.MT_G7TID = new System.Windows.Forms.MaskedTextBox();
@@ -164,6 +166,18 @@ private void InitializeComponent()
             this.NUD_RCStreak0 = new System.Windows.Forms.NumericUpDown();
             this.L_CStreak0 = new System.Windows.Forms.Label();
             this.Tab_Misc = new System.Windows.Forms.TabPage();
+            this.CHK_UnlockMega = new System.Windows.Forms.CheckBox();
+            this.L_BallThrowType = new System.Windows.Forms.Label();
+            this.CB_BallThrowType = new System.Windows.Forms.ComboBox();
+            this.CB_BallThrowTypeListMode = new System.Windows.Forms.ComboBox();
+            this.LB_BallThrowTypeUnlocked = new System.Windows.Forms.ListBox();
+            this.LB_BallThrowTypeLearned = new System.Windows.Forms.ListBox();
+            this.L_Stamps = new System.Windows.Forms.Label();
+            this.LB_Stamps = new System.Windows.Forms.ListBox();
+            this.L_DaysFromRefreshed = new System.Windows.Forms.Label();
+            this.NUD_DaysFromRefreshed = new System.Windows.Forms.NumericUpDown();
+            this.L_PlazaName = new System.Windows.Forms.Label();
+            this.TB_PlazaName = new System.Windows.Forms.TextBox();
             this.CB_Fashion = new System.Windows.Forms.ComboBox();
             this.L_SkinColor = new System.Windows.Forms.Label();
             this.CB_SkinColor = new System.Windows.Forms.ComboBox();
@@ -178,20 +192,6 @@ private void InitializeComponent()
             this.NUD_ThumbsTotal = new System.Windows.Forms.NumericUpDown();
             this.L_ThumbsTotal = new System.Windows.Forms.Label();
             this.B_Fashion = new System.Windows.Forms.Button();
-            this.TB_PlazaName = new System.Windows.Forms.TextBox();
-            this.L_PlazaName = new System.Windows.Forms.Label();
-            this.L_Vivillon = new System.Windows.Forms.Label();
-            this.CB_Vivillon = new System.Windows.Forms.ComboBox();
-            this.L_DaysFromRefreshed = new System.Windows.Forms.Label();
-            this.NUD_DaysFromRefreshed = new System.Windows.Forms.NumericUpDown();
-            this.L_BallThrowType = new System.Windows.Forms.Label();
-            this.CB_BallThrowType = new System.Windows.Forms.ComboBox();
-            this.CB_BallThrowTypeListMode = new System.Windows.Forms.ComboBox();
-            this.LB_BallThrowTypeUnlocked = new System.Windows.Forms.ListBox();
-            this.LB_BallThrowTypeLearned = new System.Windows.Forms.ListBox();
-            this.L_Stamps = new System.Windows.Forms.Label();
-            this.LB_Stamps = new System.Windows.Forms.ListBox();
-            this.CHK_UnlockMega = new System.Windows.Forms.CheckBox();
             this.TC_Editor.SuspendLayout();
             this.Tab_Overview.SuspendLayout();
             this.GB_Stats.SuspendLayout();
@@ -562,7 +562,9 @@ private void InitializeComponent()
             this.CB_Game.FormattingEnabled = true;
             this.CB_Game.Items.AddRange(new object[] {
             "Sun",
-            "Moon"});
+            "Moon",
+            "US",
+            "UM"});
             this.CB_Game.Location = new System.Drawing.Point(141, 51);
             this.CB_Game.Name = "CB_Game";
             this.CB_Game.Size = new System.Drawing.Size(51, 21);
@@ -869,6 +871,24 @@ private void InitializeComponent()
             this.Tab_Overview.Text = "Overview";
             this.Tab_Overview.UseVisualStyleBackColor = true;
             // 
+            // CB_Vivillon
+            // 
+            this.CB_Vivillon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CB_Vivillon.FormattingEnabled = true;
+            this.CB_Vivillon.Location = new System.Drawing.Point(85, 98);
+            this.CB_Vivillon.Name = "CB_Vivillon";
+            this.CB_Vivillon.Size = new System.Drawing.Size(93, 21);
+            this.CB_Vivillon.TabIndex = 65;
+            // 
+            // L_Vivillon
+            // 
+            this.L_Vivillon.Location = new System.Drawing.Point(-1, 101);
+            this.L_Vivillon.Name = "L_Vivillon";
+            this.L_Vivillon.Size = new System.Drawing.Size(80, 12);
+            this.L_Vivillon.TabIndex = 64;
+            this.L_Vivillon.Text = "Vivillon:";
+            this.L_Vivillon.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // B_GenTID
             // 
             this.B_GenTID.Location = new System.Drawing.Point(124, 75);
@@ -1346,7 +1366,7 @@ private void InitializeComponent()
             this.CHK_UnlockSuperMulti.AutoSize = true;
             this.CHK_UnlockSuperMulti.Location = new System.Drawing.Point(144, 18);
             this.CHK_UnlockSuperMulti.Name = "CHK_UnlockSuperMulti";
-            this.CHK_UnlockSuperMulti.Size = new System.Drawing.Size(49, 16);
+            this.CHK_UnlockSuperMulti.Size = new System.Drawing.Size(48, 17);
             this.CHK_UnlockSuperMulti.TabIndex = 2;
             this.CHK_UnlockSuperMulti.Text = "Multi";
             this.CHK_UnlockSuperMulti.UseVisualStyleBackColor = true;
@@ -1356,7 +1376,7 @@ private void InitializeComponent()
             this.CHK_UnlockSuperDoubles.AutoSize = true;
             this.CHK_UnlockSuperDoubles.Location = new System.Drawing.Point(73, 18);
             this.CHK_UnlockSuperDoubles.Name = "CHK_UnlockSuperDoubles";
-            this.CHK_UnlockSuperDoubles.Size = new System.Drawing.Size(65, 16);
+            this.CHK_UnlockSuperDoubles.Size = new System.Drawing.Size(65, 17);
             this.CHK_UnlockSuperDoubles.TabIndex = 1;
             this.CHK_UnlockSuperDoubles.Text = "Doubles";
             this.CHK_UnlockSuperDoubles.UseVisualStyleBackColor = true;
@@ -1366,7 +1386,7 @@ private void InitializeComponent()
             this.CHK_UnlockSuperSingles.AutoSize = true;
             this.CHK_UnlockSuperSingles.Location = new System.Drawing.Point(6, 18);
             this.CHK_UnlockSuperSingles.Name = "CHK_UnlockSuperSingles";
-            this.CHK_UnlockSuperSingles.Size = new System.Drawing.Size(61, 16);
+            this.CHK_UnlockSuperSingles.Size = new System.Drawing.Size(60, 17);
             this.CHK_UnlockSuperSingles.TabIndex = 0;
             this.CHK_UnlockSuperSingles.Text = "Singles";
             this.CHK_UnlockSuperSingles.UseVisualStyleBackColor = true;
@@ -1674,6 +1694,132 @@ private void InitializeComponent()
             this.Tab_Misc.Text = "Misc";
             this.Tab_Misc.UseVisualStyleBackColor = true;
             // 
+            // CHK_UnlockMega
+            // 
+            this.CHK_UnlockMega.AutoSize = true;
+            this.CHK_UnlockMega.Location = new System.Drawing.Point(6, 256);
+            this.CHK_UnlockMega.Name = "CHK_UnlockMega";
+            this.CHK_UnlockMega.Size = new System.Drawing.Size(90, 17);
+            this.CHK_UnlockMega.TabIndex = 72;
+            this.CHK_UnlockMega.Text = "Unlock Mega";
+            this.CHK_UnlockMega.UseVisualStyleBackColor = true;
+            // 
+            // L_BallThrowType
+            // 
+            this.L_BallThrowType.Location = new System.Drawing.Point(144, 50);
+            this.L_BallThrowType.Name = "L_BallThrowType";
+            this.L_BallThrowType.Size = new System.Drawing.Size(117, 20);
+            this.L_BallThrowType.TabIndex = 65;
+            this.L_BallThrowType.Text = "Ball Throw Type:";
+            this.L_BallThrowType.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // CB_BallThrowType
+            // 
+            this.CB_BallThrowType.FormattingEnabled = true;
+            this.CB_BallThrowType.Location = new System.Drawing.Point(267, 51);
+            this.CB_BallThrowType.Name = "CB_BallThrowType";
+            this.CB_BallThrowType.Size = new System.Drawing.Size(109, 21);
+            this.CB_BallThrowType.TabIndex = 66;
+            // 
+            // CB_BallThrowTypeListMode
+            // 
+            this.CB_BallThrowTypeListMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CB_BallThrowTypeListMode.FormattingEnabled = true;
+            this.CB_BallThrowTypeListMode.Items.AddRange(new object[] {
+            "unlocked list",
+            "learned list"});
+            this.CB_BallThrowTypeListMode.Location = new System.Drawing.Point(154, 76);
+            this.CB_BallThrowTypeListMode.Name = "CB_BallThrowTypeListMode";
+            this.CB_BallThrowTypeListMode.Size = new System.Drawing.Size(107, 21);
+            this.CB_BallThrowTypeListMode.TabIndex = 67;
+            this.CB_BallThrowTypeListMode.SelectedIndexChanged += new System.EventHandler(this.UpdateBattleStyle);
+            // 
+            // LB_BallThrowTypeUnlocked
+            // 
+            this.LB_BallThrowTypeUnlocked.FormattingEnabled = true;
+            this.LB_BallThrowTypeUnlocked.Location = new System.Drawing.Point(267, 74);
+            this.LB_BallThrowTypeUnlocked.Name = "LB_BallThrowTypeUnlocked";
+            this.LB_BallThrowTypeUnlocked.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+            this.LB_BallThrowTypeUnlocked.Size = new System.Drawing.Size(109, 43);
+            this.LB_BallThrowTypeUnlocked.TabIndex = 68;
+            this.LB_BallThrowTypeUnlocked.SelectedIndexChanged += new System.EventHandler(this.UpdateBallThrowTypeUnlocked);
+            // 
+            // LB_BallThrowTypeLearned
+            // 
+            this.LB_BallThrowTypeLearned.FormattingEnabled = true;
+            this.LB_BallThrowTypeLearned.Location = new System.Drawing.Point(267, 74);
+            this.LB_BallThrowTypeLearned.Name = "LB_BallThrowTypeLearned";
+            this.LB_BallThrowTypeLearned.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+            this.LB_BallThrowTypeLearned.Size = new System.Drawing.Size(109, 43);
+            this.LB_BallThrowTypeLearned.TabIndex = 69;
+            this.LB_BallThrowTypeLearned.Visible = false;
+            this.LB_BallThrowTypeLearned.SelectedIndexChanged += new System.EventHandler(this.UpdateBallThrowTypeLearned);
+            // 
+            // L_Stamps
+            // 
+            this.L_Stamps.AutoSize = true;
+            this.L_Stamps.Location = new System.Drawing.Point(214, 174);
+            this.L_Stamps.Name = "L_Stamps";
+            this.L_Stamps.Size = new System.Drawing.Size(45, 13);
+            this.L_Stamps.TabIndex = 70;
+            this.L_Stamps.Text = "Stamps:";
+            this.L_Stamps.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // LB_Stamps
+            // 
+            this.LB_Stamps.FormattingEnabled = true;
+            this.LB_Stamps.Location = new System.Drawing.Point(217, 194);
+            this.LB_Stamps.Name = "LB_Stamps";
+            this.LB_Stamps.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+            this.LB_Stamps.Size = new System.Drawing.Size(159, 43);
+            this.LB_Stamps.TabIndex = 71;
+            // 
+            // L_DaysFromRefreshed
+            // 
+            this.L_DaysFromRefreshed.Location = new System.Drawing.Point(144, 28);
+            this.L_DaysFromRefreshed.Name = "L_DaysFromRefreshed";
+            this.L_DaysFromRefreshed.Size = new System.Drawing.Size(117, 18);
+            this.L_DaysFromRefreshed.TabIndex = 63;
+            this.L_DaysFromRefreshed.Text = "Days from Refreshed:";
+            this.L_DaysFromRefreshed.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // NUD_DaysFromRefreshed
+            // 
+            this.NUD_DaysFromRefreshed.Location = new System.Drawing.Point(267, 30);
+            this.NUD_DaysFromRefreshed.Maximum = new decimal(new int[] {
+            255,
+            0,
+            0,
+            0});
+            this.NUD_DaysFromRefreshed.Name = "NUD_DaysFromRefreshed";
+            this.NUD_DaysFromRefreshed.Size = new System.Drawing.Size(42, 20);
+            this.NUD_DaysFromRefreshed.TabIndex = 64;
+            this.NUD_DaysFromRefreshed.Value = new decimal(new int[] {
+            255,
+            0,
+            0,
+            0});
+            // 
+            // L_PlazaName
+            // 
+            this.L_PlazaName.AutoSize = true;
+            this.L_PlazaName.Location = new System.Drawing.Point(214, 130);
+            this.L_PlazaName.Name = "L_PlazaName";
+            this.L_PlazaName.Size = new System.Drawing.Size(106, 13);
+            this.L_PlazaName.TabIndex = 62;
+            this.L_PlazaName.Text = "Festival Plaza Name:";
+            this.L_PlazaName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // TB_PlazaName
+            // 
+            this.TB_PlazaName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.TB_PlazaName.Location = new System.Drawing.Point(217, 150);
+            this.TB_PlazaName.MaxLength = 20;
+            this.TB_PlazaName.Name = "TB_PlazaName";
+            this.TB_PlazaName.Size = new System.Drawing.Size(159, 20);
+            this.TB_PlazaName.TabIndex = 61;
+            this.TB_PlazaName.Text = "WWWWWWWWWWWWWWWWWWWW";
+            // 
             // CB_Fashion
             // 
             this.CB_Fashion.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -1844,153 +1990,6 @@ private void InitializeComponent()
             this.B_Fashion.UseVisualStyleBackColor = true;
             this.B_Fashion.Click += new System.EventHandler(this.B_Fashion_Click);
             // 
-            // TB_PlazaName
-            // 
-            this.TB_PlazaName.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.TB_PlazaName.Location = new System.Drawing.Point(217, 150);
-            this.TB_PlazaName.MaxLength = 20;
-            this.TB_PlazaName.Name = "TB_PlazaName";
-            this.TB_PlazaName.Size = new System.Drawing.Size(159, 20);
-            this.TB_PlazaName.TabIndex = 61;
-            this.TB_PlazaName.Text = "WWWWWWWWWWWWWWWWWWWW";
-            // 
-            // L_PlazaName
-            // 
-            this.L_PlazaName.AutoSize = true;
-            this.L_PlazaName.Location = new System.Drawing.Point(214, 130);
-            this.L_PlazaName.Name = "L_PlazaName";
-            this.L_PlazaName.Size = new System.Drawing.Size(106, 13);
-            this.L_PlazaName.TabIndex = 62;
-            this.L_PlazaName.Text = "Festival Plaza Name:";
-            this.L_PlazaName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // L_Vivillon
-            // 
-            this.L_Vivillon.Location = new System.Drawing.Point(-1, 101);
-            this.L_Vivillon.Name = "L_Vivillon";
-            this.L_Vivillon.Size = new System.Drawing.Size(80, 12);
-            this.L_Vivillon.TabIndex = 64;
-            this.L_Vivillon.Text = "Vivillon:";
-            this.L_Vivillon.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // CB_Vivillon
-            // 
-            this.CB_Vivillon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.CB_Vivillon.FormattingEnabled = true;
-            this.CB_Vivillon.Location = new System.Drawing.Point(85, 98);
-            this.CB_Vivillon.Name = "CB_Vivillon";
-            this.CB_Vivillon.Size = new System.Drawing.Size(93, 20);
-            this.CB_Vivillon.TabIndex = 65;
-            // 
-            // L_DaysFromRefreshed
-            // 
-            this.L_DaysFromRefreshed.Location = new System.Drawing.Point(144, 28);
-            this.L_DaysFromRefreshed.Name = "L_DaysFromRefreshed";
-            this.L_DaysFromRefreshed.Size = new System.Drawing.Size(117, 18);
-            this.L_DaysFromRefreshed.TabIndex = 63;
-            this.L_DaysFromRefreshed.Text = "Days from Refreshed:";
-            this.L_DaysFromRefreshed.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // NUD_DaysFromRefreshed
-            // 
-            this.NUD_DaysFromRefreshed.Location = new System.Drawing.Point(267, 30);
-            this.NUD_DaysFromRefreshed.Maximum = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            this.NUD_DaysFromRefreshed.Name = "NUD_DaysFromRefreshed";
-            this.NUD_DaysFromRefreshed.Size = new System.Drawing.Size(42, 19);
-            this.NUD_DaysFromRefreshed.TabIndex = 64;
-            this.NUD_DaysFromRefreshed.Value = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            // 
-            // L_BallThrowType
-            // 
-            this.L_BallThrowType.Location = new System.Drawing.Point(144, 50);
-            this.L_BallThrowType.Name = "L_BallThrowType";
-            this.L_BallThrowType.Size = new System.Drawing.Size(117, 20);
-            this.L_BallThrowType.TabIndex = 65;
-            this.L_BallThrowType.Text = "Ball Throw Type:";
-            this.L_BallThrowType.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // CB_BallThrowType
-            // 
-            this.CB_BallThrowType.FormattingEnabled = true;
-            this.CB_BallThrowType.Location = new System.Drawing.Point(267, 51);
-            this.CB_BallThrowType.Name = "CB_BallThrowType";
-            this.CB_BallThrowType.Size = new System.Drawing.Size(109, 21);
-            this.CB_BallThrowType.TabIndex = 66;
-            // 
-            // CB_BallThrowTypeListMode
-            // 
-            this.CB_BallThrowTypeListMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.CB_BallThrowTypeListMode.FormattingEnabled = true;
-            this.CB_BallThrowTypeListMode.Items.AddRange(new object[] {
-            "unlocked list",
-            "learned list"});
-            this.CB_BallThrowTypeListMode.Location = new System.Drawing.Point(154, 76);
-            this.CB_BallThrowTypeListMode.Name = "CB_BallThrowTypeListMode";
-            this.CB_BallThrowTypeListMode.Size = new System.Drawing.Size(107, 21);
-            this.CB_BallThrowTypeListMode.TabIndex = 67;
-            this.CB_BallThrowTypeListMode.SelectedIndexChanged += new System.EventHandler(this.UpdateBattleStyle);
-            // 
-            // LB_BallThrowTypeUnlocked
-            // 
-            this.LB_BallThrowTypeUnlocked.FormattingEnabled = true;
-            this.LB_BallThrowTypeUnlocked.ItemHeight = 12;
-            this.LB_BallThrowTypeUnlocked.Location = new System.Drawing.Point(267, 74);
-            this.LB_BallThrowTypeUnlocked.Name = "LB_BallThrowTypeUnlocked";
-            this.LB_BallThrowTypeUnlocked.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
-            this.LB_BallThrowTypeUnlocked.Size = new System.Drawing.Size(109, 52);
-            this.LB_BallThrowTypeUnlocked.TabIndex = 68;
-            this.LB_BallThrowTypeUnlocked.SelectedIndexChanged += new System.EventHandler(this.UpdateBallThrowTypeUnlocked);
-            // 
-            // LB_BallThrowTypeLearned
-            // 
-            this.LB_BallThrowTypeLearned.FormattingEnabled = true;
-            this.LB_BallThrowTypeLearned.ItemHeight = 12;
-            this.LB_BallThrowTypeLearned.Location = new System.Drawing.Point(267, 74);
-            this.LB_BallThrowTypeLearned.Name = "LB_BallThrowTypeLearned";
-            this.LB_BallThrowTypeLearned.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
-            this.LB_BallThrowTypeLearned.Size = new System.Drawing.Size(109, 52);
-            this.LB_BallThrowTypeLearned.TabIndex = 69;
-            this.LB_BallThrowTypeLearned.Visible = false;
-            this.LB_BallThrowTypeLearned.SelectedIndexChanged += new System.EventHandler(this.UpdateBallThrowTypeLearned);
-            // 
-            // L_Stamps
-            // 
-            this.L_Stamps.AutoSize = true;
-            this.L_Stamps.Location = new System.Drawing.Point(214, 174);
-            this.L_Stamps.Name = "L_Stamps";
-            this.L_Stamps.Size = new System.Drawing.Size(45, 13);
-            this.L_Stamps.TabIndex = 70;
-            this.L_Stamps.Text = "Stamps:";
-            this.L_Stamps.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // LB_Stamps
-            // 
-            this.LB_Stamps.FormattingEnabled = true;
-            this.LB_Stamps.ItemHeight = 12;
-            this.LB_Stamps.Location = new System.Drawing.Point(217, 194);
-            this.LB_Stamps.Name = "LB_Stamps";
-            this.LB_Stamps.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
-            this.LB_Stamps.Size = new System.Drawing.Size(159, 52);
-            this.LB_Stamps.TabIndex = 71;
-            // 
-            // CHK_UnlockMega
-            // 
-            this.CHK_UnlockMega.AutoSize = true;
-            this.CHK_UnlockMega.Location = new System.Drawing.Point(6, 256);
-            this.CHK_UnlockMega.Name = "CHK_UnlockMega";
-            this.CHK_UnlockMega.Size = new System.Drawing.Size(90, 17);
-            this.CHK_UnlockMega.TabIndex = 72;
-            this.CHK_UnlockMega.Text = "Unlock Mega";
-            this.CHK_UnlockMega.UseVisualStyleBackColor = true;
-            // 
             // SAV_Trainer7
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);