diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs index 5f1dd0f80..003ea654d 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs @@ -78,6 +78,10 @@ private void InitializeComponent() this.CB_PassPower3 = new System.Windows.Forms.ComboBox(); this.CB_PassPower2 = new System.Windows.Forms.ComboBox(); this.CB_PassPower1 = new System.Windows.Forms.ComboBox(); + this.CHK_641_0x40 = new System.Windows.Forms.CheckBox(); + this.CHK_642_0x40 = new System.Windows.Forms.CheckBox(); + this.CHK_642_0x80 = new System.Windows.Forms.CheckBox(); + this.CHK_641_0x80 = new System.Windows.Forms.CheckBox(); this.TC_Misc.SuspendLayout(); this.TAB_Main.SuspendLayout(); this.GB_KeySystem.SuspendLayout(); @@ -103,9 +107,9 @@ private void InitializeComponent() // B_Cancel // this.B_Cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Cancel.Location = new System.Drawing.Point(197, 311); + this.B_Cancel.Location = new System.Drawing.Point(197, 337); this.B_Cancel.Name = "B_Cancel"; - this.B_Cancel.Size = new System.Drawing.Size(75, 23); + this.B_Cancel.Size = new System.Drawing.Size(75, 25); this.B_Cancel.TabIndex = 0; this.B_Cancel.Text = "Cancel"; this.B_Cancel.UseVisualStyleBackColor = true; @@ -114,9 +118,9 @@ private void InitializeComponent() // B_Save // this.B_Save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.B_Save.Location = new System.Drawing.Point(278, 311); + this.B_Save.Location = new System.Drawing.Point(278, 337); this.B_Save.Name = "B_Save"; - this.B_Save.Size = new System.Drawing.Size(75, 23); + this.B_Save.Size = new System.Drawing.Size(75, 25); this.B_Save.TabIndex = 1; this.B_Save.Text = "Save"; this.B_Save.UseVisualStyleBackColor = true; @@ -129,10 +133,10 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.TC_Misc.Controls.Add(this.TAB_Main); this.TC_Misc.Controls.Add(this.TAB_Entralink); - this.TC_Misc.Location = new System.Drawing.Point(12, 12); + this.TC_Misc.Location = new System.Drawing.Point(12, 13); this.TC_Misc.Name = "TC_Misc"; this.TC_Misc.SelectedIndex = 0; - this.TC_Misc.Size = new System.Drawing.Size(341, 293); + this.TC_Misc.Size = new System.Drawing.Size(341, 317); this.TC_Misc.TabIndex = 2; // // TAB_Main @@ -144,7 +148,7 @@ private void InitializeComponent() 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); - this.TAB_Main.Size = new System.Drawing.Size(333, 267); + this.TAB_Main.Size = new System.Drawing.Size(333, 291); this.TAB_Main.TabIndex = 0; this.TAB_Main.Text = "Main"; this.TAB_Main.UseVisualStyleBackColor = true; @@ -153,18 +157,18 @@ private void InitializeComponent() // this.GB_KeySystem.Controls.Add(this.B_AllKeys); this.GB_KeySystem.Controls.Add(this.CLB_KeySystem); - this.GB_KeySystem.Location = new System.Drawing.Point(152, 6); + this.GB_KeySystem.Location = new System.Drawing.Point(152, 7); this.GB_KeySystem.Name = "GB_KeySystem"; - this.GB_KeySystem.Size = new System.Drawing.Size(140, 127); + this.GB_KeySystem.Size = new System.Drawing.Size(140, 138); this.GB_KeySystem.TabIndex = 3; this.GB_KeySystem.TabStop = false; this.GB_KeySystem.Text = "Unlocked Keys"; // // B_AllKeys // - this.B_AllKeys.Location = new System.Drawing.Point(6, 18); + this.B_AllKeys.Location = new System.Drawing.Point(6, 20); this.B_AllKeys.Name = "B_AllKeys"; - this.B_AllKeys.Size = new System.Drawing.Size(75, 23); + this.B_AllKeys.Size = new System.Drawing.Size(75, 25); this.B_AllKeys.TabIndex = 1; this.B_AllKeys.Text = "Check All"; this.B_AllKeys.UseVisualStyleBackColor = true; @@ -174,48 +178,52 @@ private void InitializeComponent() // this.CLB_KeySystem.CheckOnClick = true; this.CLB_KeySystem.FormattingEnabled = true; - this.CLB_KeySystem.Location = new System.Drawing.Point(6, 47); + this.CLB_KeySystem.Location = new System.Drawing.Point(6, 51); this.CLB_KeySystem.Name = "CLB_KeySystem"; - this.CLB_KeySystem.Size = new System.Drawing.Size(128, 74); + this.CLB_KeySystem.Size = new System.Drawing.Size(128, 79); this.CLB_KeySystem.TabIndex = 0; // // CHK_LibertyPass // this.CHK_LibertyPass.AutoSize = true; - this.CHK_LibertyPass.Location = new System.Drawing.Point(6, 215); + this.CHK_LibertyPass.Location = new System.Drawing.Point(6, 233); this.CHK_LibertyPass.Name = "CHK_LibertyPass"; - this.CHK_LibertyPass.Size = new System.Drawing.Size(131, 16); + this.CHK_LibertyPass.Size = new System.Drawing.Size(122, 17); this.CHK_LibertyPass.TabIndex = 2; this.CHK_LibertyPass.Text = "Activate LibertyPass"; this.CHK_LibertyPass.UseVisualStyleBackColor = true; // // GB_Roamer // + this.GB_Roamer.Controls.Add(this.CHK_641_0x80); + this.GB_Roamer.Controls.Add(this.CHK_642_0x80); + this.GB_Roamer.Controls.Add(this.CHK_642_0x40); + this.GB_Roamer.Controls.Add(this.CHK_641_0x40); this.GB_Roamer.Controls.Add(this.L_Roamer642); this.GB_Roamer.Controls.Add(this.L_Roamer641); this.GB_Roamer.Controls.Add(this.CB_Roamer642); this.GB_Roamer.Controls.Add(this.CB_Roamer641); - this.GB_Roamer.Location = new System.Drawing.Point(6, 139); + this.GB_Roamer.Location = new System.Drawing.Point(6, 151); this.GB_Roamer.Name = "GB_Roamer"; - this.GB_Roamer.Size = new System.Drawing.Size(176, 70); + this.GB_Roamer.Size = new System.Drawing.Size(227, 76); this.GB_Roamer.TabIndex = 1; this.GB_Roamer.TabStop = false; this.GB_Roamer.Text = "Roamer"; // // L_Roamer642 // - this.L_Roamer642.Location = new System.Drawing.Point(6, 42); + this.L_Roamer642.Location = new System.Drawing.Point(6, 46); this.L_Roamer642.Name = "L_Roamer642"; - this.L_Roamer642.Size = new System.Drawing.Size(76, 23); + this.L_Roamer642.Size = new System.Drawing.Size(76, 25); this.L_Roamer642.TabIndex = 3; this.L_Roamer642.Text = "Thundurus"; this.L_Roamer642.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_Roamer641 // - this.L_Roamer641.Location = new System.Drawing.Point(6, 16); + this.L_Roamer641.Location = new System.Drawing.Point(6, 17); this.L_Roamer641.Name = "L_Roamer641"; - this.L_Roamer641.Size = new System.Drawing.Size(76, 23); + this.L_Roamer641.Size = new System.Drawing.Size(76, 25); this.L_Roamer641.TabIndex = 2; this.L_Roamer641.Text = "Tornadus"; this.L_Roamer641.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -223,26 +231,26 @@ private void InitializeComponent() // CB_Roamer642 // this.CB_Roamer642.FormattingEnabled = true; - this.CB_Roamer642.Location = new System.Drawing.Point(88, 44); + this.CB_Roamer642.Location = new System.Drawing.Point(88, 48); this.CB_Roamer642.Name = "CB_Roamer642"; - this.CB_Roamer642.Size = new System.Drawing.Size(82, 20); + this.CB_Roamer642.Size = new System.Drawing.Size(82, 21); this.CB_Roamer642.TabIndex = 1; // // CB_Roamer641 // this.CB_Roamer641.FormattingEnabled = true; - this.CB_Roamer641.Location = new System.Drawing.Point(88, 18); + this.CB_Roamer641.Location = new System.Drawing.Point(88, 20); this.CB_Roamer641.Name = "CB_Roamer641"; - this.CB_Roamer641.Size = new System.Drawing.Size(82, 20); + this.CB_Roamer641.Size = new System.Drawing.Size(82, 21); this.CB_Roamer641.TabIndex = 0; // // GB_FlyDest // this.GB_FlyDest.Controls.Add(this.CLB_FlyDest); this.GB_FlyDest.Controls.Add(this.B_AllFlyDest); - this.GB_FlyDest.Location = new System.Drawing.Point(6, 6); + this.GB_FlyDest.Location = new System.Drawing.Point(6, 7); this.GB_FlyDest.Name = "GB_FlyDest"; - this.GB_FlyDest.Size = new System.Drawing.Size(140, 127); + this.GB_FlyDest.Size = new System.Drawing.Size(140, 138); this.GB_FlyDest.TabIndex = 0; this.GB_FlyDest.TabStop = false; this.GB_FlyDest.Text = "Fly Destination"; @@ -251,16 +259,16 @@ private void InitializeComponent() // this.CLB_FlyDest.CheckOnClick = true; this.CLB_FlyDest.FormattingEnabled = true; - this.CLB_FlyDest.Location = new System.Drawing.Point(6, 47); + this.CLB_FlyDest.Location = new System.Drawing.Point(6, 51); this.CLB_FlyDest.Name = "CLB_FlyDest"; - this.CLB_FlyDest.Size = new System.Drawing.Size(128, 74); + this.CLB_FlyDest.Size = new System.Drawing.Size(128, 79); this.CLB_FlyDest.TabIndex = 1; // // B_AllFlyDest // - this.B_AllFlyDest.Location = new System.Drawing.Point(6, 18); + this.B_AllFlyDest.Location = new System.Drawing.Point(6, 20); this.B_AllFlyDest.Name = "B_AllFlyDest"; - this.B_AllFlyDest.Size = new System.Drawing.Size(75, 23); + this.B_AllFlyDest.Size = new System.Drawing.Size(75, 25); this.B_AllFlyDest.TabIndex = 0; this.B_AllFlyDest.Text = "Check All"; this.B_AllFlyDest.UseVisualStyleBackColor = true; @@ -283,52 +291,52 @@ private void InitializeComponent() this.TAB_Entralink.Controls.Add(this.GB_PassPowers); this.TAB_Entralink.Location = new System.Drawing.Point(4, 22); this.TAB_Entralink.Name = "TAB_Entralink"; - this.TAB_Entralink.Size = new System.Drawing.Size(333, 267); + this.TAB_Entralink.Size = new System.Drawing.Size(333, 291); this.TAB_Entralink.TabIndex = 1; this.TAB_Entralink.Text = "Entralink"; this.TAB_Entralink.UseVisualStyleBackColor = true; // // L_FMParticipants // - this.L_FMParticipants.Location = new System.Drawing.Point(161, 239); + this.L_FMParticipants.Location = new System.Drawing.Point(161, 259); this.L_FMParticipants.Name = "L_FMParticipants"; - this.L_FMParticipants.Size = new System.Drawing.Size(114, 23); + this.L_FMParticipants.Size = new System.Drawing.Size(114, 25); this.L_FMParticipants.TabIndex = 16; this.L_FMParticipants.Text = "Most Participants"; this.L_FMParticipants.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_FMCompleted // - this.L_FMCompleted.Location = new System.Drawing.Point(4, 239); + this.L_FMCompleted.Location = new System.Drawing.Point(4, 259); this.L_FMCompleted.Name = "L_FMCompleted"; - this.L_FMCompleted.Size = new System.Drawing.Size(84, 23); + this.L_FMCompleted.Size = new System.Drawing.Size(84, 25); this.L_FMCompleted.TabIndex = 15; this.L_FMCompleted.Text = "Completed"; this.L_FMCompleted.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_FMParticipated // - this.L_FMParticipated.Location = new System.Drawing.Point(4, 214); + this.L_FMParticipated.Location = new System.Drawing.Point(4, 232); this.L_FMParticipated.Name = "L_FMParticipated"; - this.L_FMParticipated.Size = new System.Drawing.Size(84, 23); + this.L_FMParticipated.Size = new System.Drawing.Size(84, 25); this.L_FMParticipated.TabIndex = 14; this.L_FMParticipated.Text = "Participated"; this.L_FMParticipated.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_FMHosted // - this.L_FMHosted.Location = new System.Drawing.Point(4, 189); + this.L_FMHosted.Location = new System.Drawing.Point(4, 205); this.L_FMHosted.Name = "L_FMHosted"; - this.L_FMHosted.Size = new System.Drawing.Size(84, 23); + this.L_FMHosted.Size = new System.Drawing.Size(84, 25); this.L_FMHosted.TabIndex = 13; this.L_FMHosted.Text = "Hosted"; this.L_FMHosted.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // L_FMTopScore // - this.L_FMTopScore.Location = new System.Drawing.Point(158, 214); + this.L_FMTopScore.Location = new System.Drawing.Point(158, 232); this.L_FMTopScore.Name = "L_FMTopScore"; - this.L_FMTopScore.Size = new System.Drawing.Size(111, 23); + this.L_FMTopScore.Size = new System.Drawing.Size(111, 25); this.L_FMTopScore.TabIndex = 12; this.L_FMTopScore.Text = "Top Score"; this.L_FMTopScore.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -341,9 +349,9 @@ private void InitializeComponent() this.GB_EntreeLevel.Controls.Add(this.NUD_EntreeWhiteLV); this.GB_EntreeLevel.Controls.Add(this.L_EntreeBlack); this.GB_EntreeLevel.Controls.Add(this.L_EntreeWhite); - this.GB_EntreeLevel.Location = new System.Drawing.Point(6, 6); + this.GB_EntreeLevel.Location = new System.Drawing.Point(6, 7); this.GB_EntreeLevel.Name = "GB_EntreeLevel"; - this.GB_EntreeLevel.Size = new System.Drawing.Size(137, 68); + this.GB_EntreeLevel.Size = new System.Drawing.Size(137, 74); this.GB_EntreeLevel.TabIndex = 11; this.GB_EntreeLevel.TabStop = false; this.GB_EntreeLevel.Text = "Entree Level"; @@ -351,14 +359,14 @@ private void InitializeComponent() // NUD_EntreeWhiteEXP // this.NUD_EntreeWhiteEXP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_EntreeWhiteEXP.Location = new System.Drawing.Point(94, 43); + this.NUD_EntreeWhiteEXP.Location = new System.Drawing.Point(94, 47); this.NUD_EntreeWhiteEXP.Maximum = new decimal(new int[] { 49, 0, 0, 0}); this.NUD_EntreeWhiteEXP.Name = "NUD_EntreeWhiteEXP"; - this.NUD_EntreeWhiteEXP.Size = new System.Drawing.Size(37, 19); + this.NUD_EntreeWhiteEXP.Size = new System.Drawing.Size(37, 20); this.NUD_EntreeWhiteEXP.TabIndex = 6; this.NUD_EntreeWhiteEXP.Value = new decimal(new int[] { 49, @@ -370,14 +378,14 @@ private void InitializeComponent() // NUD_EntreeBlackEXP // this.NUD_EntreeBlackEXP.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_EntreeBlackEXP.Location = new System.Drawing.Point(94, 18); + this.NUD_EntreeBlackEXP.Location = new System.Drawing.Point(94, 20); this.NUD_EntreeBlackEXP.Maximum = new decimal(new int[] { 49, 0, 0, 0}); this.NUD_EntreeBlackEXP.Name = "NUD_EntreeBlackEXP"; - this.NUD_EntreeBlackEXP.Size = new System.Drawing.Size(37, 19); + this.NUD_EntreeBlackEXP.Size = new System.Drawing.Size(37, 20); this.NUD_EntreeBlackEXP.TabIndex = 5; this.NUD_EntreeBlackEXP.Value = new decimal(new int[] { 49, @@ -389,14 +397,14 @@ private void InitializeComponent() // NUD_EntreeBlackLV // this.NUD_EntreeBlackLV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_EntreeBlackLV.Location = new System.Drawing.Point(45, 18); + this.NUD_EntreeBlackLV.Location = new System.Drawing.Point(45, 20); this.NUD_EntreeBlackLV.Maximum = new decimal(new int[] { 999, 0, 0, 0}); this.NUD_EntreeBlackLV.Name = "NUD_EntreeBlackLV"; - this.NUD_EntreeBlackLV.Size = new System.Drawing.Size(43, 19); + this.NUD_EntreeBlackLV.Size = new System.Drawing.Size(43, 20); this.NUD_EntreeBlackLV.TabIndex = 1; this.NUD_EntreeBlackLV.Value = new decimal(new int[] { 999, @@ -408,14 +416,14 @@ private void InitializeComponent() // NUD_EntreeWhiteLV // this.NUD_EntreeWhiteLV.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_EntreeWhiteLV.Location = new System.Drawing.Point(45, 43); + this.NUD_EntreeWhiteLV.Location = new System.Drawing.Point(45, 47); this.NUD_EntreeWhiteLV.Maximum = new decimal(new int[] { 999, 0, 0, 0}); this.NUD_EntreeWhiteLV.Name = "NUD_EntreeWhiteLV"; - this.NUD_EntreeWhiteLV.Size = new System.Drawing.Size(43, 19); + this.NUD_EntreeWhiteLV.Size = new System.Drawing.Size(43, 20); this.NUD_EntreeWhiteLV.TabIndex = 0; this.NUD_EntreeWhiteLV.Value = new decimal(new int[] { 999, @@ -427,9 +435,9 @@ private void InitializeComponent() // L_EntreeBlack // this.L_EntreeBlack.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_EntreeBlack.Location = new System.Drawing.Point(6, 15); + this.L_EntreeBlack.Location = new System.Drawing.Point(6, 16); this.L_EntreeBlack.Name = "L_EntreeBlack"; - this.L_EntreeBlack.Size = new System.Drawing.Size(33, 23); + this.L_EntreeBlack.Size = new System.Drawing.Size(33, 25); this.L_EntreeBlack.TabIndex = 3; this.L_EntreeBlack.Text = "B"; this.L_EntreeBlack.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -437,23 +445,23 @@ private void InitializeComponent() // L_EntreeWhite // this.L_EntreeWhite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_EntreeWhite.Location = new System.Drawing.Point(5, 40); + this.L_EntreeWhite.Location = new System.Drawing.Point(5, 43); this.L_EntreeWhite.Name = "L_EntreeWhite"; - this.L_EntreeWhite.Size = new System.Drawing.Size(34, 23); + this.L_EntreeWhite.Size = new System.Drawing.Size(34, 25); this.L_EntreeWhite.TabIndex = 4; this.L_EntreeWhite.Text = "W"; this.L_EntreeWhite.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // NUD_FMMostParticipants // - this.NUD_FMMostParticipants.Location = new System.Drawing.Point(281, 242); + this.NUD_FMMostParticipants.Location = new System.Drawing.Point(281, 262); this.NUD_FMMostParticipants.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.NUD_FMMostParticipants.Name = "NUD_FMMostParticipants"; - this.NUD_FMMostParticipants.Size = new System.Drawing.Size(43, 19); + this.NUD_FMMostParticipants.Size = new System.Drawing.Size(43, 20); this.NUD_FMMostParticipants.TabIndex = 10; this.NUD_FMMostParticipants.Value = new decimal(new int[] { 255, @@ -463,14 +471,14 @@ private void InitializeComponent() // // NUD_FMTopScores // - this.NUD_FMTopScores.Location = new System.Drawing.Point(275, 217); + this.NUD_FMTopScores.Location = new System.Drawing.Point(275, 235); this.NUD_FMTopScores.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMTopScores.Name = "NUD_FMTopScores"; - this.NUD_FMTopScores.Size = new System.Drawing.Size(49, 19); + this.NUD_FMTopScores.Size = new System.Drawing.Size(49, 20); this.NUD_FMTopScores.TabIndex = 9; this.NUD_FMTopScores.Value = new decimal(new int[] { 9999, @@ -480,14 +488,14 @@ private void InitializeComponent() // // NUD_FMCompleted // - this.NUD_FMCompleted.Location = new System.Drawing.Point(94, 242); + this.NUD_FMCompleted.Location = new System.Drawing.Point(94, 262); this.NUD_FMCompleted.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMCompleted.Name = "NUD_FMCompleted"; - this.NUD_FMCompleted.Size = new System.Drawing.Size(49, 19); + this.NUD_FMCompleted.Size = new System.Drawing.Size(49, 20); this.NUD_FMCompleted.TabIndex = 8; this.NUD_FMCompleted.Value = new decimal(new int[] { 9999, @@ -497,14 +505,14 @@ private void InitializeComponent() // // NUD_FMParticipated // - this.NUD_FMParticipated.Location = new System.Drawing.Point(94, 217); + this.NUD_FMParticipated.Location = new System.Drawing.Point(94, 235); this.NUD_FMParticipated.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMParticipated.Name = "NUD_FMParticipated"; - this.NUD_FMParticipated.Size = new System.Drawing.Size(49, 19); + this.NUD_FMParticipated.Size = new System.Drawing.Size(49, 20); this.NUD_FMParticipated.TabIndex = 7; this.NUD_FMParticipated.Value = new decimal(new int[] { 9999, @@ -514,14 +522,14 @@ private void InitializeComponent() // // NUD_FMHosted // - this.NUD_FMHosted.Location = new System.Drawing.Point(94, 192); + this.NUD_FMHosted.Location = new System.Drawing.Point(94, 208); this.NUD_FMHosted.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMHosted.Name = "NUD_FMHosted"; - this.NUD_FMHosted.Size = new System.Drawing.Size(49, 19); + this.NUD_FMHosted.Size = new System.Drawing.Size(49, 20); this.NUD_FMHosted.TabIndex = 6; this.NUD_FMHosted.Value = new decimal(new int[] { 9999, @@ -543,18 +551,18 @@ private void InitializeComponent() this.GB_FunfestMissions.Controls.Add(this.L_FMUnlocked); this.GB_FunfestMissions.Controls.Add(this.B_FunfestMissions); this.GB_FunfestMissions.Controls.Add(this.LB_FunfestMissions); - this.GB_FunfestMissions.Location = new System.Drawing.Point(149, 6); + this.GB_FunfestMissions.Location = new System.Drawing.Point(149, 7); this.GB_FunfestMissions.Name = "GB_FunfestMissions"; - this.GB_FunfestMissions.Size = new System.Drawing.Size(178, 205); + this.GB_FunfestMissions.Size = new System.Drawing.Size(178, 222); this.GB_FunfestMissions.TabIndex = 5; this.GB_FunfestMissions.TabStop = false; this.GB_FunfestMissions.Text = "Funfest Missions"; // // CHK_FMNew // - this.CHK_FMNew.Location = new System.Drawing.Point(6, 177); + this.CHK_FMNew.Location = new System.Drawing.Point(6, 192); this.CHK_FMNew.Name = "CHK_FMNew"; - this.CHK_FMNew.Size = new System.Drawing.Size(66, 24); + this.CHK_FMNew.Size = new System.Drawing.Size(66, 26); this.CHK_FMNew.TabIndex = 9; this.CHK_FMNew.Text = "NEW"; this.CHK_FMNew.UseVisualStyleBackColor = true; @@ -562,9 +570,9 @@ private void InitializeComponent() // // L_FMLocked // - this.L_FMLocked.Location = new System.Drawing.Point(6, 127); + this.L_FMLocked.Location = new System.Drawing.Point(6, 138); this.L_FMLocked.Name = "L_FMLocked"; - this.L_FMLocked.Size = new System.Drawing.Size(70, 23); + this.L_FMLocked.Size = new System.Drawing.Size(70, 25); this.L_FMLocked.TabIndex = 8; this.L_FMLocked.Text = "Locked"; this.L_FMLocked.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -572,9 +580,9 @@ private void InitializeComponent() // L_FMBestScore // this.L_FMBestScore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_FMBestScore.Location = new System.Drawing.Point(65, 177); + this.L_FMBestScore.Location = new System.Drawing.Point(65, 192); this.L_FMBestScore.Name = "L_FMBestScore"; - this.L_FMBestScore.Size = new System.Drawing.Size(52, 23); + this.L_FMBestScore.Size = new System.Drawing.Size(52, 25); this.L_FMBestScore.TabIndex = 7; this.L_FMBestScore.Text = "Score"; this.L_FMBestScore.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -582,9 +590,9 @@ private void InitializeComponent() // L_FMBestTotal // this.L_FMBestTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.L_FMBestTotal.Location = new System.Drawing.Point(4, 152); + this.L_FMBestTotal.Location = new System.Drawing.Point(4, 165); this.L_FMBestTotal.Name = "L_FMBestTotal"; - this.L_FMBestTotal.Size = new System.Drawing.Size(113, 23); + this.L_FMBestTotal.Size = new System.Drawing.Size(113, 25); this.L_FMBestTotal.TabIndex = 6; this.L_FMBestTotal.Text = "Best Records Total"; this.L_FMBestTotal.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -592,28 +600,28 @@ private void InitializeComponent() // NUD_FMBestScore // this.NUD_FMBestScore.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_FMBestScore.Location = new System.Drawing.Point(123, 180); + this.NUD_FMBestScore.Location = new System.Drawing.Point(123, 195); this.NUD_FMBestScore.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMBestScore.Name = "NUD_FMBestScore"; - this.NUD_FMBestScore.Size = new System.Drawing.Size(49, 19); + this.NUD_FMBestScore.Size = new System.Drawing.Size(49, 20); this.NUD_FMBestScore.TabIndex = 5; this.NUD_FMBestScore.ValueChanged += new System.EventHandler(this.NUD_FMBestScore_ValueChanged); // // NUD_FMBestTotal // this.NUD_FMBestTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.NUD_FMBestTotal.Location = new System.Drawing.Point(123, 155); + this.NUD_FMBestTotal.Location = new System.Drawing.Point(123, 168); this.NUD_FMBestTotal.Maximum = new decimal(new int[] { 9999, 0, 0, 0}); this.NUD_FMBestTotal.Name = "NUD_FMBestTotal"; - this.NUD_FMBestTotal.Size = new System.Drawing.Size(49, 19); + this.NUD_FMBestTotal.Size = new System.Drawing.Size(49, 20); this.NUD_FMBestTotal.TabIndex = 4; this.NUD_FMBestTotal.ValueChanged += new System.EventHandler(this.NUD_FMBestTotal_ValueChanged); // @@ -623,26 +631,26 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CB_FMLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_FMLevel.FormattingEnabled = true; - this.CB_FMLevel.Location = new System.Drawing.Point(82, 129); + this.CB_FMLevel.Location = new System.Drawing.Point(82, 140); this.CB_FMLevel.Name = "CB_FMLevel"; - this.CB_FMLevel.Size = new System.Drawing.Size(90, 20); + this.CB_FMLevel.Size = new System.Drawing.Size(90, 21); this.CB_FMLevel.TabIndex = 3; this.CB_FMLevel.SelectedIndexChanged += new System.EventHandler(this.CB_FMLevel_SelectedIndexChanged); // // L_FMUnlocked // - this.L_FMUnlocked.Location = new System.Drawing.Point(6, 127); + this.L_FMUnlocked.Location = new System.Drawing.Point(6, 138); this.L_FMUnlocked.Name = "L_FMUnlocked"; - this.L_FMUnlocked.Size = new System.Drawing.Size(70, 23); + this.L_FMUnlocked.Size = new System.Drawing.Size(70, 25); this.L_FMUnlocked.TabIndex = 2; this.L_FMUnlocked.Text = "Unlocked"; this.L_FMUnlocked.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // B_FunfestMissions // - this.B_FunfestMissions.Location = new System.Drawing.Point(6, 18); + this.B_FunfestMissions.Location = new System.Drawing.Point(6, 20); this.B_FunfestMissions.Name = "B_FunfestMissions"; - this.B_FunfestMissions.Size = new System.Drawing.Size(144, 23); + this.B_FunfestMissions.Size = new System.Drawing.Size(144, 25); this.B_FunfestMissions.TabIndex = 0; this.B_FunfestMissions.Text = "Unlock All (w/o No.0)"; this.B_FunfestMissions.UseVisualStyleBackColor = true; @@ -653,10 +661,9 @@ private void InitializeComponent() this.LB_FunfestMissions.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.LB_FunfestMissions.FormattingEnabled = true; - this.LB_FunfestMissions.ItemHeight = 12; - this.LB_FunfestMissions.Location = new System.Drawing.Point(6, 47); + this.LB_FunfestMissions.Location = new System.Drawing.Point(6, 51); this.LB_FunfestMissions.Name = "LB_FunfestMissions"; - this.LB_FunfestMissions.Size = new System.Drawing.Size(166, 76); + this.LB_FunfestMissions.Size = new System.Drawing.Size(166, 82); this.LB_FunfestMissions.TabIndex = 1; this.LB_FunfestMissions.SelectedIndexChanged += new System.EventHandler(this.LB_FunfestMissions_SelectedIndexChanged); // @@ -665,9 +672,9 @@ private void InitializeComponent() this.GB_PassPowers.Controls.Add(this.CB_PassPower3); this.GB_PassPowers.Controls.Add(this.CB_PassPower2); this.GB_PassPowers.Controls.Add(this.CB_PassPower1); - this.GB_PassPowers.Location = new System.Drawing.Point(6, 80); + this.GB_PassPowers.Location = new System.Drawing.Point(6, 87); this.GB_PassPowers.Name = "GB_PassPowers"; - this.GB_PassPowers.Size = new System.Drawing.Size(137, 96); + this.GB_PassPowers.Size = new System.Drawing.Size(137, 104); this.GB_PassPowers.TabIndex = 2; this.GB_PassPowers.TabStop = false; this.GB_PassPowers.Text = "Pass Powers"; @@ -678,9 +685,9 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CB_PassPower3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_PassPower3.FormattingEnabled = true; - this.CB_PassPower3.Location = new System.Drawing.Point(6, 70); + this.CB_PassPower3.Location = new System.Drawing.Point(6, 76); this.CB_PassPower3.Name = "CB_PassPower3"; - this.CB_PassPower3.Size = new System.Drawing.Size(125, 20); + this.CB_PassPower3.Size = new System.Drawing.Size(125, 21); this.CB_PassPower3.TabIndex = 2; // // CB_PassPower2 @@ -689,9 +696,9 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CB_PassPower2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_PassPower2.FormattingEnabled = true; - this.CB_PassPower2.Location = new System.Drawing.Point(6, 44); + this.CB_PassPower2.Location = new System.Drawing.Point(6, 48); this.CB_PassPower2.Name = "CB_PassPower2"; - this.CB_PassPower2.Size = new System.Drawing.Size(125, 20); + this.CB_PassPower2.Size = new System.Drawing.Size(125, 21); this.CB_PassPower2.TabIndex = 1; // // CB_PassPower1 @@ -700,16 +707,52 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.CB_PassPower1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.CB_PassPower1.FormattingEnabled = true; - this.CB_PassPower1.Location = new System.Drawing.Point(6, 18); + this.CB_PassPower1.Location = new System.Drawing.Point(6, 20); this.CB_PassPower1.Name = "CB_PassPower1"; - this.CB_PassPower1.Size = new System.Drawing.Size(125, 20); + this.CB_PassPower1.Size = new System.Drawing.Size(125, 21); this.CB_PassPower1.TabIndex = 0; // + // CHK_641_0x40 + // + this.CHK_641_0x40.AutoSize = true; + this.CHK_641_0x40.Location = new System.Drawing.Point(175, 23); + this.CHK_641_0x40.Name = "CHK_641_0x40"; + this.CHK_641_0x40.Size = new System.Drawing.Size(15, 14); + this.CHK_641_0x40.TabIndex = 4; + this.CHK_641_0x40.UseVisualStyleBackColor = true; + // + // CHK_642_0x40 + // + this.CHK_642_0x40.AutoSize = true; + this.CHK_642_0x40.Location = new System.Drawing.Point(175, 52); + this.CHK_642_0x40.Name = "CHK_642_0x40"; + this.CHK_642_0x40.Size = new System.Drawing.Size(15, 14); + this.CHK_642_0x40.TabIndex = 5; + this.CHK_642_0x40.UseVisualStyleBackColor = true; + // + // CHK_642_0x80 + // + this.CHK_642_0x80.AutoSize = true; + this.CHK_642_0x80.Location = new System.Drawing.Point(192, 52); + this.CHK_642_0x80.Name = "CHK_642_0x80"; + this.CHK_642_0x80.Size = new System.Drawing.Size(15, 14); + this.CHK_642_0x80.TabIndex = 6; + this.CHK_642_0x80.UseVisualStyleBackColor = true; + // + // CHK_641_0x80 + // + this.CHK_641_0x80.AutoSize = true; + this.CHK_641_0x80.Location = new System.Drawing.Point(192, 23); + this.CHK_641_0x80.Name = "CHK_641_0x80"; + this.CHK_641_0x80.Size = new System.Drawing.Size(15, 14); + this.CHK_641_0x80.TabIndex = 7; + this.CHK_641_0x80.UseVisualStyleBackColor = true; + // // SAV_Misc5 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(365, 346); + this.ClientSize = new System.Drawing.Size(365, 375); this.Controls.Add(this.TC_Misc); this.Controls.Add(this.B_Save); this.Controls.Add(this.B_Cancel); @@ -722,6 +765,7 @@ private void InitializeComponent() this.TAB_Main.PerformLayout(); this.GB_KeySystem.ResumeLayout(false); this.GB_Roamer.ResumeLayout(false); + this.GB_Roamer.PerformLayout(); this.GB_FlyDest.ResumeLayout(false); this.TAB_Entralink.ResumeLayout(false); this.GB_EntreeLevel.ResumeLayout(false); @@ -793,5 +837,9 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox CHK_FMNew; private System.Windows.Forms.NumericUpDown NUD_EntreeWhiteEXP; private System.Windows.Forms.NumericUpDown NUD_EntreeBlackEXP; + private System.Windows.Forms.CheckBox CHK_641_0x80; + private System.Windows.Forms.CheckBox CHK_642_0x80; + private System.Windows.Forms.CheckBox CHK_642_0x40; + private System.Windows.Forms.CheckBox CHK_641_0x40; } } \ No newline at end of file diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs index 89242a785..f9b9e7ae5 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs @@ -32,6 +32,7 @@ private void B_Save_Click(object sender, EventArgs e) } private ComboBox[] cbr; + private CheckBox[][] chk; private int ofsFly; private int[] FlyDestC; private const int ofsRoamer = 0x21B00; @@ -107,6 +108,7 @@ private void ReadMain() GB_KeySystem.Visible = false; // Roamer cbr = new[] { CB_Roamer642, CB_Roamer641 }; + chk = new[] {new[] {CHK_642_0x40, CHK_642_0x80}, new[] {CHK_641_0x40, CHK_641_0x80}}; ComboItem[] states = { new ComboItem { Text = "Not roamed", Value = 0 }, new ComboItem { Text = "Roaming", Value = 1 }, @@ -118,14 +120,21 @@ private void ReadMain() // Roaming: Roaming/Defeated/Captured // Defeated: Defeated/Captured // Captured: Defeated/Captured - for (int i = 0, c; i < cbr.Length; i++) + // Top 2 bit acts as flags of some sorts + for (int i = 0; i < cbr.Length; i++) { - c = SAV.Data[ofsRoamer + 0x2E + i]; + var val = SAV.Data[ofsRoamer + 0x2E + i]; + int c = val & 0x3F; + cbr[i].Items.Clear(); cbr[i].DisplayMember = "Text"; cbr[i].ValueMember = "Value"; cbr[i].DataSource = new BindingSource(states.Where(v => v.Value >= 2 || v.Value == c).ToList(), null); cbr[i].SelectedValue = c; + + var ck = chk[i]; + for (int j = 0; j < ck.Length; j++) + ck[j].Checked = (val & 1 << 6 + j) != 0; } // LibertyPass @@ -176,7 +185,12 @@ private void SaveMain() for (int i = 0; i < cbr.Length; i++) { int c = SAV.Data[ofsRoamer + 0x2E + i]; + var ck = chk[i]; var d = (int)cbr[i].SelectedValue; + for (int j = 0; j < ck.Length; j++) + if (ck[j].Checked) + d |= 1 << (6 + j); + if (c == d) continue; SAV.Data[ofsRoamer + 0x2E + i] = (byte)d;