little bit of items

9 files changed, 19 insertions, 4 deletions

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index b87dd594..c19031bc 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -111,3 +111,7 @@ narc_0111.NCLR
 narc_0112.NCGR
 narc_0112.NCLR
 narc_0114.NCLR
+narc_0115.NCGR
+narc_0115.NCLR
+narc_0117.NCGR
+narc_0117.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0115.NCGR b/files/itemtool/itemdata/item_icon/narc_0115.NCGR
deleted file mode 100644
index d43f7403..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0115.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0115.png b/files/itemtool/itemdata/item_icon/narc_0115.png
new file mode 100644
index 00000000..eb534c06
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0115.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0116.NCLR b/files/itemtool/itemdata/item_icon/narc_0116.NCLR
deleted file mode 100644
index 8b358d93..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0116.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0117.NCGR b/files/itemtool/itemdata/item_icon/narc_0117.NCGR
deleted file mode 100644
index 1f153671..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0117.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0117.png b/files/itemtool/itemdata/item_icon/narc_0117.png
new file mode 100644
index 00000000..9c1d9a76
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0117.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0118.NCLR b/files/itemtool/itemdata/item_icon/narc_0118.NCLR
deleted file mode 100644
index 6a3c534a..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0118.NCLR
+++ /dev/null
diff --git a/filesystem.mk b/filesystem.mk
index a203a0db..ade47589 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1672,7 +1672,11 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0111.NCLR \
         files/itemtool/itemdata/item_icon/narc_0112.NCGR \
         files/itemtool/itemdata/item_icon/narc_0112.NCLR \
-        files/itemtool/itemdata/item_icon/narc_0114.NCLR
+        files/itemtool/itemdata/item_icon/narc_0114.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0115.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0115.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0117.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0117.NCLR
 
 
 files/application/custom_ball/data/cb_data.narc: \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 64762f03..3195fb18 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -1,5 +1,6 @@
 #todo data/dp_areawindow.NCGR (weirdness with size)
 #todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR)
+#todo poketool/trgra/trbgra (unknown compression)
 
 CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
 
@@ -48,7 +49,9 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0105.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0107.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0109.NCGR \
-                                      files/itemtool/itemdata/item_icon/narc_0112.NCGR
+                                      files/itemtool/itemdata/item_icon/narc_0112.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0115.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0117.NCGR
 
 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR
 
@@ -141,7 +144,9 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0105.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0107.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0109.NCGR \
-                   files/itemtool/itemdata/item_icon/narc_0112.NCGR
+                   files/itemtool/itemdata/item_icon/narc_0112.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0115.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0117.NCGR
 
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
@@ -223,4 +228,6 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0110.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0111.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0112.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0114.NCLR
+                   files/itemtool/itemdata/item_icon/narc_0114.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0115.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0117.NCLR