From 7762fa4d5454be7be0e89b09986f31bbdff79a83 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 17:25:12 +0100
Subject: bit of work on graphics, mostly setup

---
 Makefile                             |  17 +++++++++++++++++
 files/data/.gitignore                |   2 ++
 files/data/cell0.NCGR                | Bin 8240 -> 0 bytes
 files/data/cell0.NCLR                | Bin 552 -> 0 bytes
 files/data/cell0.png                 | Bin 0 -> 572 bytes
 files/graphic/bag_gra/.gitignore     |   6 ++++++
 files/graphic/bag_gra/narc_0002.NCGR | Bin 16432 -> 0 bytes
 files/graphic/bag_gra/narc_0002.png  | Bin 0 -> 2024 bytes
 files/graphic/bag_gra/narc_0003.NCLR | Bin 552 -> 0 bytes
 files/graphic/bag_gra/narc_0003.pal  |  19 +++++++++++++++++++
 files/graphic/bag_gra/narc_0006.NCGR | Bin 304 -> 0 bytes
 files/graphic/bag_gra/narc_0006.png  | Bin 0 -> 188 bytes
 files/graphic/bag_gra/narc_0034.NCGR | Bin 16432 -> 0 bytes
 files/graphic/bag_gra/narc_0034.png  | Bin 0 -> 2048 bytes
 files/graphic/bag_gra/narc_0035.NCLR | Bin 552 -> 0 bytes
 filesystem.mk                        |   7 +++++++
 graphics_rules.mk                    |  17 +++++++++++++++++
 tools/nitrogfx/gfx.c                 |   6 +++---
 tools/nitrogfx/gfx.h                 |   2 +-
 tools/nitrogfx/main.c                |   7 ++++++-
 tools/nitrogfx/options.h             |   1 +
 tools/nitrogfx/util.c                |   7 ++++++-
 tools/nitrogfx/util.h                |   2 +-
 23 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 files/data/.gitignore
 delete mode 100644 files/data/cell0.NCGR
 delete mode 100644 files/data/cell0.NCLR
 create mode 100644 files/data/cell0.png
 create mode 100644 files/graphic/bag_gra/.gitignore
 delete mode 100644 files/graphic/bag_gra/narc_0002.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0002.png
 delete mode 100644 files/graphic/bag_gra/narc_0003.NCLR
 create mode 100644 files/graphic/bag_gra/narc_0003.pal
 delete mode 100644 files/graphic/bag_gra/narc_0006.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0006.png
 delete mode 100644 files/graphic/bag_gra/narc_0034.NCGR
 create mode 100644 files/graphic/bag_gra/narc_0034.png
 delete mode 100644 files/graphic/bag_gra/narc_0035.NCLR
 create mode 100644 graphics_rules.mk

diff --git a/Makefile b/Makefile
index 9b8b430e..2e7fe1a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile to build Pokemon Diamond image
 
 include config.mk
+include graphics_rules.mk
 
 HOSTCC = $(CC)
 HOSTCXX = $(CXX)
@@ -156,6 +157,7 @@ clean: mostlyclean clean-fs
 
 clean-fs:
 	$(RM) $(filter %.narc %.arc,$(HOSTFS_FILES))
+	$(RM) $(NCGR_CLEAN_LIST) $(NCLR_CLEAN_LIST)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec $(RM) {} +
 
 mostlyclean: tidy
@@ -240,6 +242,21 @@ PADDED_LZ_FILES := $(addsuffix .lz,$(wildcard \
 $(PADDED_LZ_FILES): %.lz: %
 	$(NTRCOMP) -l2 -s -A4 -o $@ $<
 
+%.NCGR: %.png
+	$(GFX) $< $@
+
+$(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png
+	$(GFX) $< $@ -clobbersize
+
+$(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
+	$(GFX) $< $@ -clobbersize -version101
+
+%.NCLR: %.png
+	$(GFX) $< $@
+
+%.NCLR: %.pal
+	$(GFX) $< $@
+
 %.png: ;
 %.pal: ;
 
diff --git a/files/data/.gitignore b/files/data/.gitignore
new file mode 100644
index 00000000..e405595a
--- /dev/null
+++ b/files/data/.gitignore
@@ -0,0 +1,2 @@
+cell0.NCGR
+cell0.NCLR
diff --git a/files/data/cell0.NCGR b/files/data/cell0.NCGR
deleted file mode 100644
index 76a112b3..00000000
Binary files a/files/data/cell0.NCGR and /dev/null differ
diff --git a/files/data/cell0.NCLR b/files/data/cell0.NCLR
deleted file mode 100644
index 680c004b..00000000
Binary files a/files/data/cell0.NCLR and /dev/null differ
diff --git a/files/data/cell0.png b/files/data/cell0.png
new file mode 100644
index 00000000..bfd49d69
Binary files /dev/null and b/files/data/cell0.png differ
diff --git a/files/graphic/bag_gra/.gitignore b/files/graphic/bag_gra/.gitignore
new file mode 100644
index 00000000..6fc1835d
--- /dev/null
+++ b/files/graphic/bag_gra/.gitignore
@@ -0,0 +1,6 @@
+narc_0002.NCGR
+narc_0006.NCGR
+narc_0035.NCLR
+narc_0034.NCGR
+narc_0003.NCLR
+narc_0034.NCLR
diff --git a/files/graphic/bag_gra/narc_0002.NCGR b/files/graphic/bag_gra/narc_0002.NCGR
deleted file mode 100644
index a33c847c..00000000
Binary files a/files/graphic/bag_gra/narc_0002.NCGR and /dev/null differ
diff --git a/files/graphic/bag_gra/narc_0002.png b/files/graphic/bag_gra/narc_0002.png
new file mode 100644
index 00000000..9152a7e1
Binary files /dev/null and b/files/graphic/bag_gra/narc_0002.png differ
diff --git a/files/graphic/bag_gra/narc_0003.NCLR b/files/graphic/bag_gra/narc_0003.NCLR
deleted file mode 100644
index 4e6b57e1..00000000
Binary files a/files/graphic/bag_gra/narc_0003.NCLR and /dev/null differ
diff --git a/files/graphic/bag_gra/narc_0003.pal b/files/graphic/bag_gra/narc_0003.pal
new file mode 100644
index 00000000..45483a1e
--- /dev/null
+++ b/files/graphic/bag_gra/narc_0003.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+189 238 205
+238 164 106
+238 115 106
+230 90 90
+197 82 65
+156 57 57
+180 65 65
+82 82 82
+255 255 255
+115 115 115
+164 131 57
+238 213 106
+230 180 90
+197 164 65
+139 115 57
+115 90 49
diff --git a/files/graphic/bag_gra/narc_0006.NCGR b/files/graphic/bag_gra/narc_0006.NCGR
deleted file mode 100644
index 3517cd01..00000000
Binary files a/files/graphic/bag_gra/narc_0006.NCGR and /dev/null differ
diff --git a/files/graphic/bag_gra/narc_0006.png b/files/graphic/bag_gra/narc_0006.png
new file mode 100644
index 00000000..a9982600
Binary files /dev/null and b/files/graphic/bag_gra/narc_0006.png differ
diff --git a/files/graphic/bag_gra/narc_0034.NCGR b/files/graphic/bag_gra/narc_0034.NCGR
deleted file mode 100644
index 55f4282b..00000000
Binary files a/files/graphic/bag_gra/narc_0034.NCGR and /dev/null differ
diff --git a/files/graphic/bag_gra/narc_0034.png b/files/graphic/bag_gra/narc_0034.png
new file mode 100644
index 00000000..ba296b4c
Binary files /dev/null and b/files/graphic/bag_gra/narc_0034.png differ
diff --git a/files/graphic/bag_gra/narc_0035.NCLR b/files/graphic/bag_gra/narc_0035.NCLR
deleted file mode 100644
index 4e6b57e1..00000000
Binary files a/files/graphic/bag_gra/narc_0035.NCLR and /dev/null differ
diff --git a/filesystem.mk b/filesystem.mk
index 180845ac..013d64a9 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -794,6 +794,13 @@ files/wazaeffect/effectclact/wecellanm.narc: \
         files/wazaeffect/effectclact/wecellanm/narc_0013.NANR.lz \
         files/wazaeffect/effectclact/wecellanm/narc_0007.NANR.lz
 
+files/graphic/bag_gra.narc: \
+        files/graphic/bag_gra/narc_0002.NCGR \
+        files/graphic/bag_gra/narc_0003.NCLR \
+        files/graphic/bag_gra/narc_0006.NCGR \
+        files/graphic/bag_gra/narc_0034.NCGR \
+        files/graphic/bag_gra/narc_0034.NCLR
+
 files/graphic/box.narc: \
         files/graphic/box/narc_0022.NANR.lz \
         files/graphic/box/narc_0036.NSCR.lz \
diff --git a/graphics_rules.mk b/graphics_rules.mk
new file mode 100644
index 00000000..0ad43bf2
--- /dev/null
+++ b/graphics_rules.mk
@@ -0,0 +1,17 @@
+#todo data/dp_areawindow.NCGR (weirdness with size)
+#todo data/graphic/bag_gra/narc_0007.NCGR (SOPC section) (width 32, palette narc_0003.NCLR)
+
+CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
+
+CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
+                                      files/graphic/bag_gra/narc_0006.NCGR \
+                                      files/graphic/bag_gra/narc_0034.NCGR
+
+NCGR_CLEAN_LIST := files/data/cell0.NCGR \
+                   files/graphic/bag_gra/narc_0002.NCGR \
+                   files/graphic/bag_gra/narc_0006.NCGR \
+                   files/graphic/bag_gra/narc_0034.NCGR
+
+NCLR_CLEAN_LIST := files/data/cell0.NCLR \
+                   files/graphic/bag_gra/narc_0003.NCLR \
+                   files/graphic/bag_gra/narc_0034.NCLR
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 3315e00e..a80d341b 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -359,7 +359,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 	free(buffer);
 }
 
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder)
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101)
 {
     FILE *fp = fopen(path, "wb");
 
@@ -407,7 +407,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
             break;
     }
 
-    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder);
+    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder, version101);
 
     unsigned char charHeader[0x20] = { 0x52, 0x41, 0x48, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 };
@@ -545,7 +545,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
     uint32_t extSize = size + (ncpr ? 0x10 : 0x18);
 
     //NCLR header
-    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr);
+    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr, false);
 
     unsigned char palHeader[0x18] =
             {
diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h
index da56c5c5..1b097336 100644
--- a/tools/nitrogfx/gfx.h
+++ b/tools/nitrogfx/gfx.h
@@ -31,7 +31,7 @@ struct Image {
 void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void ReadNtrImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder);
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101);
 void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
 void ReadNtrPalette(char *path, struct Palette *palette);
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index 2f5b2735..076e7076 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions *
 
     ReadPng(inputPath, &image);
 
-    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder);
+    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101);
 
     FreeImage(&image);
 }
@@ -320,6 +320,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
     options.metatileHeight = 1;
     options.clobberSize = false;
     options.byteOrder = true;
+    options.version101 = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -385,6 +386,10 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
         {
             options.byteOrder = false;
         }
