diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs
index 1e535d32e..5176757cd 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.Designer.cs
@@ -112,7 +112,6 @@ private void InitializeComponent()
this.CHK_Shadow = new System.Windows.Forms.CheckBox();
this.FLP_ShinyLeaf = new System.Windows.Forms.FlowLayoutPanel();
this.L_ShinyLeaf = new System.Windows.Forms.Label();
- this.ShinyLeaf = new PKHeX.WinForms.Controls.ShinyLeaf();
this.Tab_Met = new System.Windows.Forms.TabPage();
this.CHK_AsEgg = new System.Windows.Forms.CheckBox();
this.GB_EggConditions = new System.Windows.Forms.GroupBox();
@@ -148,7 +147,6 @@ private void InitializeComponent()
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.Contest = new PKHeX.WinForms.Controls.ContestStat();
this.FLP_Stats = new System.Windows.Forms.FlowLayoutPanel();
this.FLP_StatHeader = new System.Windows.Forms.FlowLayoutPanel();
this.FLP_HackedStats = new System.Windows.Forms.FlowLayoutPanel();
@@ -274,6 +272,8 @@ private void InitializeComponent()
this.Label_SID = new System.Windows.Forms.Label();
this.Label_TID = new System.Windows.Forms.Label();
this.Label_EncryptionConstant = new System.Windows.Forms.Label();
+ this.ShinyLeaf = new PKHeX.WinForms.Controls.ShinyLeaf();
+ this.Contest = new PKHeX.WinForms.Controls.ContestStat();
this.tabMain.SuspendLayout();
this.Tab_Main.SuspendLayout();
this.FLP_Main.SuspendLayout();
@@ -1394,15 +1394,6 @@ private void InitializeComponent()
this.L_ShinyLeaf.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.L_ShinyLeaf.Click += new System.EventHandler(this.ClickShinyLeaf);
//
- // ShinyLeaf
- //
- this.ShinyLeaf.Location = new System.Drawing.Point(110, 0);
- this.ShinyLeaf.Margin = new System.Windows.Forms.Padding(0);
- this.ShinyLeaf.Name = "ShinyLeaf";
- this.ShinyLeaf.Size = new System.Drawing.Size(140, 56);
- this.ShinyLeaf.TabIndex = 116;
- this.ShinyLeaf.Value = 0;
- //
// Tab_Met
//
this.Tab_Met.AllowDrop = true;
@@ -1778,12 +1769,10 @@ private void InitializeComponent()
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.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.CB_MetTimeOfDay.DropDownWidth = 150;
this.CB_MetTimeOfDay.FormattingEnabled = true;
this.CB_MetTimeOfDay.Items.AddRange(new object[] {
@@ -1796,9 +1785,6 @@ private void InitializeComponent()
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;
- this.CB_MetTimeOfDay.SelectedIndexChanged += new System.EventHandler(this.ValidateComboBox2);
- this.CB_MetTimeOfDay.Validating += new System.ComponentModel.CancelEventHandler(this.ValidateComboBox);
//
// Tab_Stats
//
@@ -1815,20 +1801,6 @@ private void InitializeComponent()
this.Tab_Stats.Text = "Stats";
this.Tab_Stats.UseVisualStyleBackColor = true;
//
- // Contest
- //
- this.Contest.Beauty = 0;
- this.Contest.Cool = 0;
- this.Contest.Cute = 0;
- this.Contest.Location = new System.Drawing.Point(21, 247);
- this.Contest.Margin = new System.Windows.Forms.Padding(0);
- this.Contest.Name = "Contest";
- this.Contest.Sheen = 0;
- this.Contest.Size = new System.Drawing.Size(230, 50);
- this.Contest.Smart = 0;
- this.Contest.TabIndex = 117;
- this.Contest.Tough = 0;
- //
// FLP_Stats
//
this.FLP_Stats.Controls.Add(this.FLP_StatHeader);
@@ -3355,6 +3327,29 @@ private void InitializeComponent()
this.Label_EncryptionConstant.Text = "Encryption Constant:";
this.Label_EncryptionConstant.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
+ // ShinyLeaf
+ //
+ this.ShinyLeaf.Location = new System.Drawing.Point(110, 0);
+ this.ShinyLeaf.Margin = new System.Windows.Forms.Padding(0);
+ this.ShinyLeaf.Name = "ShinyLeaf";
+ this.ShinyLeaf.Size = new System.Drawing.Size(140, 56);
+ this.ShinyLeaf.TabIndex = 116;
+ this.ShinyLeaf.Value = 0;
+ //
+ // Contest
+ //
+ this.Contest.Beauty = 0;
+ this.Contest.Cool = 0;
+ this.Contest.Cute = 0;
+ this.Contest.Location = new System.Drawing.Point(21, 247);
+ this.Contest.Margin = new System.Windows.Forms.Padding(0);
+ this.Contest.Name = "Contest";
+ this.Contest.Sheen = 0;
+ this.Contest.Size = new System.Drawing.Size(230, 50);
+ this.Contest.Smart = 0;
+ this.Contest.TabIndex = 117;
+ this.Contest.Tough = 0;
+ //
// PKMEditor
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index dc1a47602..30179927a 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
@@ -1821,6 +1821,7 @@ private void ToggleInterface(int gen)
FLP_MetDate.Visible = gen >= 4;
FLP_Fateful.Visible = FLP_Ball.Visible = FLP_OriginGame.Visible = gen >= 3;
FLP_MetLocation.Visible = FLP_MetLevel.Visible = gen >= 2;
+ FLP_EncounterType.Visible = gen >= 4 && gen <= 6;
FLP_TimeOfDay.Visible = gen == 2;
// Stats
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.resx b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.resx
index d4add6b82..f34523699 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.resx
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.resx
@@ -117,54 +117,6 @@
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
@@ -200,33 +152,12 @@
True
-
- True
-
-
- True
-
-
- True
-
True
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -236,21 +167,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -269,30 +185,12 @@
True
-
- True
-
-
- True
-
True
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -311,33 +209,9 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -353,15 +227,6 @@
True
-
- True
-
-
- True
-
-
- True
-
True
@@ -371,27 +236,9 @@
True
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -407,30 +254,12 @@
True
-
- True
-
-
- True
-
True
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -443,24 +272,9 @@
True
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
True
@@ -485,36 +299,12 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -527,18 +317,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -548,24 +326,12 @@
True
-
- True
-
True
True
-
- True
-
-
- True
-
-
- True
-
True
@@ -578,30 +344,9 @@
True
-
- True
-
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -614,9 +359,6 @@
True
-
- True
-
True
@@ -626,18 +368,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -650,30 +380,9 @@
True
-
- True
-
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -686,9 +395,6 @@
True
-
- True
-
True
@@ -698,18 +404,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -722,30 +416,9 @@
True
-
- True
-
-
- True
-
-
- True
-
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -761,22 +434,16 @@
True
-
- True
-
-
- True
-
True
True
-
+
True
-
+
True
@@ -853,30 +520,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1
@@ -999,48 +642,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True
@@ -1053,15 +654,6 @@
True
-
- True
-
-
- True
-
-
- True
-
True
@@ -1439,33 +1031,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
True