From 7762fa4d5454be7be0e89b09986f31bbdff79a83 Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 10 Jul 2020 17:25:12 +0100 Subject: bit of work on graphics, mostly setup --- tools/nitrogfx/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/nitrogfx/main.c') diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 2f5b2735..076e7076 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); - WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder); + WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101); FreeImage(&image); } @@ -320,6 +320,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a options.metatileHeight = 1; options.clobberSize = false; options.byteOrder = true; + options.version101 = false; for (int i = 3; i < argc; i++) { @@ -385,6 +386,10 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a { options.byteOrder = false; } + else if (strcmp(option, "-version101") == 0) + { + options.version101 = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); -- cgit v1.2.3 From 6b746c4bff86737b9ca6a3a14dcb543a1216d194 Mon Sep 17 00:00:00 2001 From: red031000 Date: Fri, 10 Jul 2020 21:57:37 +0100 Subject: IR handling for palettes, potion and antidote/brn heal/frz heal --- tools/nitrogfx/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'tools/nitrogfx/main.c') diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 076e7076..b922e4b2 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -411,6 +411,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c { struct Palette palette; bool ncpr = false; + bool ir = false; for (int i = 3; i < argc; i++) { @@ -420,6 +421,10 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c { ncpr = true; } + else if (strcmp(option, "-ir") == 0) + { + ir = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -427,7 +432,7 @@ void HandlePngToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, c } ReadPngPalette(inputPath, &palette); - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir); } void HandleGbaToJascPaletteCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) @@ -487,6 +492,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, { int numColors = 0; bool ncpr = false; + bool ir = false; for (int i = 3; i < argc; i++) { @@ -509,6 +515,10 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, { ncpr = true; } + else if (strcmp(option, "-ir") == 0) + { + ir = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); @@ -522,7 +532,7 @@ void HandleJascToNtrPaletteCommand(char *inputPath, char *outputPath, int argc, if (numColors != 0) palette.numColors = numColors; - WriteNtrPalette(outputPath, &palette, ncpr); + WriteNtrPalette(outputPath, &palette, ncpr, ir); } void HandleLatinFontToPngCommand(char *inputPath, char *outputPath, int argc UNUSED, char **argv UNUSED) -- cgit v1.2.3 From d038e60ba5baee009a0b76466cf362ae7747d48f Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 11 Jul 2020 16:13:04 +0100 Subject: add sopc support to ncgr --- tools/nitrogfx/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/nitrogfx/main.c') diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index b922e4b2..13eeb749 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); - WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101); + WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); FreeImage(&image); } @@ -321,6 +321,7 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a options.clobberSize = false; options.byteOrder = true; options.version101 = false; + options.sopc = false; for (int i = 3; i < argc; i++) { @@ -390,6 +391,10 @@ void HandlePngToNtrCommand(char *inputPath, char *outputPath, int argc, char **a { options.version101 = true; } + else if (strcmp(option, "-sopc") == 0) + { + options.sopc = true; + } else { FATAL_ERROR("Unrecognized option \"%s\".\n", option); -- cgit v1.2.3 From f76e211631b6b86ce7000c16acc5368d78b14f42 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 11 Jul 2020 21:50:56 +0100 Subject: bit of title work, maths is still wrong --- tools/nitrogfx/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/nitrogfx/main.c') diff --git a/tools/nitrogfx/main.c b/tools/nitrogfx/main.c index 13eeb749..0aaad201 100644 --- a/tools/nitrogfx/main.c +++ b/tools/nitrogfx/main.c @@ -88,7 +88,7 @@ void ConvertPngToNtr(char *inputPath, char *outputPath, struct PngToNtrOptions * ReadPng(inputPath, &image); - WriteNtrImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); + WriteNtrImage(outputPath, options->numTiles, image.bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette, options->clobberSize, options->byteOrder, options->version101, options->sopc); FreeImage(&image); } -- cgit v1.2.3