Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work

16 files changed, 10 insertions, 0 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