+        else if (strcmp(option, "-version101") == 0)
+        {
+            options.version101 = true;
+        }
         else
         {
             FATAL_ERROR("Unrecognized option \"%s\".\n", option);
diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h
index 8376348f..77006f21 100644
--- a/tools/nitrogfx/options.h
+++ b/tools/nitrogfx/options.h
@@ -28,6 +28,7 @@ struct PngToNtrOptions {
     int metatileHeight;
     bool clobberSize;
     bool byteOrder;
+    bool version101;
 };
 
 
diff --git a/tools/nitrogfx/util.c b/tools/nitrogfx/util.c
index 73a128a1..304a2319 100644
--- a/tools/nitrogfx/util.c
+++ b/tools/nitrogfx/util.c
@@ -124,13 +124,18 @@ void WriteWholeFile(char *path, void *buffer, int bufferSize)
 	fclose(fp);
 }
 
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder)
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101)
 {
     unsigned char header[0x10] =
             { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00 };
     //magic number
     memcpy(header, magicNumber, 4);
 
+    if (version101)
+    {
+        header[6] = 0x01;
+    }
+
     //byte order
     if (!byteorder)
     {
diff --git a/tools/nitrogfx/util.h b/tools/nitrogfx/util.h
index f181b66e..bb1cd4ad 100644
--- a/tools/nitrogfx/util.h
+++ b/tools/nitrogfx/util.h
@@ -11,6 +11,6 @@ char *GetFileExtension(char *path);
 unsigned char *ReadWholeFile(char *path, int *size);
 unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount);
 void WriteWholeFile(char *path, void *buffer, int bufferSize);
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder);
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101);
 
 #endif // UTIL_H
-- 
cgit v1.2.3


From 3994b2c88741770583954887980cac03c2ca35f4 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 17:35:54 +0100
Subject: crlf for palettes

---
 files/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/.gitattributes b/files/.gitattributes
index d827ef67..cc0c2f17 100644
--- a/files/.gitattributes
+++ b/files/.gitattributes
@@ -2,3 +2,4 @@
 *.txt eol=crlf
 .knarcignore eol=lf
 .knarckeep eol=lf
+*.pal eol=crlf
-- 
cgit v1.2.3


From 0cd5229fae82168f986eff59ad5af1b7a507091e Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 20:20:47 +0100
Subject: extract ball item sprites

---
 files/itemtool/itemdata/item_icon/.gitignore     |  22 +++++++++++++
 files/itemtool/itemdata/item_icon/narc_0002.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0002.png  | Bin 0 -> 297 bytes
 files/itemtool/itemdata/item_icon/narc_0003.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0004.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0004.png  | Bin 0 -> 286 bytes
 files/itemtool/itemdata/item_icon/narc_0005.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0006.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0006.png  | Bin 0 -> 295 bytes
 files/itemtool/itemdata/item_icon/narc_0007.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0008.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0008.png  | Bin 0 -> 265 bytes
 files/itemtool/itemdata/item_icon/narc_0009.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0010.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0010.png  | Bin 0 -> 300 bytes
 files/itemtool/itemdata/item_icon/narc_0011.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0012.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0012.png  | Bin 0 -> 299 bytes
 files/itemtool/itemdata/item_icon/narc_0013.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0014.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0014.png  | Bin 0 -> 297 bytes
 files/itemtool/itemdata/item_icon/narc_0015.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0016.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0016.png  | Bin 0 -> 291 bytes
 files/itemtool/itemdata/item_icon/narc_0017.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0018.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0018.png  | Bin 0 -> 292 bytes
 files/itemtool/itemdata/item_icon/narc_0019.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0020.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0020.png  | Bin 0 -> 294 bytes
 files/itemtool/itemdata/item_icon/narc_0021.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0021.png  | Bin 0 -> 281 bytes
 files/itemtool/itemdata/item_icon/narc_0022.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0022.pal  |  19 +++++++++++
 files/itemtool/itemdata/item_icon/narc_0023.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0023.png  | Bin 0 -> 258 bytes
 filesystem.mk                                    |  24 ++++++++++++++
 graphics_rules.mk                                |  40 +++++++++++++++++++++--
 38 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 files/itemtool/itemdata/item_icon/.gitignore
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0002.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0002.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0003.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0004.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0004.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0005.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0006.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0006.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0007.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0008.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0008.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0009.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0010.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0010.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0011.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0012.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0012.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0013.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0014.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0014.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0015.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0016.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0016.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0017.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0018.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0018.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0019.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0020.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0020.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0021.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0021.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0022.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0022.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0023.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0023.png

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
new file mode 100644
index 00000000..2e778c6c
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -0,0 +1,22 @@
+narc_0002.NCGR
+narc_0002.NCLR
+narc_0004.NCGR
+narc_0004.NCLR
+narc_0006.NCGR
+narc_0006.NCLR
+narc_0008.NCGR
+narc_0008.NCLR
+narc_0010.NCGR
+narc_0010.NCLR
+narc_0012.NCGR
+narc_0012.NCLR
+narc_0014.NCGR
+narc_0014.NCLR
+narc_0016.NCGR
+narc_0016.NCLR
+narc_0018.NCGR
+narc_0018.NCLR
+narc_0020.NCGR
+narc_0021.NCGR
+narc_0022.NCLR
+narc_0023.NCGR
diff --git a/files/itemtool/itemdata/item_icon/narc_0002.NCGR b/files/itemtool/itemdata/item_icon/narc_0002.NCGR
deleted file mode 100644
index 045a5e06..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0002.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0002.png b/files/itemtool/itemdata/item_icon/narc_0002.png
new file mode 100644
index 00000000..bc9abe05
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0002.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0003.NCLR b/files/itemtool/itemdata/item_icon/narc_0003.NCLR
deleted file mode 100644
index 701517a8..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0003.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0004.NCGR b/files/itemtool/itemdata/item_icon/narc_0004.NCGR
deleted file mode 100644
index 19b1164c..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0004.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0004.png b/files/itemtool/itemdata/item_icon/narc_0004.png
new file mode 100644
index 00000000..2bebe147
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0004.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0005.NCLR b/files/itemtool/itemdata/item_icon/narc_0005.NCLR
deleted file mode 100644
index bca61e37..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0005.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0006.NCGR b/files/itemtool/itemdata/item_icon/narc_0006.NCGR
deleted file mode 100644
index 2e2983c0..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0006.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0006.png b/files/itemtool/itemdata/item_icon/narc_0006.png
new file mode 100644
index 00000000..723b699a
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0006.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0007.NCLR b/files/itemtool/itemdata/item_icon/narc_0007.NCLR
deleted file mode 100644
index 91f0132a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0007.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0008.NCGR b/files/itemtool/itemdata/item_icon/narc_0008.NCGR
deleted file mode 100644
index 72d857a6..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0008.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0008.png b/files/itemtool/itemdata/item_icon/narc_0008.png
new file mode 100644
index 00000000..fb5e215e
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0008.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0009.NCLR b/files/itemtool/itemdata/item_icon/narc_0009.NCLR
deleted file mode 100644
index f728f1ae..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0009.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0010.NCGR b/files/itemtool/itemdata/item_icon/narc_0010.NCGR
deleted file mode 100644
index 56d27763..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0010.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0010.png b/files/itemtool/itemdata/item_icon/narc_0010.png
new file mode 100644
index 00000000..38784263
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0010.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0011.NCLR b/files/itemtool/itemdata/item_icon/narc_0011.NCLR
deleted file mode 100644
index 89c4675c..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0011.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0012.NCGR b/files/itemtool/itemdata/item_icon/narc_0012.NCGR
deleted file mode 100644
index 0095fa60..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0012.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0012.png b/files/itemtool/itemdata/item_icon/narc_0012.png
new file mode 100644
index 00000000..da0cf777
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0012.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0013.NCLR b/files/itemtool/itemdata/item_icon/narc_0013.NCLR
deleted file mode 100644
index 3563296b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0013.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0014.NCGR b/files/itemtool/itemdata/item_icon/narc_0014.NCGR
deleted file mode 100644
index b31b518f..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0014.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0014.png b/files/itemtool/itemdata/item_icon/narc_0014.png
new file mode 100644
index 00000000..71a630d4
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0014.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0015.NCLR b/files/itemtool/itemdata/item_icon/narc_0015.NCLR
deleted file mode 100644
index 9ba135dd..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0015.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0016.NCGR b/files/itemtool/itemdata/item_icon/narc_0016.NCGR
deleted file mode 100644
index 5d75c234..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0016.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0016.png b/files/itemtool/itemdata/item_icon/narc_0016.png
new file mode 100644
index 00000000..9f2ccb9d
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0016.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0017.NCLR b/files/itemtool/itemdata/item_icon/narc_0017.NCLR
deleted file mode 100644
index 74070d69..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0017.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0018.NCGR b/files/itemtool/itemdata/item_icon/narc_0018.NCGR
deleted file mode 100644
index d580d3e4..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0018.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0018.png b/files/itemtool/itemdata/item_icon/narc_0018.png
new file mode 100644
index 00000000..17e02bc4
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0018.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0019.NCLR b/files/itemtool/itemdata/item_icon/narc_0019.NCLR
deleted file mode 100644
index 3cc3439e..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0019.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0020.NCGR b/files/itemtool/itemdata/item_icon/narc_0020.NCGR
deleted file mode 100644
index ddd27891..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0020.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0020.png b/files/itemtool/itemdata/item_icon/narc_0020.png
new file mode 100644
index 00000000..a046a23a
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0020.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0021.NCGR b/files/itemtool/itemdata/item_icon/narc_0021.NCGR
deleted file mode 100644
index 9d93568a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0021.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0021.png b/files/itemtool/itemdata/item_icon/narc_0021.png
new file mode 100644
index 00000000..ea3fed09
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0021.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0022.NCLR b/files/itemtool/itemdata/item_icon/narc_0022.NCLR
deleted file mode 100644
index 6af27f80..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0022.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0022.pal b/files/itemtool/itemdata/item_icon/narc_0022.pal
new file mode 100644
index 00000000..696a4b38
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0022.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+74 82 82
+123 123 131
+164 164 197
+222 205 246
+255 255 255
+156 74 57
+180 82 57
+222 90 57
+255 148 57
+255 213 57
+230 180 106
+255 255 148
+213 156 49
+255 238 82
diff --git a/files/itemtool/itemdata/item_icon/narc_0023.NCGR b/files/itemtool/itemdata/item_icon/narc_0023.NCGR
deleted file mode 100644
index c63b44d6..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0023.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0023.png b/files/itemtool/itemdata/item_icon/narc_0023.png
new file mode 100644
index 00000000..66913f94
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0023.png differ
diff --git a/filesystem.mk b/filesystem.mk
index 013d64a9..73f16cb0 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1559,6 +1559,30 @@ files/poketool/pokefoot/pokefoot.narc: \
         files/poketool/pokefoot/pokefoot/narc_0371.NCGR.lz \
         files/poketool/pokefoot/pokefoot/narc_0359.NCGR.lz
 
