From 6d025833ca2f2996d37b4d11e8fcc7cd4fc16896 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Tue, 27 Sep 2016 23:53:53 -0700
Subject: [PATCH] Better Items in illegal mode (thanks anon)

---
 PKHeX/MainWindow/Main.cs                     | 2 +-
 PKHeX/Subforms/Save Editors/SAV_Inventory.cs | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/PKHeX/MainWindow/Main.cs b/PKHeX/MainWindow/Main.cs
index 44b3cb33d..9f3628302 100644
--- a/PKHeX/MainWindow/Main.cs
+++ b/PKHeX/MainWindow/Main.cs
@@ -193,7 +193,7 @@ public Main()
         private static int colorizedbox = -1;
         private static Image colorizedcolor;
         private static int colorizedslot;
-        private static bool HaX;
+        public static bool HaX;
         private LegalityAnalysis Legality = new LegalityAnalysis(new PK3());
         private static readonly Image mixedHighlight = Util.ChangeOpacity(Properties.Resources.slotSet, 0.5);
         private static readonly string[] lang_val = { "ja", "en", "fr", "it", "de", "es", "ko", "zh", "pt" };
diff --git a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs
index f4cbc988b..9685261b1 100644
--- a/PKHeX/Subforms/Save Editors/SAV_Inventory.cs	
+++ b/PKHeX/Subforms/Save Editors/SAV_Inventory.cs	
@@ -34,6 +34,9 @@ public SAV_Inventory()
                     itemlist = Main.itemlist;
                     break;
             }
+            for (int i = 0; i < itemlist.Length; i++)
+                if (itemlist[i] == "")
+                    itemlist[i] = $"(Item #{i.ToString("000")})";
             Pouches = SAV.Inventory;
             getBags();
         }
@@ -103,7 +106,8 @@ private void spillBag(DataGridView dgv, int bag)
         {
             var pouch = Pouches[bag];
             var itemcount = Pouches[bag].Items.Length;
-            string[] itemarr = getItems(pouch.LegalItems);
+            string[] itemarr = Main.HaX ? (string[])itemlist.Clone() : getItems(pouch.LegalItems);
+
             dgv.Rows.Clear();
             dgv.Columns.Clear();