From 9eb5b4737df333a071b8a3fbb299b506d4bc6c80 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 7 Jun 2026 17:14:36 -0500 Subject: [PATCH] gen5: musical prop unlocks as list --- PKHeX.WinForms/Resources/text/lang_de.txt | 1 - PKHeX.WinForms/Resources/text/lang_en.txt | 1 - PKHeX.WinForms/Resources/text/lang_es-419.txt | 1 - PKHeX.WinForms/Resources/text/lang_es.txt | 1 - PKHeX.WinForms/Resources/text/lang_fr.txt | 1 - PKHeX.WinForms/Resources/text/lang_it.txt | 1 - PKHeX.WinForms/Resources/text/lang_ja.txt | 1 - PKHeX.WinForms/Resources/text/lang_ko.txt | 1 - .../Resources/text/lang_zh-Hans.txt | 1 - .../Resources/text/lang_zh-Hant.txt | 1 - .../Save Editors/Gen5/SAV_Misc5.Designer.cs | 213 ++++++++---------- .../Subforms/Save Editors/Gen5/SAV_Misc5.cs | 18 +- 12 files changed, 107 insertions(+), 134 deletions(-) diff --git a/PKHeX.WinForms/Resources/text/lang_de.txt b/PKHeX.WinForms/Resources/text/lang_de.txt index 5e5f3cf9c..dd17ecf47 100644 --- a/PKHeX.WinForms/Resources/text/lang_de.txt +++ b/PKHeX.WinForms/Resources/text/lang_de.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Unsichtbar SAV_Misc5.CHK_LibertyPass=Aktiviere Gartenpass SAV_Misc5.CHK_MultiFriendsSet=Freunde SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=Erhalten SAV_Misc5.CHK_SingleSet=Einzel SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_en.txt b/PKHeX.WinForms/Resources/text/lang_en.txt index 6f21d79f8..52e08a79c 100644 --- a/PKHeX.WinForms/Resources/text/lang_en.txt +++ b/PKHeX.WinForms/Resources/text/lang_en.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Invisible SAV_Misc5.CHK_LibertyPass=Activate LibertyPass SAV_Misc5.CHK_MultiFriendsSet=Friends SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=Obtained SAV_Misc5.CHK_SingleSet=Single SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_es-419.txt b/PKHeX.WinForms/Resources/text/lang_es-419.txt index 7624076db..45ce7058e 100644 --- a/PKHeX.WinForms/Resources/text/lang_es-419.txt +++ b/PKHeX.WinForms/Resources/text/lang_es-419.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Invisible SAV_Misc5.CHK_LibertyPass=Activar Ticket Libertad SAV_Misc5.CHK_MultiFriendsSet=Amigos SAV_Misc5.CHK_MultiNPCSet=PNJ -SAV_Misc5.CHK_PropObtained=Obtenido SAV_Misc5.CHK_SingleSet=Individual SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_es.txt b/PKHeX.WinForms/Resources/text/lang_es.txt index df8e9c780..3916c07f2 100644 --- a/PKHeX.WinForms/Resources/text/lang_es.txt +++ b/PKHeX.WinForms/Resources/text/lang_es.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Invisible SAV_Misc5.CHK_LibertyPass=Activar Ticket Libertad SAV_Misc5.CHK_MultiFriendsSet=Amigos SAV_Misc5.CHK_MultiNPCSet=PNJ -SAV_Misc5.CHK_PropObtained=Obtenido SAV_Misc5.CHK_SingleSet=Individual SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_fr.txt b/PKHeX.WinForms/Resources/text/lang_fr.txt index 226718e2d..27591e0ff 100644 --- a/PKHeX.WinForms/Resources/text/lang_fr.txt +++ b/PKHeX.WinForms/Resources/text/lang_fr.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Invisible SAV_Misc5.CHK_LibertyPass=Activer le Pass Liberté SAV_Misc5.CHK_MultiFriendsSet=Ami SAV_Misc5.CHK_MultiNPCSet=PNJ -SAV_Misc5.CHK_PropObtained=Obtenu SAV_Misc5.CHK_SingleSet=Solo SAV_Misc5.CHK_Subway0=Drp.0 SAV_Misc5.CHK_Subway1=Drp.1 diff --git a/PKHeX.WinForms/Resources/text/lang_it.txt b/PKHeX.WinForms/Resources/text/lang_it.txt index d721fabbb..d68e76e14 100644 --- a/PKHeX.WinForms/Resources/text/lang_it.txt +++ b/PKHeX.WinForms/Resources/text/lang_it.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=Invisibile SAV_Misc5.CHK_LibertyPass=Attiva LiberTicket SAV_Misc5.CHK_MultiFriendsSet=Amici SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=Ottenuto SAV_Misc5.CHK_SingleSet=Singole SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_ja.txt b/PKHeX.WinForms/Resources/text/lang_ja.txt index 7bf079fff..d3acb5f88 100644 --- a/PKHeX.WinForms/Resources/text/lang_ja.txt +++ b/PKHeX.WinForms/Resources/text/lang_ja.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=不可視 SAV_Misc5.CHK_LibertyPass=リバティチケット 有効化 SAV_Misc5.CHK_MultiFriendsSet=フレンド SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=獲得 SAV_Misc5.CHK_SingleSet=シングル SAV_Misc5.CHK_Subway0=Flag0 SAV_Misc5.CHK_Subway1=Flag1 diff --git a/PKHeX.WinForms/Resources/text/lang_ko.txt b/PKHeX.WinForms/Resources/text/lang_ko.txt index 0065d6712..587acc05b 100644 --- a/PKHeX.WinForms/Resources/text/lang_ko.txt +++ b/PKHeX.WinForms/Resources/text/lang_ko.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=투명 SAV_Misc5.CHK_LibertyPass=리버티티켓 활성화 SAV_Misc5.CHK_MultiFriendsSet=친구 SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=획득함 SAV_Misc5.CHK_SingleSet=싱글 SAV_Misc5.CHK_Subway0=플래그0 SAV_Misc5.CHK_Subway1=플래그1 diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt index 3c1b8bf86..6d44158ab 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh-Hans.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=隐性 SAV_Misc5.CHK_LibertyPass=激活自由船票 SAV_Misc5.CHK_MultiFriendsSet=朋友 SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=获得 SAV_Misc5.CHK_SingleSet=单打 SAV_Misc5.CHK_Subway0=旗帜0 SAV_Misc5.CHK_Subway1=旗帜1 diff --git a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt index f4cb83a5e..0ffc5d6fe 100644 --- a/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt +++ b/PKHeX.WinForms/Resources/text/lang_zh-Hant.txt @@ -1748,7 +1748,6 @@ SAV_Misc5.CHK_Invisible=隱性 SAV_Misc5.CHK_LibertyPass=啟動自由船票 SAV_Misc5.CHK_MultiFriendsSet=朋友 SAV_Misc5.CHK_MultiNPCSet=NPC -SAV_Misc5.CHK_PropObtained=獲得 SAV_Misc5.CHK_SingleSet=單打 SAV_Misc5.CHK_Subway0=旗幟0 SAV_Misc5.CHK_Subway1=旗幟1 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 c19702e9b..e350728a5 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.Designer.cs @@ -182,9 +182,8 @@ private void InitializeComponent() B_ImportFC = new System.Windows.Forms.Button(); B_DumpFC = new System.Windows.Forms.Button(); TAB_Muscial = new System.Windows.Forms.TabPage(); + CLB_MusicalProps = new System.Windows.Forms.CheckedListBox(); B_UnlockAllProps = new System.Windows.Forms.Button(); - CHK_PropObtained = new System.Windows.Forms.CheckBox(); - CB_Prop = new System.Windows.Forms.ComboBox(); TipExpB = new System.Windows.Forms.ToolTip(components); TipExpW = new System.Windows.Forms.ToolTip(components); TC_Misc.SuspendLayout(); @@ -302,11 +301,11 @@ private void InitializeComponent() TAB_Main.Controls.Add(CHK_LibertyPass); TAB_Main.Controls.Add(GB_Roamer); TAB_Main.Controls.Add(GB_FlyDest); - TAB_Main.Location = new System.Drawing.Point(4, 24); + TAB_Main.Location = new System.Drawing.Point(4, 26); TAB_Main.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TAB_Main.Name = "TAB_Main"; TAB_Main.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - TAB_Main.Size = new System.Drawing.Size(390, 338); + TAB_Main.Size = new System.Drawing.Size(390, 336); TAB_Main.TabIndex = 0; TAB_Main.Text = "Main"; TAB_Main.UseVisualStyleBackColor = true; @@ -356,14 +355,14 @@ private void InitializeComponent() NUD_Record32V.Location = new System.Drawing.Point(263, 279); NUD_Record32V.Maximum = new decimal(new int[] { -1, 0, 0, 0 }); NUD_Record32V.Name = "NUD_Record32V"; - NUD_Record32V.Size = new System.Drawing.Size(120, 23); + NUD_Record32V.Size = new System.Drawing.Size(120, 25); NUD_Record32V.TabIndex = 8; // // NUD_Record32 // NUD_Record32.Location = new System.Drawing.Point(263, 254); NUD_Record32.Name = "NUD_Record32"; - NUD_Record32.Size = new System.Drawing.Size(120, 23); + NUD_Record32.Size = new System.Drawing.Size(120, 25); NUD_Record32.TabIndex = 7; // // NUD_Record16V @@ -371,14 +370,14 @@ private void InitializeComponent() NUD_Record16V.Location = new System.Drawing.Point(263, 225); NUD_Record16V.Maximum = new decimal(new int[] { 65535, 0, 0, 0 }); NUD_Record16V.Name = "NUD_Record16V"; - NUD_Record16V.Size = new System.Drawing.Size(120, 23); + NUD_Record16V.Size = new System.Drawing.Size(120, 25); NUD_Record16V.TabIndex = 6; // // NUD_Record16 // NUD_Record16.Location = new System.Drawing.Point(263, 200); NUD_Record16.Name = "NUD_Record16"; - NUD_Record16.Size = new System.Drawing.Size(120, 23); + NUD_Record16.Size = new System.Drawing.Size(120, 25); NUD_Record16.TabIndex = 5; // // GB_KeySystem @@ -414,17 +413,17 @@ private void InitializeComponent() CLB_KeySystem.Location = new System.Drawing.Point(7, 59); CLB_KeySystem.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CLB_KeySystem.Name = "CLB_KeySystem"; - CLB_KeySystem.Size = new System.Drawing.Size(149, 58); + CLB_KeySystem.Size = new System.Drawing.Size(149, 44); CLB_KeySystem.TabIndex = 1; // // CHK_LibertyPass // CHK_LibertyPass.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; CHK_LibertyPass.AutoSize = true; - CHK_LibertyPass.Location = new System.Drawing.Point(189, 149); + CHK_LibertyPass.Location = new System.Drawing.Point(179, 149); CHK_LibertyPass.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CHK_LibertyPass.Name = "CHK_LibertyPass"; - CHK_LibertyPass.Size = new System.Drawing.Size(131, 19); + CHK_LibertyPass.Size = new System.Drawing.Size(141, 21); CHK_LibertyPass.TabIndex = 4; CHK_LibertyPass.Text = "Activate LibertyPass"; CHK_LibertyPass.UseVisualStyleBackColor = true; @@ -455,7 +454,7 @@ private void InitializeComponent() CB_RoamStatus.Location = new System.Drawing.Point(93, 88); CB_RoamStatus.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_RoamStatus.Name = "CB_RoamStatus"; - CB_RoamStatus.Size = new System.Drawing.Size(101, 23); + CB_RoamStatus.Size = new System.Drawing.Size(101, 25); CB_RoamStatus.TabIndex = 5; // // L_RoamStatus @@ -496,7 +495,7 @@ private void InitializeComponent() CB_Roamer642.Location = new System.Drawing.Point(93, 55); CB_Roamer642.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Roamer642.Name = "CB_Roamer642"; - CB_Roamer642.Size = new System.Drawing.Size(101, 23); + CB_Roamer642.Size = new System.Drawing.Size(101, 25); CB_Roamer642.TabIndex = 3; // // CB_Roamer641 @@ -507,7 +506,7 @@ private void InitializeComponent() CB_Roamer641.Location = new System.Drawing.Point(93, 23); CB_Roamer641.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Roamer641.Name = "CB_Roamer641"; - CB_Roamer641.Size = new System.Drawing.Size(101, 23); + CB_Roamer641.Size = new System.Drawing.Size(101, 25); CB_Roamer641.TabIndex = 1; // // GB_FlyDest @@ -532,7 +531,7 @@ private void InitializeComponent() CLB_FlyDest.Location = new System.Drawing.Point(7, 59); CLB_FlyDest.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CLB_FlyDest.Name = "CLB_FlyDest"; - CLB_FlyDest.Size = new System.Drawing.Size(149, 58); + CLB_FlyDest.Size = new System.Drawing.Size(149, 44); CLB_FlyDest.TabIndex = 1; // // B_AllFlyDest @@ -552,10 +551,10 @@ private void InitializeComponent() TAB_Entralink.Controls.Add(GB_EntreeLevel); TAB_Entralink.Controls.Add(GB_FunfestMissions); TAB_Entralink.Controls.Add(GB_PassPowers); - TAB_Entralink.Location = new System.Drawing.Point(4, 24); + TAB_Entralink.Location = new System.Drawing.Point(4, 26); TAB_Entralink.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TAB_Entralink.Name = "TAB_Entralink"; - TAB_Entralink.Size = new System.Drawing.Size(390, 338); + TAB_Entralink.Size = new System.Drawing.Size(390, 336); TAB_Entralink.TabIndex = 1; TAB_Entralink.Text = "Entralink"; TAB_Entralink.UseVisualStyleBackColor = true; @@ -604,7 +603,7 @@ private void InitializeComponent() NUD_FMHosted.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMHosted.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMHosted.Name = "NUD_FMHosted"; - NUD_FMHosted.Size = new System.Drawing.Size(57, 23); + NUD_FMHosted.Size = new System.Drawing.Size(57, 25); NUD_FMHosted.TabIndex = 4; NUD_FMHosted.Value = new decimal(new int[] { 9999, 0, 0, 0 }); // @@ -624,7 +623,7 @@ private void InitializeComponent() NUD_FMMostParticipants.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMMostParticipants.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); NUD_FMMostParticipants.Name = "NUD_FMMostParticipants"; - NUD_FMMostParticipants.Size = new System.Drawing.Size(50, 23); + NUD_FMMostParticipants.Size = new System.Drawing.Size(50, 25); NUD_FMMostParticipants.TabIndex = 12; NUD_FMMostParticipants.Value = new decimal(new int[] { 255, 0, 0, 0 }); // @@ -634,7 +633,7 @@ private void InitializeComponent() NUD_FMParticipated.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMParticipated.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMParticipated.Name = "NUD_FMParticipated"; - NUD_FMParticipated.Size = new System.Drawing.Size(57, 23); + NUD_FMParticipated.Size = new System.Drawing.Size(57, 25); NUD_FMParticipated.TabIndex = 6; NUD_FMParticipated.Value = new decimal(new int[] { 9999, 0, 0, 0 }); // @@ -654,7 +653,7 @@ private void InitializeComponent() NUD_FMCompleted.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMCompleted.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMCompleted.Name = "NUD_FMCompleted"; - NUD_FMCompleted.Size = new System.Drawing.Size(57, 23); + NUD_FMCompleted.Size = new System.Drawing.Size(57, 25); NUD_FMCompleted.TabIndex = 10; NUD_FMCompleted.Value = new decimal(new int[] { 9999, 0, 0, 0 }); // @@ -664,7 +663,7 @@ private void InitializeComponent() NUD_FMTopScores.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMTopScores.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMTopScores.Name = "NUD_FMTopScores"; - NUD_FMTopScores.Size = new System.Drawing.Size(57, 23); + NUD_FMTopScores.Size = new System.Drawing.Size(57, 25); NUD_FMTopScores.TabIndex = 8; NUD_FMTopScores.Value = new decimal(new int[] { 9999, 0, 0, 0 }); // @@ -702,7 +701,7 @@ private void InitializeComponent() NUD_EntreeWhiteEXP.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_EntreeWhiteEXP.Maximum = new decimal(new int[] { 49, 0, 0, 0 }); NUD_EntreeWhiteEXP.Name = "NUD_EntreeWhiteEXP"; - NUD_EntreeWhiteEXP.Size = new System.Drawing.Size(43, 23); + NUD_EntreeWhiteEXP.Size = new System.Drawing.Size(43, 25); NUD_EntreeWhiteEXP.TabIndex = 5; NUD_EntreeWhiteEXP.Value = new decimal(new int[] { 49, 0, 0, 0 }); NUD_EntreeWhiteEXP.ValueChanged += NUD_EntreeWhiteEXP_ValueChanged; @@ -714,7 +713,7 @@ private void InitializeComponent() NUD_EntreeBlackEXP.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_EntreeBlackEXP.Maximum = new decimal(new int[] { 49, 0, 0, 0 }); NUD_EntreeBlackEXP.Name = "NUD_EntreeBlackEXP"; - NUD_EntreeBlackEXP.Size = new System.Drawing.Size(43, 23); + NUD_EntreeBlackEXP.Size = new System.Drawing.Size(43, 25); NUD_EntreeBlackEXP.TabIndex = 2; NUD_EntreeBlackEXP.Value = new decimal(new int[] { 49, 0, 0, 0 }); NUD_EntreeBlackEXP.ValueChanged += NUD_EntreeBlackEXP_ValueChanged; @@ -726,7 +725,7 @@ private void InitializeComponent() NUD_EntreeBlackLV.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_EntreeBlackLV.Maximum = new decimal(new int[] { 999, 0, 0, 0 }); NUD_EntreeBlackLV.Name = "NUD_EntreeBlackLV"; - NUD_EntreeBlackLV.Size = new System.Drawing.Size(50, 23); + NUD_EntreeBlackLV.Size = new System.Drawing.Size(50, 25); NUD_EntreeBlackLV.TabIndex = 1; NUD_EntreeBlackLV.Value = new decimal(new int[] { 999, 0, 0, 0 }); NUD_EntreeBlackLV.ValueChanged += NUD_EntreeBlackLV_ValueChanged; @@ -738,7 +737,7 @@ private void InitializeComponent() NUD_EntreeWhiteLV.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_EntreeWhiteLV.Maximum = new decimal(new int[] { 999, 0, 0, 0 }); NUD_EntreeWhiteLV.Name = "NUD_EntreeWhiteLV"; - NUD_EntreeWhiteLV.Size = new System.Drawing.Size(50, 23); + NUD_EntreeWhiteLV.Size = new System.Drawing.Size(50, 25); NUD_EntreeWhiteLV.TabIndex = 4; NUD_EntreeWhiteLV.Value = new decimal(new int[] { 999, 0, 0, 0 }); NUD_EntreeWhiteLV.ValueChanged += NUD_EntreeWhiteLV_ValueChanged; @@ -838,7 +837,7 @@ private void InitializeComponent() NUD_FMBestScore.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMBestScore.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMBestScore.Name = "NUD_FMBestScore"; - NUD_FMBestScore.Size = new System.Drawing.Size(57, 23); + NUD_FMBestScore.Size = new System.Drawing.Size(57, 25); NUD_FMBestScore.TabIndex = 8; NUD_FMBestScore.ValueChanged += ChangeFestaMissionValue; // @@ -849,7 +848,7 @@ private void InitializeComponent() NUD_FMBestTotal.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_FMBestTotal.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_FMBestTotal.Name = "NUD_FMBestTotal"; - NUD_FMBestTotal.Size = new System.Drawing.Size(57, 23); + NUD_FMBestTotal.Size = new System.Drawing.Size(57, 25); NUD_FMBestTotal.TabIndex = 5; NUD_FMBestTotal.ValueChanged += ChangeFestaMissionValue; // @@ -861,7 +860,7 @@ private void InitializeComponent() CB_FMLevel.Location = new System.Drawing.Point(96, 144); CB_FMLevel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_FMLevel.Name = "CB_FMLevel"; - CB_FMLevel.Size = new System.Drawing.Size(104, 23); + CB_FMLevel.Size = new System.Drawing.Size(104, 25); CB_FMLevel.TabIndex = 3; CB_FMLevel.SelectedIndexChanged += ChangeFestaMissionValue; // @@ -890,11 +889,10 @@ private void InitializeComponent() // LB_FunfestMissions.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; LB_FunfestMissions.FormattingEnabled = true; - LB_FunfestMissions.ItemHeight = 15; LB_FunfestMissions.Location = new System.Drawing.Point(7, 47); LB_FunfestMissions.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); LB_FunfestMissions.Name = "LB_FunfestMissions"; - LB_FunfestMissions.Size = new System.Drawing.Size(193, 94); + LB_FunfestMissions.Size = new System.Drawing.Size(193, 89); LB_FunfestMissions.TabIndex = 1; LB_FunfestMissions.SelectedIndexChanged += LB_FunfestMissions_SelectedIndexChanged; // @@ -920,7 +918,7 @@ private void InitializeComponent() CB_PassPower3.Location = new System.Drawing.Point(7, 75); CB_PassPower3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_PassPower3.Name = "CB_PassPower3"; - CB_PassPower3.Size = new System.Drawing.Size(145, 23); + CB_PassPower3.Size = new System.Drawing.Size(145, 25); CB_PassPower3.TabIndex = 2; // // CB_PassPower2 @@ -931,7 +929,7 @@ private void InitializeComponent() CB_PassPower2.Location = new System.Drawing.Point(7, 47); CB_PassPower2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_PassPower2.Name = "CB_PassPower2"; - CB_PassPower2.Size = new System.Drawing.Size(145, 23); + CB_PassPower2.Size = new System.Drawing.Size(145, 25); CB_PassPower2.TabIndex = 1; // // CB_PassPower1 @@ -942,7 +940,7 @@ private void InitializeComponent() CB_PassPower1.Location = new System.Drawing.Point(7, 20); CB_PassPower1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_PassPower1.Name = "CB_PassPower1"; - CB_PassPower1.Size = new System.Drawing.Size(145, 23); + CB_PassPower1.Size = new System.Drawing.Size(145, 25); CB_PassPower1.TabIndex = 0; // // TAB_Forest @@ -965,11 +963,11 @@ private void InitializeComponent() TAB_Forest.Controls.Add(CB_Species); TAB_Forest.Controls.Add(CB_Areas); TAB_Forest.Controls.Add(LB_Slots); - TAB_Forest.Location = new System.Drawing.Point(4, 24); + TAB_Forest.Location = new System.Drawing.Point(4, 26); TAB_Forest.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); TAB_Forest.Name = "TAB_Forest"; TAB_Forest.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - TAB_Forest.Size = new System.Drawing.Size(390, 338); + TAB_Forest.Size = new System.Drawing.Size(390, 336); TAB_Forest.TabIndex = 2; TAB_Forest.Text = "Forest"; TAB_Forest.UseVisualStyleBackColor = true; @@ -994,7 +992,7 @@ private void InitializeComponent() NUD_Unlocked.Maximum = new decimal(new int[] { 8, 0, 0, 0 }); NUD_Unlocked.Minimum = new decimal(new int[] { 2, 0, 0, 0 }); NUD_Unlocked.Name = "NUD_Unlocked"; - NUD_Unlocked.Size = new System.Drawing.Size(43, 23); + NUD_Unlocked.Size = new System.Drawing.Size(43, 25); NUD_Unlocked.TabIndex = 3; NUD_Unlocked.Value = new decimal(new int[] { 2, 0, 0, 0 }); // @@ -1014,10 +1012,10 @@ private void InitializeComponent() CHK_Area9.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; CHK_Area9.AutoSize = true; CHK_Area9.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - CHK_Area9.Location = new System.Drawing.Point(266, 68); + CHK_Area9.Location = new System.Drawing.Point(255, 68); CHK_Area9.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CHK_Area9.Name = "CHK_Area9"; - CHK_Area9.Size = new System.Drawing.Size(115, 19); + CHK_Area9.Size = new System.Drawing.Size(126, 21); CHK_Area9.TabIndex = 4; CHK_Area9.Text = "Area 9 Unlocked:"; CHK_Area9.UseVisualStyleBackColor = true; @@ -1037,10 +1035,10 @@ private void InitializeComponent() // CHK_Invisible.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; CHK_Invisible.AutoSize = true; - CHK_Invisible.Location = new System.Drawing.Point(297, 313); + CHK_Invisible.Location = new System.Drawing.Point(293, 313); CHK_Invisible.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CHK_Invisible.Name = "CHK_Invisible"; - CHK_Invisible.Size = new System.Drawing.Size(69, 19); + CHK_Invisible.Size = new System.Drawing.Size(73, 21); CHK_Invisible.TabIndex = 16; CHK_Invisible.Text = "Invisible"; CHK_Invisible.UseVisualStyleBackColor = true; @@ -1064,7 +1062,7 @@ private void InitializeComponent() NUD_Animation.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); NUD_Animation.Maximum = new decimal(new int[] { 5, 0, 0, 0 }); NUD_Animation.Name = "NUD_Animation"; - NUD_Animation.Size = new System.Drawing.Size(43, 23); + NUD_Animation.Size = new System.Drawing.Size(43, 25); NUD_Animation.TabIndex = 15; NUD_Animation.ValueChanged += UpdateSlotValue; // @@ -1087,7 +1085,7 @@ private void InitializeComponent() CB_Gender.Location = new System.Drawing.Point(240, 249); CB_Gender.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Gender.Name = "CB_Gender"; - CB_Gender.Size = new System.Drawing.Size(140, 23); + CB_Gender.Size = new System.Drawing.Size(140, 25); CB_Gender.TabIndex = 11; CB_Gender.SelectedIndexChanged += UpdateSlotValue; // @@ -1133,7 +1131,7 @@ private void InitializeComponent() CB_Move.Location = new System.Drawing.Point(240, 276); CB_Move.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Move.Name = "CB_Move"; - CB_Move.Size = new System.Drawing.Size(140, 23); + CB_Move.Size = new System.Drawing.Size(140, 25); CB_Move.TabIndex = 13; CB_Move.SelectedIndexChanged += UpdateSlotValue; // @@ -1145,7 +1143,7 @@ private void InitializeComponent() CB_Form.Location = new System.Drawing.Point(240, 223); CB_Form.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Form.Name = "CB_Form"; - CB_Form.Size = new System.Drawing.Size(140, 23); + CB_Form.Size = new System.Drawing.Size(140, 25); CB_Form.TabIndex = 9; CB_Form.SelectedIndexChanged += UpdateSlotValue; // @@ -1158,7 +1156,7 @@ private void InitializeComponent() CB_Species.Location = new System.Drawing.Point(240, 196); CB_Species.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Species.Name = "CB_Species"; - CB_Species.Size = new System.Drawing.Size(140, 23); + CB_Species.Size = new System.Drawing.Size(140, 25); CB_Species.TabIndex = 7; CB_Species.SelectedIndexChanged += UpdateSlotValue; // @@ -1170,7 +1168,7 @@ private void InitializeComponent() CB_Areas.Location = new System.Drawing.Point(166, 7); CB_Areas.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); CB_Areas.Name = "CB_Areas"; - CB_Areas.Size = new System.Drawing.Size(215, 23); + CB_Areas.Size = new System.Drawing.Size(215, 25); CB_Areas.TabIndex = 1; CB_Areas.SelectedIndexChanged += ChangeArea; // @@ -1178,11 +1176,10 @@ private void InitializeComponent() // LB_Slots.Dock = System.Windows.Forms.DockStyle.Left; LB_Slots.FormattingEnabled = true; - LB_Slots.ItemHeight = 15; LB_Slots.Location = new System.Drawing.Point(4, 3); LB_Slots.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); LB_Slots.Name = "LB_Slots"; - LB_Slots.Size = new System.Drawing.Size(154, 332); + LB_Slots.Size = new System.Drawing.Size(154, 330); LB_Slots.TabIndex = 0; LB_Slots.SelectedIndexChanged += ChangeSlot; // @@ -1197,11 +1194,11 @@ private void InitializeComponent() TAB_Subway.Controls.Add(GB_Multi); TAB_Subway.Controls.Add(GB_Doubles); TAB_Subway.Controls.Add(GB_Singles); - TAB_Subway.Location = new System.Drawing.Point(4, 24); + TAB_Subway.Location = new System.Drawing.Point(4, 26); TAB_Subway.Margin = new System.Windows.Forms.Padding(2); TAB_Subway.Name = "TAB_Subway"; TAB_Subway.Padding = new System.Windows.Forms.Padding(2); - TAB_Subway.Size = new System.Drawing.Size(390, 338); + TAB_Subway.Size = new System.Drawing.Size(390, 336); TAB_Subway.TabIndex = 3; TAB_Subway.Text = "Subway"; TAB_Subway.UseVisualStyleBackColor = true; @@ -1232,7 +1229,7 @@ private void InitializeComponent() CHK_Subway0.Location = new System.Drawing.Point(10, 20); CHK_Subway0.Margin = new System.Windows.Forms.Padding(2); CHK_Subway0.Name = "CHK_Subway0"; - CHK_Subway0.Size = new System.Drawing.Size(54, 19); + CHK_Subway0.Size = new System.Drawing.Size(58, 21); CHK_Subway0.TabIndex = 1; CHK_Subway0.Text = "Flag0"; CHK_Subway0.UseVisualStyleBackColor = true; @@ -1243,7 +1240,7 @@ private void InitializeComponent() CHK_Subway1.Location = new System.Drawing.Point(77, 20); CHK_Subway1.Margin = new System.Windows.Forms.Padding(2); CHK_Subway1.Name = "CHK_Subway1"; - CHK_Subway1.Size = new System.Drawing.Size(54, 19); + CHK_Subway1.Size = new System.Drawing.Size(58, 21); CHK_Subway1.TabIndex = 2; CHK_Subway1.Text = "Flag1"; CHK_Subway1.UseVisualStyleBackColor = true; @@ -1254,7 +1251,7 @@ private void InitializeComponent() CHK_Subway2.Location = new System.Drawing.Point(10, 38); CHK_Subway2.Margin = new System.Windows.Forms.Padding(2); CHK_Subway2.Name = "CHK_Subway2"; - CHK_Subway2.Size = new System.Drawing.Size(54, 19); + CHK_Subway2.Size = new System.Drawing.Size(58, 21); CHK_Subway2.TabIndex = 3; CHK_Subway2.Text = "Flag2"; CHK_Subway2.UseVisualStyleBackColor = true; @@ -1265,7 +1262,7 @@ private void InitializeComponent() CHK_Subway3.Location = new System.Drawing.Point(77, 38); CHK_Subway3.Margin = new System.Windows.Forms.Padding(2); CHK_Subway3.Name = "CHK_Subway3"; - CHK_Subway3.Size = new System.Drawing.Size(54, 19); + CHK_Subway3.Size = new System.Drawing.Size(58, 21); CHK_Subway3.TabIndex = 4; CHK_Subway3.Text = "Flag3"; CHK_Subway3.UseVisualStyleBackColor = true; @@ -1276,7 +1273,7 @@ private void InitializeComponent() CHK_SuperSingle.Location = new System.Drawing.Point(10, 56); CHK_SuperSingle.Margin = new System.Windows.Forms.Padding(2); CHK_SuperSingle.Name = "CHK_SuperSingle"; - CHK_SuperSingle.Size = new System.Drawing.Size(101, 19); + CHK_SuperSingle.Size = new System.Drawing.Size(112, 21); CHK_SuperSingle.TabIndex = 5; CHK_SuperSingle.Text = "Super Singles?"; CHK_SuperSingle.UseVisualStyleBackColor = true; @@ -1287,7 +1284,7 @@ private void InitializeComponent() CHK_SuperMulti.Location = new System.Drawing.Point(10, 74); CHK_SuperMulti.Margin = new System.Windows.Forms.Padding(2); CHK_SuperMulti.Name = "CHK_SuperMulti"; - CHK_SuperMulti.Size = new System.Drawing.Size(92, 19); + CHK_SuperMulti.Size = new System.Drawing.Size(100, 21); CHK_SuperMulti.TabIndex = 7; CHK_SuperMulti.Text = "Super Multi?"; CHK_SuperMulti.UseVisualStyleBackColor = true; @@ -1298,7 +1295,7 @@ private void InitializeComponent() CHK_SuperDouble.Location = new System.Drawing.Point(10, 92); CHK_SuperDouble.Margin = new System.Windows.Forms.Padding(2); CHK_SuperDouble.Name = "CHK_SuperDouble"; - CHK_SuperDouble.Size = new System.Drawing.Size(107, 19); + CHK_SuperDouble.Size = new System.Drawing.Size(119, 21); CHK_SuperDouble.TabIndex = 6; CHK_SuperDouble.Text = "Super Doubles?"; CHK_SuperDouble.UseVisualStyleBackColor = true; @@ -1309,7 +1306,7 @@ private void InitializeComponent() CHK_Subway7.Location = new System.Drawing.Point(10, 110); CHK_Subway7.Margin = new System.Windows.Forms.Padding(2); CHK_Subway7.Name = "CHK_Subway7"; - CHK_Subway7.Size = new System.Drawing.Size(54, 19); + CHK_Subway7.Size = new System.Drawing.Size(58, 21); CHK_Subway7.TabIndex = 8; CHK_Subway7.Text = "Flag7"; CHK_Subway7.UseVisualStyleBackColor = true; @@ -1320,7 +1317,7 @@ private void InitializeComponent() CHK_SWNPCMet.Location = new System.Drawing.Point(64, 110); CHK_SWNPCMet.Margin = new System.Windows.Forms.Padding(2); CHK_SWNPCMet.Name = "CHK_SWNPCMet"; - CHK_SWNPCMet.Size = new System.Drawing.Size(74, 19); + CHK_SWNPCMet.Size = new System.Drawing.Size(78, 21); CHK_SWNPCMet.TabIndex = 8; CHK_SWNPCMet.Text = "NPC met"; CHK_SWNPCMet.UseVisualStyleBackColor = true; @@ -1347,7 +1344,7 @@ private void InitializeComponent() L_CurrentType.Location = new System.Drawing.Point(45, 23); L_CurrentType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_CurrentType.Name = "L_CurrentType"; - L_CurrentType.Size = new System.Drawing.Size(31, 15); + L_CurrentType.Size = new System.Drawing.Size(35, 17); L_CurrentType.TabIndex = 0; L_CurrentType.Text = "Type"; L_CurrentType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1359,7 +1356,7 @@ private void InitializeComponent() L_CurrentBattle.Location = new System.Drawing.Point(17, 47); L_CurrentBattle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_CurrentBattle.Name = "L_CurrentBattle"; - L_CurrentBattle.Size = new System.Drawing.Size(59, 15); + L_CurrentBattle.Size = new System.Drawing.Size(65, 17); L_CurrentBattle.TabIndex = 0; L_CurrentBattle.Text = "Battle No."; L_CurrentBattle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1371,7 +1368,7 @@ private void InitializeComponent() NUD_CurrentType.Margin = new System.Windows.Forms.Padding(2); NUD_CurrentType.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); NUD_CurrentType.Name = "NUD_CurrentType"; - NUD_CurrentType.Size = new System.Drawing.Size(48, 23); + NUD_CurrentType.Size = new System.Drawing.Size(48, 25); NUD_CurrentType.TabIndex = 1; // // NUD_CurrentBattle @@ -1381,7 +1378,7 @@ private void InitializeComponent() NUD_CurrentBattle.Margin = new System.Windows.Forms.Padding(2); NUD_CurrentBattle.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); NUD_CurrentBattle.Name = "NUD_CurrentBattle"; - NUD_CurrentBattle.Size = new System.Drawing.Size(48, 23); + NUD_CurrentBattle.Size = new System.Drawing.Size(48, 25); NUD_CurrentBattle.TabIndex = 1; // // GB_SubwaySets @@ -1412,7 +1409,7 @@ private void InitializeComponent() L_NormalSets.Location = new System.Drawing.Point(42, 19); L_NormalSets.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_NormalSets.Name = "L_NormalSets"; - L_NormalSets.Size = new System.Drawing.Size(47, 15); + L_NormalSets.Size = new System.Drawing.Size(52, 17); L_NormalSets.TabIndex = 0; L_NormalSets.Text = "Normal"; L_NormalSets.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1424,7 +1421,7 @@ private void InitializeComponent() L_SuperSets.Location = new System.Drawing.Point(90, 19); L_SuperSets.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); L_SuperSets.Name = "L_SuperSets"; - L_SuperSets.Size = new System.Drawing.Size(37, 15); + L_SuperSets.Size = new System.Drawing.Size(42, 17); L_SuperSets.TabIndex = 1; L_SuperSets.Text = "Super"; L_SuperSets.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1436,7 +1433,7 @@ private void InitializeComponent() CHK_SingleSet.Location = new System.Drawing.Point(16, 36); CHK_SingleSet.Margin = new System.Windows.Forms.Padding(2); CHK_SingleSet.Name = "CHK_SingleSet"; - CHK_SingleSet.Size = new System.Drawing.Size(58, 19); + CHK_SingleSet.Size = new System.Drawing.Size(62, 21); CHK_SingleSet.TabIndex = 2; CHK_SingleSet.Text = "Single"; CHK_SingleSet.UseVisualStyleBackColor = true; @@ -1449,7 +1446,7 @@ private void InitializeComponent() CHK_DoubleSet.Location = new System.Drawing.Point(10, 53); CHK_DoubleSet.Margin = new System.Windows.Forms.Padding(2); CHK_DoubleSet.Name = "CHK_DoubleSet"; - CHK_DoubleSet.Size = new System.Drawing.Size(64, 19); + CHK_DoubleSet.Size = new System.Drawing.Size(69, 21); CHK_DoubleSet.TabIndex = 3; CHK_DoubleSet.Text = "Double"; CHK_DoubleSet.UseVisualStyleBackColor = true; @@ -1462,7 +1459,7 @@ private void InitializeComponent() CHK_MultiNPCSet.Location = new System.Drawing.Point(24, 70); CHK_MultiNPCSet.Margin = new System.Windows.Forms.Padding(2); CHK_MultiNPCSet.Name = "CHK_MultiNPCSet"; - CHK_MultiNPCSet.Size = new System.Drawing.Size(50, 19); + CHK_MultiNPCSet.Size = new System.Drawing.Size(52, 21); CHK_MultiNPCSet.TabIndex = 4; CHK_MultiNPCSet.Text = "NPC"; CHK_MultiNPCSet.UseVisualStyleBackColor = true; @@ -1475,7 +1472,7 @@ private void InitializeComponent() CHK_MultiFriendsSet.Location = new System.Drawing.Point(10, 87); CHK_MultiFriendsSet.Margin = new System.Windows.Forms.Padding(2); CHK_MultiFriendsSet.Name = "CHK_MultiFriendsSet"; - CHK_MultiFriendsSet.Size = new System.Drawing.Size(64, 19); + CHK_MultiFriendsSet.Size = new System.Drawing.Size(69, 21); CHK_MultiFriendsSet.TabIndex = 5; CHK_MultiFriendsSet.Text = "Friends"; CHK_MultiFriendsSet.UseVisualStyleBackColor = true; @@ -1575,7 +1572,7 @@ private void InitializeComponent() NUD_SMultiFriendsRecord.Margin = new System.Windows.Forms.Padding(2); NUD_SMultiFriendsRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SMultiFriendsRecord.Name = "NUD_SMultiFriendsRecord"; - NUD_SMultiFriendsRecord.Size = new System.Drawing.Size(48, 23); + NUD_SMultiFriendsRecord.Size = new System.Drawing.Size(48, 25); NUD_SMultiFriendsRecord.TabIndex = 9; // // L_SMultiFriendsPast @@ -1596,7 +1593,7 @@ private void InitializeComponent() NUD_SMultiFriendsPast.Margin = new System.Windows.Forms.Padding(2); NUD_SMultiFriendsPast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SMultiFriendsPast.Name = "NUD_SMultiFriendsPast"; - NUD_SMultiFriendsPast.Size = new System.Drawing.Size(48, 23); + NUD_SMultiFriendsPast.Size = new System.Drawing.Size(48, 25); NUD_SMultiFriendsPast.TabIndex = 7; // // NUD_SMultiNpcRecord @@ -1606,7 +1603,7 @@ private void InitializeComponent() NUD_SMultiNpcRecord.Margin = new System.Windows.Forms.Padding(2); NUD_SMultiNpcRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SMultiNpcRecord.Name = "NUD_SMultiNpcRecord"; - NUD_SMultiNpcRecord.Size = new System.Drawing.Size(48, 23); + NUD_SMultiNpcRecord.Size = new System.Drawing.Size(48, 25); NUD_SMultiNpcRecord.TabIndex = 4; // // L_SMultiNpcPast @@ -1627,7 +1624,7 @@ private void InitializeComponent() NUD_SMultiNpcPast.Margin = new System.Windows.Forms.Padding(2); NUD_SMultiNpcPast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SMultiNpcPast.Name = "NUD_SMultiNpcPast"; - NUD_SMultiNpcPast.Size = new System.Drawing.Size(48, 23); + NUD_SMultiNpcPast.Size = new System.Drawing.Size(48, 25); NUD_SMultiNpcPast.TabIndex = 2; // // L_SMultiFriendsRecord @@ -1674,7 +1671,7 @@ private void InitializeComponent() NUD_SDoubleRecord.Margin = new System.Windows.Forms.Padding(2); NUD_SDoubleRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SDoubleRecord.Name = "NUD_SDoubleRecord"; - NUD_SDoubleRecord.Size = new System.Drawing.Size(48, 23); + NUD_SDoubleRecord.Size = new System.Drawing.Size(48, 25); NUD_SDoubleRecord.TabIndex = 3; // // L_SDoublePast @@ -1695,7 +1692,7 @@ private void InitializeComponent() NUD_SDoublePast.Margin = new System.Windows.Forms.Padding(2); NUD_SDoublePast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SDoublePast.Name = "NUD_SDoublePast"; - NUD_SDoublePast.Size = new System.Drawing.Size(48, 23); + NUD_SDoublePast.Size = new System.Drawing.Size(48, 25); NUD_SDoublePast.TabIndex = 1; // // L_SDoubleRecord @@ -1731,7 +1728,7 @@ private void InitializeComponent() NUD_SSingleRecord.Margin = new System.Windows.Forms.Padding(2); NUD_SSingleRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SSingleRecord.Name = "NUD_SSingleRecord"; - NUD_SSingleRecord.Size = new System.Drawing.Size(48, 23); + NUD_SSingleRecord.Size = new System.Drawing.Size(48, 25); NUD_SSingleRecord.TabIndex = 3; // // L_SSinglePast @@ -1752,7 +1749,7 @@ private void InitializeComponent() NUD_SSinglePast.Margin = new System.Windows.Forms.Padding(2); NUD_SSinglePast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SSinglePast.Name = "NUD_SSinglePast"; - NUD_SSinglePast.Size = new System.Drawing.Size(48, 23); + NUD_SSinglePast.Size = new System.Drawing.Size(48, 25); NUD_SSinglePast.TabIndex = 1; // // L_SSingleRecord @@ -1816,7 +1813,7 @@ private void InitializeComponent() NUD_MultiFriendsRecord.Margin = new System.Windows.Forms.Padding(2); NUD_MultiFriendsRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_MultiFriendsRecord.Name = "NUD_MultiFriendsRecord"; - NUD_MultiFriendsRecord.Size = new System.Drawing.Size(48, 23); + NUD_MultiFriendsRecord.Size = new System.Drawing.Size(48, 25); NUD_MultiFriendsRecord.TabIndex = 9; // // L_MultiFriendsPast @@ -1837,7 +1834,7 @@ private void InitializeComponent() NUD_MultiFriendsPast.Margin = new System.Windows.Forms.Padding(2); NUD_MultiFriendsPast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_MultiFriendsPast.Name = "NUD_MultiFriendsPast"; - NUD_MultiFriendsPast.Size = new System.Drawing.Size(48, 23); + NUD_MultiFriendsPast.Size = new System.Drawing.Size(48, 25); NUD_MultiFriendsPast.TabIndex = 7; // // NUD_MultiNpcRecord @@ -1847,7 +1844,7 @@ private void InitializeComponent() NUD_MultiNpcRecord.Margin = new System.Windows.Forms.Padding(2); NUD_MultiNpcRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_MultiNpcRecord.Name = "NUD_MultiNpcRecord"; - NUD_MultiNpcRecord.Size = new System.Drawing.Size(48, 23); + NUD_MultiNpcRecord.Size = new System.Drawing.Size(48, 25); NUD_MultiNpcRecord.TabIndex = 4; // // L_MultiNpcPast @@ -1868,7 +1865,7 @@ private void InitializeComponent() NUD_MultiNpcPast.Margin = new System.Windows.Forms.Padding(2); NUD_MultiNpcPast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_MultiNpcPast.Name = "NUD_MultiNpcPast"; - NUD_MultiNpcPast.Size = new System.Drawing.Size(48, 23); + NUD_MultiNpcPast.Size = new System.Drawing.Size(48, 25); NUD_MultiNpcPast.TabIndex = 2; // // L_MultiFriendsRecord @@ -1915,7 +1912,7 @@ private void InitializeComponent() NUD_DoubleRecord.Margin = new System.Windows.Forms.Padding(2); NUD_DoubleRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_DoubleRecord.Name = "NUD_DoubleRecord"; - NUD_DoubleRecord.Size = new System.Drawing.Size(48, 23); + NUD_DoubleRecord.Size = new System.Drawing.Size(48, 25); NUD_DoubleRecord.TabIndex = 3; // // L_DoublePast @@ -1936,7 +1933,7 @@ private void InitializeComponent() NUD_DoublePast.Margin = new System.Windows.Forms.Padding(2); NUD_DoublePast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_DoublePast.Name = "NUD_DoublePast"; - NUD_DoublePast.Size = new System.Drawing.Size(48, 23); + NUD_DoublePast.Size = new System.Drawing.Size(48, 25); NUD_DoublePast.TabIndex = 1; // // L_DoubleRecord @@ -1972,7 +1969,7 @@ private void InitializeComponent() NUD_SingleRecord.Margin = new System.Windows.Forms.Padding(2); NUD_SingleRecord.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SingleRecord.Name = "NUD_SingleRecord"; - NUD_SingleRecord.Size = new System.Drawing.Size(48, 23); + NUD_SingleRecord.Size = new System.Drawing.Size(48, 25); NUD_SingleRecord.TabIndex = 3; // // L_SinglePast @@ -1993,7 +1990,7 @@ private void InitializeComponent() NUD_SinglePast.Margin = new System.Windows.Forms.Padding(2); NUD_SinglePast.Maximum = new decimal(new int[] { 9999, 0, 0, 0 }); NUD_SinglePast.Name = "NUD_SinglePast"; - NUD_SinglePast.Size = new System.Drawing.Size(48, 23); + NUD_SinglePast.Size = new System.Drawing.Size(48, 25); NUD_SinglePast.TabIndex = 1; // // L_SingleRecord @@ -2012,11 +2009,11 @@ private void InitializeComponent() TAB_BWCityForest.Controls.Add(L_FC); TAB_BWCityForest.Controls.Add(B_ImportFC); TAB_BWCityForest.Controls.Add(B_DumpFC); - TAB_BWCityForest.Location = new System.Drawing.Point(4, 24); + TAB_BWCityForest.Location = new System.Drawing.Point(4, 26); TAB_BWCityForest.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); TAB_BWCityForest.Name = "TAB_BWCityForest"; TAB_BWCityForest.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - TAB_BWCityForest.Size = new System.Drawing.Size(390, 338); + TAB_BWCityForest.Size = new System.Drawing.Size(390, 336); TAB_BWCityForest.TabIndex = 4; TAB_BWCityForest.Text = "WhiteForest/BlackCity"; TAB_BWCityForest.UseVisualStyleBackColor = true; @@ -2054,17 +2051,25 @@ private void InitializeComponent() // // TAB_Muscial // + TAB_Muscial.Controls.Add(CLB_MusicalProps); TAB_Muscial.Controls.Add(B_UnlockAllProps); - TAB_Muscial.Controls.Add(CHK_PropObtained); - TAB_Muscial.Controls.Add(CB_Prop); - TAB_Muscial.Location = new System.Drawing.Point(4, 24); + TAB_Muscial.Location = new System.Drawing.Point(4, 26); TAB_Muscial.Name = "TAB_Muscial"; TAB_Muscial.Padding = new System.Windows.Forms.Padding(3); - TAB_Muscial.Size = new System.Drawing.Size(390, 338); + TAB_Muscial.Size = new System.Drawing.Size(390, 336); TAB_Muscial.TabIndex = 6; TAB_Muscial.Text = "Musical"; TAB_Muscial.UseVisualStyleBackColor = true; // + // CLB_MusicalProps + // + CLB_MusicalProps.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + CLB_MusicalProps.FormattingEnabled = true; + CLB_MusicalProps.Location = new System.Drawing.Point(6, 6); + CLB_MusicalProps.Name = "CLB_MusicalProps"; + CLB_MusicalProps.Size = new System.Drawing.Size(244, 244); + CLB_MusicalProps.TabIndex = 3; + // // B_UnlockAllProps // B_UnlockAllProps.Location = new System.Drawing.Point(6, 261); @@ -2075,26 +2080,6 @@ private void InitializeComponent() B_UnlockAllProps.UseVisualStyleBackColor = true; B_UnlockAllProps.Click += B_UnlockAllProps_Click; // - // CHK_PropObtained - // - CHK_PropObtained.AutoSize = true; - CHK_PropObtained.Location = new System.Drawing.Point(6, 35); - CHK_PropObtained.Name = "CHK_PropObtained"; - CHK_PropObtained.Size = new System.Drawing.Size(75, 19); - CHK_PropObtained.TabIndex = 1; - CHK_PropObtained.Text = "Obtained"; - CHK_PropObtained.UseVisualStyleBackColor = true; - CHK_PropObtained.CheckedChanged += CHK_PropObtained_CheckedChanged; - // - // CB_Prop - // - CB_Prop.FormattingEnabled = true; - CB_Prop.Location = new System.Drawing.Point(6, 6); - CB_Prop.Name = "CB_Prop"; - CB_Prop.Size = new System.Drawing.Size(378, 23); - CB_Prop.TabIndex = 0; - CB_Prop.SelectedIndexChanged += CB_Prop_SelectedIndexChanged; - // // SAV_Misc5 // AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -2172,7 +2157,6 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)NUD_SinglePast).EndInit(); TAB_BWCityForest.ResumeLayout(false); TAB_Muscial.ResumeLayout(false); - TAB_Muscial.PerformLayout(); ResumeLayout(false); } @@ -2325,8 +2309,6 @@ private void InitializeComponent() private System.Windows.Forms.Button B_ImportFC; private System.Windows.Forms.Button B_DumpFC; private System.Windows.Forms.TabPage TAB_Muscial; - private System.Windows.Forms.ComboBox CB_Prop; - private System.Windows.Forms.CheckBox CHK_PropObtained; private System.Windows.Forms.Button B_UnlockAllProps; private System.Windows.Forms.Label L_Record32V; private System.Windows.Forms.Label L_Record32; @@ -2336,5 +2318,6 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown NUD_Record32; private System.Windows.Forms.NumericUpDown NUD_Record16V; private System.Windows.Forms.NumericUpDown NUD_Record16; + private System.Windows.Forms.CheckedListBox CLB_MusicalProps; } } diff --git a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs index 41230cc6b..8c54f8af3 100644 --- a/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs +++ b/PKHeX.WinForms/Subforms/Save Editors/Gen5/SAV_Misc5.cs @@ -28,6 +28,7 @@ public SAV_Misc5(SAV5 sav) WinFormsUtil.TranslateInterface(this, Main.CurrentLanguage); SAV = (SAV5)(Origin = sav).Clone(); + CLB_MusicalProps.Items.AddRange(PropNames); swp = SAV.BattleSubwayPlay; sw = SAV.BattleSubway; ReadMain(); @@ -46,6 +47,7 @@ private void B_Save_Click(object sender, EventArgs e) SaveForest(); SaveSubway(); SaveEntralink(); + SaveMusical(); SaveRecord(); Forest.EnsureDecrypted(false); @@ -852,18 +854,15 @@ private void B_ImportFC_Click(object sender, EventArgs e) private void ReadMusical() { - CB_Prop.Items.AddRange(PropNames); - CB_Prop.SelectedIndex = 0; + CLB_MusicalProps.SelectedIndex = 0; + for (int i = 0; i < PropNames.Length; i++) + CLB_MusicalProps.SetItemChecked(i, SAV.Musical.GetHasProp(i)); } - private void CB_Prop_SelectedIndexChanged(object sender, EventArgs e) + private void SaveMusical() { - CHK_PropObtained.Checked = SAV.Musical.GetHasProp(CB_Prop.SelectedIndex); - } - - private void CHK_PropObtained_CheckedChanged(object sender, EventArgs e) - { - SAV.Musical.SetHasProp(CB_Prop.SelectedIndex, CHK_PropObtained.Checked); + for (int i = 0; i < PropNames.Length; i++) + SAV.Musical.SetHasProp(i, CLB_MusicalProps.GetItemChecked(i)); } private void CHK_SingleSet_CheckedChanged(object sender, EventArgs e) @@ -910,6 +909,7 @@ private void B_UnlockAllProps_Click(object sender, EventArgs e) { SAV.Musical.UnlockAllMusicalProps(); B_UnlockAllProps.Enabled = false; + ReadMusical(); WinFormsUtil.Asterisk(); } }