diff --git a/.gitignore b/.gitignore index 989d13bf1..2bd0a997b 100644 --- a/.gitignore +++ b/.gitignore @@ -241,3 +241,9 @@ pip-log.txt # Mr Developer .mr.developer.cfg + +################# +## MonoDevelop +################# + +*.userprefs \ No newline at end of file diff --git a/PKHeX/Legality/Checks.cs b/PKHeX/Legality/Checks.cs index 2903566c0..5c293e490 100644 --- a/PKHeX/Legality/Checks.cs +++ b/PKHeX/Legality/Checks.cs @@ -175,8 +175,10 @@ private LegalityCheck verifyEVs() { var evs = pk6.EVs; int sum = evs.Sum(); + if (pk6.IsEgg && sum > 0) + return new LegalityCheck(Severity.Invalid, "Eggs cannot receive EVs."); if (sum == 0 && pk6.Stat_Level - pk6.Met_Level > 0) - return new LegalityCheck(Severity.Fishy, "All EVs are zero, but leveled above Met Level"); + return new LegalityCheck(Severity.Fishy, "All EVs are zero, but leveled above Met Level."); if (sum == 508) return new LegalityCheck(Severity.Fishy, "2 EVs remaining."); if (sum > 510) @@ -349,6 +351,8 @@ private LegalityCheck verifyLevel() return new LegalityCheck(Severity.Invalid, "Met Level does not match Wonder Card level."); int lvl = pk6.CurrentLevel; + if (lvl > 1 && pk6.IsEgg) + return new LegalityCheck(Severity.Invalid, "Current level for an egg is invalid."); if (lvl < pk6.Met_Level) return new LegalityCheck(Severity.Invalid, "Current level is below met level."); if ((pk6.WasEgg || EncounterMatch == null) && !Legal.getEvolutionValid(pk6) && pk6.Species != 350) @@ -365,6 +369,28 @@ private LegalityCheck verifyRibbons() List missingRibbons = new List(); List invalidRibbons = new List(); + + if (pk6.IsEgg) + { + var RibbonNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "Ribbon"); + foreach (object RibbonValue in RibbonNames.Select(RibbonName => ReflectUtil.GetValue(pk6, RibbonName))) + { + if ((RibbonValue as int?) > 0) + return new LegalityCheck(Severity.Invalid, "Eggs should not have ribbons."); + if (RibbonValue as bool? == true) + return new LegalityCheck(Severity.Invalid, "Eggs should not have ribbons."); + } + + var DistNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "DistSuperTrain"); + if (DistNames.Select(MissionName => ReflectUtil.GetValue(pk6, MissionName)).Any(Flag => Flag as bool? == true)) + return new LegalityCheck(Severity.Invalid, "Distribution Super Training missions on Egg."); + + var TrainNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "SuperTrain"); + if (TrainNames.Select(MissionName => ReflectUtil.GetValue(pk6, MissionName)).Any(Flag => Flag as bool? == true)) + return new LegalityCheck(Severity.Fishy, "Super Training missions on Egg."); + + return new LegalityCheck(); + } // Check Event Ribbons bool[] EventRib = @@ -420,7 +446,13 @@ private LegalityCheck verifyRibbons() invalidRibbons.Add("Battle Memory"); // Gen3/4 Battle if (missingRibbons.Count + invalidRibbons.Count == 0) + { + var DistNames = ReflectUtil.getPropertiesStartWithPrefix(pk6.GetType(), "DistSuperTrain"); + if (DistNames.Select(MissionName => ReflectUtil.GetValue(pk6, MissionName)).Any(Flag => Flag as bool? == true)) + return new LegalityCheck(Severity.Fishy, "Distribution Super Training missions are not released."); + return new LegalityCheck(Severity.Valid, "All ribbons accounted for."); + } string[] result = new string[2]; if (missingRibbons.Count > 0) @@ -820,6 +852,14 @@ private LegalityCheck verifyForm() } private LegalityCheck verifyMisc() { + if (pk6.IsEgg) + { + if (new[] { pk6.Move1_PPUps, pk6.Move2_PPUps, pk6.Move3_PPUps, pk6.Move4_PPUps }.Any(ppup => ppup > 0)) + return new LegalityCheck(Severity.Invalid, "Cannot apply PP Ups to an Egg."); + if (pk6.CNTs.Any(stat => stat > 0)) + return new LegalityCheck(Severity.Invalid, "Cannot increase Contest Stats of an Egg."); + } + if (pk6.Gen6 && Encounter.Valid && EncounterType == typeof(WC6) ^ pk6.FatefulEncounter) { if (EncounterType == typeof(EncounterStatic) && pk6.Species == 386) // Deoxys Matched @ Sky Pillar diff --git a/PKHeX/Legality/Tables.cs b/PKHeX/Legality/Tables.cs index 6d9a2a1f6..5555397c7 100644 --- a/PKHeX/Legality/Tables.cs +++ b/PKHeX/Legality/Tables.cs @@ -840,6 +840,9 @@ public static partial class Legal }; internal static readonly int[] Ban_Gen3Ball = { + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 @@ -850,6 +853,9 @@ public static partial class Legal 152, 155, 158, //1 - Chikorita, Cyndaquil, Totodile 153, 156, 159, //2 154, 157, 160, //3 + 387, 390, 393, //1 - Turtwig, Chimchar, Piplup + 388, 391, 394, //2 + 389, 392, 395, //3 495, 498, 501, //1 - Snivy, Tepig, Oshawott 496, 499, 502, //2 497, 500, 503, //3 diff --git a/PKHeX/Legality/Tables1.cs b/PKHeX/Legality/Tables1.cs new file mode 100644 index 000000000..fb27c2f0b --- /dev/null +++ b/PKHeX/Legality/Tables1.cs @@ -0,0 +1,28 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_RBY = Enumerable.Range(0, 7) // 0-6 + .Concat(Enumerable.Range(10, 11)) // 10-20 + .Concat(Enumerable.Range(29, 15)) // 29-43 + .Concat(Enumerable.Range(45, 5)) // 45-49 + .Concat(Enumerable.Range(51, 8)) // 51-58 + .Concat(Enumerable.Range(60, 24)) // 60-83 + .Concat(Enumerable.Range(196, 54)) // 196-249 + .Select(i => (ushort)i).ToArray(); + + internal static readonly int[] MovePP_RBY = + { + 0, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 10, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/Legality/Tables2.cs b/PKHeX/Legality/Tables2.cs new file mode 100644 index 000000000..0b33cccea --- /dev/null +++ b/PKHeX/Legality/Tables2.cs @@ -0,0 +1,35 @@ +using System.Linq; + +namespace PKHeX +{ + public static partial class Legal + { + // PKHeX Valid Array Storage + internal static readonly ushort[] Pouch_Items_GSC = { + 3, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 51, 52, 53, 57, 60, 62, 63, 64, 65, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 117, 118, 119, 121, 122, 123, 124, 125, 126, 131, 132, 138, 139, 140, 143, 144, 146, 150, 151, 152, 156, 158, 163, 168, 169, 170, 172, 173, 174, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189 + }; + internal static readonly ushort[] Pouch_Ball_GSC = { + 1, 2, 4, 5, 157, 159, 160, 161, 164, 165, 166, 167 + }; + internal static readonly ushort[] Pouch_Key_GS = { + 7, 54, 55, 58, 59, 61, 66, 67, 68 , 69, 71, 127, 128, 130, 133, 134, 175, 178 + }; + internal static readonly ushort[] Pouch_Key_C = Pouch_Key_GS.Concat(new ushort[]{70, 115, 116, 129}).ToArray(); + internal static readonly ushort[] Pouch_TMHM_GSC = { + 191, 192, 193, 194, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249 + }; + + internal static readonly ushort[] HeldItems_GSC = new ushort[1].Concat(Pouch_Items_GSC).Concat(Pouch_Ball_GSC).Concat(Pouch_TMHM_GSC).ToArray(); + + internal static readonly int[] MovePP_GSC = + { + 00, + 35, 25, 10, 15, 20, 20, 15, 15, 15, 35, 30, 05, 10, 30, 30, 35, 35, 20, 15, 20, 20, 10, 20, 30, 05, 25, 15, 15, 15, 25, 20, 05, 35, 15, 20, 20, 20, 15, 30, 35, 20, 20, 30, 25, 40, 20, 15, 20, 20, 20, + 30, 25, 15, 30, 25, 05, 15, 10, 05, 20, 20, 20, 05, 35, 20, 25, 20, 20, 20, 15, 20, 10, 10, 40, 25, 10, 35, 30, 15, 20, 40, 10, 15, 30, 15, 20, 10, 15, 10, 05, 10, 10, 25, 10, 20, 40, 30, 30, 20, 20, + 15, 10, 40, 15, 20, 30, 20, 20, 10, 40, 40, 30, 30, 30, 20, 30, 10, 10, 20, 05, 10, 30, 20, 20, 20, 05, 15, 10, 20, 15, 15, 35, 20, 15, 10, 20, 30, 15, 40, 20, 15, 10, 05, 10, 30, 10, 15, 20, 15, 40, + 40, 10, 05, 15, 10, 10, 10, 15, 30, 30, 10, 10, 20, 10, 01, 01, 10, 10, 10, 05, 15, 25, 15, 10, 15, 30, 05, 40, 15, 10, 25, 10, 30, 10, 20, 10, 10, 10, 10, 10, 20, 05, 40, 05, 05, 15, 05, 10, 05, 15, + 10, 05, 10, 20, 20, 40, 15, 10, 20, 20, 25, 05, 15, 10, 05, 20, 15, 20, 25, 20, 05, 30, 05, 10, 20, 40, 05, 20, 40, 20, 15, 35, 10, 05, 05, 05, 15, 05, 20, 05, 05, 15, 20, 10, 05, 05, 15, 15, 15, 15, + 10, 00, 00, 00, 00 + }; + } +} diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs index d94fa86f3..41d5b0c59 100644 --- a/PKHeX/Legality/Tables3.cs +++ b/PKHeX/Legality/Tables3.cs @@ -7,7 +7,7 @@ public static partial class Legal // PKHeX Valid Array Storage #region RS internal static readonly ushort[] Pouch_Items_RS = { - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 83, 84, 85, 86, 93, 94, 95, 96, 97, 98, 103, 104, 106, 107, 108, 109, 110, 111, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 254, 255, 256, 257, 258 }; internal static readonly ushort[] Pouch_Key_RS = { 259, 260, 261, 262, 263, 264, 265, 266, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288 diff --git a/PKHeX/MainWindow/Main.Designer.cs b/PKHeX/MainWindow/Main.Designer.cs index 91aaf0b79..0bddf33c2 100644 --- a/PKHeX/MainWindow/Main.Designer.cs +++ b/PKHeX/MainWindow/Main.Designer.cs @@ -33,101 +33,118 @@ public void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); this.tabMain = new System.Windows.Forms.TabControl(); this.Tab_Main = new System.Windows.Forms.TabPage(); - this.CB_Language = new System.Windows.Forms.ComboBox(); - this.MT_Form = new System.Windows.Forms.MaskedTextBox(); - this.CB_Ability = new System.Windows.Forms.ComboBox(); + this.FLP_Main = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PID = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_PIDLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PID = new System.Windows.Forms.Label(); + this.BTN_Shinytize = new System.Windows.Forms.Button(); + this.Label_IsShiny = new System.Windows.Forms.PictureBox(); + this.FLP_PIDRight = new System.Windows.Forms.FlowLayoutPanel(); this.TB_PID = new System.Windows.Forms.TextBox(); - this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); this.Label_Gender = new System.Windows.Forms.Label(); - this.CB_Form = new System.Windows.Forms.ComboBox(); - this.CHK_Cured = new System.Windows.Forms.CheckBox(); - this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.BTN_RerollPID = new System.Windows.Forms.Button(); + this.FLP_Species = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Species = new System.Windows.Forms.Label(); + this.CB_Species = new System.Windows.Forms.ComboBox(); + this.FLP_Nickname = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_NicknameLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Nicknamed = new System.Windows.Forms.CheckBox(); + this.TB_Nickname = new System.Windows.Forms.TextBox(); + this.FLP_EXPLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EXP = new System.Windows.Forms.Label(); + this.FLP_EXPLevelRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); + this.Label_CurLevel = new System.Windows.Forms.Label(); + this.TB_Level = new System.Windows.Forms.MaskedTextBox(); + this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Nature = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Nature = new System.Windows.Forms.Label(); + this.CB_Nature = new System.Windows.Forms.ComboBox(); + this.FLP_HeldItem = new System.Windows.Forms.FlowLayoutPanel(); this.Label_HeldItem = new System.Windows.Forms.Label(); this.CB_HeldItem = new System.Windows.Forms.ComboBox(); - this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); - this.TB_Level = new System.Windows.Forms.MaskedTextBox(); - this.TB_EXP = new System.Windows.Forms.MaskedTextBox(); - this.BTN_RerollPID = new System.Windows.Forms.Button(); - this.CB_3DSReg = new System.Windows.Forms.ComboBox(); - this.CB_SubRegion = new System.Windows.Forms.ComboBox(); - this.CB_Country = new System.Windows.Forms.ComboBox(); - this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); - this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); - this.CB_Nature = new System.Windows.Forms.ComboBox(); - this.Label_3DSRegion = new System.Windows.Forms.Label(); - this.Label_SubRegion = new System.Windows.Forms.Label(); - this.Label_Country = new System.Windows.Forms.Label(); - this.Label_PKRSdays = new System.Windows.Forms.Label(); - this.Label_PKRS = new System.Windows.Forms.Label(); - this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); - this.Label_Language = new System.Windows.Forms.Label(); - this.Label_Form = new System.Windows.Forms.Label(); - this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_FriendshipForm = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_FriendshipFormLeft = new System.Windows.Forms.FlowLayoutPanel(); this.Label_Friendship = new System.Windows.Forms.Label(); - this.Label_Nature = new System.Windows.Forms.Label(); - this.Label_CurLevel = new System.Windows.Forms.Label(); - this.TB_Nickname = new System.Windows.Forms.TextBox(); - this.CB_Species = new System.Windows.Forms.ComboBox(); - this.Label_EXP = new System.Windows.Forms.Label(); - this.Label_Species = new System.Windows.Forms.Label(); this.Label_HatchCounter = new System.Windows.Forms.Label(); - this.Label_IsShiny = new System.Windows.Forms.PictureBox(); - this.BTN_Shinytize = new System.Windows.Forms.Button(); - this.Label_PID = new System.Windows.Forms.Label(); - this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); - this.MT_Level = new System.Windows.Forms.MaskedTextBox(); + this.FLP_FriendshipFormRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_Friendship = new System.Windows.Forms.MaskedTextBox(); + this.Label_Form = new System.Windows.Forms.Label(); + this.CB_Form = new System.Windows.Forms.ComboBox(); + this.MT_Form = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Ability = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ability = new System.Windows.Forms.Label(); + this.FLP_AbilityRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_Ability = new System.Windows.Forms.ComboBox(); this.DEV_Ability = new System.Windows.Forms.ComboBox(); + this.TB_AbilityNumber = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Language = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Language = new System.Windows.Forms.Label(); + this.CB_Language = new System.Windows.Forms.ComboBox(); + this.FLP_EggPKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_EggPKRSLeft = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_IsEgg = new System.Windows.Forms.CheckBox(); + this.FLP_EggPKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_Infected = new System.Windows.Forms.CheckBox(); + this.CHK_Cured = new System.Windows.Forms.CheckBox(); + this.FLP_PKRS = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_PKRS = new System.Windows.Forms.Label(); + this.FLP_PKRSRight = new System.Windows.Forms.FlowLayoutPanel(); + this.CB_PKRSStrain = new System.Windows.Forms.ComboBox(); + this.Label_PKRSdays = new System.Windows.Forms.Label(); + this.CB_PKRSDays = new System.Windows.Forms.ComboBox(); + this.FLP_Country = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Country = new System.Windows.Forms.Label(); + this.CB_Country = new System.Windows.Forms.ComboBox(); + this.FLP_SubRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SubRegion = new System.Windows.Forms.Label(); + this.CB_SubRegion = new System.Windows.Forms.ComboBox(); + this.FLP_3DSRegion = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_3DSRegion = new System.Windows.Forms.Label(); + this.CB_3DSReg = new System.Windows.Forms.ComboBox(); + this.FLP_NSparkle = new System.Windows.Forms.FlowLayoutPanel(); + this.L_NSparkle = new System.Windows.Forms.Label(); + this.CHK_NSparkle = new System.Windows.Forms.CheckBox(); this.Tab_Met = new System.Windows.Forms.TabPage(); this.CHK_AsEgg = new System.Windows.Forms.CheckBox(); - this.CHK_Fateful = new System.Windows.Forms.CheckBox(); this.GB_EggConditions = new System.Windows.Forms.GroupBox(); this.CB_EggLocation = new System.Windows.Forms.ComboBox(); this.CAL_EggDate = new System.Windows.Forms.DateTimePicker(); this.Label_EggDate = new System.Windows.Forms.Label(); this.Label_EggLocation = new System.Windows.Forms.Label(); - this.Label_EncounterType = new System.Windows.Forms.Label(); - this.Label_MetDate = new System.Windows.Forms.Label(); - this.Label_MetLevel = new System.Windows.Forms.Label(); - this.Label_Ball = new System.Windows.Forms.Label(); - this.Label_MetLocation = new System.Windows.Forms.Label(); + this.FLP_Met = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_OriginGame = new System.Windows.Forms.FlowLayoutPanel(); this.Label_OriginGame = new System.Windows.Forms.Label(); this.CB_GameOrigin = new System.Windows.Forms.ComboBox(); + this.FLP_MetLocation = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLocation = new System.Windows.Forms.Label(); this.CB_MetLocation = new System.Windows.Forms.ComboBox(); + this.FLP_Ball = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Ball = new System.Windows.Forms.Label(); this.CB_Ball = new System.Windows.Forms.ComboBox(); + this.FLP_MetLevel = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetLevel = new System.Windows.Forms.Label(); this.TB_MetLevel = new System.Windows.Forms.MaskedTextBox(); + this.FLP_MetDate = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_MetDate = new System.Windows.Forms.Label(); this.CAL_MetDate = new System.Windows.Forms.DateTimePicker(); + this.FLP_Fateful = new System.Windows.Forms.FlowLayoutPanel(); + this.PAN_Fateful = new System.Windows.Forms.Panel(); + this.CHK_Fateful = new System.Windows.Forms.CheckBox(); + this.FLP_EncounterType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_EncounterType = new System.Windows.Forms.Label(); this.CB_EncounterType = new System.Windows.Forms.ComboBox(); + this.FLP_TimeOfDay = new System.Windows.Forms.FlowLayoutPanel(); + this.L_MetTimeOfDay = new System.Windows.Forms.Label(); + this.CB_MetTimeOfDay = new System.Windows.Forms.ComboBox(); this.Tab_Stats = new System.Windows.Forms.TabPage(); - this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); - this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); - this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); - this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); - this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); - this.CB_HPType = new System.Windows.Forms.ComboBox(); - this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); - this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); - this.L_Potential = new System.Windows.Forms.Label(); - this.TB_IVTotal = new System.Windows.Forms.TextBox(); - this.L_Characteristic = new System.Windows.Forms.Label(); + this.PAN_Contest = new System.Windows.Forms.Panel(); this.TB_Sheen = new System.Windows.Forms.MaskedTextBox(); this.TB_Tough = new System.Windows.Forms.MaskedTextBox(); this.TB_Smart = new System.Windows.Forms.MaskedTextBox(); this.TB_Cute = new System.Windows.Forms.MaskedTextBox(); this.TB_Beauty = new System.Windows.Forms.MaskedTextBox(); this.TB_Cool = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); - this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); - this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); this.Label_Sheen = new System.Windows.Forms.Label(); this.Label_Tough = new System.Windows.Forms.Label(); this.Label_Smart = new System.Windows.Forms.Label(); @@ -135,20 +152,66 @@ public void InitializeComponent() this.Label_Beauty = new System.Windows.Forms.Label(); this.Label_Cool = new System.Windows.Forms.Label(); this.Label_ContestStats = new System.Windows.Forms.Label(); + this.FLP_Stats = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_StatHeader = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel(); + this.CHK_HackedStats = new System.Windows.Forms.CheckBox(); + this.FLP_StatsHeaderRight = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_IVs = new System.Windows.Forms.Label(); + this.Label_EVs = new System.Windows.Forms.Label(); + this.Label_Stats = new System.Windows.Forms.Label(); + this.FLP_HP = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_HP = new System.Windows.Forms.Label(); + this.FLP_HPRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_HPIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_HPEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_HP = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Atk = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_ATK = new System.Windows.Forms.Label(); + this.FLP_AtkRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_ATKIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_ATKEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_ATK = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Def = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_DEF = new System.Windows.Forms.Label(); + this.FLP_DefRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_DEFIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_DEFEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_DEF = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpA = new System.Windows.Forms.FlowLayoutPanel(); + this.FLP_SpALeft = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPA = new System.Windows.Forms.Label(); + this.Label_SPC = new System.Windows.Forms.Label(); + this.FLP_SpARight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPAIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPAEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPA = new System.Windows.Forms.MaskedTextBox(); + this.FLP_SpD = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPD = new System.Windows.Forms.Label(); + this.FLP_SpDRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPDIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPDEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPD = new System.Windows.Forms.MaskedTextBox(); + this.FLP_Spe = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_SPE = new System.Windows.Forms.Label(); + this.FLP_SpeRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_SPEIV = new System.Windows.Forms.MaskedTextBox(); + this.TB_SPEEV = new System.Windows.Forms.MaskedTextBox(); + this.Stat_SPE = new System.Windows.Forms.MaskedTextBox(); + this.FLP_StatsTotal = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_Total = new System.Windows.Forms.Label(); + this.FLP_StatsTotalRight = new System.Windows.Forms.FlowLayoutPanel(); + this.TB_IVTotal = new System.Windows.Forms.TextBox(); + this.TB_EVTotal = new System.Windows.Forms.TextBox(); + this.L_Potential = new System.Windows.Forms.Label(); + this.FLP_HPType = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); + this.CB_HPType = new System.Windows.Forms.ComboBox(); + this.FLP_Characteristic = new System.Windows.Forms.FlowLayoutPanel(); + this.Label_CharacteristicPrefix = new System.Windows.Forms.Label(); + this.L_Characteristic = new System.Windows.Forms.Label(); this.BTN_RandomEVs = new System.Windows.Forms.Button(); this.BTN_RandomIVs = new System.Windows.Forms.Button(); - this.Label_HiddenPowerPrefix = new System.Windows.Forms.Label(); - this.Label_Stats = new System.Windows.Forms.Label(); - this.Label_EVs = new System.Windows.Forms.Label(); - this.Label_IVs = new System.Windows.Forms.Label(); - this.Label_Total = new System.Windows.Forms.Label(); - this.Label_SPE = new System.Windows.Forms.Label(); - this.Label_SPD = new System.Windows.Forms.Label(); - this.Label_SPA = new System.Windows.Forms.Label(); - this.Label_DEF = new System.Windows.Forms.Label(); - this.Label_ATK = new System.Windows.Forms.Label(); - this.Label_HP = new System.Windows.Forms.Label(); - this.TB_EVTotal = new System.Windows.Forms.TextBox(); this.Tab_Attacks = new System.Windows.Forms.TabPage(); this.PB_WarnMove4 = new System.Windows.Forms.PictureBox(); this.PB_WarnMove3 = new System.Windows.Forms.PictureBox(); @@ -233,6 +296,7 @@ public void InitializeComponent() this.Menu_DumpBoxes = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Report = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Database = new System.Windows.Forms.ToolStripMenuItem(); + this.Menu_MGDatabase = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_BatchEditor = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_Other = new System.Windows.Forms.ToolStripMenuItem(); this.Menu_OpenSDF = new System.Windows.Forms.ToolStripMenuItem(); @@ -347,9 +411,9 @@ public void InitializeComponent() this.B_OpenOPowers = new System.Windows.Forms.Button(); this.B_OpenEventFlags = new System.Windows.Forms.Button(); this.B_OpenPokedex = new System.Windows.Forms.Button(); - this.B_LinkInfo = new System.Windows.Forms.Button(); + this.B_OpenLinkInfo = new System.Windows.Forms.Button(); this.B_OpenBerryField = new System.Windows.Forms.Button(); - this.B_Pokeblocks = new System.Windows.Forms.Button(); + this.B_OpenPokeblocks = new System.Windows.Forms.Button(); this.B_OpenSecretBase = new System.Windows.Forms.Button(); this.B_OpenPokepuffs = new System.Windows.Forms.Button(); this.B_OpenSuperTraining = new System.Windows.Forms.Button(); @@ -365,10 +429,67 @@ public void InitializeComponent() this.L_UpdateAvailable = new System.Windows.Forms.LinkLabel(); this.tabMain.SuspendLayout(); this.Tab_Main.SuspendLayout(); + this.FLP_Main.SuspendLayout(); + this.FLP_PID.SuspendLayout(); + this.FLP_PIDLeft.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).BeginInit(); + this.FLP_PIDRight.SuspendLayout(); + this.FLP_Species.SuspendLayout(); + this.FLP_Nickname.SuspendLayout(); + this.FLP_NicknameLeft.SuspendLayout(); + this.FLP_EXPLevel.SuspendLayout(); + this.FLP_EXPLevelRight.SuspendLayout(); + this.FLP_Nature.SuspendLayout(); + this.FLP_HeldItem.SuspendLayout(); + this.FLP_FriendshipForm.SuspendLayout(); + this.FLP_FriendshipFormLeft.SuspendLayout(); + this.FLP_FriendshipFormRight.SuspendLayout(); + this.FLP_Ability.SuspendLayout(); + this.FLP_AbilityRight.SuspendLayout(); + this.FLP_Language.SuspendLayout(); + this.FLP_EggPKRS.SuspendLayout(); + this.FLP_EggPKRSLeft.SuspendLayout(); + this.FLP_EggPKRSRight.SuspendLayout(); + this.FLP_PKRS.SuspendLayout(); + this.FLP_PKRSRight.SuspendLayout(); + this.FLP_Country.SuspendLayout(); + this.FLP_SubRegion.SuspendLayout(); + this.FLP_3DSRegion.SuspendLayout(); + this.FLP_NSparkle.SuspendLayout(); this.Tab_Met.SuspendLayout(); this.GB_EggConditions.SuspendLayout(); + this.FLP_Met.SuspendLayout(); + this.FLP_OriginGame.SuspendLayout(); + this.FLP_MetLocation.SuspendLayout(); + this.FLP_Ball.SuspendLayout(); + this.FLP_MetLevel.SuspendLayout(); + this.FLP_MetDate.SuspendLayout(); + this.FLP_Fateful.SuspendLayout(); + this.FLP_EncounterType.SuspendLayout(); + this.FLP_TimeOfDay.SuspendLayout(); this.Tab_Stats.SuspendLayout(); + this.PAN_Contest.SuspendLayout(); + this.FLP_Stats.SuspendLayout(); + this.FLP_StatHeader.SuspendLayout(); + this.FLP_HackedStats.SuspendLayout(); + this.FLP_StatsHeaderRight.SuspendLayout(); + this.FLP_HP.SuspendLayout(); + this.FLP_HPRight.SuspendLayout(); + this.FLP_Atk.SuspendLayout(); + this.FLP_AtkRight.SuspendLayout(); + this.FLP_Def.SuspendLayout(); + this.FLP_DefRight.SuspendLayout(); + this.FLP_SpA.SuspendLayout(); + this.FLP_SpALeft.SuspendLayout(); + this.FLP_SpARight.SuspendLayout(); + this.FLP_SpD.SuspendLayout(); + this.FLP_SpDRight.SuspendLayout(); + this.FLP_Spe.SuspendLayout(); + this.FLP_SpeRight.SuspendLayout(); + this.FLP_StatsTotal.SuspendLayout(); + this.FLP_StatsTotalRight.SuspendLayout(); + this.FLP_HPType.SuspendLayout(); + this.FLP_Characteristic.SuspendLayout(); this.Tab_Attacks.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).BeginInit(); @@ -486,50 +607,7 @@ public void InitializeComponent() // Tab_Main // this.Tab_Main.AllowDrop = true; - this.Tab_Main.Controls.Add(this.CB_Language); - this.Tab_Main.Controls.Add(this.MT_Form); - this.Tab_Main.Controls.Add(this.CB_Ability); - this.Tab_Main.Controls.Add(this.TB_PID); - this.Tab_Main.Controls.Add(this.CHK_Nicknamed); - this.Tab_Main.Controls.Add(this.Label_Gender); - this.Tab_Main.Controls.Add(this.CB_Form); - this.Tab_Main.Controls.Add(this.CHK_Cured); - this.Tab_Main.Controls.Add(this.CHK_Infected); - this.Tab_Main.Controls.Add(this.Label_HeldItem); - this.Tab_Main.Controls.Add(this.CB_HeldItem); - this.Tab_Main.Controls.Add(this.TB_Friendship); - this.Tab_Main.Controls.Add(this.TB_Level); - this.Tab_Main.Controls.Add(this.TB_EXP); - this.Tab_Main.Controls.Add(this.BTN_RerollPID); - this.Tab_Main.Controls.Add(this.CB_3DSReg); - this.Tab_Main.Controls.Add(this.CB_SubRegion); - this.Tab_Main.Controls.Add(this.CB_Country); - this.Tab_Main.Controls.Add(this.CB_PKRSDays); - this.Tab_Main.Controls.Add(this.CB_PKRSStrain); - this.Tab_Main.Controls.Add(this.CB_Nature); - this.Tab_Main.Controls.Add(this.Label_3DSRegion); - this.Tab_Main.Controls.Add(this.Label_SubRegion); - this.Tab_Main.Controls.Add(this.Label_Country); - this.Tab_Main.Controls.Add(this.Label_PKRSdays); - this.Tab_Main.Controls.Add(this.Label_PKRS); - this.Tab_Main.Controls.Add(this.CHK_IsEgg); - this.Tab_Main.Controls.Add(this.Label_Language); - this.Tab_Main.Controls.Add(this.Label_Form); - this.Tab_Main.Controls.Add(this.Label_Ability); - this.Tab_Main.Controls.Add(this.Label_Friendship); - this.Tab_Main.Controls.Add(this.Label_Nature); - this.Tab_Main.Controls.Add(this.Label_CurLevel); - this.Tab_Main.Controls.Add(this.TB_Nickname); - this.Tab_Main.Controls.Add(this.CB_Species); - this.Tab_Main.Controls.Add(this.Label_EXP); - this.Tab_Main.Controls.Add(this.Label_Species); - this.Tab_Main.Controls.Add(this.Label_HatchCounter); - this.Tab_Main.Controls.Add(this.Label_IsShiny); - this.Tab_Main.Controls.Add(this.BTN_Shinytize); - this.Tab_Main.Controls.Add(this.Label_PID); - this.Tab_Main.Controls.Add(this.TB_AbilityNumber); - this.Tab_Main.Controls.Add(this.MT_Level); - this.Tab_Main.Controls.Add(this.DEV_Ability); + this.Tab_Main.Controls.Add(this.FLP_Main); this.Tab_Main.Location = new System.Drawing.Point(4, 22); this.Tab_Main.Name = "Tab_Main"; this.Tab_Main.Padding = new System.Windows.Forms.Padding(3); @@ -538,48 +616,109 @@ public void InitializeComponent() this.Tab_Main.Text = "Main"; this.Tab_Main.UseVisualStyleBackColor = true; // - // CB_Language + // FLP_Main // - this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Language.FormattingEnabled = true; - this.CB_Language.Location = new System.Drawing.Point(105, 174); - this.CB_Language.Name = "CB_Language"; - this.CB_Language.Size = new System.Drawing.Size(122, 21); - this.CB_Language.TabIndex = 15; - this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + this.FLP_Main.Controls.Add(this.FLP_PID); + this.FLP_Main.Controls.Add(this.FLP_Species); + this.FLP_Main.Controls.Add(this.FLP_Nickname); + this.FLP_Main.Controls.Add(this.FLP_EXPLevel); + this.FLP_Main.Controls.Add(this.FLP_Nature); + this.FLP_Main.Controls.Add(this.FLP_HeldItem); + this.FLP_Main.Controls.Add(this.FLP_FriendshipForm); + this.FLP_Main.Controls.Add(this.FLP_Ability); + this.FLP_Main.Controls.Add(this.FLP_Language); + this.FLP_Main.Controls.Add(this.FLP_EggPKRS); + this.FLP_Main.Controls.Add(this.FLP_PKRS); + this.FLP_Main.Controls.Add(this.FLP_Country); + this.FLP_Main.Controls.Add(this.FLP_SubRegion); + this.FLP_Main.Controls.Add(this.FLP_3DSRegion); + this.FLP_Main.Controls.Add(this.FLP_NSparkle); + this.FLP_Main.Location = new System.Drawing.Point(0, 2); + this.FLP_Main.Name = "FLP_Main"; + this.FLP_Main.Size = new System.Drawing.Size(272, 322); + this.FLP_Main.TabIndex = 103; // - // MT_Form + // FLP_PID // - this.MT_Form.Enabled = false; - this.MT_Form.Location = new System.Drawing.Point(229, 133); - this.MT_Form.Mask = "00"; - this.MT_Form.Name = "MT_Form"; - this.MT_Form.Size = new System.Drawing.Size(19, 20); - this.MT_Form.TabIndex = 18; - this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.MT_Form.Visible = false; - this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); + this.FLP_PID.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PID.Controls.Add(this.FLP_PIDLeft); + this.FLP_PID.Controls.Add(this.FLP_PIDRight); + this.FLP_PID.Location = new System.Drawing.Point(0, 0); + this.FLP_PID.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PID.Name = "FLP_PID"; + this.FLP_PID.Size = new System.Drawing.Size(272, 22); + this.FLP_PID.TabIndex = 0; // - // CB_Ability + // FLP_PIDLeft // - this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Ability.FormattingEnabled = true; - this.CB_Ability.Items.AddRange(new object[] { - "Item"}); - this.CB_Ability.Location = new System.Drawing.Point(105, 153); - this.CB_Ability.Name = "CB_Ability"; - this.CB_Ability.Size = new System.Drawing.Size(122, 21); - this.CB_Ability.TabIndex = 13; - this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_PIDLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_PIDLeft.Controls.Add(this.Label_PID); + this.FLP_PIDLeft.Controls.Add(this.BTN_Shinytize); + this.FLP_PIDLeft.Controls.Add(this.Label_IsShiny); + this.FLP_PIDLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_PIDLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_PIDLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDLeft.Name = "FLP_PIDLeft"; + this.FLP_PIDLeft.Size = new System.Drawing.Size(110, 22); + this.FLP_PIDLeft.TabIndex = 0; + // + // Label_PID + // + this.Label_PID.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_PID.AutoSize = true; + this.Label_PID.Location = new System.Drawing.Point(82, 5); + this.Label_PID.Margin = new System.Windows.Forms.Padding(0, 5, 0, 4); + this.Label_PID.Name = "Label_PID"; + this.Label_PID.Size = new System.Drawing.Size(28, 13); + this.Label_PID.TabIndex = 0; + this.Label_PID.Text = "PID:"; + this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // BTN_Shinytize + // + this.BTN_Shinytize.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.BTN_Shinytize.Location = new System.Drawing.Point(58, 0); + this.BTN_Shinytize.Margin = new System.Windows.Forms.Padding(0); + this.BTN_Shinytize.Name = "BTN_Shinytize"; + this.BTN_Shinytize.Size = new System.Drawing.Size(24, 22); + this.BTN_Shinytize.TabIndex = 1; + this.BTN_Shinytize.Text = "☆"; + this.BTN_Shinytize.UseVisualStyleBackColor = true; + this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); + // + // Label_IsShiny + // + this.Label_IsShiny.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); + this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); + this.Label_IsShiny.Location = new System.Drawing.Point(36, 2); + this.Label_IsShiny.Margin = new System.Windows.Forms.Padding(0, 2, 2, 0); + this.Label_IsShiny.Name = "Label_IsShiny"; + this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); + this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.Label_IsShiny.TabIndex = 62; + this.Label_IsShiny.TabStop = false; + this.Label_IsShiny.Visible = false; + // + // FLP_PIDRight + // + this.FLP_PIDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PIDRight.Controls.Add(this.TB_PID); + this.FLP_PIDRight.Controls.Add(this.Label_Gender); + this.FLP_PIDRight.Controls.Add(this.BTN_RerollPID); + this.FLP_PIDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PIDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PIDRight.Name = "FLP_PIDRight"; + this.FLP_PIDRight.Size = new System.Drawing.Size(162, 22); + this.FLP_PIDRight.TabIndex = 104; // // TB_PID // + this.TB_PID.Anchor = System.Windows.Forms.AnchorStyles.Left; this.TB_PID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_PID.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_PID.Location = new System.Drawing.Point(105, 7); + this.TB_PID.Location = new System.Drawing.Point(0, 1); + this.TB_PID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); this.TB_PID.MaxLength = 8; this.TB_PID.Name = "TB_PID"; this.TB_PID.Size = new System.Drawing.Size(60, 20); @@ -588,69 +727,253 @@ public void InitializeComponent() this.TB_PID.TextChanged += new System.EventHandler(this.update_ID); this.TB_PID.MouseHover += new System.EventHandler(this.updateTSV); // - // CHK_Nicknamed - // - this.CHK_Nicknamed.Location = new System.Drawing.Point(25, 51); - this.CHK_Nicknamed.Name = "CHK_Nicknamed"; - this.CHK_Nicknamed.Size = new System.Drawing.Size(80, 17); - this.CHK_Nicknamed.TabIndex = 4; - this.CHK_Nicknamed.Text = "Nickname:"; - this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Nicknamed.UseVisualStyleBackColor = true; - this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); - // // Label_Gender // + this.Label_Gender.Anchor = System.Windows.Forms.AnchorStyles.Left; this.Label_Gender.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label_Gender.Location = new System.Drawing.Point(170, 10); + this.Label_Gender.Location = new System.Drawing.Point(60, 0); + this.Label_Gender.Margin = new System.Windows.Forms.Padding(0); this.Label_Gender.Name = "Label_Gender"; - this.Label_Gender.Size = new System.Drawing.Size(16, 13); + this.Label_Gender.Size = new System.Drawing.Size(19, 21); this.Label_Gender.TabIndex = 55; this.Label_Gender.Text = "-"; this.Label_Gender.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.Label_Gender.Click += new System.EventHandler(this.clickGender); // - // CB_Form + // BTN_RerollPID // - this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_Form.DropDownWidth = 85; - this.CB_Form.Enabled = false; - this.CB_Form.FormattingEnabled = true; - this.CB_Form.Location = new System.Drawing.Point(158, 132); - this.CB_Form.Name = "CB_Form"; - this.CB_Form.Size = new System.Drawing.Size(69, 21); - this.CB_Form.TabIndex = 12; - this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); + this.BTN_RerollPID.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.BTN_RerollPID.Location = new System.Drawing.Point(79, 1); + this.BTN_RerollPID.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0); + this.BTN_RerollPID.Name = "BTN_RerollPID"; + this.BTN_RerollPID.Size = new System.Drawing.Size(47, 20); + this.BTN_RerollPID.TabIndex = 1; + this.BTN_RerollPID.Text = "Reroll"; + this.BTN_RerollPID.UseVisualStyleBackColor = true; + this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); // - // CHK_Cured + // FLP_Species // - this.CHK_Cured.AutoSize = true; - this.CHK_Cured.Location = new System.Drawing.Point(179, 196); - this.CHK_Cured.Name = "CHK_Cured"; - this.CHK_Cured.Size = new System.Drawing.Size(54, 17); - this.CHK_Cured.TabIndex = 18; - this.CHK_Cured.Text = "Cured"; - this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Cured.UseVisualStyleBackColor = true; - this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + this.FLP_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Species.Controls.Add(this.Label_Species); + this.FLP_Species.Controls.Add(this.CB_Species); + this.FLP_Species.Location = new System.Drawing.Point(0, 22); + this.FLP_Species.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Species.Name = "FLP_Species"; + this.FLP_Species.Size = new System.Drawing.Size(272, 21); + this.FLP_Species.TabIndex = 1; // - // CHK_Infected + // Label_Species // - this.CHK_Infected.AutoSize = true; - this.CHK_Infected.Location = new System.Drawing.Point(105, 196); - this.CHK_Infected.Name = "CHK_Infected"; - this.CHK_Infected.Size = new System.Drawing.Size(65, 17); - this.CHK_Infected.TabIndex = 17; - this.CHK_Infected.Text = "Infected"; - this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_Infected.UseVisualStyleBackColor = true; - this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + this.Label_Species.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_Species.Location = new System.Drawing.Point(0, 0); + this.Label_Species.Margin = new System.Windows.Forms.Padding(0); + this.Label_Species.Name = "Label_Species"; + this.Label_Species.Size = new System.Drawing.Size(110, 21); + this.Label_Species.TabIndex = 1; + this.Label_Species.Text = "Species:"; + this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Species.Click += new System.EventHandler(this.updateNickname); + // + // CB_Species + // + this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Species.FormattingEnabled = true; + this.CB_Species.Location = new System.Drawing.Point(110, 0); + this.CB_Species.Margin = new System.Windows.Forms.Padding(0); + this.CB_Species.Name = "CB_Species"; + this.CB_Species.Size = new System.Drawing.Size(126, 21); + this.CB_Species.TabIndex = 3; + this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); + this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_Nickname + // + this.FLP_Nickname.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nickname.Controls.Add(this.FLP_NicknameLeft); + this.FLP_Nickname.Controls.Add(this.TB_Nickname); + this.FLP_Nickname.Location = new System.Drawing.Point(0, 43); + this.FLP_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nickname.Name = "FLP_Nickname"; + this.FLP_Nickname.Size = new System.Drawing.Size(272, 22); + this.FLP_Nickname.TabIndex = 2; + // + // FLP_NicknameLeft + // + this.FLP_NicknameLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_NicknameLeft.Controls.Add(this.CHK_Nicknamed); + this.FLP_NicknameLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_NicknameLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_NicknameLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NicknameLeft.Name = "FLP_NicknameLeft"; + this.FLP_NicknameLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_NicknameLeft.TabIndex = 109; + // + // CHK_Nicknamed + // + this.CHK_Nicknamed.AutoSize = true; + this.CHK_Nicknamed.Location = new System.Drawing.Point(36, 3); + this.CHK_Nicknamed.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Nicknamed.Name = "CHK_Nicknamed"; + this.CHK_Nicknamed.Size = new System.Drawing.Size(74, 17); + this.CHK_Nicknamed.TabIndex = 4; + this.CHK_Nicknamed.Text = "Nickname"; + this.CHK_Nicknamed.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Nicknamed.UseVisualStyleBackColor = true; + this.CHK_Nicknamed.CheckedChanged += new System.EventHandler(this.updateNickname); + // + // TB_Nickname + // + this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Nickname.Location = new System.Drawing.Point(110, 0); + this.TB_Nickname.Margin = new System.Windows.Forms.Padding(0); + this.TB_Nickname.MaxLength = 12; + this.TB_Nickname.Name = "TB_Nickname"; + this.TB_Nickname.Size = new System.Drawing.Size(126, 20); + this.TB_Nickname.TabIndex = 5; + this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); + this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + // + // FLP_EXPLevel + // + this.FLP_EXPLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EXPLevel.Controls.Add(this.Label_EXP); + this.FLP_EXPLevel.Controls.Add(this.FLP_EXPLevelRight); + this.FLP_EXPLevel.Location = new System.Drawing.Point(0, 65); + this.FLP_EXPLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevel.Name = "FLP_EXPLevel"; + this.FLP_EXPLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_EXPLevel.TabIndex = 3; + // + // Label_EXP + // + this.Label_EXP.Location = new System.Drawing.Point(0, 0); + this.Label_EXP.Margin = new System.Windows.Forms.Padding(0); + this.Label_EXP.Name = "Label_EXP"; + this.Label_EXP.Size = new System.Drawing.Size(110, 21); + this.Label_EXP.TabIndex = 3; + this.Label_EXP.Text = "EXP:"; + this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_EXPLevelRight + // + this.FLP_EXPLevelRight.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.FLP_EXPLevelRight.Controls.Add(this.TB_EXP); + this.FLP_EXPLevelRight.Controls.Add(this.Label_CurLevel); + this.FLP_EXPLevelRight.Controls.Add(this.TB_Level); + this.FLP_EXPLevelRight.Controls.Add(this.MT_Level); + this.FLP_EXPLevelRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EXPLevelRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EXPLevelRight.Name = "FLP_EXPLevelRight"; + this.FLP_EXPLevelRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EXPLevelRight.TabIndex = 0; + // + // TB_EXP + // + this.TB_EXP.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EXP.Location = new System.Drawing.Point(0, 0); + this.TB_EXP.Margin = new System.Windows.Forms.Padding(0); + this.TB_EXP.Mask = "0000000"; + this.TB_EXP.Name = "TB_EXP"; + this.TB_EXP.Size = new System.Drawing.Size(46, 20); + this.TB_EXP.TabIndex = 7; + this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // Label_CurLevel + // + this.Label_CurLevel.Location = new System.Drawing.Point(46, 0); + this.Label_CurLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_CurLevel.Name = "Label_CurLevel"; + this.Label_CurLevel.Size = new System.Drawing.Size(58, 21); + this.Label_CurLevel.TabIndex = 7; + this.Label_CurLevel.Text = "Level:"; + this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // TB_Level + // + this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Level.Location = new System.Drawing.Point(104, 0); + this.TB_Level.Margin = new System.Windows.Forms.Padding(0); + this.TB_Level.Mask = "000"; + this.TB_Level.Name = "TB_Level"; + this.TB_Level.Size = new System.Drawing.Size(22, 20); + this.TB_Level.TabIndex = 8; + this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // MT_Level + // + this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.MT_Level.Enabled = false; + this.MT_Level.Location = new System.Drawing.Point(126, 0); + this.MT_Level.Margin = new System.Windows.Forms.Padding(0); + this.MT_Level.Mask = "000"; + this.MT_Level.Name = "MT_Level"; + this.MT_Level.Size = new System.Drawing.Size(22, 20); + this.MT_Level.TabIndex = 17; + this.MT_Level.Visible = false; + this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + // + // FLP_Nature + // + this.FLP_Nature.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Nature.Controls.Add(this.Label_Nature); + this.FLP_Nature.Controls.Add(this.CB_Nature); + this.FLP_Nature.Location = new System.Drawing.Point(0, 86); + this.FLP_Nature.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Nature.Name = "FLP_Nature"; + this.FLP_Nature.Size = new System.Drawing.Size(272, 21); + this.FLP_Nature.TabIndex = 4; + // + // Label_Nature + // + this.Label_Nature.Location = new System.Drawing.Point(0, 0); + this.Label_Nature.Margin = new System.Windows.Forms.Padding(0); + this.Label_Nature.Name = "Label_Nature"; + this.Label_Nature.Size = new System.Drawing.Size(110, 21); + this.Label_Nature.TabIndex = 8; + this.Label_Nature.Text = "Nature:"; + this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Nature + // + this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Nature.FormattingEnabled = true; + this.CB_Nature.Location = new System.Drawing.Point(110, 0); + this.CB_Nature.Margin = new System.Windows.Forms.Padding(0); + this.CB_Nature.Name = "CB_Nature"; + this.CB_Nature.Size = new System.Drawing.Size(126, 21); + this.CB_Nature.TabIndex = 9; + this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); + this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // FLP_HeldItem + // + this.FLP_HeldItem.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HeldItem.Controls.Add(this.Label_HeldItem); + this.FLP_HeldItem.Controls.Add(this.CB_HeldItem); + this.FLP_HeldItem.Location = new System.Drawing.Point(0, 107); + this.FLP_HeldItem.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HeldItem.Name = "FLP_HeldItem"; + this.FLP_HeldItem.Size = new System.Drawing.Size(272, 21); + this.FLP_HeldItem.TabIndex = 5; // // Label_HeldItem // - this.Label_HeldItem.Location = new System.Drawing.Point(25, 114); + this.Label_HeldItem.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.Label_HeldItem.Location = new System.Drawing.Point(0, 0); + this.Label_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.Label_HeldItem.Name = "Label_HeldItem"; - this.Label_HeldItem.Size = new System.Drawing.Size(77, 13); + this.Label_HeldItem.Size = new System.Drawing.Size(110, 21); this.Label_HeldItem.TabIndex = 51; this.Label_HeldItem.Text = "Held Item:"; this.Label_HeldItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -660,18 +983,77 @@ public void InitializeComponent() this.CB_HeldItem.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_HeldItem.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_HeldItem.FormattingEnabled = true; - this.CB_HeldItem.Location = new System.Drawing.Point(105, 111); + this.CB_HeldItem.Location = new System.Drawing.Point(110, 0); + this.CB_HeldItem.Margin = new System.Windows.Forms.Padding(0); this.CB_HeldItem.Name = "CB_HeldItem"; - this.CB_HeldItem.Size = new System.Drawing.Size(122, 21); + this.CB_HeldItem.Size = new System.Drawing.Size(126, 21); this.CB_HeldItem.TabIndex = 10; this.CB_HeldItem.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_HeldItem.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_HeldItem.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_FriendshipForm + // + this.FLP_FriendshipForm.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormLeft); + this.FLP_FriendshipForm.Controls.Add(this.FLP_FriendshipFormRight); + this.FLP_FriendshipForm.Location = new System.Drawing.Point(0, 128); + this.FLP_FriendshipForm.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipForm.Name = "FLP_FriendshipForm"; + this.FLP_FriendshipForm.Size = new System.Drawing.Size(272, 21); + this.FLP_FriendshipForm.TabIndex = 6; + // + // FLP_FriendshipFormLeft + // + this.FLP_FriendshipFormLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_Friendship); + this.FLP_FriendshipFormLeft.Controls.Add(this.Label_HatchCounter); + this.FLP_FriendshipFormLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_FriendshipFormLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_FriendshipFormLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormLeft.Name = "FLP_FriendshipFormLeft"; + this.FLP_FriendshipFormLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_FriendshipFormLeft.TabIndex = 0; + // + // Label_Friendship + // + this.Label_Friendship.Location = new System.Drawing.Point(0, 0); + this.Label_Friendship.Margin = new System.Windows.Forms.Padding(0); + this.Label_Friendship.Name = "Label_Friendship"; + this.Label_Friendship.Size = new System.Drawing.Size(110, 21); + this.Label_Friendship.TabIndex = 9; + this.Label_Friendship.Text = "Friendship:"; + this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + // + // Label_HatchCounter + // + this.Label_HatchCounter.Location = new System.Drawing.Point(0, 21); + this.Label_HatchCounter.Margin = new System.Windows.Forms.Padding(0); + this.Label_HatchCounter.Name = "Label_HatchCounter"; + this.Label_HatchCounter.Size = new System.Drawing.Size(110, 21); + this.Label_HatchCounter.TabIndex = 61; + this.Label_HatchCounter.Text = "Hatch Counter:"; + this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_FriendshipFormRight + // + this.FLP_FriendshipFormRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_FriendshipFormRight.Controls.Add(this.TB_Friendship); + this.FLP_FriendshipFormRight.Controls.Add(this.Label_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.CB_Form); + this.FLP_FriendshipFormRight.Controls.Add(this.MT_Form); + this.FLP_FriendshipFormRight.Location = new System.Drawing.Point(110, 0); + this.FLP_FriendshipFormRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_FriendshipFormRight.Name = "FLP_FriendshipFormRight"; + this.FLP_FriendshipFormRight.Size = new System.Drawing.Size(162, 21); + this.FLP_FriendshipFormRight.TabIndex = 104; + // // TB_Friendship // this.TB_Friendship.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Friendship.Location = new System.Drawing.Point(105, 133); + this.TB_Friendship.Location = new System.Drawing.Point(0, 0); + this.TB_Friendship.Margin = new System.Windows.Forms.Padding(0); this.TB_Friendship.Mask = "000"; this.TB_Friendship.Name = "TB_Friendship"; this.TB_Friendship.Size = new System.Drawing.Size(22, 20); @@ -679,86 +1061,258 @@ public void InitializeComponent() this.TB_Friendship.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_Friendship.TextChanged += new System.EventHandler(this.update255_MTB); // - // TB_Level + // Label_Form // - this.TB_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Level.Location = new System.Drawing.Point(205, 70); - this.TB_Level.Mask = "000"; - this.TB_Level.Name = "TB_Level"; - this.TB_Level.Size = new System.Drawing.Size(22, 20); - this.TB_Level.TabIndex = 8; - this.TB_Level.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.Label_Form.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.Label_Form.AutoSize = true; + this.Label_Form.Location = new System.Drawing.Point(22, 4); + this.Label_Form.Margin = new System.Windows.Forms.Padding(0); + this.Label_Form.Name = "Label_Form"; + this.Label_Form.Size = new System.Drawing.Size(33, 13); + this.Label_Form.TabIndex = 11; + this.Label_Form.Text = "Form:"; + this.Label_Form.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // TB_EXP + // CB_Form // - this.TB_EXP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EXP.Location = new System.Drawing.Point(105, 70); - this.TB_EXP.Mask = "0000000"; - this.TB_EXP.Name = "TB_EXP"; - this.TB_EXP.Size = new System.Drawing.Size(46, 20); - this.TB_EXP.TabIndex = 7; - this.TB_EXP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_EXP.TextChanged += new System.EventHandler(this.updateEXPLevel); + this.CB_Form.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Form.DropDownWidth = 85; + this.CB_Form.Enabled = false; + this.CB_Form.FormattingEnabled = true; + this.CB_Form.Location = new System.Drawing.Point(55, 0); + this.CB_Form.Margin = new System.Windows.Forms.Padding(0); + this.CB_Form.Name = "CB_Form"; + this.CB_Form.Size = new System.Drawing.Size(71, 21); + this.CB_Form.TabIndex = 12; + this.CB_Form.SelectedIndexChanged += new System.EventHandler(this.updateForm); // - // BTN_RerollPID + // MT_Form // - this.BTN_RerollPID.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.BTN_RerollPID.Location = new System.Drawing.Point(188, 7); - this.BTN_RerollPID.Name = "BTN_RerollPID"; - this.BTN_RerollPID.Size = new System.Drawing.Size(40, 20); - this.BTN_RerollPID.TabIndex = 1; - this.BTN_RerollPID.Text = "Reroll"; - this.BTN_RerollPID.UseVisualStyleBackColor = true; - this.BTN_RerollPID.Click += new System.EventHandler(this.updateRandomPID); + this.MT_Form.Enabled = false; + this.MT_Form.Location = new System.Drawing.Point(126, 0); + this.MT_Form.Margin = new System.Windows.Forms.Padding(0); + this.MT_Form.Mask = "00"; + this.MT_Form.Name = "MT_Form"; + this.MT_Form.Size = new System.Drawing.Size(19, 20); + this.MT_Form.TabIndex = 18; + this.MT_Form.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.MT_Form.Visible = false; + this.MT_Form.TextChanged += new System.EventHandler(this.updateHaXForm); // - // CB_3DSReg + // FLP_Ability // - this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_3DSReg.FormattingEnabled = true; - this.CB_3DSReg.Location = new System.Drawing.Point(105, 276); - this.CB_3DSReg.Name = "CB_3DSReg"; - this.CB_3DSReg.Size = new System.Drawing.Size(122, 21); - this.CB_3DSReg.TabIndex = 23; + this.FLP_Ability.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ability.Controls.Add(this.Label_Ability); + this.FLP_Ability.Controls.Add(this.FLP_AbilityRight); + this.FLP_Ability.Location = new System.Drawing.Point(0, 149); + this.FLP_Ability.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ability.Name = "FLP_Ability"; + this.FLP_Ability.Size = new System.Drawing.Size(272, 21); + this.FLP_Ability.TabIndex = 7; // - // CB_SubRegion + // Label_Ability // - this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_SubRegion.DropDownWidth = 180; - this.CB_SubRegion.FormattingEnabled = true; - this.CB_SubRegion.Location = new System.Drawing.Point(105, 256); - this.CB_SubRegion.Name = "CB_SubRegion"; - this.CB_SubRegion.Size = new System.Drawing.Size(122, 21); - this.CB_SubRegion.TabIndex = 22; - this.CB_SubRegion.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_SubRegion.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_SubRegion.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.Label_Ability.Location = new System.Drawing.Point(0, 0); + this.Label_Ability.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ability.Name = "Label_Ability"; + this.Label_Ability.Size = new System.Drawing.Size(110, 21); + this.Label_Ability.TabIndex = 10; + this.Label_Ability.Text = "Ability:"; + this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Country + // FLP_AbilityRight // - this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Country.DropDownWidth = 180; - this.CB_Country.FormattingEnabled = true; - this.CB_Country.Location = new System.Drawing.Point(105, 236); - this.CB_Country.Name = "CB_Country"; - this.CB_Country.Size = new System.Drawing.Size(122, 21); - this.CB_Country.TabIndex = 21; - this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); - this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.FLP_AbilityRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AbilityRight.Controls.Add(this.CB_Ability); + this.FLP_AbilityRight.Controls.Add(this.DEV_Ability); + this.FLP_AbilityRight.Controls.Add(this.TB_AbilityNumber); + this.FLP_AbilityRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AbilityRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AbilityRight.Name = "FLP_AbilityRight"; + this.FLP_AbilityRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AbilityRight.TabIndex = 109; // - // CB_PKRSDays + // CB_Ability // - this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.CB_PKRSDays.FormattingEnabled = true; - this.CB_PKRSDays.Location = new System.Drawing.Point(197, 213); - this.CB_PKRSDays.Name = "CB_PKRSDays"; - this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); - this.CB_PKRSDays.TabIndex = 20; - this.CB_PKRSDays.Visible = false; - this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); + this.CB_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Ability.FormattingEnabled = true; + this.CB_Ability.Items.AddRange(new object[] { + "Item"}); + this.CB_Ability.Location = new System.Drawing.Point(0, 0); + this.CB_Ability.Margin = new System.Windows.Forms.Padding(0); + this.CB_Ability.Name = "CB_Ability"; + this.CB_Ability.Size = new System.Drawing.Size(126, 21); + this.CB_Ability.TabIndex = 13; + this.CB_Ability.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); + this.CB_Ability.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Ability.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + // + // DEV_Ability + // + this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.DEV_Ability.Enabled = false; + this.DEV_Ability.FormattingEnabled = true; + this.DEV_Ability.Items.AddRange(new object[] { + "Item"}); + this.DEV_Ability.Location = new System.Drawing.Point(0, 21); + this.DEV_Ability.Margin = new System.Windows.Forms.Padding(0); + this.DEV_Ability.Name = "DEV_Ability"; + this.DEV_Ability.Size = new System.Drawing.Size(126, 21); + this.DEV_Ability.TabIndex = 14; + this.DEV_Ability.Visible = false; + // + // TB_AbilityNumber + // + this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_AbilityNumber.Location = new System.Drawing.Point(126, 21); + this.TB_AbilityNumber.Margin = new System.Windows.Forms.Padding(0); + this.TB_AbilityNumber.Mask = "0"; + this.TB_AbilityNumber.Name = "TB_AbilityNumber"; + this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); + this.TB_AbilityNumber.TabIndex = 14; + this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_AbilityNumber.Visible = false; + // + // FLP_Language + // + this.FLP_Language.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Language.Controls.Add(this.Label_Language); + this.FLP_Language.Controls.Add(this.CB_Language); + this.FLP_Language.Location = new System.Drawing.Point(0, 170); + this.FLP_Language.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Language.Name = "FLP_Language"; + this.FLP_Language.Size = new System.Drawing.Size(272, 21); + this.FLP_Language.TabIndex = 8; + // + // Label_Language + // + this.Label_Language.Location = new System.Drawing.Point(0, 0); + this.Label_Language.Margin = new System.Windows.Forms.Padding(0); + this.Label_Language.Name = "Label_Language"; + this.Label_Language.Size = new System.Drawing.Size(110, 21); + this.Label_Language.TabIndex = 12; + this.Label_Language.Text = "Language:"; + this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_Language + // + this.CB_Language.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.CB_Language.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_Language.FormattingEnabled = true; + this.CB_Language.Location = new System.Drawing.Point(110, 0); + this.CB_Language.Margin = new System.Windows.Forms.Padding(0); + this.CB_Language.Name = "CB_Language"; + this.CB_Language.Size = new System.Drawing.Size(126, 21); + this.CB_Language.TabIndex = 15; + this.CB_Language.SelectedIndexChanged += new System.EventHandler(this.updateNickname); + // + // FLP_EggPKRS + // + this.FLP_EggPKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSLeft); + this.FLP_EggPKRS.Controls.Add(this.FLP_EggPKRSRight); + this.FLP_EggPKRS.Location = new System.Drawing.Point(0, 191); + this.FLP_EggPKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRS.Name = "FLP_EggPKRS"; + this.FLP_EggPKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_EggPKRS.TabIndex = 9; + // + // FLP_EggPKRSLeft + // + this.FLP_EggPKRSLeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_EggPKRSLeft.Controls.Add(this.CHK_IsEgg); + this.FLP_EggPKRSLeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_EggPKRSLeft.Location = new System.Drawing.Point(0, 0); + this.FLP_EggPKRSLeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSLeft.Name = "FLP_EggPKRSLeft"; + this.FLP_EggPKRSLeft.Size = new System.Drawing.Size(110, 21); + this.FLP_EggPKRSLeft.TabIndex = 0; + // + // CHK_IsEgg + // + this.CHK_IsEgg.AutoSize = true; + this.CHK_IsEgg.Location = new System.Drawing.Point(54, 3); + this.CHK_IsEgg.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_IsEgg.Name = "CHK_IsEgg"; + this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); + this.CHK_IsEgg.TabIndex = 16; + this.CHK_IsEgg.Text = "Is Egg"; + this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_IsEgg.UseVisualStyleBackColor = true; + this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + // + // FLP_EggPKRSRight + // + this.FLP_EggPKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Infected); + this.FLP_EggPKRSRight.Controls.Add(this.CHK_Cured); + this.FLP_EggPKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_EggPKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EggPKRSRight.Name = "FLP_EggPKRSRight"; + this.FLP_EggPKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_EggPKRSRight.TabIndex = 104; + // + // CHK_Infected + // + this.CHK_Infected.AutoSize = true; + this.CHK_Infected.Location = new System.Drawing.Point(0, 3); + this.CHK_Infected.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Infected.Name = "CHK_Infected"; + this.CHK_Infected.Size = new System.Drawing.Size(65, 17); + this.CHK_Infected.TabIndex = 17; + this.CHK_Infected.Text = "Infected"; + this.CHK_Infected.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Infected.UseVisualStyleBackColor = true; + this.CHK_Infected.CheckedChanged += new System.EventHandler(this.updatePKRSInfected); + // + // CHK_Cured + // + this.CHK_Cured.AutoSize = true; + this.CHK_Cured.Location = new System.Drawing.Point(65, 3); + this.CHK_Cured.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Cured.Name = "CHK_Cured"; + this.CHK_Cured.Size = new System.Drawing.Size(54, 17); + this.CHK_Cured.TabIndex = 18; + this.CHK_Cured.Text = "Cured"; + this.CHK_Cured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_Cured.UseVisualStyleBackColor = true; + this.CHK_Cured.CheckedChanged += new System.EventHandler(this.updatePKRSCured); + // + // FLP_PKRS + // + this.FLP_PKRS.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRS.Controls.Add(this.Label_PKRS); + this.FLP_PKRS.Controls.Add(this.FLP_PKRSRight); + this.FLP_PKRS.Location = new System.Drawing.Point(0, 212); + this.FLP_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRS.Name = "FLP_PKRS"; + this.FLP_PKRS.Size = new System.Drawing.Size(272, 21); + this.FLP_PKRS.TabIndex = 10; + // + // Label_PKRS + // + this.Label_PKRS.Location = new System.Drawing.Point(0, 0); + this.Label_PKRS.Margin = new System.Windows.Forms.Padding(0); + this.Label_PKRS.Name = "Label_PKRS"; + this.Label_PKRS.Size = new System.Drawing.Size(110, 21); + this.Label_PKRS.TabIndex = 14; + this.Label_PKRS.Text = "PkRs:"; + this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_PKRS.Visible = false; + // + // FLP_PKRSRight + // + this.FLP_PKRSRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSStrain); + this.FLP_PKRSRight.Controls.Add(this.Label_PKRSdays); + this.FLP_PKRSRight.Controls.Add(this.CB_PKRSDays); + this.FLP_PKRSRight.Location = new System.Drawing.Point(110, 0); + this.FLP_PKRSRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_PKRSRight.Name = "FLP_PKRSRight"; + this.FLP_PKRSRight.Size = new System.Drawing.Size(162, 21); + this.FLP_PKRSRight.TabIndex = 105; // // CB_PKRSStrain // @@ -781,282 +1335,176 @@ public void InitializeComponent() "13", "14", "15"}); - this.CB_PKRSStrain.Location = new System.Drawing.Point(135, 213); + this.CB_PKRSStrain.Location = new System.Drawing.Point(0, 0); + this.CB_PKRSStrain.Margin = new System.Windows.Forms.Padding(0); this.CB_PKRSStrain.Name = "CB_PKRSStrain"; this.CB_PKRSStrain.Size = new System.Drawing.Size(43, 21); this.CB_PKRSStrain.TabIndex = 19; this.CB_PKRSStrain.Visible = false; this.CB_PKRSStrain.SelectedValueChanged += new System.EventHandler(this.updatePKRSstrain); // - // CB_Nature - // - this.CB_Nature.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Nature.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Nature.FormattingEnabled = true; - this.CB_Nature.Location = new System.Drawing.Point(105, 90); - this.CB_Nature.Name = "CB_Nature"; - this.CB_Nature.Size = new System.Drawing.Size(122, 21); - this.CB_Nature.TabIndex = 9; - this.CB_Nature.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Nature.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Nature.MouseHover += new System.EventHandler(this.updateNatureModification); - this.CB_Nature.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); - // - // Label_3DSRegion - // - this.Label_3DSRegion.Location = new System.Drawing.Point(25, 279); - this.Label_3DSRegion.Name = "Label_3DSRegion"; - this.Label_3DSRegion.Size = new System.Drawing.Size(77, 13); - this.Label_3DSRegion.TabIndex = 18; - this.Label_3DSRegion.Text = "3DS Region:"; - this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SubRegion - // - this.Label_SubRegion.Location = new System.Drawing.Point(25, 259); - this.Label_SubRegion.Name = "Label_SubRegion"; - this.Label_SubRegion.Size = new System.Drawing.Size(77, 13); - this.Label_SubRegion.TabIndex = 17; - this.Label_SubRegion.Text = "Sub Region:"; - this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Country - // - this.Label_Country.Location = new System.Drawing.Point(25, 239); - this.Label_Country.Name = "Label_Country"; - this.Label_Country.Size = new System.Drawing.Size(77, 13); - this.Label_Country.TabIndex = 16; - this.Label_Country.Text = "Country:"; - this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // Label_PKRSdays // - this.Label_PKRSdays.Location = new System.Drawing.Point(178, 216); + this.Label_PKRSdays.Location = new System.Drawing.Point(43, 0); + this.Label_PKRSdays.Margin = new System.Windows.Forms.Padding(0); this.Label_PKRSdays.Name = "Label_PKRSdays"; - this.Label_PKRSdays.Size = new System.Drawing.Size(20, 13); + this.Label_PKRSdays.Size = new System.Drawing.Size(25, 21); this.Label_PKRSdays.TabIndex = 15; this.Label_PKRSdays.Text = "d:"; this.Label_PKRSdays.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.Label_PKRSdays.Visible = false; // - // Label_PKRS + // CB_PKRSDays // - this.Label_PKRS.Location = new System.Drawing.Point(80, 216); - this.Label_PKRS.Name = "Label_PKRS"; - this.Label_PKRS.Size = new System.Drawing.Size(56, 13); - this.Label_PKRS.TabIndex = 14; - this.Label_PKRS.Text = "PkRs:"; - this.Label_PKRS.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_PKRS.Visible = false; + this.CB_PKRSDays.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_PKRSDays.FormattingEnabled = true; + this.CB_PKRSDays.Location = new System.Drawing.Point(68, 0); + this.CB_PKRSDays.Margin = new System.Windows.Forms.Padding(0); + this.CB_PKRSDays.Name = "CB_PKRSDays"; + this.CB_PKRSDays.Size = new System.Drawing.Size(30, 21); + this.CB_PKRSDays.TabIndex = 20; + this.CB_PKRSDays.Visible = false; + this.CB_PKRSDays.SelectedIndexChanged += new System.EventHandler(this.updatePKRSdays); // - // CHK_IsEgg + // FLP_Country // - this.CHK_IsEgg.AutoSize = true; - this.CHK_IsEgg.Location = new System.Drawing.Point(35, 196); - this.CHK_IsEgg.Name = "CHK_IsEgg"; - this.CHK_IsEgg.Size = new System.Drawing.Size(56, 17); - this.CHK_IsEgg.TabIndex = 16; - this.CHK_IsEgg.Text = "Is Egg"; - this.CHK_IsEgg.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.CHK_IsEgg.UseVisualStyleBackColor = true; - this.CHK_IsEgg.CheckedChanged += new System.EventHandler(this.updateIsEgg); + this.FLP_Country.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Country.Controls.Add(this.Label_Country); + this.FLP_Country.Controls.Add(this.CB_Country); + this.FLP_Country.Location = new System.Drawing.Point(0, 233); + this.FLP_Country.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Country.Name = "FLP_Country"; + this.FLP_Country.Size = new System.Drawing.Size(272, 21); + this.FLP_Country.TabIndex = 107; // - // Label_Language + // Label_Country // - this.Label_Language.Location = new System.Drawing.Point(25, 177); - this.Label_Language.Name = "Label_Language"; - this.Label_Language.Size = new System.Drawing.Size(77, 13); - this.Label_Language.TabIndex = 12; - this.Label_Language.Text = "Language:"; - this.Label_Language.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_Country.Location = new System.Drawing.Point(0, 0); + this.Label_Country.Margin = new System.Windows.Forms.Padding(0); + this.Label_Country.Name = "Label_Country"; + this.Label_Country.Size = new System.Drawing.Size(110, 21); + this.Label_Country.TabIndex = 16; + this.Label_Country.Text = "Country:"; + this.Label_Country.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Form + // CB_Country // - this.Label_Form.AutoSize = true; - this.Label_Form.Location = new System.Drawing.Point(125, 136); - this.Label_Form.Name = "Label_Form"; - this.Label_Form.Size = new System.Drawing.Size(33, 13); - this.Label_Form.TabIndex = 11; - this.Label_Form.Text = "Form:"; + this.CB_Country.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Country.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_Country.DropDownWidth = 180; + this.CB_Country.FormattingEnabled = true; + this.CB_Country.Location = new System.Drawing.Point(110, 0); + this.CB_Country.Margin = new System.Windows.Forms.Padding(0); + this.CB_Country.Name = "CB_Country"; + this.CB_Country.Size = new System.Drawing.Size(126, 21); + this.CB_Country.TabIndex = 21; + this.CB_Country.SelectedIndexChanged += new System.EventHandler(this.updateCountry); + this.CB_Country.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); + this.CB_Country.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // - // Label_Ability + // FLP_SubRegion // - this.Label_Ability.Location = new System.Drawing.Point(25, 157); - this.Label_Ability.Name = "Label_Ability"; - this.Label_Ability.Size = new System.Drawing.Size(77, 13); - this.Label_Ability.TabIndex = 10; - this.Label_Ability.Text = "Ability:"; - this.Label_Ability.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_SubRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SubRegion.Controls.Add(this.Label_SubRegion); + this.FLP_SubRegion.Controls.Add(this.CB_SubRegion); + this.FLP_SubRegion.Location = new System.Drawing.Point(0, 254); + this.FLP_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SubRegion.Name = "FLP_SubRegion"; + this.FLP_SubRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_SubRegion.TabIndex = 110; // - // Label_Friendship + // Label_SubRegion // - this.Label_Friendship.Location = new System.Drawing.Point(25, 135); - this.Label_Friendship.Name = "Label_Friendship"; - this.Label_Friendship.Size = new System.Drawing.Size(77, 13); - this.Label_Friendship.TabIndex = 9; - this.Label_Friendship.Text = "Friendship:"; - this.Label_Friendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Friendship.Click += new System.EventHandler(this.clickFriendship); + this.Label_SubRegion.Location = new System.Drawing.Point(0, 0); + this.Label_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_SubRegion.Name = "Label_SubRegion"; + this.Label_SubRegion.Size = new System.Drawing.Size(110, 21); + this.Label_SubRegion.TabIndex = 17; + this.Label_SubRegion.Text = "Sub Region:"; + this.Label_SubRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_Nature + // CB_SubRegion // - this.Label_Nature.Location = new System.Drawing.Point(25, 93); - this.Label_Nature.Name = "Label_Nature"; - this.Label_Nature.Size = new System.Drawing.Size(77, 13); - this.Label_Nature.TabIndex = 8; - this.Label_Nature.Text = "Nature:"; - this.Label_Nature.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CB_SubRegion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_SubRegion.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_SubRegion.DropDownWidth = 180; + this.CB_SubRegion.FormattingEnabled = true; + this.CB_SubRegion.Location = new System.Drawing.Point(110, 0); + this.CB_SubRegion.Margin = new System.Windows.Forms.Padding(0); + this.CB_SubRegion.Name = "CB_SubRegion"; + this.CB_SubRegion.Size = new System.Drawing.Size(126, 21); + this.CB_SubRegion.TabIndex = 22; // - // Label_CurLevel + // FLP_3DSRegion // - this.Label_CurLevel.Location = new System.Drawing.Point(153, 73); - this.Label_CurLevel.Name = "Label_CurLevel"; - this.Label_CurLevel.Size = new System.Drawing.Size(50, 13); - this.Label_CurLevel.TabIndex = 7; - this.Label_CurLevel.Text = "Level:"; - this.Label_CurLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_3DSRegion.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_3DSRegion.Controls.Add(this.Label_3DSRegion); + this.FLP_3DSRegion.Controls.Add(this.CB_3DSReg); + this.FLP_3DSRegion.Location = new System.Drawing.Point(0, 275); + this.FLP_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.FLP_3DSRegion.Name = "FLP_3DSRegion"; + this.FLP_3DSRegion.Size = new System.Drawing.Size(272, 21); + this.FLP_3DSRegion.TabIndex = 111; // - // TB_Nickname + // Label_3DSRegion // - this.TB_Nickname.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Nickname.Location = new System.Drawing.Point(105, 49); - this.TB_Nickname.MaximumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.MaxLength = 12; - this.TB_Nickname.MinimumSize = new System.Drawing.Size(122, 20); - this.TB_Nickname.Name = "TB_Nickname"; - this.TB_Nickname.Size = new System.Drawing.Size(122, 20); - this.TB_Nickname.TabIndex = 5; - this.TB_Nickname.TextChanged += new System.EventHandler(this.updateIsNicknamed); - this.TB_Nickname.MouseDown += new System.Windows.Forms.MouseEventHandler(this.updateNicknameClick); + this.Label_3DSRegion.Location = new System.Drawing.Point(0, 0); + this.Label_3DSRegion.Margin = new System.Windows.Forms.Padding(0); + this.Label_3DSRegion.Name = "Label_3DSRegion"; + this.Label_3DSRegion.Size = new System.Drawing.Size(110, 21); + this.Label_3DSRegion.TabIndex = 18; + this.Label_3DSRegion.Text = "3DS Region:"; + this.Label_3DSRegion.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // CB_Species + // CB_3DSReg // - this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_Species.FormattingEnabled = true; - this.CB_Species.Location = new System.Drawing.Point(105, 27); - this.CB_Species.Name = "CB_Species"; - this.CB_Species.Size = new System.Drawing.Size(122, 21); - this.CB_Species.TabIndex = 3; - this.CB_Species.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); - this.CB_Species.SelectedValueChanged += new System.EventHandler(this.updateSpecies); - this.CB_Species.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); - this.CB_Species.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); + this.CB_3DSReg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.CB_3DSReg.FormattingEnabled = true; + this.CB_3DSReg.Location = new System.Drawing.Point(110, 0); + this.CB_3DSReg.Margin = new System.Windows.Forms.Padding(0); + this.CB_3DSReg.Name = "CB_3DSReg"; + this.CB_3DSReg.Size = new System.Drawing.Size(126, 21); + this.CB_3DSReg.TabIndex = 23; // - // Label_EXP + // FLP_NSparkle // - this.Label_EXP.Location = new System.Drawing.Point(25, 73); - this.Label_EXP.Name = "Label_EXP"; - this.Label_EXP.Size = new System.Drawing.Size(77, 13); - this.Label_EXP.TabIndex = 3; - this.Label_EXP.Text = "EXP:"; - this.Label_EXP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_NSparkle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_NSparkle.Controls.Add(this.L_NSparkle); + this.FLP_NSparkle.Controls.Add(this.CHK_NSparkle); + this.FLP_NSparkle.Location = new System.Drawing.Point(0, 296); + this.FLP_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.FLP_NSparkle.Name = "FLP_NSparkle"; + this.FLP_NSparkle.Size = new System.Drawing.Size(272, 21); + this.FLP_NSparkle.TabIndex = 112; // - // Label_Species + // L_NSparkle // - this.Label_Species.Location = new System.Drawing.Point(25, 30); - this.Label_Species.Name = "Label_Species"; - this.Label_Species.Size = new System.Drawing.Size(77, 13); - this.Label_Species.TabIndex = 1; - this.Label_Species.Text = "Species:"; - this.Label_Species.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_Species.Click += new System.EventHandler(this.updateNickname); + this.L_NSparkle.Location = new System.Drawing.Point(0, 0); + this.L_NSparkle.Margin = new System.Windows.Forms.Padding(0); + this.L_NSparkle.Name = "L_NSparkle"; + this.L_NSparkle.Size = new System.Drawing.Size(110, 21); + this.L_NSparkle.TabIndex = 17; + this.L_NSparkle.Text = "N\'s Sparkle:"; + this.L_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_HatchCounter + // CHK_NSparkle // - this.Label_HatchCounter.Location = new System.Drawing.Point(20, 134); - this.Label_HatchCounter.Name = "Label_HatchCounter"; - this.Label_HatchCounter.Size = new System.Drawing.Size(82, 13); - this.Label_HatchCounter.TabIndex = 61; - this.Label_HatchCounter.Text = "Hatch Counter:"; - this.Label_HatchCounter.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_IsShiny - // - this.Label_IsShiny.Image = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.Image"))); - this.Label_IsShiny.InitialImage = ((System.Drawing.Image)(resources.GetObject("Label_IsShiny.InitialImage"))); - this.Label_IsShiny.Location = new System.Drawing.Point(53, 7); - this.Label_IsShiny.Name = "Label_IsShiny"; - this.Label_IsShiny.Size = new System.Drawing.Size(20, 20); - this.Label_IsShiny.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.Label_IsShiny.TabIndex = 62; - this.Label_IsShiny.TabStop = false; - this.Label_IsShiny.Visible = false; - // - // BTN_Shinytize - // - this.BTN_Shinytize.Location = new System.Drawing.Point(50, 6); - this.BTN_Shinytize.Name = "BTN_Shinytize"; - this.BTN_Shinytize.Size = new System.Drawing.Size(26, 22); - this.BTN_Shinytize.TabIndex = 1; - this.BTN_Shinytize.Text = "☆"; - this.BTN_Shinytize.UseVisualStyleBackColor = true; - this.BTN_Shinytize.Click += new System.EventHandler(this.updateShinyPID); - // - // Label_PID - // - this.Label_PID.Location = new System.Drawing.Point(25, 11); - this.Label_PID.Name = "Label_PID"; - this.Label_PID.Size = new System.Drawing.Size(77, 13); - this.Label_PID.TabIndex = 0; - this.Label_PID.Text = "PID:"; - this.Label_PID.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // TB_AbilityNumber - // - this.TB_AbilityNumber.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_AbilityNumber.Location = new System.Drawing.Point(229, 153); - this.TB_AbilityNumber.Mask = "0"; - this.TB_AbilityNumber.Name = "TB_AbilityNumber"; - this.TB_AbilityNumber.Size = new System.Drawing.Size(19, 20); - this.TB_AbilityNumber.TabIndex = 14; - this.TB_AbilityNumber.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_AbilityNumber.Visible = false; - // - // MT_Level - // - this.MT_Level.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MT_Level.Enabled = false; - this.MT_Level.Location = new System.Drawing.Point(205, 70); - this.MT_Level.Mask = "000"; - this.MT_Level.Name = "MT_Level"; - this.MT_Level.Size = new System.Drawing.Size(22, 20); - this.MT_Level.TabIndex = 17; - this.MT_Level.Visible = false; - this.MT_Level.TextChanged += new System.EventHandler(this.updateEXPLevel); - // - // DEV_Ability - // - this.DEV_Ability.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.DEV_Ability.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.DEV_Ability.Enabled = false; - this.DEV_Ability.FormattingEnabled = true; - this.DEV_Ability.Items.AddRange(new object[] { - "Item"}); - this.DEV_Ability.Location = new System.Drawing.Point(105, 153); - this.DEV_Ability.Name = "DEV_Ability"; - this.DEV_Ability.Size = new System.Drawing.Size(122, 21); - this.DEV_Ability.TabIndex = 14; - this.DEV_Ability.Visible = false; + this.CHK_NSparkle.AutoSize = true; + this.CHK_NSparkle.Location = new System.Drawing.Point(110, 3); + this.CHK_NSparkle.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_NSparkle.Name = "CHK_NSparkle"; + this.CHK_NSparkle.Size = new System.Drawing.Size(56, 17); + this.CHK_NSparkle.TabIndex = 18; + this.CHK_NSparkle.Text = "Active"; + this.CHK_NSparkle.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.CHK_NSparkle.UseVisualStyleBackColor = true; // // Tab_Met // this.Tab_Met.AllowDrop = true; this.Tab_Met.Controls.Add(this.CHK_AsEgg); - this.Tab_Met.Controls.Add(this.CHK_Fateful); this.Tab_Met.Controls.Add(this.GB_EggConditions); - this.Tab_Met.Controls.Add(this.Label_EncounterType); - this.Tab_Met.Controls.Add(this.Label_MetDate); - this.Tab_Met.Controls.Add(this.Label_MetLevel); - this.Tab_Met.Controls.Add(this.Label_Ball); - this.Tab_Met.Controls.Add(this.Label_MetLocation); - this.Tab_Met.Controls.Add(this.Label_OriginGame); - this.Tab_Met.Controls.Add(this.CB_GameOrigin); - this.Tab_Met.Controls.Add(this.CB_MetLocation); - this.Tab_Met.Controls.Add(this.CB_Ball); - this.Tab_Met.Controls.Add(this.TB_MetLevel); - this.Tab_Met.Controls.Add(this.CAL_MetDate); - this.Tab_Met.Controls.Add(this.CB_EncounterType); + this.Tab_Met.Controls.Add(this.FLP_Met); this.Tab_Met.Location = new System.Drawing.Point(4, 22); this.Tab_Met.Name = "Tab_Met"; this.Tab_Met.Padding = new System.Windows.Forms.Padding(3); @@ -1068,7 +1516,7 @@ public void InitializeComponent() // CHK_AsEgg // this.CHK_AsEgg.AutoSize = true; - this.CHK_AsEgg.Location = new System.Drawing.Point(105, 204); + this.CHK_AsEgg.Location = new System.Drawing.Point(110, 204); this.CHK_AsEgg.Name = "CHK_AsEgg"; this.CHK_AsEgg.Size = new System.Drawing.Size(60, 17); this.CHK_AsEgg.TabIndex = 8; @@ -1076,16 +1524,6 @@ public void InitializeComponent() this.CHK_AsEgg.UseVisualStyleBackColor = true; this.CHK_AsEgg.Click += new System.EventHandler(this.updateMetAsEgg); // - // CHK_Fateful - // - this.CHK_Fateful.AutoSize = true; - this.CHK_Fateful.Location = new System.Drawing.Point(105, 115); - this.CHK_Fateful.Name = "CHK_Fateful"; - this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); - this.CHK_Fateful.TabIndex = 6; - this.CHK_Fateful.Text = "Fateful Encounter"; - this.CHK_Fateful.UseVisualStyleBackColor = true; - // // GB_EggConditions // this.GB_EggConditions.Controls.Add(this.CB_EggLocation); @@ -1093,7 +1531,7 @@ public void InitializeComponent() this.GB_EggConditions.Controls.Add(this.Label_EggDate); this.GB_EggConditions.Controls.Add(this.Label_EggLocation); this.GB_EggConditions.Enabled = false; - this.GB_EggConditions.Location = new System.Drawing.Point(37, 226); + this.GB_EggConditions.Location = new System.Drawing.Point(39, 226); this.GB_EggConditions.Name = "GB_EggConditions"; this.GB_EggConditions.Size = new System.Drawing.Size(200, 67); this.GB_EggConditions.TabIndex = 9; @@ -1144,56 +1582,38 @@ public void InitializeComponent() this.Label_EggLocation.Text = "Location:"; this.Label_EggLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // - // Label_EncounterType + // FLP_Met // - this.Label_EncounterType.Location = new System.Drawing.Point(25, 138); - this.Label_EncounterType.Name = "Label_EncounterType"; - this.Label_EncounterType.Size = new System.Drawing.Size(77, 13); - this.Label_EncounterType.TabIndex = 5; - this.Label_EncounterType.Text = "Encounter:"; - this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_Met.Controls.Add(this.FLP_OriginGame); + this.FLP_Met.Controls.Add(this.FLP_MetLocation); + this.FLP_Met.Controls.Add(this.FLP_Ball); + this.FLP_Met.Controls.Add(this.FLP_MetLevel); + this.FLP_Met.Controls.Add(this.FLP_MetDate); + this.FLP_Met.Controls.Add(this.FLP_Fateful); + this.FLP_Met.Controls.Add(this.FLP_EncounterType); + this.FLP_Met.Controls.Add(this.FLP_TimeOfDay); + this.FLP_Met.Location = new System.Drawing.Point(0, 24); + this.FLP_Met.Name = "FLP_Met"; + this.FLP_Met.Size = new System.Drawing.Size(272, 175); + this.FLP_Met.TabIndex = 103; // - // Label_MetDate + // FLP_OriginGame // - this.Label_MetDate.Location = new System.Drawing.Point(25, 93); - this.Label_MetDate.Name = "Label_MetDate"; - this.Label_MetDate.Size = new System.Drawing.Size(77, 13); - this.Label_MetDate.TabIndex = 4; - this.Label_MetDate.Text = "Met Date:"; - this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLevel - // - this.Label_MetLevel.Location = new System.Drawing.Point(25, 73); - this.Label_MetLevel.Name = "Label_MetLevel"; - this.Label_MetLevel.Size = new System.Drawing.Size(77, 13); - this.Label_MetLevel.TabIndex = 3; - this.Label_MetLevel.Text = "Met Level:"; - this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Ball - // - this.Label_Ball.Location = new System.Drawing.Point(25, 52); - this.Label_Ball.Name = "Label_Ball"; - this.Label_Ball.Size = new System.Drawing.Size(77, 13); - this.Label_Ball.TabIndex = 2; - this.Label_Ball.Text = "Ball:"; - this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_MetLocation - // - this.Label_MetLocation.Location = new System.Drawing.Point(25, 30); - this.Label_MetLocation.Name = "Label_MetLocation"; - this.Label_MetLocation.Size = new System.Drawing.Size(77, 13); - this.Label_MetLocation.TabIndex = 1; - this.Label_MetLocation.Text = "Met Location:"; - this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_OriginGame.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_OriginGame.Controls.Add(this.Label_OriginGame); + this.FLP_OriginGame.Controls.Add(this.CB_GameOrigin); + this.FLP_OriginGame.Location = new System.Drawing.Point(0, 0); + this.FLP_OriginGame.Margin = new System.Windows.Forms.Padding(0); + this.FLP_OriginGame.Name = "FLP_OriginGame"; + this.FLP_OriginGame.Size = new System.Drawing.Size(272, 21); + this.FLP_OriginGame.TabIndex = 112; // // Label_OriginGame // - this.Label_OriginGame.Location = new System.Drawing.Point(25, 11); + this.Label_OriginGame.Location = new System.Drawing.Point(0, 0); + this.Label_OriginGame.Margin = new System.Windows.Forms.Padding(0); this.Label_OriginGame.Name = "Label_OriginGame"; - this.Label_OriginGame.Size = new System.Drawing.Size(77, 13); + this.Label_OriginGame.Size = new System.Drawing.Size(110, 21); this.Label_OriginGame.TabIndex = 0; this.Label_OriginGame.Text = "Origin Game:"; this.Label_OriginGame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1202,125 +1622,259 @@ public void InitializeComponent() // this.CB_GameOrigin.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_GameOrigin.FormattingEnabled = true; - this.CB_GameOrigin.Location = new System.Drawing.Point(105, 7); + this.CB_GameOrigin.Location = new System.Drawing.Point(110, 0); + this.CB_GameOrigin.Margin = new System.Windows.Forms.Padding(0); this.CB_GameOrigin.Name = "CB_GameOrigin"; - this.CB_GameOrigin.Size = new System.Drawing.Size(122, 21); + this.CB_GameOrigin.Size = new System.Drawing.Size(126, 21); this.CB_GameOrigin.TabIndex = 1; this.CB_GameOrigin.SelectedIndexChanged += new System.EventHandler(this.updateOriginGame); // + // FLP_MetLocation + // + this.FLP_MetLocation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLocation.Controls.Add(this.Label_MetLocation); + this.FLP_MetLocation.Controls.Add(this.CB_MetLocation); + this.FLP_MetLocation.Location = new System.Drawing.Point(0, 21); + this.FLP_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLocation.Name = "FLP_MetLocation"; + this.FLP_MetLocation.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLocation.TabIndex = 113; + // + // Label_MetLocation + // + this.Label_MetLocation.Location = new System.Drawing.Point(0, 0); + this.Label_MetLocation.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLocation.Name = "Label_MetLocation"; + this.Label_MetLocation.Size = new System.Drawing.Size(110, 21); + this.Label_MetLocation.TabIndex = 1; + this.Label_MetLocation.Text = "Met Location:"; + this.Label_MetLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_MetLocation // this.CB_MetLocation.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_MetLocation.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_MetLocation.DropDownWidth = 150; this.CB_MetLocation.FormattingEnabled = true; - this.CB_MetLocation.Location = new System.Drawing.Point(105, 27); + this.CB_MetLocation.Location = new System.Drawing.Point(110, 0); + this.CB_MetLocation.Margin = new System.Windows.Forms.Padding(0); this.CB_MetLocation.Name = "CB_MetLocation"; - this.CB_MetLocation.Size = new System.Drawing.Size(122, 21); + this.CB_MetLocation.Size = new System.Drawing.Size(126, 21); this.CB_MetLocation.TabIndex = 2; this.CB_MetLocation.SelectedIndexChanged += new System.EventHandler(this.validateLocation); this.CB_MetLocation.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_MetLocation.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_Ball + // + this.FLP_Ball.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Ball.Controls.Add(this.Label_Ball); + this.FLP_Ball.Controls.Add(this.CB_Ball); + this.FLP_Ball.Location = new System.Drawing.Point(0, 42); + this.FLP_Ball.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Ball.Name = "FLP_Ball"; + this.FLP_Ball.Size = new System.Drawing.Size(272, 21); + this.FLP_Ball.TabIndex = 114; + // + // Label_Ball + // + this.Label_Ball.Location = new System.Drawing.Point(0, 0); + this.Label_Ball.Margin = new System.Windows.Forms.Padding(0); + this.Label_Ball.Name = "Label_Ball"; + this.Label_Ball.Size = new System.Drawing.Size(110, 21); + this.Label_Ball.TabIndex = 2; + this.Label_Ball.Text = "Ball:"; + this.Label_Ball.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_Ball // this.CB_Ball.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.CB_Ball.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Ball.FormattingEnabled = true; - this.CB_Ball.Location = new System.Drawing.Point(105, 48); + this.CB_Ball.Location = new System.Drawing.Point(110, 0); + this.CB_Ball.Margin = new System.Windows.Forms.Padding(0); this.CB_Ball.Name = "CB_Ball"; - this.CB_Ball.Size = new System.Drawing.Size(122, 21); + this.CB_Ball.Size = new System.Drawing.Size(126, 21); this.CB_Ball.TabIndex = 3; this.CB_Ball.SelectedIndexChanged += new System.EventHandler(this.validateComboBox2); this.CB_Ball.KeyDown += new System.Windows.Forms.KeyEventHandler(this.removedropCB); this.CB_Ball.Validating += new System.ComponentModel.CancelEventHandler(this.validateComboBox); // + // FLP_MetLevel + // + this.FLP_MetLevel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetLevel.Controls.Add(this.Label_MetLevel); + this.FLP_MetLevel.Controls.Add(this.TB_MetLevel); + this.FLP_MetLevel.Location = new System.Drawing.Point(0, 63); + this.FLP_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetLevel.Name = "FLP_MetLevel"; + this.FLP_MetLevel.Size = new System.Drawing.Size(272, 21); + this.FLP_MetLevel.TabIndex = 115; + // + // Label_MetLevel + // + this.Label_MetLevel.Location = new System.Drawing.Point(0, 0); + this.Label_MetLevel.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetLevel.Name = "Label_MetLevel"; + this.Label_MetLevel.Size = new System.Drawing.Size(110, 21); + this.Label_MetLevel.TabIndex = 3; + this.Label_MetLevel.Text = "Met Level:"; + this.Label_MetLevel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // TB_MetLevel // this.TB_MetLevel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_MetLevel.Location = new System.Drawing.Point(105, 70); + this.TB_MetLevel.Location = new System.Drawing.Point(110, 0); + this.TB_MetLevel.Margin = new System.Windows.Forms.Padding(0); this.TB_MetLevel.Mask = "000"; this.TB_MetLevel.Name = "TB_MetLevel"; - this.TB_MetLevel.Size = new System.Drawing.Size(122, 20); + this.TB_MetLevel.Size = new System.Drawing.Size(126, 20); this.TB_MetLevel.TabIndex = 4; this.TB_MetLevel.TextChanged += new System.EventHandler(this.update255_MTB); // + // FLP_MetDate + // + this.FLP_MetDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_MetDate.Controls.Add(this.Label_MetDate); + this.FLP_MetDate.Controls.Add(this.CAL_MetDate); + this.FLP_MetDate.Location = new System.Drawing.Point(0, 84); + this.FLP_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.FLP_MetDate.Name = "FLP_MetDate"; + this.FLP_MetDate.Size = new System.Drawing.Size(272, 21); + this.FLP_MetDate.TabIndex = 116; + // + // Label_MetDate + // + this.Label_MetDate.Location = new System.Drawing.Point(0, 0); + this.Label_MetDate.Margin = new System.Windows.Forms.Padding(0); + this.Label_MetDate.Name = "Label_MetDate"; + this.Label_MetDate.Size = new System.Drawing.Size(110, 21); + this.Label_MetDate.TabIndex = 4; + this.Label_MetDate.Text = "Met Date:"; + this.Label_MetDate.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CAL_MetDate // this.CAL_MetDate.CustomFormat = "MM/dd/yyyy"; this.CAL_MetDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.CAL_MetDate.Location = new System.Drawing.Point(105, 90); + this.CAL_MetDate.Location = new System.Drawing.Point(110, 0); + this.CAL_MetDate.Margin = new System.Windows.Forms.Padding(0); this.CAL_MetDate.MaxDate = new System.DateTime(2099, 12, 31, 0, 0, 0, 0); this.CAL_MetDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); this.CAL_MetDate.Name = "CAL_MetDate"; - this.CAL_MetDate.Size = new System.Drawing.Size(122, 20); + this.CAL_MetDate.Size = new System.Drawing.Size(126, 20); this.CAL_MetDate.TabIndex = 5; this.CAL_MetDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); // + // FLP_Fateful + // + this.FLP_Fateful.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Fateful.Controls.Add(this.PAN_Fateful); + this.FLP_Fateful.Controls.Add(this.CHK_Fateful); + this.FLP_Fateful.Location = new System.Drawing.Point(0, 105); + this.FLP_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Fateful.Name = "FLP_Fateful"; + this.FLP_Fateful.Size = new System.Drawing.Size(272, 21); + this.FLP_Fateful.TabIndex = 117; + // + // PAN_Fateful + // + this.PAN_Fateful.Location = new System.Drawing.Point(0, 0); + this.PAN_Fateful.Margin = new System.Windows.Forms.Padding(0); + this.PAN_Fateful.Name = "PAN_Fateful"; + this.PAN_Fateful.Size = new System.Drawing.Size(110, 21); + this.PAN_Fateful.TabIndex = 104; + // + // CHK_Fateful + // + this.CHK_Fateful.AutoSize = true; + this.CHK_Fateful.Location = new System.Drawing.Point(110, 3); + this.CHK_Fateful.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); + this.CHK_Fateful.Name = "CHK_Fateful"; + this.CHK_Fateful.Size = new System.Drawing.Size(110, 17); + this.CHK_Fateful.TabIndex = 6; + this.CHK_Fateful.Text = "Fateful Encounter"; + this.CHK_Fateful.UseVisualStyleBackColor = true; + // + // FLP_EncounterType + // + this.FLP_EncounterType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_EncounterType.Controls.Add(this.Label_EncounterType); + this.FLP_EncounterType.Controls.Add(this.CB_EncounterType); + this.FLP_EncounterType.Location = new System.Drawing.Point(0, 126); + this.FLP_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_EncounterType.Name = "FLP_EncounterType"; + this.FLP_EncounterType.Size = new System.Drawing.Size(272, 21); + this.FLP_EncounterType.TabIndex = 118; + // + // Label_EncounterType + // + this.Label_EncounterType.Location = new System.Drawing.Point(0, 0); + this.Label_EncounterType.Margin = new System.Windows.Forms.Padding(0); + this.Label_EncounterType.Name = "Label_EncounterType"; + this.Label_EncounterType.Size = new System.Drawing.Size(110, 21); + this.Label_EncounterType.TabIndex = 5; + this.Label_EncounterType.Text = "Encounter:"; + this.Label_EncounterType.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // CB_EncounterType // this.CB_EncounterType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_EncounterType.DropDownWidth = 160; this.CB_EncounterType.FormattingEnabled = true; - this.CB_EncounterType.Location = new System.Drawing.Point(105, 135); + this.CB_EncounterType.Location = new System.Drawing.Point(110, 0); + this.CB_EncounterType.Margin = new System.Windows.Forms.Padding(0); this.CB_EncounterType.Name = "CB_EncounterType"; - this.CB_EncounterType.Size = new System.Drawing.Size(122, 21); + this.CB_EncounterType.Size = new System.Drawing.Size(126, 21); this.CB_EncounterType.TabIndex = 7; // + // FLP_TimeOfDay + // + this.FLP_TimeOfDay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_TimeOfDay.Controls.Add(this.L_MetTimeOfDay); + this.FLP_TimeOfDay.Controls.Add(this.CB_MetTimeOfDay); + this.FLP_TimeOfDay.Location = new System.Drawing.Point(0, 147); + this.FLP_TimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.FLP_TimeOfDay.Name = "FLP_TimeOfDay"; + this.FLP_TimeOfDay.Size = new System.Drawing.Size(272, 21); + this.FLP_TimeOfDay.TabIndex = 119; + // + // L_MetTimeOfDay + // + this.L_MetTimeOfDay.Location = new System.Drawing.Point(0, 0); + this.L_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.L_MetTimeOfDay.Name = "L_MetTimeOfDay"; + this.L_MetTimeOfDay.Size = new System.Drawing.Size(110, 21); + this.L_MetTimeOfDay.TabIndex = 10; + this.L_MetTimeOfDay.Text = "Time of Day:"; + this.L_MetTimeOfDay.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.L_MetTimeOfDay.Visible = false; + // + // CB_MetTimeOfDay + // + this.CB_MetTimeOfDay.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_MetTimeOfDay.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_MetTimeOfDay.DropDownWidth = 150; + this.CB_MetTimeOfDay.FormattingEnabled = true; + this.CB_MetTimeOfDay.Items.AddRange(new object[] { + "(None)", + "Morning", + "Day", + "Night"}); + this.CB_MetTimeOfDay.Location = new System.Drawing.Point(110, 0); + this.CB_MetTimeOfDay.Margin = new System.Windows.Forms.Padding(0); + this.CB_MetTimeOfDay.Name = "CB_MetTimeOfDay"; + this.CB_MetTimeOfDay.Size = new System.Drawing.Size(126, 21); + this.CB_MetTimeOfDay.TabIndex = 11; + this.CB_MetTimeOfDay.Visible = false; + // // Tab_Stats // this.Tab_Stats.AllowDrop = true; - this.Tab_Stats.Controls.Add(this.Stat_SPE); - this.Tab_Stats.Controls.Add(this.Stat_SPD); - this.Tab_Stats.Controls.Add(this.Stat_SPA); - this.Tab_Stats.Controls.Add(this.Stat_DEF); - this.Tab_Stats.Controls.Add(this.Stat_ATK); - this.Tab_Stats.Controls.Add(this.Stat_HP); - this.Tab_Stats.Controls.Add(this.CB_HPType); - this.Tab_Stats.Controls.Add(this.CHK_HackedStats); - this.Tab_Stats.Controls.Add(this.Label_CharacteristicPrefix); - this.Tab_Stats.Controls.Add(this.L_Potential); - this.Tab_Stats.Controls.Add(this.TB_IVTotal); - this.Tab_Stats.Controls.Add(this.L_Characteristic); - this.Tab_Stats.Controls.Add(this.TB_Sheen); - this.Tab_Stats.Controls.Add(this.TB_Tough); - this.Tab_Stats.Controls.Add(this.TB_Smart); - this.Tab_Stats.Controls.Add(this.TB_Cute); - this.Tab_Stats.Controls.Add(this.TB_Beauty); - this.Tab_Stats.Controls.Add(this.TB_Cool); - this.Tab_Stats.Controls.Add(this.TB_SPEIV); - this.Tab_Stats.Controls.Add(this.TB_SPDIV); - this.Tab_Stats.Controls.Add(this.TB_SPAIV); - this.Tab_Stats.Controls.Add(this.TB_DEFIV); - this.Tab_Stats.Controls.Add(this.TB_ATKIV); - this.Tab_Stats.Controls.Add(this.TB_HPIV); - this.Tab_Stats.Controls.Add(this.TB_ATKEV); - this.Tab_Stats.Controls.Add(this.TB_DEFEV); - this.Tab_Stats.Controls.Add(this.TB_SPEEV); - this.Tab_Stats.Controls.Add(this.TB_SPDEV); - this.Tab_Stats.Controls.Add(this.TB_SPAEV); - this.Tab_Stats.Controls.Add(this.TB_HPEV); - this.Tab_Stats.Controls.Add(this.Label_Sheen); - this.Tab_Stats.Controls.Add(this.Label_Tough); - this.Tab_Stats.Controls.Add(this.Label_Smart); - this.Tab_Stats.Controls.Add(this.Label_Cute); - this.Tab_Stats.Controls.Add(this.Label_Beauty); - this.Tab_Stats.Controls.Add(this.Label_Cool); - this.Tab_Stats.Controls.Add(this.Label_ContestStats); + this.Tab_Stats.Controls.Add(this.PAN_Contest); + this.Tab_Stats.Controls.Add(this.FLP_Stats); this.Tab_Stats.Controls.Add(this.BTN_RandomEVs); this.Tab_Stats.Controls.Add(this.BTN_RandomIVs); - this.Tab_Stats.Controls.Add(this.Label_HiddenPowerPrefix); - this.Tab_Stats.Controls.Add(this.Label_Stats); - this.Tab_Stats.Controls.Add(this.Label_EVs); - this.Tab_Stats.Controls.Add(this.Label_IVs); - this.Tab_Stats.Controls.Add(this.Label_Total); - this.Tab_Stats.Controls.Add(this.Label_SPE); - this.Tab_Stats.Controls.Add(this.Label_SPD); - this.Tab_Stats.Controls.Add(this.Label_SPA); - this.Tab_Stats.Controls.Add(this.Label_DEF); - this.Tab_Stats.Controls.Add(this.Label_ATK); - this.Tab_Stats.Controls.Add(this.Label_HP); - this.Tab_Stats.Controls.Add(this.TB_EVTotal); this.Tab_Stats.Location = new System.Drawing.Point(4, 22); this.Tab_Stats.Name = "Tab_Stats"; this.Tab_Stats.Padding = new System.Windows.Forms.Padding(3); @@ -1329,96 +1883,193 @@ public void InitializeComponent() this.Tab_Stats.Text = "Stats"; this.Tab_Stats.UseVisualStyleBackColor = true; // - // Stat_SPE + // PAN_Contest // - this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPE.Enabled = false; - this.Stat_SPE.Location = new System.Drawing.Point(167, 129); - this.Stat_SPE.Mask = "00000"; - this.Stat_SPE.Name = "Stat_SPE"; - this.Stat_SPE.PromptChar = ' '; - this.Stat_SPE.Size = new System.Drawing.Size(31, 20); - this.Stat_SPE.TabIndex = 50; - this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.PAN_Contest.Controls.Add(this.TB_Sheen); + this.PAN_Contest.Controls.Add(this.TB_Tough); + this.PAN_Contest.Controls.Add(this.TB_Smart); + this.PAN_Contest.Controls.Add(this.TB_Cute); + this.PAN_Contest.Controls.Add(this.TB_Beauty); + this.PAN_Contest.Controls.Add(this.TB_Cool); + this.PAN_Contest.Controls.Add(this.Label_Sheen); + this.PAN_Contest.Controls.Add(this.Label_Tough); + this.PAN_Contest.Controls.Add(this.Label_Smart); + this.PAN_Contest.Controls.Add(this.Label_Cute); + this.PAN_Contest.Controls.Add(this.Label_Beauty); + this.PAN_Contest.Controls.Add(this.Label_Cool); + this.PAN_Contest.Controls.Add(this.Label_ContestStats); + this.PAN_Contest.Location = new System.Drawing.Point(21, 247); + this.PAN_Contest.Name = "PAN_Contest"; + this.PAN_Contest.Size = new System.Drawing.Size(230, 50); + this.PAN_Contest.TabIndex = 104; // - // Stat_SPD + // TB_Sheen // - this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPD.Enabled = false; - this.Stat_SPD.Location = new System.Drawing.Point(167, 107); - this.Stat_SPD.Mask = "00000"; - this.Stat_SPD.Name = "Stat_SPD"; - this.Stat_SPD.PromptChar = ' '; - this.Stat_SPD.Size = new System.Drawing.Size(31, 20); - this.Stat_SPD.TabIndex = 49; - this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Sheen.Location = new System.Drawing.Point(192, 30); + this.TB_Sheen.Mask = "000"; + this.TB_Sheen.Name = "TB_Sheen"; + this.TB_Sheen.Size = new System.Drawing.Size(31, 20); + this.TB_Sheen.TabIndex = 45; + this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_SPA + // TB_Tough // - this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_SPA.Enabled = false; - this.Stat_SPA.Location = new System.Drawing.Point(167, 85); - this.Stat_SPA.Mask = "00000"; - this.Stat_SPA.Name = "Stat_SPA"; - this.Stat_SPA.PromptChar = ' '; - this.Stat_SPA.Size = new System.Drawing.Size(31, 20); - this.Stat_SPA.TabIndex = 48; - this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Tough.Location = new System.Drawing.Point(155, 30); + this.TB_Tough.Mask = "000"; + this.TB_Tough.Name = "TB_Tough"; + this.TB_Tough.Size = new System.Drawing.Size(31, 20); + this.TB_Tough.TabIndex = 44; + this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_DEF + // TB_Smart // - this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_DEF.Enabled = false; - this.Stat_DEF.Location = new System.Drawing.Point(167, 63); - this.Stat_DEF.Mask = "00000"; - this.Stat_DEF.Name = "Stat_DEF"; - this.Stat_DEF.PromptChar = ' '; - this.Stat_DEF.Size = new System.Drawing.Size(31, 20); - this.Stat_DEF.TabIndex = 47; - this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Smart.Location = new System.Drawing.Point(118, 30); + this.TB_Smart.Mask = "000"; + this.TB_Smart.Name = "TB_Smart"; + this.TB_Smart.Size = new System.Drawing.Size(31, 20); + this.TB_Smart.TabIndex = 43; + this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_ATK + // TB_Cute // - this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_ATK.Enabled = false; - this.Stat_ATK.Location = new System.Drawing.Point(167, 41); - this.Stat_ATK.Mask = "00000"; - this.Stat_ATK.Name = "Stat_ATK"; - this.Stat_ATK.PromptChar = ' '; - this.Stat_ATK.Size = new System.Drawing.Size(31, 20); - this.Stat_ATK.TabIndex = 46; - this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cute.Location = new System.Drawing.Point(81, 30); + this.TB_Cute.Mask = "000"; + this.TB_Cute.Name = "TB_Cute"; + this.TB_Cute.Size = new System.Drawing.Size(31, 20); + this.TB_Cute.TabIndex = 42; + this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // Stat_HP + // TB_Beauty // - this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Stat_HP.Enabled = false; - this.Stat_HP.Location = new System.Drawing.Point(167, 19); - this.Stat_HP.Mask = "00000"; - this.Stat_HP.Name = "Stat_HP"; - this.Stat_HP.PromptChar = ' '; - this.Stat_HP.Size = new System.Drawing.Size(31, 20); - this.Stat_HP.TabIndex = 45; - this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); + this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Beauty.Location = new System.Drawing.Point(44, 30); + this.TB_Beauty.Mask = "000"; + this.TB_Beauty.Name = "TB_Beauty"; + this.TB_Beauty.Size = new System.Drawing.Size(31, 20); + this.TB_Beauty.TabIndex = 41; + this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // CB_HPType + // TB_Cool // - this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; - this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; - this.CB_HPType.DropDownWidth = 80; - this.CB_HPType.FormattingEnabled = true; - this.CB_HPType.Location = new System.Drawing.Point(162, 176); - this.CB_HPType.Name = "CB_HPType"; - this.CB_HPType.Size = new System.Drawing.Size(70, 21); - this.CB_HPType.TabIndex = 44; - this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_Cool.Location = new System.Drawing.Point(7, 30); + this.TB_Cool.Mask = "000"; + this.TB_Cool.Name = "TB_Cool"; + this.TB_Cool.Size = new System.Drawing.Size(31, 20); + this.TB_Cool.TabIndex = 40; + this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // Label_Sheen + // + this.Label_Sheen.Location = new System.Drawing.Point(186, 17); + this.Label_Sheen.Name = "Label_Sheen"; + this.Label_Sheen.Size = new System.Drawing.Size(43, 13); + this.Label_Sheen.TabIndex = 52; + this.Label_Sheen.Text = "Sheen"; + this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Tough + // + this.Label_Tough.Location = new System.Drawing.Point(149, 17); + this.Label_Tough.Name = "Label_Tough"; + this.Label_Tough.Size = new System.Drawing.Size(43, 13); + this.Label_Tough.TabIndex = 51; + this.Label_Tough.Text = "Tough"; + this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Smart + // + this.Label_Smart.Location = new System.Drawing.Point(112, 17); + this.Label_Smart.Name = "Label_Smart"; + this.Label_Smart.Size = new System.Drawing.Size(43, 13); + this.Label_Smart.TabIndex = 50; + this.Label_Smart.Text = "Clever"; + this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cute + // + this.Label_Cute.Location = new System.Drawing.Point(75, 17); + this.Label_Cute.Name = "Label_Cute"; + this.Label_Cute.Size = new System.Drawing.Size(43, 13); + this.Label_Cute.TabIndex = 49; + this.Label_Cute.Text = "Cute"; + this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Beauty + // + this.Label_Beauty.Location = new System.Drawing.Point(38, 17); + this.Label_Beauty.Name = "Label_Beauty"; + this.Label_Beauty.Size = new System.Drawing.Size(43, 13); + this.Label_Beauty.TabIndex = 48; + this.Label_Beauty.Text = "Beauty"; + this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_Cool + // + this.Label_Cool.Location = new System.Drawing.Point(1, 17); + this.Label_Cool.Name = "Label_Cool"; + this.Label_Cool.Size = new System.Drawing.Size(43, 13); + this.Label_Cool.TabIndex = 47; + this.Label_Cool.Text = "Cool"; + this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // Label_ContestStats + // + this.Label_ContestStats.Location = new System.Drawing.Point(46, 1); + this.Label_ContestStats.Name = "Label_ContestStats"; + this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); + this.Label_ContestStats.TabIndex = 46; + this.Label_ContestStats.Text = "Contest Stats"; + this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // FLP_Stats + // + this.FLP_Stats.Controls.Add(this.FLP_StatHeader); + this.FLP_Stats.Controls.Add(this.FLP_HP); + this.FLP_Stats.Controls.Add(this.FLP_Atk); + this.FLP_Stats.Controls.Add(this.FLP_Def); + this.FLP_Stats.Controls.Add(this.FLP_SpA); + this.FLP_Stats.Controls.Add(this.FLP_SpD); + this.FLP_Stats.Controls.Add(this.FLP_Spe); + this.FLP_Stats.Controls.Add(this.FLP_StatsTotal); + this.FLP_Stats.Controls.Add(this.FLP_HPType); + this.FLP_Stats.Controls.Add(this.FLP_Characteristic); + this.FLP_Stats.Location = new System.Drawing.Point(0, 2); + this.FLP_Stats.Name = "FLP_Stats"; + this.FLP_Stats.Size = new System.Drawing.Size(272, 206); + this.FLP_Stats.TabIndex = 103; + // + // FLP_StatHeader + // + this.FLP_StatHeader.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatHeader.Controls.Add(this.FLP_HackedStats); + this.FLP_StatHeader.Controls.Add(this.FLP_StatsHeaderRight); + this.FLP_StatHeader.Location = new System.Drawing.Point(0, 0); + this.FLP_StatHeader.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatHeader.Name = "FLP_StatHeader"; + this.FLP_StatHeader.Size = new System.Drawing.Size(272, 22); + this.FLP_StatHeader.TabIndex = 122; + // + // FLP_HackedStats + // + this.FLP_HackedStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HackedStats.Controls.Add(this.CHK_HackedStats); + this.FLP_HackedStats.Location = new System.Drawing.Point(0, 0); + this.FLP_HackedStats.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HackedStats.Name = "FLP_HackedStats"; + this.FLP_HackedStats.Size = new System.Drawing.Size(107, 21); + this.FLP_HackedStats.TabIndex = 122; // // CHK_HackedStats // this.CHK_HackedStats.AutoSize = true; this.CHK_HackedStats.Enabled = false; - this.CHK_HackedStats.Location = new System.Drawing.Point(3, 3); + this.CHK_HackedStats.Location = new System.Drawing.Point(0, 3); + this.CHK_HackedStats.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3); this.CHK_HackedStats.Name = "CHK_HackedStats"; this.CHK_HackedStats.Size = new System.Drawing.Size(91, 17); this.CHK_HackedStats.TabIndex = 18; @@ -1427,175 +2078,87 @@ public void InitializeComponent() this.CHK_HackedStats.Visible = false; this.CHK_HackedStats.Click += new System.EventHandler(this.updateHackedStats); // - // Label_CharacteristicPrefix + // FLP_StatsHeaderRight // - this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(29, 198); - this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; - this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(103, 13); - this.Label_CharacteristicPrefix.TabIndex = 43; - this.Label_CharacteristicPrefix.Text = "Characteristic:"; - this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.FLP_StatsHeaderRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_IVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_EVs); + this.FLP_StatsHeaderRight.Controls.Add(this.Label_Stats); + this.FLP_StatsHeaderRight.Location = new System.Drawing.Point(107, 0); + this.FLP_StatsHeaderRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsHeaderRight.Name = "FLP_StatsHeaderRight"; + this.FLP_StatsHeaderRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsHeaderRight.TabIndex = 123; // - // L_Potential + // Label_IVs // - this.L_Potential.AutoSize = true; - this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.L_Potential.Location = new System.Drawing.Point(165, 153); - this.L_Potential.Name = "L_Potential"; - this.L_Potential.Size = new System.Drawing.Size(67, 16); - this.L_Potential.TabIndex = 42; - this.L_Potential.Text = "(potential)"; + this.Label_IVs.Location = new System.Drawing.Point(0, 0); + this.Label_IVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_IVs.Name = "Label_IVs"; + this.Label_IVs.Size = new System.Drawing.Size(30, 21); + this.Label_IVs.TabIndex = 29; + this.Label_IVs.Text = "IVs"; + this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_IVTotal + // Label_EVs // - this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_IVTotal.Enabled = false; - this.TB_IVTotal.Location = new System.Drawing.Point(102, 151); - this.TB_IVTotal.MaxLength = 3; - this.TB_IVTotal.Name = "TB_IVTotal"; - this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); - this.TB_IVTotal.TabIndex = 41; - this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Label_EVs.Location = new System.Drawing.Point(30, 0); + this.Label_EVs.Margin = new System.Windows.Forms.Padding(0); + this.Label_EVs.Name = "Label_EVs"; + this.Label_EVs.Size = new System.Drawing.Size(35, 21); + this.Label_EVs.TabIndex = 27; + this.Label_EVs.Text = "EVs"; + this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // L_Characteristic + // Label_Stats // - this.L_Characteristic.AutoSize = true; - this.L_Characteristic.Location = new System.Drawing.Point(131, 198); - this.L_Characteristic.Name = "L_Characteristic"; - this.L_Characteristic.Size = new System.Drawing.Size(34, 13); - this.L_Characteristic.TabIndex = 40; - this.L_Characteristic.Text = "(char)"; + this.Label_Stats.Location = new System.Drawing.Point(65, 0); + this.Label_Stats.Margin = new System.Windows.Forms.Padding(0); + this.Label_Stats.Name = "Label_Stats"; + this.Label_Stats.Size = new System.Drawing.Size(35, 21); + this.Label_Stats.TabIndex = 28; + this.Label_Stats.Text = "Stats"; + this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // TB_Sheen + // FLP_HP // - this.TB_Sheen.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Sheen.Location = new System.Drawing.Point(213, 279); - this.TB_Sheen.Mask = "000"; - this.TB_Sheen.Name = "TB_Sheen"; - this.TB_Sheen.Size = new System.Drawing.Size(31, 20); - this.TB_Sheen.TabIndex = 20; - this.TB_Sheen.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Sheen.TextChanged += new System.EventHandler(this.update255_MTB); + this.FLP_HP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HP.Controls.Add(this.Label_HP); + this.FLP_HP.Controls.Add(this.FLP_HPRight); + this.FLP_HP.Location = new System.Drawing.Point(0, 22); + this.FLP_HP.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HP.Name = "FLP_HP"; + this.FLP_HP.Size = new System.Drawing.Size(272, 21); + this.FLP_HP.TabIndex = 123; // - // TB_Tough + // Label_HP // - this.TB_Tough.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Tough.Location = new System.Drawing.Point(176, 279); - this.TB_Tough.Mask = "000"; - this.TB_Tough.Name = "TB_Tough"; - this.TB_Tough.Size = new System.Drawing.Size(31, 20); - this.TB_Tough.TabIndex = 19; - this.TB_Tough.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Tough.TextChanged += new System.EventHandler(this.update255_MTB); + this.Label_HP.Location = new System.Drawing.Point(0, 0); + this.Label_HP.Margin = new System.Windows.Forms.Padding(0); + this.Label_HP.Name = "Label_HP"; + this.Label_HP.Size = new System.Drawing.Size(110, 21); + this.Label_HP.TabIndex = 19; + this.Label_HP.Text = "HP:"; + this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // TB_Smart + // FLP_HPRight // - this.TB_Smart.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Smart.Location = new System.Drawing.Point(139, 279); - this.TB_Smart.Mask = "000"; - this.TB_Smart.Name = "TB_Smart"; - this.TB_Smart.Size = new System.Drawing.Size(31, 20); - this.TB_Smart.TabIndex = 18; - this.TB_Smart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Smart.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cute - // - this.TB_Cute.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cute.Location = new System.Drawing.Point(102, 279); - this.TB_Cute.Mask = "000"; - this.TB_Cute.Name = "TB_Cute"; - this.TB_Cute.Size = new System.Drawing.Size(31, 20); - this.TB_Cute.TabIndex = 17; - this.TB_Cute.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cute.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Beauty - // - this.TB_Beauty.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Beauty.Location = new System.Drawing.Point(65, 279); - this.TB_Beauty.Mask = "000"; - this.TB_Beauty.Name = "TB_Beauty"; - this.TB_Beauty.Size = new System.Drawing.Size(31, 20); - this.TB_Beauty.TabIndex = 16; - this.TB_Beauty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Beauty.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_Cool - // - this.TB_Cool.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_Cool.Location = new System.Drawing.Point(28, 279); - this.TB_Cool.Mask = "000"; - this.TB_Cool.Name = "TB_Cool"; - this.TB_Cool.Size = new System.Drawing.Size(31, 20); - this.TB_Cool.TabIndex = 15; - this.TB_Cool.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_Cool.TextChanged += new System.EventHandler(this.update255_MTB); - // - // TB_SPEIV - // - this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEIV.Location = new System.Drawing.Point(102, 129); - this.TB_SPEIV.Mask = "00"; - this.TB_SPEIV.Name = "TB_SPEIV"; - this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPEIV.TabIndex = 6; - this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPDIV - // - this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDIV.Location = new System.Drawing.Point(102, 107); - this.TB_SPDIV.Mask = "00"; - this.TB_SPDIV.Name = "TB_SPDIV"; - this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPDIV.TabIndex = 5; - this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_SPAIV - // - this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAIV.Location = new System.Drawing.Point(102, 85); - this.TB_SPAIV.Mask = "00"; - this.TB_SPAIV.Name = "TB_SPAIV"; - this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); - this.TB_SPAIV.TabIndex = 4; - this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); - this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_DEFIV - // - this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFIV.Location = new System.Drawing.Point(102, 63); - this.TB_DEFIV.Mask = "00"; - this.TB_DEFIV.Name = "TB_DEFIV"; - this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); - this.TB_DEFIV.TabIndex = 3; - this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); - this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); - // - // TB_ATKIV - // - this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKIV.Location = new System.Drawing.Point(102, 41); - this.TB_ATKIV.Mask = "00"; - this.TB_ATKIV.Name = "TB_ATKIV"; - this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); - this.TB_ATKIV.TabIndex = 2; - this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); - this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); + this.FLP_HPRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPRight.Controls.Add(this.TB_HPIV); + this.FLP_HPRight.Controls.Add(this.TB_HPEV); + this.FLP_HPRight.Controls.Add(this.Stat_HP); + this.FLP_HPRight.Location = new System.Drawing.Point(110, 0); + this.FLP_HPRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPRight.Name = "FLP_HPRight"; + this.FLP_HPRight.Size = new System.Drawing.Size(162, 21); + this.FLP_HPRight.TabIndex = 121; // // TB_HPIV // this.TB_HPIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPIV.Location = new System.Drawing.Point(102, 19); + this.TB_HPIV.Location = new System.Drawing.Point(0, 0); + this.TB_HPIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.TB_HPIV.Mask = "00"; this.TB_HPIV.Name = "TB_HPIV"; this.TB_HPIV.Size = new System.Drawing.Size(22, 20); @@ -1604,140 +2167,553 @@ public void InitializeComponent() this.TB_HPIV.Click += new System.EventHandler(this.clickIV); this.TB_HPIV.TextChanged += new System.EventHandler(this.updateIVs); // - // TB_ATKEV - // - this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_ATKEV.Location = new System.Drawing.Point(130, 41); - this.TB_ATKEV.Mask = "000"; - this.TB_ATKEV.Name = "TB_ATKEV"; - this.TB_ATKEV.Size = new System.Drawing.Size(31, 20); - this.TB_ATKEV.TabIndex = 8; - this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); - this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_DEFEV - // - this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_DEFEV.Location = new System.Drawing.Point(130, 63); - this.TB_DEFEV.Mask = "000"; - this.TB_DEFEV.Name = "TB_DEFEV"; - this.TB_DEFEV.Size = new System.Drawing.Size(31, 20); - this.TB_DEFEV.TabIndex = 9; - this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); - this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPEEV - // - this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPEEV.Location = new System.Drawing.Point(130, 129); - this.TB_SPEEV.Mask = "000"; - this.TB_SPEEV.Name = "TB_SPEEV"; - this.TB_SPEEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPEEV.TabIndex = 12; - this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPDEV - // - this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPDEV.Location = new System.Drawing.Point(130, 107); - this.TB_SPDEV.Mask = "000"; - this.TB_SPDEV.Name = "TB_SPDEV"; - this.TB_SPDEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPDEV.TabIndex = 11; - this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); - // - // TB_SPAEV - // - this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_SPAEV.Location = new System.Drawing.Point(130, 85); - this.TB_SPAEV.Mask = "000"; - this.TB_SPAEV.Name = "TB_SPAEV"; - this.TB_SPAEV.Size = new System.Drawing.Size(31, 20); - this.TB_SPAEV.TabIndex = 10; - this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); - this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); - // // TB_HPEV // this.TB_HPEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_HPEV.Location = new System.Drawing.Point(130, 19); + this.TB_HPEV.Location = new System.Drawing.Point(28, 0); + this.TB_HPEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); this.TB_HPEV.Mask = "000"; this.TB_HPEV.Name = "TB_HPEV"; - this.TB_HPEV.Size = new System.Drawing.Size(31, 20); + this.TB_HPEV.Size = new System.Drawing.Size(28, 20); this.TB_HPEV.TabIndex = 7; this.TB_HPEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.TB_HPEV.Click += new System.EventHandler(this.clickEV); this.TB_HPEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_Sheen + // Stat_HP // - this.Label_Sheen.Location = new System.Drawing.Point(207, 266); - this.Label_Sheen.Name = "Label_Sheen"; - this.Label_Sheen.Size = new System.Drawing.Size(43, 13); - this.Label_Sheen.TabIndex = 39; - this.Label_Sheen.Text = "Sheen"; - this.Label_Sheen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_HP.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_HP.Enabled = false; + this.Stat_HP.Location = new System.Drawing.Point(62, 0); + this.Stat_HP.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_HP.Mask = "00000"; + this.Stat_HP.Name = "Stat_HP"; + this.Stat_HP.PromptChar = ' '; + this.Stat_HP.Size = new System.Drawing.Size(37, 20); + this.Stat_HP.TabIndex = 45; + this.Stat_HP.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.Stat_HP.TextChanged += new System.EventHandler(this.updateHackedStatText); // - // Label_Tough + // FLP_Atk // - this.Label_Tough.Location = new System.Drawing.Point(170, 266); - this.Label_Tough.Name = "Label_Tough"; - this.Label_Tough.Size = new System.Drawing.Size(43, 13); - this.Label_Tough.TabIndex = 38; - this.Label_Tough.Text = "Tough"; - this.Label_Tough.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_Atk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Atk.Controls.Add(this.Label_ATK); + this.FLP_Atk.Controls.Add(this.FLP_AtkRight); + this.FLP_Atk.Location = new System.Drawing.Point(0, 43); + this.FLP_Atk.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Atk.Name = "FLP_Atk"; + this.FLP_Atk.Size = new System.Drawing.Size(272, 21); + this.FLP_Atk.TabIndex = 124; // - // Label_Smart + // Label_ATK // - this.Label_Smart.Location = new System.Drawing.Point(133, 266); - this.Label_Smart.Name = "Label_Smart"; - this.Label_Smart.Size = new System.Drawing.Size(43, 13); - this.Label_Smart.TabIndex = 37; - this.Label_Smart.Text = "Clever"; - this.Label_Smart.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Label_ATK.Location = new System.Drawing.Point(0, 0); + this.Label_ATK.Margin = new System.Windows.Forms.Padding(0); + this.Label_ATK.Name = "Label_ATK"; + this.Label_ATK.Size = new System.Drawing.Size(110, 21); + this.Label_ATK.TabIndex = 20; + this.Label_ATK.Text = "Atk:"; + this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); // - // Label_Cute + // FLP_AtkRight // - this.Label_Cute.Location = new System.Drawing.Point(96, 266); - this.Label_Cute.Name = "Label_Cute"; - this.Label_Cute.Size = new System.Drawing.Size(43, 13); - this.Label_Cute.TabIndex = 36; - this.Label_Cute.Text = "Cute"; - this.Label_Cute.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.FLP_AtkRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_AtkRight.Controls.Add(this.TB_ATKIV); + this.FLP_AtkRight.Controls.Add(this.TB_ATKEV); + this.FLP_AtkRight.Controls.Add(this.Stat_ATK); + this.FLP_AtkRight.Location = new System.Drawing.Point(110, 0); + this.FLP_AtkRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_AtkRight.Name = "FLP_AtkRight"; + this.FLP_AtkRight.Size = new System.Drawing.Size(162, 21); + this.FLP_AtkRight.TabIndex = 123; // - // Label_Beauty + // TB_ATKIV // - this.Label_Beauty.Location = new System.Drawing.Point(59, 266); - this.Label_Beauty.Name = "Label_Beauty"; - this.Label_Beauty.Size = new System.Drawing.Size(43, 13); - this.Label_Beauty.TabIndex = 35; - this.Label_Beauty.Text = "Beauty"; - this.Label_Beauty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKIV.Location = new System.Drawing.Point(0, 0); + this.TB_ATKIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_ATKIV.Mask = "00"; + this.TB_ATKIV.Name = "TB_ATKIV"; + this.TB_ATKIV.Size = new System.Drawing.Size(22, 20); + this.TB_ATKIV.TabIndex = 2; + this.TB_ATKIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKIV.Click += new System.EventHandler(this.clickIV); + this.TB_ATKIV.TextChanged += new System.EventHandler(this.updateIVs); // - // Label_Cool + // TB_ATKEV // - this.Label_Cool.Location = new System.Drawing.Point(22, 266); - this.Label_Cool.Name = "Label_Cool"; - this.Label_Cool.Size = new System.Drawing.Size(43, 13); - this.Label_Cool.TabIndex = 34; - this.Label_Cool.Text = "Cool"; - this.Label_Cool.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.TB_ATKEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_ATKEV.Location = new System.Drawing.Point(28, 0); + this.TB_ATKEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_ATKEV.Mask = "000"; + this.TB_ATKEV.Name = "TB_ATKEV"; + this.TB_ATKEV.Size = new System.Drawing.Size(28, 20); + this.TB_ATKEV.TabIndex = 8; + this.TB_ATKEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_ATKEV.Click += new System.EventHandler(this.clickEV); + this.TB_ATKEV.TextChanged += new System.EventHandler(this.updateEVs); // - // Label_ContestStats + // Stat_ATK // - this.Label_ContestStats.Location = new System.Drawing.Point(67, 250); - this.Label_ContestStats.Name = "Label_ContestStats"; - this.Label_ContestStats.Size = new System.Drawing.Size(140, 13); - this.Label_ContestStats.TabIndex = 33; - this.Label_ContestStats.Text = "Contest Stats"; - this.Label_ContestStats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Stat_ATK.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_ATK.Enabled = false; + this.Stat_ATK.Location = new System.Drawing.Point(62, 0); + this.Stat_ATK.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_ATK.Mask = "00000"; + this.Stat_ATK.Name = "Stat_ATK"; + this.Stat_ATK.PromptChar = ' '; + this.Stat_ATK.Size = new System.Drawing.Size(37, 20); + this.Stat_ATK.TabIndex = 46; + this.Stat_ATK.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Def + // + this.FLP_Def.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Def.Controls.Add(this.Label_DEF); + this.FLP_Def.Controls.Add(this.FLP_DefRight); + this.FLP_Def.Location = new System.Drawing.Point(0, 64); + this.FLP_Def.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Def.Name = "FLP_Def"; + this.FLP_Def.Size = new System.Drawing.Size(272, 21); + this.FLP_Def.TabIndex = 125; + // + // Label_DEF + // + this.Label_DEF.Location = new System.Drawing.Point(0, 0); + this.Label_DEF.Margin = new System.Windows.Forms.Padding(0); + this.Label_DEF.Name = "Label_DEF"; + this.Label_DEF.Size = new System.Drawing.Size(110, 21); + this.Label_DEF.TabIndex = 21; + this.Label_DEF.Text = "Def:"; + this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_DefRight + // + this.FLP_DefRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_DefRight.Controls.Add(this.TB_DEFIV); + this.FLP_DefRight.Controls.Add(this.TB_DEFEV); + this.FLP_DefRight.Controls.Add(this.Stat_DEF); + this.FLP_DefRight.Location = new System.Drawing.Point(110, 0); + this.FLP_DefRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_DefRight.Name = "FLP_DefRight"; + this.FLP_DefRight.Size = new System.Drawing.Size(162, 21); + this.FLP_DefRight.TabIndex = 123; + // + // TB_DEFIV + // + this.TB_DEFIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFIV.Location = new System.Drawing.Point(0, 0); + this.TB_DEFIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_DEFIV.Mask = "00"; + this.TB_DEFIV.Name = "TB_DEFIV"; + this.TB_DEFIV.Size = new System.Drawing.Size(22, 20); + this.TB_DEFIV.TabIndex = 3; + this.TB_DEFIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFIV.Click += new System.EventHandler(this.clickIV); + this.TB_DEFIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_DEFEV + // + this.TB_DEFEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_DEFEV.Location = new System.Drawing.Point(28, 0); + this.TB_DEFEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_DEFEV.Mask = "000"; + this.TB_DEFEV.Name = "TB_DEFEV"; + this.TB_DEFEV.Size = new System.Drawing.Size(28, 20); + this.TB_DEFEV.TabIndex = 9; + this.TB_DEFEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_DEFEV.Click += new System.EventHandler(this.clickEV); + this.TB_DEFEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_DEF + // + this.Stat_DEF.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_DEF.Enabled = false; + this.Stat_DEF.Location = new System.Drawing.Point(62, 0); + this.Stat_DEF.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_DEF.Mask = "00000"; + this.Stat_DEF.Name = "Stat_DEF"; + this.Stat_DEF.PromptChar = ' '; + this.Stat_DEF.Size = new System.Drawing.Size(37, 20); + this.Stat_DEF.TabIndex = 47; + this.Stat_DEF.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpA + // + this.FLP_SpA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpA.Controls.Add(this.FLP_SpALeft); + this.FLP_SpA.Controls.Add(this.FLP_SpARight); + this.FLP_SpA.Location = new System.Drawing.Point(0, 85); + this.FLP_SpA.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpA.Name = "FLP_SpA"; + this.FLP_SpA.Size = new System.Drawing.Size(272, 21); + this.FLP_SpA.TabIndex = 126; + // + // FLP_SpALeft + // + this.FLP_SpALeft.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.FLP_SpALeft.Controls.Add(this.Label_SPA); + this.FLP_SpALeft.Controls.Add(this.Label_SPC); + this.FLP_SpALeft.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; + this.FLP_SpALeft.Location = new System.Drawing.Point(0, 0); + this.FLP_SpALeft.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpALeft.Name = "FLP_SpALeft"; + this.FLP_SpALeft.Size = new System.Drawing.Size(110, 21); + this.FLP_SpALeft.TabIndex = 124; + // + // Label_SPA + // + this.Label_SPA.Location = new System.Drawing.Point(0, 0); + this.Label_SPA.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPA.Name = "Label_SPA"; + this.Label_SPA.Size = new System.Drawing.Size(110, 21); + this.Label_SPA.TabIndex = 22; + this.Label_SPA.Text = "SpA:"; + this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // Label_SPC + // + this.Label_SPC.Location = new System.Drawing.Point(0, 21); + this.Label_SPC.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPC.Name = "Label_SPC"; + this.Label_SPC.Size = new System.Drawing.Size(110, 21); + this.Label_SPC.TabIndex = 125; + this.Label_SPC.Text = "SpC:"; + this.Label_SPC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPC.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpARight + // + this.FLP_SpARight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpARight.Controls.Add(this.TB_SPAIV); + this.FLP_SpARight.Controls.Add(this.TB_SPAEV); + this.FLP_SpARight.Controls.Add(this.Stat_SPA); + this.FLP_SpARight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpARight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpARight.Name = "FLP_SpARight"; + this.FLP_SpARight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpARight.TabIndex = 123; + // + // TB_SPAIV + // + this.TB_SPAIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPAIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPAIV.Mask = "00"; + this.TB_SPAIV.Name = "TB_SPAIV"; + this.TB_SPAIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPAIV.TabIndex = 4; + this.TB_SPAIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPAIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPAEV + // + this.TB_SPAEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPAEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPAEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPAEV.Mask = "000"; + this.TB_SPAEV.Name = "TB_SPAEV"; + this.TB_SPAEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPAEV.TabIndex = 10; + this.TB_SPAEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPAEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPAEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPA + // + this.Stat_SPA.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPA.Enabled = false; + this.Stat_SPA.Location = new System.Drawing.Point(62, 0); + this.Stat_SPA.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPA.Mask = "00000"; + this.Stat_SPA.Name = "Stat_SPA"; + this.Stat_SPA.PromptChar = ' '; + this.Stat_SPA.Size = new System.Drawing.Size(37, 20); + this.Stat_SPA.TabIndex = 48; + this.Stat_SPA.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_SpD + // + this.FLP_SpD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpD.Controls.Add(this.Label_SPD); + this.FLP_SpD.Controls.Add(this.FLP_SpDRight); + this.FLP_SpD.Location = new System.Drawing.Point(0, 106); + this.FLP_SpD.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpD.Name = "FLP_SpD"; + this.FLP_SpD.Size = new System.Drawing.Size(272, 21); + this.FLP_SpD.TabIndex = 127; + // + // Label_SPD + // + this.Label_SPD.Location = new System.Drawing.Point(0, 0); + this.Label_SPD.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPD.Name = "Label_SPD"; + this.Label_SPD.Size = new System.Drawing.Size(110, 21); + this.Label_SPD.TabIndex = 23; + this.Label_SPD.Text = "SpD:"; + this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpDRight + // + this.FLP_SpDRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpDRight.Controls.Add(this.TB_SPDIV); + this.FLP_SpDRight.Controls.Add(this.TB_SPDEV); + this.FLP_SpDRight.Controls.Add(this.Stat_SPD); + this.FLP_SpDRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpDRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpDRight.Name = "FLP_SpDRight"; + this.FLP_SpDRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpDRight.TabIndex = 123; + // + // TB_SPDIV + // + this.TB_SPDIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPDIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPDIV.Mask = "00"; + this.TB_SPDIV.Name = "TB_SPDIV"; + this.TB_SPDIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPDIV.TabIndex = 5; + this.TB_SPDIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPDIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPDEV + // + this.TB_SPDEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPDEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPDEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPDEV.Mask = "000"; + this.TB_SPDEV.Name = "TB_SPDEV"; + this.TB_SPDEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPDEV.TabIndex = 11; + this.TB_SPDEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPDEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPDEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPD + // + this.Stat_SPD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPD.Enabled = false; + this.Stat_SPD.Location = new System.Drawing.Point(62, 0); + this.Stat_SPD.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPD.Mask = "00000"; + this.Stat_SPD.Name = "Stat_SPD"; + this.Stat_SPD.PromptChar = ' '; + this.Stat_SPD.Size = new System.Drawing.Size(37, 20); + this.Stat_SPD.TabIndex = 49; + this.Stat_SPD.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_Spe + // + this.FLP_Spe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Spe.Controls.Add(this.Label_SPE); + this.FLP_Spe.Controls.Add(this.FLP_SpeRight); + this.FLP_Spe.Location = new System.Drawing.Point(0, 127); + this.FLP_Spe.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Spe.Name = "FLP_Spe"; + this.FLP_Spe.Size = new System.Drawing.Size(272, 21); + this.FLP_Spe.TabIndex = 128; + // + // Label_SPE + // + this.Label_SPE.Location = new System.Drawing.Point(0, 0); + this.Label_SPE.Margin = new System.Windows.Forms.Padding(0); + this.Label_SPE.Name = "Label_SPE"; + this.Label_SPE.Size = new System.Drawing.Size(110, 21); + this.Label_SPE.TabIndex = 24; + this.Label_SPE.Text = "Spe:"; + this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); + // + // FLP_SpeRight + // + this.FLP_SpeRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_SpeRight.Controls.Add(this.TB_SPEIV); + this.FLP_SpeRight.Controls.Add(this.TB_SPEEV); + this.FLP_SpeRight.Controls.Add(this.Stat_SPE); + this.FLP_SpeRight.Location = new System.Drawing.Point(110, 0); + this.FLP_SpeRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_SpeRight.Name = "FLP_SpeRight"; + this.FLP_SpeRight.Size = new System.Drawing.Size(162, 21); + this.FLP_SpeRight.TabIndex = 123; + // + // TB_SPEIV + // + this.TB_SPEIV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEIV.Location = new System.Drawing.Point(0, 0); + this.TB_SPEIV.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_SPEIV.Mask = "00"; + this.TB_SPEIV.Name = "TB_SPEIV"; + this.TB_SPEIV.Size = new System.Drawing.Size(22, 20); + this.TB_SPEIV.TabIndex = 6; + this.TB_SPEIV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEIV.Click += new System.EventHandler(this.clickIV); + this.TB_SPEIV.TextChanged += new System.EventHandler(this.updateIVs); + // + // TB_SPEEV + // + this.TB_SPEEV.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_SPEEV.Location = new System.Drawing.Point(28, 0); + this.TB_SPEEV.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_SPEEV.Mask = "000"; + this.TB_SPEEV.Name = "TB_SPEEV"; + this.TB_SPEEV.Size = new System.Drawing.Size(28, 20); + this.TB_SPEEV.TabIndex = 12; + this.TB_SPEEV.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.TB_SPEEV.Click += new System.EventHandler(this.clickEV); + this.TB_SPEEV.TextChanged += new System.EventHandler(this.updateEVs); + // + // Stat_SPE + // + this.Stat_SPE.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.Stat_SPE.Enabled = false; + this.Stat_SPE.Location = new System.Drawing.Point(62, 0); + this.Stat_SPE.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.Stat_SPE.Mask = "00000"; + this.Stat_SPE.Name = "Stat_SPE"; + this.Stat_SPE.PromptChar = ' '; + this.Stat_SPE.Size = new System.Drawing.Size(37, 20); + this.Stat_SPE.TabIndex = 50; + this.Stat_SPE.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // FLP_StatsTotal + // + this.FLP_StatsTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotal.Controls.Add(this.Label_Total); + this.FLP_StatsTotal.Controls.Add(this.FLP_StatsTotalRight); + this.FLP_StatsTotal.Location = new System.Drawing.Point(0, 148); + this.FLP_StatsTotal.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotal.Name = "FLP_StatsTotal"; + this.FLP_StatsTotal.Size = new System.Drawing.Size(272, 21); + this.FLP_StatsTotal.TabIndex = 129; + // + // Label_Total + // + this.Label_Total.Location = new System.Drawing.Point(0, 0); + this.Label_Total.Margin = new System.Windows.Forms.Padding(0); + this.Label_Total.Name = "Label_Total"; + this.Label_Total.Size = new System.Drawing.Size(110, 21); + this.Label_Total.TabIndex = 25; + this.Label_Total.Text = "Total:"; + this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // FLP_StatsTotalRight + // + this.FLP_StatsTotalRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_StatsTotalRight.Controls.Add(this.TB_IVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.TB_EVTotal); + this.FLP_StatsTotalRight.Controls.Add(this.L_Potential); + this.FLP_StatsTotalRight.Location = new System.Drawing.Point(110, 0); + this.FLP_StatsTotalRight.Margin = new System.Windows.Forms.Padding(0); + this.FLP_StatsTotalRight.Name = "FLP_StatsTotalRight"; + this.FLP_StatsTotalRight.Size = new System.Drawing.Size(162, 21); + this.FLP_StatsTotalRight.TabIndex = 123; + // + // TB_IVTotal + // + this.TB_IVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_IVTotal.Enabled = false; + this.TB_IVTotal.Location = new System.Drawing.Point(0, 0); + this.TB_IVTotal.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.TB_IVTotal.MaxLength = 3; + this.TB_IVTotal.Name = "TB_IVTotal"; + this.TB_IVTotal.Size = new System.Drawing.Size(22, 20); + this.TB_IVTotal.TabIndex = 41; + this.TB_IVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // TB_EVTotal + // + this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.TB_EVTotal.Enabled = false; + this.TB_EVTotal.Location = new System.Drawing.Point(28, 0); + this.TB_EVTotal.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.TB_EVTotal.MaxLength = 3; + this.TB_EVTotal.Name = "TB_EVTotal"; + this.TB_EVTotal.Size = new System.Drawing.Size(28, 20); + this.TB_EVTotal.TabIndex = 18; + this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // L_Potential + // + this.L_Potential.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.L_Potential.Location = new System.Drawing.Point(59, 0); + this.L_Potential.Margin = new System.Windows.Forms.Padding(0); + this.L_Potential.Name = "L_Potential"; + this.L_Potential.Size = new System.Drawing.Size(67, 21); + this.L_Potential.TabIndex = 42; + this.L_Potential.Text = "(potential)"; + this.L_Potential.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // FLP_HPType + // + this.FLP_HPType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_HPType.Controls.Add(this.Label_HiddenPowerPrefix); + this.FLP_HPType.Controls.Add(this.CB_HPType); + this.FLP_HPType.Location = new System.Drawing.Point(0, 169); + this.FLP_HPType.Margin = new System.Windows.Forms.Padding(0); + this.FLP_HPType.Name = "FLP_HPType"; + this.FLP_HPType.Size = new System.Drawing.Size(272, 21); + this.FLP_HPType.TabIndex = 130; + // + // Label_HiddenPowerPrefix + // + this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_HiddenPowerPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; + this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(172, 21); + this.Label_HiddenPowerPrefix.TabIndex = 29; + this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; + this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CB_HPType + // + this.CB_HPType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_HPType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.CB_HPType.DropDownWidth = 80; + this.CB_HPType.FormattingEnabled = true; + this.CB_HPType.Location = new System.Drawing.Point(172, 0); + this.CB_HPType.Margin = new System.Windows.Forms.Padding(0); + this.CB_HPType.Name = "CB_HPType"; + this.CB_HPType.Size = new System.Drawing.Size(70, 21); + this.CB_HPType.TabIndex = 44; + this.CB_HPType.SelectedIndexChanged += new System.EventHandler(this.updateHPType); + // + // FLP_Characteristic + // + this.FLP_Characteristic.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.FLP_Characteristic.Controls.Add(this.Label_CharacteristicPrefix); + this.FLP_Characteristic.Controls.Add(this.L_Characteristic); + this.FLP_Characteristic.Location = new System.Drawing.Point(0, 190); + this.FLP_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.FLP_Characteristic.Name = "FLP_Characteristic"; + this.FLP_Characteristic.Size = new System.Drawing.Size(272, 21); + this.FLP_Characteristic.TabIndex = 131; + // + // Label_CharacteristicPrefix + // + this.Label_CharacteristicPrefix.Location = new System.Drawing.Point(0, 0); + this.Label_CharacteristicPrefix.Margin = new System.Windows.Forms.Padding(0); + this.Label_CharacteristicPrefix.Name = "Label_CharacteristicPrefix"; + this.Label_CharacteristicPrefix.Size = new System.Drawing.Size(110, 21); + this.Label_CharacteristicPrefix.TabIndex = 43; + this.Label_CharacteristicPrefix.Text = "Characteristic:"; + this.Label_CharacteristicPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // L_Characteristic + // + this.L_Characteristic.Location = new System.Drawing.Point(110, 0); + this.L_Characteristic.Margin = new System.Windows.Forms.Padding(0); + this.L_Characteristic.Name = "L_Characteristic"; + this.L_Characteristic.Size = new System.Drawing.Size(150, 21); + this.L_Characteristic.TabIndex = 40; + this.L_Characteristic.Text = "(char)"; + this.L_Characteristic.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // BTN_RandomEVs // @@ -1759,122 +2735,6 @@ public void InitializeComponent() this.BTN_RandomIVs.UseVisualStyleBackColor = true; this.BTN_RandomIVs.Click += new System.EventHandler(this.updateRandomIVs); // - // Label_HiddenPowerPrefix - // - this.Label_HiddenPowerPrefix.Location = new System.Drawing.Point(29, 179); - this.Label_HiddenPowerPrefix.Name = "Label_HiddenPowerPrefix"; - this.Label_HiddenPowerPrefix.Size = new System.Drawing.Size(133, 13); - this.Label_HiddenPowerPrefix.TabIndex = 29; - this.Label_HiddenPowerPrefix.Text = "Hidden Power Type:"; - this.Label_HiddenPowerPrefix.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_Stats - // - this.Label_Stats.Location = new System.Drawing.Point(162, 6); - this.Label_Stats.Name = "Label_Stats"; - this.Label_Stats.Size = new System.Drawing.Size(40, 13); - this.Label_Stats.TabIndex = 28; - this.Label_Stats.Text = "Stats"; - this.Label_Stats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_EVs - // - this.Label_EVs.Location = new System.Drawing.Point(125, 6); - this.Label_EVs.Name = "Label_EVs"; - this.Label_EVs.Size = new System.Drawing.Size(40, 13); - this.Label_EVs.TabIndex = 27; - this.Label_EVs.Text = "EVs"; - this.Label_EVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_IVs - // - this.Label_IVs.Location = new System.Drawing.Point(98, 6); - this.Label_IVs.Name = "Label_IVs"; - this.Label_IVs.Size = new System.Drawing.Size(30, 13); - this.Label_IVs.TabIndex = 26; - this.Label_IVs.Text = "IVs"; - this.Label_IVs.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // Label_Total - // - this.Label_Total.Location = new System.Drawing.Point(29, 154); - this.Label_Total.Name = "Label_Total"; - this.Label_Total.Size = new System.Drawing.Size(70, 13); - this.Label_Total.TabIndex = 25; - this.Label_Total.Text = "Total:"; - this.Label_Total.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Label_SPE - // - this.Label_SPE.Location = new System.Drawing.Point(29, 131); - this.Label_SPE.Name = "Label_SPE"; - this.Label_SPE.Size = new System.Drawing.Size(70, 13); - this.Label_SPE.TabIndex = 24; - this.Label_SPE.Text = "Spe:"; - this.Label_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPE.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPD - // - this.Label_SPD.Location = new System.Drawing.Point(29, 109); - this.Label_SPD.Name = "Label_SPD"; - this.Label_SPD.Size = new System.Drawing.Size(70, 13); - this.Label_SPD.TabIndex = 23; - this.Label_SPD.Text = "SpD:"; - this.Label_SPD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPD.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_SPA - // - this.Label_SPA.Location = new System.Drawing.Point(29, 87); - this.Label_SPA.Name = "Label_SPA"; - this.Label_SPA.Size = new System.Drawing.Size(70, 13); - this.Label_SPA.TabIndex = 22; - this.Label_SPA.Text = "SpA:"; - this.Label_SPA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_SPA.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_DEF - // - this.Label_DEF.Location = new System.Drawing.Point(29, 65); - this.Label_DEF.Name = "Label_DEF"; - this.Label_DEF.Size = new System.Drawing.Size(70, 13); - this.Label_DEF.TabIndex = 21; - this.Label_DEF.Text = "Def:"; - this.Label_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_DEF.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_ATK - // - this.Label_ATK.Location = new System.Drawing.Point(29, 43); - this.Label_ATK.Name = "Label_ATK"; - this.Label_ATK.Size = new System.Drawing.Size(70, 13); - this.Label_ATK.TabIndex = 20; - this.Label_ATK.Text = "Atk:"; - this.Label_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_ATK.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // Label_HP - // - this.Label_HP.Location = new System.Drawing.Point(29, 21); - this.Label_HP.Name = "Label_HP"; - this.Label_HP.Size = new System.Drawing.Size(70, 13); - this.Label_HP.TabIndex = 19; - this.Label_HP.Text = "HP:"; - this.Label_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.Label_HP.MouseDown += new System.Windows.Forms.MouseEventHandler(this.clickStatLabel); - // - // TB_EVTotal - // - this.TB_EVTotal.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.TB_EVTotal.Enabled = false; - this.TB_EVTotal.Location = new System.Drawing.Point(130, 151); - this.TB_EVTotal.MaxLength = 3; - this.TB_EVTotal.Name = "TB_EVTotal"; - this.TB_EVTotal.Size = new System.Drawing.Size(31, 20); - this.TB_EVTotal.TabIndex = 18; - this.TB_EVTotal.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // // Tab_Attacks // this.Tab_Attacks.AllowDrop = true; @@ -2714,7 +3574,7 @@ public void InitializeComponent() this.Menu_ExportMAIN.Name = "Menu_ExportMAIN"; this.Menu_ExportMAIN.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); this.Menu_ExportMAIN.ShowShortcutKeys = false; - this.Menu_ExportMAIN.Size = new System.Drawing.Size(130, 22); + this.Menu_ExportMAIN.Size = new System.Drawing.Size(142, 22); this.Menu_ExportMAIN.Text = "&Export main"; this.Menu_ExportMAIN.Click += new System.EventHandler(this.clickExportSAV); // @@ -2724,8 +3584,8 @@ public void InitializeComponent() this.Menu_ExportBAK.Name = "Menu_ExportBAK"; this.Menu_ExportBAK.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); this.Menu_ExportBAK.ShowShortcutKeys = false; - this.Menu_ExportBAK.Size = new System.Drawing.Size(130, 22); - this.Menu_ExportBAK.Text = "Export &BAK"; + this.Menu_ExportBAK.Size = new System.Drawing.Size(142, 22); + this.Menu_ExportBAK.Text = "Export &Backup"; this.Menu_ExportBAK.Click += new System.EventHandler(this.clickExportSAVBAK); // // Menu_Exit @@ -2831,6 +3691,7 @@ public void InitializeComponent() this.Menu_DumpBoxes, this.Menu_Report, this.Menu_Database, + this.Menu_MGDatabase, this.Menu_BatchEditor}); this.Menu_Data.Image = global::PKHeX.Properties.Resources.data; this.Menu_Data.Name = "Menu_Data"; @@ -2841,7 +3702,7 @@ public void InitializeComponent() // this.Menu_LoadBoxes.Image = global::PKHeX.Properties.Resources.load; this.Menu_LoadBoxes.Name = "Menu_LoadBoxes"; - this.Menu_LoadBoxes.Size = new System.Drawing.Size(151, 22); + this.Menu_LoadBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_LoadBoxes.Text = "Load Boxes"; this.Menu_LoadBoxes.Click += new System.EventHandler(this.mainMenuBoxLoad); // @@ -2849,7 +3710,7 @@ public void InitializeComponent() // this.Menu_DumpBoxes.Image = global::PKHeX.Properties.Resources.dump; this.Menu_DumpBoxes.Name = "Menu_DumpBoxes"; - this.Menu_DumpBoxes.Size = new System.Drawing.Size(151, 22); + this.Menu_DumpBoxes.Size = new System.Drawing.Size(182, 22); this.Menu_DumpBoxes.Text = "Dump Boxes"; this.Menu_DumpBoxes.Click += new System.EventHandler(this.mainMenuBoxDump); // @@ -2859,7 +3720,7 @@ public void InitializeComponent() this.Menu_Report.Name = "Menu_Report"; this.Menu_Report.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.Menu_Report.ShowShortcutKeys = false; - this.Menu_Report.Size = new System.Drawing.Size(151, 22); + this.Menu_Report.Size = new System.Drawing.Size(182, 22); this.Menu_Report.Text = "Box Data &Report"; this.Menu_Report.Click += new System.EventHandler(this.mainMenuBoxReport); // @@ -2869,17 +3730,27 @@ public void InitializeComponent() this.Menu_Database.Name = "Menu_Database"; this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); this.Menu_Database.ShowShortcutKeys = false; - this.Menu_Database.Size = new System.Drawing.Size(151, 22); - this.Menu_Database.Text = "PK6 &Database"; + this.Menu_Database.Size = new System.Drawing.Size(182, 22); + this.Menu_Database.Text = "PKM &Database"; this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase); // + // Menu_MGDatabase + // + this.Menu_MGDatabase.Image = global::PKHeX.Properties.Resources.gift; + this.Menu_MGDatabase.Name = "Menu_MGDatabase"; + this.Menu_MGDatabase.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); + this.Menu_MGDatabase.ShowShortcutKeys = false; + this.Menu_MGDatabase.Size = new System.Drawing.Size(182, 22); + this.Menu_MGDatabase.Text = "&Mystery Gift Database"; + this.Menu_MGDatabase.Click += new System.EventHandler(this.mainMenuMysteryDM); + // // Menu_BatchEditor // this.Menu_BatchEditor.Image = global::PKHeX.Properties.Resources.settings; this.Menu_BatchEditor.Name = "Menu_BatchEditor"; this.Menu_BatchEditor.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.M))); this.Menu_BatchEditor.ShowShortcutKeys = false; - this.Menu_BatchEditor.Size = new System.Drawing.Size(151, 22); + this.Menu_BatchEditor.Size = new System.Drawing.Size(182, 22); this.Menu_BatchEditor.Text = "Batch Editor"; this.Menu_BatchEditor.Click += new System.EventHandler(this.manMenuBatchEditor); // @@ -4362,9 +5233,9 @@ public void InitializeComponent() this.FLP_SAVtools.Controls.Add(this.B_OpenOPowers); this.FLP_SAVtools.Controls.Add(this.B_OpenEventFlags); this.FLP_SAVtools.Controls.Add(this.B_OpenPokedex); - this.FLP_SAVtools.Controls.Add(this.B_LinkInfo); + this.FLP_SAVtools.Controls.Add(this.B_OpenLinkInfo); this.FLP_SAVtools.Controls.Add(this.B_OpenBerryField); - this.FLP_SAVtools.Controls.Add(this.B_Pokeblocks); + this.FLP_SAVtools.Controls.Add(this.B_OpenPokeblocks); this.FLP_SAVtools.Controls.Add(this.B_OpenSecretBase); this.FLP_SAVtools.Controls.Add(this.B_OpenPokepuffs); this.FLP_SAVtools.Controls.Add(this.B_OpenSuperTraining); @@ -4446,15 +5317,15 @@ public void InitializeComponent() this.B_OpenPokedex.UseVisualStyleBackColor = true; this.B_OpenPokedex.Click += new System.EventHandler(this.B_OpenPokedex_Click); // - // B_LinkInfo + // B_OpenLinkInfo // - this.B_LinkInfo.Location = new System.Drawing.Point(96, 61); - this.B_LinkInfo.Name = "B_LinkInfo"; - this.B_LinkInfo.Size = new System.Drawing.Size(87, 23); - this.B_LinkInfo.TabIndex = 23; - this.B_LinkInfo.Text = "Link Data"; - this.B_LinkInfo.UseVisualStyleBackColor = true; - this.B_LinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); + this.B_OpenLinkInfo.Location = new System.Drawing.Point(96, 61); + this.B_OpenLinkInfo.Name = "B_OpenLinkInfo"; + this.B_OpenLinkInfo.Size = new System.Drawing.Size(87, 23); + this.B_OpenLinkInfo.TabIndex = 23; + this.B_OpenLinkInfo.Text = "Link Data"; + this.B_OpenLinkInfo.UseVisualStyleBackColor = true; + this.B_OpenLinkInfo.Click += new System.EventHandler(this.B_LinkInfo_Click); // // B_OpenBerryField // @@ -4466,16 +5337,16 @@ public void InitializeComponent() this.B_OpenBerryField.UseVisualStyleBackColor = true; this.B_OpenBerryField.Click += new System.EventHandler(this.B_OpenBerryField_Click); // - // B_Pokeblocks + // B_OpenPokeblocks // - this.B_Pokeblocks.Location = new System.Drawing.Point(3, 90); - this.B_Pokeblocks.Name = "B_Pokeblocks"; - this.B_Pokeblocks.Size = new System.Drawing.Size(87, 23); - this.B_Pokeblocks.TabIndex = 22; - this.B_Pokeblocks.Text = "Pokéblocks"; - this.B_Pokeblocks.UseVisualStyleBackColor = true; - this.B_Pokeblocks.Visible = false; - this.B_Pokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); + this.B_OpenPokeblocks.Location = new System.Drawing.Point(3, 90); + this.B_OpenPokeblocks.Name = "B_OpenPokeblocks"; + this.B_OpenPokeblocks.Size = new System.Drawing.Size(87, 23); + this.B_OpenPokeblocks.TabIndex = 22; + this.B_OpenPokeblocks.Text = "Pokéblocks"; + this.B_OpenPokeblocks.UseVisualStyleBackColor = true; + this.B_OpenPokeblocks.Visible = false; + this.B_OpenPokeblocks.Click += new System.EventHandler(this.B_OpenPokeblocks_Click); // // B_OpenSecretBase // @@ -4631,13 +5502,89 @@ public void InitializeComponent() this.DragEnter += new System.Windows.Forms.DragEventHandler(this.tabMain_DragEnter); this.tabMain.ResumeLayout(false); this.Tab_Main.ResumeLayout(false); - this.Tab_Main.PerformLayout(); + this.FLP_Main.ResumeLayout(false); + this.FLP_PID.ResumeLayout(false); + this.FLP_PIDLeft.ResumeLayout(false); + this.FLP_PIDLeft.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.Label_IsShiny)).EndInit(); + this.FLP_PIDRight.ResumeLayout(false); + this.FLP_PIDRight.PerformLayout(); + this.FLP_Species.ResumeLayout(false); + this.FLP_Nickname.ResumeLayout(false); + this.FLP_Nickname.PerformLayout(); + this.FLP_NicknameLeft.ResumeLayout(false); + this.FLP_NicknameLeft.PerformLayout(); + this.FLP_EXPLevel.ResumeLayout(false); + this.FLP_EXPLevelRight.ResumeLayout(false); + this.FLP_EXPLevelRight.PerformLayout(); + this.FLP_Nature.ResumeLayout(false); + this.FLP_HeldItem.ResumeLayout(false); + this.FLP_FriendshipForm.ResumeLayout(false); + this.FLP_FriendshipFormLeft.ResumeLayout(false); + this.FLP_FriendshipFormRight.ResumeLayout(false); + this.FLP_FriendshipFormRight.PerformLayout(); + this.FLP_Ability.ResumeLayout(false); + this.FLP_AbilityRight.ResumeLayout(false); + this.FLP_AbilityRight.PerformLayout(); + this.FLP_Language.ResumeLayout(false); + this.FLP_EggPKRS.ResumeLayout(false); + this.FLP_EggPKRSLeft.ResumeLayout(false); + this.FLP_EggPKRSLeft.PerformLayout(); + this.FLP_EggPKRSRight.ResumeLayout(false); + this.FLP_EggPKRSRight.PerformLayout(); + this.FLP_PKRS.ResumeLayout(false); + this.FLP_PKRSRight.ResumeLayout(false); + this.FLP_Country.ResumeLayout(false); + this.FLP_SubRegion.ResumeLayout(false); + this.FLP_3DSRegion.ResumeLayout(false); + this.FLP_NSparkle.ResumeLayout(false); + this.FLP_NSparkle.PerformLayout(); this.Tab_Met.ResumeLayout(false); this.Tab_Met.PerformLayout(); this.GB_EggConditions.ResumeLayout(false); + this.FLP_Met.ResumeLayout(false); + this.FLP_OriginGame.ResumeLayout(false); + this.FLP_MetLocation.ResumeLayout(false); + this.FLP_Ball.ResumeLayout(false); + this.FLP_MetLevel.ResumeLayout(false); + this.FLP_MetLevel.PerformLayout(); + this.FLP_MetDate.ResumeLayout(false); + this.FLP_Fateful.ResumeLayout(false); + this.FLP_Fateful.PerformLayout(); + this.FLP_EncounterType.ResumeLayout(false); + this.FLP_TimeOfDay.ResumeLayout(false); this.Tab_Stats.ResumeLayout(false); - this.Tab_Stats.PerformLayout(); + this.PAN_Contest.ResumeLayout(false); + this.PAN_Contest.PerformLayout(); + this.FLP_Stats.ResumeLayout(false); + this.FLP_StatHeader.ResumeLayout(false); + this.FLP_HackedStats.ResumeLayout(false); + this.FLP_HackedStats.PerformLayout(); + this.FLP_StatsHeaderRight.ResumeLayout(false); + this.FLP_HP.ResumeLayout(false); + this.FLP_HPRight.ResumeLayout(false); + this.FLP_HPRight.PerformLayout(); + this.FLP_Atk.ResumeLayout(false); + this.FLP_AtkRight.ResumeLayout(false); + this.FLP_AtkRight.PerformLayout(); + this.FLP_Def.ResumeLayout(false); + this.FLP_DefRight.ResumeLayout(false); + this.FLP_DefRight.PerformLayout(); + this.FLP_SpA.ResumeLayout(false); + this.FLP_SpALeft.ResumeLayout(false); + this.FLP_SpARight.ResumeLayout(false); + this.FLP_SpARight.PerformLayout(); + this.FLP_SpD.ResumeLayout(false); + this.FLP_SpDRight.ResumeLayout(false); + this.FLP_SpDRight.PerformLayout(); + this.FLP_Spe.ResumeLayout(false); + this.FLP_SpeRight.ResumeLayout(false); + this.FLP_SpeRight.PerformLayout(); + this.FLP_StatsTotal.ResumeLayout(false); + this.FLP_StatsTotalRight.ResumeLayout(false); + this.FLP_StatsTotalRight.PerformLayout(); + this.FLP_HPType.ResumeLayout(false); + this.FLP_Characteristic.ResumeLayout(false); this.Tab_Attacks.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_WarnMove3)).EndInit(); @@ -4772,15 +5719,11 @@ public void InitializeComponent() private System.Windows.Forms.Label Label_Nature; private System.Windows.Forms.Label Label_CurLevel; private System.Windows.Forms.Button BTN_RerollPID; - private System.Windows.Forms.ComboBox CB_3DSReg; - private System.Windows.Forms.ComboBox CB_SubRegion; private System.Windows.Forms.ComboBox CB_Country; private System.Windows.Forms.ComboBox CB_PKRSDays; private System.Windows.Forms.ComboBox CB_PKRSStrain; private System.Windows.Forms.ComboBox CB_Language; private System.Windows.Forms.ComboBox CB_Ability; - private System.Windows.Forms.Label Label_3DSRegion; - private System.Windows.Forms.Label Label_SubRegion; private System.Windows.Forms.Label Label_Country; private System.Windows.Forms.Label Label_PKRSdays; private System.Windows.Forms.Label Label_PKRS; @@ -4810,19 +5753,11 @@ public void InitializeComponent() private System.Windows.Forms.ComboBox CB_RelearnMove1; private System.Windows.Forms.Label Label_CurPP; private System.Windows.Forms.Label Label_PPups; - private System.Windows.Forms.Label Label_Sheen; - private System.Windows.Forms.Label Label_Tough; - private System.Windows.Forms.Label Label_Smart; - private System.Windows.Forms.Label Label_Cute; - private System.Windows.Forms.Label Label_Beauty; - private System.Windows.Forms.Label Label_Cool; - private System.Windows.Forms.Label Label_ContestStats; private System.Windows.Forms.Button BTN_RandomEVs; private System.Windows.Forms.Button BTN_RandomIVs; private System.Windows.Forms.Label Label_HiddenPowerPrefix; private System.Windows.Forms.Label Label_Stats; private System.Windows.Forms.Label Label_EVs; - private System.Windows.Forms.Label Label_IVs; private System.Windows.Forms.Label Label_Total; private System.Windows.Forms.Label Label_SPE; private System.Windows.Forms.Label Label_SPD; @@ -4858,12 +5793,6 @@ public void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_DEFIV; private System.Windows.Forms.MaskedTextBox TB_ATKIV; private System.Windows.Forms.MaskedTextBox TB_HPIV; - private System.Windows.Forms.MaskedTextBox TB_Sheen; - private System.Windows.Forms.MaskedTextBox TB_Tough; - private System.Windows.Forms.MaskedTextBox TB_Smart; - private System.Windows.Forms.MaskedTextBox TB_Cute; - private System.Windows.Forms.MaskedTextBox TB_Beauty; - private System.Windows.Forms.MaskedTextBox TB_Cool; private System.Windows.Forms.MaskedTextBox TB_SID; private System.Windows.Forms.MaskedTextBox TB_TID; private System.Windows.Forms.MaskedTextBox TB_Level; @@ -4874,7 +5803,6 @@ public void InitializeComponent() private System.Windows.Forms.CheckBox CHK_Infected; private System.Windows.Forms.ComboBox CB_Form; private System.Windows.Forms.Label Label_Gender; - private System.Windows.Forms.CheckBox CHK_Nicknamed; private System.Windows.Forms.Button BTN_Shinytize; private System.Windows.Forms.MaskedTextBox TB_AbilityNumber; private System.Windows.Forms.MaskedTextBox TB_MetLevel; @@ -5081,13 +6009,96 @@ public void InitializeComponent() private System.Windows.Forms.FlowLayoutPanel FLP_SAVtools; private System.Windows.Forms.GroupBox GB_SAVtools; private System.Windows.Forms.PictureBox PB_Mark1; - private System.Windows.Forms.Button B_Pokeblocks; + private System.Windows.Forms.Button B_OpenPokeblocks; private System.Windows.Forms.ToolStripMenuItem Menu_BatchEditor; private System.Windows.Forms.Button BTN_Medals; private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors; - private System.Windows.Forms.Button B_LinkInfo; + private System.Windows.Forms.Button B_OpenLinkInfo; private System.Windows.Forms.Button B_CGearSkin; private System.Windows.Forms.LinkLabel L_UpdateAvailable; + private System.Windows.Forms.Label L_MetTimeOfDay; + public System.Windows.Forms.ComboBox CB_MetTimeOfDay; + private System.Windows.Forms.ToolStripMenuItem Menu_MGDatabase; + private System.Windows.Forms.FlowLayoutPanel FLP_Main; + private System.Windows.Forms.FlowLayoutPanel FLP_PID; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_PIDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Species; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_EXPLevelRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Nature; + private System.Windows.Forms.FlowLayoutPanel FLP_HeldItem; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipForm; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_FriendshipFormRight; + private System.Windows.Forms.FlowLayoutPanel FLP_Ability; + private System.Windows.Forms.FlowLayoutPanel FLP_Language; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRS; + private System.Windows.Forms.FlowLayoutPanel FLP_Country; + private System.Windows.Forms.FlowLayoutPanel FLP_PKRSRight; + private System.Windows.Forms.FlowLayoutPanel FLP_EggPKRSLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_AbilityRight; + private System.Windows.Forms.CheckBox CHK_Nicknamed; + private System.Windows.Forms.FlowLayoutPanel FLP_NicknameLeft; + private System.Windows.Forms.FlowLayoutPanel FLP_Nickname; + private System.Windows.Forms.CheckBox CHK_NSparkle; + private System.Windows.Forms.Label L_NSparkle; + private System.Windows.Forms.FlowLayoutPanel FLP_NSparkle; + private System.Windows.Forms.ComboBox CB_3DSReg; + private System.Windows.Forms.Label Label_3DSRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_3DSRegion; + private System.Windows.Forms.ComboBox CB_SubRegion; + private System.Windows.Forms.Label Label_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_SubRegion; + private System.Windows.Forms.FlowLayoutPanel FLP_Met; + private System.Windows.Forms.FlowLayoutPanel FLP_OriginGame; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLocation; + private System.Windows.Forms.FlowLayoutPanel FLP_Ball; + private System.Windows.Forms.FlowLayoutPanel FLP_MetLevel; + private System.Windows.Forms.FlowLayoutPanel FLP_MetDate; + private System.Windows.Forms.FlowLayoutPanel FLP_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_EncounterType; + private System.Windows.Forms.FlowLayoutPanel FLP_TimeOfDay; + private System.Windows.Forms.Panel PAN_Fateful; + private System.Windows.Forms.FlowLayoutPanel FLP_Stats; + private System.Windows.Forms.FlowLayoutPanel FLP_StatHeader; + private System.Windows.Forms.FlowLayoutPanel FLP_HP; + private System.Windows.Forms.FlowLayoutPanel FLP_Atk; + private System.Windows.Forms.FlowLayoutPanel FLP_Def; + private System.Windows.Forms.FlowLayoutPanel FLP_SpA; + private System.Windows.Forms.FlowLayoutPanel FLP_SpD; + private System.Windows.Forms.FlowLayoutPanel FLP_Spe; + private System.Windows.Forms.FlowLayoutPanel FLP_HPRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HPType; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotal; + private System.Windows.Forms.FlowLayoutPanel FLP_Characteristic; + private System.Windows.Forms.FlowLayoutPanel FLP_DefRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpDRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpeRight; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsTotalRight; + private System.Windows.Forms.FlowLayoutPanel FLP_HackedStats; + private System.Windows.Forms.FlowLayoutPanel FLP_AtkRight; + private System.Windows.Forms.FlowLayoutPanel FLP_SpARight; + private System.Windows.Forms.Label Label_SPC; + private System.Windows.Forms.FlowLayoutPanel FLP_SpALeft; + private System.Windows.Forms.FlowLayoutPanel FLP_StatsHeaderRight; + private System.Windows.Forms.Panel PAN_Contest; + private System.Windows.Forms.Label Label_ContestStats; + private System.Windows.Forms.Label Label_Cool; + private System.Windows.Forms.Label Label_Beauty; + private System.Windows.Forms.Label Label_Cute; + private System.Windows.Forms.Label Label_Smart; + private System.Windows.Forms.Label Label_Tough; + private System.Windows.Forms.Label Label_Sheen; + private System.Windows.Forms.MaskedTextBox TB_Cool; + private System.Windows.Forms.MaskedTextBox TB_Beauty; + private System.Windows.Forms.MaskedTextBox TB_Cute; + private System.Windows.Forms.MaskedTextBox TB_Smart; + private System.Windows.Forms.MaskedTextBox TB_Tough; + private System.Windows.Forms.MaskedTextBox TB_Sheen; + private System.Windows.Forms.Label Label_IVs; } } diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs index ad274d416..194d238f4 100644 --- a/PKHeX/MainWindow/Main.cs +++ b/PKHeX/MainWindow/Main.cs @@ -67,8 +67,7 @@ public Main() }; relearnPB = new[] { PB_WarnRelearn1, PB_WarnRelearn2, PB_WarnRelearn3, PB_WarnRelearn4 }; movePB = new[] { PB_WarnMove1, PB_WarnMove2, PB_WarnMove3, PB_WarnMove4 }; - defaultControlWhite = CB_Species.BackColor; - defaultControlText = Label_Species.ForeColor; + Label_Species.ResetForeColor(); // Set up Language Selection foreach (var cbItem in main_langlist) @@ -78,7 +77,7 @@ public Main() new ToolTip().SetToolTip(dragout, "PKM QuickSave"); // Box Drag & Drop - foreach (PictureBox pb in PAN_Box.Controls) + foreach (PictureBox pb in SlotPictureBoxes) { pb.AllowDrop = true; // The PictureBoxes have their own drag&drop event handlers (pbBoxSlot) pb.GiveFeedback += (sender, e) => { e.UseDefaultCursors = false; }; @@ -173,15 +172,14 @@ public Main() #region Important Variables public static PKM pkm = new PK6(); // Tab Pokemon Data Storage public static SaveFile SAV = new SAV6 { Game = (int)GameVersion.AS, OT = "PKHeX", TID = 12345, SID = 54321, Language = 2, Country = 49, SubRegion = 7, ConsoleRegion = 1 }; // Save File - public static Color defaultControlWhite, defaultControlText; public static string eggname = ""; public static string curlanguage = "en"; public static string[] gendersymbols = { "♂", "♀", "-" }; public static string[] specieslist, movelist, itemlist, abilitylist, types, natures, forms, memories, genloc, trainingbags, trainingstage, characteristics, - encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items = { }; - public static string[] metRSEFRLG_00000 = { }; + encountertypelist, gamelanguages, balllist, gamelist, pokeblocks, g3items, g2items, g1items = { }; + public static string[] metGSC_00000, metRSEFRLG_00000 = { }; public static string[] metHGSS_00000, metHGSS_02000, metHGSS_03000 = { }; public static string[] metBW2_00000, metBW2_30000, metBW2_40000, metBW2_60000 = { }; public static string[] metXY_00000, metXY_30000, metXY_40000, metXY_60000 = { }; @@ -219,7 +217,7 @@ public Main() public static string WorkingDirectory => Environment.CurrentDirectory; public static string DatabasePath => Path.Combine(WorkingDirectory, "db"); - private static string WC6DatabasePath => Path.Combine(WorkingDirectory, "wc6"); + public static string WC6DatabasePath => Path.Combine(WorkingDirectory, "wc6"); private static string BackupPath => Path.Combine(WorkingDirectory, "bak"); private static string ThreadPath => @"https://projectpokemon.org/forums/showthread.php?36986"; private static string VersionPath => @"https://raw.githubusercontent.com/kwsch/PKHeX/master/PKHeX/Resources/text/version.txt"; @@ -338,6 +336,15 @@ private void mainMenuDatabase(object sender, EventArgs e) Util.Alert("PKHeX's database was not found.", $"Please dump all boxes from a save file, then ensure the '{DatabasePath}' folder exists."); } + private void mainMenuMysteryDM(object sender, EventArgs e) + { + var z = Application.OpenForms.Cast
().FirstOrDefault(form => form.GetType() == typeof(SAV_MysteryGiftDB)) as SAV_MysteryGiftDB; + if (z != null) + { Util.CenterToForm(z, this); z.BringToFront(); return; } + + new SAV_MysteryGiftDB(this).Show(); + + } private void mainMenuUnicode(object sender, EventArgs e) { unicode = Menu_Unicode.Checked; @@ -423,9 +430,12 @@ private void clickShowdownImportPK6(object sender, EventArgs e) if (Set.Species < 0) { Util.Alert("Set data not found in clipboard."); return; } - if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Import this set?", Clipboard.GetText())) + if (DialogResult.Yes != Util.Prompt(MessageBoxButtons.YesNo, "Import this set?", Set.getText())) { return; } + if (Set.InvalidLines.Any()) + Util.Alert("Invalid lines detected:", string.Join(Environment.NewLine, Set.InvalidLines)); + // Set Species & Nickname CB_Species.SelectedValue = Set.Species; CHK_Nicknamed.Checked = Set.Nickname != null; @@ -789,6 +799,8 @@ private void openSAV(byte[] input, string path) private void loadSAV(SaveFile sav, string path) { PKM pk = preparePKM(); + // clean fields + populateFields(SAV.BlankPKM); SAV = sav; if (path != null) // Actual save file @@ -797,7 +809,7 @@ private void loadSAV(SaveFile sav, string path) SAV.FileName = Path.GetExtension(path) == ".bak" ? Path.GetFileName(path).Split(new[] { " [" }, StringSplitOptions.None)[0] : Path.GetFileName(path); - Text = "PKHeX - " + $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"SAV{SAV.Generation}: {Path.GetFileNameWithoutExtension(Util.CleanFileName(SAV.BAKName))}"; // more descriptive // If backup folder exists, save a backup. string backupName = Path.Combine(BackupPath, Util.CleanFileName(SAV.BAKName)); @@ -810,7 +822,7 @@ private void loadSAV(SaveFile sav, string path) { SAV.FilePath = null; SAV.FileName = "Blank Save File"; - Text = "PKHeX - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; + Text = $"PKH{(HaX ? "a" : "e")}X - " + $"SAV{SAV.Generation}: {SAV.FileName} [{SAV.OT} ({SAV.Version})]"; GB_SAVtools.Visible = false; } @@ -830,13 +842,29 @@ private void loadSAV(SaveFile sav, string path) } setPKXBoxes(); // Reload all of the PKX Windows + bool WindowTranslationRequired = false; + // Hide content if not present in game. GB_SUBE.Visible = SAV.HasSUBE; PB_Locked.Visible = SAV.HasBattleBox && SAV.BattleBoxLocked; - PAN_Box.Visible = CB_BoxSelect.Visible = B_BoxLeft.Visible = B_BoxRight.Visible = SAV.HasBox; + if (!SAV.HasBox && tabBoxMulti.TabPages.Contains(Tab_Box)) + tabBoxMulti.TabPages.Remove(Tab_Box); + else if (SAV.HasBox && !tabBoxMulti.TabPages.Contains(Tab_Box)) + { + tabBoxMulti.TabPages.Insert(0, Tab_Box); + WindowTranslationRequired = true; + } Menu_LoadBoxes.Enabled = Menu_DumpBoxes.Enabled = Menu_Report.Enabled = Menu_Modify.Enabled = B_SaveBoxBin.Enabled = SAV.HasBox; + if (!SAV.HasDaycare && tabBoxMulti.TabPages.Contains(Tab_Other)) + tabBoxMulti.TabPages.Remove(Tab_Other); + else if (SAV.HasDaycare && !tabBoxMulti.TabPages.Contains(Tab_Other)) + { + tabBoxMulti.TabPages.Insert(tabBoxMulti.TabPages.IndexOf(Tab_PartyBattle) + 1, Tab_Other); + WindowTranslationRequired = true; + } + if (path != null) // Actual save file { PAN_BattleBox.Visible = L_BattleBox.Visible = L_ReadOnlyPBB.Visible = SAV.HasBattleBox; @@ -853,10 +881,10 @@ private void loadSAV(SaveFile sav, string path) B_OpenOPowers.Visible = SAV.HasOPower; B_OpenPokedex.Visible = SAV.HasPokeDex; B_OpenBerryField.Visible = SAV.HasBerryField && SAV.XY; - B_Pokeblocks.Visible = SAV.HasPokeBlock; + B_OpenPokeblocks.Visible = SAV.HasPokeBlock; B_JPEG.Visible = SAV.HasJPEG; B_OpenEventFlags.Visible = SAV.HasEvents; - B_LinkInfo.Visible = SAV.HasLink; + B_OpenLinkInfo.Visible = SAV.HasLink; B_CGearSkin.Visible = SAV.Generation == 5; } @@ -864,8 +892,7 @@ private void loadSAV(SaveFile sav, string path) byte[] extraBytes = new byte[1]; Tip1.RemoveAll(); Tip2.RemoveAll(); Tip3.RemoveAll(); // TSV/PSV - CB_Country.Visible = CB_SubRegion.Visible = CB_3DSReg.Visible = - Label_Country.Visible = Label_SubRegion.Visible = Label_3DSRegion.Visible = SAV.Generation >= 6; + FLP_Country.Visible = FLP_SubRegion.Visible = FLP_3DSRegion.Visible = SAV.Generation >= 6; Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6; GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6; PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6; @@ -873,77 +900,93 @@ private void loadSAV(SaveFile sav, string path) PB_MarkPentagon.Visible = SAV.Generation == 6; TB_GameSync.Visible = TB_Secure1.Visible = TB_Secure2.Visible = L_GameSync.Visible = L_Secure1.Visible = L_Secure2.Visible = SAV.Exportable && SAV.Generation == 6; - CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = - Label_MetDate.Visible = CAL_MetDate.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; + FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = SAV.Generation == 5; + + CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4; - BTN_Ribbons.Visible = SAV.Generation >= 3; DEV_Ability.Enabled = DEV_Ability.Visible = SAV.Generation > 3 && HaX; - TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; CB_Ability.Visible = !DEV_Ability.Enabled && SAV.Generation >= 3; + FLP_Nature.Visible = SAV.Generation >= 3; + FLP_Ability.Visible = SAV.Generation >= 3; + FLP_Language.Visible = SAV.Generation >= 3; + GB_ExtraBytes.Visible = GB_ExtraBytes.Enabled = SAV.Generation >= 3; + GB_Markings.Visible = SAV.Generation >= 3; + BTN_Ribbons.Visible = SAV.Generation >= 3; + CB_HPType.Enabled = CB_Form.Enabled = SAV.Generation >= 3; + BTN_RerollPID.Visible = Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; - GB_ExtraBytes.Visible = SAV.Generation > 1; - GB_Markings.Visible = SAV.Generation > 2; + FLP_FriendshipForm.Visible = SAV.Generation >= 2; + FLP_HeldItem.Visible = SAV.Generation >= 2; + CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation >= 2; + FLP_PKRS.Visible = FLP_EggPKRSRight.Visible = SAV.Generation >= 2; + Label_OTGender.Visible = SAV.Generation >= 2; - Label_HeldItem.Visible = CB_HeldItem.Visible = SAV.Generation > 1; - Label_Total.Visible = TB_IVTotal.Visible = TB_EVTotal.Visible = L_Potential.Visible = - Label_HiddenPowerPrefix.Visible = CB_HPType.Visible = SAV.Generation > 1; - Label_CharacteristicPrefix.Visible = L_Characteristic.Visible = SAV.Generation > 1; - Label_ContestStats.Visible = Label_Cool.Visible = Label_Tough.Visible = Label_Smart.Visible = - Label_Sheen.Visible = Label_Beauty.Visible = Label_Cute.Visible = TB_Cool.Visible = TB_Tough.Visible = - TB_Smart.Visible = TB_Sheen.Visible = TB_Beauty.Visible = TB_Cute.Visible = Label_Nature.Visible = - CB_Nature.Visible = Label_Language.Visible = CB_Language.Visible = Label_Ability.Visible = - Label_Friendship.Visible = Label_HatchCounter.Visible = TB_Friendship.Visible = BTN_RerollPID.Visible = - Label_PID.Visible = TB_PID.Visible = Label_SID.Visible = TB_SID.Visible = SAV.Generation >= 3; + if (SAV.Generation == 1) + Label_IsShiny.Visible = false; + + // HaX override, needs to be after DEV_Ability enabled assignment. + TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled; // Met Tab - CHK_Fateful.Visible = Label_OriginGame.Visible = Label_Ball.Visible = Label_MetLevel.Visible = - CB_MetLocation.Visible = Label_MetLocation.Visible = SAV.Generation > 2 || (SAV.Version == GameVersion.GSC); - CB_GameOrigin.Visible = CB_Ball.Visible = TB_MetLevel.Visible = SAV.Generation > 2; + FLP_MetDate.Visible = SAV.Generation >= 4; + FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = SAV.Generation >= 3; + FLP_MetLocation.Visible = FLP_MetLevel.Visible = SAV.Generation >= 2; + FLP_TimeOfDay.Visible = SAV.Generation == 2; - CHK_Infected.Visible = CHK_Cured.Visible = SAV.Generation >= 3; + // Stats + FLP_StatsTotal.Visible = SAV.Generation >= 3; + FLP_Characteristic.Visible = SAV.Generation >= 3; + FLP_HPType.Visible = SAV.Generation >= 2; + + PAN_Contest.Visible = SAV.Generation >= 3; // Second daycare slot - SlotPictureBoxes[43].Visible = SAV.Generation > 1; + SlotPictureBoxes[43].Visible = SAV.Generation >= 2; - CHK_IsEgg.Visible = Label_Gender.Visible = SAV.Generation > 1; - - Label_OTGender.Visible = SAV.Generation > 1; - - if (1 <= sav.Generation && sav.Generation <= 2) + if (sav.Generation == 1) { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = false; - Label_SPA.Text = "Spc"; - TB_HPIV.ReadOnly = true; + FLP_SpD.Visible = false; + Label_SPA.Visible = false; + Label_SPC.Visible = true; + TB_HPIV.Enabled = false; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "00000"; - ctrl.Size = new Size(37, 20); + ctrl.Size = Stat_HP.Size; + } + } + else if (sav.Generation == 2) + { + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = false; + TB_HPIV.Enabled = false; + MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; + foreach (var ctrl in evControls) + { + ctrl.Mask = "00000"; + ctrl.Size = Stat_HP.Size; } - Control[] statControls = {Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE}; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(173, ctrl.Location.Y); - Label_Stats.Location = new Point(168, Label_Stats.Location.Y); } else { - Label_SPD.Visible = TB_SPDEV.Visible = TB_SPDIV.Visible = Stat_SPD.Visible = true; - Label_SPA.Text = "SpA"; - TB_HPIV.ReadOnly = false; + FLP_SpD.Visible = true; + Label_SPA.Visible = true; + Label_SPC.Visible = false; + TB_SPDEV.Enabled = TB_SPDIV.Enabled = true; + TB_HPIV.Enabled = true; MaskedTextBox[] evControls = { TB_SPAEV, TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPEEV, TB_SPDEV }; foreach (var ctrl in evControls) { ctrl.Mask = "000"; - ctrl.Size = new Size(31, 20); + ctrl.Size = TB_ExtraByte.Size; } - Control[] statControls = { Stat_HP, Stat_ATK, Stat_DEF, Stat_SPA, Stat_SPD, Stat_SPE }; - foreach (Control ctrl in statControls) - ctrl.Location = new Point(167, ctrl.Location.Y); - Label_Stats.Location = new Point(162, Label_Stats.Location.Y); } // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y); switch (SAV.Generation) { @@ -952,6 +995,11 @@ private void loadSAV(SaveFile sav, string path) getPKMfromFields = preparePK1; extraBytes = new byte[] {}; break; + case 2: + getFieldsfromPKM = populateFieldsPK2; + getPKMfromFields = preparePK2; + extraBytes = new byte[] { }; + break; case 3: getFieldsfromPKM = populateFieldsPK3; getPKMfromFields = preparePK3; @@ -979,9 +1027,10 @@ private void loadSAV(SaveFile sav, string path) break; } bool init = fieldsInitialized; - fieldsInitialized = false; + fieldsInitialized = fieldsLoaded = false; + pkm = (pkm.Format != SAV.Generation || SAV.Generation < 3) ? SAV.BlankPKM : pk; populateFilteredDataSources(); - populateFields((pkm.Format != SAV.Generation || SAV.Generation == 1) ? SAV.BlankPKM : pk); + populateFields(pkm); fieldsInitialized |= init; // SAV Specific Limits @@ -989,12 +1038,21 @@ private void loadSAV(SaveFile sav, string path) TB_OTt2.MaxLength = SAV.OTLength; TB_Nickname.MaxLength = SAV.NickLength; + // Hide Unused Tabs + if (SAV.Generation == 1 && tabMain.TabPages.Contains(Tab_Met)) + tabMain.TabPages.Remove(Tab_Met); + else if (SAV.Generation != 1 && !tabMain.TabPages.Contains(Tab_Met)) + { + tabMain.TabPages.Insert(1, Tab_Met); + WindowTranslationRequired = true; + } + // Common HaX Interface CHK_HackedStats.Enabled = CHK_HackedStats.Visible = MT_Level.Enabled = MT_Level.Visible = MT_Form.Enabled = MT_Form.Visible = HaX; TB_Level.Visible = !HaX; // Load Extra Byte List - if (GB_ExtraBytes.Visible) + if (GB_ExtraBytes.Enabled) { CB_ExtraBytes.Items.Clear(); foreach (byte b in extraBytes) @@ -1002,9 +1060,16 @@ private void loadSAV(SaveFile sav, string path) CB_ExtraBytes.SelectedIndex = 0; } + // pk2 save files do not have an Origin Game stored. Prompt the met location list to update. + if (SAV.Generation == 2) + updateOriginGame(null, null); + // Refresh PK#->PK6 conversion info PKMConverter.updateConfig(SAV.SubRegion, SAV.Country, SAV.ConsoleRegion, SAV.OT, SAV.Gender); + if (WindowTranslationRequired) // force update -- re-added controls may be untranslated + Util.TranslateInterface(this, curlanguage); + // Indicate audibly the save is loaded SystemSounds.Beep.Play(); } @@ -1022,7 +1087,7 @@ private static void refreshWC6DB() for (int i = 0; i < wc6full.Length; i += WC6.SizeFull) { byte[] data = new byte[WC6.SizeFull]; - Array.Copy(wc6bin, i, data, 0, WC6.SizeFull); + Array.Copy(wc6full, i, data, 0, WC6.SizeFull); wc6db.Add(new WC6(data)); } @@ -1046,7 +1111,7 @@ private void changeMainLanguage(object sender, EventArgs e) InitializeLanguage(); Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex]); // Translate the UI to language. // Recenter PKM SubEditors - FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); + FLP_PKMEditors.Location = new Point((Tab_OTMisc.Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y); populateFields(pk); // put data back in form fieldsInitialized |= alreadyInit; @@ -1059,12 +1124,16 @@ private void InitializeStrings() if (CB_MainLanguage.SelectedIndex < 8) curlanguage = lang_val[CB_MainLanguage.SelectedIndex]; + string l = curlanguage; + // Past Generation strings - g3items = Util.getStringList("ItemsG3", "en"); - metRSEFRLG_00000 = Util.getStringList("rsefrlg_00000", "en"); + g3items = Util.getStringListFallback("ItemsG3", l, "en"); + g2items = Util.getStringListFallback("ItemsG2", l, "en"); + g1items = Util.getStringListFallback("ItemsG1", l, "en"); + metRSEFRLG_00000 = Util.getStringListFallback("rsefrlg_00000", l, "en"); + metGSC_00000 = Util.getStringListFallback("gsc_00000", l, "en"); // Current Generation strings - string l = curlanguage; natures = Util.getStringList("natures", l); types = Util.getStringList("types", l); abilitylist = Util.getAbilitiesList(l); @@ -1092,7 +1161,14 @@ private void InitializeStrings() puffs = Util.getStringList("puff", l); } + // Gen4 Mail names not stored in future games. No clever solution like for HM's, so improvise. + for (int i = 137; i <= 148; i++) + itemlist[i] = $"Mail #{i-137+1} (G4)"; + // Fix Item Names (Duplicate entries) + int len = itemlist[425].Length; + itemlist[426] = itemlist[425].Substring(0, len-1) + (char)(itemlist[425][len-1]+1) + " (G4)"; + itemlist[427] = itemlist[425].Substring(0, len-1) + (char)(itemlist[425][len-1]+2) + " (G4)"; itemlist[456] += " (HG/SS)"; // S.S. Ticket itemlist[736] += " (OR/AS)"; // S.S. Ticket itemlist[463] += " (DPPt)"; // Storage Key @@ -1226,9 +1302,9 @@ private void InitializeLanguage() #region Met Locations // Gen 2 { - var met_list = Util.getCBList(metRSEFRLG_00000, Enumerable.Range(0, 0x5F).ToArray()); - met_list = Util.getOffsetCBList(met_list, metRSEFRLG_00000, 00000, new[] { 253, 254, 255 }); - metGen2 = null; + var met_list = Util.getCBList(metGSC_00000, Enumerable.Range(0, 0x5F).ToArray()); + met_list = Util.getOffsetCBList(met_list, metGSC_00000, 00000, new[] { 0x7E, 0x7F }); + metGen2 = met_list; } // Gen 3 { @@ -1284,6 +1360,8 @@ private void populateFilteredDataSources() string[] items = itemlist; if (SAV.Generation == 3) items = g3items; + if (SAV.Generation == 2) + items = g2items; ItemDataSource = Util.getCBList(items, (HaX ? Enumerable.Range(0, SAV.MaxItemID) : SAV.HeldItems.Select(i => (int)i)).ToArray()); CB_HeldItem.DataSource = new BindingSource(ItemDataSource.Where(i => i.Value <= SAV.MaxItemID).ToList(), null); @@ -1307,9 +1385,10 @@ private void populateFilteredDataSources() public void populateFields(PKM pk, bool focus = true) { if (pk == null) { Util.Error("Attempted to load a null file."); return; } - - if (pk.Format > SAV.Generation) - { Util.Alert("Can't load future generation files."); return; } + + if ((pk.Format >= 3 && pk.Format > SAV.Generation) // pk3-7, can't go backwards + || (pk.Format <= 2 && SAV.Generation > 2 && SAV.Generation < 7)) // pk1-2, can't go 3-6 + { Util.Alert($"Can't load Gen{pk.Format} to Gen{SAV.Generation} games."); return; } bool oldInit = fieldsInitialized; fieldsInitialized = fieldsLoaded = false; @@ -1329,7 +1408,8 @@ public void populateFields(PKM pk, bool focus = true) Util.Alert("Converted File."); } - getFieldsfromPKM(); + try { getFieldsfromPKM(); } + catch { fieldsInitialized = oldInit; throw; } CB_EncounterType.Visible = Label_EncounterType.Visible = pkm.Gen4; fieldsInitialized = oldInit; @@ -1353,6 +1433,9 @@ public void populateFields(PKM pk, bool focus = true) } fieldsLoaded = true; + Label_HatchCounter.Visible = CHK_IsEgg.Checked && SAV.Generation > 1; + Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 1; + // Set the Preview Box dragout.Image = pk.Sprite; updateLegality(); @@ -1382,6 +1465,11 @@ private void setForms() bool hasForms = SAV.Personal[species].HasFormes || new[] { 201, 664, 665, 414 }.Contains(species); CB_Form.Enabled = CB_Form.Visible = Label_Form.Visible = hasForms; + if (SAV.Generation == 2) + CB_Form.Enabled = false; + + if (HaX) + Label_Form.Visible = true; if (!hasForms) return; @@ -1399,7 +1487,7 @@ private void setAbilityList() formnum = CB_Form.SelectedIndex; int[] abils = SAV.Personal.getAbilities(species, formnum); - if (abils[1] == 0) + if (abils[1] == 0 && SAV.Generation != 3) abils[1] = abils[0]; string[] abilIdentifier = {" (1)", " (2)", " (H)"}; List ability_list = abils.Where(a => a != 0).Select((t, i) => abilitylist[t] + abilIdentifier[i]).ToList(); @@ -1423,7 +1511,7 @@ private void setIsShiny(object sender) bool isShiny = pkm.IsShiny; // Set the Controls - BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny && SAV.Generation > 2; + BTN_Shinytize.Visible = BTN_Shinytize.Enabled = !isShiny && SAV.Generation > 1; Label_IsShiny.Visible = isShiny && SAV.Generation > 1; // Refresh Markings (for Shiny Star if applicable) @@ -1539,32 +1627,40 @@ private void clickStatLabel(object sender, MouseEventArgs e) if (!(ModifierKeys == Keys.Control || ModifierKeys == Keys.Alt)) return; + if (sender == Label_SPC) + sender = Label_SPA; int index = Array.IndexOf(new[] { Label_HP, Label_ATK, Label_DEF, Label_SPA, Label_SPD, Label_SPE }, sender); if (ModifierKeys == Keys.Alt) // EV { - var arrayEV = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}; - arrayEV[index].Text = (e.Button == MouseButtons.Left - ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(arrayEV[index].Text), 0), 252) - : 0).ToString(); + var mt = new[] {TB_HPEV, TB_ATKEV, TB_DEFEV, TB_SPAEV, TB_SPDEV, TB_SPEEV}[index]; + if (e.Button == MouseButtons.Left) // max + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); + else // min + mt.Text = 0.ToString(); } else new[] {TB_HPIV, TB_ATKIV, TB_DEFIV, TB_SPAIV, TB_SPDIV, TB_SPEIV}[index].Text = - (e.Button == MouseButtons.Left ? 31 : 0).ToString(); + (e.Button == MouseButtons.Left ? SAV.MaxIV : 0).ToString(); } private void clickIV(object sender, EventArgs e) { if (ModifierKeys == Keys.Control) - ((MaskedTextBox) sender).Text = 31.ToString(); + ((MaskedTextBox) sender).Text = SAV.MaxIV.ToString(); else if (ModifierKeys == Keys.Alt) ((MaskedTextBox) sender).Text = 0.ToString(); } private void clickEV(object sender, EventArgs e) { + MaskedTextBox mt = (MaskedTextBox)sender; if (ModifierKeys == Keys.Control) // EV - ((MaskedTextBox) sender).Text = Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32((sender as MaskedTextBox).Text), 0), 252).ToString(); + mt.Text = SAV.Generation >= 3 + ? Math.Min(Math.Max(510 - Util.ToInt32(TB_EVTotal.Text) + Util.ToInt32(mt.Text), 0), 252).ToString() + : ushort.MaxValue.ToString(); else if (ModifierKeys == Keys.Alt) - ((MaskedTextBox) sender).Text = 0.ToString(); + mt.Text = 0.ToString(); } private void clickOT(object sender, EventArgs e) { @@ -1719,7 +1815,18 @@ private void updateIVs(object sender, EventArgs e) if (SAV.Generation < 3) { - TB_HPIV.Text = pkm.IV_HP.ToString("00"); + TB_HPIV.Text = pkm.IV_HP.ToString(); + TB_SPDIV.Text = TB_SPAIV.Text; + if (SAV.Generation == 2) + { + Label_Gender.Text = gendersymbols[pkm.Gender]; + Label_Gender.ForeColor = pkm.Gender == 2 + ? Label_Species.ForeColor + : (pkm.Gender == 1 ? Color.Red : Color.Blue); + CB_Form.SelectedIndex = pkm.AltForm; + setIsShiny(null); + getQuickFiller(dragout); + } } CB_HPType.SelectedValue = pkm.HPType; @@ -1756,6 +1863,9 @@ private void updateEVs(object sender, EventArgs e) else if (sender == TB_SPAEV) pkm.EV_SPA = Util.ToInt32(TB_SPAEV.Text); else if (sender == TB_SPDEV) pkm.EV_SPD = Util.ToInt32(TB_SPDEV.Text); + if (SAV.Generation < 3) + TB_SPDEV.Text = TB_SPAEV.Text; + int evtotal = pkm.EVs.Sum(); if (evtotal > 510) // Background turns Red @@ -2058,8 +2168,11 @@ private void updateSpecies(object sender, EventArgs e) updateLegality(); } - private IEnumerable getLocationList(GameVersion Version, int SaveFormat, bool egg) + private static List getLocationList(GameVersion Version, int SaveFormat, bool egg) { + if (SaveFormat == 2) + return metGen2; + if (egg) { if (Version < GameVersion.W && SaveFormat >= 5) @@ -2076,33 +2189,33 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.R: case GameVersion.S: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87); // Ferry + return metGen3.OrderByDescending(loc => loc.Value <= 87).ToList(); // Ferry break; case GameVersion.E: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)); // Trainer Hill + return metGen3.OrderByDescending(loc => loc.Value <= 87 || (loc.Value >= 196 && loc.Value <= 212)).ToList(); // Trainer Hill break; case GameVersion.FR: case GameVersion.LG: if (SaveFormat == 3) - return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197); // Celadon Dept. + return metGen3.OrderByDescending(loc => loc.Value > 87 && loc.Value < 197).ToList(); // Celadon Dept. break; case GameVersion.D: case GameVersion.P: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 111)); // Battle Park + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 111)).ToList(); // Battle Park break; case GameVersion.Pt: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value <= 125)); // Rock Peak Ruins + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value <= 125)).ToList(); // Rock Peak Ruins break; case GameVersion.HG: case GameVersion.SS: if (SaveFormat == 4 || (SaveFormat >= 5 && egg)) - return metGen4.Take(4).Concat(metGen6.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)); // Celadon Dept. + return metGen4.Take(4).Concat(metGen4.Skip(4).OrderByDescending(loc => loc.Value > 125 && loc.Value < 234)).ToList(); // Celadon Dept. break; case GameVersion.B: @@ -2111,27 +2224,27 @@ private IEnumerable getLocationList(GameVersion Version, int SaveForm case GameVersion.B2: case GameVersion.W2: - return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)); // Abyssal Ruins + return metGen5.Take(3).Concat(metGen5.Skip(3).OrderByDescending(loc => loc.Value <= 116)).ToList(); // Abyssal Ruins case GameVersion.X: case GameVersion.Y: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)); // Unknown Dungeon + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value <= 168)).ToList(); // Unknown Dungeon case GameVersion.OR: case GameVersion.AS: - return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)); // Secret Base + return metGen6.Take(3).Concat(metGen6.Skip(3).OrderByDescending(loc => loc.Value > 168 && loc.Value <= 354)).ToList(); // Secret Base } // Currently on a future game, return corresponding list for generation if (Version <= GameVersion.CXD && SaveFormat == 4) return metGen4.Where(loc => loc.Value == 0x37) // Pal Park to front .Concat(metGen4.Take(4)) - .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)); + .Concat(metGen4.Skip(4).Where(loc => loc.Value != 0x37)).ToList(); if (Version < GameVersion.X && SaveFormat >= 5) // PokéTransfer to front return metGen5.Where(loc => loc.Value == 30001) .Concat(metGen5.Take(3)) - .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)); + .Concat(metGen5.Skip(3).Where(loc => loc.Value != 30001)).ToList(); return metGen6; } @@ -2204,7 +2317,7 @@ private void updateNatureModification(object sender, EventArgs e) Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral NatureTip.SetToolTip(CB_Nature, @@ -2234,9 +2347,14 @@ private void updateNickname(object sender, EventArgs e) if (SAV.Generation < 5) // All caps GenIV and previous nick = nick.ToUpper(); + if (SAV.Generation < 3) + nick = nick.Replace(" ", ""); TB_Nickname.Text = nick; if (SAV.Generation == 1) - ((PK1)pkm).setNotNicknamed(); + ((PK1)pkm).setNotNicknamed(); + if (SAV.Generation == 2) + ((PK2)pkm).setNotNicknamed(); + } } private void updateNicknameClick(object sender, MouseEventArgs e) @@ -2268,6 +2386,8 @@ private void updateIsEgg(object sender, EventArgs e) { CHK_Nicknamed.Checked = false; TB_Friendship.Text = "1"; + if (SAV.Generation == 2) + pkm.IsEgg = true; // If we are an egg, it won't have a met location. CHK_AsEgg.Checked = true; @@ -2281,6 +2401,9 @@ private void updateIsEgg(object sender, EventArgs e) if (!CHK_Nicknamed.Checked) updateNickname(null, null); + if (SAV.Generation == 2) + pkm.IsEgg = false; + TB_Friendship.Text = SAV.Personal[Util.getIndex(CB_Species)].BaseFriendship.ToString(); if (CB_EggLocation.SelectedIndex == 0) @@ -2292,7 +2415,7 @@ private void updateIsEgg(object sender, EventArgs e) } // Display hatch counter if it is an egg, Display Friendship if it is not. Label_HatchCounter.Visible = CHK_IsEgg.Checked && SAV.Generation > 1; - Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 2; + Label_Friendship.Visible = !CHK_IsEgg.Checked && SAV.Generation > 1; // Update image to (not) show egg. @@ -2321,7 +2444,16 @@ private void updateShinyPID(object sender, EventArgs e) pkm.AltForm = CB_Form.SelectedIndex; pkm.Version = Util.getIndex(CB_GameOrigin); - pkm.setShinyPID(); + if (pkm.Format > 2) + pkm.setShinyPID(); + else + { + TB_ATKIV.Text = "15"; + TB_DEFIV.Text = "10"; + TB_SPEIV.Text = "10"; + TB_SPAIV.Text = "10"; + updateIVs(null, null); + } TB_PID.Text = pkm.PID.ToString("X8"); if (pkm.GenNumber < 6 && TB_EC.Visible) @@ -2378,9 +2510,12 @@ private void validateComboBox(object sender) cb.SelectionLength = 0; if (cb.Text == "") { cb.SelectedIndex = 0; return; } - cb.BackColor = cb.SelectedValue == null ? Color.DarkSalmon : defaultControlWhite; + if (cb.SelectedValue == null) + cb.BackColor = Color.DarkSalmon; + else + cb.ResetBackColor(); } - private void validateComboBox(object sender, EventArgs e) + private void validateComboBox(object sender, System.ComponentModel.CancelEventArgs e) { if (!(sender is ComboBox)) return; @@ -2394,7 +2529,7 @@ private void validateComboBox2(object sender, EventArgs e) { if (!fieldsInitialized) return; - validateComboBox(sender, e); + validateComboBox(sender, null); if (fieldsLoaded) { if (sender == CB_Ability && SAV.Generation >= 6) @@ -2490,7 +2625,7 @@ private void updateStats() Label[] labarray = { Label_ATK, Label_DEF, Label_SPE, Label_SPA, Label_SPD }; // Reset Label Colors foreach (Label label in labarray) - label.ForeColor = defaultControlText; + label.ResetForeColor(); // Set Colored StatLabels only if Nature isn't Neutral if (incr == decr) return; @@ -2548,38 +2683,30 @@ public bool verifiedPKM() if (ModifierKeys == (Keys.Control | Keys.Shift | Keys.Alt)) return true; // Override // Make sure the PKX Fields are filled out properly (color check) - #region ComboBoxes to verify they are set. ComboBox[] cba = { CB_Species, CB_Nature, CB_HeldItem, CB_Ability, // Main Tab CB_MetLocation, CB_EggLocation, CB_Ball, // Met Tab CB_Move1, CB_Move2, CB_Move3, CB_Move4, // Moves CB_RelearnMove1, CB_RelearnMove2, CB_RelearnMove3, CB_RelearnMove4 // Moves }; - for (int i = 0; i < cba.Length; i++) - { - int back = cba[i].BackColor.ToArgb(); - if (!cba[i].Visible || back == SystemColors.Control.ToArgb() || back == 0 || - !(back != -1 & back != defaultControlWhite.ToArgb())) continue; - if (i < 6) // Main Tab - tabMain.SelectedIndex = 0; - else if (i < 9) // Met Tab - tabMain.SelectedIndex = 1; - else // Moves - tabMain.SelectedIndex = 3; - goto invalid; - } - #endregion - // Further logic checking - if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) - { tabMain.SelectedIndex = 2; goto invalid; } - // If no errors detected... - if (Util.getIndex(CB_Species) != 0) return true; - // Else - tabMain.SelectedIndex = 0; - // else... - invalid: - { SystemSounds.Exclamation.Play(); return false; } + ComboBox cb = cba.FirstOrDefault(c => c.BackColor == Color.DarkSalmon); + if (cb != null) + { + Control c = cb.Parent; + while (!(c is TabPage)) + c = c.Parent; + tabMain.SelectedTab = c as TabPage; + } + else if (SAV.Generation >= 3 && Convert.ToUInt32(TB_EVTotal.Text) > 510 && !CHK_HackedStats.Checked) + tabMain.SelectedTab = Tab_Stats; + else if (Util.getIndex(CB_Species) == 0) + tabMain.SelectedTab = Tab_Main; + else + return true; + + SystemSounds.Exclamation.Play(); + return false; } public static string[] verifyPKMtoSAV(PKM pk) { @@ -2773,7 +2900,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.resetBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes cleared!"); } else if (ModifierKeys == Keys.Alt) @@ -2791,7 +2918,7 @@ private void clickBoxSort(object sender, EventArgs e) return; SAV.sortBoxes(); - CB_BoxSelect.SelectedIndex = 0; + setPKXBoxes(); Util.Alert("Boxes sorted!"); } else if (ModifierKeys == Keys.Control) @@ -2922,7 +3049,7 @@ private void clickDelete(object sender, EventArgs e) { SAV.setStoredSlot(SAV.BlankPKM, getPKXOffset(slot)); } else return; - SlotPictureBoxes[slot].Image = null; + getQuickFiller(SlotPictureBoxes[slot], SAV.BlankPKM); getSlotColor(slot, Properties.Resources.slotDel); } private void clickClone(object sender, EventArgs e) @@ -2959,7 +3086,7 @@ private void clickLegality(object sender, EventArgs e) { SystemSounds.Asterisk.Play(); return; } if (typeof (PK6) != pk.GetType()) { - Util.Alert($"Checking legality of {pk.GetType()} files is not supported."); + Util.Alert($"Checking legality of {pk.GetType().Name} files is not supported."); return; } showLegality(pk as PK6, slot < 0, ModifierKeys == Keys.Control); @@ -3056,6 +3183,8 @@ private void updateIsNicknamed(object sender, EventArgs e) if (SAV.Generation < 5) // All caps GenIV and previous nick = nick.ToUpper(); + if (SAV.Generation < 3) + nick = nick.Replace(" ", ""); if (TB_Nickname.Text != nick) { CHK_Nicknamed.Checked = true; @@ -3307,7 +3436,7 @@ private void dumpBoxesToDB(string path, bool individualBoxFolders) Directory.CreateDirectory(Path.Combine(path, boxfolder)); } if (!File.Exists(Path.Combine(Path.Combine(path, boxfolder), fileName))) - File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.Data.Take(SAV.SIZE_STORED).ToArray()); + File.WriteAllBytes(Path.Combine(Path.Combine(path, boxfolder), fileName), pk.DecryptedBoxData); } } private void loadBoxesFromDB(string path) @@ -3462,7 +3591,7 @@ private void B_OpenPokedex_Click(object sender, EventArgs e) new SAV_PokedexORAS().ShowDialog(); else if (SAV.XY) new SAV_PokedexXY().ShowDialog(); - else if (SAV.RBY) + else if (SAV.RBY || SAV.GSC) new SAV_SimplePokedex().ShowDialog(); } private void B_OUTPasserby_Click(object sender, EventArgs e) @@ -3629,7 +3758,7 @@ private void pbBoxSlot_MouseMove(object sender, MouseEventArgs e) getQuickFiller(pb, SAV.getStoredSlot(DragInfo.slotSourceOffset)); pb.BackgroundImage = null; - if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber) + if (DragInfo.slotDestinationBoxNumber == DragInfo.slotSourceBoxNumber && DragInfo.slotDestinationSlotNumber > -1) SlotPictureBoxes[DragInfo.slotDestinationSlotNumber].Image = img; if (result == DragDropEffects.Copy) // viewed in tabs, apply 'view' highlight diff --git a/PKHeX/MainWindow/Main.resx b/PKHeX/MainWindow/Main.resx index df010947a..afb521d4b 100644 --- a/PKHeX/MainWindow/Main.resx +++ b/PKHeX/MainWindow/Main.resx @@ -120,31 +120,22 @@ True - + True - + True - + True - + True - + True - - True - - - True - - - True - - + True @@ -153,85 +144,97 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True True - + True - + True - + True - + True - + True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True @@ -254,25 +257,181 @@ GigXDIB8F3QxIgADAwC7NFU/mWb72QAAAABJRU5ErkJggg== - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True @@ -290,19 +449,16 @@ True - + True - + True - + True - - True - - + True @@ -311,55 +467,76 @@ True + + True + + + True + + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + True + + True + + + True + + + True + + + True + + + True + True - + True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - + True @@ -380,42 +557,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -437,48 +578,267 @@ True - + True - + True - + True - + True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True True - + True - + True - + True - + True - - True - - + True True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -553,6 +913,30 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1 @@ -675,6 +1059,48 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -687,9 +1113,27 @@ True + + True + + + True + + + True + True + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -847,6 +1291,33 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True @@ -988,6 +1459,84 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1101,6 +1650,24 @@ True + + True + + + True + + + True + + + True + + + True + + + True + iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -1204,18 +1771,57 @@ True + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + True True + + True + True True + + True + True @@ -1225,6 +1831,9 @@ True + + True + True @@ -1258,6 +1867,9 @@ True + + True + True @@ -1279,13 +1891,61 @@ True - + True True - + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + True diff --git a/PKHeX/MainWindow/MainPK1.cs b/PKHeX/MainWindow/MainPK1.cs index 3057dc27f..0b4eef469 100644 --- a/PKHeX/MainWindow/MainPK1.cs +++ b/PKHeX/MainWindow/MainPK1.cs @@ -77,7 +77,10 @@ private PKM preparePK1() pk1.EV_SPE = Util.ToInt32(TB_SPEEV.Text); pk1.EV_SPC = Util.ToInt32(TB_SPAEV.Text); - pk1.Nickname = TB_Nickname.Text; + if (CHK_Nicknamed.Checked) + pk1.Nickname = TB_Nickname.Text; + else + pk1.setNotNicknamed(); pk1.Move1 = Util.getIndex(CB_Move1); pk1.Move2 = Util.getIndex(CB_Move2); pk1.Move3 = Util.getIndex(CB_Move3); diff --git a/PKHeX/MainWindow/MainPK2.cs b/PKHeX/MainWindow/MainPK2.cs new file mode 100644 index 000000000..ce3b719bd --- /dev/null +++ b/PKHeX/MainWindow/MainPK2.cs @@ -0,0 +1,146 @@ +using System; +using System.Drawing; + +namespace PKHeX +{ + public partial class Main + { + private void populateFieldsPK2() + { + PK2 pk2 = pkm as PK2; + if (pk2 == null) + return; + + // Do first + pk2.Stat_Level = PKX.getLevel(pk2.Species, pk2.EXP); + if (pk2.Stat_Level == 100) + pk2.EXP = PKX.getEXP(pk2.Stat_Level, pk2.Species); + + CB_Species.SelectedValue = pk2.Species; + TB_Level.Text = pk2.Stat_Level.ToString(); + TB_EXP.Text = pk2.EXP.ToString(); + CB_HeldItem.SelectedValue = pk2.HeldItem; + CB_Form.SelectedIndex = pk2.AltForm; + CHK_IsEgg.Checked = pk2.IsEgg; + TB_Friendship.Text = pk2.CurrentFriendship.ToString(); + + TB_MetLevel.Text = pk2.Met_Level.ToString(); + CB_MetLocation.SelectedValue = pk2.Met_Location; + CB_MetTimeOfDay.SelectedIndex = pk2.Met_TimeOfDay; + + // Load rest + TB_TID.Text = pk2.TID.ToString("00000"); + CHK_Nicknamed.Checked = pk2.IsNicknamed; + TB_Nickname.Text = pk2.Nickname; + TB_OT.Text = pk2.OT_Name; + GB_OT.BackgroundImage = null; + Label_OTGender.Text = gendersymbols[pk2.OT_Gender]; + Label_OTGender.ForeColor = pk2.OT_Gender == 1 ? Color.Red : Color.Blue; + // Reset Label and ComboBox visibility, as well as non-data checked status. + Label_PKRS.Visible = false; + Label_PKRSdays.Visible = false; + + TB_HPIV.Text = pk2.IV_HP.ToString(); + TB_ATKIV.Text = pk2.IV_ATK.ToString(); + TB_DEFIV.Text = pk2.IV_DEF.ToString(); + TB_SPEIV.Text = pk2.IV_SPE.ToString(); + TB_SPAIV.Text = pk2.IV_SPA.ToString(); + + TB_HPEV.Text = pk2.EV_HP.ToString(); + TB_ATKEV.Text = pk2.EV_ATK.ToString(); + TB_DEFEV.Text = pk2.EV_DEF.ToString(); + TB_SPEEV.Text = pk2.EV_SPE.ToString(); + TB_SPAEV.Text = pk2.EV_SPA.ToString(); + + CB_Move1.SelectedValue = pk2.Move1; + CB_Move2.SelectedValue = pk2.Move2; + CB_Move3.SelectedValue = pk2.Move3; + CB_Move4.SelectedValue = pk2.Move4; + CB_PPu1.SelectedIndex = pk2.Move1_PPUps; + CB_PPu2.SelectedIndex = pk2.Move2_PPUps; + CB_PPu3.SelectedIndex = pk2.Move3_PPUps; + CB_PPu4.SelectedIndex = pk2.Move4_PPUps; + TB_PP1.Text = pk2.Move1_PP.ToString(); + TB_PP2.Text = pk2.Move2_PP.ToString(); + TB_PP3.Text = pk2.Move3_PP.ToString(); + TB_PP4.Text = pk2.Move4_PP.ToString(); + + CB_Language.SelectedIndex = pk2.Japanese ? 0 : 1; + + updateStats(); + setIsShiny(null); + + Label_Gender.Text = gendersymbols[pk2.Gender]; + Label_Gender.ForeColor = pk2.Gender == 2 ? Label_Species.ForeColor : (pk2.Gender == 1 ? Color.Red : Color.Blue); + TB_EXP.Text = pk2.EXP.ToString(); + } + private PKM preparePK2() + { + PK2 pk2 = pkm as PK2; + if (pk2 == null) + return null; + + pk2.Species = Util.getIndex(CB_Species); + pk2.TID = Util.ToInt32(TB_TID.Text); + pk2.EXP = Util.ToUInt32(TB_EXP.Text); + pk2.HeldItem = Util.getIndex(CB_HeldItem); + pk2.IsEgg = CHK_IsEgg.Checked; + pk2.CurrentFriendship = Util.ToInt32(TB_Friendship.Text); + pk2.Met_Level = Util.ToInt32(TB_MetLevel.Text); + pk2.Met_Location = Util.getIndex(CB_MetLocation); + pk2.Met_TimeOfDay = CB_MetTimeOfDay.SelectedIndex; + + pk2.EV_HP = Util.ToInt32(TB_HPEV.Text); + pk2.EV_ATK = Util.ToInt32(TB_ATKEV.Text); + pk2.EV_DEF = Util.ToInt32(TB_DEFEV.Text); + pk2.EV_SPE = Util.ToInt32(TB_SPEEV.Text); + pk2.EV_SPC = Util.ToInt32(TB_SPAEV.Text); + + if (CHK_Nicknamed.Checked) + pk2.Nickname = TB_Nickname.Text; + else + pk2.setNotNicknamed(); + pk2.Move1 = Util.getIndex(CB_Move1); + pk2.Move2 = Util.getIndex(CB_Move2); + pk2.Move3 = Util.getIndex(CB_Move3); + pk2.Move4 = Util.getIndex(CB_Move4); + pk2.Move1_PP = Util.getIndex(CB_Move1) > 0 ? Util.ToInt32(TB_PP1.Text) : 0; + pk2.Move2_PP = Util.getIndex(CB_Move2) > 0 ? Util.ToInt32(TB_PP2.Text) : 0; + pk2.Move3_PP = Util.getIndex(CB_Move3) > 0 ? Util.ToInt32(TB_PP3.Text) : 0; + pk2.Move4_PP = Util.getIndex(CB_Move4) > 0 ? Util.ToInt32(TB_PP4.Text) : 0; + pk2.Move1_PPUps = Util.getIndex(CB_Move1) > 0 ? CB_PPu1.SelectedIndex : 0; + pk2.Move2_PPUps = Util.getIndex(CB_Move2) > 0 ? CB_PPu2.SelectedIndex : 0; + pk2.Move3_PPUps = Util.getIndex(CB_Move3) > 0 ? CB_PPu3.SelectedIndex : 0; + pk2.Move4_PPUps = Util.getIndex(CB_Move4) > 0 ? CB_PPu4.SelectedIndex : 0; + + pk2.IV_HP = Util.ToInt32(TB_HPIV.Text); + pk2.IV_ATK = Util.ToInt32(TB_ATKIV.Text); + pk2.IV_DEF = Util.ToInt32(TB_DEFIV.Text); + pk2.IV_SPE = Util.ToInt32(TB_SPEIV.Text); + pk2.IV_SPA = Util.ToInt32(TB_SPAIV.Text); + + pk2.OT_Name = TB_OT.Text; + + // Toss in Party Stats + Array.Resize(ref pk2.Data, pk2.SIZE_PARTY); + pk2.Stat_Level = Util.ToInt32(TB_Level.Text); + pk2.Stat_HPCurrent = Util.ToInt32(Stat_HP.Text); + pk2.Stat_HPMax = Util.ToInt32(Stat_HP.Text); + pk2.Stat_ATK = Util.ToInt32(Stat_ATK.Text); + pk2.Stat_DEF = Util.ToInt32(Stat_DEF.Text); + pk2.Stat_SPE = Util.ToInt32(Stat_SPE.Text); + pk2.Stat_SPA = Util.ToInt32(Stat_SPA.Text); + pk2.Stat_SPD = Util.ToInt32(Stat_SPD.Text); + + if (HaX) + { + pk2.Stat_Level = (byte)Math.Min(Convert.ToInt32(MT_Level.Text), byte.MaxValue); + } + + // Fix Moves if a slot is empty + pk2.FixMoves(); + + return pk2; + } + } +} diff --git a/PKHeX/MainWindow/MainPK4.cs b/PKHeX/MainWindow/MainPK4.cs index fef518fd0..ca7c299ad 100644 --- a/PKHeX/MainWindow/MainPK4.cs +++ b/PKHeX/MainWindow/MainPK4.cs @@ -137,8 +137,6 @@ private void populateFieldsPK4() if (abil < 0) CB_Ability.SelectedIndex = 0; - else if (abil == 2) - CB_Ability.SelectedIndex = 2; else if (abils[0] == abils[1] || abils[1] == 0) CB_Ability.SelectedIndex = pk4.PIDAbility; else diff --git a/PKHeX/MainWindow/MainPK5.cs b/PKHeX/MainWindow/MainPK5.cs index 286871469..37764677e 100644 --- a/PKHeX/MainWindow/MainPK5.cs +++ b/PKHeX/MainWindow/MainPK5.cs @@ -136,6 +136,7 @@ private void populateFieldsPK5() TB_EXP.Text = pk5.EXP.ToString(); Label_Gender.Text = gendersymbols[pk5.Gender]; Label_Gender.ForeColor = pk5.Gender == 2 ? Label_Species.ForeColor : (pk5.Gender == 1 ? Color.Red : Color.Blue); + CHK_NSparkle.Checked = pk5.NPokémon; if (HaX) DEV_Ability.SelectedValue = pk5.Ability; @@ -240,6 +241,8 @@ private PKM preparePK5() pk5.Version = Util.getIndex(CB_GameOrigin); pk5.Language = Util.getIndex(CB_Language); + pk5.NPokémon = CHK_NSparkle.Checked; + // Toss in Party Stats Array.Resize(ref pk5.Data, pk5.SIZE_PARTY); pk5.Stat_Level = Util.ToInt32(TB_Level.Text); diff --git a/PKHeX/Misc/personal_gs b/PKHeX/Misc/personal_gs new file mode 100644 index 000000000..05130b80b Binary files /dev/null and b/PKHeX/Misc/personal_gs differ diff --git a/PKHeX/MysteryGifts/MysteryGift.cs b/PKHeX/MysteryGifts/MysteryGift.cs index a8e1d07af..95933c87d 100644 --- a/PKHeX/MysteryGifts/MysteryGift.cs +++ b/PKHeX/MysteryGifts/MysteryGift.cs @@ -42,8 +42,10 @@ internal static MysteryGift getMysteryGift(byte[] data) } public abstract string Extension { get; } + public string FileName => getCardHeader() + "." + Extension; public virtual byte[] Data { get; set; } public abstract PKM convertToPKM(SaveFile SAV); + public abstract int Format { get; } public MysteryGift Clone() { @@ -64,6 +66,18 @@ public MysteryGift Clone() public virtual int Quantity { get { return 1; } set { } } public bool Empty => Data.SequenceEqual(new byte[Data.Length]); - public string getCardHeader() => (CardID > 0 ? $"Card #: {CardID.ToString("0000")}" : "N/A") + $" - {CardTitle.Replace('\u3000',' ').Trim()}" + Environment.NewLine; + public string getCardHeader() => (CardID > 0 ? $"Card #: {CardID.ToString("0000")}" : "N/A") + $" - {CardTitle.Replace('\u3000',' ').Trim()}"; + + // Search Properties + public virtual int Species { get { return -1; } set { } } + public virtual int[] Moves => new int[0]; + public virtual bool IsShiny => false; + public virtual bool IsEgg { get { return false; } set { } } + public virtual int HeldItem { get { return -1; } set { } } + public bool Gen7 => Format == 7; + public bool Gen6 => Format == 6; + public bool Gen5 => Format == 5; + public bool Gen4 => Format == 4; + public bool Gen3 => Format == 3; } } diff --git a/PKHeX/MysteryGifts/PGF.cs b/PKHeX/MysteryGifts/PGF.cs index f58b383e5..60a83281f 100644 --- a/PKHeX/MysteryGifts/PGF.cs +++ b/PKHeX/MysteryGifts/PGF.cs @@ -6,7 +6,8 @@ namespace PKHeX public sealed class PGF : MysteryGift { internal const int Size = 0xCC; - public override string Extension => ".pgf"; + public override string Extension => "pgf"; + public override int Format => 5; public PGF(byte[] data = null) { @@ -41,12 +42,13 @@ public PGF(byte[] data = null) public bool RIB1_7 { get { return (RIB1 & (1 << 7)) == 1 << 7; } set { RIB1 = (byte)(RIB1 & ~(1 << 7) | (value ? 1 << 7 : 0)); } } // Empty public int Pokéball { get { return Data[0x0E]; } set { Data[0x0E] = (byte)value; } } - public int HeldItem { get { return BitConverter.ToUInt16(Data, 0x10); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x10); } } + public override int HeldItem { get { return BitConverter.ToUInt16(Data, 0x10); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x10); } } public int Move1 { get { return BitConverter.ToUInt16(Data, 0x12); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x12); } } public int Move2 { get { return BitConverter.ToUInt16(Data, 0x14); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x14); } } public int Move3 { get { return BitConverter.ToUInt16(Data, 0x16); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x16); } } public int Move4 { get { return BitConverter.ToUInt16(Data, 0x18); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x18); } } - public int Species { get { return BitConverter.ToUInt16(Data, 0x1A); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x1A); } } + public override int Species { get { return BitConverter.ToUInt16(Data, 0x1A); } + } public int Form { get { return Data[0x1C]; } set { Data[0x1C] = (byte)value; } } public int Language { get { return Data[0x1D]; } set { Data[0x1D] = (byte)value; } } public string Nickname @@ -79,7 +81,7 @@ public string Nickname set { Encoding.Unicode.GetBytes(value.PadRight(0x08, (char)0xFFFF)).CopyTo(Data, 0x4A); } } public int OTGender { get { return Data[0x5A]; } set { Data[0x5A] = (byte)value; } } public int Level { get { return Data[0x5B]; } set { Data[0x5C] = (byte)value; } } - public bool IsEgg { get { return Data[0x5C] == 1; } set { Data[0x5C] = (byte)(value ? 1 : 0); } } + public override bool IsEgg { get { return Data[0x5C] == 1; } set { Data[0x5C] = (byte)(value ? 1 : 0); } } // Unused 0x5D 0x5E 0x5F public override string CardTitle { @@ -142,16 +144,9 @@ public override int CardID public int[] IVs => new[] { IV_HP, IV_ATK, IV_DEF, IV_SPE, IV_SPA, IV_SPD }; public bool IsNicknamed => Nickname.Length > 0; - public int[] Moves + public override int[] Moves { get { return new[] { Move1, Move2, Move3, Move4 }; } - set - { - if (value.Length > 0) Move1 = value[0]; - if (value.Length > 1) Move2 = value[1]; - if (value.Length > 2) Move3 = value[2]; - if (value.Length > 3) Move4 = value[3]; - } } public override bool IsPokémon { get { return CardType == 1; } set { if (value) CardType = 1; } } public override bool IsItem { get { return CardType == 2; } set { if (value) CardType = 2; } } diff --git a/PKHeX/MysteryGifts/PGT.cs b/PKHeX/MysteryGifts/PGT.cs index 25c935e3c..98e1c65a2 100644 --- a/PKHeX/MysteryGifts/PGT.cs +++ b/PKHeX/MysteryGifts/PGT.cs @@ -11,7 +11,8 @@ namespace PKHeX public sealed class PCD : MysteryGift { internal const int Size = 0x358; // 856 - public override string Extension => ".pcd"; + public override string Extension => "pcd"; + public override int Format => 4; public PCD(byte[] data = null) { @@ -50,6 +51,12 @@ public override string CardTitle } } + public override int Species => Gift.PK.Species; + public override int[] Moves => Gift.PK.Moves; + public override bool IsShiny => Gift.PK.IsShiny; + public override bool IsEgg => Gift.PK.IsEgg; + public override int HeldItem => Gift.PK.HeldItem; + public override PKM convertToPKM(SaveFile SAV) { return Gift.convertToPKM(SAV); @@ -58,7 +65,8 @@ public override PKM convertToPKM(SaveFile SAV) public class PGT : MysteryGift { internal const int Size = 0x104; // 260 - public override string Extension => ".pgt"; + public override string Extension => "pgt"; + public override int Format => 4; private enum GiftType { @@ -103,7 +111,7 @@ private void refreshData(byte[] data) public byte Slot { get { return Data[2]; } set { Data[2] = value; } } public byte Detail { get { return Data[3]; } set { Data[3] = value; } } public override int Item { get { return BitConverter.ToUInt16(Data, 0x4); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x4); } } - private PK4 PK; + public PK4 PK; private byte[] Unknown; private byte[] RAW; @@ -118,11 +126,16 @@ public override byte[] Data private GiftType PGTGiftType { get { return (GiftType)Data[0]; } set {Data[0] = (byte)value; } } public bool IsHatched => PGTGiftType == GiftType.Pokémon; - public bool IsEgg => PGTGiftType == GiftType.PokémonEgg; + public override bool IsEgg => PGTGiftType == GiftType.PokémonEgg; public bool IsManaphyEgg => PGTGiftType == GiftType.ManaphyEgg; public override bool IsItem { get { return PGTGiftType == GiftType.Item; } set { if (value) CardType = (int)GiftType.Item; } } public override bool IsPokémon { get { return PGTGiftType == GiftType.Pokémon || PGTGiftType == GiftType.PokémonEgg || PGTGiftType == GiftType.ManaphyEgg; } set { } } + public override int Species => PK.Species; + public override int[] Moves => PK.Moves; + public override bool IsShiny => PK.IsShiny; + public override int HeldItem => PK.HeldItem; + public override PKM convertToPKM(SaveFile SAV) { if (!IsPokémon) diff --git a/PKHeX/MysteryGifts/WC6.cs b/PKHeX/MysteryGifts/WC6.cs index 37305bb4e..9541d1d17 100644 --- a/PKHeX/MysteryGifts/WC6.cs +++ b/PKHeX/MysteryGifts/WC6.cs @@ -9,7 +9,8 @@ public sealed class WC6 : MysteryGift internal const int Size = 0x108; internal const int SizeFull = 0x310; internal const uint EonTicketConst = 0x225D73C2; - public override string Extension => ".wc6"; + public override string Extension => "wc6"; + public override int Format => 6; public WC6(byte[] data = null) { @@ -94,6 +95,7 @@ public WC6(byte[] data = null) // Pokémon Properties public override bool IsPokémon { get { return CardType == 0; } set { if (value) CardType = 0; } } + public override bool IsShiny { get { return PIDType == 2; } } public int TID { get { return BitConverter.ToUInt16(Data, 0x68); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x68); } } @@ -109,7 +111,7 @@ public WC6(byte[] data = null) public int Pokéball { get { return Data[0x76]; } set { Data[0x76] = (byte)value; } } - public int HeldItem { + public override int HeldItem { get { return BitConverter.ToUInt16(Data, 0x78); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x78); } } public int Move1 { @@ -124,7 +126,7 @@ public WC6(byte[] data = null) public int Move4 { get { return BitConverter.ToUInt16(Data, 0x80); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x80); } } - public int Species { + public override int Species { get { return BitConverter.ToUInt16(Data, 0x82); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x82); } } public int Form { @@ -174,7 +176,7 @@ public WC6(byte[] data = null) get { return Util.TrimFromZero(Encoding.Unicode.GetString(Data, 0xB6, 0x1A)); } set { Encoding.Unicode.GetBytes(value.PadRight(value.Length + 1, '\0')).CopyTo(Data, 0xB6); } } public int Level { get { return Data[0xD0]; } set { Data[0xD0] = (byte)value; } } - public bool IsEgg { get { return Data[0xD1] == 1; } set { Data[0xD1] = (byte)(value ? 1 : 0); } } + public override bool IsEgg { get { return Data[0xD1] == 1; } set { Data[0xD1] = (byte)(value ? 1 : 0); } } public uint PID { get { return BitConverter.ToUInt32(Data, 0xD4); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xD4); } } @@ -218,16 +220,9 @@ public WC6(byte[] data = null) public int[] IVs => new[] { IV_HP, IV_ATK, IV_DEF, IV_SPE, IV_SPA, IV_SPD }; public bool IsNicknamed => Nickname.Length > 0; - public int[] Moves + public override int[] Moves { get { return new[] {Move1, Move2, Move3, Move4}; } - set - { - if (value.Length > 0) Move1 = value[0]; - if (value.Length > 1) Move2 = value[1]; - if (value.Length > 2) Move3 = value[2]; - if (value.Length > 3) Move4 = value[3]; - } } public int[] RelearnMoves { diff --git a/PKHeX/PKHeX.csproj b/PKHeX/PKHeX.csproj index 354ac77d0..fc23e8a23 100644 --- a/PKHeX/PKHeX.csproj +++ b/PKHeX/PKHeX.csproj @@ -72,9 +72,14 @@ + + + + Form + Form @@ -101,6 +106,7 @@ + @@ -108,6 +114,7 @@ + @@ -127,6 +134,7 @@ + @@ -215,6 +223,12 @@ SAV_SimplePokedex.cs + + Form + + + SAV_MysteryGiftDB.cs + Form @@ -375,6 +389,9 @@ SAV_SimplePokedex.cs + + SAV_MysteryGiftDB.cs + SAV_Database.cs @@ -433,6 +450,7 @@ Designer + SettingsSingleFileGenerator Settings.Designer.cs @@ -442,6 +460,16 @@ Settings.settings True + + + + + + + + + + @@ -482,9 +510,11 @@ + + @@ -2751,6 +2781,17 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + 17, 17 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAE + AAAAAAAAAAAAAAAAAAAAAAAAIyMjAQAAAAALCwsPJiYmJysrKycqKionKSkpJykpKScpKSknKioqJyoq + KicrKysnJycnJw0ODQ8AAAAAJiYmAQAAAABpaWlHq6ur17+/v+6+vr7svr6+7b6+vu2+vr7tvr6+7b6+ + vu2+vr7tvr6+7L+/v+6rq6vXampqSAAAAAAoKSgXvr++3eLi4v/g4OD94eHh/+Hh4f/i4uL/4uLi/+Li + 4v/i4uL/4eHh/+Dh4P/g4OD94uLi/7+/v90sLCwXfn5+PNna2frg4OD/39/f/uHh4f7h4eH+39/f/uDg + 4P7g4OD+39/f/uHh4f7h4OH+39/f/t/g3//a2tr6g4ODPoOCgz7X19f64+Pj/+Li4v7k5OT/4+Tj//Ly + 8v/19fX/9PT0//T09P/k5OT/5OTk/+Pj4/7j4+P/19jX+4qLikCDhIM+2tra++Xl5f/k5eT+5OTk//Lz + 8v+urq7/RUVF/z4+Pv+Zmpn/8fHx/+Xm5f/k5eT+5eXl/9ra2vyLi4tAhYWFPuXm5vvx8vP/7+/w/v// + //+sra3/AgIC/15eXv9tbG3/BQUF/4yMjP//////7+/w/vHy8//l5ub8jY2NQC4uLD5LS0f7UFBL/09P + Sv5YWVP/FBUS/29wcP///////////5SUlP8PDw//U1NO/1BQS/5PT0r/S0tH/DIyMEAAAAs+AAAM+wAA + Dv8AAA/+AwMS/wAAAP+UlJX///////////+3t7n/AAAA/wAAD/8BAQ/+AAAO/wAADPwCAg5ABARSPgoK + k/sNDab/DQ2o/hAQvP8CAmj/IiIW/7Kzrv/Cw8D/NDQm/wAATf8QELz/DQ2q/gwMp/8LC5T8Dg5bQAUF + Xj4KCpz7DQ2u/w0NsP4NDbX/Dw+//wUFYf8CAhL/AwMP/wMDTf8ODrj/Dg64/w0NsP4MDK7/Cwud/A8P + aEEGBmU9DAyl+w4Otf8ODrf+Dw+6/xAQvv8TE8v/EhK+/xAQvP8TE8v/EBDA/w8Puf8PD7f+Dg61/w0N + pvsREW9ACAhtQA8PsfsTE77/ExO//xQUwP8UFML/FBTD/xUVyP8WFsn/FRXE/xQUw/8UFMH/ExO//xMT + vv8QELL7ERF3QxkZdCgXF771ExPH/xUVyPwVFcn9FhbL/RcXzP0XF8z9FxfM/RcXy/0XF8v9FhbJ/RUV + yPwTE8f/Fxe+9RkZdykAAAAAIyOtghsbx/8ZGcj+GRnJ/xoayf8aGsn/GhrK/xoayv8aGsn/GhrJ/xkZ + yf8ZGcj+GxvH/yMjrYQAAAAAAADHAQAAAAAzM51FLCyscCoqrGwqKqxtKSmsbSoqrG0qKqxtKSmsbSoq + rG0qKqxsLCyscDMznUUAAAAAAAAAAP//AADAAwAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIAB + AACAAQAAgAEAAIABAACAAQAAgAEAAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKysrCR0dHSMWFhY3GBgYORgYGDkYGBg5GBgYORgY + GDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5GBgYORgYGDkYGBg5FxcXNx4e + HiQuLi4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASEhIARYWFis7OzuVkJCQ2ampqeqqqqrsqqqq7Kqq + quyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqqquyqqqrsqqqq7Kqq + quypqanqkZGR2j09PZcXFxcsUFBQAQAAAAAAAAAAAAAAAAAAAAASEhIuhISEytvb2/7W1tb/19fX/9jY + 2P/Y2Nj/2NjY/9jY2P/Y2Nj/2NjY/9nZ2f/Z2dn/2dnZ/9nZ2f/Z2dn/2dnZ/9nZ2f/Y2Nj/2NjY/9jY + 2P/Y2Nj/2NjY/9fX1//W1tb/29vb/oeHh8sTExMvAAAAAAAAAAAAAAAAPDw8DGtra6zZ2dn/2dnZ/9ra + 2v/b29v/29vb/9vb2//c3Nz/3Nzc/9zc3P/c3Nz/3d3d/93d3f/d3d3/3d3d/93d3f/d3d3/3Nzc/9zc + 3P/c3Nz/3Nzc/9vb2//b29v/29vb/9ra2v/Z2dn/2dnZ/21tba5DQ0MNAAAAAAAAAAAiIiIx1NXU9tna + 2f/c3Nz/3d3d/93e3f/e3t7/3t7e/9/f3//f39//39/f/9/g3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg + 4P/g4OD/39/f/9/f3//f39//3t/e/97e3v/d3t3/3d3d/9zc3P/Z2tn/1dXV9icnJzMAAAAAAAAAAFhZ + WFzf4N//3Nzc/97e3v/f39//39/f/9/g3//g4OD/4ODg/+Hh4f/h4eH/4eHh/+Li4v/i4uL/4uLi/+Li + 4v/i4uL/4uLi/+Hi4f/h4eH/4eHh/+Dg4P/g4OD/3+Df/9/f3//f39//3t7e/9zc3P/f39//XV1dXQAA + AAAAAAAAZmZmZdvc2//e3t7/3+Df/+Dg4P/g4eD/4eHh/+Hi4f/i4uL/4uPi/+Pj4//j4+P/5OTk/+Tk + 5P/k5OT/5OTk/+Tk5P/k5OT/4+Pj/+Pj4//j4+P/4uLi/+Li4v/h4eH/4eHh/+Dg4P/f4N//3t7e/9vb + 2/9wcHBoAAAAAAAAAABoaGhl3d3d/9/f3//h4eH/4eLh/+Li4v/j4+P/4+Pj/+Tk5P/k5OT/5eXl/+Xl + 5f/l5uX/5ubm/+bm5v/m5ub/5ubm/+bm5v/l5eX/5eXl/+Tk5P/k5OT/4+Pj/+Pj4//i4uL/4uLi/+Hh + 4f/f39//3N3c/3Nzc2kAAAAAAAAAAGhoaGXe3t7/4ODg/+Li4v/j4+P/4+Pj/+Tk5P/l5eX/5eXl/+bm + 5v/m5+b/5+fn/+fn5//n6Of/6Ojo/+jo6P/o6Oj/5+fn/+fn5//n5+f/5ubm/+Xl5f/l5eX/5OTk/+Pk + 4//j4+P/4uLi/+Dg4P/e3t7/c3NzaQAAAAAAAAAAaGhoZd/g3//i4uL/5OTk/+Tl5P/l5eX/5ebl/+bn + 5v/n5+f/5+jn/+jp6P/p6en/7Ozs/8LCwv+Tk5P/ioqK/66urv/o6ej/6enp/+jp6P/o6Oj/5+jn/+bn + 5v/m5ub/5ebl/+Tl5P/k5OT/4uLi/9/g3/9zdHNpAAAAAAAAAABoaWhl4eLh/+Pk4//m5ub/5ubm/+fn + 5//n6Of/6Ojo/+np6f/p6un/6urq/8bGxv8yMjL/AAAA/wAAAP8AAAD/AAAA/xMTE/+ZmZn/7Ozs/+rq + 6v/p6en/6Ojo/+jo6P/n5+f/5ubm/+bm5v/k5OT/4eHh/3R0dGkAAAAAAAAAAGhpaGXj4+P/5eXl/+fn + 5//n6Of/6Ojo/+np6f/q6ur/6urq/+vr6//Dw8P/DAwM/wAAAP8AAAD/Gxsb/ygoKP8BAQH/AAAA/wAA + AP+FhYX/7O3s/+rr6v/q6ur/6enp/+jo6P/o6Oj/5+fn/+Xl5f/i4+L/dHR0aQAAAAAAAAAAYWFhZeTl + 5P/m5+b/6Ono/+np6f/p6un/6uvq/+vr6//s7Oz/7e7t/ycnJ/8AAAD/Ghoa/7S0tP/m5ub/5OTk/9HR + 0f9GRkb/AAAA/wICAv/IyMj/7Ozs/+vs6//q6+r/6urq/+nq6f/o6ej/5+fn/+Tk5P9sbGxpAAAAAAAA + AAA9Pj1lj4+P/5OTk/+VlZX/lpaW/5eXl/+YmJj/mZmZ/5qamv92dnb/AAAA/wEBAf+/wL//3Nzc/+Tk + 5P/l5eX/3d3d/+Li4v8mJib/AAAA/0ZGRv+ampr/mZmZ/5iYmP+Xl5f/lpaW/5WVlf+Tk5P/j4+P/0ZG + RmoAAAAAAAAAAAwMDGUAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/Nzc3/+fn + 5//q6ur/7O3s/+zt7P/v7+//39/f/4WFhf8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/EBAQagAAAAAAAAAAAwMHZQAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP9NTU3/5ufm//Lz8v/z9PP/8/Tz//X19f/l5eX/nZ2d/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8GBgpqAAAAAAAAAAAAABZlAQEk/wEBJ/8CAin/AgIq/wICKv8CAiv/AgIs/wIC + LP8BAR3/AAAA/xwcHP/w8PD/6+zr//r6+v/6+vr/9PT0/+vr6/9lZWX/AAAA/wAAD/8CAi3/AgIs/wIC + K/8CAir/AgIq/wICKf8BASf/AQEl/wUFG2oAAAAAAAAAAAICQGUGBpL/Bwec/wgIo/8JCaf/CQmq/wkJ + rf8JCa//Cgqz/wkJqP8AAAL/AAAA/4CAgP/y8/L/6+zr/+3t7f/u7u7/xMTE/wcHB/8AAAD/BgZz/woK + s/8JCbD/CQmt/wkJqv8JCaj/CAik/wcHnf8HB5P/Dg5MagAAAAAAAAAAAwNHZQgIk/8JCZ3/Cgqj/wsL + p/8LC6n/Cwus/wsLr/8MDLL/DAy2/wYGW/8AAAD/AAAA/1JSUv+sraz/tra2/3h4eP8KCgr/AAAA/wIC + Iv8MDLb/DAyy/wsLsP8LC63/Cwuq/wsLp/8KCqT/CQmd/wgIk/8PD1VrAAAAAAAAAAAEBE1lCQmY/woK + ov8LC6j/DAyr/wwMrf8MDLD/DAyy/w0Ntf8NDbf/Dg67/wUFSv8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8CAiH/DQ2q/w0NuP8NDbX/DQ2z/wwMsP8MDK7/DAyr/wsLqP8KCqL/CQmZ/xAQWmsAAAAAAAAAAAQE + UGUKCp7/Cwum/wwMrP8NDa//DQ2w/w0Ns/8ODrX/Dg63/w4Ouf8ODrv/Dw/A/wwMiv8FBTj/AAAG/wAA + AP8DAyb/CQls/w8Pu/8PD7z/Dg66/w4OuP8ODrX/DQ2z/w0Nsf8NDa//DAys/wsLp/8KCp7/ERFeawAA + AAAAAAAABQVTZQsLpP8MDKv/DQ2w/w4Os/8ODrT/Dg62/w8PuP8PD7r/Dw+8/w8Pvf8QEL//EBDA/xER + w/8SEsn/ERHJ/xERxf8QEMD/EBC//w8Pvv8PD7z/Dw+6/w8PuP8ODrf/Dg61/w4Os/8NDbH/DAyr/wsL + pP8SEmFrAAAAAAAAAAAGBlZlDAyq/w4OsP8PD7X/Dw+3/w8PuP8QELr/EBC7/xAQvf8REb7/ERHA/xER + wf8REcL/EhLC/xISw/8SEsP/EhLC/xERwv8REcH/ERHA/xERvv8QEL3/EBC7/xAQuv8QELj/Dw+3/w8P + tf8ODrD/DAyq/xMTZWsAAAAAAAAAAAcHWmUODrD/EBC2/xERuv8REbz/ERG9/xISvv8SEr//EhLA/xMT + wf8TE8P/ExPD/xMTxP8TE8X/FBTF/xQUxf8UFMX/ExPE/xMTxP8TE8P/ExPC/xISwf8SEr//EhK+/xER + vf8REbz/ERG6/xAQtv8ODrD/FBRpawAAAAAAAAAACAhcYxAQtf8SErv/ExO+/xQUwP8UFMD/FBTB/xUV + wv8VFcP/FRXE/xUVxf8WFsb/FhbG/xYWx/8WFsf/FhbH/xYWx/8WFsf/FhbG/xYWxf8VFcT/FRXD/xUV + wv8UFMH/FBTB/xQUwP8TE77/EhK7/xAQtf8TE2hoAAAAAAAAAAAQEFNUFRXC/xMTv/8UFMP/FRXE/xUV + xP8VFcX/FRXG/xYWx/8WFsf/FhbI/xYWyf8XF8n/FxfK/xcXyv8XF8r/FxfK/xcXyf8XF8n/FhbI/xYW + yP8WFsf/FhbG/xUVxf8VFcT/FRXE/xQUw/8TE7//FRXB/xAQV1UAAAAAAAAAAA0NPxkjI8byFBTD/xUV + x/8WFsj/FxfJ/xcXyf8XF8r/FxfK/xcXy/8YGMz/GBjM/xgYzP8YGM3/GBjN/xgYzf8YGM3/GBjM/xgY + zP8YGMz/GBjL/xcXy/8XF8r/FxfJ/xcXyf8WFsj/FRXH/xQUw/8jI8f0Dg5GGwAAAAAAAAAAFhZxAiUl + eIUZGcr/FBTI/xUVyv8WFsv/FhbM/xYWzP8WFsz/FhbN/xcXzf8XF83/FxfN/xcXzv8XF87/FxfO/xcX + zv8XF87/FxfN/xcXzf8WFs3/FhbM/xYWzP8WFsz/FhbL/xUVyv8UFMj/GBjJ/yYmeogWFnYCAAAAAAAA + AAAAAAAAGBh1BzMzk50kJNP+FxfK/xgYzP8YGMz/GBjN/xgYzf8YGM3/GBjN/xgYzf8ZGc7/GRnO/xkZ + zv8ZGc7/GRnO/xkZzv8YGM3/GBjN/xgYzf8YGM3/GBjN/xgYzP8YGMz/FxfK/yMj0v4zM5WfFBRkBwAA + AAAAAAAAAAAAAAAAAAAAAAAAHBx7Ay0tdkg3N5emMTGpxSwsp8gsLKfILCynyCwsp8gsLKfILCynyCws + p8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyCwsp8gsLKfILCynyDExqcU2NpenLi54Shsb + ewMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////8AAAD+AAAAfAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA + AAPAAAADwAAAA8AAAAPAAAAD4AAAB/gAAB////// + + + \ No newline at end of file diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs index 915668503..cfbaef4ee 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Pokepuff.cs @@ -48,11 +48,18 @@ private void Setup() dgv.Columns.Add(dgvIndex); dgv.Columns.Add(dgvPuff); - dgv.Rows.Add(100); - for (int i = 0; i < 100; i++) + var Puffs = SAV.Puffs; + dgv.Rows.Add(Puffs.Length); + for (int i = 0; i < Puffs.Length; i++) { dgv.Rows[i].Cells[0].Value = (i + 1).ToString(); - dgv.Rows[i].Cells[1].Value = pfa[SAV.Data[SAV.Puff + i]]; + int puffval = Puffs[i]; + if (puffval >= pfa.Length) + { + Util.Error($"Invalid Puff Index: {i}", $"Expected < ${pfa.Length}"); + puffval = 0; + } + dgv.Rows[i].Cells[1].Value = pfa[puffval]; } MT_CNT.Text = SAV.PuffCount.ToString(); } diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs index fe932c756..b2a55e5f4 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_SecretBase.Designer.cs @@ -396,12 +396,12 @@ private void InitializeComponent() // // L_PKFriendship // - this.L_PKFriendship.AutoSize = true; - this.L_PKFriendship.Location = new System.Drawing.Point(265, 166); + this.L_PKFriendship.Location = new System.Drawing.Point(245, 163); this.L_PKFriendship.Name = "L_PKFriendship"; - this.L_PKFriendship.Size = new System.Drawing.Size(55, 13); + this.L_PKFriendship.Size = new System.Drawing.Size(75, 21); this.L_PKFriendship.TabIndex = 82; this.L_PKFriendship.Text = "Friendship"; + this.L_PKFriendship.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // CB_Ball // @@ -451,7 +451,7 @@ private void InitializeComponent() this.CHK_Shiny.AutoSize = true; this.CHK_Shiny.Location = new System.Drawing.Point(146, 92); this.CHK_Shiny.Name = "CHK_Shiny"; - this.CHK_Shiny.Size = new System.Drawing.Size(38, 17); + this.CHK_Shiny.Size = new System.Drawing.Size(35, 17); this.CHK_Shiny.TabIndex = 77; this.CHK_Shiny.Text = "☆"; this.CHK_Shiny.UseVisualStyleBackColor = true; @@ -514,7 +514,7 @@ private void InitializeComponent() this.CB_Move4.FormattingEnabled = true; this.CB_Move4.Location = new System.Drawing.Point(15, 225); this.CB_Move4.Name = "CB_Move4"; - this.CB_Move4.Size = new System.Drawing.Size(121, 21); + this.CB_Move4.Size = new System.Drawing.Size(122, 21); this.CB_Move4.TabIndex = 74; // // CB_PPu1 @@ -538,7 +538,7 @@ private void InitializeComponent() this.CB_Move3.FormattingEnabled = true; this.CB_Move3.Location = new System.Drawing.Point(15, 203); this.CB_Move3.Name = "CB_Move3"; - this.CB_Move3.Size = new System.Drawing.Size(121, 21); + this.CB_Move3.Size = new System.Drawing.Size(122, 21); this.CB_Move3.TabIndex = 72; // // CB_Move2 @@ -548,7 +548,7 @@ private void InitializeComponent() this.CB_Move2.FormattingEnabled = true; this.CB_Move2.Location = new System.Drawing.Point(15, 181); this.CB_Move2.Name = "CB_Move2"; - this.CB_Move2.Size = new System.Drawing.Size(121, 21); + this.CB_Move2.Size = new System.Drawing.Size(122, 21); this.CB_Move2.TabIndex = 70; // // CB_Move1 @@ -558,21 +558,21 @@ private void InitializeComponent() this.CB_Move1.FormattingEnabled = true; this.CB_Move1.Location = new System.Drawing.Point(15, 159); this.CB_Move1.Name = "CB_Move1"; - this.CB_Move1.Size = new System.Drawing.Size(121, 21); + this.CB_Move1.Size = new System.Drawing.Size(122, 21); this.CB_Move1.TabIndex = 68; // // L_Participant // - this.L_Participant.AutoSize = true; - this.L_Participant.Location = new System.Drawing.Point(12, 19); + this.L_Participant.Location = new System.Drawing.Point(15, 19); this.L_Participant.Name = "L_Participant"; - this.L_Participant.Size = new System.Drawing.Size(60, 13); + this.L_Participant.Size = new System.Drawing.Size(78, 20); this.L_Participant.TabIndex = 67; this.L_Participant.Text = "Participant:"; + this.L_Participant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FPKM // - this.NUD_FPKM.Location = new System.Drawing.Point(78, 17); + this.NUD_FPKM.Location = new System.Drawing.Point(99, 21); this.NUD_FPKM.Maximum = new decimal(new int[] { 3, 0, @@ -584,7 +584,7 @@ private void InitializeComponent() 0, 0}); this.NUD_FPKM.Name = "NUD_FPKM"; - this.NUD_FPKM.Size = new System.Drawing.Size(35, 20); + this.NUD_FPKM.Size = new System.Drawing.Size(38, 20); this.NUD_FPKM.TabIndex = 66; this.NUD_FPKM.Value = new decimal(new int[] { 1, @@ -627,18 +627,18 @@ private void InitializeComponent() // // L_EncryptionConstant // - this.L_EncryptionConstant.AutoSize = true; - this.L_EncryptionConstant.Location = new System.Drawing.Point(12, 47); + this.L_EncryptionConstant.Location = new System.Drawing.Point(15, 44); this.L_EncryptionConstant.Name = "L_EncryptionConstant"; - this.L_EncryptionConstant.Size = new System.Drawing.Size(32, 13); + this.L_EncryptionConstant.Size = new System.Drawing.Size(56, 21); this.L_EncryptionConstant.TabIndex = 62; this.L_EncryptionConstant.Text = "ENC:"; + this.L_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // TB_EC // this.TB_EC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TB_EC.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_EC.Location = new System.Drawing.Point(53, 45); + this.TB_EC.Location = new System.Drawing.Point(77, 44); this.TB_EC.MaxLength = 8; this.TB_EC.Name = "TB_EC"; this.TB_EC.Size = new System.Drawing.Size(60, 20); @@ -668,62 +668,62 @@ private void InitializeComponent() // L_SPE // this.L_SPE.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SPE.AutoSize = true; - this.L_SPE.Location = new System.Drawing.Point(235, 140); + this.L_SPE.Location = new System.Drawing.Point(209, 138); this.L_SPE.Name = "L_SPE"; - this.L_SPE.Size = new System.Drawing.Size(28, 13); + this.L_SPE.Size = new System.Drawing.Size(50, 21); this.L_SPE.TabIndex = 13; this.L_SPE.Text = "SPE"; + this.L_SPE.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_SpD // this.L_SpD.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SpD.AutoSize = true; - this.L_SpD.Location = new System.Drawing.Point(235, 118); + this.L_SpD.Location = new System.Drawing.Point(209, 116); this.L_SpD.Name = "L_SpD"; - this.L_SpD.Size = new System.Drawing.Size(28, 13); + this.L_SpD.Size = new System.Drawing.Size(50, 21); this.L_SpD.TabIndex = 12; this.L_SpD.Text = "SpD"; + this.L_SpD.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_SpA // this.L_SpA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_SpA.AutoSize = true; - this.L_SpA.Location = new System.Drawing.Point(236, 96); + this.L_SpA.Location = new System.Drawing.Point(209, 94); this.L_SpA.Name = "L_SpA"; - this.L_SpA.Size = new System.Drawing.Size(27, 13); + this.L_SpA.Size = new System.Drawing.Size(50, 21); this.L_SpA.TabIndex = 11; this.L_SpA.Text = "SpA"; + this.L_SpA.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_DEF // this.L_DEF.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_DEF.AutoSize = true; - this.L_DEF.Location = new System.Drawing.Point(235, 74); + this.L_DEF.Location = new System.Drawing.Point(209, 72); this.L_DEF.Name = "L_DEF"; - this.L_DEF.Size = new System.Drawing.Size(28, 13); + this.L_DEF.Size = new System.Drawing.Size(50, 21); this.L_DEF.TabIndex = 4; this.L_DEF.Text = "DEF"; + this.L_DEF.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_ATK // this.L_ATK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_ATK.AutoSize = true; - this.L_ATK.Location = new System.Drawing.Point(235, 52); + this.L_ATK.Location = new System.Drawing.Point(209, 50); this.L_ATK.Name = "L_ATK"; - this.L_ATK.Size = new System.Drawing.Size(28, 13); + this.L_ATK.Size = new System.Drawing.Size(50, 21); this.L_ATK.TabIndex = 3; this.L_ATK.Text = "ATK"; + this.L_ATK.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_HP // this.L_HP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_HP.AutoSize = true; - this.L_HP.Location = new System.Drawing.Point(241, 30); + this.L_HP.Location = new System.Drawing.Point(209, 28); this.L_HP.Name = "L_HP"; - this.L_HP.Size = new System.Drawing.Size(22, 13); + this.L_HP.Size = new System.Drawing.Size(50, 21); this.L_HP.TabIndex = 2; this.L_HP.Text = "HP"; + this.L_HP.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // f_MAIN // @@ -754,7 +754,7 @@ private void InitializeComponent() // // NUD_FBaseLocation // - this.NUD_FBaseLocation.Location = new System.Drawing.Point(128, 35); + this.NUD_FBaseLocation.Location = new System.Drawing.Point(159, 5); this.NUD_FBaseLocation.Maximum = new decimal(new int[] { 85, 0, @@ -778,7 +778,7 @@ private void InitializeComponent() // this.TB_FT2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FT2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FT2.Location = new System.Drawing.Point(240, 132); + this.TB_FT2.Location = new System.Drawing.Point(92, 101); this.TB_FT2.MaxLength = 16; this.TB_FT2.Name = "TB_FT2"; this.TB_FT2.Size = new System.Drawing.Size(124, 20); @@ -788,7 +788,7 @@ private void InitializeComponent() // this.TB_FT1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FT1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FT1.Location = new System.Drawing.Point(240, 110); + this.TB_FT1.Location = new System.Drawing.Point(92, 80); this.TB_FT1.MaxLength = 16; this.TB_FT1.Name = "TB_FT1"; this.TB_FT1.Size = new System.Drawing.Size(124, 20); @@ -797,10 +797,9 @@ private void InitializeComponent() // L_TeamSlogan // this.L_TeamSlogan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_TeamSlogan.AutoSize = true; - this.L_TeamSlogan.Location = new System.Drawing.Point(166, 135); + this.L_TeamSlogan.Location = new System.Drawing.Point(11, 100); this.L_TeamSlogan.Name = "L_TeamSlogan"; - this.L_TeamSlogan.Size = new System.Drawing.Size(73, 13); + this.L_TeamSlogan.Size = new System.Drawing.Size(75, 21); this.L_TeamSlogan.TabIndex = 17; this.L_TeamSlogan.Text = "Team Slogan:"; this.L_TeamSlogan.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -808,10 +807,9 @@ private void InitializeComponent() // L_TeamName // this.L_TeamName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_TeamName.AutoSize = true; - this.L_TeamName.Location = new System.Drawing.Point(171, 113); + this.L_TeamName.Location = new System.Drawing.Point(11, 79); this.L_TeamName.Name = "L_TeamName"; - this.L_TeamName.Size = new System.Drawing.Size(68, 13); + this.L_TeamName.Size = new System.Drawing.Size(75, 21); this.L_TeamName.TabIndex = 16; this.L_TeamName.Text = "Team Name:"; this.L_TeamName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -830,85 +828,85 @@ private void InitializeComponent() this.GB_Object.Controls.Add(this.NUD_FObjType); this.GB_Object.Controls.Add(this.L_Index); this.GB_Object.Controls.Add(this.NUD_FObject); - this.GB_Object.Location = new System.Drawing.Point(6, 158); + this.GB_Object.Location = new System.Drawing.Point(222, 56); this.GB_Object.Name = "GB_Object"; - this.GB_Object.Size = new System.Drawing.Size(357, 103); + this.GB_Object.Size = new System.Drawing.Size(142, 154); this.GB_Object.TabIndex = 13; this.GB_Object.TabStop = false; this.GB_Object.Text = "Object Layout"; // // L_Y // - this.L_Y.AutoSize = true; - this.L_Y.Location = new System.Drawing.Point(231, 48); + this.L_Y.Location = new System.Drawing.Point(10, 117); this.L_Y.Name = "L_Y"; - this.L_Y.Size = new System.Drawing.Size(71, 13); + this.L_Y.Size = new System.Drawing.Size(75, 21); this.L_Y.TabIndex = 9; this.L_Y.Text = "Y Coordinate:"; + this.L_Y.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_X // - this.L_X.AutoSize = true; - this.L_X.Location = new System.Drawing.Point(231, 22); + this.L_X.Location = new System.Drawing.Point(10, 96); this.L_X.Name = "L_X"; - this.L_X.Size = new System.Drawing.Size(71, 13); + this.L_X.Size = new System.Drawing.Size(75, 21); this.L_X.TabIndex = 8; this.L_X.Text = "X Coordinate:"; + this.L_X.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FX // - this.NUD_FX.Location = new System.Drawing.Point(308, 20); + this.NUD_FX.Location = new System.Drawing.Point(87, 98); this.NUD_FX.Maximum = new decimal(new int[] { 40, 0, 0, 0}); this.NUD_FX.Name = "NUD_FX"; - this.NUD_FX.Size = new System.Drawing.Size(36, 20); + this.NUD_FX.Size = new System.Drawing.Size(40, 20); this.NUD_FX.TabIndex = 7; this.NUD_FX.ValueChanged += new System.EventHandler(this.changeObjectQuality); // // NUD_FY // - this.NUD_FY.Location = new System.Drawing.Point(308, 46); + this.NUD_FY.Location = new System.Drawing.Point(87, 119); this.NUD_FY.Maximum = new decimal(new int[] { 40, 0, 0, 0}); this.NUD_FY.Name = "NUD_FY"; - this.NUD_FY.Size = new System.Drawing.Size(36, 20); + this.NUD_FY.Size = new System.Drawing.Size(40, 20); this.NUD_FY.TabIndex = 6; this.NUD_FY.ValueChanged += new System.EventHandler(this.changeObjectQuality); // // L_Rotation // - this.L_Rotation.AutoSize = true; - this.L_Rotation.Location = new System.Drawing.Point(6, 74); + this.L_Rotation.Location = new System.Drawing.Point(10, 70); this.L_Rotation.Name = "L_Rotation"; - this.L_Rotation.Size = new System.Drawing.Size(68, 13); + this.L_Rotation.Size = new System.Drawing.Size(75, 21); this.L_Rotation.TabIndex = 5; this.L_Rotation.Text = "Rotation Val:"; + this.L_Rotation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Decoration // - this.L_Decoration.AutoSize = true; - this.L_Decoration.Location = new System.Drawing.Point(12, 48); + this.L_Decoration.Location = new System.Drawing.Point(10, 49); this.L_Decoration.Name = "L_Decoration"; - this.L_Decoration.Size = new System.Drawing.Size(62, 13); + this.L_Decoration.Size = new System.Drawing.Size(75, 21); this.L_Decoration.TabIndex = 4; this.L_Decoration.Text = "Decoration:"; + this.L_Decoration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FRot // - this.NUD_FRot.Location = new System.Drawing.Point(76, 72); + this.NUD_FRot.Location = new System.Drawing.Point(87, 72); this.NUD_FRot.Maximum = new decimal(new int[] { 7, 0, 0, 0}); this.NUD_FRot.Name = "NUD_FRot"; - this.NUD_FRot.Size = new System.Drawing.Size(36, 20); + this.NUD_FRot.Size = new System.Drawing.Size(40, 20); this.NUD_FRot.TabIndex = 3; this.NUD_FRot.Value = new decimal(new int[] { 1, @@ -919,7 +917,7 @@ private void InitializeComponent() // // NUD_FObjType // - this.NUD_FObjType.Location = new System.Drawing.Point(76, 46); + this.NUD_FObjType.Location = new System.Drawing.Point(87, 51); this.NUD_FObjType.Maximum = new decimal(new int[] { 173, 0, @@ -931,7 +929,7 @@ private void InitializeComponent() 0, -2147483648}); this.NUD_FObjType.Name = "NUD_FObjType"; - this.NUD_FObjType.Size = new System.Drawing.Size(38, 20); + this.NUD_FObjType.Size = new System.Drawing.Size(40, 20); this.NUD_FObjType.TabIndex = 2; this.NUD_FObjType.Value = new decimal(new int[] { 1, @@ -942,16 +940,16 @@ private void InitializeComponent() // // L_Index // - this.L_Index.AutoSize = true; - this.L_Index.Location = new System.Drawing.Point(38, 22); + this.L_Index.Location = new System.Drawing.Point(10, 23); this.L_Index.Name = "L_Index"; - this.L_Index.Size = new System.Drawing.Size(36, 13); + this.L_Index.Size = new System.Drawing.Size(75, 21); this.L_Index.TabIndex = 1; this.L_Index.Text = "Index:"; + this.L_Index.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FObject // - this.NUD_FObject.Location = new System.Drawing.Point(76, 20); + this.NUD_FObject.Location = new System.Drawing.Point(87, 25); this.NUD_FObject.Maximum = new decimal(new int[] { 25, 0, @@ -963,7 +961,7 @@ private void InitializeComponent() 0, 0}); this.NUD_FObject.Name = "NUD_FObject"; - this.NUD_FObject.Size = new System.Drawing.Size(36, 20); + this.NUD_FObject.Size = new System.Drawing.Size(40, 20); this.NUD_FObject.TabIndex = 0; this.NUD_FObject.Value = new decimal(new int[] { 1, @@ -974,18 +972,18 @@ private void InitializeComponent() // // L_BaseLocation // - this.L_BaseLocation.AutoSize = true; - this.L_BaseLocation.Location = new System.Drawing.Point(6, 35); + this.L_BaseLocation.Location = new System.Drawing.Point(3, 3); this.L_BaseLocation.Name = "L_BaseLocation"; - this.L_BaseLocation.Size = new System.Drawing.Size(112, 13); + this.L_BaseLocation.Size = new System.Drawing.Size(150, 21); this.L_BaseLocation.TabIndex = 11; this.L_BaseLocation.Text = "Secret Base Location:"; + this.L_BaseLocation.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // TB_FSay4 // this.TB_FSay4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay4.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay4.Location = new System.Drawing.Point(240, 72); + this.TB_FSay4.Location = new System.Drawing.Point(92, 190); this.TB_FSay4.MaxLength = 16; this.TB_FSay4.Name = "TB_FSay4"; this.TB_FSay4.Size = new System.Drawing.Size(124, 20); @@ -995,7 +993,7 @@ private void InitializeComponent() // this.TB_FSay3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay3.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay3.Location = new System.Drawing.Point(240, 50); + this.TB_FSay3.Location = new System.Drawing.Point(92, 169); this.TB_FSay3.MaxLength = 16; this.TB_FSay3.Name = "TB_FSay3"; this.TB_FSay3.Size = new System.Drawing.Size(124, 20); @@ -1005,7 +1003,7 @@ private void InitializeComponent() // this.TB_FSay2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay2.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay2.Location = new System.Drawing.Point(240, 28); + this.TB_FSay2.Location = new System.Drawing.Point(92, 148); this.TB_FSay2.MaxLength = 16; this.TB_FSay2.Name = "TB_FSay2"; this.TB_FSay2.Size = new System.Drawing.Size(124, 20); @@ -1015,7 +1013,7 @@ private void InitializeComponent() // this.TB_FSay1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.TB_FSay1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FSay1.Location = new System.Drawing.Point(240, 6); + this.TB_FSay1.Location = new System.Drawing.Point(92, 127); this.TB_FSay1.MaxLength = 16; this.TB_FSay1.Name = "TB_FSay1"; this.TB_FSay1.Size = new System.Drawing.Size(124, 20); @@ -1024,7 +1022,7 @@ private void InitializeComponent() // TB_FOT // this.TB_FOT.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.TB_FOT.Location = new System.Drawing.Point(80, 7); + this.TB_FOT.Location = new System.Drawing.Point(123, 54); this.TB_FOT.MaxLength = 12; this.TB_FOT.Name = "TB_FOT"; this.TB_FOT.Size = new System.Drawing.Size(93, 20); @@ -1032,20 +1030,19 @@ private void InitializeComponent() // // L_TrName // - this.L_TrName.AutoSize = true; - this.L_TrName.Location = new System.Drawing.Point(6, 9); + this.L_TrName.Location = new System.Drawing.Point(9, 53); this.L_TrName.Name = "L_TrName"; - this.L_TrName.Size = new System.Drawing.Size(74, 13); + this.L_TrName.Size = new System.Drawing.Size(108, 21); this.L_TrName.TabIndex = 9; this.L_TrName.Text = "Trainer Name:"; + this.L_TrName.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Confetti // this.L_Confetti.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Confetti.AutoSize = true; - this.L_Confetti.Location = new System.Drawing.Point(193, 75); + this.L_Confetti.Location = new System.Drawing.Point(11, 189); this.L_Confetti.Name = "L_Confetti"; - this.L_Confetti.Size = new System.Drawing.Size(46, 13); + this.L_Confetti.Size = new System.Drawing.Size(75, 21); this.L_Confetti.TabIndex = 8; this.L_Confetti.Text = "Confetti:"; this.L_Confetti.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1053,10 +1050,9 @@ private void InitializeComponent() // L_Blackboard // this.L_Blackboard.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Blackboard.AutoSize = true; - this.L_Blackboard.Location = new System.Drawing.Point(175, 53); + this.L_Blackboard.Location = new System.Drawing.Point(11, 168); this.L_Blackboard.Name = "L_Blackboard"; - this.L_Blackboard.Size = new System.Drawing.Size(64, 13); + this.L_Blackboard.Size = new System.Drawing.Size(75, 21); this.L_Blackboard.TabIndex = 7; this.L_Blackboard.Text = "Blackboard:"; this.L_Blackboard.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1064,10 +1060,9 @@ private void InitializeComponent() // L_Encourage // this.L_Encourage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Encourage.AutoSize = true; - this.L_Encourage.Location = new System.Drawing.Point(177, 32); + this.L_Encourage.Location = new System.Drawing.Point(11, 147); this.L_Encourage.Name = "L_Encourage"; - this.L_Encourage.Size = new System.Drawing.Size(62, 13); + this.L_Encourage.Size = new System.Drawing.Size(75, 21); this.L_Encourage.TabIndex = 6; this.L_Encourage.Text = "Encourage:"; this.L_Encourage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1075,10 +1070,9 @@ private void InitializeComponent() // L_Happy // this.L_Happy.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_Happy.AutoSize = true; - this.L_Happy.Location = new System.Drawing.Point(198, 9); + this.L_Happy.Location = new System.Drawing.Point(11, 126); this.L_Happy.Name = "L_Happy"; - this.L_Happy.Size = new System.Drawing.Size(41, 13); + this.L_Happy.Size = new System.Drawing.Size(75, 21); this.L_Happy.TabIndex = 5; this.L_Happy.Text = "Happy:"; this.L_Happy.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1098,7 +1092,7 @@ private void InitializeComponent() // B_GiveDecor // this.B_GiveDecor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.B_GiveDecor.Location = new System.Drawing.Point(144, 302); + this.B_GiveDecor.Location = new System.Drawing.Point(162, 302); this.B_GiveDecor.Name = "B_GiveDecor"; this.B_GiveDecor.Size = new System.Drawing.Size(112, 23); this.B_GiveDecor.TabIndex = 19; @@ -1118,7 +1112,7 @@ private void InitializeComponent() // // MT_Flags // - this.MT_Flags.Location = new System.Drawing.Point(93, 304); + this.MT_Flags.Location = new System.Drawing.Point(111, 304); this.MT_Flags.Mask = "00000"; this.MT_Flags.Name = "MT_Flags"; this.MT_Flags.Size = new System.Drawing.Size(39, 20); @@ -1127,12 +1121,12 @@ private void InitializeComponent() // // L_FlagsCaptured // - this.L_FlagsCaptured.AutoSize = true; this.L_FlagsCaptured.Location = new System.Drawing.Point(9, 307); this.L_FlagsCaptured.Name = "L_FlagsCaptured"; - this.L_FlagsCaptured.Size = new System.Drawing.Size(84, 13); + this.L_FlagsCaptured.Size = new System.Drawing.Size(100, 13); this.L_FlagsCaptured.TabIndex = 22; this.L_FlagsCaptured.Text = "Flags Captured: "; + this.L_FlagsCaptured.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // B_FDelete // @@ -1175,7 +1169,6 @@ private void InitializeComponent() this.f_MAIN.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FBaseLocation)).EndInit(); this.GB_Object.ResumeLayout(false); - this.GB_Object.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FY)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NUD_FRot)).EndInit(); diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs index 1e2c51459..3f996480f 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_SuperTrain.Designer.cs @@ -44,7 +44,7 @@ private void InitializeComponent() this.TB_Unk = new System.Windows.Forms.MaskedTextBox(); this.L_Unk = new System.Windows.Forms.Label(); this.L_Species = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.L_Time0 = new System.Windows.Forms.Label(); this.L_Records = new System.Windows.Forms.Label(); this.L_Bags = new System.Windows.Forms.Label(); this.L_UNKNOWN = new System.Windows.Forms.Label(); @@ -207,6 +207,8 @@ private void InitializeComponent() // CB_Species // this.CB_Species.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CB_Species.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.CB_Species.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.CB_Species.FormattingEnabled = true; this.CB_Species.Location = new System.Drawing.Point(176, 38); this.CB_Species.Name = "CB_Species"; @@ -243,15 +245,15 @@ private void InitializeComponent() this.L_Species.TabIndex = 129; this.L_Species.Text = "Species:"; // - // label4 + // L_Time0 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(178, 99); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(33, 13); - this.label4.TabIndex = 130; - this.label4.Text = "Time:"; + this.L_Time0.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.L_Time0.AutoSize = true; + this.L_Time0.Location = new System.Drawing.Point(178, 99); + this.L_Time0.Name = "L_Time0"; + this.L_Time0.Size = new System.Drawing.Size(33, 13); + this.L_Time0.TabIndex = 130; + this.L_Time0.Text = "Time:"; // // L_Records // @@ -290,7 +292,7 @@ private void InitializeComponent() this.Controls.Add(this.L_UNKNOWN); this.Controls.Add(this.L_Bags); this.Controls.Add(this.L_Records); - this.Controls.Add(this.label4); + this.Controls.Add(this.L_Time0); this.Controls.Add(this.L_Species); this.Controls.Add(this.L_Unk); this.Controls.Add(this.TB_Unk); @@ -337,7 +339,7 @@ private void InitializeComponent() private System.Windows.Forms.MaskedTextBox TB_Unk; private System.Windows.Forms.Label L_Unk; private System.Windows.Forms.Label L_Species; - private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label L_Time0; private System.Windows.Forms.Label L_Records; private System.Windows.Forms.Label L_Bags; private System.Windows.Forms.Label L_UNKNOWN; diff --git a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs index 11747e675..60ba5c73c 100644 --- a/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs +++ b/PKHeX/Subforms/Save Editors/Gen6/SAV_Trainer.Designer.cs @@ -179,8 +179,11 @@ private void InitializeComponent() this.MT_Stat = new System.Windows.Forms.MaskedTextBox(); this.TC_Editor = new System.Windows.Forms.TabControl(); this.Tab_Overview = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.GB_Stats = new System.Windows.Forms.GroupBox(); + this.GB_Adventure = new System.Windows.Forms.GroupBox(); + this.L_Fame = new System.Windows.Forms.Label(); + this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker(); + this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker(); this.L_Started = new System.Windows.Forms.Label(); this.CAL_AdventureStartDate = new System.Windows.Forms.DateTimePicker(); this.CAL_AdventureStartTime = new System.Windows.Forms.DateTimePicker(); @@ -199,9 +202,6 @@ private void InitializeComponent() this.Tab_Multiplayer = new System.Windows.Forms.TabPage(); this.Tab_Maison = new System.Windows.Forms.TabPage(); this.Tab_Appearance = new System.Windows.Forms.TabPage(); - this.L_Fame = new System.Windows.Forms.Label(); - this.CAL_HoFDate = new System.Windows.Forms.DateTimePicker(); - this.CAL_HoFTime = new System.Windows.Forms.DateTimePicker(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.PB_Badge4)).BeginInit(); @@ -216,8 +216,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.PB_Sprite)).BeginInit(); this.TC_Editor.SuspendLayout(); this.Tab_Overview.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); + this.GB_Stats.SuspendLayout(); + this.GB_Adventure.SuspendLayout(); this.Tab_BadgeMap.SuspendLayout(); this.GB_Map.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.NUD_Z)).BeginInit(); @@ -1777,8 +1777,8 @@ private void InitializeComponent() // // Tab_Overview // - this.Tab_Overview.Controls.Add(this.groupBox1); - this.Tab_Overview.Controls.Add(this.groupBox2); + this.Tab_Overview.Controls.Add(this.GB_Stats); + this.Tab_Overview.Controls.Add(this.GB_Adventure); this.Tab_Overview.Controls.Add(this.CB_Vivillon); this.Tab_Overview.Controls.Add(this.L_Vivillon); this.Tab_Overview.Controls.Add(this.TB_OTName); @@ -1808,48 +1808,81 @@ private void InitializeComponent() this.Tab_Overview.Text = "Overview"; this.Tab_Overview.UseVisualStyleBackColor = true; // - // groupBox1 + // GB_Stats // - this.groupBox1.Controls.Add(this.TB_BP); - this.groupBox1.Controls.Add(this.TB_PM); - this.groupBox1.Controls.Add(this.L_PM); - this.groupBox1.Controls.Add(this.TB_Style); - this.groupBox1.Controls.Add(this.L_Offset); - this.groupBox1.Controls.Add(this.L_BP); - this.groupBox1.Controls.Add(this.L_Value); - this.groupBox1.Controls.Add(this.L_Style); - this.groupBox1.Controls.Add(this.MT_Stat); - this.groupBox1.Controls.Add(this.CB_Stats); - this.groupBox1.Location = new System.Drawing.Point(209, 99); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(171, 151); - this.groupBox1.TabIndex = 55; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Stats"; + this.GB_Stats.Controls.Add(this.TB_BP); + this.GB_Stats.Controls.Add(this.TB_PM); + this.GB_Stats.Controls.Add(this.L_PM); + this.GB_Stats.Controls.Add(this.TB_Style); + this.GB_Stats.Controls.Add(this.L_Offset); + this.GB_Stats.Controls.Add(this.L_BP); + this.GB_Stats.Controls.Add(this.L_Value); + this.GB_Stats.Controls.Add(this.L_Style); + this.GB_Stats.Controls.Add(this.MT_Stat); + this.GB_Stats.Controls.Add(this.CB_Stats); + this.GB_Stats.Location = new System.Drawing.Point(209, 99); + this.GB_Stats.Name = "GB_Stats"; + this.GB_Stats.Size = new System.Drawing.Size(171, 151); + this.GB_Stats.TabIndex = 55; + this.GB_Stats.TabStop = false; + this.GB_Stats.Text = "Stats"; // - // groupBox2 + // GB_Adventure // - this.groupBox2.Controls.Add(this.L_Fame); - this.groupBox2.Controls.Add(this.CAL_HoFDate); - this.groupBox2.Controls.Add(this.CAL_HoFTime); - this.groupBox2.Controls.Add(this.L_Started); - this.groupBox2.Controls.Add(this.CAL_AdventureStartDate); - this.groupBox2.Controls.Add(this.CAL_LastSavedDate); - this.groupBox2.Controls.Add(this.L_LastSaved); - this.groupBox2.Controls.Add(this.MT_Seconds); - this.groupBox2.Controls.Add(this.MT_Hours); - this.groupBox2.Controls.Add(this.L_Seconds); - this.groupBox2.Controls.Add(this.L_Hours); - this.groupBox2.Controls.Add(this.MT_Minutes); - this.groupBox2.Controls.Add(this.L_Minutes); - this.groupBox2.Controls.Add(this.CAL_AdventureStartTime); - this.groupBox2.Controls.Add(this.CAL_LastSavedTime); - this.groupBox2.Location = new System.Drawing.Point(3, 99); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(200, 151); - this.groupBox2.TabIndex = 56; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Adventure Info"; + this.GB_Adventure.Controls.Add(this.L_Fame); + this.GB_Adventure.Controls.Add(this.CAL_HoFDate); + this.GB_Adventure.Controls.Add(this.CAL_HoFTime); + this.GB_Adventure.Controls.Add(this.L_Started); + this.GB_Adventure.Controls.Add(this.CAL_AdventureStartDate); + this.GB_Adventure.Controls.Add(this.CAL_LastSavedDate); + this.GB_Adventure.Controls.Add(this.L_LastSaved); + this.GB_Adventure.Controls.Add(this.MT_Seconds); + this.GB_Adventure.Controls.Add(this.MT_Hours); + this.GB_Adventure.Controls.Add(this.L_Seconds); + this.GB_Adventure.Controls.Add(this.L_Hours); + this.GB_Adventure.Controls.Add(this.MT_Minutes); + this.GB_Adventure.Controls.Add(this.L_Minutes); + this.GB_Adventure.Controls.Add(this.CAL_AdventureStartTime); + this.GB_Adventure.Controls.Add(this.CAL_LastSavedTime); + this.GB_Adventure.Location = new System.Drawing.Point(3, 99); + this.GB_Adventure.Name = "GB_Adventure"; + this.GB_Adventure.Size = new System.Drawing.Size(200, 151); + this.GB_Adventure.TabIndex = 56; + this.GB_Adventure.TabStop = false; + this.GB_Adventure.Text = "Adventure Info"; + // + // L_Fame + // + this.L_Fame.Location = new System.Drawing.Point(3, 72); + this.L_Fame.Name = "L_Fame"; + this.L_Fame.Size = new System.Drawing.Size(80, 20); + this.L_Fame.TabIndex = 40; + this.L_Fame.Text = "HoF Entered:"; + this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // CAL_HoFDate + // + this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; + this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72); + this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); + this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + this.CAL_HoFDate.Name = "CAL_HoFDate"; + this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20); + this.CAL_HoFDate.TabIndex = 39; + this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + // + // CAL_HoFTime + // + this.CAL_HoFTime.CustomFormat = "hh:mm tt"; + this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; + this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91); + this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); + this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); + this.CAL_HoFTime.Name = "CAL_HoFTime"; + this.CAL_HoFTime.ShowUpDown = true; + this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20); + this.CAL_HoFTime.TabIndex = 38; + this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0); // // L_Started // @@ -2119,39 +2152,6 @@ private void InitializeComponent() this.Tab_Appearance.Text = "Appearance"; this.Tab_Appearance.UseVisualStyleBackColor = true; // - // L_Fame - // - this.L_Fame.Location = new System.Drawing.Point(3, 72); - this.L_Fame.Name = "L_Fame"; - this.L_Fame.Size = new System.Drawing.Size(80, 20); - this.L_Fame.TabIndex = 40; - this.L_Fame.Text = "HoF Entered:"; - this.L_Fame.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // CAL_HoFDate - // - this.CAL_HoFDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.CAL_HoFDate.Location = new System.Drawing.Point(89, 72); - this.CAL_HoFDate.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); - this.CAL_HoFDate.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - this.CAL_HoFDate.Name = "CAL_HoFDate"; - this.CAL_HoFDate.Size = new System.Drawing.Size(99, 20); - this.CAL_HoFDate.TabIndex = 39; - this.CAL_HoFDate.Value = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - // - // CAL_HoFTime - // - this.CAL_HoFTime.CustomFormat = "hh:mm tt"; - this.CAL_HoFTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.CAL_HoFTime.Location = new System.Drawing.Point(115, 91); - this.CAL_HoFTime.MaxDate = new System.DateTime(2050, 12, 31, 0, 0, 0, 0); - this.CAL_HoFTime.MinDate = new System.DateTime(2000, 1, 1, 0, 0, 0, 0); - this.CAL_HoFTime.Name = "CAL_HoFTime"; - this.CAL_HoFTime.ShowUpDown = true; - this.CAL_HoFTime.Size = new System.Drawing.Size(73, 20); - this.CAL_HoFTime.TabIndex = 38; - this.CAL_HoFTime.Value = new System.DateTime(2001, 1, 1, 0, 0, 0, 0); - // // SAV_Trainer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -2185,10 +2185,10 @@ private void InitializeComponent() this.TC_Editor.ResumeLayout(false); this.Tab_Overview.ResumeLayout(false); this.Tab_Overview.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); + this.GB_Stats.ResumeLayout(false); + this.GB_Stats.PerformLayout(); + this.GB_Adventure.ResumeLayout(false); + this.GB_Adventure.PerformLayout(); this.Tab_BadgeMap.ResumeLayout(false); this.Tab_BadgeMap.PerformLayout(); this.GB_Map.ResumeLayout(false); @@ -2371,8 +2371,8 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_M; private System.Windows.Forms.NumericUpDown NUD_Z; private System.Windows.Forms.GroupBox GB_Map; - private System.Windows.Forms.GroupBox groupBox2; - private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox GB_Adventure; + private System.Windows.Forms.GroupBox GB_Stats; private System.Windows.Forms.DateTimePicker CAL_AdventureStartDate; private System.Windows.Forms.DateTimePicker CAL_AdventureStartTime; private System.Windows.Forms.Label L_Started; diff --git a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs index 5245c33af..bf21fa08d 100644 --- a/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_BoxViewer.cs @@ -42,6 +42,9 @@ public SAV_BoxViewer(Main p) pb.DragEnter += pbBoxSlot_DragEnter; pb.QueryContinueDrag += pbBoxSlot_QueryContinueDrag; } + for (int i = SAV.BoxSlotCount; i < SlotPictureBoxes.Length; i++) + SlotPictureBoxes[i].Visible = false; + try { CB_BoxSelect.Items.Clear(); @@ -87,7 +90,7 @@ private void setPKXBoxes() int boxbgval = SAV.getBoxWallpaper(CB_BoxSelect.SelectedIndex); PAN_Box.BackgroundImage = BoxWallpaper.getWallpaper(SAV, boxbgval); - for (int i = 0; i < SlotPictureBoxes.Length; i++) + for (int i = 0; i < SAV.BoxSlotCount; i++) getSlotFiller(boxoffset + SAV.SIZE_STORED*i, SlotPictureBoxes[i]); } private void getSlotFiller(int offset, PictureBox pb) diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs index e341d52a2..338dddf6a 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs @@ -49,9 +49,10 @@ private void InitializeComponent() this.B_LoadNew = new System.Windows.Forms.Button(); this.B_LoadOld = new System.Windows.Forms.Button(); this.GB_Flags = new System.Windows.Forms.GroupBox(); + this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); this.GB_Constants = new System.Windows.Forms.GroupBox(); this.TLP_Const = new System.Windows.Forms.TableLayoutPanel(); - this.TLP_Flags = new System.Windows.Forms.TableLayoutPanel(); + this.L_EventFlagWarn = new System.Windows.Forms.Label(); this.GB_FlagStatus.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nud)).BeginInit(); this.GB_Researcher.SuspendLayout(); @@ -271,21 +272,38 @@ private void InitializeComponent() this.GB_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Flags.Controls.Add(this.TLP_Flags); - this.GB_Flags.Location = new System.Drawing.Point(12, 12); + this.GB_Flags.Location = new System.Drawing.Point(12, 24); this.GB_Flags.Name = "GB_Flags"; - this.GB_Flags.Size = new System.Drawing.Size(212, 210); + this.GB_Flags.Size = new System.Drawing.Size(212, 198); this.GB_Flags.TabIndex = 39; this.GB_Flags.TabStop = false; this.GB_Flags.Text = "Event Flags"; // + // TLP_Flags + // + this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.TLP_Flags.AutoScroll = true; + this.TLP_Flags.ColumnCount = 2; + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.TLP_Flags.Location = new System.Drawing.Point(6, 19); + this.TLP_Flags.Name = "TLP_Flags"; + this.TLP_Flags.RowCount = 2; + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.TLP_Flags.Size = new System.Drawing.Size(200, 172); + this.TLP_Flags.TabIndex = 0; + // // GB_Constants // this.GB_Constants.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.GB_Constants.Controls.Add(this.TLP_Const); - this.GB_Constants.Location = new System.Drawing.Point(235, 12); + this.GB_Constants.Location = new System.Drawing.Point(235, 24); this.GB_Constants.Name = "GB_Constants"; - this.GB_Constants.Size = new System.Drawing.Size(212, 210); + this.GB_Constants.Size = new System.Drawing.Size(212, 198); this.GB_Constants.TabIndex = 40; this.GB_Constants.TabStop = false; this.GB_Constants.Text = "Event Constants"; @@ -303,31 +321,28 @@ private void InitializeComponent() this.TLP_Const.Name = "TLP_Const"; this.TLP_Const.RowCount = 1; this.TLP_Const.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Const.Size = new System.Drawing.Size(200, 184); + this.TLP_Const.Size = new System.Drawing.Size(200, 172); this.TLP_Const.TabIndex = 0; // - // TLP_Flags + // L_EventFlagWarn // - this.TLP_Flags.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) + this.L_EventFlagWarn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.TLP_Flags.AutoScroll = true; - this.TLP_Flags.ColumnCount = 2; - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.TLP_Flags.Location = new System.Drawing.Point(6, 19); - this.TLP_Flags.Name = "TLP_Flags"; - this.TLP_Flags.RowCount = 2; - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.TLP_Flags.Size = new System.Drawing.Size(200, 184); - this.TLP_Flags.TabIndex = 0; + this.L_EventFlagWarn.ForeColor = System.Drawing.Color.Red; + this.L_EventFlagWarn.Location = new System.Drawing.Point(12, 1); + this.L_EventFlagWarn.Name = "L_EventFlagWarn"; + this.L_EventFlagWarn.Size = new System.Drawing.Size(435, 20); + this.L_EventFlagWarn.TabIndex = 41; + this.L_EventFlagWarn.Text = "Altering Event Flags may impact other story events. Save file backups are recomme" + + "nded."; + this.L_EventFlagWarn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // SAV_EventFlags // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(454, 351); + this.Controls.Add(this.L_EventFlagWarn); this.Controls.Add(this.GB_Constants); this.Controls.Add(this.GB_Flags); this.Controls.Add(this.GB_Researcher); @@ -378,5 +393,6 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox GB_Constants; private System.Windows.Forms.TableLayoutPanel TLP_Const; private System.Windows.Forms.TableLayoutPanel TLP_Flags; + private System.Windows.Forms.Label L_EventFlagWarn; } } \ No newline at end of file diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs index f80ecd218..6b28c6775 100644 --- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs +++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs @@ -218,7 +218,7 @@ private void changeCustomFlag(object sender, EventArgs e) else { c_CustomFlag.Enabled = true; - nud.BackColor = Main.defaultControlWhite; + nud.ResetBackColor(); c_CustomFlag.Checked = flags[flag]; } } @@ -301,7 +301,7 @@ private void diffSaves() SaveFile s1 = SaveUtil.getVariantSAV(File.ReadAllBytes(TB_OldSAV.Text)); SaveFile s2 = SaveUtil.getVariantSAV(File.ReadAllBytes(TB_NewSAV.Text)); - if (s1.GetType() != s2.GetType()) { Util.Alert("Save types are different.", $"S1: {s1.GetType()}", $"S2: {s2.GetType()}"); return; } + if (s1.GetType() != s2.GetType()) { Util.Alert("Save types are different.", $"S1: {s1.GetType().Name}", $"S2: {s2.GetType().Name}"); return; } if (s1.Version != s2.Version) { Util.Alert("Save versions are different.", $"S1: {s1.Version}", $"S2: {s2.Version}"); return; } string tbIsSet = ""; diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs index c997680e7..49fadc449 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Linq; using System.Windows.Forms; @@ -13,11 +14,16 @@ public SAV_Inventory() switch (SAV.Generation) { case 1: - itemlist = PKX.getG1ItemList(); + itemlist = Main.g1items; B_GiveAll.Visible = false; // Can't give all, not enough room break; + case 2: + itemlist = Main.g2items; + B_GiveAll.Visible = false; + break; case 3: itemlist = Main.g3items; + B_GiveAll.Visible = false; break; default: itemlist = Main.itemlist; @@ -47,6 +53,8 @@ private void B_Save_Click(object sender, EventArgs e) private void getBags() { + tabControl1.SizeMode = TabSizeMode.Fixed; + tabControl1.ItemSize = new Size(IL_Pouch.Images[0].Width + 4, 0); for (int i = 0; i < Pouches.Length; i++) { // Add Tab @@ -167,7 +175,7 @@ private void packBags() itemcnt++; // No 0 count of items else if (itemcnt > 995) itemcnt = 995; // cap out - else if (itemcnt > 99 && SAV.Generation < 3) + else if (itemcnt > 99 && SAV.Generation <= 3) itemcnt = 99; if (itemindex == 0) // Compression of Empty Slots diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.resx b/PKHeX/Subforms/Save Editors/SAV_Inventory.resx index f2029aec5..8c5cb2c89 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Inventory.resx +++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.resx @@ -124,9 +124,9 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADE - IwAAAk1TRnQBSQFMAgEBCAEAARgBAAEIAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABgAMAAWADAAEBAQABCAYAATAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABc + DwAAAk1TRnQBSQFMAgEBCAEAARgBAAEIAQABGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABYAMAAUgDAAEBAQABCAYAARsYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm @@ -154,130 +154,43 @@ AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8A/wD/AP8A/wD/AP8A - /wD/AP8A/wD/AP8A/wD/AP8AFAAT9BMADfQbAAf0CAAg9AMAAfQE/wn0BP8B9BMAAfQL/wH0GwAB9AL/ - AfQC/wH0CAAe/wL0AQAD9AH/AvQCGQEJAtwB1QLcAQkBGQHzA/8D9A0ABPQB8wEZCdwBGQHzBPQHAAn0 - AwAG9AEJAdUB3QH/AfQIAAH/ARkb3AEZAvQBAAH0Av8B9AIZAQkB3AHbAtQBzQLUAdsBCQEZA/QC/wH0 - DQAB9AP/ARkB3AHUB80B1AHcARkD/wH0BwAB9Af/AfQDAAH0A/8B9AEZAdUBzQHcAf8B9AgAAf8B3BnN - AtQB3AL0AQAB9AH/AhkB3ALVA9QDzQLUAtUB3AEJAhkB/wH0CwAC9AHzARkC3AHVAtQHzQLUAdUC3AEZ - AfMC9AUAAfQB/wH1BPQB/wX0Af8C9AHcAdUB1AHNAdwB/wH0CAAB/wHcAc0a1AHcAvQBAAL0ARkB3AHU - C80C1AHbAdwBGQL0CwAB9AH/ARkB3AHUD80B1AHcARkB/wH0BQAB9AH/AfQEGQH0Bf8B9AIZAdUDzQHc - Af8B9AgAAf8B3AHNAdQB2xXcAdsB2gHUAdwD9ALzAQkB2wHUDM0C1AHcAQkB8wP0BwAC9AHzARkB3ALU - D80C1AHcARkB8wL0AwAB9AH/ARkB3AHbAdUB3AEJARkD8wEZAQkB3AHVAdQDzQHcAf8B9AgAAf8B3AHN - AdQB2xXcAdsB2gHUAdwD9ALzAdwC1A3NAdQB1QEJAfMB9AH/AfQHAAH0Af8BGQHcAdQTzQHUAdwBGQH/ - AfQDAAL0AdwC1AHNAdQB2wHcA90B3AHbAdQFzQHcAf8B9AgAAf8B3AHNAdQB2xXcAdsB2gHUAdwC9AH/ - ARkBCQHVAdQOzQLUAdwBGQHzAf8B9AcAAfQB/wHcAtQTzQLUAdwB/wH0AwAC9AEZAdwB1QTUA9UD1AXN - AdwB/wn0Af8B3AHNAdQB2xXcAdsB2gHUAdwC9AH/ARkB2wHUD80C1AHbAdwBGQL0BwAB9AH/AdwXzQHc - Af8B9AUAAfQB/wHcAtQNzQHcAv8I9AH/AdwBzQHUAdsV3AHbAdoB1AHcAvQB/wHcAtQEzQHUC80C1AHb - AQkC9AYAAfQB8wEZAdUHzQLUAdUD3AHVAtQHzQHVARkB8wL0AwAB9AH/AQkB2wHUBM0H1ALNAdUIGQH/ - AfQB/wHcAc0B1AHbFdwB2wHaAdQB3AL0Af8B3AXNA9QLzQLUAdwC9AYAAf8BGQHcAdQHzQHUAdwBGQP/ - ARkB3AHUB80B1AHcARkB/wH0AwAC9AEZAQkB1QPNCdQBzQHUB9wBGQH/AfQB/wHcAc0B1AHbFdwB2wHa - AdQB3AL0Af8B3AHUAs0BzgHUAdUB2wHVA9QHzQLUAdoB3AL0BgAB/wHcAtQFzQLUAdwBGQXcARkB3ALU - Bc0C1AHcAf8B9AMAAvQB8wEZAdwB1AHOAc0E1AHVA9sB1AHNBtQB1QHcAd0B/wH0Af8B3AHNAdQB2xXc - AdsB2gHUAdwC9AH/AdwC1AHNAdQB1QHcAQkB3AHbAdoC1AXNAtQB2gHbAQkC9AYAAf8B3AfNAdQB3AEZ - Af8B3APNAdwB/wEZAdwB1AfNAdwB/wH0BQAB9AH/AQkB1QHUAc0B1APVBNwB1AfNAdQB1QEJAvQB/wHc - Ac0B1AHbFdwB2wHaAdQB3AL0Af8BGQHcAdQBzgHUAdUB3AEZAtwB2wLUBc0C1AHbAdwBGQL0BgAB/wHc - B9QB3AEZAtwB1APNAdQC3AEZAdwH1AHcAf8B9AMABPQB3AHbAdQBzQTUAdsD3AHUBM0D1AHbAQkBGQL0 - Af8B3AHNAdQB2wfcAdsB1QPUAdUB2wfcAdsB2gHUAdwD9AIZAdYBzgHUAdUB3AEZAQkB3AHbAtQFzQLU - AdwCGQL0BgAB/wEZB9wBGQH/AdwHzQHcAf8BGQfcARkB/wH0AwAC9AIZAdwB2wHUAc0E1AHbA9wB1APN - AtQB2gHbAQkC9AIAAf8B3AHNAdQB2wbcAdsC1APNAtQB2wbcAdsB2gHUAdwE9AEZAdwD1AHVAtwB2wLU - Bc0C1AHbAdwBGQP0BgAB/wH0BxkB9AH/AdwHzQHcAf8B9AcZAfQB/wH0AQAC9AEZAQkC3AHVAtQBzQHU - B9sB1AHNAtQB1QLcAQkBGQL0AgAB/wHcAc0B1AHbBdwB2wHVB9QB1QHbBdwB2wHaAdQB3AL0AQAC9AEJ - AdsB1AHNAdQB1QPUBc0C1AHbAdwBGQL0CAAL/wHcB80B3Av/AfQBAAL0AQkB1QPUA80B1APcAdsE1AHN - AdQB3AEJAhkC9AQAAf8B3AHNAdQB2wTcAdsC1AHVBdwB1QLUAdsE3AHbAdoB1AHcAvQBAAL0ARkB3AHb - AdQB1QHbA9QCzQPUAdUB2wHcARkB8wL0AQAH9AH/ARkI3AEZAtwB1APNAdQC3AEZCNwBGQH/AvQBGQEJ - AdUD1ATNAdQD3AHbBNQBzQHUAdwBCQT0BAAB/wHcAc0B1AHbA9wC2wHaAdsH3AHVAdQB1QHbA9wB2wHa - AdQB3AL0AQAC9AIZAQkC3AHbAdoC1AHNAtQB2gHbAdwBCQHxAvMC9AEAAfQC/wT0Af8B3AfNAdQB3AEZ - Af8B3APNAdwB/wEZAdwB1AfNAdwB/wL0AQkB1QHUB80B1ATcA9UB1AHNAdQB1QEJAf8B9AYAAf8B3AHN - AdQB2wLcAdsB1AHaAdsJ3AHVAtQB2wLcAdsB2gHUAdwC9AEAA/QDGQIJAdwB2wPUAdsB3AEJAhkB8wb0 - Af8B9AEZA/QB/wHcAtQFzQLUAdwBGQXcARkB3ALUBc0C1AHcAf8B9AH/Ad0B3AbVAc4BzQHUA9sB1QTU - Ac0BzgHUAdwBGQHzAvQEAAH/AdwBzQHUBNsB2gHbC9wB2wHaBNsB2gHUAdwC9AMABPQC8wEZAtwB2wLc - ARkC8wH0Av8B9AEAAfQC/wH0AxkC9AH/ARkB3AHUB80B1AHcARkD/wEZAdwB1AfNAdQB3AEZAf8B9AH/ - ARkHCQHVAc0J1APNAdUBCQEZAvQEAAH/AdwBzQHUAdsB2gHUAdoB2w3cAdsB2gHUAdoB2wHaAdQB3AL0 - AwAE9ALzAQkB3AHbAdoB2wHcAQkC8wL0Af8B9ALzARkBCQPcARkD9AHzARkB1QfNAtQB1QPcAdUC1AfN - AdUBGQHzAvQB/wHzBxkB1QLNB9QEzQHUAdsBCQH/AfQEAAH/AdwBzQPUAdoB2w/cAdsB2gTUAdwC9AcA - AvQBCQHVAtQB2gHbAdwCGQP0AvMB8QEJAdsD1AHcAvQBAAH0Af8B3BfNAdwB/wH0AgAH9AL/AdwNzQLU - AdwB/wH0BAAB/wHcA80B1AHbEdwB2wHUAc0C1AHcAvQHAAL0Ad0B3AHVA9QB1QfcAtUD1AHbAQkC9AEA - AfQB/wHcAtQTzQLUAdwB/wH0AgAI9AH/AdwFzQPUA9UE1AHVAdwBGQL0AgAB/wHcAc0C1AHbE9wB2wPU - AdwC9AcAAvQBGQHcAdsC1AHNCdQDzQHUAdwBGQL0AQAB9AH/ARkB3AHUE80B1AHcARkB/wH0CQAB9AH/ - AdwFzQHUAdsB3AMZAdwB2wHUAc0C1AHcAvQCAAH/AdwBzQHUAdsV3AHbAdoB1AHcAvQHAAH0Af8CGQHc - AdsO1AHcAhkB/wH0AQAC9AHzARkB3ALUD80C1AHcARkB8wL0CQAB9AH/AdwDzQHUAdUB3AEJARkD9AEZ - AQkB3AHVAdsB3AEZAf8B9AIAAf8B3AHNAdQB2xXcAdsB2gHUAdwC9AcAAfQC/wH0ARkB3AHbAtQHzQLU - AdsB3AEZAfQC/wH0AwAB9AH/ARkB3AHUD80B1AHcARkB/wH0CwAB9AH/AdwDzQHVAhkB9AX/AfQEGQH0 - Af8B9AIAAf8B3AHNAdQB2xXcAdsB2gHUAdwC9AcAA/QB/wIZAQkB3AHbAtQEzQHUAdUB3AEJAhkB/wP0 - AwAC9AHzARkC3AHVAtQHzQLUAdUC3AEZAfMC9AsAAfQB/wHcAc0B1AHVAQkC9AH/BfQB/wT0AfUB/wH0 - AgAB/wHcAc0a1AHcAvQJAAH0Av8D9AEJAdsB1APNAtQB3AP0Av8B9AcAAfQD/wEZAdwB1AfNAdQB3AEZ - A/8B9A0AAfQB/wHcAc0B1QH0BP8B9AMAAfQH/wH0AgAB/wHcGc0C1AHcAvQJAAb0ARkBCQbcARkG9AcA - BPQB8wEZCdwBGQHzBPQNAAH0Af8BGQHcAd0G9AMACfQCAAH/ARkb3AEZAvQPAAL0Bf8C9BEAAfQL/wH0 - EQAB9AP/AfQUAB7/AvQHABH0DQAJ9B0ACfQMACD0BwAC9A3/AvQNAAH0B/8B9B0AAfQH/wH0DAAe/wL0 - AwAF9AIZAQkJ3AMZBfQFAAT0AfMBGQXcARkB8wT0FQAE9AEZB9wBGQT0CAAB/wEZGNwCGQT0AwAC9AL/ - AfQBGQHcAdUB1AfNAdQB2wHcARkB9AL/AvQFAAH0A/8BGQHcAdQDzQHUAdwBGQP/AfQVAAH0A/8B3AfN - AdwD/wH0CAAB/wHcAtQVzQHUAdsB3AIZAvQBAAL0AfMBGQEJAtwB1QLUAc4HzQPUAdUC3AEJARkB8wL0 - AwAB9AH/ARkB3AHVAtQDzQLUAdUB3AEZAf8B9BMAAvQBGQPcAdUB1AHVA9wB1QHUAdUD3AEZAvQGAAH/ - AdwC1BXNAdQB2wHcAhkC9AEAAvQBGQEJAdsC1A/NAtQB2wEJARkC9AMAAfQB/wHcC80B3AH/AfQTAAH0 - Af8B3APNAdQB3AEZA/8BGQHcAdQDzQHcAf8B9AYAAf8B3ALUFc0B1AHbAdwCGQL0AQAC9AEJAdsC1BHN - AdQB1QHcAd0C9AIAAfQB8wEZAdUDzQHUA9wB1APNAdUBGQHzAvQPAAL0ARkB3AHVAdQB1QLcARkB9AP/ - ARkB3AHbA9QB1QHcARkC9AQAAf8B3ALUFc0B1AHbAdwCGQL0AQAC9AHcAtQTzQHUAdUBCQL0AgAB/wEZ - AdwB1APNAdwD/wHcA80B1AHcARkB/wH0DwAB9AH/AdwBzQHUAdwBGQf/ARkF3AHUAc0B3AH/AfQEAAH/ - AdwC1BXNAdQB2wHcAhkD9AHzARkB2wLUE80C1AHcARkB8wL0Af8B3ALUAc0B1AHcARkD9AEZAdwB1AHN - AtQB3AH/AfQNAAL0ARkB3AHVAdQB3AEZAfQF/wH0ARkBCQXcAdsB1AHVAdwBGQL0AgAB/wHcAtQVzQHU - AdsB3AIZAvQB/wEZAdwB2wLUE80C1AHbAQkBGQL0Af8B3APNAdwB/wH0AwAB9AH/AdwDzQHcAf8B9A0A - AfQB/wHcAc0B1AHcARkH/wEZCdwB1AHNAdwB/wH0AgAB/wHcAtQVzQHUAdsB3AIZAvQB/wEJAdsC1BXN - AtQB2wEJAvQB/wHcA80B3AH/AfQDAAH0Af8B3APNAdwB/wH0DQAB9AH/AdwBzQHVARkB9Af/ARkJ3AHU - Ac0B3AH/AfQCAAH/AdwC1BXNAdQB2wHcAhkC9AH/AdwC1BfNAtQB3AL0Af8B3APNAdwB/wH0AwAB9AH/ - AdwDzQHcAf8B9A0AAfQB/wHcAc0B3An/ARkJ3AHUAc0B3AH/AfQCAAH/AdwC1BXNAdQB2wHcAhkC9AH/ - AdwC1BfNAtQB3AL0Af8B3ALUAc0B1AHcARkD9AEZAdwB1AHNAtQB3AH/AfQMAAH0ARkB3AHVAdQB3AX/ - AfQBGQLcAdUB1AHbB9wB2wHUAdUB3AEZAvQB/wEJAdsB1RXUAdsC3AIZAvQB/wHcAtQXzQLUAdwC9AH/ - ARkB3AHUA80B3AP/AdwDzQHUAdwBGQH/AfQMAAH/AdwBzQHUAdwBGQX/ARkB3AHUA80B1AncAdQBzQHc - Af8B9AH/ARkBCRjcAQkCGQL0Af8BCQHbAtQVzQLUAdsBCQP0AfMBGQHVA80B1APcAdQDzQHVARkB8wL0 - AQAD9AgAAf8B3AHNAdUBGQH0Bf8B3AHUAdwDCQHcAdQB2wPcAQkDGQHVAc0B3AH/AfQB/wEZAQkY3AEJ - AhkC9AH/ARkB3AHbAtQTzQLUAdsBCQEZAvQBAAH0Af8B3AvNAdwB/wH0AwAB9AH/AfQIAAH/AdwBzQHc - B/8B3AHNAQkDAAEJAc0B1APcARkD/wHcAc0B3AH/AfQB/wEZAQkY3AEJAhkD9AHzARkB2wLUE80C1AHc - ARkB8wL0AQAB9AH/ARkB3AHVAtQFzQLUAdwB/wH0AQAC9AHzARkB8wL0BgAB/wHcAc0B3AP/AfQDGQHV - Ac0BCQMAAQkBzQHVAxkB9AP/AdwBzQHcAf8B9AH/AQkB2wHVFdQB2wLcAhkC9AEAAvQB3ALUE80B1AHV - AQkC9AMAAfQD/wEZAdwB1AXNAdQB3AEZAf8B9AEAAfQB/wEZAdwBGQH/AfQGAAH/AdwBzQHcA/8BGQPc - AdQBzQEJAwABCQHNAdwH/wHcAc0B3AH/AfQB/wHcAtQVzQHUAdsB3AIZAvQBAAL0AQkB2wLUEc0B1AHV - AdwB3QL0AwAE9AHzARkE3AHUAc0C1AHcARkB8wH0AfMBGQHcAdQB1QHcARkC9AQAAf8B3AHNAdUDGQEJ - A9wB2wHUAdwDCQHcAdQB3AX/AfQBGQHVAc0B3AH/AfQB/wHcAtQVzQHUAdsB3AIZAvQBAAL0ARkBCQHb - AtQPzQLUAdsBCQEZAvQHAAH0Bf8B3APNAdQB3AEZAf8BGQHcAdQDzQHcAf8B9AQAAf8B3AHNAdQJ3AHU - A80B1AHcARkF/wEZAdwB1AHNAdwB/wH0Af8B3ALUFc0B1AHbAdwCGQL0AQAC9AHzARkBCQLcAtUL1ALV - AtwBCQEZAfMC9AcABvQBGQHcAdQBzQLUAdwBGQHcAtQBzQHUAtwBGQHzAvQCAAH0ARkB3AHVAdQB2wfc - AdsB1AHVAtwBGQH0Bf8B3AHUAdUB3AEZAvQB/wHcAtQVzQHUAdsB3AIZAvQDAAL0Av8B9AEZAQkL3AEJ - ARkB9AL/AvQPAAH0Af8B3APNAdQB3AHUA80B3AH/ARkB3AEZAf8B9AMAAfQB/wHcAc0B1AncARkJ/wHc - Ac0B3AH/AfQCAAH/AdwC1BXNAdQB2wHcAhkC9AMAA/QB/wH0ARkC3AHVB9QB2wLcARkB9AH/A/QPAAL0 - ARkB3AHUAc0D1AHNAdQC3AEZAdwB1AHVAdwBGQL0AQAB9AH/AdwBzQHUCdwBGQf/AfQBGQHVAc0B3AH/ - AfQCAAH/ARkC3ALVE9QB2wHcARkE9AUAAvQCGQHcAdUB1AfNAdQB2wHcAhkC9BMAAfQB/wHcBc0B3AH/ - ARkB3AHUA80B3AH/AfQBAAH0Af8B3AHNAdQJ3AEZB/8BGQHcAdQBzQHcAf8B9AIAA/8B9AEZAQkT3AEJ - ARkB9AL/AvQDAAL0AfMBGQLcAdUB1AHOB80C1AHVAdwCGQP0EQAC9AEZAdwB1APNAdUBGQHcAtQBzQHU - AdwBGQL0AQAC9AEZAdwB1QHUAdsF3AEJARkB9AX/AfQBGQHcAdQB1QHcARkC9AIAAvQB/wEZAdwB2w/U - AdUB2wLcAQkBGQH0Af8D9AMAAvQBGQEJAdsC1AvNAdQB1QHcAhkC9BMAAfQB/wHcA80B1AHcAdQDzQHc - Af8B9AUAAfQB/wHcAc0B1AXcARkH/wEZAdwB1AHNAdwB/wH0BQAC9AEJAdsB1A/NAtQB2wHcAQkCGQL0 - AwAC9AHzARkBCQHbAtQMzQHOAdQB1QLcARkB8wL0EQAC9AEZAdwB1AHNA9QBzQHUAdwBGQL0BQAC9AEZ - AdwB1QPUAdsB3AEZA/8B9AEZAtwB1QHUAdUB3AEZAvQFAAL0AQkB2wHUD80C1AHbAdwBCQIZAvQDAAL0 - ARkBCQHbAtQPzQLUAdsBCQEZAvQTAAH0Af8B3AXNAdwB/wH0CQAB9AH/AdwDzQHUAdwBGQP/ARkB3AHU - A80B3AH/AfQHAAL0AQkB2wHUD80C1AHbAdwBCQIZAvQDAAL0ARkBCQHbAtQPzQLUAdsBCQEZAvQTAAL0 - ARkB3AHUAc0B1AHcARkC9AkAAvQBGQPcAdUB1AHVA9wB1QHUAdUD3AEZAvQHAAL0AQkB2wHUD80C1AHb - AdwBCQIZAvQDAAL0ARkBCQHbAtQPzQLUAdsBCQEZAvQVAAH0Af8B3AHNAdwB/wH0DQAB9AP/AdwHzQHc - A/8B9AkAAvQBCQHbAdQPzQLUAdsB3AEJAhkC9AMAAvQB8wEZAQkT3AEJARkB8wL0FQAC9AEZAdwBGQL0 - DQAE9AEZB9wBGQT0CQAC9AIZEtwBCQIZBPQFAAL0Ff8C9BkAAfQB/wH0EwAB9Af/AfQNAAL0Gf8C9AIA - AUIBTQE+BwABPgMAASgDAAGAAwABYAMAAQEBAAEBBgABBhYAA///AP8AAwAB4AEAAQMC/wGAAQMD/wGA - Af8EAAHgAQABAwL/AYABAwP/AYAB/wQAAYACAAH/AfgCAAE/AYABOAEAAf8EAAGAAgAB/wH4AgABPwGA - ATgBAAH/BAABgAIAAf8B4AIAAQ8BgAIAAf8EAAGAAgAB/wHgAgABDwGAAgAB/wcAAT8BgAIAAQMBgAIA - Af8HAAE/AYACAAEDAYACAAH/BwABPwGAAgABAwGACgABPwGAAgABAwHgCgABPwQAAeAKAAE/BAAB4AoA - AT8EAAHgCgABPwQAAfgKAAE/BAAB4AoAAT8EAAHgAgABAwcAAT8EAAGAAgABAwQAAYACAAH/BAABgAIA - AQ8EAAGAAgABgAcAAQ8EAAGAAgABgAcAAT8EAAGACgABDwQAAeABAAECCAABDwQAAeAKAAEPBAAB/gMA - AYACAAEDAwABDwQAAf4DAAGAAgABAwMAAQMEAAH+AwABgAIAAQMB/gIAAQMEAAH+AwABgAIAAQMB/gIA - AQMEAAH+AwAB4AIAAQ8B/gIAAQMEAAH+AwAB4AIAAQ8B/gIAAQMEAAH/AYABAAEDAfgCAAE/Af4BAAE4 - AQMEAAH/AYABAAEDAfgCAAE/Af4BAAE4AQMEAAH/Af4BAAL/AYABAwH/Af4BDwL/BAAB/gIAAf8B+AED - A/8B4AEPAf8EAAH+AgAB/wH4AQMD/wHgAQ8B/wQAAeACAAEPAYABAAE/Af8B/gIAAf8EAAHgAgABDwGA - AQABPwH/Af4CAAH/BAABgAIAAQMBgAEAAT8B/wH4AgABPwQAAYACAAEDAYABAAE/Af8B+AIAAT8EAAGA - AgABAwIAAQ8B/wHgAgABDwQAAYACAAEDAgABDwH/AeACAAEPCgABDwH/AYACAAEDCQAB4AEPAf8BgAIA - AQMJAAHgAQ8B/wGAAgABAwkAAeABDwH/AYACAAEDCgABDwH/DgABDwH/DgABCAH/DAABgAEAATgB/wEA - AQMBgAkAAYABAAEgAT8BAAEDAYAFAAGAAgABAwGAAQABIAE/AQABAwGABQABgAIAAQMBgAIAAQ8IAAGA - AgABAwH4AgABDwgAAYACAAEDAfgCAAEDCAAB4AIAAQ8B/wHgAQABAwGAAgABAwQAAeACAAEPAf8B4AIA - AYACAAEDBAAB+AIAAT8B/wH4AgABgAIAAQMEAAHgAgABDwH/AfgCAAGAAgABAwQAAeACAAEPAf8B/gEA - AQMB4AIAAQ8BgAIAAQMBgAIAAQMB/wH+AQABAwHgAgABDwGAAgABAwGAAgABAwL/AYABDwH4AgABPwGA - AgABAwGAAgABAwL/AYABDwH4AgABPwGAAgABAwGAAgABAwL/AeABPwH+AgAB/wGAAgABAwGAAgABAwL/ - AeABPwH+AgAB/wGAAgABAwHgAgABDwL/AfgC/wHgAQ8B/wGAAgABAws= + /wD/AAwAFHEEABRLBAAUrAQAFJADABZxAgAWSwIAFqwCABaQAQAYcRhLGKwYkBhxGEsYrBiQCXEE/wtx + CUsG/wlLDqwC/wisBZAP/wSQB3EC/wHcAs0B3AL/CXEHSwL/AdwEzQHcAv8HSw2sAf8BzQH/CKwFkAH/ + Dc0B/wSQBnEB/wHcBs0B3AH/CHEGSwH/AdwIzQHcAf8GSwWsBP8CrAL/As0B/wisBZAB/wHNC9wBzQH/ + BJAGcQH/CM0B/whxBUsB/wHcCs0B3AH/BUsFrAH/As0B3AL/AdwDzQH/CKwFkAH/Ac0L3AHNAf8EkAVx + Af8B3AjNAdwB/wdxBUsB/wzNAf8FSwasAf8IzQH/CKwFkAH/Ac0L3AHNAf8EkAVxAf8KzQH/B3EESwH/ + AdwEzQHcAv8B3ATNAdwB/wRLBqwB/wHcB80F/wSsBZAB/wHNC9wBzQH/BJAFTwH/A80B3AbNAf8HTwRS + Af8EzQHcAf8CzQH/AdwEzQH/BFIHrQH/As0E3AXNAf8ErQWWAf8BzQvcAc0B/wSWBU8B/wHcAc0C/wHc + BM0B3AH/B08EUgH/BNwB/wTNAf8E3AH/BFIHrQL/A80C3ATNAf8FrQWWAf8BzQTcA80E3AHNAf8ElgZV + Af8CzQH/Bc0B/whVBFkG/wTNBv8EWQbVAf8B3ALNBNwCzQHcAf8G1QW5Af8BzQPcAc0D3AHNA9wBzQH/ + BLkGVQH/AdwGzQHcAf8IVQRZAf8EzQHcAf8CzQH/AdwEzQH/BFkF1QH/BM0C3APNAv8H1QW5Af8BzQLc + Ac0F3AHNAtwBzQH/BLkHVQL/AdwCzQHcAv8DVQL/BFUEWQH/AdwEzQHcAv8B3ATNAdwB/wRZBNUB/wXN + BNwCzQH/B9UFuQH/Ac0B3AHNB9wBzQHcAc0B/wS5CVUB/wLcAf8EVQH/AdwB/wRVBVkB/wzNAf8FWQTV + Bf8HzQHcAf8G1QW5Af8CzQncAs0B/wS5CVUB/wLNAdwD/wHcAs0B/wRVBVkB/wHcCs0B3AH/BVkI1QH/ + CM0B/wbVBbkB/wHNC9wBzQH/BLkJVQH/AdwHzQHcAf8EVQZZAf8B3AjNAdwB/wZZCNUB/wPNAdwC/wHc + As0B/wXVBbkB/wHNC9wBzQH/BLkKVQH/AdwFzQHcAf8FVQdZAv8B3ATNAdwC/wdZCNUB/wLNAv8C1QT/ + BdUFuQH/Dc0B/wS5C1UC/wPNAv8GVQlZBv8JWQjVAf8BzQH/DdUFuQ//BLkNVQP/CFUYWQjVAv8O1Ri5 + GFUYWRjVGLkBABZVAgAWWQIAFtUCABa5AwAUVQQAFFkEABTVBAAUuQQAFI0EABSoBAAUUAQAFEsDABaN + AgAWqAIAFlACABZLAQAYjRioGFAYSxiNGKgYUBhLCY0G/wmNB6gE/w2oClAE/wpQBksM/wZLB40C/wHc + BM0B3AL/B40FqAL/AdwCzQHcAv8LqAhQAv8EzQL/CFAGSwH/Cc0B3AH/BksGjQH/AdwIzQHcAf8GjQWo + Af8GzQH/C6gHUAH/As0B3AL/AdwCzQH/B1AGSwH/Cc0B3AH/BksGjQH/Cs0B/waNBKgB/wHcAs0C/wLN + AdwB/wqoBlAB/wHNAdwE/wPcAc0B/wZQBksB/wnNAdwB/wZLBY0B/wHcCs0B3AH/BY0EqAH/As0B/wKo + Af8CzQH/CqgFUAH/Ac0B3AT/BdwBzQH/BVAGSwH/Cc0B3AH/BksFjQH/DM0B/wWNBKgB/wLNAf8CqAH/ + As0B/wqoBVAB/wHNBf8F3AHNAf8FUAZLAf8JzQHcAf8GSwWOAf8MzQH/BY4EygH/AdwCzQL/As0B3AH/ + CsoEVwH/Ac0B3AP/AdwCzQXcAc0B/wRXBkwB/wrcAf8GTAWOAf8B3ArNAdwB/wWOBcoB/wbNAf8CygH/ + CMoEVwH/Ac0E/wHNAlcBzQLcAv8BzQH/BFcGTAH/CtwB/wZMBrcB/wrNAf8GtwXQAv8B3APNAdwB/wHQ + Af8B3AH/B9AEXAH/Ac0C/wLcAc0CXAHNBP8BzQH/BFwGTQH/Cc0B3AH/Bk0GtwH/AdwIzQHcAf8GtwfQ + A/8CzQHcAf8B3ALNAf8G0ARcAf8BzQXcAs0B3AP/AdwBzQH/BFwGTQH/Cc0B3AH/Bk0HtwL/BtwC/we3 + CtAB/wLNAdwCzQH/AdwB/wXQBVwB/wHNBdwF/wHNAf8FXAZNAf8JzQHcAf8GTQi3Af8B3ATNAdwB/wi3 + C9AB/wPNAf8B3ALNAf8E0AVcAf8BzQXcBP8B3AHNAf8FXAZNAv8I3AL/Bk0HtwH/AdwGzQHcAf8HtwzQ + Af8CzQHcAs0B/wXQBlwB/wHNA9wE/wHcAc0B/wZcB00B/wfNAdwB/wdNBrcB/wHcCM0B3AH/BrcN0AH/ + A80B/wbQB1wB/wLNAdwC/wHcAs0B/wdcB00B/wfNAdwB/wdNBrcB/wHcCM0B3AH/BrcO0AH/Ac0B/wfQ + CFwC/wTNAv8IXAdNAf8HzQHcAf8HTQe3Cv8Htw/QAf8I0ApcBP8KXAdNCv8HTRi3GNAYXBhNGLcY0Bhc + GE0BABa3AgAW0AIAFlwCABZNAwAUtwQAFNAEABRcBAAUTQIAAUIBTQE+BwABPgMAASgDAAFgAwABSAMA + AQEBAAEBBQABYAEDFgAD//8AIgABwAEAAQMBwAEAAQMBwAEAAQMBwAEAAQMBgAEAAQEBgAEAAQEBgAEA + AQEBgAEAAQHwAAGAAQABAQGAAQABAQGAAQABAQGAAQABAQHAAQABAwHAAQABAwHAAQABAwHAAQABAwHA + AQABAwHAAQABAwHAAQABAwHAAQABAwGAAQABAQGAAQABAQGAAQABAQGAAQABAfAAAYABAAEBAYABAAEB + AYABAAEBAYABAAEBAcABAAEDAcABAAEDAcABAAEDAcABAAEDCw== diff --git a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs index ea487cb4c..bbfa1e24c 100644 --- a/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs +++ b/PKHeX/Subforms/Save Editors/SAV_SimpleTrainer.cs @@ -13,7 +13,8 @@ public SAV_SimpleTrainer() cba = new[] {CHK_1, CHK_2, CHK_3, CHK_4, CHK_5, CHK_6, CHK_7, CHK_8}; TB_OTName.MaxLength = SAV.OTLength; - B_MaxCash.Click += (sender, e) => MT_Money.Text = "9,999,999"; + B_MaxCash.Click += (sender, e) => MT_Money.Text = SAV.MaxMoney.ToString(); + MT_Money.Mask = "00000000000".Substring(0, SAV.MaxMoney.ToString().Length); B_MaxCoins.Click += (sender, e) => MT_Coins.Text = "9999"; CB_Gender.Items.Clear(); @@ -55,6 +56,28 @@ public SAV_SimpleTrainer() CB_TextSpeed.SelectedIndex = sav1.TextSpeed; } + if (SAV is SAV2) + { + SAV2 sav2 = (SAV2)SAV; + MT_Coins.Text = sav2.Coin.ToString(); + + L_Started.Visible = L_Fame.Visible = false; + CAL_AdventureStartDate.Visible = CAL_HoFDate.Visible = false; + CAL_AdventureStartTime.Visible = CAL_HoFTime.Visible = false; + GB_Map.Visible = false; + GB_Options.Visible = true; + CB_BattleStyle.Items.AddRange(new[] { "Switch", "Set" }); + CB_SoundType.Items.AddRange(new[] { "Mono", "Stereo" }); + CB_TextSpeed.Items.AddRange(new[] { "0 (Instant)", "1 (Fast)", "2", "3 (Normal)", "4", "5 (Slow)", "6", "7" }); + + CHK_BattleEffects.Checked = sav2.BattleEffects; + CB_BattleStyle.SelectedIndex = sav2.BattleStyleSwitch ? 0 : 1; + CB_SoundType.SelectedIndex = sav2.Sound > 0 ? 1 : 0; + CB_TextSpeed.SelectedIndex = sav2.TextSpeed; + badgeval = sav2.Badges; + cba = new[] { CHK_1, CHK_2, CHK_3, CHK_4, CHK_6, CHK_5, CHK_7, CHK_8, CHK_H1, CHK_H2, CHK_H3, CHK_H4, CHK_H5, CHK_H6, CHK_H7, CHK_H8 }; + } + if (SAV is SAV3) { GB_Map.Visible = false; @@ -143,6 +166,18 @@ private void B_Save_Click(object sender, EventArgs e) sav1.TextSpeed = CB_TextSpeed.SelectedIndex; } + if (SAV is SAV2) + { + SAV2 sav2 = (SAV2)SAV; + sav2.Coin = (ushort)Util.ToUInt32(MT_Coins.Text); + sav2.Badges = badgeval & 0xFFFF; + + sav2.BattleEffects = CHK_BattleEffects.Checked; + sav2.BattleStyleSwitch = CB_BattleStyle.SelectedIndex == 0; + sav2.Sound = CB_SoundType.SelectedIndex > 0 ? 2 : 0; + sav2.TextSpeed = CB_TextSpeed.SelectedIndex; + } + if (SAV is SAV4) { SAV4 s = (SAV4)SAV; diff --git a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs index a9ddbd317..53a2f34ad 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs @@ -468,7 +468,7 @@ private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) } private int wc_slot = -1; - private static Image getSprite(MysteryGift gift) + internal static Image getSprite(MysteryGift gift) { Image img; if (gift.IsPokémon) @@ -487,7 +487,7 @@ private static string getDescription(MysteryGift gift) if (gift.Empty) return "Empty Slot. No data!"; - string s = gift.getCardHeader(); + string s = gift.getCardHeader() + Environment.NewLine; if (gift.IsItem) { s += "Item: " + Main.itemlist[gift.Item] + Environment.NewLine + "Quantity: " + gift.Quantity; diff --git a/PKHeX/Util/ByteUtil.cs b/PKHeX/Util/ByteUtil.cs index 0418dbdb9..4c41fe1cf 100644 --- a/PKHeX/Util/ByteUtil.cs +++ b/PKHeX/Util/ByteUtil.cs @@ -30,7 +30,7 @@ internal static uint SwapEndianness(uint val) /// /// Value to swap endianness of. /// The endianness-swapped value. - internal static int SwapEndianness(short val) + internal static short SwapEndianness(short val) { return (short)SwapEndianness((ushort)val); } diff --git a/PKHeX/Util/DataUtil.cs b/PKHeX/Util/DataUtil.cs index 86ffbf8cb..2c358d39a 100644 --- a/PKHeX/Util/DataUtil.cs +++ b/PKHeX/Util/DataUtil.cs @@ -55,6 +55,13 @@ public static string[] getStringList(string f, string l) rawlist[i] = rawlist[i].Trim(); return rawlist; } + public static string[] getStringListFallback(string f, string l, string fallback) + { + string[] text = getStringList(f, l); + if (text.Length == 0) + text = getStringList(f, fallback); + return text; + } internal static string[] getNulledStringArray(string[] SimpleStringList) { try