From bbe6762d2448749b5bb333d045de45c023f5d634 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 20 May 2018 20:05:27 -0700 Subject: [PATCH] Misc fixes Off by 1 for MemArgType div/0 for no instructions Thanks Davil! https://projectpokemon.org/home/forums/topic/45324-menories-error/ --- PKHeX.Core/Editing/Bulk/BatchEditor.cs | 2 ++ PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PKHeX.Core/Editing/Bulk/BatchEditor.cs b/PKHeX.Core/Editing/Bulk/BatchEditor.cs index 0270596ab71..e9df71ee475 100644 --- a/PKHeX.Core/Editing/Bulk/BatchEditor.cs +++ b/PKHeX.Core/Editing/Bulk/BatchEditor.cs @@ -51,6 +51,8 @@ public bool ProcessPKM(PKM pkm, IEnumerable filters, IEnumera /// Friendly (multi-line) string indicating the result of the batch edits. public string GetEditorResults(ICollection sets) { + if (sets.Count == 0) + return MsgBEInstructionNone; int ctr = Modified / sets.Count; int len = Iterated / sets.Count; string maybe = sets.Count == 1 ? string.Empty : "~"; diff --git a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs index 813d131d220..fe3cd7be684 100644 --- a/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs +++ b/PKHeX.WinForms/Subforms/PKM Editors/MemoryAmie.cs @@ -212,7 +212,7 @@ private void UpdateMemoryDisplay(object sender) CB_CTVar.DisplayMember = nameof(ComboItem.Text); CB_CTVar.ValueMember = nameof(ComboItem.Value); CB_CTVar.DataSource = argvals; - LCTV.Text = vartypes[(int)memIndex]; + LCTV.Text = vartypes[(int)memIndex - 1]; LCTV.Visible = CB_CTVar.Visible = CB_CTVar.Enabled = argvals.Count > 1; } else @@ -220,7 +220,7 @@ private void UpdateMemoryDisplay(object sender) CB_OTVar.DisplayMember = nameof(ComboItem.Text); CB_OTVar.ValueMember = nameof(ComboItem.Value); CB_OTVar.DataSource = argvals; - LOTV.Text = vartypes[(int)memIndex]; + LOTV.Text = vartypes[(int)memIndex - 1]; LOTV.Visible = CB_OTVar.Visible = CB_OTVar.Enabled = argvals.Count > 1; } }