+files/itemtool/itemdata/item_icon.narc: \
+        files/itemtool/itemdata/item_icon/narc_0002.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0002.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0004.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0004.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0006.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0006.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0008.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0008.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0010.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0010.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0012.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0012.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0014.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0014.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0016.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0016.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0018.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0018.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0020.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0021.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0022.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0023.NCGR
+
 files/application/custom_ball/data/cb_data.narc: \
         files/application/custom_ball/data/cb_data/narc_0195.NCGR.lz \
         files/application/custom_ball/data/cb_data/narc_0181.NCER.lz \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index 0ad43bf2..0005814a 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -5,13 +5,47 @@ CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
 
 CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/graphic/bag_gra/narc_0006.NCGR \
-                                      files/graphic/bag_gra/narc_0034.NCGR
+                                      files/graphic/bag_gra/narc_0034.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0002.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0004.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0006.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0008.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0010.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0012.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0014.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0016.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0018.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0020.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0021.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0023.NCGR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
                    files/graphic/bag_gra/narc_0006.NCGR \
-                   files/graphic/bag_gra/narc_0034.NCGR
+                   files/graphic/bag_gra/narc_0034.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0002.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0004.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0006.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0008.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0010.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0012.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0014.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0016.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0018.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0020.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0021.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0023.NCGR
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
-                   files/graphic/bag_gra/narc_0034.NCLR
+                   files/graphic/bag_gra/narc_0034.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0002.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0004.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0006.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0008.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0010.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0012.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0014.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0016.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0018.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0022.NCLR
-- 
cgit v1.2.3


From 6b746c4bff86737b9ca6a3a14dcb543a1216d194 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 21:57:37 +0100
Subject: IR handling for palettes, potion and antidote/brn heal/frz heal

---
 Makefile                                         |   3 +++
 files/itemtool/itemdata/item_icon/.gitignore     |   6 ++++++
 files/itemtool/itemdata/item_icon/narc_0024.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0024.png  | Bin 0 -> 295 bytes
 files/itemtool/itemdata/item_icon/narc_0025.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0026.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0026.png  | Bin 0 -> 260 bytes
 files/itemtool/itemdata/item_icon/narc_0027.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0027.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0028.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0028.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0029.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0029.pal  |  19 +++++++++++++++++++
 filesystem.mk                                    |   8 +++++++-
 graphics_rules.mk                                |  17 ++++++++++++++---
 tools/nitrogfx/gfx.c                             |   8 +++++++-
 tools/nitrogfx/gfx.h                             |   2 +-
 tools/nitrogfx/main.c                            |  14 ++++++++++++--
 18 files changed, 107 insertions(+), 8 deletions(-)
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0024.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0024.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0025.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0026.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0026.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0027.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0027.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0028.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0028.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0029.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0029.pal

diff --git a/Makefile b/Makefile
index 2e7fe1a7..48ac1ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -257,6 +257,9 @@ $(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
 %.NCLR: %.pal
 	$(GFX) $< $@
 
+$(IR_NCLR_FILES): %.NCLR: %.pal
+	$(GFX) $< $@ -ir
+
 %.png: ;
 %.pal: ;
 
diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 2e778c6c..6387f2e3 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -20,3 +20,9 @@ narc_0020.NCGR
 narc_0021.NCGR
 narc_0022.NCLR
 narc_0023.NCGR
+narc_0024.NCGR
+narc_0024.NCLR
+narc_0026.NCGR
+narc_0027.NCLR
+narc_0028.NCLR
+narc_0029.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0024.NCGR b/files/itemtool/itemdata/item_icon/narc_0024.NCGR
deleted file mode 100644
index df0ab48b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0024.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0024.png b/files/itemtool/itemdata/item_icon/narc_0024.png
new file mode 100644
index 00000000..5abf90de
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0024.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0025.NCLR b/files/itemtool/itemdata/item_icon/narc_0025.NCLR
deleted file mode 100644
index 04294c8a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0025.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0026.NCGR b/files/itemtool/itemdata/item_icon/narc_0026.NCGR
deleted file mode 100644
index 74b77380..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0026.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0026.png b/files/itemtool/itemdata/item_icon/narc_0026.png
new file mode 100644
index 00000000..b8541bf2
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0026.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0027.NCLR b/files/itemtool/itemdata/item_icon/narc_0027.NCLR
deleted file mode 100644
index 56911461..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0027.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0027.pal b/files/itemtool/itemdata/item_icon/narc_0027.pal
new file mode 100644
index 00000000..fc656170
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0027.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 238 98
+255 180 41
+255 213 74
+246 197 57
+255 255 180
+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_0028.NCLR b/files/itemtool/itemdata/item_icon/narc_0028.NCLR
deleted file mode 100644
index 3b2de0f8..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0028.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0028.pal b/files/itemtool/itemdata/item_icon/narc_0028.pal
new file mode 100644
index 00000000..9ca16738
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0028.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+205 205 205
+156 156 156
+139 246 139
+82 189 82
+115 222 115
+106 213 106
+222 255 222
+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_0029.NCLR b/files/itemtool/itemdata/item_icon/narc_0029.NCLR
deleted file mode 100644
index 7d9c6c89..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0029.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0029.pal b/files/itemtool/itemdata/item_icon/narc_0029.pal
new file mode 100644
index 00000000..49a1b20b
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0029.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 189 180
+246 106 106
+246 164 164
+246 139 139
+255 222 222
+90 90 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/filesystem.mk b/filesystem.mk
index 73f16cb0..80e44372 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1581,7 +1581,13 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0020.NCGR \
         files/itemtool/itemdata/item_icon/narc_0021.NCGR \
         files/itemtool/itemdata/item_icon/narc_0022.NCLR \
-        files/itemtool/itemdata/item_icon/narc_0023.NCGR
+        files/itemtool/itemdata/item_icon/narc_0023.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0024.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0024.NCLR \
+        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/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 0005814a..34c6544d 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -17,7 +17,12 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0018.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0020.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0021.NCGR \
-                                      files/itemtool/itemdata/item_icon/narc_0023.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
+
+IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0029.NCLR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
@@ -34,7 +39,9 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0018.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0020.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0021.NCGR \
-                   files/itemtool/itemdata/item_icon/narc_0023.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
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
@@ -48,4 +55,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0014.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0016.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0018.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0022.NCLR
+                   files/itemtool/itemdata/item_icon/narc_0022.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
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index a80d341b..0acb4133 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -534,7 +534,7 @@ void WriteGbaPalette(char *path, struct Palette *palette)
 	fclose(fp);
 }
 
-void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
+void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir)
 {
     FILE *fp = fopen(path, "wb");
 
@@ -594,6 +594,12 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
         }
     }
 
+    if (ir)
+    {
+        colours[510] = 'I';
+        colours[511] = 'R';
+    }
+
     fwrite(colours, 1, 256 * 2, fp);
 
     fclose(fp);
diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h
index 1b097336..ef7926d1 100644
--- a/tools/nitrogfx/gfx.h
+++ b/tools/nitrogfx/gfx.h
@@ -36,6 +36,6 @@ void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
 void ReadNtrPalette(char *path, struct Palette *palette);
 void WriteGbaPalette(char *path, struct Palette *palette);
-void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr);
+void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir);
 
 #endif // GFX_H
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index 076e7076..b922e4b2 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -411,6 +411,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c
 {
     struct Palette palette;
     bool ncpr = false;
+    bool ir = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -420,6 +421,10 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c
         {
             ncpr = true;
         }
+        else if (strcmp(option, "-ir") == 0)
+        {
+            ir = true;
+        }
         else
         {
             FATAL_ERROR("Unrecognized option \"%s\".\n", option);
@@ -427,7 +432,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c
     }
 
     ReadPngPalette(inputPath, &palette);
-    WriteNtrPalette(outputPath, &palette, ncpr);
+    WriteNtrPalette(outputPath, &palette, ncpr, ir);
 }
 
 void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
@@ -487,6 +492,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc,
 {
     int numColors = 0;
     bool ncpr = false;
+    bool ir = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -509,6 +515,10 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc,
         {
             ncpr = true;
         }
+        else if (strcmp(option, "-ir") == 0)
+        {
+            ir = true;
+        }
         else
         {
             FATAL_ERROR("Unrecognized option \"%s\".\n", option);
@@ -522,7 +532,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc,
     if (numColors != 0)
         palette.numColors = numColors;
 
-    WriteNtrPalette(outputPath, &palette, ncpr);
+    WriteNtrPalette(outputPath, &palette, ncpr, ir);
 }
 
 void HandleLatinFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED)
-- 
cgit v1.2.3


From d1a79ff239f939fe41b14f2e4220a0a722aa9d24 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 10 Jul 2020 23:03:08 +0100
Subject: 30 to 35

---
 files/itemtool/itemdata/item_icon/.gitignore     |   6 ++++++
 files/itemtool/itemdata/item_icon/narc_0030.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0030.png  | Bin 0 -> 260 bytes
 files/itemtool/itemdata/item_icon/narc_0031.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0031.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0032.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0032.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0033.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0033.png  | Bin 0 -> 309 bytes
 files/itemtool/itemdata/item_icon/narc_0034.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0034.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0035.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0035.pal  |  19 +++++++++++++++++++
 filesystem.mk                                    |   8 +++++++-
 graphics_rules.mk                                |  18 ++++++++++++++----
 15 files changed, 103 insertions(+), 5 deletions(-)
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0030.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0030.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0031.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0031.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0032.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0032.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0033.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0033.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0034.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0034.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0035.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0035.pal

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
Binary files a/files/itemtool/itemdata/item_icon/narc_0030.NCGR and /dev/null differ
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
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0030.png differ
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
Binary files a/files/itemtool/itemdata/item_icon/narc_0031.NCLR and /dev/null differ
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
Binary files a/files/itemtool/itemdata/item_icon/narc_0032.NCLR and /dev/null differ
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
Binary files a/files/itemtool/itemdata/item_icon/narc_0033.NCGR and /dev/null differ
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
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0033.png differ
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
Binary files a/files/itemtool/itemdata/item_icon/narc_0034.NCLR and /dev/null differ
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
Binary files a/files/itemtool/itemdata/item_icon/narc_0035.NCLR and /dev/null differ
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
-- 
cgit v1.2.3


From 663653782d087c1478fe51b25b7869ac7d92ce2c Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sat, 11 Jul 2020 00:00:49 +0100
Subject: 36 to 39

---
 files/itemtool/itemdata/item_icon/.gitignore     |   4 ++++
 files/itemtool/itemdata/item_icon/narc_0036.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0036.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0037.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0037.pal  |  19 +++++++++++++++++++
 files/itemtool/itemdata/item_icon/narc_0038.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0038.png  | Bin 0 -> 259 bytes
 files/itemtool/itemdata/item_icon/narc_0039.NCLR | Bin 552 -> 0 bytes
 filesystem.mk                                    |   6 +++++-
 graphics_rules.mk                                |  15 +++++++++++----
 10 files changed, 58 insertions(+), 5 deletions(-)
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0036.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0036.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0037.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0037.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0038.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0038.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0039.NCLR

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index c0fb024d..8b5fb50d 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -32,3 +32,7 @@ narc_0032.NCLR
 narc_0033.NCGR
 narc_0034.NCLR
 narc_0035.NCLR
