diff --git a/MainWindow/Main.Designer.cs b/MainWindow/Main.Designer.cs
index d368d58ab..e34d12b1d 100644
--- a/MainWindow/Main.Designer.cs
+++ b/MainWindow/Main.Designer.cs
@@ -179,14 +179,16 @@ public void InitializeComponent()
this.CB_Move2 = new System.Windows.Forms.ComboBox();
this.CB_Move1 = new System.Windows.Forms.ComboBox();
this.Tab_OTMisc = new System.Windows.Forms.TabPage();
+ this.FLP_PKMEditors = new System.Windows.Forms.FlowLayoutPanel();
+ this.BTN_Ribbons = new System.Windows.Forms.Button();
+ this.BTN_History = new System.Windows.Forms.Button();
+ this.BTN_Medals = new System.Windows.Forms.Button();
this.TB_EC = new System.Windows.Forms.TextBox();
this.GB_nOT = new System.Windows.Forms.GroupBox();
this.Label_CTGender = new System.Windows.Forms.Label();
this.TB_OTt2 = new System.Windows.Forms.TextBox();
this.Label_PrevOT = new System.Windows.Forms.Label();
this.BTN_RerollEC = new System.Windows.Forms.Button();
- this.BTN_History = new System.Windows.Forms.Button();
- this.BTN_Ribbons = new System.Windows.Forms.Button();
this.GB_Markings = new System.Windows.Forms.GroupBox();
this.PB_Mark6 = new System.Windows.Forms.PictureBox();
this.PB_MarkPentagon = new System.Windows.Forms.PictureBox();
@@ -377,6 +379,7 @@ public void InitializeComponent()
((System.ComponentModel.ISupportInitialize)(this.PB_WarnRelearn1)).BeginInit();
this.GB_CurrentMoves.SuspendLayout();
this.Tab_OTMisc.SuspendLayout();
+ this.FLP_PKMEditors.SuspendLayout();
this.GB_nOT.SuspendLayout();
this.GB_Markings.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PB_Mark6)).BeginInit();
@@ -2240,11 +2243,10 @@ public void InitializeComponent()
// Tab_OTMisc
//
this.Tab_OTMisc.AllowDrop = true;
+ this.Tab_OTMisc.Controls.Add(this.FLP_PKMEditors);
this.Tab_OTMisc.Controls.Add(this.TB_EC);
this.Tab_OTMisc.Controls.Add(this.GB_nOT);
this.Tab_OTMisc.Controls.Add(this.BTN_RerollEC);
- this.Tab_OTMisc.Controls.Add(this.BTN_History);
- this.Tab_OTMisc.Controls.Add(this.BTN_Ribbons);
this.Tab_OTMisc.Controls.Add(this.GB_Markings);
this.Tab_OTMisc.Controls.Add(this.GB_ExtraBytes);
this.Tab_OTMisc.Controls.Add(this.GB_OT);
@@ -2257,6 +2259,68 @@ public void InitializeComponent()
this.Tab_OTMisc.Text = "OT/Misc";
this.Tab_OTMisc.UseVisualStyleBackColor = true;
//
+ // FLP_PKMEditors
+ //
+ this.FLP_PKMEditors.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.FLP_PKMEditors.AutoSize = true;
+ this.FLP_PKMEditors.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.FLP_PKMEditors.Controls.Add(this.BTN_Ribbons);
+ this.FLP_PKMEditors.Controls.Add(this.BTN_Medals);
+ this.FLP_PKMEditors.Controls.Add(this.BTN_History);
+ this.FLP_PKMEditors.Location = new System.Drawing.Point(49, 245);
+ this.FLP_PKMEditors.Name = "FLP_PKMEditors";
+ this.FLP_PKMEditors.Size = new System.Drawing.Size(175, 25);
+ this.FLP_PKMEditors.TabIndex = 9;
+ this.FLP_PKMEditors.WrapContents = false;
+ //
+ // BTN_Ribbons
+ //
+ this.BTN_Ribbons.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.BTN_Ribbons.AutoSize = true;
+ this.BTN_Ribbons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.BTN_Ribbons.Location = new System.Drawing.Point(1, 1);
+ this.BTN_Ribbons.Margin = new System.Windows.Forms.Padding(1);
+ this.BTN_Ribbons.Name = "BTN_Ribbons";
+ this.BTN_Ribbons.Size = new System.Drawing.Size(56, 23);
+ this.BTN_Ribbons.TabIndex = 5;
+ this.BTN_Ribbons.Text = "Ribbons";
+ this.BTN_Ribbons.UseVisualStyleBackColor = true;
+ this.BTN_Ribbons.Click += new System.EventHandler(this.openRibbons);
+ //
+ // BTN_History
+ //
+ this.BTN_History.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.BTN_History.AutoSize = true;
+ this.BTN_History.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.BTN_History.Location = new System.Drawing.Point(112, 1);
+ this.BTN_History.Margin = new System.Windows.Forms.Padding(1);
+ this.BTN_History.Name = "BTN_History";
+ this.BTN_History.Size = new System.Drawing.Size(62, 23);
+ this.BTN_History.TabIndex = 6;
+ this.BTN_History.Text = "Memories";
+ this.BTN_History.UseVisualStyleBackColor = true;
+ this.BTN_History.Click += new System.EventHandler(this.openHistory);
+ //
+ // BTN_Medals
+ //
+ this.BTN_Medals.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.BTN_Medals.AutoSize = true;
+ this.BTN_Medals.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.BTN_Medals.Location = new System.Drawing.Point(59, 1);
+ this.BTN_Medals.Margin = new System.Windows.Forms.Padding(1);
+ this.BTN_Medals.Name = "BTN_Medals";
+ this.BTN_Medals.Size = new System.Drawing.Size(51, 23);
+ this.BTN_Medals.TabIndex = 7;
+ this.BTN_Medals.Text = "Medals";
+ this.BTN_Medals.UseVisualStyleBackColor = true;
+ this.BTN_Medals.Click += new System.EventHandler(this.openMedals);
+ //
// TB_EC
//
this.TB_EC.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -2274,7 +2338,7 @@ public void InitializeComponent()
this.GB_nOT.Controls.Add(this.Label_CTGender);
this.GB_nOT.Controls.Add(this.TB_OTt2);
this.GB_nOT.Controls.Add(this.Label_PrevOT);
- this.GB_nOT.Location = new System.Drawing.Point(40, 90);
+ this.GB_nOT.Location = new System.Drawing.Point(40, 85);
this.GB_nOT.Name = "GB_nOT";
this.GB_nOT.Size = new System.Drawing.Size(190, 50);
this.GB_nOT.TabIndex = 2;
@@ -2326,26 +2390,6 @@ public void InitializeComponent()
this.BTN_RerollEC.UseVisualStyleBackColor = true;
this.BTN_RerollEC.Click += new System.EventHandler(this.updateRandomEC);
//
- // BTN_History
- //
- this.BTN_History.Location = new System.Drawing.Point(138, 250);
- this.BTN_History.Name = "BTN_History";
- this.BTN_History.Size = new System.Drawing.Size(100, 23);
- this.BTN_History.TabIndex = 6;
- this.BTN_History.Text = "Memories/Amie";
- this.BTN_History.UseVisualStyleBackColor = true;
- this.BTN_History.Click += new System.EventHandler(this.openHistory);
- //
- // BTN_Ribbons
- //
- this.BTN_Ribbons.Location = new System.Drawing.Point(32, 250);
- this.BTN_Ribbons.Name = "BTN_Ribbons";
- this.BTN_Ribbons.Size = new System.Drawing.Size(100, 23);
- this.BTN_Ribbons.TabIndex = 5;
- this.BTN_Ribbons.Text = "Ribbons/Medals";
- this.BTN_Ribbons.UseVisualStyleBackColor = true;
- this.BTN_Ribbons.Click += new System.EventHandler(this.openRibbons);
- //
// GB_Markings
//
this.GB_Markings.Controls.Add(this.PB_Mark6);
@@ -2357,7 +2401,7 @@ public void InitializeComponent()
this.GB_Markings.Controls.Add(this.PB_MarkShiny);
this.GB_Markings.Controls.Add(this.PB_Mark1);
this.GB_Markings.Controls.Add(this.PB_Mark4);
- this.GB_Markings.Location = new System.Drawing.Point(68, 188);
+ this.GB_Markings.Location = new System.Drawing.Point(68, 183);
this.GB_Markings.Name = "GB_Markings";
this.GB_Markings.Size = new System.Drawing.Size(135, 58);
this.GB_Markings.TabIndex = 4;
@@ -2479,7 +2523,7 @@ public void InitializeComponent()
//
this.GB_ExtraBytes.Controls.Add(this.TB_ExtraByte);
this.GB_ExtraBytes.Controls.Add(this.CB_ExtraBytes);
- this.GB_ExtraBytes.Location = new System.Drawing.Point(68, 140);
+ this.GB_ExtraBytes.Location = new System.Drawing.Point(68, 135);
this.GB_ExtraBytes.Name = "GB_ExtraBytes";
this.GB_ExtraBytes.Size = new System.Drawing.Size(135, 48);
this.GB_ExtraBytes.TabIndex = 3;
@@ -2517,7 +2561,7 @@ public void InitializeComponent()
this.GB_OT.Controls.Add(this.Label_OT);
this.GB_OT.Controls.Add(this.Label_SID);
this.GB_OT.Controls.Add(this.Label_TID);
- this.GB_OT.Location = new System.Drawing.Point(40, 13);
+ this.GB_OT.Location = new System.Drawing.Point(40, 8);
this.GB_OT.Name = "GB_OT";
this.GB_OT.Size = new System.Drawing.Size(190, 75);
this.GB_OT.TabIndex = 1;
@@ -2711,7 +2755,7 @@ public void InitializeComponent()
this.Menu_ShowdownExportBattleBox});
this.Menu_Showdown.Image = global::PKHeX.Properties.Resources.showdown;
this.Menu_Showdown.Name = "Menu_Showdown";
- this.Menu_Showdown.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Showdown.Size = new System.Drawing.Size(143, 22);
this.Menu_Showdown.Text = "Showdown";
//
// Menu_ShowdownImportPKM
@@ -2758,7 +2802,7 @@ public void InitializeComponent()
this.Menu_OpenCache});
this.Menu_CyberGadget.Image = global::PKHeX.Properties.Resources.other;
this.Menu_CyberGadget.Name = "Menu_CyberGadget";
- this.Menu_CyberGadget.Size = new System.Drawing.Size(152, 22);
+ this.Menu_CyberGadget.Size = new System.Drawing.Size(143, 22);
this.Menu_CyberGadget.Text = "CyberGadget";
//
// Menu_OpenTemp
@@ -2787,14 +2831,14 @@ public void InitializeComponent()
this.Menu_BatchEditor});
this.Menu_Data.Image = global::PKHeX.Properties.Resources.data;
this.Menu_Data.Name = "Menu_Data";
- this.Menu_Data.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Data.Size = new System.Drawing.Size(143, 22);
this.Menu_Data.Text = "Data";
//
// Menu_LoadBoxes
//
this.Menu_LoadBoxes.Image = global::PKHeX.Properties.Resources.load;
this.Menu_LoadBoxes.Name = "Menu_LoadBoxes";
- this.Menu_LoadBoxes.Size = new System.Drawing.Size(152, 22);
+ this.Menu_LoadBoxes.Size = new System.Drawing.Size(151, 22);
this.Menu_LoadBoxes.Text = "Load Boxes";
this.Menu_LoadBoxes.Click += new System.EventHandler(this.mainMenuBoxLoad);
//
@@ -2802,7 +2846,7 @@ public void InitializeComponent()
//
this.Menu_DumpBoxes.Image = global::PKHeX.Properties.Resources.dump;
this.Menu_DumpBoxes.Name = "Menu_DumpBoxes";
- this.Menu_DumpBoxes.Size = new System.Drawing.Size(152, 22);
+ this.Menu_DumpBoxes.Size = new System.Drawing.Size(151, 22);
this.Menu_DumpBoxes.Text = "Dump Boxes";
this.Menu_DumpBoxes.Click += new System.EventHandler(this.mainMenuBoxDump);
//
@@ -2812,7 +2856,7 @@ public void InitializeComponent()
this.Menu_Report.Name = "Menu_Report";
this.Menu_Report.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
this.Menu_Report.ShowShortcutKeys = false;
- this.Menu_Report.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Report.Size = new System.Drawing.Size(151, 22);
this.Menu_Report.Text = "Box Data &Report";
this.Menu_Report.Click += new System.EventHandler(this.mainMenuBoxReport);
//
@@ -2822,7 +2866,7 @@ public void InitializeComponent()
this.Menu_Database.Name = "Menu_Database";
this.Menu_Database.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.Menu_Database.ShowShortcutKeys = false;
- this.Menu_Database.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Database.Size = new System.Drawing.Size(151, 22);
this.Menu_Database.Text = "PK6 &Database";
this.Menu_Database.Click += new System.EventHandler(this.mainMenuDatabase);
//
@@ -2832,7 +2876,7 @@ public void InitializeComponent()
this.Menu_BatchEditor.Name = "Menu_BatchEditor";
this.Menu_BatchEditor.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.M)));
this.Menu_BatchEditor.ShowShortcutKeys = false;
- this.Menu_BatchEditor.Size = new System.Drawing.Size(152, 22);
+ this.Menu_BatchEditor.Size = new System.Drawing.Size(151, 22);
this.Menu_BatchEditor.Text = "Batch Editor";
this.Menu_BatchEditor.Click += new System.EventHandler(this.manMenuBatchEditor);
//
@@ -2843,7 +2887,7 @@ public void InitializeComponent()
this.Menu_OpenSDB});
this.Menu_Other.Image = global::PKHeX.Properties.Resources.other;
this.Menu_Other.Name = "Menu_Other";
- this.Menu_Other.Size = new System.Drawing.Size(152, 22);
+ this.Menu_Other.Size = new System.Drawing.Size(143, 22);
this.Menu_Other.Text = "Other";
//
// Menu_OpenSDF
@@ -4392,6 +4436,8 @@ public void InitializeComponent()
this.GB_CurrentMoves.PerformLayout();
this.Tab_OTMisc.ResumeLayout(false);
this.Tab_OTMisc.PerformLayout();
+ this.FLP_PKMEditors.ResumeLayout(false);
+ this.FLP_PKMEditors.PerformLayout();
this.GB_nOT.ResumeLayout(false);
this.GB_nOT.PerformLayout();
this.GB_Markings.ResumeLayout(false);
@@ -4822,6 +4868,8 @@ public void InitializeComponent()
private System.Windows.Forms.PictureBox PB_Mark1;
private System.Windows.Forms.Button B_Pokeblocks;
private System.Windows.Forms.ToolStripMenuItem Menu_BatchEditor;
+ private System.Windows.Forms.Button BTN_Medals;
+ private System.Windows.Forms.FlowLayoutPanel FLP_PKMEditors;
}
}
diff --git a/MainWindow/Main.cs b/MainWindow/Main.cs
index adf3f89d3..4f90cfd2c 100644
--- a/MainWindow/Main.cs
+++ b/MainWindow/Main.cs
@@ -745,7 +745,7 @@ private void openSAV(byte[] input, string path)
CB_Country.Visible = CB_SubRegion.Visible = CB_3DSReg.Visible =
Label_Country.Visible = Label_SubRegion.Visible = Label_3DSRegion.Visible = SAV.Generation >= 6;
Label_EncryptionConstant.Visible = BTN_RerollEC.Visible = TB_EC.Visible = SAV.Generation >= 6;
- GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_History.Visible = BTN_Ribbons.Visible = SAV.Generation >= 6;
+ GB_nOT.Visible = GB_RelearnMoves.Visible = BTN_Medals.Visible = BTN_History.Visible = SAV.Generation >= 6;
PB_Legal.Visible = PB_WarnMove1.Visible = PB_WarnMove2.Visible = PB_WarnMove3.Visible = PB_WarnMove4.Visible = SAV.Generation >= 6;
PB_MarkPentagon.Visible = SAV.Generation == 6;
@@ -755,10 +755,14 @@ private void openSAV(byte[] input, string path)
CB_Form.Visible = Label_Form.Visible = CHK_AsEgg.Visible = GB_EggConditions.Visible =
Label_MetDate.Visible = CAL_MetDate.Visible = PB_Mark5.Visible = PB_Mark6.Visible = SAV.Generation >= 4;
+ BTN_Ribbons.Visible = SAV.Generation >= 3;
DEV_Ability.Enabled = DEV_Ability.Visible = SAV.Generation > 3 && HaX;
TB_AbilityNumber.Visible = SAV.Generation >= 6 && DEV_Ability.Enabled;
CB_Ability.Visible = !DEV_Ability.Enabled && SAV.Generation >= 3;
+ // Recenter PKM SubEditors
+ FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width) / 2, FLP_PKMEditors.Location.Y);
+
switch (SAV.Generation)
{
case 3:
@@ -850,6 +854,8 @@ private void changeMainLanguage(object sender, EventArgs e)
InitializeStrings();
InitializeLanguage();
Util.TranslateInterface(this, lang_val[CB_MainLanguage.SelectedIndex]); // Translate the UI to language.
+ // Recenter PKM SubEditors
+ FLP_PKMEditors.Location = new Point((tabMain.TabPages[4].Width - FLP_PKMEditors.Width)/2, FLP_PKMEditors.Location.Y);
populateFields(pk); // put data back in form
fieldsInitialized |= alreadyInit;
}
@@ -2236,7 +2242,11 @@ private void updateUnicode()
// Secondary Windows for Ribbons/Amie/Memories
private void openRibbons(object sender, EventArgs e)
{
- new RibbMedal().ShowDialog();
+ new RibbonEditor().ShowDialog();
+ }
+ private void openMedals(object sender, EventArgs e)
+ {
+ new SuperTrainingEditor().ShowDialog();
}
private void openHistory(object sender, EventArgs e)
{
diff --git a/MainWindow/Main.resx b/MainWindow/Main.resx
index 45a4409d3..adb9b3c4d 100644
--- a/MainWindow/Main.resx
+++ b/MainWindow/Main.resx
@@ -237,6 +237,408 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
@@ -290,6 +692,18 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -553,6 +967,30 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAeZJREFUOE+1
@@ -675,10 +1113,46 @@
True
-
+
True
-
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
True
@@ -690,18 +1164,6 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -853,18 +1315,12 @@
N5EOGBgAEVY/pv9ltCoAAAAASUVORK5CYII=
-
- True
-
True
True
-
- True
-
True
@@ -886,9 +1342,6 @@
True
-
- True
-
17, 17
@@ -904,6 +1357,108 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -1009,6 +1564,42 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -1122,6 +1713,24 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
iVBORw0KGgoAAAANSUhEUgAAAG8AAACgCAYAAAACezIBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -1192,6 +1801,54 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -1231,12 +1888,18 @@
True
+
+ True
+
True
True
+
+ True
+
True
@@ -1246,6 +1909,36 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
@@ -1279,6 +1972,51 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
True
diff --git a/PKHeX.csproj b/PKHeX.csproj
index afa6f51dd..ed4c30501 100644
--- a/PKHeX.csproj
+++ b/PKHeX.csproj
@@ -125,17 +125,17 @@
BatchEditor.cs
-
+
Form
-
- SuperTraining.cs
+
+ SuperTrainingEditor.cs
-
+
Form
-
- RibbMedal2.cs
+
+ RibbonEditor.cs
Form
@@ -300,11 +300,11 @@
BatchEditor.cs
-
- SuperTraining.cs
+
+ SuperTrainingEditor.cs
-
- RibbMedal2.cs
+
+ RibbonEditor.cs
Text.cs
diff --git a/Resources/text/de/lang_de.txt b/Resources/text/de/lang_de.txt
index d0da10599..099319046 100644
--- a/Resources/text/de/lang_de.txt
+++ b/Resources/text/de/lang_de.txt
@@ -129,8 +129,9 @@ GB_nOT = Letzter (nicht OT) Handler
Label_PrevOT = OT:
GB_ExtraBytes = Extra Bytes
GB_Markings = Markierungen
-BTN_Ribbons = Bänder/Medaillen
-BTN_History = Erinnerung/Amie
+BTN_Ribbons = Bänder
+BTN_Medals = Medaillen
+BTN_History = Erinnerung
Label_EncryptionConstant = PKX-Konstante:
BTN_RerollEC = Neu
-----------------Save Data Interface--------------------
diff --git a/Resources/text/en/lang_en.txt b/Resources/text/en/lang_en.txt
index 22eb12e0c..742ea201d 100644
--- a/Resources/text/en/lang_en.txt
+++ b/Resources/text/en/lang_en.txt
@@ -129,8 +129,9 @@ GB_nOT = Latest (not OT) Handler
Label_PrevOT = OT:
GB_ExtraBytes = Extra Bytes
GB_Markings = Markings
-BTN_Ribbons = Ribbons/Medals
-BTN_History = Memories/Amie
+BTN_Ribbons = Ribbons
+BTN_Medals = Medals
+BTN_History = Memories
Label_EncryptionConstant = Encryption Constant:
BTN_RerollEC = Reroll
-----------------Save Data Interface--------------------
diff --git a/Resources/text/es/lang_es.txt b/Resources/text/es/lang_es.txt
index 4a4a7b2d2..c7a6f60f8 100644
--- a/Resources/text/es/lang_es.txt
+++ b/Resources/text/es/lang_es.txt
@@ -129,8 +129,9 @@ GB_nOT = Ultimo dueño (no OT)
Label_PrevOT = OT:
GB_ExtraBytes = Bytes Extras
GB_Markings = Marcas
-BTN_Ribbons = Listones/Medales
-BTN_History = Memorias/Recreo
+BTN_Ribbons = Listones
+BTN_Medals = Medales
+BTN_History = Memorias
Label_EncryptionConstant = Constante de Encryption:
BTN_RerollEC = Generar
-----------------Save Data Interface--------------------
diff --git a/Resources/text/fr/lang_fr.txt b/Resources/text/fr/lang_fr.txt
index eb6e33dae..141e948f7 100644
--- a/Resources/text/fr/lang_fr.txt
+++ b/Resources/text/fr/lang_fr.txt
@@ -129,8 +129,9 @@ GB_nOT = Dernier Dresseur connu
Label_PrevOT = DO :
GB_ExtraBytes = Octets supplémentaires
GB_Markings = Marquages
-BTN_Ribbons = Rubans / Médaill.
-BTN_History = Souvenirs/Récré
+BTN_Ribbons = Rubans
+BTN_Medals = Médaill.
+BTN_History = Souvenirs
Label_EncryptionConstant = Valeur de cryptage :
BTN_RerollEC = Edit.
-----------------Save Data Interface--------------------
diff --git a/Resources/text/it/lang_it.txt b/Resources/text/it/lang_it.txt
index ecd99e1fb..dd467727b 100644
--- a/Resources/text/it/lang_it.txt
+++ b/Resources/text/it/lang_it.txt
@@ -129,8 +129,9 @@ GB_nOT = Latest (not OT) Handler
Label_PrevOT = OT:
GB_ExtraBytes = Extra Bytes
GB_Markings = Markings
-BTN_Ribbons = Ribbons/Medals
-BTN_History = Memories/Amie
+BTN_Ribbons = Ribbons
+BTN_Medals = Medals
+BTN_History = Memories
Label_EncryptionConstant = Encryption Constant:
BTN_RerollEC = Reroll
-----------------Save Data Interface--------------------
diff --git a/Resources/text/ja/lang_ja.txt b/Resources/text/ja/lang_ja.txt
index 511e080e9..d0b51ef7d 100644
--- a/Resources/text/ja/lang_ja.txt
+++ b/Resources/text/ja/lang_ja.txt
@@ -129,8 +129,9 @@ GB_nOT = 最新の（非親）ハンドラ
Label_PrevOT = 親のなまえ
GB_ExtraBytes = 余分なバイト
GB_Markings = マーキング
-BTN_Ribbons = リボン/スーパートレーニング
-BTN_History = メモリ/ポケパルレ
+BTN_Ribbons = リボン
+BTN_Medals = スーパートレーニング
+BTN_History = メモリ
Label_EncryptionConstant = 暗号化定数
BTN_RerollEC = 新規作成
-----------------Save Data Interface--------------------
diff --git a/Resources/text/ko/lang_ko.txt b/Resources/text/ko/lang_ko.txt
index 93f73633c..e6cb6abba 100644
--- a/Resources/text/ko/lang_ko.txt
+++ b/Resources/text/ko/lang_ko.txt
@@ -129,7 +129,8 @@ GB_nOT = 최근 (주인이 아닌) 트레이너
Label_PrevOT = 주인:
GB_ExtraBytes = Extra Bytes
GB_Markings = 마킹
-BTN_Ribbons = 리본/메달
+BTN_Ribbons = 리본
+BTN_Medals = 메달
BTN_History = 기억
Label_EncryptionConstant = Encryption Constant:
BTN_RerollEC = 재설정
diff --git a/Resources/text/other/lang_pt.txt b/Resources/text/other/lang_pt.txt
index 31eb6c534..3d32d1889 100644
--- a/Resources/text/other/lang_pt.txt
+++ b/Resources/text/other/lang_pt.txt
@@ -129,8 +129,9 @@ GB_nOT = Último (não OT) Treinador
Label_PrevOT = OT:
GB_ExtraBytes = Bytes Extra
GB_Markings = Marcas
-BTN_Ribbons = Fitas/Medalhas
-BTN_History = Memórias/Amie
+BTN_Ribbons = Fitas
+BTN_Medals = Medalhas
+BTN_History = Memórias
Label_EncryptionConstant = Constante de Encriptação:
BTN_RerollEC = Gerar
-----------------Save Data Interface--------------------
diff --git a/Resources/text/zh/lang_zh.txt b/Resources/text/zh/lang_zh.txt
index 31b525f44..29b235e86 100644
--- a/Resources/text/zh/lang_zh.txt
+++ b/Resources/text/zh/lang_zh.txt
@@ -129,7 +129,8 @@ GB_nOT = 最新的持有人（非主人）
Label_PrevOT = 主人名称
GB_ExtraBytes = 额外字节
GB_Markings = 标记
-BTN_Ribbons = 绸带/超级训练
+BTN_Ribbons = 绸带
+BTN_Medals = 超级训练
BTN_History = 记忆
Label_EncryptionConstant = 暗号化定数
BTN_RerollEC = 随机