diff --git a/PKHeX/Resources/text/other/const_sm.txt b/PKHeX/Resources/text/other/const_sm.txt
index 987a58b1c..ecf15fdcb 100644
--- a/PKHeX/Resources/text/other/const_sm.txt
+++ b/PKHeX/Resources/text/other/const_sm.txt
@@ -1 +1,2 @@
-0	Test1
\ No newline at end of file
+404	Tapu Fini	03:Battleable,04:Defeated,05:Captured
+433	Tapu Lele	01:Battleable,02:Defeated,03:Captured
\ No newline at end of file
diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs
index 338dddf6a..0461296ad 100644
--- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs	
+++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.Designer.cs	
@@ -314,9 +314,10 @@ private void InitializeComponent()
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.TLP_Const.AutoScroll = true;
-            this.TLP_Const.ColumnCount = 2;
+            this.TLP_Const.ColumnCount = 3;
             this.TLP_Const.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.TLP_Const.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.TLP_Const.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.TLP_Const.Location = new System.Drawing.Point(6, 19);
             this.TLP_Const.Name = "TLP_Const";
             this.TLP_Const.RowCount = 1;
diff --git a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs
index 7983acdc6..6af939fd8 100644
--- a/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs	
+++ b/PKHeX/Subforms/Save Editors/SAV_EventFlags.cs	
@@ -36,7 +36,10 @@ public SAV_EventFlags()
             TLP_Const.ResumeLayout();
 
             Util.TranslateInterface(this, Main.curlanguage);
-            
+
+            Text = $"Event Flag Editor ({gamePrefix.ToUpper()})";
+
+
             CB_Stats.SelectedIndex = 0;
             nud.Maximum = flags.Length - 1;
             nud.Text = "0";
@@ -47,6 +50,7 @@ public SAV_EventFlags()
         private readonly ushort[] Constants;
         private const string flagTag = "bool_";
         private const string constTag = "const_";
+        private const string constCBTag = "cbconst_";
         private const string flagLabelTag = "flag_";
         private const string constLabelTag = "L_";
         private bool editing;
@@ -168,8 +172,9 @@ private void addConstList(string[] list)
             // Get list
             List<int> num = new List<int>();
             List<string> desc = new List<string>();
+            List<string> enums = new List<string>();
 
-            foreach (string[] split in list.Select(s => s.Split('\t')).Where(split => split.Length == 2))
+            foreach (string[] split in list.Select(s => s.Split('\t')).Where(split => split.Length == 2 || split.Length == 3))
             {
                 try
                 {
@@ -178,6 +183,10 @@ private void addConstList(string[] list)
                         continue;
                     num.Add(n);
                     desc.Add(split[1]);
+                    if (split.Length == 3)
+                        enums.Add(split[2]);
+                    else
+                        enums.Add("");
                 } catch { }
             }
             if (num.Count == 0)
@@ -202,11 +211,40 @@ private void addConstList(string[] list)
                     Value = Constants[num[i]],
                     Name = constTag + num[i].ToString("0000"),
                     Margin = Padding.Empty,
-                    Width = 55,
+                    Width = 50,
                 };
+
+                var map = new[] { new { Text = "Custom", Value = -1 } }.ToList();
+
+                if (!string.IsNullOrWhiteSpace(enums[i]))
+                {
+                    foreach (var entry in enums[i].Split(','))
+                    {
+                        var spl = entry.Split(':');
+                        map.Add(new { Text = spl[1], Value = (int)Convert.ToInt32(spl[0])});
+                    }
+                }
+                var cb = new ComboBox()
+                {
+                    ValueMember = "Value",
+                    DisplayMember = "Text",
+                    Margin = Padding.Empty,
+                    Width = 80,
+                    Name = constCBTag + num[i].ToString("0000"),
+                    DropDownStyle = ComboBoxStyle.DropDownList,
+                    BindingContext = this.BindingContext,
+                    DataSource = map
+                };
+                cb.SelectedIndex = 0;
+                cb.SelectedValueChanged += toggleConst;
                 mtb.TextChanged += toggleConst;
-                TLP_Const.Controls.Add(mtb, 0, i);
-                TLP_Const.Controls.Add(lbl, 1, i);
+                TLP_Const.Controls.Add(lbl, 0, i);
+                TLP_Const.Controls.Add(cb, 1, i);
+                TLP_Const.Controls.Add(mtb, 2, i);
+                if (map.Any(val => val.Value == (int)Constants[num[i]]))
+                {
+                    cb.SelectedValue = (int)Constants[num[i]];
+                }
             }
         }
 
@@ -291,12 +329,26 @@ private void toggleConst(object sender, EventArgs e)
             if (editing)
                 return;
 
-            editing = true;
-            int constnum = getControlNum((NumericUpDown)sender);
-            Constants[constnum] = (ushort)(Util.ToUInt32(((NumericUpDown)sender).Text) & 0xFFFF);
-            if (constnum == CB_Stats.SelectedIndex)
-                MT_Stat.Text = Constants[constnum].ToString();
-            editing = false;
+            int constnum = getControlNum((Control)sender);
+            if (sender is ComboBox)
+            {
+                var nud = (NumericUpDown)TLP_Const.GetControlFromPosition(2, TLP_Const.GetRow((Control)sender));
+                var sel_val = (int)((ComboBox)sender).SelectedValue;
+                editing = true;
+                nud.Enabled = sel_val == -1;
+                if (sel_val != -1)
+                    nud.Value = (ushort)sel_val;
+                Constants[constnum] = (ushort)(Util.ToUInt32(nud.Text) & 0xFFFF);
+                editing = false;
+            }
+            else if (sender is NumericUpDown)
+            {
+                editing = true;
+                Constants[constnum] = (ushort)(Util.ToUInt32(((NumericUpDown)sender).Text) & 0xFFFF);
+                if (constnum == CB_Stats.SelectedIndex)
+                    MT_Stat.Text = Constants[constnum].ToString();
+                editing = false;
+            }
         }
 
         private void changeSAV(object sender, EventArgs e)