+narc_0036.NCLR
+narc_0037.NCLR
+narc_0038.NCGR
+narc_0038.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0036.NCLR b/files/itemtool/itemdata/item_icon/narc_0036.NCLR
deleted file mode 100644
index 0183b36b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0036.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0036.pal b/files/itemtool/itemdata/item_icon/narc_0036.pal
new file mode 100644
index 00000000..fda69e0b
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0036.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 131 205
+197 222 238
+255 255 255
+164 189 205
+255 98 172
+131 156 172
+230 255 255
+255 197 255
+82 106 123
+197 57 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0037.NCLR b/files/itemtool/itemdata/item_icon/narc_0037.NCLR
deleted file mode 100644
index 660d239d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0037.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0037.pal b/files/itemtool/itemdata/item_icon/narc_0037.pal
new file mode 100644
index 00000000..76e58020
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0037.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+222 131 131
+255 222 131
+255 255 238
+230 189 106
+197 98 90
+180 139 65
+255 246 180
+255 172 148
+148 106 49
+148 82 74
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0038.NCGR b/files/itemtool/itemdata/item_icon/narc_0038.NCGR
deleted file mode 100644
index 99816ceb..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0038.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0038.png b/files/itemtool/itemdata/item_icon/narc_0038.png
new file mode 100644
index 00000000..076c4fd5
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0038.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0039.NCLR b/files/itemtool/itemdata/item_icon/narc_0039.NCLR
deleted file mode 100644
index 5abc1d68..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0039.NCLR and /dev/null differ
diff --git a/filesystem.mk b/filesystem.mk
index 21d86ba1..65cec2c1 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1593,7 +1593,11 @@ files/itemtool/itemdata/item_icon.narc: \
         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/itemtool/itemdata/item_icon/narc_0035.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0036.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0037.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0038.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0038.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 c2318733..070ea220 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -21,12 +21,15 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0024.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
+                                      files/itemtool/itemdata/item_icon/narc_0033.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0038.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_0032.NCLR \
-                 files/itemtool/itemdata/item_icon/narc_0035.NCLR
+                 files/itemtool/itemdata/item_icon/narc_0035.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0036.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0037.NCLR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
@@ -47,7 +50,8 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0024.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
+                   files/itemtool/itemdata/item_icon/narc_0033.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0038.NCGR
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
@@ -69,4 +73,7 @@ NCLR_CLEAN_LIST := files/data/cell0.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
+                   files/itemtool/itemdata/item_icon/narc_0035.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0036.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0037.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0038.NCLR
-- 
cgit v1.2.3


From 30203ef93c3a5e536f37535e30dc60c07fc49b7c Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sat, 11 Jul 2020 00:32:55 +0100
Subject: to 55

---
 files/itemtool/itemdata/item_icon/.gitignore     |  18 +++++++++++-
 files/itemtool/itemdata/item_icon/narc_0025.pal  |  19 ++++++++++++
 files/itemtool/itemdata/item_icon/narc_0040.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0040.png  | Bin 0 -> 199 bytes
 files/itemtool/itemdata/item_icon/narc_0041.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0041.png  | Bin 0 -> 275 bytes
 files/itemtool/itemdata/item_icon/narc_0042.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0042.pal  |  19 ++++++++++++
 files/itemtool/itemdata/item_icon/narc_0043.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0043.png  | Bin 0 -> 272 bytes
 files/itemtool/itemdata/item_icon/narc_0044.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0045.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0045.png  | Bin 0 -> 273 bytes
 files/itemtool/itemdata/item_icon/narc_0046.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0047.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0047.png  | Bin 0 -> 289 bytes
 files/itemtool/itemdata/item_icon/narc_0048.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0049.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0049.png  | Bin 0 -> 262 bytes
 files/itemtool/itemdata/item_icon/narc_0050.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0051.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0051.png  | Bin 0 -> 232 bytes
 files/itemtool/itemdata/item_icon/narc_0052.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0052.pal  |  19 ++++++++++++
 files/itemtool/itemdata/item_icon/narc_0053.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0053.png  | Bin 0 -> 287 bytes
 files/itemtool/itemdata/item_icon/narc_0054.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0055.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0055.pal  |  19 ++++++++++++
 filesystem.mk                                    |  21 ++++++++++++--
 graphics_rules.mk                                |  35 +++++++++++++++++++----
 31 files changed, 142 insertions(+), 8 deletions(-)
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0025.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0040.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0040.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0041.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0041.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0042.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0042.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0043.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0043.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0044.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0045.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0045.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0046.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0047.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0047.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0048.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0049.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0049.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0050.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0051.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0051.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0052.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0052.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0053.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0053.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0054.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0055.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0055.pal

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 8b5fb50d..3e3460e6 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -21,7 +21,7 @@ narc_0021.NCGR
 narc_0022.NCLR
 narc_0023.NCGR
 narc_0024.NCGR
-narc_0024.NCLR
+narc_0025.NCLR
 narc_0026.NCGR
 narc_0027.NCLR
 narc_0028.NCLR
@@ -36,3 +36,19 @@ narc_0036.NCLR
 narc_0037.NCLR
 narc_0038.NCGR
 narc_0038.NCLR
+narc_0040.NCGR
+narc_0041.NCGR
+narc_0042.NCLR
+narc_0043.NCGR
+narc_0043.NCLR
+narc_0045.NCGR
+narc_0045.NCLR
+narc_0047.NCGR
+narc_0047.NCLR
+narc_0049.NCGR
+narc_0049.NCLR
+narc_0051.NCGR
+narc_0052.NCLR
+narc_0053.NCGR
+narc_0053.NCLR
+narc_0055.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0025.pal b/files/itemtool/itemdata/item_icon/narc_0025.pal
new file mode 100644
index 00000000..d1c83395
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0025.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+164 131 205
+197 238 222
+255 255 255
+164 205 189
+131 98 172
+131 172 156
+230 255 255
+230 197 255
+82 123 106
+90 57 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0040.NCGR b/files/itemtool/itemdata/item_icon/narc_0040.NCGR
deleted file mode 100644
index 0bf54763..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0040.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0040.png b/files/itemtool/itemdata/item_icon/narc_0040.png
new file mode 100644
index 00000000..2b5a5086
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0040.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0041.NCGR b/files/itemtool/itemdata/item_icon/narc_0041.NCGR
deleted file mode 100644
index 4dfa8709..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0041.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0041.png b/files/itemtool/itemdata/item_icon/narc_0041.png
new file mode 100644
index 00000000..987ca1be
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0041.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0042.NCLR b/files/itemtool/itemdata/item_icon/narc_0042.NCLR
deleted file mode 100644
index b5d81020..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0042.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0042.pal b/files/itemtool/itemdata/item_icon/narc_0042.pal
new file mode 100644
index 00000000..ec9f0478
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0042.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 246 197
+230 230 123
+164 164 57
+255 255 255
+74 74 0
+222 238 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0043.NCGR b/files/itemtool/itemdata/item_icon/narc_0043.NCGR
deleted file mode 100644
index 29df88c9..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0043.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0043.png b/files/itemtool/itemdata/item_icon/narc_0043.png
new file mode 100644
index 00000000..a9b7aae9
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0043.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0044.NCLR b/files/itemtool/itemdata/item_icon/narc_0044.NCLR
deleted file mode 100644
index 3d36b70a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0044.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0045.NCGR b/files/itemtool/itemdata/item_icon/narc_0045.NCGR
deleted file mode 100644
index ed50716d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0045.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0045.png b/files/itemtool/itemdata/item_icon/narc_0045.png
new file mode 100644
index 00000000..08dd22f2
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0045.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0046.NCLR b/files/itemtool/itemdata/item_icon/narc_0046.NCLR
deleted file mode 100644
index fe281d12..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0046.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0047.NCGR b/files/itemtool/itemdata/item_icon/narc_0047.NCGR
deleted file mode 100644
index 71a3ee83..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0047.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0047.png b/files/itemtool/itemdata/item_icon/narc_0047.png
new file mode 100644
index 00000000..e77fb5ea
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0047.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0048.NCLR b/files/itemtool/itemdata/item_icon/narc_0048.NCLR
deleted file mode 100644
index 54c0443a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0048.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0049.NCGR b/files/itemtool/itemdata/item_icon/narc_0049.NCGR
deleted file mode 100644
index 96797161..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0049.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0049.png b/files/itemtool/itemdata/item_icon/narc_0049.png
new file mode 100644
index 00000000..ce892f9d
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0049.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0050.NCLR b/files/itemtool/itemdata/item_icon/narc_0050.NCLR
deleted file mode 100644
index 4cd9db27..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0050.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0051.NCGR b/files/itemtool/itemdata/item_icon/narc_0051.NCGR
deleted file mode 100644
index 8487d213..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0051.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0051.png b/files/itemtool/itemdata/item_icon/narc_0051.png
new file mode 100644
index 00000000..65c39cf7
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0051.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0052.NCLR b/files/itemtool/itemdata/item_icon/narc_0052.NCLR
deleted file mode 100644
index e9cfec47..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0052.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0052.pal b/files/itemtool/itemdata/item_icon/narc_0052.pal
new file mode 100644
index 00000000..e4a26470
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0052.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 246
+238 164 164
+148 148 82
+197 115 115
+222 222 156
+238 238 189
+115 65 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0053.NCGR b/files/itemtool/itemdata/item_icon/narc_0053.NCGR
deleted file mode 100644
index d5b4a18a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0053.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0053.png b/files/itemtool/itemdata/item_icon/narc_0053.png
new file mode 100644
index 00000000..a081274c
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0053.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0054.NCLR b/files/itemtool/itemdata/item_icon/narc_0054.NCLR
deleted file mode 100644
index df463ef7..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0054.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0055.NCLR b/files/itemtool/itemdata/item_icon/narc_0055.NCLR
deleted file mode 100644
index e1684620..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0055.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0055.pal b/files/itemtool/itemdata/item_icon/narc_0055.pal
new file mode 100644
index 00000000..dfe2d317
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0055.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+205 230 205
+238 238 98
+57 123 57
+197 197 98
+90 172 90
+139 205 139
+115 115 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/filesystem.mk b/filesystem.mk
index 65cec2c1..7cc32168 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1583,7 +1583,7 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0022.NCLR \
         files/itemtool/itemdata/item_icon/narc_0023.NCGR \
         files/itemtool/itemdata/item_icon/narc_0024.NCGR \
-        files/itemtool/itemdata/item_icon/narc_0024.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0025.NCLR \
         files/itemtool/itemdata/item_icon/narc_0026.NCGR \
         files/itemtool/itemdata/item_icon/narc_0027.NCLR \
         files/itemtool/itemdata/item_icon/narc_0028.NCLR \
@@ -1597,7 +1597,24 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0036.NCLR \
         files/itemtool/itemdata/item_icon/narc_0037.NCLR \
         files/itemtool/itemdata/item_icon/narc_0038.NCGR \
