From bd54199157769c90be156ba1c9a46a2ab6f37c30 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 18 Jul 2020 23:58:23 +0100 Subject: extract all trainer back sprites --- files/poketool/trgra/trbgra/.gitignore | 4 +-- files/poketool/trgra/trbgra/narc_0002.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0002.png | Bin 0 -> 1503 bytes files/poketool/trgra/trbgra/narc_0002.png.key | 1 + files/poketool/trgra/trbgra/narc_0003.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0004.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0004.png | Bin 0 -> 1366 bytes files/poketool/trgra/trbgra/narc_0004.png.key | 1 + files/poketool/trgra/trbgra/narc_0005.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0006.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0006.png | Bin 0 -> 1581 bytes files/poketool/trgra/trbgra/narc_0006.png.key | 1 + files/poketool/trgra/trbgra/narc_0007.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0008.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0008.png | Bin 0 -> 1466 bytes files/poketool/trgra/trbgra/narc_0008.png.key | 1 + files/poketool/trgra/trbgra/narc_0009.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0010.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0010.png | Bin 0 -> 1412 bytes files/poketool/trgra/trbgra/narc_0010.png.key | 1 + files/poketool/trgra/trbgra/narc_0011.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0012.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0012.png | Bin 0 -> 1218 bytes files/poketool/trgra/trbgra/narc_0012.png.key | 1 + files/poketool/trgra/trbgra/narc_0013.NCLR | Bin 72 -> 0 bytes files/poketool/trgra/trbgra/narc_0014.NCGR | Bin 6448 -> 0 bytes files/poketool/trgra/trbgra/narc_0014.png | Bin 0 -> 1492 bytes files/poketool/trgra/trbgra/narc_0014.png.key | 1 + files/poketool/trgra/trbgra/narc_0015.NCLR | Bin 72 -> 0 bytes filesystem.mk | 16 +++++++++++- graphics_rules.mk | 36 +++++++++++++++++++++++--- 31 files changed, 56 insertions(+), 7 deletions(-) delete mode 100644 files/poketool/trgra/trbgra/narc_0002.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0002.png create mode 100644 files/poketool/trgra/trbgra/narc_0002.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0003.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0004.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0004.png create mode 100644 files/poketool/trgra/trbgra/narc_0004.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0005.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0006.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0006.png create mode 100644 files/poketool/trgra/trbgra/narc_0006.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0007.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0008.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0008.png create mode 100644 files/poketool/trgra/trbgra/narc_0008.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0009.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0010.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0010.png create mode 100644 files/poketool/trgra/trbgra/narc_0010.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0011.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0012.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0012.png create mode 100644 files/poketool/trgra/trbgra/narc_0012.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0013.NCLR delete mode 100644 files/poketool/trgra/trbgra/narc_0014.NCGR create mode 100644 files/poketool/trgra/trbgra/narc_0014.png create mode 100644 files/poketool/trgra/trbgra/narc_0014.png.key delete mode 100644 files/poketool/trgra/trbgra/narc_0015.NCLR diff --git a/files/poketool/trgra/trbgra/.gitignore b/files/poketool/trgra/trbgra/.gitignore index 849e6ea4..574e26f1 100644 --- a/files/poketool/trgra/trbgra/.gitignore +++ b/files/poketool/trgra/trbgra/.gitignore @@ -1,2 +1,2 @@ -narc_0000.NCGR -narc_0000.NCLR \ No newline at end of file +*.NCGR +*.NCLR diff --git a/files/poketool/trgra/trbgra/narc_0002.NCGR b/files/poketool/trgra/trbgra/narc_0002.NCGR deleted file mode 100644 index bacde954..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0002.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0002.png b/files/poketool/trgra/trbgra/narc_0002.png new file mode 100644 index 00000000..27e75ea2 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0002.png differ diff --git a/files/poketool/trgra/trbgra/narc_0002.png.key b/files/poketool/trgra/trbgra/narc_0002.png.key new file mode 100644 index 00000000..c13045ef --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0002.png.key @@ -0,0 +1 @@ +!ð# \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0003.NCLR b/files/poketool/trgra/trbgra/narc_0003.NCLR deleted file mode 100644 index ddc56db8..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0003.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0004.NCGR b/files/poketool/trgra/trbgra/narc_0004.NCGR deleted file mode 100644 index 3372790e..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0004.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0004.png b/files/poketool/trgra/trbgra/narc_0004.png new file mode 100644 index 00000000..99bf9780 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0004.png differ diff --git a/files/poketool/trgra/trbgra/narc_0004.png.key b/files/poketool/trgra/trbgra/narc_0004.png.key new file mode 100644 index 00000000..7a5ca01d --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0004.png.key @@ -0,0 +1 @@ + Ì¾- \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0005.NCLR b/files/poketool/trgra/trbgra/narc_0005.NCLR deleted file mode 100644 index cf369085..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0005.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0006.NCGR b/files/poketool/trgra/trbgra/narc_0006.NCGR deleted file mode 100644 index daebb303..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0006.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0006.png b/files/poketool/trgra/trbgra/narc_0006.png new file mode 100644 index 00000000..01d527ec Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0006.png differ diff --git a/files/poketool/trgra/trbgra/narc_0006.png.key b/files/poketool/trgra/trbgra/narc_0006.png.key new file mode 100644 index 00000000..a7054634 --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0006.png.key @@ -0,0 +1 @@ +Ê Ž‘ \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0007.NCLR b/files/poketool/trgra/trbgra/narc_0007.NCLR deleted file mode 100644 index 20b35a8e..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0007.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0008.NCGR b/files/poketool/trgra/trbgra/narc_0008.NCGR deleted file mode 100644 index 7c9ba271..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0008.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0008.png b/files/poketool/trgra/trbgra/narc_0008.png new file mode 100644 index 00000000..06634311 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0008.png differ diff --git a/files/poketool/trgra/trbgra/narc_0008.png.key b/files/poketool/trgra/trbgra/narc_0008.png.key new file mode 100644 index 00000000..42659e6d --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0008.png.key @@ -0,0 +1 @@ +=,²u \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0009.NCLR b/files/poketool/trgra/trbgra/narc_0009.NCLR deleted file mode 100644 index d89d3988..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0009.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0010.NCGR b/files/poketool/trgra/trbgra/narc_0010.NCGR deleted file mode 100644 index 93a39c7a..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0010.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0010.png b/files/poketool/trgra/trbgra/narc_0010.png new file mode 100644 index 00000000..5f1f90e7 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0010.png differ diff --git a/files/poketool/trgra/trbgra/narc_0010.png.key b/files/poketool/trgra/trbgra/narc_0010.png.key new file mode 100644 index 00000000..7822b84d --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0010.png.key @@ -0,0 +1 @@ +–? \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0011.NCLR b/files/poketool/trgra/trbgra/narc_0011.NCLR deleted file mode 100644 index 1b323a1d..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0011.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0012.NCGR b/files/poketool/trgra/trbgra/narc_0012.NCGR deleted file mode 100644 index ae073bdc..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0012.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0012.png b/files/poketool/trgra/trbgra/narc_0012.png new file mode 100644 index 00000000..116ff9b9 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0012.png differ diff --git a/files/poketool/trgra/trbgra/narc_0012.png.key b/files/poketool/trgra/trbgra/narc_0012.png.key new file mode 100644 index 00000000..7e331dbe --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0012.png.key @@ -0,0 +1 @@ +\Þ| \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0013.NCLR b/files/poketool/trgra/trbgra/narc_0013.NCLR deleted file mode 100644 index e374a023..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0013.NCLR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0014.NCGR b/files/poketool/trgra/trbgra/narc_0014.NCGR deleted file mode 100644 index a24ae094..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0014.NCGR and /dev/null differ diff --git a/files/poketool/trgra/trbgra/narc_0014.png b/files/poketool/trgra/trbgra/narc_0014.png new file mode 100644 index 00000000..515df0e7 Binary files /dev/null and b/files/poketool/trgra/trbgra/narc_0014.png differ diff --git a/files/poketool/trgra/trbgra/narc_0014.png.key b/files/poketool/trgra/trbgra/narc_0014.png.key new file mode 100644 index 00000000..905bc805 --- /dev/null +++ b/files/poketool/trgra/trbgra/narc_0014.png.key @@ -0,0 +1 @@ +šl†ž \ No newline at end of file diff --git a/files/poketool/trgra/trbgra/narc_0015.NCLR b/files/poketool/trgra/trbgra/narc_0015.NCLR deleted file mode 100644 index 0af3a75d..00000000 Binary files a/files/poketool/trgra/trbgra/narc_0015.NCLR and /dev/null differ diff --git a/filesystem.mk b/filesystem.mk index d5d3cae8..f827943e 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2260,7 +2260,21 @@ files/demo/title/titledemo.narc: \ files/poketool/trgra/trbgra.narc: \ files/poketool/trgra/trbgra/narc_0000.NCGR \ - files/poketool/trgra/trbgra/narc_0000.NCLR + files/poketool/trgra/trbgra/narc_0000.NCLR \ + files/poketool/trgra/trbgra/narc_0002.NCGR \ + files/poketool/trgra/trbgra/narc_0002.NCLR \ + files/poketool/trgra/trbgra/narc_0004.NCGR \ + files/poketool/trgra/trbgra/narc_0004.NCLR \ + files/poketool/trgra/trbgra/narc_0006.NCGR \ + files/poketool/trgra/trbgra/narc_0006.NCLR \ + files/poketool/trgra/trbgra/narc_0008.NCGR \ + files/poketool/trgra/trbgra/narc_0008.NCLR \ + files/poketool/trgra/trbgra/narc_0010.NCGR \ + files/poketool/trgra/trbgra/narc_0010.NCLR \ + files/poketool/trgra/trbgra/narc_0012.NCGR \ + files/poketool/trgra/trbgra/narc_0012.NCLR \ + files/poketool/trgra/trbgra/narc_0014.NCGR \ + files/poketool/trgra/trbgra/narc_0014.NCLR .PHONY: filesystem diff --git a/graphics_rules.mk b/graphics_rules.mk index 95b55503..73294e1d 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -105,9 +105,23 @@ 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 -8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR +8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ + files/poketool/trgra/trbgra/narc_0002.NCLR \ + files/poketool/trgra/trbgra/narc_0004.NCLR \ + files/poketool/trgra/trbgra/narc_0006.NCLR \ + files/poketool/trgra/trbgra/narc_0008.NCLR \ + files/poketool/trgra/trbgra/narc_0010.NCLR \ + files/poketool/trgra/trbgra/narc_0012.NCLR \ + files/poketool/trgra/trbgra/narc_0014.NCLR -SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR +SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR \ + files/poketool/trgra/trbgra/narc_0002.NCGR \ + files/poketool/trgra/trbgra/narc_0004.NCGR \ + files/poketool/trgra/trbgra/narc_0006.NCGR \ + files/poketool/trgra/trbgra/narc_0008.NCGR \ + files/poketool/trgra/trbgra/narc_0010.NCGR \ + files/poketool/trgra/trbgra/narc_0012.NCGR \ + files/poketool/trgra/trbgra/narc_0014.NCGR NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/demo/title/titledemo/narc_0001.NCGR \ @@ -175,7 +189,14 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/itemtool/itemdata/item_icon/narc_0135.NCGR \ files/itemtool/itemdata/item_icon/narc_0136.NCGR \ files/itemtool/itemdata/item_icon/narc_0138.NCGR \ - files/poketool/trgra/trbgra/narc_0000.NCGR + files/poketool/trgra/trbgra/narc_0000.NCGR \ + files/poketool/trgra/trbgra/narc_0002.NCGR \ + files/poketool/trgra/trbgra/narc_0004.NCGR \ + files/poketool/trgra/trbgra/narc_0006.NCGR \ + files/poketool/trgra/trbgra/narc_0008.NCGR \ + files/poketool/trgra/trbgra/narc_0010.NCGR \ + files/poketool/trgra/trbgra/narc_0012.NCGR \ + files/poketool/trgra/trbgra/narc_0014.NCGR NCLR_CLEAN_LIST := files/data/cell0.NCLR \ @@ -269,4 +290,11 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/itemtool/itemdata/item_icon/narc_0134.NCLR \ files/itemtool/itemdata/item_icon/narc_0136.NCLR \ files/itemtool/itemdata/item_icon/narc_0138.NCLR \ - files/poketool/trgra/trbgra/narc_0000.NCLR + files/poketool/trgra/trbgra/narc_0000.NCLR \ + files/poketool/trgra/trbgra/narc_0002.NCLR \ + files/poketool/trgra/trbgra/narc_0004.NCLR \ + files/poketool/trgra/trbgra/narc_0006.NCLR \ + files/poketool/trgra/trbgra/narc_0008.NCLR \ + files/poketool/trgra/trbgra/narc_0010.NCLR \ + files/poketool/trgra/trbgra/narc_0012.NCLR \ + files/poketool/trgra/trbgra/narc_0014.NCLR -- cgit v1.2.3 From 0791e26907187bfe5017f113bdab552d52fe3a12 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 19 Jul 2020 16:58:24 +0100 Subject: palette indexes --- tools/nitrogfx/gfx.c | 22 ++++++++++++++++------ tools/nitrogfx/gfx.h | 2 +- tools/nitrogfx/main.c | 18 ++++++++++++++++-- tools/nitrogfx/options.h | 1 + 4 files changed, 34 insertions(+), 9 deletions(-) diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index c1be2a36..1f414ad7 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -586,7 +586,7 @@ void ReadGbaPalette(char *path, struct Palette *palette) free(data); } -void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth) +void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth, int palIndex) { int fileSize; unsigned char *data = ReadWholeFile(path, &fileSize); @@ -613,13 +613,23 @@ void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth) palette->numColors = bitdepth == 4 ? 16 : 256; //remove header and divide by 2 unsigned char *paletteData = paletteHeader + 0x18; + palIndex = palIndex - 1; - for (int i = 0; i < palette->numColors; i++) + for (int i = 0; i < 256; i++) { - uint16_t paletteEntry = (paletteData[i * 2 + 1] << 8) | paletteData[i * 2]; - palette->colors[i].red = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_RED(paletteEntry)); - palette->colors[i].green = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_GREEN(paletteEntry)); - palette->colors[i].blue = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_BLUE(paletteEntry)); + if (i < palette->numColors) + { + uint16_t paletteEntry = (paletteData[(32 * palIndex) + i * 2 + 1] << 8) | paletteData[(32 * palIndex) + i * 2]; + palette->colors[i].red = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_RED(paletteEntry)); + palette->colors[i].green = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_GREEN(paletteEntry)); + palette->colors[i].blue = UPCONVERT_BIT_DEPTH(GET_GBA_PAL_BLUE(paletteEntry)); + } + else + { + palette->colors[i].red = 0; + palette->colors[i].green = 0; + palette->colors[i].blue = 0; + } } free(data); diff --git a/tools/nitrogfx/gfx.h b/tools/nitrogfx/gfx.h index ef1f493d..e04a781a 100644 --- a/tools/nitrogfx/gfx.h +++ b/tools/nitrogfx/gfx.h @@ -34,7 +34,7 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m 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, bool scanned, uint32_t key); void FreeImage(struct Image *image); void ReadGbaPalette(char *path, struct Palette *palette); -void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth); +void ReadNtrPalette(char *path, struct Palette *palette, int bitdepth, int palIndex); void WriteGbaPalette(char *path, struct Palette *palette); void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr, bool ir, int bitdepth, bool pad, int compNum); diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 942b0d90..35f59d0b 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, options->bitDepth); + ReadNtrPalette(options->paletteFilePath, &image.palette, options->bitDepth, options->palIndex); image.hasPalette = true; } else @@ -205,6 +205,7 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a options.width = 1; options.metatileWidth = 1; options.metatileHeight = 1; + options.palIndex = 1; for (int i = 3; i < argc; i++) { @@ -223,6 +224,19 @@ void HandleNtrToPngCommand(char *inputPath, char *outputPath, int argc, char **a { options.hasTransparency = true; } + else if (strcmp(option, "-palindex") == 0) + { + if (i + 1 >= argc) + FATAL_ERROR("No palette index following \"-palindex\".\n"); + + i++; + + if (!ParseNumber(argv[i], NULL, 10, &options.palIndex)) + FATAL_ERROR("Failed to parse palette index.\n"); + + if (options.width < 1) + FATAL_ERROR("Palette index must be positive.\n"); + } else if (strcmp(option, "-width") == 0) { if (i + 1 >= argc) @@ -539,7 +553,7 @@ void HandleNtrToJascPaletteCommand(char *inputPath, char *outputPath, int argc, } } - ReadNtrPalette(inputPath, &palette, bitdepth); + ReadNtrPalette(inputPath, &palette, bitdepth, 1); WriteJascPalette(outputPath, &palette); } diff --git a/tools/nitrogfx/options.h b/tools/nitrogfx/options.h index b03bd561..8c1e7a0e 100644 --- a/tools/nitrogfx/options.h +++ b/tools/nitrogfx/options.h @@ -12,6 +12,7 @@ struct GbaToPngOptions { int width; int metatileWidth; int metatileHeight; + int palIndex; }; struct PngToGbaOptions { -- cgit v1.2.3 From 5d20e10122470858b31d9520bdb8f77beac6a74b Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 19 Jul 2020 17:15:15 +0100 Subject: few more items --- files/itemtool/itemdata/item_icon/.gitignore | 8 ++++++++ files/itemtool/itemdata/item_icon/narc_0140.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0140.png | Bin 0 -> 256 bytes files/itemtool/itemdata/item_icon/narc_0141.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0142.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0142.png | Bin 0 -> 258 bytes files/itemtool/itemdata/item_icon/narc_0143.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0144.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0144.png | Bin 0 -> 260 bytes files/itemtool/itemdata/item_icon/narc_0145.NCLR | Bin 552 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0146.NCGR | Bin 560 -> 0 bytes files/itemtool/itemdata/item_icon/narc_0146.png | Bin 0 -> 284 bytes files/itemtool/itemdata/item_icon/narc_0147.NCLR | Bin 552 -> 0 bytes filesystem.mk | 10 +++++++++- graphics_rules.mk | 14 +++++++++++++- 15 files changed, 30 insertions(+), 2 deletions(-) delete mode 100644 files/itemtool/itemdata/item_icon/narc_0140.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0140.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0141.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0142.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0142.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0143.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0144.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0144.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0145.NCLR delete mode 100644 files/itemtool/itemdata/item_icon/narc_0146.NCGR create mode 100644 files/itemtool/itemdata/item_icon/narc_0146.png delete mode 100644 files/itemtool/itemdata/item_icon/narc_0147.NCLR diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore index e1591c96..5f446a70 100644 --- a/files/itemtool/itemdata/item_icon/.gitignore +++ b/files/itemtool/itemdata/item_icon/.gitignore @@ -136,3 +136,11 @@ narc_0136.NCGR narc_0136.NCLR narc_0138.NCGR narc_0138.NCLR +narc_0140.NCGR +narc_0140.NCLR +narc_0142.NCGR +narc_0142.NCLR +narc_0144.NCGR +narc_0144.NCLR +narc_0146.NCGR +narc_0146.NCLR diff --git a/files/itemtool/itemdata/item_icon/narc_0140.NCGR b/files/itemtool/itemdata/item_icon/narc_0140.NCGR deleted file mode 100644 index a5d9f0ce..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0140.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0140.png b/files/itemtool/itemdata/item_icon/narc_0140.png new file mode 100644 index 00000000..c625707b Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0140.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0141.NCLR b/files/itemtool/itemdata/item_icon/narc_0141.NCLR deleted file mode 100644 index 8a761e03..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0141.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0142.NCGR b/files/itemtool/itemdata/item_icon/narc_0142.NCGR deleted file mode 100644 index 0a39cd41..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0142.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0142.png b/files/itemtool/itemdata/item_icon/narc_0142.png new file mode 100644 index 00000000..67c1f879 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0142.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0143.NCLR b/files/itemtool/itemdata/item_icon/narc_0143.NCLR deleted file mode 100644 index 8942e239..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0143.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0144.NCGR b/files/itemtool/itemdata/item_icon/narc_0144.NCGR deleted file mode 100644 index 70bc184d..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0144.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0144.png b/files/itemtool/itemdata/item_icon/narc_0144.png new file mode 100644 index 00000000..0840b8c2 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0144.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0145.NCLR b/files/itemtool/itemdata/item_icon/narc_0145.NCLR deleted file mode 100644 index fc288d02..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0145.NCLR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0146.NCGR b/files/itemtool/itemdata/item_icon/narc_0146.NCGR deleted file mode 100644 index 6e38d57f..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0146.NCGR and /dev/null differ diff --git a/files/itemtool/itemdata/item_icon/narc_0146.png b/files/itemtool/itemdata/item_icon/narc_0146.png new file mode 100644 index 00000000..35b63f11 Binary files /dev/null and b/files/itemtool/itemdata/item_icon/narc_0146.png differ diff --git a/files/itemtool/itemdata/item_icon/narc_0147.NCLR b/files/itemtool/itemdata/item_icon/narc_0147.NCLR deleted file mode 100644 index 505f60a5..00000000 Binary files a/files/itemtool/itemdata/item_icon/narc_0147.NCLR and /dev/null differ diff --git a/filesystem.mk b/filesystem.mk index f827943e..2fb01e81 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -1697,7 +1697,15 @@ files/itemtool/itemdata/item_icon.narc: \ files/itemtool/itemdata/item_icon/narc_0136.NCGR \ files/itemtool/itemdata/item_icon/narc_0136.NCLR \ files/itemtool/itemdata/item_icon/narc_0138.NCGR \ - files/itemtool/itemdata/item_icon/narc_0138.NCLR + files/itemtool/itemdata/item_icon/narc_0138.NCLR \ + files/itemtool/itemdata/item_icon/narc_0140.NCGR \ + files/itemtool/itemdata/item_icon/narc_0140.NCLR \ + files/itemtool/itemdata/item_icon/narc_0142.NCGR \ + files/itemtool/itemdata/item_icon/narc_0142.NCLR \ + files/itemtool/itemdata/item_icon/narc_0144.NCGR \ + files/itemtool/itemdata/item_icon/narc_0144.NCLR \ + files/itemtool/itemdata/item_icon/narc_0146.NCGR \ + files/itemtool/itemdata/item_icon/narc_0146.NCLR files/application/custom_ball/data/cb_data.narc: \ diff --git a/graphics_rules.mk b/graphics_rules.mk index 73294e1d..993f9e4b 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -63,7 +63,11 @@ CLOBBER_SIZE_VERSION101_NCGR_FILES := files/graphic/bag_gra/narc_0002.NCGR \ files/itemtool/itemdata/item_icon/narc_0133.NCGR \ files/itemtool/itemdata/item_icon/narc_0135.NCGR \ files/itemtool/itemdata/item_icon/narc_0136.NCGR \ - files/itemtool/itemdata/item_icon/narc_0138.NCGR + files/itemtool/itemdata/item_icon/narc_0138.NCGR \ + files/itemtool/itemdata/item_icon/narc_0140.NCGR \ + files/itemtool/itemdata/item_icon/narc_0142.NCGR \ + files/itemtool/itemdata/item_icon/narc_0144.NCGR \ + files/itemtool/itemdata/item_icon/narc_0146.NCGR 4BPP_NCLR_FILES := files/demo/title/titledemo/narc_0016.NCLR @@ -189,6 +193,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/itemtool/itemdata/item_icon/narc_0135.NCGR \ files/itemtool/itemdata/item_icon/narc_0136.NCGR \ files/itemtool/itemdata/item_icon/narc_0138.NCGR \ + files/itemtool/itemdata/item_icon/narc_0140.NCGR \ + files/itemtool/itemdata/item_icon/narc_0142.NCGR \ + files/itemtool/itemdata/item_icon/narc_0144.NCGR \ + files/itemtool/itemdata/item_icon/narc_0146.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -290,6 +298,10 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/itemtool/itemdata/item_icon/narc_0134.NCLR \ files/itemtool/itemdata/item_icon/narc_0136.NCLR \ files/itemtool/itemdata/item_icon/narc_0138.NCLR \ + files/itemtool/itemdata/item_icon/narc_0140.NCLR \ + files/itemtool/itemdata/item_icon/narc_0142.NCLR \ + files/itemtool/itemdata/item_icon/narc_0144.NCLR \ + files/itemtool/itemdata/item_icon/narc_0146.NCLR \ files/poketool/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ files/poketool/trgra/trbgra/narc_0004.NCLR \ -- cgit v1.2.3 From 52a9fc4ec63c3aa0e3c252b74968d06f144559d3 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 19 Jul 2020 17:47:57 +0100 Subject: extract bulbasaur --- Makefile | 5 +++- files/poketool/pokegra/pokegra/.gitignore | 6 +++++ files/poketool/pokegra/pokegra/.knarcignore | 1 + files/poketool/pokegra/pokegra/narc_0006.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0006.png | Bin 0 -> 695 bytes files/poketool/pokegra/pokegra/narc_0006.png.key | 1 + files/poketool/pokegra/pokegra/narc_0007.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0007.png | Bin 0 -> 695 bytes files/poketool/pokegra/pokegra/narc_0007.png.key | 1 + files/poketool/pokegra/pokegra/narc_0008.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0008.png | Bin 0 -> 957 bytes files/poketool/pokegra/pokegra/narc_0008.png.key | 1 + files/poketool/pokegra/pokegra/narc_0009.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0009.png | Bin 0 -> 957 bytes files/poketool/pokegra/pokegra/narc_0009.png.key | 1 + files/poketool/pokegra/pokegra/narc_0010.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0010.pal | 19 ++++++++++++++ files/poketool/pokegra/pokegra/narc_0011.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0011.pal | 19 ++++++++++++++ filesystem.mk | 8 ++++++ graphics_rules.mk | 31 ++++++++++++++++------- 21 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 files/poketool/pokegra/pokegra/.gitignore delete mode 100644 files/poketool/pokegra/pokegra/narc_0006.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0006.png create mode 100644 files/poketool/pokegra/pokegra/narc_0006.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0007.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0007.png create mode 100644 files/poketool/pokegra/pokegra/narc_0007.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0008.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0008.png create mode 100644 files/poketool/pokegra/pokegra/narc_0008.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0009.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0009.png create mode 100644 files/poketool/pokegra/pokegra/narc_0009.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0010.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0010.pal delete mode 100644 files/poketool/pokegra/pokegra/narc_0011.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0011.pal diff --git a/Makefile b/Makefile index f0fc0cb1..7a9b1e06 100644 --- a/Makefile +++ b/Makefile @@ -275,7 +275,10 @@ $(IR_NCLR_FILES): %.NCLR: %.pal $(4BPP_NCLR_FILES): %.NCLR: %.pal $(GFX) $< $@ -bitdepth 4 -$(8BPP_COMP10_NOPAD_NCLR_FILES): %.NCLR: %.png +$(8BPP_COMP10_NOPAD_NCLR_PNG_FILES): %.NCLR: %.png + $(GFX) $< $@ -bitdepth 8 -nopad -comp 10 + +$(8BPP_COMP10_NOPAD_NCLR_PAL_FILES): %.NCLR: %.pal $(GFX) $< $@ -bitdepth 8 -nopad -comp 10 %.png: ; diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore new file mode 100644 index 00000000..125c2ffb --- /dev/null +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -0,0 +1,6 @@ +narc_0006.NCGR +narc_0007.NCGR +narc_0008.NCGR +narc_0009.NCGR +narc_0010.NCLR +narc_0011.NCLR diff --git a/files/poketool/pokegra/pokegra/.knarcignore b/files/poketool/pokegra/pokegra/.knarcignore index 2856080a..e2f57de1 100644 --- a/files/poketool/pokegra/pokegra/.knarcignore +++ b/files/poketool/pokegra/pokegra/.knarcignore @@ -1,2 +1,3 @@ *.png *.pal +*.key diff --git a/files/poketool/pokegra/pokegra/narc_0006.NCGR b/files/poketool/pokegra/pokegra/narc_0006.NCGR deleted file mode 100644 index 7f45ac31..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0006.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0006.png b/files/poketool/pokegra/pokegra/narc_0006.png new file mode 100644 index 00000000..4c8dff0a Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0006.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0006.png.key b/files/poketool/pokegra/pokegra/narc_0006.png.key new file mode 100644 index 00000000..5ba0d100 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0006.png.key @@ -0,0 +1 @@ +íˆó diff --git a/files/poketool/pokegra/pokegra/narc_0007.NCGR b/files/poketool/pokegra/pokegra/narc_0007.NCGR deleted file mode 100644 index 7f45ac31..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0007.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0007.png b/files/poketool/pokegra/pokegra/narc_0007.png new file mode 100644 index 00000000..4c8dff0a Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0007.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0007.png.key b/files/poketool/pokegra/pokegra/narc_0007.png.key new file mode 100644 index 00000000..5ba0d100 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0007.png.key @@ -0,0 +1 @@ +íˆó diff --git a/files/poketool/pokegra/pokegra/narc_0008.NCGR b/files/poketool/pokegra/pokegra/narc_0008.NCGR deleted file mode 100644 index 75a92927..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0008.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0008.png b/files/poketool/pokegra/pokegra/narc_0008.png new file mode 100644 index 00000000..05866d74 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0008.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0008.png.key b/files/poketool/pokegra/pokegra/narc_0008.png.key new file mode 100644 index 00000000..9738ac81 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0008.png.key @@ -0,0 +1 @@ +†þ½ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0009.NCGR b/files/poketool/pokegra/pokegra/narc_0009.NCGR deleted file mode 100644 index 75a92927..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0009.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0009.png b/files/poketool/pokegra/pokegra/narc_0009.png new file mode 100644 index 00000000..05866d74 Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0009.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0009.png.key b/files/poketool/pokegra/pokegra/narc_0009.png.key new file mode 100644 index 00000000..9738ac81 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0009.png.key @@ -0,0 +1 @@ +†þ½ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0010.NCLR b/files/poketool/pokegra/pokegra/narc_0010.NCLR deleted file mode 100644 index 9148703e..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0010.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0010.pal b/files/poketool/pokegra/pokegra/narc_0010.pal new file mode 100644 index 00000000..68bc65c7 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0010.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 213 180 +255 255 255 +131 238 197 +98 213 180 +57 148 148 +24 74 74 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +189 255 115 +164 213 65 +115 172 49 +82 98 41 +255 0 255 diff --git a/files/poketool/pokegra/pokegra/narc_0011.NCLR b/files/poketool/pokegra/pokegra/narc_0011.NCLR deleted file mode 100644 index ae1a8672..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0011.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0011.pal b/files/poketool/pokegra/pokegra/narc_0011.pal new file mode 100644 index 00000000..fc5cd190 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0011.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 213 180 +255 255 255 +197 246 82 +156 213 74 +115 164 49 +49 98 32 +255 106 98 +222 74 65 +189 41 32 +205 205 205 +16 16 16 +98 222 57 +41 172 16 +0 131 32 +0 90 0 +255 0 255 diff --git a/filesystem.mk b/filesystem.mk index 2fb01e81..0f5b8bcd 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2284,6 +2284,14 @@ files/poketool/trgra/trbgra.narc: \ files/poketool/trgra/trbgra/narc_0014.NCGR \ files/poketool/trgra/trbgra/narc_0014.NCLR +files/poketool/pokegra/pokegra.narc: \ + files/poketool/pokegra/pokegra/narc_0006.NCGR \ + files/poketool/pokegra/pokegra/narc_0007.NCGR \ + files/poketool/pokegra/pokegra/narc_0008.NCGR \ + files/poketool/pokegra/pokegra/narc_0009.NCGR \ + files/poketool/pokegra/pokegra/narc_0010.NCLR \ + files/poketool/pokegra/pokegra/narc_0011.NCLR + .PHONY: filesystem filesystem: $(HOSTFS_FILES) diff --git a/graphics_rules.mk b/graphics_rules.mk index 993f9e4b..a5b3bb70 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -109,16 +109,23 @@ 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 -8BPP_COMP10_NOPAD_NCLR_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ - files/poketool/trgra/trbgra/narc_0002.NCLR \ - files/poketool/trgra/trbgra/narc_0004.NCLR \ - files/poketool/trgra/trbgra/narc_0006.NCLR \ - files/poketool/trgra/trbgra/narc_0008.NCLR \ - files/poketool/trgra/trbgra/narc_0010.NCLR \ - files/poketool/trgra/trbgra/narc_0012.NCLR \ - files/poketool/trgra/trbgra/narc_0014.NCLR +8BPP_COMP10_NOPAD_NCLR_PNG_FILES := files/poketool/trgra/trbgra/narc_0000.NCLR \ + files/poketool/trgra/trbgra/narc_0002.NCLR \ + files/poketool/trgra/trbgra/narc_0004.NCLR \ + files/poketool/trgra/trbgra/narc_0006.NCLR \ + files/poketool/trgra/trbgra/narc_0008.NCLR \ + files/poketool/trgra/trbgra/narc_0010.NCLR \ + files/poketool/trgra/trbgra/narc_0012.NCLR \ + files/poketool/trgra/trbgra/narc_0014.NCLR -SCANNED_NCGR_FILES := files/poketool/trgra/trbgra/narc_0000.NCGR \ +8BPP_COMP10_NOPAD_NCLR_PAL_FILES := files/poketool/pokegra/pokegra/narc_0010.NCLR \ + files/poketool/pokegra/pokegra/narc_0011.NCLR + +SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \ + files/poketool/pokegra/pokegra/narc_0007.NCGR \ + files/poketool/pokegra/pokegra/narc_0008.NCGR \ + files/poketool/pokegra/pokegra/narc_0009.NCGR \ + files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ files/poketool/trgra/trbgra/narc_0006.NCGR \ @@ -197,6 +204,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/itemtool/itemdata/item_icon/narc_0142.NCGR \ files/itemtool/itemdata/item_icon/narc_0144.NCGR \ files/itemtool/itemdata/item_icon/narc_0146.NCGR \ + files/poketool/pokegra/pokegra/narc_0006.NCGR \ + files/poketool/pokegra/pokegra/narc_0007.NCGR \ + files/poketool/pokegra/pokegra/narc_0008.NCGR \ + files/poketool/pokegra/pokegra/narc_0009.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -302,6 +313,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/itemtool/itemdata/item_icon/narc_0142.NCLR \ files/itemtool/itemdata/item_icon/narc_0144.NCLR \ files/itemtool/itemdata/item_icon/narc_0146.NCLR \ + files/poketool/pokegra/pokegra/narc_0010.NCLR \ + files/poketool/pokegra/pokegra/narc_0011.NCLR \ files/poketool/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ files/poketool/trgra/trbgra/narc_0004.NCLR \ -- cgit v1.2.3 From e312ef2117a7ffaffb05f84e2526b947a4591c69 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 19 Jul 2020 18:01:23 +0100 Subject: ivysaur --- files/poketool/pokegra/pokegra/.gitignore | 6 ++++++ files/poketool/pokegra/pokegra/narc_0012.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0012.png | Bin 0 -> 977 bytes files/poketool/pokegra/pokegra/narc_0012.png.key | 1 + files/poketool/pokegra/pokegra/narc_0013.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0013.png | Bin 0 -> 977 bytes files/poketool/pokegra/pokegra/narc_0013.png.key | 1 + files/poketool/pokegra/pokegra/narc_0014.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0014.png | Bin 0 -> 1222 bytes files/poketool/pokegra/pokegra/narc_0014.png.key | 1 + files/poketool/pokegra/pokegra/narc_0015.NCGR | Bin 6448 -> 0 bytes files/poketool/pokegra/pokegra/narc_0015.png | Bin 0 -> 1222 bytes files/poketool/pokegra/pokegra/narc_0015.png.key | 1 + files/poketool/pokegra/pokegra/narc_0016.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0016.pal | 19 +++++++++++++++++++ files/poketool/pokegra/pokegra/narc_0017.NCLR | Bin 72 -> 0 bytes files/poketool/pokegra/pokegra/narc_0017.pal | 19 +++++++++++++++++++ filesystem.mk | 8 +++++++- graphics_rules.mk | 14 +++++++++++++- 19 files changed, 68 insertions(+), 2 deletions(-) delete mode 100644 files/poketool/pokegra/pokegra/narc_0012.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0012.png create mode 100644 files/poketool/pokegra/pokegra/narc_0012.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0013.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0013.png create mode 100644 files/poketool/pokegra/pokegra/narc_0013.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0014.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0014.png create mode 100644 files/poketool/pokegra/pokegra/narc_0014.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0015.NCGR create mode 100644 files/poketool/pokegra/pokegra/narc_0015.png create mode 100644 files/poketool/pokegra/pokegra/narc_0015.png.key delete mode 100644 files/poketool/pokegra/pokegra/narc_0016.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0016.pal delete mode 100644 files/poketool/pokegra/pokegra/narc_0017.NCLR create mode 100644 files/poketool/pokegra/pokegra/narc_0017.pal diff --git a/files/poketool/pokegra/pokegra/.gitignore b/files/poketool/pokegra/pokegra/.gitignore index 125c2ffb..cdabb31c 100644 --- a/files/poketool/pokegra/pokegra/.gitignore +++ b/files/poketool/pokegra/pokegra/.gitignore @@ -4,3 +4,9 @@ narc_0008.NCGR narc_0009.NCGR narc_0010.NCLR narc_0011.NCLR +narc_0012.NCGR +narc_0013.NCGR +narc_0014.NCGR +narc_0015.NCGR +narc_0016.NCLR +narc_0017.NCLR diff --git a/files/poketool/pokegra/pokegra/narc_0012.NCGR b/files/poketool/pokegra/pokegra/narc_0012.NCGR deleted file mode 100644 index c876c941..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0012.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0012.png b/files/poketool/pokegra/pokegra/narc_0012.png new file mode 100644 index 00000000..b465bf5e Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0012.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0012.png.key b/files/poketool/pokegra/pokegra/narc_0012.png.key new file mode 100644 index 00000000..d709c778 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0012.png.key @@ -0,0 +1 @@ +àG•% \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0013.NCGR b/files/poketool/pokegra/pokegra/narc_0013.NCGR deleted file mode 100644 index c876c941..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0013.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0013.png b/files/poketool/pokegra/pokegra/narc_0013.png new file mode 100644 index 00000000..b465bf5e Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0013.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0013.png.key b/files/poketool/pokegra/pokegra/narc_0013.png.key new file mode 100644 index 00000000..d709c778 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0013.png.key @@ -0,0 +1 @@ +àG•% \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0014.NCGR b/files/poketool/pokegra/pokegra/narc_0014.NCGR deleted file mode 100644 index 2bb74828..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0014.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0014.png b/files/poketool/pokegra/pokegra/narc_0014.png new file mode 100644 index 00000000..8607b9ee Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0014.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0014.png.key b/files/poketool/pokegra/pokegra/narc_0014.png.key new file mode 100644 index 00000000..c3ae04de --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0014.png.key @@ -0,0 +1 @@ +¤Ú€€ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0015.NCGR b/files/poketool/pokegra/pokegra/narc_0015.NCGR deleted file mode 100644 index 2bb74828..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0015.NCGR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0015.png b/files/poketool/pokegra/pokegra/narc_0015.png new file mode 100644 index 00000000..8607b9ee Binary files /dev/null and b/files/poketool/pokegra/pokegra/narc_0015.png differ diff --git a/files/poketool/pokegra/pokegra/narc_0015.png.key b/files/poketool/pokegra/pokegra/narc_0015.png.key new file mode 100644 index 00000000..c3ae04de --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0015.png.key @@ -0,0 +1 @@ +¤Ú€€ \ No newline at end of file diff --git a/files/poketool/pokegra/pokegra/narc_0016.NCLR b/files/poketool/pokegra/pokegra/narc_0016.NCLR deleted file mode 100644 index 3d460dcb..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0016.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0016.pal b/files/poketool/pokegra/pokegra/narc_0016.pal new file mode 100644 index 00000000..1db34fcf --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0016.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 172 164 +255 123 123 +213 65 90 +131 238 197 +90 205 148 +32 148 90 +16 65 74 +131 230 90 +106 180 32 +74 139 32 +16 82 32 +197 115 57 +123 49 41 +16 16 16 diff --git a/files/poketool/pokegra/pokegra/narc_0017.NCLR b/files/poketool/pokegra/pokegra/narc_0017.NCLR deleted file mode 100644 index e27047dd..00000000 Binary files a/files/poketool/pokegra/pokegra/narc_0017.NCLR and /dev/null differ diff --git a/files/poketool/pokegra/pokegra/narc_0017.pal b/files/poketool/pokegra/pokegra/narc_0017.pal new file mode 100644 index 00000000..c4cfa8d7 --- /dev/null +++ b/files/poketool/pokegra/pokegra/narc_0017.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 172 +255 255 255 +255 255 156 +255 213 0 +205 139 16 +205 246 82 +164 213 74 +123 164 49 +57 98 32 +139 222 74 +90 172 32 +49 131 49 +49 90 16 +213 98 57 +139 32 41 +16 16 16 diff --git a/filesystem.mk b/filesystem.mk index 0f5b8bcd..cb5ea2a1 100644 --- a/filesystem.mk +++ b/filesystem.mk @@ -2290,7 +2290,13 @@ files/poketool/pokegra/pokegra.narc: \ files/poketool/pokegra/pokegra/narc_0008.NCGR \ files/poketool/pokegra/pokegra/narc_0009.NCGR \ files/poketool/pokegra/pokegra/narc_0010.NCLR \ - files/poketool/pokegra/pokegra/narc_0011.NCLR + files/poketool/pokegra/pokegra/narc_0011.NCLR \ + files/poketool/pokegra/pokegra/narc_0012.NCGR \ + files/poketool/pokegra/pokegra/narc_0013.NCGR \ + files/poketool/pokegra/pokegra/narc_0014.NCGR \ + files/poketool/pokegra/pokegra/narc_0015.NCGR \ + files/poketool/pokegra/pokegra/narc_0016.NCLR \ + files/poketool/pokegra/pokegra/narc_0017.NCLR .PHONY: filesystem diff --git a/graphics_rules.mk b/graphics_rules.mk index a5b3bb70..5e498cfd 100644 --- a/graphics_rules.mk +++ b/graphics_rules.mk @@ -119,12 +119,18 @@ VERSION101_SOPC_NCGR_FILES := files/demo/title/titledemo/narc_0007.NCGR \ files/poketool/trgra/trbgra/narc_0014.NCLR 8BPP_COMP10_NOPAD_NCLR_PAL_FILES := files/poketool/pokegra/pokegra/narc_0010.NCLR \ - files/poketool/pokegra/pokegra/narc_0011.NCLR + files/poketool/pokegra/pokegra/narc_0011.NCLR \ + files/poketool/pokegra/pokegra/narc_0016.NCLR \ + files/poketool/pokegra/pokegra/narc_0017.NCLR SCANNED_NCGR_FILES := files/poketool/pokegra/pokegra/narc_0006.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ files/poketool/pokegra/pokegra/narc_0008.NCGR \ files/poketool/pokegra/pokegra/narc_0009.NCGR \ + files/poketool/pokegra/pokegra/narc_0012.NCGR \ + files/poketool/pokegra/pokegra/narc_0013.NCGR \ + files/poketool/pokegra/pokegra/narc_0014.NCGR \ + files/poketool/pokegra/pokegra/narc_0015.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -208,6 +214,10 @@ NCGR_CLEAN_LIST := files/data/cell0.NCGR \ files/poketool/pokegra/pokegra/narc_0007.NCGR \ files/poketool/pokegra/pokegra/narc_0008.NCGR \ files/poketool/pokegra/pokegra/narc_0009.NCGR \ + files/poketool/pokegra/pokegra/narc_0012.NCGR \ + files/poketool/pokegra/pokegra/narc_0013.NCGR \ + files/poketool/pokegra/pokegra/narc_0014.NCGR \ + files/poketool/pokegra/pokegra/narc_0015.NCGR \ files/poketool/trgra/trbgra/narc_0000.NCGR \ files/poketool/trgra/trbgra/narc_0002.NCGR \ files/poketool/trgra/trbgra/narc_0004.NCGR \ @@ -315,6 +325,8 @@ NCLR_CLEAN_LIST := files/data/cell0.NCLR \ files/itemtool/itemdata/item_icon/narc_0146.NCLR \ files/poketool/pokegra/pokegra/narc_0010.NCLR \ files/poketool/pokegra/pokegra/narc_0011.NCLR \ + files/poketool/pokegra/pokegra/narc_0016.NCLR \ + files/poketool/pokegra/pokegra/narc_0017.NCLR \ files/poketool/trgra/trbgra/narc_0000.NCLR \ files/poketool/trgra/trbgra/narc_0002.NCLR \ files/poketool/trgra/trbgra/narc_0004.NCLR \ -- cgit v1.2.3