diff options
251 files changed, 1843 insertions, 31 deletions
@@ -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-tools 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 @@ -243,6 +245,33 @@ 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 + +$(VERSION101_SOPC_8BPP_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -version101 -sopc -bitdepth 8 + +$(VERSION101_SOPC_NCGR_FILES): %.NCGR: %.png + $(GFX) $< $@ -version101 -sopc + +%.NCLR: %.png + $(GFX) $< $@ + +%.NCLR: %.pal + $(GFX) $< $@ + +$(IR_NCLR_FILES): %.NCLR: %.pal + $(GFX) $< $@ -ir + +$(4BPP_NCLR_FILES): %.NCLR: %.pal + $(GFX) $< $@ -bitdepth 4 + %.png: ; %.pal: ; diff --git a/arm9/asm/MI_swap.s b/arm9/asm/MI_swap.s deleted file mode 100644 index 576b38dc..00000000 --- a/arm9/asm/MI_swap.s +++ /dev/null @@ -1,9 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start MI_SwapWord -MI_SwapWord: ; 0x020CE520 - swp r0, r0, [r1] - bx lr diff --git a/arm9/lib/include/MI_swap.h b/arm9/lib/include/MI_swap.h new file mode 100644 index 00000000..433b5804 --- /dev/null +++ b/arm9/lib/include/MI_swap.h @@ -0,0 +1,6 @@ +#ifndef NITRO_MI_SWAP_H_ +#define NITRO_MI_SWAP_H_ + +u32 MI_SwapWord(u32 setData, volatile u32 * destp); + +#endif //NITRO_MI_SWAP_H_ diff --git a/arm9/lib/src/MI_swap.c b/arm9/lib/src/MI_swap.c new file mode 100644 index 00000000..b72e1386 --- /dev/null +++ b/arm9/lib/src/MI_swap.c @@ -0,0 +1,16 @@ +#include "global.h" +#include "MI_swap.h" + +/* + * Exchange 32 bits of data between register and memory. + * + * The SDK also defines an 8-bit version of this routine, + * but it is not linked in pokediamond. + */ + +asm +u32 MI_SwapWord(register u32 setData, register vu32 * destp) +{ + swp setData, setData, [destp] + bx lr +} 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 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 Binary files differdeleted file mode 100644 index 76a112b3..00000000 --- a/files/data/cell0.NCGR +++ /dev/null diff --git a/files/data/cell0.NCLR b/files/data/cell0.NCLR Binary files differdeleted file mode 100644 index 680c004b..00000000 --- a/files/data/cell0.NCLR +++ /dev/null diff --git a/files/data/cell0.png b/files/data/cell0.png Binary files differnew file mode 100644 index 00000000..bfd49d69 --- /dev/null +++ b/files/data/cell0.png diff --git a/files/demo/title/titledemo/.gitignore b/files/demo/title/titledemo/.gitignore new file mode 100644 index 00000000..e16f0811 --- /dev/null +++ b/files/demo/title/titledemo/.gitignore @@ -0,0 +1,2 @@ +*.NCLR +*.NCGR diff --git a/files/demo/title/titledemo/narc_0001.NCGR b/files/demo/title/titledemo/narc_0001.NCGR Binary files differdeleted file mode 100644 index b40573ef..00000000 --- a/files/demo/title/titledemo/narc_0001.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0001.png b/files/demo/title/titledemo/narc_0001.png Binary files differnew file mode 100644 index 00000000..09c9cd17 --- /dev/null +++ b/files/demo/title/titledemo/narc_0001.png diff --git a/files/demo/title/titledemo/narc_0002.NCLR b/files/demo/title/titledemo/narc_0002.NCLR Binary files differdeleted file mode 100644 index f38c8aef..00000000 --- a/files/demo/title/titledemo/narc_0002.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0003.NCGR b/files/demo/title/titledemo/narc_0003.NCGR Binary files differdeleted file mode 100644 index 007b734c..00000000 --- a/files/demo/title/titledemo/narc_0003.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0003.png b/files/demo/title/titledemo/narc_0003.png Binary files differnew file mode 100644 index 00000000..34db01e9 --- /dev/null +++ b/files/demo/title/titledemo/narc_0003.png diff --git a/files/demo/title/titledemo/narc_0004.NCLR b/files/demo/title/titledemo/narc_0004.NCLR Binary files differdeleted file mode 100644 index bf289579..00000000 --- a/files/demo/title/titledemo/narc_0004.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0007.NCGR b/files/demo/title/titledemo/narc_0007.NCGR Binary files differdeleted file mode 100644 index 999daf42..00000000 --- a/files/demo/title/titledemo/narc_0007.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0007.png b/files/demo/title/titledemo/narc_0007.png Binary files differnew file mode 100644 index 00000000..b0cc4b6e --- /dev/null +++ b/files/demo/title/titledemo/narc_0007.png diff --git a/files/demo/title/titledemo/narc_0009.NCLR b/files/demo/title/titledemo/narc_0009.NCLR Binary files differdeleted file mode 100644 index d7ac121e..00000000 --- a/files/demo/title/titledemo/narc_0009.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0009.pal b/files/demo/title/titledemo/narc_0009.pal new file mode 100644 index 00000000..e69e3f47 --- /dev/null +++ b/files/demo/title/titledemo/narc_0009.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +238 238 246 +222 222 230 +205 205 222 +180 189 205 +164 172 197 +148 156 180 +131 131 172 +106 115 156 +90 98 148 +74 82 131 +57 65 123 +32 49 106 +16 32 98 +0 8 82 diff --git a/files/demo/title/titledemo/narc_0010.NCLR b/files/demo/title/titledemo/narc_0010.NCLR Binary files differdeleted file mode 100644 index 1dc5e984..00000000 --- a/files/demo/title/titledemo/narc_0010.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0010.pal b/files/demo/title/titledemo/narc_0010.pal new file mode 100644 index 00000000..4a9c3339 --- /dev/null +++ b/files/demo/title/titledemo/narc_0010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +246 238 246 +230 222 230 +213 205 213 +197 189 205 +180 172 189 +164 156 172 +148 139 164 +131 115 148 +115 98 131 +98 82 123 +82 65 106 +74 49 90 +57 32 82 +41 16 65 diff --git a/files/demo/title/titledemo/narc_0011.NCGR b/files/demo/title/titledemo/narc_0011.NCGR Binary files differdeleted file mode 100644 index 999daf42..00000000 --- a/files/demo/title/titledemo/narc_0011.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0011.png b/files/demo/title/titledemo/narc_0011.png Binary files differnew file mode 100644 index 00000000..4a0a9211 --- /dev/null +++ b/files/demo/title/titledemo/narc_0011.png diff --git a/files/demo/title/titledemo/narc_0013.NCLR b/files/demo/title/titledemo/narc_0013.NCLR Binary files differdeleted file mode 100644 index 0dd59fd4..00000000 --- a/files/demo/title/titledemo/narc_0013.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0013.pal b/files/demo/title/titledemo/narc_0013.pal new file mode 100644 index 00000000..74fff8e5 --- /dev/null +++ b/files/demo/title/titledemo/narc_0013.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 8 +0 0 16 +0 0 24 +0 0 24 +0 0 32 +0 0 41 +0 8 49 +0 8 49 +0 8 57 +0 8 65 +0 8 74 +0 8 74 +0 8 82 diff --git a/files/demo/title/titledemo/narc_0014.NCLR b/files/demo/title/titledemo/narc_0014.NCLR Binary files differdeleted file mode 100644 index 4187c5bf..00000000 --- a/files/demo/title/titledemo/narc_0014.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0014.pal b/files/demo/title/titledemo/narc_0014.pal new file mode 100644 index 00000000..f64b3cef --- /dev/null +++ b/files/demo/title/titledemo/narc_0014.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 8 +8 0 8 +8 0 16 +8 0 16 +16 0 24 +16 8 32 +16 8 32 +24 8 41 +24 8 41 +32 8 49 +32 8 57 +32 8 57 +41 16 65 diff --git a/files/demo/title/titledemo/narc_0015.NCGR b/files/demo/title/titledemo/narc_0015.NCGR Binary files differdeleted file mode 100644 index 10e00b0e..00000000 --- a/files/demo/title/titledemo/narc_0015.NCGR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0015.png b/files/demo/title/titledemo/narc_0015.png Binary files differnew file mode 100644 index 00000000..9584e219 --- /dev/null +++ b/files/demo/title/titledemo/narc_0015.png diff --git a/files/demo/title/titledemo/narc_0016.NCLR b/files/demo/title/titledemo/narc_0016.NCLR Binary files differdeleted file mode 100644 index 697a342a..00000000 --- a/files/demo/title/titledemo/narc_0016.NCLR +++ /dev/null diff --git a/files/demo/title/titledemo/narc_0016.pal b/files/demo/title/titledemo/narc_0016.pal new file mode 100644 index 00000000..13181a80 --- /dev/null +++ b/files/demo/title/titledemo/narc_0016.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +16 16 16 +32 32 32 +49 49 49 +74 74 74 +90 90 90 +106 106 106 +123 123 123 +148 148 148 +164 164 164 +180 180 180 +205 205 205 +222 222 222 +238 238 238 +255 255 255 +0 0 0 +0 0 0 +16 16 16 +32 32 32 +49 49 49 +74 74 74 +90 90 90 +106 106 106 +123 123 123 +148 148 148 +164 164 164 +180 180 180 +205 205 205 +222 222 222 +238 238 238 +255 255 255 +0 0 0 +222 16 16 +222 115 115 +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 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 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 +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 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 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 +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 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 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 +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 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 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 +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 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 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 +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 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 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 +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 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 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 Binary files differdeleted file mode 100644 index a33c847c..00000000 --- a/files/graphic/bag_gra/narc_0002.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0002.png b/files/graphic/bag_gra/narc_0002.png Binary files differnew file mode 100644 index 00000000..9152a7e1 --- /dev/null +++ b/files/graphic/bag_gra/narc_0002.png diff --git a/files/graphic/bag_gra/narc_0003.NCLR b/files/graphic/bag_gra/narc_0003.NCLR Binary files differdeleted file mode 100644 index 4e6b57e1..00000000 --- a/files/graphic/bag_gra/narc_0003.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3517cd01..00000000 --- a/files/graphic/bag_gra/narc_0006.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0006.png b/files/graphic/bag_gra/narc_0006.png Binary files differnew file mode 100644 index 00000000..a9982600 --- /dev/null +++ b/files/graphic/bag_gra/narc_0006.png diff --git a/files/graphic/bag_gra/narc_0034.NCGR b/files/graphic/bag_gra/narc_0034.NCGR Binary files differdeleted file mode 100644 index 55f4282b..00000000 --- a/files/graphic/bag_gra/narc_0034.NCGR +++ /dev/null diff --git a/files/graphic/bag_gra/narc_0034.png b/files/graphic/bag_gra/narc_0034.png Binary files differnew file mode 100644 index 00000000..ba296b4c --- /dev/null +++ b/files/graphic/bag_gra/narc_0034.png diff --git a/files/graphic/bag_gra/narc_0035.NCLR b/files/graphic/bag_gra/narc_0035.NCLR Binary files differdeleted file mode 100644 index 4e6b57e1..00000000 --- a/files/graphic/bag_gra/narc_0035.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore new file mode 100644 index 00000000..b87dd594 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -0,0 +1,113 @@ +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 +narc_0024.NCGR +narc_0025.NCLR +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 +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 +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_0002.NCGR b/files/itemtool/itemdata/item_icon/narc_0002.NCGR Binary files differdeleted file mode 100644 index 045a5e06..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0002.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0002.png b/files/itemtool/itemdata/item_icon/narc_0002.png Binary files differnew file mode 100644 index 00000000..bc9abe05 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0002.png diff --git a/files/itemtool/itemdata/item_icon/narc_0003.NCLR b/files/itemtool/itemdata/item_icon/narc_0003.NCLR Binary files differdeleted file mode 100644 index 701517a8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0003.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0004.NCGR b/files/itemtool/itemdata/item_icon/narc_0004.NCGR Binary files differdeleted file mode 100644 index 19b1164c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0004.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0004.png b/files/itemtool/itemdata/item_icon/narc_0004.png Binary files differnew file mode 100644 index 00000000..2bebe147 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0004.png diff --git a/files/itemtool/itemdata/item_icon/narc_0005.NCLR b/files/itemtool/itemdata/item_icon/narc_0005.NCLR Binary files differdeleted file mode 100644 index bca61e37..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0005.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0006.NCGR b/files/itemtool/itemdata/item_icon/narc_0006.NCGR Binary files differdeleted file mode 100644 index 2e2983c0..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0006.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0006.png b/files/itemtool/itemdata/item_icon/narc_0006.png Binary files differnew file mode 100644 index 00000000..723b699a --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0006.png diff --git a/files/itemtool/itemdata/item_icon/narc_0007.NCLR b/files/itemtool/itemdata/item_icon/narc_0007.NCLR Binary files differdeleted file mode 100644 index 91f0132a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0007.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0008.NCGR b/files/itemtool/itemdata/item_icon/narc_0008.NCGR Binary files differdeleted file mode 100644 index 72d857a6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0008.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0008.png b/files/itemtool/itemdata/item_icon/narc_0008.png Binary files differnew file mode 100644 index 00000000..fb5e215e --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0008.png diff --git a/files/itemtool/itemdata/item_icon/narc_0009.NCLR b/files/itemtool/itemdata/item_icon/narc_0009.NCLR Binary files differdeleted file mode 100644 index f728f1ae..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0009.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0010.NCGR b/files/itemtool/itemdata/item_icon/narc_0010.NCGR Binary files differdeleted file mode 100644 index 56d27763..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0010.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0010.png b/files/itemtool/itemdata/item_icon/narc_0010.png Binary files differnew file mode 100644 index 00000000..38784263 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0010.png diff --git a/files/itemtool/itemdata/item_icon/narc_0011.NCLR b/files/itemtool/itemdata/item_icon/narc_0011.NCLR Binary files differdeleted file mode 100644 index 89c4675c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0011.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0012.NCGR b/files/itemtool/itemdata/item_icon/narc_0012.NCGR Binary files differdeleted file mode 100644 index 0095fa60..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0012.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0012.png b/files/itemtool/itemdata/item_icon/narc_0012.png Binary files differnew file mode 100644 index 00000000..da0cf777 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0012.png diff --git a/files/itemtool/itemdata/item_icon/narc_0013.NCLR b/files/itemtool/itemdata/item_icon/narc_0013.NCLR Binary files differdeleted file mode 100644 index 3563296b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0013.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0014.NCGR b/files/itemtool/itemdata/item_icon/narc_0014.NCGR Binary files differdeleted file mode 100644 index b31b518f..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0014.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0014.png b/files/itemtool/itemdata/item_icon/narc_0014.png Binary files differnew file mode 100644 index 00000000..71a630d4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0014.png diff --git a/files/itemtool/itemdata/item_icon/narc_0015.NCLR b/files/itemtool/itemdata/item_icon/narc_0015.NCLR Binary files differdeleted file mode 100644 index 9ba135dd..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0015.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0016.NCGR b/files/itemtool/itemdata/item_icon/narc_0016.NCGR Binary files differdeleted file mode 100644 index 5d75c234..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0016.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0016.png b/files/itemtool/itemdata/item_icon/narc_0016.png Binary files differnew file mode 100644 index 00000000..9f2ccb9d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0016.png diff --git a/files/itemtool/itemdata/item_icon/narc_0017.NCLR b/files/itemtool/itemdata/item_icon/narc_0017.NCLR Binary files differdeleted file mode 100644 index 74070d69..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0017.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0018.NCGR b/files/itemtool/itemdata/item_icon/narc_0018.NCGR Binary files differdeleted file mode 100644 index d580d3e4..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0018.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0018.png b/files/itemtool/itemdata/item_icon/narc_0018.png Binary files differnew file mode 100644 index 00000000..17e02bc4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0018.png diff --git a/files/itemtool/itemdata/item_icon/narc_0019.NCLR b/files/itemtool/itemdata/item_icon/narc_0019.NCLR Binary files differdeleted file mode 100644 index 3cc3439e..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0019.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0020.NCGR b/files/itemtool/itemdata/item_icon/narc_0020.NCGR Binary files differdeleted file mode 100644 index ddd27891..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0020.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0020.png b/files/itemtool/itemdata/item_icon/narc_0020.png Binary files differnew file mode 100644 index 00000000..a046a23a --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0020.png diff --git a/files/itemtool/itemdata/item_icon/narc_0021.NCGR b/files/itemtool/itemdata/item_icon/narc_0021.NCGR Binary files differdeleted file mode 100644 index 9d93568a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0021.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0021.png b/files/itemtool/itemdata/item_icon/narc_0021.png Binary files differnew file mode 100644 index 00000000..ea3fed09 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0021.png diff --git a/files/itemtool/itemdata/item_icon/narc_0022.NCLR b/files/itemtool/itemdata/item_icon/narc_0022.NCLR Binary files differdeleted file mode 100644 index 6af27f80..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0022.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index c63b44d6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0023.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0023.png b/files/itemtool/itemdata/item_icon/narc_0023.png Binary files differnew file mode 100644 index 00000000..66913f94 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0023.png diff --git a/files/itemtool/itemdata/item_icon/narc_0024.NCGR b/files/itemtool/itemdata/item_icon/narc_0024.NCGR Binary files differdeleted file mode 100644 index df0ab48b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0024.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0024.png b/files/itemtool/itemdata/item_icon/narc_0024.png Binary files differnew file mode 100644 index 00000000..5abf90de --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0024.png diff --git a/files/itemtool/itemdata/item_icon/narc_0025.NCLR b/files/itemtool/itemdata/item_icon/narc_0025.NCLR Binary files differdeleted file mode 100644 index 04294c8a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0025.NCLR +++ /dev/null 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_0026.NCGR b/files/itemtool/itemdata/item_icon/narc_0026.NCGR Binary files differdeleted file mode 100644 index 74b77380..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0026.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0026.png b/files/itemtool/itemdata/item_icon/narc_0026.png Binary files differnew file mode 100644 index 00000000..b8541bf2 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0026.png diff --git a/files/itemtool/itemdata/item_icon/narc_0027.NCLR b/files/itemtool/itemdata/item_icon/narc_0027.NCLR Binary files differdeleted file mode 100644 index 56911461..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0027.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3b2de0f8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0028.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7d9c6c89..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0029.NCLR +++ /dev/null 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/files/itemtool/itemdata/item_icon/narc_0030.NCGR b/files/itemtool/itemdata/item_icon/narc_0030.NCGR Binary files differdeleted file mode 100644 index 74b77380..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0030.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0030.png b/files/itemtool/itemdata/item_icon/narc_0030.png Binary files differnew file mode 100644 index 00000000..6976dc90 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0030.png diff --git a/files/itemtool/itemdata/item_icon/narc_0031.NCLR b/files/itemtool/itemdata/item_icon/narc_0031.NCLR Binary files differdeleted file mode 100644 index 61212a78..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0031.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0031.pal b/files/itemtool/itemdata/item_icon/narc_0031.pal new file mode 100644 index 00000000..b2984538 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0031.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +131 238 255 +74 180 197 +106 213 230 +90 197 213 +213 255 255 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0032.NCLR b/files/itemtool/itemdata/item_icon/narc_0032.NCLR Binary files differdeleted file mode 100644 index 3f997e97..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0032.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0032.pal b/files/itemtool/itemdata/item_icon/narc_0032.pal new file mode 100644 index 00000000..e19a72ca --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0032.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +255 255 255 +205 205 205 +156 156 156 +255 255 148 +197 197 57 +238 238 98 +222 222 90 +255 255 213 +90 90 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0033.NCGR b/files/itemtool/itemdata/item_icon/narc_0033.NCGR Binary files differdeleted file mode 100644 index 5f2f5ee5..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0033.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0033.png b/files/itemtool/itemdata/item_icon/narc_0033.png Binary files differnew file mode 100644 index 00000000..f6ace7d3 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0033.png diff --git a/files/itemtool/itemdata/item_icon/narc_0034.NCLR b/files/itemtool/itemdata/item_icon/narc_0034.NCLR Binary files differdeleted file mode 100644 index 50c925b9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0034.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0034.pal b/files/itemtool/itemdata/item_icon/narc_0034.pal new file mode 100644 index 00000000..35de1c56 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0034.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +156 230 65 +172 255 148 +123 197 32 +90 123 49 +213 213 164 +148 148 98 +255 255 213 +255 255 230 +180 180 131 +238 238 180 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0035.NCLR b/files/itemtool/itemdata/item_icon/narc_0035.NCLR Binary files differdeleted file mode 100644 index cdaa41e2..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0035.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0035.pal b/files/itemtool/itemdata/item_icon/narc_0035.pal new file mode 100644 index 00000000..8ac59013 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0035.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +65 156 230 +148 172 255 +32 123 197 +49 90 123 +180 180 197 +115 115 131 +230 230 246 +246 255 246 +148 148 164 +205 205 222 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/files/itemtool/itemdata/item_icon/narc_0036.NCLR b/files/itemtool/itemdata/item_icon/narc_0036.NCLR Binary files differdeleted file mode 100644 index 0183b36b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0036.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 660d239d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0037.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 99816ceb..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0038.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0038.png b/files/itemtool/itemdata/item_icon/narc_0038.png Binary files differnew file mode 100644 index 00000000..076c4fd5 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0038.png diff --git a/files/itemtool/itemdata/item_icon/narc_0039.NCLR b/files/itemtool/itemdata/item_icon/narc_0039.NCLR Binary files differdeleted file mode 100644 index 5abc1d68..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0039.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0040.NCGR b/files/itemtool/itemdata/item_icon/narc_0040.NCGR Binary files differdeleted file mode 100644 index 0bf54763..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0040.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0040.png b/files/itemtool/itemdata/item_icon/narc_0040.png Binary files differnew file mode 100644 index 00000000..2b5a5086 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0040.png diff --git a/files/itemtool/itemdata/item_icon/narc_0041.NCGR b/files/itemtool/itemdata/item_icon/narc_0041.NCGR Binary files differdeleted file mode 100644 index 4dfa8709..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0041.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0041.png b/files/itemtool/itemdata/item_icon/narc_0041.png Binary files differnew file mode 100644 index 00000000..987ca1be --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0041.png diff --git a/files/itemtool/itemdata/item_icon/narc_0042.NCLR b/files/itemtool/itemdata/item_icon/narc_0042.NCLR Binary files differdeleted file mode 100644 index b5d81020..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0042.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 29df88c9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0043.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0043.png b/files/itemtool/itemdata/item_icon/narc_0043.png Binary files differnew file mode 100644 index 00000000..a9b7aae9 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0043.png diff --git a/files/itemtool/itemdata/item_icon/narc_0044.NCLR b/files/itemtool/itemdata/item_icon/narc_0044.NCLR Binary files differdeleted file mode 100644 index 3d36b70a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0044.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0045.NCGR b/files/itemtool/itemdata/item_icon/narc_0045.NCGR Binary files differdeleted file mode 100644 index ed50716d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0045.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0045.png b/files/itemtool/itemdata/item_icon/narc_0045.png Binary files differnew file mode 100644 index 00000000..08dd22f2 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0045.png diff --git a/files/itemtool/itemdata/item_icon/narc_0046.NCLR b/files/itemtool/itemdata/item_icon/narc_0046.NCLR Binary files differdeleted file mode 100644 index fe281d12..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0046.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0047.NCGR b/files/itemtool/itemdata/item_icon/narc_0047.NCGR Binary files differdeleted file mode 100644 index 71a3ee83..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0047.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0047.png b/files/itemtool/itemdata/item_icon/narc_0047.png Binary files differnew file mode 100644 index 00000000..e77fb5ea --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0047.png diff --git a/files/itemtool/itemdata/item_icon/narc_0048.NCLR b/files/itemtool/itemdata/item_icon/narc_0048.NCLR Binary files differdeleted file mode 100644 index 54c0443a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0048.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0049.NCGR b/files/itemtool/itemdata/item_icon/narc_0049.NCGR Binary files differdeleted file mode 100644 index 96797161..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0049.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0049.png b/files/itemtool/itemdata/item_icon/narc_0049.png Binary files differnew file mode 100644 index 00000000..ce892f9d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0049.png diff --git a/files/itemtool/itemdata/item_icon/narc_0050.NCLR b/files/itemtool/itemdata/item_icon/narc_0050.NCLR Binary files differdeleted file mode 100644 index 4cd9db27..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0050.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0051.NCGR b/files/itemtool/itemdata/item_icon/narc_0051.NCGR Binary files differdeleted file mode 100644 index 8487d213..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0051.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0051.png b/files/itemtool/itemdata/item_icon/narc_0051.png Binary files differnew file mode 100644 index 00000000..65c39cf7 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0051.png diff --git a/files/itemtool/itemdata/item_icon/narc_0052.NCLR b/files/itemtool/itemdata/item_icon/narc_0052.NCLR Binary files differdeleted file mode 100644 index e9cfec47..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0052.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index d5b4a18a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0053.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0053.png b/files/itemtool/itemdata/item_icon/narc_0053.png Binary files differnew file mode 100644 index 00000000..a081274c --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0053.png diff --git a/files/itemtool/itemdata/item_icon/narc_0054.NCLR b/files/itemtool/itemdata/item_icon/narc_0054.NCLR Binary files differdeleted file mode 100644 index df463ef7..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0054.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0055.NCLR b/files/itemtool/itemdata/item_icon/narc_0055.NCLR Binary files differdeleted file mode 100644 index e1684620..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0055.NCLR +++ /dev/null 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/files/itemtool/itemdata/item_icon/narc_0056.NCGR b/files/itemtool/itemdata/item_icon/narc_0056.NCGR Binary files differdeleted file mode 100644 index 38d84b65..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0056.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0056.png b/files/itemtool/itemdata/item_icon/narc_0056.png Binary files differnew file mode 100644 index 00000000..021f36f8 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0056.png diff --git a/files/itemtool/itemdata/item_icon/narc_0057.NCLR b/files/itemtool/itemdata/item_icon/narc_0057.NCLR Binary files differdeleted file mode 100644 index b143cb13..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0057.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0058.NCGR b/files/itemtool/itemdata/item_icon/narc_0058.NCGR Binary files differdeleted file mode 100644 index 8eb49fbc..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0058.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0058.png b/files/itemtool/itemdata/item_icon/narc_0058.png Binary files differnew file mode 100644 index 00000000..e68fe9c4 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0058.png diff --git a/files/itemtool/itemdata/item_icon/narc_0059.NCLR b/files/itemtool/itemdata/item_icon/narc_0059.NCLR Binary files differdeleted file mode 100644 index 934feb0d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0059.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index c1cf2ad5..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0060.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 740926e9..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0061.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 64019fbd..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0062.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index d55c56df..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0063.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0063.png b/files/itemtool/itemdata/item_icon/narc_0063.png Binary files differnew file mode 100644 index 00000000..d4d5e349 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0063.png diff --git a/files/itemtool/itemdata/item_icon/narc_0064.NCLR b/files/itemtool/itemdata/item_icon/narc_0064.NCLR Binary files differdeleted file mode 100644 index 2ad0b03a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0064.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0065.NCGR b/files/itemtool/itemdata/item_icon/narc_0065.NCGR Binary files differdeleted file mode 100644 index 5a52f13c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0065.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0065.png b/files/itemtool/itemdata/item_icon/narc_0065.png Binary files differnew file mode 100644 index 00000000..9ee018cd --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0065.png diff --git a/files/itemtool/itemdata/item_icon/narc_0066.NCLR b/files/itemtool/itemdata/item_icon/narc_0066.NCLR Binary files differdeleted file mode 100644 index 7014cc69..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0066.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 0773888b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0067.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8691a020..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0068.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index d42adc51..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0069.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index b1c784f6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0070.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1fbbca02..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0071.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0071.png b/files/itemtool/itemdata/item_icon/narc_0071.png Binary files differnew file mode 100644 index 00000000..7e5f9cb6 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0071.png diff --git a/files/itemtool/itemdata/item_icon/narc_0072.NCLR b/files/itemtool/itemdata/item_icon/narc_0072.NCLR Binary files differdeleted file mode 100644 index c8c90838..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0072.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0073.NCGR b/files/itemtool/itemdata/item_icon/narc_0073.NCGR Binary files differdeleted file mode 100644 index cd0a84ad..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0073.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0073.png b/files/itemtool/itemdata/item_icon/narc_0073.png Binary files differnew file mode 100644 index 00000000..50ff4eb8 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0073.png diff --git a/files/itemtool/itemdata/item_icon/narc_0074.NCLR b/files/itemtool/itemdata/item_icon/narc_0074.NCLR Binary files differdeleted file mode 100644 index 3a0b2bb1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0074.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index e08ca8fc..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0075.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 54ffcd43..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0076.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0076.png b/files/itemtool/itemdata/item_icon/narc_0076.png Binary files differnew file mode 100644 index 00000000..6b99ab1f --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0076.png diff --git a/files/itemtool/itemdata/item_icon/narc_0077.NCLR b/files/itemtool/itemdata/item_icon/narc_0077.NCLR Binary files differdeleted file mode 100644 index bb493a41..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0077.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0078.NCGR b/files/itemtool/itemdata/item_icon/narc_0078.NCGR Binary files differdeleted file mode 100644 index eb58370b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0078.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0078.png b/files/itemtool/itemdata/item_icon/narc_0078.png Binary files differnew file mode 100644 index 00000000..1339baad --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0078.png diff --git a/files/itemtool/itemdata/item_icon/narc_0079.NCLR b/files/itemtool/itemdata/item_icon/narc_0079.NCLR Binary files differdeleted file mode 100644 index b36e4f46..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0079.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index d0b6912f..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0080.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index d5cdde93..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0081.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index e7c51a31..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0082.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 9455a7ef..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0083.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0083.png b/files/itemtool/itemdata/item_icon/narc_0083.png Binary files differnew file mode 100644 index 00000000..fcce914d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0083.png diff --git a/files/itemtool/itemdata/item_icon/narc_0084.NCLR b/files/itemtool/itemdata/item_icon/narc_0084.NCLR Binary files differdeleted file mode 100644 index 7b79fbec..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0084.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0085.NCGR b/files/itemtool/itemdata/item_icon/narc_0085.NCGR Binary files differdeleted file mode 100644 index d884ae88..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0085.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0085.png b/files/itemtool/itemdata/item_icon/narc_0085.png Binary files differnew file mode 100644 index 00000000..db5dd059 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0085.png diff --git a/files/itemtool/itemdata/item_icon/narc_0086.NCLR b/files/itemtool/itemdata/item_icon/narc_0086.NCLR Binary files differdeleted file mode 100644 index fa50e91b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0086.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 26c8e57a..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0087.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 790c698d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0088.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index a9c3b20b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0089.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 31e2976b..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0090.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0090.png b/files/itemtool/itemdata/item_icon/narc_0090.png Binary files differnew file mode 100644 index 00000000..d0fa4924 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0090.png diff --git a/files/itemtool/itemdata/item_icon/narc_0091.NCLR b/files/itemtool/itemdata/item_icon/narc_0091.NCLR Binary files differdeleted file mode 100644 index 1291d15c..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0091.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0092.NCGR b/files/itemtool/itemdata/item_icon/narc_0092.NCGR Binary files differdeleted file mode 100644 index 794e3bb6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0092.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0092.png b/files/itemtool/itemdata/item_icon/narc_0092.png Binary files differnew file mode 100644 index 00000000..4cd0bf83 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0092.png diff --git a/files/itemtool/itemdata/item_icon/narc_0093.NCLR b/files/itemtool/itemdata/item_icon/narc_0093.NCLR Binary files differdeleted file mode 100644 index 70b2a48e..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0093.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0094.NCLR b/files/itemtool/itemdata/item_icon/narc_0094.NCLR Binary files differdeleted file mode 100644 index 0cc05bf1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0094.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index a72df0b6..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0095.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0095.png b/files/itemtool/itemdata/item_icon/narc_0095.png Binary files differnew file mode 100644 index 00000000..ee852fe1 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0095.png diff --git a/files/itemtool/itemdata/item_icon/narc_0096.NCLR b/files/itemtool/itemdata/item_icon/narc_0096.NCLR Binary files differdeleted file mode 100644 index 520a43e8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0096.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0097.NCLR b/files/itemtool/itemdata/item_icon/narc_0097.NCLR Binary files differdeleted file mode 100644 index 699bb466..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0097.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 9f90931d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0098.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index fc5fd0c2..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0099.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index e2d0ccb0..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0100.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0100.png b/files/itemtool/itemdata/item_icon/narc_0100.png Binary files differnew file mode 100644 index 00000000..a6091675 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0100.png diff --git a/files/itemtool/itemdata/item_icon/narc_0101.NCLR b/files/itemtool/itemdata/item_icon/narc_0101.NCLR Binary files differdeleted file mode 100644 index d8934247..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0101.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 050b02a8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0102.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7a35d504..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0103.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 003a56d1..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0104.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6c79368d..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0105.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0105.png b/files/itemtool/itemdata/item_icon/narc_0105.png Binary files differnew file mode 100644 index 00000000..8f437a49 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0105.png diff --git a/files/itemtool/itemdata/item_icon/narc_0106.NCLR b/files/itemtool/itemdata/item_icon/narc_0106.NCLR Binary files differdeleted file mode 100644 index 6bafd934..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0106.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0107.NCGR b/files/itemtool/itemdata/item_icon/narc_0107.NCGR Binary files differdeleted file mode 100644 index 22704d94..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0107.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0107.png b/files/itemtool/itemdata/item_icon/narc_0107.png Binary files differnew file mode 100644 index 00000000..192a875d --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0107.png diff --git a/files/itemtool/itemdata/item_icon/narc_0108.NCLR b/files/itemtool/itemdata/item_icon/narc_0108.NCLR Binary files differdeleted file mode 100644 index eabeeab8..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0108.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0109.NCGR b/files/itemtool/itemdata/item_icon/narc_0109.NCGR Binary files differdeleted file mode 100644 index 7f43bfae..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0109.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0109.png b/files/itemtool/itemdata/item_icon/narc_0109.png Binary files differnew file mode 100644 index 00000000..dab3c620 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0109.png diff --git a/files/itemtool/itemdata/item_icon/narc_0110.NCLR b/files/itemtool/itemdata/item_icon/narc_0110.NCLR Binary files differdeleted file mode 100644 index e92ca175..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0110.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 408583d7..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0111.NCLR +++ /dev/null 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 Binary files differdeleted file mode 100644 index 5a495cbb..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0112.NCGR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0112.png b/files/itemtool/itemdata/item_icon/narc_0112.png Binary files differnew file mode 100644 index 00000000..44d5c064 --- /dev/null +++ b/files/itemtool/itemdata/item_icon/narc_0112.png diff --git a/files/itemtool/itemdata/item_icon/narc_0113.NCLR b/files/itemtool/itemdata/item_icon/narc_0113.NCLR Binary files differdeleted file mode 100644 index 12b0d170..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0113.NCLR +++ /dev/null diff --git a/files/itemtool/itemdata/item_icon/narc_0114.NCLR b/files/itemtool/itemdata/item_icon/narc_0114.NCLR Binary files differdeleted file mode 100644 index 3d35e0db..00000000 --- a/files/itemtool/itemdata/item_icon/narc_0114.NCLR +++ /dev/null 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 180845ac..a203a0db 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 \ @@ -1552,6 +1559,122 @@ 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/itemtool/itemdata/item_icon/narc_0024.NCGR \ + 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 \ + 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/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_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/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: \ files/application/custom_ball/data/cb_data/narc_0195.NCGR.lz \ files/application/custom_ball/data/cb_data/narc_0181.NCER.lz \ @@ -2096,6 +2219,20 @@ 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 \ + files/demo/title/titledemo/narc_0007.NCGR \ + files/demo/title/titledemo/narc_0009.NCLR \ + files/demo/title/titledemo/narc_0010.NCLR \ + files/demo/title/titledemo/narc_0011.NCGR \ + files/demo/title/titledemo/narc_0013.NCLR \ + files/demo/title/titledemo/narc_0014.NCLR \ + files/demo/title/titledemo/narc_0015.NCGR \ + files/demo/title/titledemo/narc_0016.NCLR + .PHONY: filesystem filesystem: $(HOSTFS_FILES) diff --git a/graphics_rules.mk b/graphics_rules.mk new file mode 100644 index 00000000..64762f03 --- /dev/null +++ b/graphics_rules.mk @@ -0,0 +1,226 @@ +#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 \ + 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 \ + 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_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 \ + 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 + +4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR + +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_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 + +VERSION101_SOPC_8BPP_NCGR_FILES := files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR + +VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \ + files/demo/title/titledemo/narc_0011.NCGR \ + files/demo/title/titledemo/narc_0015.NCGR + +NCGR_CLEAN_LIST := files/data/cell0.NCGR \ + files/demo/title/titledemo/narc_0001.NCGR \ + files/demo/title/titledemo/narc_0003.NCGR \ + files/demo/title/titledemo/narc_0007.NCGR \ + files/demo/title/titledemo/narc_0011.NCGR \ + files/demo/title/titledemo/narc_0015.NCGR \ + files/graphic/bag_gra/narc_0002.NCGR \ + files/graphic/bag_gra/narc_0006.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 \ + 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_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 \ + 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/demo/title/titledemo/narc_0001.NCLR \ + files/demo/title/titledemo/narc_0003.NCLR \ + files/demo/title/titledemo/narc_0009.NCLR \ + files/demo/title/titledemo/narc_0010.NCLR \ + files/demo/title/titledemo/narc_0013.NCLR \ + files/demo/title/titledemo/narc_0014.NCLR \ + files/demo/title/titledemo/narc_0016.NCLR \ + files/graphic/bag_gra/narc_0003.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 \ + 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 \ + 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_0036.NCLR \ + files/itemtool/itemdata/item_icon/narc_0037.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 \ + 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 diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 3315e00e..8f943698 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, 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); + 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 }; @@ -419,11 +419,11 @@ void WriteNtrImage(char *path, int numTiles, int bitDepth, int metatileWidth, in if (!clobberSize) { - charHeader[8] = numTiles & 0xFF; - charHeader[9] = (numTiles >> 8) & 0xFF; + charHeader[8] = tilesHeight & 0xFF; + charHeader[9] = (tilesHeight >> 8) & 0xFF; - charHeader[10] = tileSize & 0xFF; - charHeader[11] = (tileSize >> 8) & 0xFF; + charHeader[10] = tilesWidth & 0xFF; + charHeader[11] = (tilesWidth >> 8) & 0xFF; } else { @@ -446,6 +446,19 @@ 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, 0x00, 0x00, 0x00, 0x00 }; + + sopcBuffer[12] = tilesWidth & 0xFF; + sopcBuffer[13] = (tilesWidth >> 8) & 0xFF; + + sopcBuffer[14] = tilesHeight & 0xFF; + sopcBuffer[15] = (tilesHeight >> 8) & 0xFF; + + fwrite(sopcBuffer, 1, 0x10, fp); + } + free(pixelBuffer); fclose(fp); } @@ -476,7 +489,7 @@ void ReadGbaPalette(char *path, struct Palette *palette) free(data); } -void ReadNtrPalette(char *path, struct Palette *palette) +void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth) { int fileSize; unsigned char *data = ReadWholeFile(path, &fileSize); @@ -498,7 +511,9 @@ void ReadNtrPalette(char *path, struct Palette *palette) palette->bitDepth = paletteHeader[0x8] == 3 ? 4 : 8; - palette->numColors = palette->bitDepth == 4 ? 16 : 256; //remove header and divide by 2 + bitdepth = bitdepth ? bitdepth : palette->bitDepth; + + palette->numColors = bitdepth == 4 ? 16 : 256; //remove header and divide by 2 unsigned char *paletteData = paletteHeader + 0x18; @@ -534,7 +549,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, int bitdepth) { FILE *fp = fopen(path, "wb"); @@ -545,7 +560,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, 1); unsigned char palHeader[0x18] = { @@ -561,8 +576,11 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) if (!palette->bitDepth) palette->bitDepth = 4; + + bitdepth = bitdepth ? bitdepth : palette->bitDepth; + //bit depth - palHeader[8] = palette->bitDepth == 4 ? 0x03: 0x04; + palHeader[8] = bitdepth == 4 ? 0x03: 0x04; //size palHeader[16] = size & 0xFF; @@ -594,6 +612,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 da56c5c5..e5189100 100644 --- a/tools/nitrogfx/gfx.h +++ b/tools/nitrogfx/gfx.h @@ -31,11 +31,11 @@ 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, bool sopc); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); -void ReadNtrPalette(char *path, struct Palette *palette); +void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth); 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, int bitdepth); #endif // GFX_H diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 2f5b2735..188bdf0a 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -50,7 +50,7 @@ void ConvertNtrToPng(char *inputPath, char *outputPath, struct GbaToPngOptions * if (options->paletteFilePath != NULL) { - ReadNtrPalette(options->paletteFilePath, &image.palette); + ReadNtrPalette(options->paletteFilePath, &image.palette, options->bitDepth); image.hasPalette = true; } else @@ -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, image.bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); FreeImage(&image); } @@ -320,6 +320,8 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a options.metatileHeight = 1; options.clobberSize = false; options.byteOrder = true; + options.version101 = false; + options.sopc = false; for (int i = 3; i < argc; i++) { @@ -385,6 +387,14 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a { options.byteOrder = false; } + else if (strcmp(option, "-version101") == 0) + { + options.version101 = true; + } + else if (strcmp(option, "-sopc") == 0) + { + options.sopc = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -406,6 +416,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++) { @@ -415,6 +426,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); @@ -422,7 +437,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c } ReadPngPalette(inputPath, &palette); - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir, palette.bitDepth); } void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) @@ -433,11 +448,35 @@ void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc U WriteJascPalette(outputPath, &palette); } -void HandleNtrToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) +void HandleNtrToJascPaletteCommand(char *inputPath, char *outputPath, int argc, char **argv) { struct Palette palette; + int bitdepth = 0; + + for (int i = 3; i < argc; i++) + { + char *option = argv[i]; + + if (strcmp(option, "-bitdepth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No bitdepth following \"-bitdepth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &bitdepth)) + FATAL_ERROR("Failed to parse bitdepth.\n"); - ReadNtrPalette(inputPath, &palette); + if (bitdepth != 4 && bitdepth != 8) + FATAL_ERROR("Bitdepth must be 4 or 8.\n"); + } + else + { + FATAL_ERROR("Unrecognized option \"%s\".\n", option); + } + } + + ReadNtrPalette(inputPath, &palette, bitdepth); WriteJascPalette(outputPath, &palette); } @@ -482,6 +521,8 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, { int numColors = 0; bool ncpr = false; + bool ir = false; + int bitdepth = 0; for (int i = 3; i < argc; i++) { @@ -500,10 +541,27 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, if (numColors < 1) FATAL_ERROR("Number of colors must be positive.\n"); } + if (strcmp(option, "-bitdepth") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No bitdepth following \"-bitdepth\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &bitdepth)) + FATAL_ERROR("Failed to parse bitdepth.\n"); + + if (bitdepth != 4 && bitdepth != 8) + FATAL_ERROR("Bitdepth must be 4 or 8.\n"); + } else if (strcmp(option, "-ncpr") == 0) { ncpr = true; } + else if (strcmp(option, "-ir") == 0) + { + ir = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -517,7 +575,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, if (numColors != 0) palette.numColors = numColors; - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir, bitdepth); } void HandleLatinFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h index 8376348f..dc90a2a2 100644 --- a/tools/nitrogfx/options.h +++ b/tools/nitrogfx/options.h @@ -28,6 +28,8 @@ struct PngToNtrOptions { int metatileHeight; bool clobberSize; bool byteOrder; + bool version101; + bool sopc; }; diff --git a/tools/nitrogfx/util.c b/tools/nitrogfx/util.c index 73a128a1..7dc4ca89 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, uint16_t sectionCount) { 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) { @@ -144,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 f181b66e..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); +void WriteGenericNtrHeader(FILE* fp, const char* magicNumber, uint32_t size, bool byteorder, bool version101, uint16_t sectionCount); #endif // UTIL_H |