-        files/itemtool/itemdata/item_icon/narc_0038.NCLR
+        files/itemtool/itemdata/item_icon/narc_0038.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0040.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0041.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0042.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0043.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0043.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0045.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0045.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0047.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0047.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0049.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0049.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0051.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0052.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0053.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0053.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0055.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 070ea220..d46aa743 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -22,14 +22,23 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.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 \
-                                      files/itemtool/itemdata/item_icon/narc_0038.NCGR
+                                      files/itemtool/itemdata/item_icon/narc_0038.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0040.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0041.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0043.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0045.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0047.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0049.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0051.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0053.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_0032.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0035.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0036.NCLR \
-                 files/itemtool/itemdata/item_icon/narc_0037.NCLR
+                 files/itemtool/itemdata/item_icon/narc_0037.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0055.NCLR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
@@ -51,7 +60,15 @@ NCGR_CLEAN_LIST := files/data/cell0.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 \
-                   files/itemtool/itemdata/item_icon/narc_0038.NCGR
+                   files/itemtool/itemdata/item_icon/narc_0038.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0040.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0041.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0043.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0045.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0047.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0049.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0051.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0053.NCGR
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
@@ -66,7 +83,7 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0016.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0018.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0022.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0024.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0025.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 \
@@ -76,4 +93,12 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0035.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0036.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0037.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0038.NCLR
+                   files/itemtool/itemdata/item_icon/narc_0038.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0042.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0043.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0045.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0047.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0049.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0052.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0053.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0055.NCLR
-- 
cgit v1.2.3


From 6d1ac864f23076399e99c00a4a875e5ce88af674 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sat, 11 Jul 2020 15:42:35 +0100
Subject: to 114

---
 files/itemtool/itemdata/item_icon/.gitignore     |  59 ++++++++++++
 files/itemtool/itemdata/item_icon/narc_0056.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0056.png  | Bin 0 -> 301 bytes
 files/itemtool/itemdata/item_icon/narc_0057.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0058.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0058.png  | Bin 0 -> 283 bytes
 files/itemtool/itemdata/item_icon/narc_0059.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0059.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0060.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0060.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0061.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0061.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0062.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0062.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0063.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0063.png  | Bin 0 -> 294 bytes
 files/itemtool/itemdata/item_icon/narc_0064.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0065.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0065.png  | Bin 0 -> 271 bytes
 files/itemtool/itemdata/item_icon/narc_0066.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0066.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0067.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0067.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0068.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0068.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0069.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0069.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0070.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0070.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0071.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0071.png  | Bin 0 -> 311 bytes
 files/itemtool/itemdata/item_icon/narc_0072.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0073.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0073.png  | Bin 0 -> 291 bytes
 files/itemtool/itemdata/item_icon/narc_0074.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0074.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0075.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0075.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0076.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0076.png  | Bin 0 -> 332 bytes
 files/itemtool/itemdata/item_icon/narc_0077.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0078.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0078.png  | Bin 0 -> 196 bytes
 files/itemtool/itemdata/item_icon/narc_0079.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0079.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0080.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0080.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0081.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0081.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0082.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0082.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0083.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0083.png  | Bin 0 -> 284 bytes
 files/itemtool/itemdata/item_icon/narc_0084.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0085.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0085.png  | Bin 0 -> 279 bytes
 files/itemtool/itemdata/item_icon/narc_0086.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0086.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0087.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0087.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0088.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0088.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0089.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0089.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0090.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0090.png  | Bin 0 -> 285 bytes
 files/itemtool/itemdata/item_icon/narc_0091.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0092.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0092.png  | Bin 0 -> 279 bytes
 files/itemtool/itemdata/item_icon/narc_0093.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0094.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0094.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0095.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0095.png  | Bin 0 -> 276 bytes
 files/itemtool/itemdata/item_icon/narc_0096.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0097.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0097.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0098.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0098.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0099.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0099.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0100.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0100.png  | Bin 0 -> 308 bytes
 files/itemtool/itemdata/item_icon/narc_0101.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0101.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0102.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0102.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0103.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0103.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0104.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0104.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0105.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0105.png  | Bin 0 -> 305 bytes
 files/itemtool/itemdata/item_icon/narc_0106.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0107.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0107.png  | Bin 0 -> 332 bytes
 files/itemtool/itemdata/item_icon/narc_0108.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0109.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0109.png  | Bin 0 -> 271 bytes
 files/itemtool/itemdata/item_icon/narc_0110.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0110.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0111.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0111.pal  |  19 ++++
 files/itemtool/itemdata/item_icon/narc_0112.NCGR | Bin 560 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0112.png  | Bin 0 -> 268 bytes
 files/itemtool/itemdata/item_icon/narc_0113.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0114.NCLR | Bin 552 -> 0 bytes
 files/itemtool/itemdata/item_icon/narc_0114.pal  |  19 ++++
 filesystem.mk                                    |  61 ++++++++++++-
 graphics_rules.mk                                | 109 ++++++++++++++++++++++-
 110 files changed, 794 insertions(+), 5 deletions(-)
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0056.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0056.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0057.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0058.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0058.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0059.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0059.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0060.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0060.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0061.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0061.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0062.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0062.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0063.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0063.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0064.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0065.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0065.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0066.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0066.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0067.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0067.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0068.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0068.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0069.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0069.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0070.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0070.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0071.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0071.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0072.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0073.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0073.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0074.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0074.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0075.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0075.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0076.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0076.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0077.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0078.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0078.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0079.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0079.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0080.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0080.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0081.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0081.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0082.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0082.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0083.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0083.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0084.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0085.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0085.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0086.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0086.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0087.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0087.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0088.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0088.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0089.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0089.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0090.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0090.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0091.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0092.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0092.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0093.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0094.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0094.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0095.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0095.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0096.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0097.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0097.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0098.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0098.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0099.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0099.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0100.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0100.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0101.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0101.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0102.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0102.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0103.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0103.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0104.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0104.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0105.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0105.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0106.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0107.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0107.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0108.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0109.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0109.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0110.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0110.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0111.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0111.pal
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0112.NCGR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0112.png
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0113.NCLR
 delete mode 100644 files/itemtool/itemdata/item_icon/narc_0114.NCLR
 create mode 100644 files/itemtool/itemdata/item_icon/narc_0114.pal

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 3e3460e6..b87dd594 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -52,3 +52,62 @@ narc_0052.NCLR
 narc_0053.NCGR
 narc_0053.NCLR
 narc_0055.NCLR
