1 files changed, 112 insertions, 12 deletions

diff --git a/tools/nitrogfx/gfx.c b/tools/nitrogfx/gfx.c
index 31ebf64b..3d9d5848 100644
--- a/tools/nitrogfx/gfx.c
+++ b/tools/nitrogfx/gfx.c
@@ -359,6 +359,98 @@ 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)
+{
+    FILE *fp = fopen(path, "wb");
+
+    if (fp == NULL)
+        FATAL_ERROR("Failed to open \"%s\" for writing.\n", path);
+
+    int tileSize = bitDepth * 8;
+
+    if (image->width % 8 != 0)
+        FATAL_ERROR("The width in pixels (%d) isn't a multiple of 8.\n", image->width);
+
+    if (image->height % 8 != 0)
+        FATAL_ERROR("The height in pixels (%d) isn't a multiple of 8.\n", image->height);
+
+    int tilesWidth = image->width / 8;
+    int tilesHeight = image->height / 8;
+
+    if (tilesWidth % metatileWidth != 0)
+        FATAL_ERROR("The width in tiles (%d) isn't a multiple of the specified metatile width (%d)", tilesWidth, metatileWidth);
+
+    if (tilesHeight % metatileHeight != 0)
+        FATAL_ERROR("The height in tiles (%d) isn't a multiple of the specified metatile height (%d)", tilesHeight, metatileHeight);
+
+    int maxNumTiles = tilesWidth * tilesHeight;
+
+    if (numTiles == 0)
+        numTiles = maxNumTiles;
+    else if (numTiles > maxNumTiles)
+        FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles);
+
+    int bufferSize = numTiles * tileSize;
+    unsigned char *pixelBuffer = malloc(bufferSize);
+
+    if (pixelBuffer == NULL)
+        FATAL_ERROR("Failed to allocate memory for pixels.\n");
+
+    int metatilesWide = tilesWidth / metatileWidth;
+
+    switch (bitDepth) {
+        case 4:
+            ConvertToTiles4Bpp(image->pixels, pixelBuffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+            break;
+        case 8:
+            ConvertToTiles8Bpp(image->pixels, pixelBuffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
+            break;
+    }
+
+    WriteGenericNtrHeader(fp, "RGCN", bufferSize + 0x20, byteOrder);
+
+    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 };
+
+    charHeader[4] = (bufferSize + 0x20) & 0xFF;
+    charHeader[5] = ((bufferSize + 0x20) >> 8) & 0xFF;
+    charHeader[6] = ((bufferSize + 0x20) >> 16) & 0xFF;
+    charHeader[7] = ((bufferSize + 0x20) >> 24) & 0xFF;
+
+    if (!clobberSize)
+    {
+        charHeader[8] = numTiles & 0xFF;
+        charHeader[9] = (numTiles >> 8) & 0xFF;
+
+        charHeader[10] = tileSize & 0xFF;
+        charHeader[11] = (tileSize >> 8) & 0xFF;
+    }
+    else
+    {
+        charHeader[8] = 0xFF;
+        charHeader[9] = 0xFF;
+        charHeader[10] = 0xFF;
+        charHeader[11] = 0xFF;
+
+        charHeader[16] = 0x10; //seems to be set when size is clobbered
+    }
+
+    charHeader[12] = bitDepth == 4 ? 3 : 4;
+
+    charHeader[24] = bufferSize & 0xFF;
+    charHeader[25] = (bufferSize >> 8) & 0xFF;
+    charHeader[26] = (bufferSize >> 16) & 0xFF;
+    charHeader[27] = (bufferSize >> 24) & 0xFF;
+
+    fwrite(charHeader, 1, 0x20, fp);
+
+    fwrite(pixelBuffer, 1, bufferSize, fp);
+
+    free(pixelBuffer);
+    fclose(fp);
+}
+
 void FreeImage(struct Image *image)
 {
 	free(image->pixels);
@@ -450,7 +542,7 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
     if (fp == NULL)
         FATAL_ERROR("Failed to open \"%s\" for writing.\n", path);
 
-    uint32_t size = palette->numColors * 2;
+    uint32_t size = 256 * 2; //todo check if there's a better way to detect :/
     uint32_t extSize = size + (ncpr ? 0x10 : 0x18);
 
     //NCLR header
@@ -481,21 +573,29 @@ void WriteNtrPalette(char *path, struct Palette *palette, bool ncpr)
 
     fwrite(palHeader, 1, 0x18, fp);
 
-    unsigned char colours[palette->numColors * 2];
+    unsigned char colours[256 * 2];
     //palette data
-    for (int i = 0; i < palette->numColors; i++)
+    for (int i = 0; i < 256; 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);
-
-        colours[i * 2] = paletteEntry & 0xFF;
-        colours[i * 2 + 1] = paletteEntry >> 8;
+        if (i < palette->numColors)
+        {
+            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);
+
+            colours[i * 2] = paletteEntry & 0xFF;
+            colours[i * 2 + 1] = paletteEntry >> 8;
+        }
+        else
+        {
+            colours[i * 2] = 0x00;
+            colours[i * 2 + 1] = 0x00;
+        }
     }
 
-    fwrite(colours, 1, palette->numColors * 2, fp);
+    fwrite(colours, 1, 256 * 2, fp);
 
     fclose(fp);
 }