From cc5a1e59920fe0ed975af40aa49b7870832323af Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 6 Jun 2020 23:58:19 +0100 Subject: palette conversion --- tools/nitrogfx/gfx.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index f927deed..25c346db 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -322,6 +322,39 @@ void ReadGbaPalette(char *path, struct Palette *palette) free(data); } +void ReadNtrPalette(char *path, struct Palette *palette) +{ + int fileSize; + unsigned char *data = ReadWholeFile(path, &fileSize); + + uint32_t magicNumber = (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0]; + if (magicNumber != 0x4E434C52) //NCLR + FATAL_ERROR("Not a valid NCLR palette file. Magic number (%x).\n", magicNumber); + + unsigned char *paletteHeader = data + 0x10; + + magicNumber = (paletteHeader[3] << 24) | (paletteHeader[2] << 16) | (paletteHeader[1] << 8) | paletteHeader[0]; + if (magicNumber != 0x504C5454) //PLTT + FATAL_ERROR("No valid PLTT file after NCLR header. Magic number (%x).\n", magicNumber); + + if ((fileSize - 0x28) % 2 != 0) + FATAL_ERROR("The file size (%d) is not a multiple of 2.\n", fileSize); + + palette->numColors = (fileSize - 0x28) / 2; //remove header and divide by 2 + + unsigned char *paletteData = paletteHeader + 0x18; + + for (int i = 0; i < palette->numColors; 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)); + } + + free(data); +} + void WriteGbaPalette(char *path, struct Palette *palette) { FILE *fp = fopen(path, "wb"); @@ -342,3 +375,65 @@ void WriteGbaPalette(char *path, struct Palette *palette) fclose(fp); } + +void WriteNtrPalette(char *path, struct Palette *palette) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed too open \"%s\" for writing.\n", path); + + uint32_t size = palette->numColors * 2; + uint32_t extSize = size + 0x18; + + //NCLR header + WriteGenericNtrHeader(fp, "RLCN", extSize); + + //PLTT header + //magic number + fputs("TTLP", fp); + + //section size + fputc(extSize & 0xFF, fp); + fputc((extSize >> 8) & 0xFF, fp); + fputc((extSize >> 16) & 0xFF, fp); + fputc((extSize >> 24) & 0xFF, fp); + + //bit depth + fputc(0x03, fp); //todo figure out a way to determine bit depth + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //padding + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //size + fputc(size & 0xFF, fp); + fputc((size >> 8) & 0xFF, fp); + fputc((size >> 16) & 0xFF, fp); + fputc((size >> 24) & 0xFF, fp); + + //colours per palette + fputc(0x10, fp); + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //palette data + for (int i = 0; i < palette->numColors; i++) { + unsigned char red = DOWNCONVERT_BIT_DEPTH(palette->colors[i].red); + unsigned char green = DOWNCONVERT_BIT_DEPTH(palette->colors[i].green); + unsigned char blue = DOWNCONVERT_BIT_DEPTH(palette->colors[i].blue); + + uint16_t paletteEntry = SET_GBA_PAL(red, green, blue); + + fputc(paletteEntry & 0xFF, fp); + fputc(paletteEntry >> 8, fp); + } + + fclose(fp); +} -- cgit v1.2.3 From cc67cafa094351a033f295d054380acc63fddd78 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 15:57:16 +0100 Subject: fix bitdepth --- tools/nitrogfx/gfx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 25c346db..bb6ff442 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -400,7 +400,8 @@ void WriteNtrPalette(char *path, struct Palette *palette) fputc((extSize >> 24) & 0xFF, fp); //bit depth - fputc(0x03, fp); //todo figure out a way to determine bit depth + char bitDepth = palette->bitDepth == 4 ? 0x03: 0x04; + fputc(bitDepth, fp); fputc(0x00, fp); fputc(0x00, fp); fputc(0x00, fp); -- cgit v1.2.3 From 28bffae5bc2b497329e04dbae842d3b6fe3024d8 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 16:46:28 +0100 Subject: ncpr palette support --- tools/nitrogfx/gfx.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index bb6ff442..8a10efe2 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -328,8 +328,8 @@ void ReadNtrPalette(char *path, struct Palette *palette) unsigned char *data = ReadWholeFile(path, &fileSize); uint32_t magicNumber = (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0]; - if (magicNumber != 0x4E434C52) //NCLR - FATAL_ERROR("Not a valid NCLR palette file. Magic number (%x).\n", magicNumber); + if (magicNumber != 0x4E434C52 && magicNumber != 0x4E435052) //NCLR / NCPR + FATAL_ERROR("Not a valid NCLR or NCPR palette file. Magic number (%x).\n", magicNumber); unsigned char *paletteHeader = data + 0x10; @@ -376,7 +376,7 @@ void WriteGbaPalette(char *path, struct Palette *palette) fclose(fp); } -void WriteNtrPalette(char *path, struct Palette *palette) +void WriteNtrNCLRPalette(char *path, struct Palette *palette) { FILE *fp = fopen(path, "wb"); @@ -387,7 +387,70 @@ void WriteNtrPalette(char *path, struct Palette *palette) uint32_t extSize = size + 0x18; //NCLR header - WriteGenericNtrHeader(fp, "RLCN", extSize); + WriteGenericNtrHeader(fp, "RLCN", extSize, true); + + //PLTT header + //magic number + fputs("TTLP", fp); + + //section size + fputc(extSize & 0xFF, fp); + fputc((extSize >> 8) & 0xFF, fp); + fputc((extSize >> 16) & 0xFF, fp); + fputc((extSize >> 24) & 0xFF, fp); + + //bit depth + char bitDepth = palette->bitDepth == 4 ? 0x03: 0x04; + fputc(bitDepth, fp); + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //padding + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //size + fputc(size & 0xFF, fp); + fputc((size >> 8) & 0xFF, fp); + fputc((size >> 16) & 0xFF, fp); + fputc((size >> 24) & 0xFF, fp); + + //colours per palette + fputc(0x10, fp); + fputc(0x00, fp); + fputc(0x00, fp); + fputc(0x00, fp); + + //palette data + for (int i = 0; i < palette->numColors; i++) { + unsigned char red = DOWNCONVERT_BIT_DEPTH(palette->colors[i].red); + unsigned char green = DOWNCONVERT_BIT_DEPTH(palette->colors[i].green); + unsigned char blue = DOWNCONVERT_BIT_DEPTH(palette->colors[i].blue); + + uint16_t paletteEntry = SET_GBA_PAL(red, green, blue); + + fputc(paletteEntry & 0xFF, fp); + fputc(paletteEntry >> 8, fp); + } + + fclose(fp); +} + +void WriteNtrNCPRPalette(char *path, struct Palette *palette) +{ + FILE *fp = fopen(path, "wb"); + + if (fp == NULL) + FATAL_ERROR("Failed too open \"%s\" for writing.\n", path); + + uint32_t size = palette->numColors * 2; + uint32_t extSize = size + 0x10; + + //NCLR header + WriteGenericNtrHeader(fp, "RPCN", extSize, false); //PLTT header //magic number -- cgit v1.2.3 From 6bd0b1970c1b096d9791c8ea1515e0f722fd99a8 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 17:34:32 +0100 Subject: bit of cleanup --- tools/nitrogfx/gfx.c | 69 +++------------------------------------------------- 1 file changed, 3 insertions(+), 66 deletions(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 8a10efe2..92483228 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -376,7 +376,7 @@ void WriteGbaPalette(char *path, struct Palette *palette) fclose(fp); } -void WriteNtrNCLRPalette(char *path, struct Palette *palette) +void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) { FILE *fp = fopen(path, "wb"); @@ -384,73 +384,10 @@ void WriteNtrNCLRPalette(char *path, struct Palette *palette) FATAL_ERROR("Failed too open \"%s\" for writing.\n", path); uint32_t size = palette->numColors * 2; - uint32_t extSize = size + 0x18; + uint32_t extSize = size + (ncpr ? 0x10 : 0x18); //NCLR header - WriteGenericNtrHeader(fp, "RLCN", extSize, true); - - //PLTT header - //magic number - fputs("TTLP", fp); - - //section size - fputc(extSize & 0xFF, fp); - fputc((extSize >> 8) & 0xFF, fp); - fputc((extSize >> 16) & 0xFF, fp); - fputc((extSize >> 24) & 0xFF, fp); - - //bit depth - char bitDepth = palette->bitDepth == 4 ? 0x03: 0x04; - fputc(bitDepth, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - - //padding - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - - //size - fputc(size & 0xFF, fp); - fputc((size >> 8) & 0xFF, fp); - fputc((size >> 16) & 0xFF, fp); - fputc((size >> 24) & 0xFF, fp); - - //colours per palette - fputc(0x10, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - - //palette data - for (int i = 0; i < palette->numColors; i++) { - unsigned char red = DOWNCONVERT_BIT_DEPTH(palette->colors[i].red); - unsigned char green = DOWNCONVERT_BIT_DEPTH(palette->colors[i].green); - unsigned char blue = DOWNCONVERT_BIT_DEPTH(palette->colors[i].blue); - - uint16_t paletteEntry = SET_GBA_PAL(red, green, blue); - - fputc(paletteEntry & 0xFF, fp); - fputc(paletteEntry >> 8, fp); - } - - fclose(fp); -} - -void WriteNtrNCPRPalette(char *path, struct Palette *palette) -{ - FILE *fp = fopen(path, "wb"); - - if (fp == NULL) - FATAL_ERROR("Failed too open \"%s\" for writing.\n", path); - - uint32_t size = palette->numColors * 2; - uint32_t extSize = size + 0x10; - - //NCLR header - WriteGenericNtrHeader(fp, "RPCN", extSize, false); + WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr); //PLTT header //magic number -- cgit v1.2.3 From 550c03c212bee4096c3b2174f8b9d32d655843ec Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 20:18:30 +0100 Subject: cleanup and address issues --- tools/nitrogfx/gfx.c | 60 +++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 92483228..ad2b313e 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -1,5 +1,6 @@ // Copyright (c) 2015 YamaArashi +#include #include #include #include @@ -327,15 +328,17 @@ void ReadNtrPalette(char *path, struct Palette *palette) int fileSize; unsigned char *data = ReadWholeFile(path, &fileSize); - uint32_t magicNumber = (data[3] << 24) | (data[2] << 16) | (data[1] << 8) | data[0]; - if (magicNumber != 0x4E434C52 && magicNumber != 0x4E435052) //NCLR / NCPR - FATAL_ERROR("Not a valid NCLR or NCPR palette file. Magic number (%x).\n", magicNumber); + if (memcmp(data, "RLCN", 4) != 0 && memcmp(data, "RPCN", 4) != 0) //NCLR / NCPR + { + FATAL_ERROR("Not a valid NCLR or NCPR palette file.\n"); + } unsigned char *paletteHeader = data + 0x10; - magicNumber = (paletteHeader[3] << 24) | (paletteHeader[2] << 16) | (paletteHeader[1] << 8) | paletteHeader[0]; - if (magicNumber != 0x504C5454) //PLTT - FATAL_ERROR("No valid PLTT file after NCLR header. Magic number (%x).\n", magicNumber); + if (memcmp(paletteHeader, "TTLP", 4) != 0) + { + FATAL_ERROR("No valid PLTT file after NCLR header.\n"); + } if ((fileSize - 0x28) % 2 != 0) FATAL_ERROR("The file size (%d) is not a multiple of 2.\n", fileSize); @@ -389,43 +392,32 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) //NCLR header WriteGenericNtrHeader(fp, (ncpr ? "RPCN" : "RLCN"), extSize, !ncpr); - //PLTT header - //magic number - fputs("TTLP", fp); + unsigned char palHeader[0x18] = + { + 0x54, 0x54, 0x4C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + }; //section size - fputc(extSize & 0xFF, fp); - fputc((extSize >> 8) & 0xFF, fp); - fputc((extSize >> 16) & 0xFF, fp); - fputc((extSize >> 24) & 0xFF, fp); + palHeader[4] = extSize & 0xFF; + palHeader[5] = (extSize >> 8) & 0xFF; + palHeader[6] = (extSize >> 16) & 0xFF; + palHeader[7] = (extSize >> 24) & 0xFF; //bit depth - char bitDepth = palette->bitDepth == 4 ? 0x03: 0x04; - fputc(bitDepth, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - - //padding - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); + palHeader[8] = palette->bitDepth == 4 ? 0x03: 0x04; //size - fputc(size & 0xFF, fp); - fputc((size >> 8) & 0xFF, fp); - fputc((size >> 16) & 0xFF, fp); - fputc((size >> 24) & 0xFF, fp); + palHeader[16] = size & 0xFF; + palHeader[17] = (size >> 8) & 0xFF; + palHeader[18] = (size >> 16) & 0xFF; + palHeader[19] = (size >> 24) & 0xFF; - //colours per palette - fputc(0x10, fp); - fputc(0x00, fp); - fputc(0x00, fp); - fputc(0x00, fp); + fwrite(palHeader, 1, 0x18, fp); //palette data - for (int i = 0; i < palette->numColors; i++) { + for (int i = 0; i < palette->numColors; i++) + { unsigned char red = DOWNCONVERT_BIT_DEPTH(palette->colors[i].red); unsigned char green = DOWNCONVERT_BIT_DEPTH(palette->colors[i].green); unsigned char blue = DOWNCONVERT_BIT_DEPTH(palette->colors[i].blue); -- cgit v1.2.3 From 19f7d55504ad804ba540a8f42aaf1c51b242f8a0 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 20:24:53 +0100 Subject: too -> to --- tools/nitrogfx/gfx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index ad2b313e..7b17a7b1 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -384,7 +384,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) FILE *fp = fopen(path, "wb"); if (fp == NULL) - FATAL_ERROR("Failed too open \"%s\" for writing.\n", path); + FATAL_ERROR("Failed to open \"%s\" for writing.\n", path); uint32_t size = palette->numColors * 2; uint32_t extSize = size + (ncpr ? 0x10 : 0x18); -- cgit v1.2.3 From fce2c89d6edb6d8e6d8fbc6926b1b0784a07c984 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sun, 7 Jun 2020 20:34:43 +0100 Subject: more efficient gfx.c --- tools/nitrogfx/gfx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tools/nitrogfx/gfx.c') diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c index 7b17a7b1..ac156575 100644 --- a/tools/nitrogfx/gfx.c +++ b/tools/nitrogfx/gfx.c @@ -415,6 +415,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) fwrite(palHeader, 1, 0x18, fp); + unsigned char colours[palette->numColors * 2]; //palette data for (int i = 0; i < palette->numColors; i++) { @@ -424,9 +425,11 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr) uint16_t paletteEntry = SET_GBA_PAL(red, green, blue); - fputc(paletteEntry & 0xFF, fp); - fputc(paletteEntry >> 8, fp); + colours[i * 2] = paletteEntry & 0xFF; + colours[i * 2 + 1] = paletteEntry >> 8; } + fwrite(colours, 1, palette->numColors * 2, fp); + fclose(fp); } -- cgit v1.2.3