+narc_0056.NCGR
+narc_0056.NCLR
+narc_0058.NCGR
+narc_0059.NCLR
+narc_0060.NCLR
+narc_0061.NCLR
+narc_0062.NCLR
+narc_0063.NCGR
+narc_0063.NCLR
+narc_0065.NCGR
+narc_0066.NCLR
+narc_0067.NCLR
+narc_0068.NCLR
+narc_0069.NCLR
+narc_0070.NCLR
+narc_0071.NCGR
+narc_0071.NCLR
+narc_0073.NCGR
+narc_0074.NCLR
+narc_0075.NCLR
+narc_0076.NCGR
+narc_0076.NCLR
+narc_0078.NCGR
+narc_0079.NCLR
+narc_0080.NCLR
+narc_0081.NCLR
+narc_0082.NCLR
+narc_0083.NCGR
+narc_0083.NCLR
+narc_0085.NCGR
+narc_0086.NCLR
+narc_0087.NCLR
+narc_0088.NCLR
+narc_0089.NCLR
+narc_0090.NCGR
+narc_0090.NCLR
+narc_0092.NCGR
+narc_0092.NCLR
+narc_0094.NCLR
+narc_0095.NCGR
+narc_0095.NCLR
+narc_0097.NCLR
+narc_0098.NCLR
+narc_0099.NCLR
+narc_0100.NCGR
+narc_0101.NCLR
+narc_0102.NCLR
+narc_0103.NCLR
+narc_0104.NCLR
+narc_0105.NCGR
+narc_0105.NCLR
+narc_0107.NCGR
+narc_0107.NCLR
+narc_0109.NCGR
+narc_0110.NCLR
+narc_0111.NCLR
+narc_0112.NCGR
+narc_0112.NCLR
+narc_0114.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0056.NCGR b/files/itemtool/itemdata/item_icon/narc_0056.NCGR
deleted file mode 100644
index 38d84b65..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0056.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0056.png b/files/itemtool/itemdata/item_icon/narc_0056.png
new file mode 100644
index 00000000..021f36f8
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0056.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0057.NCLR b/files/itemtool/itemdata/item_icon/narc_0057.NCLR
deleted file mode 100644
index b143cb13..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0057.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0058.NCGR b/files/itemtool/itemdata/item_icon/narc_0058.NCGR
deleted file mode 100644
index 8eb49fbc..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0058.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0058.png b/files/itemtool/itemdata/item_icon/narc_0058.png
new file mode 100644
index 00000000..e68fe9c4
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0058.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0059.NCLR b/files/itemtool/itemdata/item_icon/narc_0059.NCLR
deleted file mode 100644
index 934feb0d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0059.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0059.pal b/files/itemtool/itemdata/item_icon/narc_0059.pal
new file mode 100644
index 00000000..312f134f
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0059.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+213 230 230
+222 172 230
+189 139 197
+164 197 197
+131 82 139
+123 156 164
+230 255 255
+246 213 255
+74 41 98
+156 106 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0060.NCLR b/files/itemtool/itemdata/item_icon/narc_0060.NCLR
deleted file mode 100644
index c1cf2ad5..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0060.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0060.pal b/files/itemtool/itemdata/item_icon/narc_0060.pal
new file mode 100644
index 00000000..1e51e009
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0060.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+238 238 255
+189 255 156
+164 230 131
+205 205 222
+106 180 65
+164 164 180
+246 246 255
+222 255 213
+49 106 65
+131 197 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0061.NCLR b/files/itemtool/itemdata/item_icon/narc_0061.NCLR
deleted file mode 100644
index 740926e9..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0061.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0061.pal b/files/itemtool/itemdata/item_icon/narc_0061.pal
new file mode 100644
index 00000000..51096890
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0061.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+238 238 164
+255 189 156
+230 164 131
+205 205 131
+180 106 65
+164 164 90
+246 246 164
+255 222 213
+106 49 65
+197 131 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0062.NCLR b/files/itemtool/itemdata/item_icon/narc_0062.NCLR
deleted file mode 100644
index 64019fbd..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0062.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0062.pal b/files/itemtool/itemdata/item_icon/narc_0062.pal
new file mode 100644
index 00000000..61e3c34f
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0062.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 246 180
+156 255 255
+131 230 230
+238 238 156
+65 180 180
+213 213 90
+255 255 205
+213 255 255
+65 106 106
+115 197 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0063.NCGR b/files/itemtool/itemdata/item_icon/narc_0063.NCGR
deleted file mode 100644
index d55c56df..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0063.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0063.png b/files/itemtool/itemdata/item_icon/narc_0063.png
new file mode 100644
index 00000000..d4d5e349
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0063.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0064.NCLR b/files/itemtool/itemdata/item_icon/narc_0064.NCLR
deleted file mode 100644
index 2ad0b03a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0064.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0065.NCGR b/files/itemtool/itemdata/item_icon/narc_0065.NCGR
deleted file mode 100644
index 5a52f13c..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0065.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0065.png b/files/itemtool/itemdata/item_icon/narc_0065.png
new file mode 100644
index 00000000..9ee018cd
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0065.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0066.NCLR b/files/itemtool/itemdata/item_icon/narc_0066.NCLR
deleted file mode 100644
index 7014cc69..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0066.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0066.pal b/files/itemtool/itemdata/item_icon/narc_0066.pal
new file mode 100644
index 00000000..2aa1aa0c
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0066.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+139 172 246
+74 106 172
+172 205 255
+106 139 222
+205 74 65
+205 115 106
+222 164 148
+164 74 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0067.NCLR b/files/itemtool/itemdata/item_icon/narc_0067.NCLR
deleted file mode 100644
index 0773888b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0067.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0067.pal b/files/itemtool/itemdata/item_icon/narc_0067.pal
new file mode 100644
index 00000000..d20ae449
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0067.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+230 230 115
+139 139 74
+238 238 172
+205 205 90
+74 205 65
+115 205 106
+164 222 148
+74 172 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0068.NCLR b/files/itemtool/itemdata/item_icon/narc_0068.NCLR
deleted file mode 100644
index 8691a020..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0068.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0068.pal b/files/itemtool/itemdata/item_icon/narc_0068.pal
new file mode 100644
index 00000000..9fec9ed1
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0068.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+246 172 139
+172 106 74
+255 205 172
+222 139 106
+65 74 205
+106 115 205
+148 164 222
+65 74 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0069.NCLR b/files/itemtool/itemdata/item_icon/narc_0069.NCLR
deleted file mode 100644
index d42adc51..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0069.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0069.pal b/files/itemtool/itemdata/item_icon/narc_0069.pal
new file mode 100644
index 00000000..93bdbd6e
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0069.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+115 115 115
+49 49 49
+148 148 148
+82 82 82
+222 222 98
+222 222 139
+238 238 189
+180 180 98
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0070.NCLR b/files/itemtool/itemdata/item_icon/narc_0070.NCLR
deleted file mode 100644
index b1c784f6..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0070.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0070.pal b/files/itemtool/itemdata/item_icon/narc_0070.pal
new file mode 100644
index 00000000..6dffd6f7
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0070.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+230 230 230
+164 164 164
+230 230 230
+197 197 197
+222 98 222
+222 139 222
+238 189 238
+180 98 180
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0071.NCGR b/files/itemtool/itemdata/item_icon/narc_0071.NCGR
deleted file mode 100644
index 1fbbca02..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0071.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0071.png b/files/itemtool/itemdata/item_icon/narc_0071.png
new file mode 100644
index 00000000..7e5f9cb6
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0071.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0072.NCLR b/files/itemtool/itemdata/item_icon/narc_0072.NCLR
deleted file mode 100644
index c8c90838..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0072.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0073.NCGR b/files/itemtool/itemdata/item_icon/narc_0073.NCGR
deleted file mode 100644
index cd0a84ad..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0073.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0073.png b/files/itemtool/itemdata/item_icon/narc_0073.png
new file mode 100644
index 00000000..50ff4eb8
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0073.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0074.NCLR b/files/itemtool/itemdata/item_icon/narc_0074.NCLR
deleted file mode 100644
index 3a0b2bb1..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0074.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0074.pal b/files/itemtool/itemdata/item_icon/narc_0074.pal
new file mode 100644
index 00000000..4b7ec0b8
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0074.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+222 222 106
+172 172 41
+98 98 24
+246 246 164
+156 156 156
+115 115 115
+205 205 205
+82 82 82
+222 222 222
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0075.NCLR b/files/itemtool/itemdata/item_icon/narc_0075.NCLR
deleted file mode 100644
index e08ca8fc..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0075.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0075.pal b/files/itemtool/itemdata/item_icon/narc_0075.pal
new file mode 100644
index 00000000..85e6fd59
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0075.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+238 205 131
+131 131 131
+197 164 82
+205 205 205
+238 238 238
+115 90 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0076.NCGR b/files/itemtool/itemdata/item_icon/narc_0076.NCGR
deleted file mode 100644
index 54ffcd43..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0076.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0076.png b/files/itemtool/itemdata/item_icon/narc_0076.png
new file mode 100644
index 00000000..6b99ab1f
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0076.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0077.NCLR b/files/itemtool/itemdata/item_icon/narc_0077.NCLR
deleted file mode 100644
index bb493a41..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0077.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0078.NCGR b/files/itemtool/itemdata/item_icon/narc_0078.NCGR
deleted file mode 100644
index eb58370b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0078.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0078.png b/files/itemtool/itemdata/item_icon/narc_0078.png
new file mode 100644
index 00000000..1339baad
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0078.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0079.NCLR b/files/itemtool/itemdata/item_icon/narc_0079.NCLR
deleted file mode 100644
index b36e4f46..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0079.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0079.pal b/files/itemtool/itemdata/item_icon/narc_0079.pal
new file mode 100644
index 00000000..2c4c742b
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0079.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 148 139
+197 90 115
+90 8 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0080.NCLR b/files/itemtool/itemdata/item_icon/narc_0080.NCLR
deleted file mode 100644
index d0b6912f..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0080.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0080.pal b/files/itemtool/itemdata/item_icon/narc_0080.pal
new file mode 100644
index 00000000..acaf36f9
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0080.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+172 180 255
+115 90 197
+32 8 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0081.NCLR b/files/itemtool/itemdata/item_icon/narc_0081.NCLR
deleted file mode 100644
index d5cdde93..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0081.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0081.pal b/files/itemtool/itemdata/item_icon/narc_0081.pal
new file mode 100644
index 00000000..3e33880b
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0081.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 230 90
+197 172 65
+90 65 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0082.NCLR b/files/itemtool/itemdata/item_icon/narc_0082.NCLR
deleted file mode 100644
index e7c51a31..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0082.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0082.pal b/files/itemtool/itemdata/item_icon/narc_0082.pal
new file mode 100644
index 00000000..066162e0
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0082.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+148 246 139
+90 197 115
+8 90 32
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0083.NCGR b/files/itemtool/itemdata/item_icon/narc_0083.NCGR
deleted file mode 100644
index 9455a7ef..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0083.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0083.png b/files/itemtool/itemdata/item_icon/narc_0083.png
new file mode 100644
index 00000000..fcce914d
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0083.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0084.NCLR b/files/itemtool/itemdata/item_icon/narc_0084.NCLR
deleted file mode 100644
index 7b79fbec..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0084.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0085.NCGR b/files/itemtool/itemdata/item_icon/narc_0085.NCGR
deleted file mode 100644
index d884ae88..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0085.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0085.png b/files/itemtool/itemdata/item_icon/narc_0085.png
new file mode 100644
index 00000000..db5dd059
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0085.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0086.NCLR b/files/itemtool/itemdata/item_icon/narc_0086.NCLR
deleted file mode 100644
index fa50e91b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0086.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0086.pal b/files/itemtool/itemdata/item_icon/narc_0086.pal
new file mode 100644
index 00000000..913a87ea
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0086.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 255 246
+148 90 57
+197 98 98
+246 164 164
+139 65 65
+189 148 41
+255 197 115
+197 222 197
+230 246 230
+172 197 172
+246 164 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0087.NCLR b/files/itemtool/itemdata/item_icon/narc_0087.NCLR
deleted file mode 100644
index 26c8e57a..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0087.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0087.pal b/files/itemtool/itemdata/item_icon/narc_0087.pal
new file mode 100644
index 00000000..44592f92
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0087.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 255 246
+148 90 57
+189 189 90
+246 246 164
+139 139 65
+189 148 41
+255 197 115
+197 222 197
+230 246 230
+172 197 172
+49 164 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0088.NCLR b/files/itemtool/itemdata/item_icon/narc_0088.NCLR
deleted file mode 100644
index 790c698d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0088.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0088.pal b/files/itemtool/itemdata/item_icon/narc_0088.pal
new file mode 100644
index 00000000..75ea0b5e
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0088.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 255 246
+148 90 57
+90 189 189
+164 246 246
+65 139 139
+189 148 41
+255 197 115
+197 222 197
+230 246 230
+172 197 172
+41 164 246
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0089.NCLR b/files/itemtool/itemdata/item_icon/narc_0089.NCLR
deleted file mode 100644
index a9c3b20b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0089.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0089.pal b/files/itemtool/itemdata/item_icon/narc_0089.pal
new file mode 100644
index 00000000..0a0100e2
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0089.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 255 246
+148 90 57
+213 131 74
+255 205 164
+180 106 49
+189 148 41
+255 197 115
+197 222 197
+230 246 230
+172 197 172
+246 65 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0090.NCGR b/files/itemtool/itemdata/item_icon/narc_0090.NCGR
deleted file mode 100644
index 31e2976b..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0090.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0090.png b/files/itemtool/itemdata/item_icon/narc_0090.png
new file mode 100644
index 00000000..d0fa4924
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0090.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0091.NCLR b/files/itemtool/itemdata/item_icon/narc_0091.NCLR
deleted file mode 100644
index 1291d15c..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0091.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0092.NCGR b/files/itemtool/itemdata/item_icon/narc_0092.NCGR
deleted file mode 100644
index 794e3bb6..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0092.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0092.png b/files/itemtool/itemdata/item_icon/narc_0092.png
new file mode 100644
index 00000000..4cd0bf83
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0092.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0093.NCLR b/files/itemtool/itemdata/item_icon/narc_0093.NCLR
deleted file mode 100644
index 70b2a48e..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0093.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0094.NCLR b/files/itemtool/itemdata/item_icon/narc_0094.NCLR
deleted file mode 100644
index 0cc05bf1..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0094.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0094.pal b/files/itemtool/itemdata/item_icon/narc_0094.pal
new file mode 100644
index 00000000..47293609
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0094.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+246 255 246
+148 90 57
+189 131 49
+238 205 106
+123 106 0
+189 148 41
+255 197 115
+197 222 197
+230 246 230
+172 197 172
+131 222 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0095.NCGR b/files/itemtool/itemdata/item_icon/narc_0095.NCGR
deleted file mode 100644
index a72df0b6..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0095.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0095.png b/files/itemtool/itemdata/item_icon/narc_0095.png
new file mode 100644
index 00000000..ee852fe1
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0095.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0096.NCLR b/files/itemtool/itemdata/item_icon/narc_0096.NCLR
deleted file mode 100644
index 520a43e8..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0096.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0097.NCLR b/files/itemtool/itemdata/item_icon/narc_0097.NCLR
deleted file mode 100644
index 699bb466..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0097.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0097.pal b/files/itemtool/itemdata/item_icon/narc_0097.pal
new file mode 100644
index 00000000..ad5bd273
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0097.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+106 213 115
+74 164 74
+172 238 156
+255 255 255
+148 156 148
+213 230 213
+32 115 32
+222 255 230
+90 172 74
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0098.NCLR b/files/itemtool/itemdata/item_icon/narc_0098.NCLR
deleted file mode 100644
index 9f90931d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0098.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0098.pal b/files/itemtool/itemdata/item_icon/narc_0098.pal
new file mode 100644
index 00000000..402d5bc5
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0098.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+230 189 90
+180 131 49
+255 213 131
+255 255 255
+164 148 148
+238 213 189
+123 57 8
+255 230 205
+205 148 49
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0099.NCLR b/files/itemtool/itemdata/item_icon/narc_0099.NCLR
deleted file mode 100644
index fc5fd0c2..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0099.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0099.pal b/files/itemtool/itemdata/item_icon/narc_0099.pal
new file mode 100644
index 00000000..4976e562
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0099.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+230 131 123
+164 74 74
+238 156 172
+255 255 255
+156 148 148
+230 213 213
+131 49 49
+255 230 222
+197 98 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0100.NCGR b/files/itemtool/itemdata/item_icon/narc_0100.NCGR
deleted file mode 100644
index e2d0ccb0..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0100.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0100.png b/files/itemtool/itemdata/item_icon/narc_0100.png
new file mode 100644
index 00000000..a6091675
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0100.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0101.NCLR b/files/itemtool/itemdata/item_icon/narc_0101.NCLR
deleted file mode 100644
index d8934247..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0101.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0101.pal b/files/itemtool/itemdata/item_icon/narc_0101.pal
new file mode 100644
index 00000000..a76518db
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0101.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+123 131 230
+74 74 164
+172 156 238
+255 255 255
+148 148 156
+213 213 230
+57 57 139
+222 230 255
+115 98 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0102.NCLR b/files/itemtool/itemdata/item_icon/narc_0102.NCLR
deleted file mode 100644
index 050b02a8..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0102.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0102.pal b/files/itemtool/itemdata/item_icon/narc_0102.pal
new file mode 100644
index 00000000..15138038
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0102.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+106 205 205
+74 156 156
+172 230 230
+255 255 255
+148 156 156
+213 230 230
+32 106 106
+222 255 255
+90 164 164
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0103.NCLR b/files/itemtool/itemdata/item_icon/narc_0103.NCLR
deleted file mode 100644
index 7a35d504..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0103.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0103.pal b/files/itemtool/itemdata/item_icon/narc_0103.pal
new file mode 100644
index 00000000..4c600d07
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0103.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+205 115 189
+164 82 148
+238 180 222
+255 255 255
+156 148 156
+230 213 230
+115 49 98
+255 230 246
+172 98 156
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/files/itemtool/itemdata/item_icon/narc_0104.NCLR b/files/itemtool/itemdata/item_icon/narc_0104.NCLR
deleted file mode 100644
index 003a56d1..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0104.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0104.pal b/files/itemtool/itemdata/item_icon/narc_0104.pal
new file mode 100644
index 00000000..6f5bc3d4
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0104.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+205 205 106
+156 156 74
+230 230 172
+255 255 255
+156 156 148
+230 230 213
+106 106 32
+255 255 222
+164 164 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_0105.NCGR b/files/itemtool/itemdata/item_icon/narc_0105.NCGR
deleted file mode 100644
index 6c79368d..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0105.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0105.png b/files/itemtool/itemdata/item_icon/narc_0105.png
new file mode 100644
index 00000000..8f437a49
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0105.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0106.NCLR b/files/itemtool/itemdata/item_icon/narc_0106.NCLR
deleted file mode 100644
index 6bafd934..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0106.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0107.NCGR b/files/itemtool/itemdata/item_icon/narc_0107.NCGR
deleted file mode 100644
index 22704d94..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0107.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0107.png b/files/itemtool/itemdata/item_icon/narc_0107.png
new file mode 100644
index 00000000..192a875d
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0107.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0108.NCLR b/files/itemtool/itemdata/item_icon/narc_0108.NCLR
deleted file mode 100644
index eabeeab8..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0108.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0109.NCGR b/files/itemtool/itemdata/item_icon/narc_0109.NCGR
deleted file mode 100644
index 7f43bfae..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0109.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0109.png b/files/itemtool/itemdata/item_icon/narc_0109.png
new file mode 100644
index 00000000..dab3c620
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0109.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0110.NCLR b/files/itemtool/itemdata/item_icon/narc_0110.NCLR
deleted file mode 100644
index e92ca175..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0110.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0110.pal b/files/itemtool/itemdata/item_icon/narc_0110.pal
new file mode 100644
index 00000000..c9c48968
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0110.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+213 230 230
+180 197 197
+123 139 139
+0 0 0
+0 0 0
+213 189 189
+139 115 115
+0 0 0
+0 0 0
+0 0 0
+246 246 255
+148 148 172
+205 205 230
diff --git a/files/itemtool/itemdata/item_icon/narc_0111.NCLR b/files/itemtool/itemdata/item_icon/narc_0111.NCLR
deleted file mode 100644
index 408583d7..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0111.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0111.pal b/files/itemtool/itemdata/item_icon/narc_0111.pal
new file mode 100644
index 00000000..1946607d
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0111.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+213 230 230
+180 197 197
+123 139 139
+0 0 0
+0 0 0
+213 205 189
+139 131 115
+0 0 0
+0 0 0
+0 0 0
+255 246 230
+189 172 106
+246 230 164
diff --git a/files/itemtool/itemdata/item_icon/narc_0112.NCGR b/files/itemtool/itemdata/item_icon/narc_0112.NCGR
deleted file mode 100644
index 5a495cbb..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0112.NCGR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0112.png b/files/itemtool/itemdata/item_icon/narc_0112.png
new file mode 100644
index 00000000..44d5c064
Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0112.png differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0113.NCLR b/files/itemtool/itemdata/item_icon/narc_0113.NCLR
deleted file mode 100644
index 12b0d170..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0113.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0114.NCLR b/files/itemtool/itemdata/item_icon/narc_0114.NCLR
deleted file mode 100644
index 3d35e0db..00000000
Binary files a/files/itemtool/itemdata/item_icon/narc_0114.NCLR and /dev/null differ
diff --git a/files/itemtool/itemdata/item_icon/narc_0114.pal b/files/itemtool/itemdata/item_icon/narc_0114.pal
new file mode 100644
index 00000000..c7ef0931
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0114.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+180 180 180
+49 49 49
+255 255 255
+213 230 230
+180 197 197
+123 139 139
+0 0 0
+0 0 0
+230 90 57
+189 49 16
+0 0 0
+0 0 0
+0 0 0
+139 230 139
+49 123 49
+82 180 82
diff --git a/filesystem.mk b/filesystem.mk
index 7cc32168..63b120fd 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -1613,7 +1613,66 @@ files/itemtool/itemdata/item_icon.narc: \
         files/itemtool/itemdata/item_icon/narc_0052.NCLR \
         files/itemtool/itemdata/item_icon/narc_0053.NCGR \
         files/itemtool/itemdata/item_icon/narc_0053.NCLR \
