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 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 57989e926..9c1235132 100644 Binary files a/PKHeX.Core/Resources/byte/personal_uu and b/PKHeX.Core/Resources/byte/personal_uu differ 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);