From 8626619b60342562f0484d11674872ffa00ec35c Mon Sep 17 00:00:00 2001
From: Kurt <kwsch@users.noreply.github.com>
Date: Mon, 24 Feb 2025 21:31:16 -0600
Subject: [PATCH] move combobox ordering oops

---
 .../Controls/PKM Editor/PKMEditor.Designer.cs | 20 +++++++++----------
 .../Controls/PKM Editor/PKMEditor.cs          |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs
index 84f7fa043..2e21bf463 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs	
@@ -532,8 +532,8 @@ private void InitializeComponent()
             // 
             // UC_Gender
             // 
-            UC_Gender.AccessibleDescription = "Entity gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
-            UC_Gender.AccessibleName = "Entity gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
+            UC_Gender.AccessibleDescription = "Entity gender panel";
+            UC_Gender.AccessibleName = "Entity gender panel";
             UC_Gender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
             UC_Gender.AllowClick = false;
             UC_Gender.BackgroundImage = (System.Drawing.Image)resources.GetObject("UC_Gender.BackgroundImage");
@@ -1927,9 +1927,9 @@ private void InitializeComponent()
             FLP_Moves.Controls.Add(GB_CurrentMoves);
             FLP_Moves.Controls.Add(FLP_PP);
             FLP_Moves.Controls.Add(MC_Move1);
-            FLP_Moves.Controls.Add(MC_Move4);
-            FLP_Moves.Controls.Add(MC_Move3);
             FLP_Moves.Controls.Add(MC_Move2);
+            FLP_Moves.Controls.Add(MC_Move3);
+            FLP_Moves.Controls.Add(MC_Move4);
             FLP_Moves.Controls.Add(GB_RelearnMoves);
             FLP_Moves.Controls.Add(FLP_Relearn1);
             FLP_Moves.Controls.Add(FLP_Relearn2);
@@ -2006,7 +2006,7 @@ private void InitializeComponent()
             MC_Move4.AutoSize = true;
             MC_Move4.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             FLP_Moves.SetFlowBreak(MC_Move4, true);
-            MC_Move4.Location = new System.Drawing.Point(8, 58);
+            MC_Move4.Location = new System.Drawing.Point(8, 110);
             MC_Move4.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
             MC_Move4.Name = "MC_Move4";
             MC_Move4.PP = 0;
@@ -2034,7 +2034,7 @@ private void InitializeComponent()
             MC_Move2.AutoSize = true;
             MC_Move2.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             FLP_Moves.SetFlowBreak(MC_Move2, true);
-            MC_Move2.Location = new System.Drawing.Point(8, 110);
+            MC_Move2.Location = new System.Drawing.Point(8, 58);
             MC_Move2.Margin = new System.Windows.Forms.Padding(8, 0, 0, 0);
             MC_Move2.Name = "MC_Move2";
             MC_Move2.PP = 0;
@@ -2709,8 +2709,8 @@ private void InitializeComponent()
             // 
             // UC_OTGender
             // 
-            UC_OTGender.AccessibleDescription = "Trainer gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
-            UC_OTGender.AccessibleName = "Trainer gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
+            UC_OTGender.AccessibleDescription = "Trainer gender panel";
+            UC_OTGender.AccessibleName = "Trainer gender panel";
             UC_OTGender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
             UC_OTGender.AllowClick = true;
             UC_OTGender.BackgroundImage = (System.Drawing.Image)resources.GetObject("UC_OTGender.BackgroundImage");
@@ -2928,8 +2928,8 @@ private void InitializeComponent()
             // 
             // UC_HTGender
             // 
-            UC_HTGender.AccessibleDescription = "Handling Trainer gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
-            UC_HTGender.AccessibleName = "Handling Trainer gender pane (0) (0) (0) (0) (0) (0) (0) (0) (0)";
+            UC_HTGender.AccessibleDescription = "Handling Trainer gender panel";
+            UC_HTGender.AccessibleName = "Handling Trainer gender panel";
             UC_HTGender.AccessibleRole = System.Windows.Forms.AccessibleRole.Graphic;
             UC_HTGender.AllowClick = true;
             UC_HTGender.BackgroundImage = (System.Drawing.Image)resources.GetObject("UC_HTGender.BackgroundImage");
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 70fae4e48..2d12af408 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs	
@@ -1956,7 +1956,8 @@ private void ToggleSecrets(bool hidden, byte format)
     private void ToggleInterface(byte format)
     {
         ToggleSecrets(HideSecretValues, format);
-        FLP_Handler.Visible = GB_nOT.Visible = FLP_HT.Visible = GB_RelearnMoves.Visible = format >= 6;
+        FLP_HT.Visible = GB_nOT.Visible = FLP_Handler.Visible =
+        FLP_Relearn4.Visible = FLP_Relearn3.Visible = FLP_Relearn2.Visible = FLP_Relearn1.Visible = GB_RelearnMoves.Visible = format >= 6;
 
         PB_Origin.Visible = format >= 6;
         FLP_NSparkle.Visible = L_NSparkle.Visible = CHK_NSparkle.Visible = format == 5;