30 to 35

15 files changed, 103 insertions, 5 deletions

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 6387f2e3..c0fb024d 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -26,3 +26,9 @@ narc_0026.NCGR
 narc_0027.NCLR
 narc_0028.NCLR
 narc_0029.NCLR
+narc_0030.NCGR
+narc_0031.NCLR
+narc_0032.NCLR
+narc_0033.NCGR
+narc_0034.NCLR
+narc_0035.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0030.NCGR b/files/itemtool/itemdata/item_icon/narc_0030.NCGR
deleted file mode 100644
index 74b77380..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0030.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0030.png b/files/itemtool/itemdata/item_icon/narc_0030.png
new file mode 100644
index 00000000..6976dc90
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0030.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0031.NCLR b/files/itemtool/itemdata/item_icon/narc_0031.NCLR
deleted file mode 100644
index 61212a78..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0031.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0031.pal b/files/itemtool/itemdata/item_icon/narc_0031.pal
new file mode 100644
index 00000000..b2984538
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0031.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+205 205 205
+156 156 156
+131 238 255
+74 180 197
+106 213 230
+90 197 213
+213 255 255
+90 90 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0032.NCLR b/files/itemtool/itemdata/item_icon/narc_0032.NCLR
deleted file mode 100644
index 3f997e97..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0032.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0032.pal b/files/itemtool/itemdata/item_icon/narc_0032.pal
new file mode 100644
index 00000000..e19a72ca
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0032.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+205 205 205
+156 156 156
+255 255 148
+197 197 57
+238 238 98
+222 222 90
+255 255 213
+90 90 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0033.NCGR b/files/itemtool/itemdata/item_icon/narc_0033.NCGR
deleted file mode 100644
index 5f2f5ee5..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0033.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0033.png b/files/itemtool/itemdata/item_icon/narc_0033.png
new file mode 100644
index 00000000..f6ace7d3
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0033.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0034.NCLR b/files/itemtool/itemdata/item_icon/narc_0034.NCLR
deleted file mode 100644
index 50c925b9..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0034.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0034.pal b/files/itemtool/itemdata/item_icon/narc_0034.pal
new file mode 100644
index 00000000..35de1c56
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0034.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+156 230 65
+172 255 148
+123 197 32
+90 123 49
+213 213 164
+148 148 98
+255 255 213
+255 255 230
+180 180 131
+238 238 180
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0035.NCLR b/files/itemtool/itemdata/item_icon/narc_0035.NCLR
deleted file mode 100644
index cdaa41e2..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0035.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0035.pal b/files/itemtool/itemdata/item_icon/narc_0035.pal
new file mode 100644
index 00000000..8ac59013
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0035.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+65 156 230
+148 172 255
+32 123 197
+49 90 123
+180 180 197
+115 115 131
+230 230 246
+246 255 246
+148 148 164
+205 205 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/filesystem.mk b/filesystem.mk
index 80e44372..21d86ba1 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1587,7 +1587,13 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0026.NCGR \
         files/itemtool/itemdata/item_icon/narc_0027.NCLR \
         files/itemtool/itemdata/item_icon/narc_0028.NCLR \
-        files/itemtool/itemdata/item_icon/narc_0029.NCLR
+        files/itemtool/itemdata/item_icon/narc_0029.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0030.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0031.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0032.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0033.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0034.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0035.NCLR
 
 files/application/custom_ball/data/cb_data.narc: \
         files/application/custom_ball/data/cb_data/narc_0195.NCGR.lz \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 34c6544d..c2318733 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -19,10 +19,14 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0021.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0023.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0024.NCGR \
-                                      files/itemtool/itemdata/item_icon/narc_0026.NCGR
+                                      files/itemtool/itemdata/item_icon/narc_0026.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0030.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0033.NCGR
 
 IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
-                 files/itemtool/itemdata/item_icon/narc_0029.NCLR
+                 files/itemtool/itemdata/item_icon/narc_0029.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0032.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0035.NCLR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
@@ -41,7 +45,9 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0021.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0023.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0024.NCGR \
-                   files/itemtool/itemdata/item_icon/narc_0026.NCGR
+                   files/itemtool/itemdata/item_icon/narc_0026.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0030.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0033.NCGR
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
@@ -59,4 +65,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0024.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0027.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0028.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0029.NCLR
+                   files/itemtool/itemdata/item_icon/narc_0029.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0031.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0032.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0034.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0035.NCLR