From 00d367b1b09f2ea9729ff19697a99e6c0d81704a Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 1 Dec 2018 15:16:53 -0800
Subject: [PATCH] Add common sanitization util

---
 pkNX.Game/Editors/EditorUtil.cs      | 16 ++++++++++++++++
 pkNX.WinForms/Subforms/BTTE.cs       |  1 +
 pkNX.WinForms/Subforms/PokeDataUI.cs |  5 +----
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkNX.Game/Editors/EditorUtil.cs

diff --git a/pkNX.Game/Editors/EditorUtil.cs b/pkNX.Game/Editors/EditorUtil.cs
new file mode 100644
index 00000000..297ca089
--- /dev/null
+++ b/pkNX.Game/Editors/EditorUtil.cs
@@ -0,0 +1,16 @@
+namespace pkNX.Game
+{
+    public static class EditorUtil
+    {
+        public static string[] SanitizeMoveList(string[] list)
+        {
+            var movelist = (string[])list.Clone();
+            if (movelist.Length < 658)
+                return movelist;
+            string[] ps = { "P", "S" }; // Distinguish Physical/Special Z Moves
+            for (int i = 622; i < 658; i++)
+                movelist[i] += $" ({ps[i % 2]})";
+            return movelist;
+        }
+    }
+}
diff --git a/pkNX.WinForms/Subforms/BTTE.cs b/pkNX.WinForms/Subforms/BTTE.cs
index 700db425..b59ab33f 100644
--- a/pkNX.WinForms/Subforms/BTTE.cs
+++ b/pkNX.WinForms/Subforms/BTTE.cs
@@ -55,6 +55,7 @@ public BTTE(GameManager game, TrainerEditor editor)
             natures = Game.GetStrings(TextName.Natures);
             trName = Game.GetStrings(TextName.TrainerNames);
             trClass = Game.GetStrings(TextName.TrainerClasses);
+            movelist = EditorUtil.SanitizeMoveList(movelist);
 
             AIBits = new[] {CHK_AI0, CHK_AI1, CHK_AI2, CHK_AI3, CHK_AI4, CHK_AI5, CHK_AI6, CHK_AI7};
 
diff --git a/pkNX.WinForms/Subforms/PokeDataUI.cs b/pkNX.WinForms/Subforms/PokeDataUI.cs
index 9844e2a6..de5c6726 100644
--- a/pkNX.WinForms/Subforms/PokeDataUI.cs
+++ b/pkNX.WinForms/Subforms/PokeDataUI.cs
@@ -30,10 +30,7 @@ public PokeDataUI(PokeEditor editor, GameManager rom)
             species = ROM.GetStrings(TextName.SpeciesNames);
             abilities = ROM.GetStrings(TextName.AbilityNames);
             types = ROM.GetStrings(TextName.Types);
-
-            string[] ps = { "P", "S" }; // Distinguish Physical/Special Z Moves
-            for (int i = 622; i < 658; i++)
-                movelist[i] += $" ({ps[i % 2]})";
+            movelist = EditorUtil.SanitizeMoveList(movelist);
 
             species[0] = "---";
             abilities[0] = items[0] = movelist[0] = "";