Merge branch 'master' into pikalax_work

18 files changed, 36 insertions, 1 deletions

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 190832e8..6710dbd1 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -162,3 +162,13 @@ narc_0162.NCGR
 narc_0162.NCLR
 narc_0164.NCGR
 narc_0164.NCLR
+narc_0166.NCGR
+narc_0166.NCLR
+narc_0168.NCGR
+narc_0168.NCLR
+narc_0170.NCGR
+narc_0170.NCLR
+narc_0172.NCGR
+narc_0172.NCLR
+narc_0174.NCGR
+narc_0174.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0166.NCGR b/files/itemtool/itemdata/item_icon/narc_0166.NCGR
deleted file mode 100644
index ec3586be..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0166.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0166.png b/files/itemtool/itemdata/item_icon/narc_0166.png
new file mode 100644
index 00000000..de6ca576
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0166.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0167.NCLR b/files/itemtool/itemdata/item_icon/narc_0167.NCLR
deleted file mode 100644
index 65e3fb33..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0167.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0168.NCGR b/files/itemtool/itemdata/item_icon/narc_0168.NCGR
deleted file mode 100644
index 260d4342..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0168.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0168.png b/files/itemtool/itemdata/item_icon/narc_0168.png
new file mode 100644
index 00000000..351d0712
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0168.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0169.NCLR b/files/itemtool/itemdata/item_icon/narc_0169.NCLR
deleted file mode 100644
index 1082f764..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0169.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0170.NCGR b/files/itemtool/itemdata/item_icon/narc_0170.NCGR
deleted file mode 100644
index 922ca0a3..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0170.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0170.png b/files/itemtool/itemdata/item_icon/narc_0170.png
new file mode 100644
index 00000000..1bfc49f1
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0170.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0171.NCLR b/files/itemtool/itemdata/item_icon/narc_0171.NCLR
deleted file mode 100644
index e15a8a7a..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0171.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0172.NCGR b/files/itemtool/itemdata/item_icon/narc_0172.NCGR
deleted file mode 100644
index 15a77735..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0172.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0172.png b/files/itemtool/itemdata/item_icon/narc_0172.png
new file mode 100644
index 00000000..81b648e5
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0172.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0173.NCLR b/files/itemtool/itemdata/item_icon/narc_0173.NCLR
deleted file mode 100644
index b3edb23e..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0173.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0174.NCGR b/files/itemtool/itemdata/item_icon/narc_0174.NCGR
deleted file mode 100644
index 390dd391..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0174.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0174.png b/files/itemtool/itemdata/item_icon/narc_0174.png
new file mode 100644
index 00000000..1766cbcd
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0174.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0175.NCLR b/files/itemtool/itemdata/item_icon/narc_0175.NCLR
deleted file mode 100644
index 9ab0f314..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0175.NCLR
+++ /dev/null
diff --git a/filesystem.mk b/filesystem.mk
index f06a5429..2b74f25f 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1742,7 +1742,17 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0162.NCGR \
         files/itemtool/itemdata/item_icon/narc_0162.NCLR \
         files/itemtool/itemdata/item_icon/narc_0164.NCGR \
-        files/itemtool/itemdata/item_icon/narc_0164.NCLR
+        files/itemtool/itemdata/item_icon/narc_0164.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0166.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0166.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0168.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0168.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0170.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0170.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0172.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0172.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0174.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0174.NCLR
 
 
 files/application/custom_ball/data/cb_data.narc: \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index d20020cd..691a81f4 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -76,6 +76,11 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0160.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0162.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0164.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0166.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0168.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0170.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0172.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0174.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0007.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0008.NCGR \
                                       files/poketool/icongra/poke_icon/narc_0009.NCGR \
@@ -508,6 +513,11 @@ NCGR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0005.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0160.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0162.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0164.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0166.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0168.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0170.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0172.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0174.NCGR \
                    files/poketool/icongra/poke_icon/narc_0007.NCGR \
                    files/poketool/icongra/poke_icon/narc_0008.NCGR \
                    files/poketool/icongra/poke_icon/narc_0009.NCGR \
@@ -792,6 +802,11 @@ NCLR_CLEAN_LIST := files/application/wifi_earth/wifi_earth/narc_0006.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0160.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0162.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0164.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0166.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0168.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0170.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0172.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0174.NCLR \
                    files/poketool/icongra/poke_icon/narc_0000.NCLR \
                    files/poketool/pokegra/pokegra/narc_0010.NCLR \
                    files/poketool/pokegra/pokegra/narc_0011.NCLR \