1 files changed, 64 insertions, 6 deletions

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)