summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-07-14 08:31:45 +0300
committerGitHub <noreply@github.com>2020-07-14 08:31:45 +0300
commite62dcb7dc070fab232b124510938473cc35a2e78 (patch)
treee559d4ac0279f78b740b443a8c3936138dbfd226 /files
parent6ebca13d4c5a290e239364f90bf137c12f332a13 (diff)
parentd2ff9e5df70f2c6be6a0c822ba2e689f82911911 (diff)
Merge pull request #233 from red031000/master
palette padding changes + OS_timer
Diffstat (limited to 'files')
-rw-r--r--files/itemtool/itemdata/item_icon/.gitignore4
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0115.NCGRbin560 -> 0 bytes
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0115.pngbin0 -> 329 bytes
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0116.NCLRbin552 -> 0 bytes
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0117.NCGRbin560 -> 0 bytes
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0117.pngbin0 -> 294 bytes
-rw-r--r--files/itemtool/itemdata/item_icon/narc_0118.NCLRbin552 -> 0 bytes
7 files changed, 4 insertions, 0 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