-        files/itemtool/itemdata/item_icon/narc_0055.NCLR
+        files/itemtool/itemdata/item_icon/narc_0055.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0056.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0056.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0058.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0059.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0060.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0061.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0062.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0063.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0063.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0065.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0066.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0067.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0068.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0069.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0070.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0071.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0071.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0073.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0074.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0075.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0076.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0076.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0078.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0079.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0080.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0081.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0082.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0083.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0083.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0085.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0086.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0087.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0088.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0089.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0090.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0090.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0092.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0092.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0094.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0095.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0095.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0097.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0098.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0099.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0100.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0101.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0102.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0103.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0104.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0105.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0105.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0107.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0107.NCLR \
+        files/itemtool/itemdata/item_icon/narc_0109.NCGR \
+        files/itemtool/itemdata/item_icon/narc_0110.NCLR \
+        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/application/custom_ball/data/cb_data.narc: \
diff --git a/graphics_rules.mk b/graphics_rules.mk
index d46aa743..a5f3adc3 100644
--- a/graphics_rules.mk
+++ b/graphics_rules.mk
@@ -30,7 +30,25 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0047.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0049.NCGR \
                                       files/itemtool/itemdata/item_icon/narc_0051.NCGR \
-                                      files/itemtool/itemdata/item_icon/narc_0053.NCGR
+                                      files/itemtool/itemdata/item_icon/narc_0053.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0056.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0058.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0063.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0065.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0071.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0073.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0076.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0078.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0083.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0085.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0090.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0092.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0095.NCGR \
+                                      files/itemtool/itemdata/item_icon/narc_0100.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
 
 IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0029.NCLR \
@@ -38,7 +56,30 @@ IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0035.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0036.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0037.NCLR \
-                 files/itemtool/itemdata/item_icon/narc_0055.NCLR
+                 files/itemtool/itemdata/item_icon/narc_0055.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0060.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0061.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0062.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0067.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0068.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0069.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0070.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0075.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0080.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0081.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0082.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0087.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0088.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0089.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0094.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0097.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0098.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0099.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0102.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0103.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0104.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0111.NCLR \
+                 files/itemtool/itemdata/item_icon/narc_0114.NCLR
 
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
@@ -68,7 +109,26 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0047.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0049.NCGR \
                    files/itemtool/itemdata/item_icon/narc_0051.NCGR \
-                   files/itemtool/itemdata/item_icon/narc_0053.NCGR
+                   files/itemtool/itemdata/item_icon/narc_0053.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0056.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0058.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0063.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0065.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0071.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0073.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0076.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0078.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0083.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0085.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0090.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0092.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0095.NCGR \
+                   files/itemtool/itemdata/item_icon/narc_0100.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
+
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
@@ -101,4 +161,45 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0049.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0052.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0053.NCLR \
-                   files/itemtool/itemdata/item_icon/narc_0055.NCLR
+                   files/itemtool/itemdata/item_icon/narc_0055.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0056.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0059.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0060.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0061.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0062.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0063.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0066.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0067.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0068.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0069.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0070.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0071.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0074.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0075.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0076.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0079.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0080.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0081.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0082.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0083.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0086.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0087.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0088.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0089.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0090.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0092.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0094.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0095.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0097.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0098.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0099.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0101.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0102.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0103.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0104.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0105.NCLR \
+                   files/itemtool/itemdata/item_icon/narc_0107.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
-- 
cgit v1.2.3


From d038e60ba5baee009a0b76466cf362ae7747d48f Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sat, 11 Jul 2020 16:13:04 +0100
Subject: add sopc support to ncgr

---
 tools/nitrogfx/gfx.c     | 15 ++++++++++++---
 tools/nitrogfx/gfx.h     |  2 +-
 tools/nitrogfx/main.c    |  7 ++++++-
 tools/nitrogfx/options.h |  1 +
 tools/nitrogfx/util.c    |  6 +++++-
 tools/nitrogfx/util.h    |  2 +-
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 0acb4133..7bbc7ddf 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -359,7 +359,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
 	free(buffer);
 }
 
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101)
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc)
 {
     FILE *fp = fopen(path, "wb");
 
@@ -407,7 +407,7 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
             break;
     }
 
-    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder, version101);
+    WriteGenericNtrHeader(fp, "RGCN", bufferSize + (sopc ? 0x30 : 0x20), byteOrder, version101, sopc ? 2 : 1);
 
     unsigned char charHeader[0x20] = { 0x52, 0x41, 0x48, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00 };
@@ -446,6 +446,15 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
 
     fwrite(pixelBuffer, 1, bufferSize, fp);
 
+    if (sopc)
+	{
+    	unsigned char sopcBuffer[0x10] = { 0x53, 0x4F, 0x50, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 };
+		sopcBuffer[14] = numTiles & 0xFF;
+		sopcBuffer[15] = (numTiles >> 8) & 0xFF;
+
+		fwrite(sopcBuffer, 1, 0x10, fp);
+	}
+
     free(pixelBuffer);
     fclose(fp);
 }
@@ -545,7 +554,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir)
     uint32_t extSize = size + (ncpr ? 0x10 : 0x18);
 
     //NCLR header
-    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr, false);
+    WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr, false, 1);
 
     unsigned char palHeader[0x18] =
             {
diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h
index ef7926d1..54e6fb16 100644
--- a/tools/nitrogfx/gfx.h
+++ b/tools/nitrogfx/gfx.h
@@ -31,7 +31,7 @@ struct Image {
 void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void ReadNtrImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
 void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
-void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101);
+void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors, bool clobberSize, bool byteOrder, bool version101, bool sopc);
 void FreeImage(struct Image *image);
 void ReadGbaPalette(char *path, struct Palette *palette);
 void ReadNtrPalette(char *path, struct Palette *palette);
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index b922e4b2..13eeb749 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions *
 
     ReadPng(inputPath, &image);
 
-    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101);
+    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc);
 
     FreeImage(&image);
 }
@@ -321,6 +321,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
     options.clobberSize = false;
     options.byteOrder = true;
     options.version101 = false;
+    options.sopc = false;
 
     for (int i = 3; i < argc; i++)
     {
@@ -390,6 +391,10 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a
         {
             options.version101 = true;
         }
+        else if (strcmp(option, "-sopc") == 0)
+        {
+            options.sopc = true;
+        }
         else
         {
             FATAL_ERROR("Unrecognized option \"%s\".\n", option);
diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h
index 77006f21..dc90a2a2 100644
--- a/tools/nitrogfx/options.h
+++ b/tools/nitrogfx/options.h
@@ -29,6 +29,7 @@ struct PngToNtrOptions {
     bool clobberSize;
     bool byteOrder;
     bool version101;
+    bool sopc;
 };
 
 
diff --git a/tools/nitrogfx/util.c b/tools/nitrogfx/util.c
index 304a2319..7dc4ca89 100644
--- a/tools/nitrogfx/util.c
+++ b/tools/nitrogfx/util.c
@@ -124,7 +124,7 @@ void WriteWholeFile(char *path, void *buffer, int bufferSize)
 	fclose(fp);
 }
 
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101)
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101, uint16_t sectionCount)
 {
     unsigned char header[0x10] =
             { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFE, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x01, 0x00 };
@@ -149,5 +149,9 @@ void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, boo
     header[10] = (size >> 16) & 0xFF;
     header[11] = (size >> 24) & 0xFF;
 
+    //section count
+    header[14] = sectionCount & 0xFF;
+    header[15] = (sectionCount >> 8) & 0xFF;
+
     fwrite(header, 1, 0x10, fp);
 }
diff --git a/tools/nitrogfx/util.h b/tools/nitrogfx/util.h
index bb1cd4ad..b757aa4d 100644
--- a/tools/nitrogfx/util.h
+++ b/tools/nitrogfx/util.h
@@ -11,6 +11,6 @@ char *GetFileExtension(char *path);
 unsigned char *ReadWholeFile(char *path, int *size);
 unsigned char *ReadWholeFileZeroPadded(char *path, int *size, int padAmount);
 void WriteWholeFile(char *path, void *buffer, int bufferSize);
-void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101);
+void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101, uint16_t sectionCount);
 
 #endif // UTIL_H
-- 
cgit v1.2.3


From f76e211631b6b86ce7000c16acc5368d78b14f42 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Sat, 11 Jul 2020 21:50:56 +0100
Subject: bit of title work, maths is still wrong

---
 Makefile                                  |   3 +++
 files/demo/title/titledemo/.gitignore     |   4 ++++
 files/demo/title/titledemo/narc_0001.NCGR | Bin 32832 -> 0 bytes
 files/demo/title/titledemo/narc_0001.png  | Bin 0 -> 10975 bytes
 files/demo/title/titledemo/narc_0002.NCLR | Bin 552 -> 0 bytes
 files/demo/title/titledemo/narc_0003.NCGR | Bin 32832 -> 0 bytes
 files/demo/title/titledemo/narc_0003.png  | Bin 0 -> 10254 bytes
 files/demo/title/titledemo/narc_0004.NCLR | Bin 552 -> 0 bytes
 filesystem.mk                             |   6 ++++++
 graphics_rules.mk                         |   8 ++++++++
 tools/nitrogfx/gfx.c                      |  17 ++++++++++-------
 tools/nitrogfx/main.c                     |   2 +-
 12 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 files/demo/title/titledemo/.gitignore
 delete mode 100644 files/demo/title/titledemo/narc_0001.NCGR
 create mode 100644 files/demo/title/titledemo/narc_0001.png
 delete mode 100644 files/demo/title/titledemo/narc_0002.NCLR
 delete mode 100644 files/demo/title/titledemo/narc_0003.NCGR
 create mode 100644 files/demo/title/titledemo/narc_0003.png
 delete mode 100644 files/demo/title/titledemo/narc_0004.NCLR

diff --git a/Makefile b/Makefile
index 48ac1ab8..eec4fdbf 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,9 @@ $(CLOBBER_SIZE_NCGR_FILES): %.NCGR: %.png
 $(CLOBBER_SIZE_VERSION101_NCGR_FILES): %.NCGR: %.png
 	$(GFX) $< $@ -clobbersize -version101
 
+$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png
+	$(GFX) $< $@ -version101 -sopc -bitdepth 8
+
 %.NCLR: %.png
 	$(GFX) $< $@
 
diff --git a/files/demo/title/titledemo/.gitignore b/files/demo/title/titledemo/.gitignore
new file mode 100644
index 00000000..b49b5cb3
--- /dev/null
+++ b/files/demo/title/titledemo/.gitignore
@@ -0,0 +1,4 @@
+narc_0001.NCGR
+narc_0001.NCLR
+narc_0003.NCGR
+narc_0003.NCLR
diff --git a/files/demo/title/titledemo/narc_0001.NCGR b/files/demo/title/titledemo/narc_0001.NCGR
deleted file mode 100644
index b40573ef..00000000
Binary files a/files/demo/title/titledemo/narc_0001.NCGR and /dev/null differ
diff --git a/files/demo/title/titledemo/narc_0001.png b/files/demo/title/titledemo/narc_0001.png
new file mode 100644
index 00000000..09c9cd17
Binary files /dev/null and b/files/demo/title/titledemo/narc_0001.png differ
diff --git a/files/demo/title/titledemo/narc_0002.NCLR b/files/demo/title/titledemo/narc_0002.NCLR
deleted file mode 100644
index f38c8aef..00000000
Binary files a/files/demo/title/titledemo/narc_0002.NCLR and /dev/null differ
diff --git a/files/demo/title/titledemo/narc_0003.NCGR b/files/demo/title/titledemo/narc_0003.NCGR
deleted file mode 100644
index 007b734c..00000000
Binary files a/files/demo/title/titledemo/narc_0003.NCGR and /dev/null differ
diff --git a/files/demo/title/titledemo/narc_0003.png b/files/demo/title/titledemo/narc_0003.png
new file mode 100644
index 00000000..34db01e9
Binary files /dev/null and b/files/demo/title/titledemo/narc_0003.png differ
diff --git a/files/demo/title/titledemo/narc_0004.NCLR b/files/demo/title/titledemo/narc_0004.NCLR
deleted file mode 100644
index bf289579..00000000
Binary files a/files/demo/title/titledemo/narc_0004.NCLR and /dev/null differ
diff --git a/filesystem.mk b/filesystem.mk
index 63b120fd..1be7b682 100644
--- a/filesystem.mk
+++ b/filesystem.mk
@@ -2219,6 +2219,12 @@ files/data/namein.narc: \
         files/data/namein/narc_0013.NCER.lz \
         files/data/namein/narc_0007.NSCR.lz
 
+files/demo/title/titledemo.narc: \
+        files/demo/title/titledemo/narc_0001.NCGR \
+        files/demo/title/titledemo/narc_0001.NCLR \
+        files/demo/title/titledemo/narc_0003.NCGR \
+        files/demo/title/titledemo/narc_0003.NCLR
+
 .PHONY: filesystem
 
 filesystem: $(HOSTFS_FILES)
diff --git a/graphics_rules.mk b/graphics_rules.mk
index a5f3adc3..fba3be06 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 data/demo/title/titledemo/narc_0007.NCGR (weidness with size, needs investigating)
 
 CLOBBER_SIZE_NCGR_FILES := files/data/cell0.NCGR
 
@@ -81,7 +82,12 @@ IR_NCLR_FILES := files/itemtool/itemdata/item_icon/narc_0028.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0111.NCLR \
                  files/itemtool/itemdata/item_icon/narc_0114.NCLR
 
+VERSION101_SOPC_8BPP_NCGR_FILES := files/demo/title/titledemo/narc_0001.NCGR \
+                                   files/demo/title/titledemo/narc_0003.NCGR
+
 NCGR_CLEAN_LIST := files/data/cell0.NCGR \
+                   files/demo/title/titledemo/narc_0001.NCGR \
+                   files/demo/title/titledemo/narc_0003.NCGR \
                    files/graphic/bag_gra/narc_0002.NCGR \
                    files/graphic/bag_gra/narc_0006.NCGR \
                    files/graphic/bag_gra/narc_0034.NCGR \
@@ -131,6 +137,8 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \
 
 
 NCLR_CLEAN_LIST := files/data/cell0.NCLR \
+                   files/demo/title/titledemo/narc_0001.NCLR \
+                   files/demo/title/titledemo/narc_0003.NCLR \
                    files/graphic/bag_gra/narc_0003.NCLR \
                    files/graphic/bag_gra/narc_0034.NCLR \
                    files/itemtool/itemdata/item_icon/narc_0002.NCLR \
diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 7bbc7ddf..c62a25f8 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -419,11 +419,14 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
 
     if (!clobberSize)
     {
-        charHeader[8] = numTiles & 0xFF;
-        charHeader[9] = (numTiles >> 8) & 0xFF;
-
-        charHeader[10] = tileSize & 0xFF;
-        charHeader[11] = (tileSize >> 8) & 0xFF;
+        //charHeader[8] = numTiles & 0xFF;
+        //charHeader[9] = (numTiles >> 8) & 0xFF;
+        charHeader[8] = (bufferSize / (256 * bitDepth)) & 0xFF;
+        charHeader[9] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF;
+
+        //charHeader[10] = tileSize & 0xFF;
+        //charHeader[11] = (tileSize >> 8) & 0xFF;
+        charHeader[10] = 0x20; //todo figure out if this changes
     }
     else
     {
@@ -449,8 +452,8 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in
     if (sopc)
 	{
     	unsigned char sopcBuffer[0x10] = { 0x53, 0x4F, 0x50, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 };
-		sopcBuffer[14] = numTiles & 0xFF;
-		sopcBuffer[15] = (numTiles >> 8) & 0xFF;
+		sopcBuffer[14] = (bufferSize / (256 * bitDepth)) & 0xFF;
+		sopcBuffer[15] = ((bufferSize / (256 * bitDepth)) >> 8) & 0xFF;
 
 		fwrite(sopcBuffer, 1, 0x10, fp);
 	}
diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c
index 13eeb749..0aaad201 100644
--- a/tools/nitrogfx/main.c
+++ b/tools/nitrogfx/main.c
@@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions *
 
     ReadPng(inputPath, &image);
 
-    WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc);
+    WriteNtrImage(outputPath, options->numTiles, image.bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc);
 
     FreeImage(&image);
 }
-- 
cgit v1.2.3