4 files changed, 97 insertions, 39 deletions

diff --git a/sprite2gba/Makefile b/img2gba/Makefile
index 0d6dc07..f374ea9 100644
--- a/sprite2gba/Makefile
+++ b/img2gba/Makefile
@@ -9,7 +9,7 @@ WATCH_SRC      := $(wildcard $(SRC_DIR)/*.c)
 WATCH_SRC      += $(wildcard $(SRC_DIR)/*.h)
 
 # Output library names and executables.
-BIN_NAME       := sprite2gba
+BIN_NAME       := img2gba
 BUILD_DIR      := build
 BIN            := $(BUILD_DIR)/$(BIN_NAME)
 
diff --git a/sprite2gba/src/main.c b/img2gba/src/main.c
index f91ecd0..8a5edfc 100644
--- a/sprite2gba/src/main.c
+++ b/img2gba/src/main.c
@@ -6,8 +6,9 @@
 #include "stb_image.h"
 
 #define TILE_SIZE 8
-#define DEFAULT_PALETTE_SIZE 16
+#define PALETTE_SIZE 16
 #define DEFAULT_BG_COLOR 0x0000
+#define MAX_FILE_NAME 1024
 
 typedef u16 Color;
 
@@ -32,7 +33,7 @@ typedef struct Tiles {
 } Tiles;
 
 typedef struct Palette {
-    Color *data;
+    Color data[PALETTE_SIZE];
     size_t size;
     size_t capacity;
 } Palette;
@@ -48,22 +49,22 @@ u8
 pack_1bb(u32 hex) {
     u32 low_nibble = hex & 0xFFFF;
     u32 high_nibble = (hex >> 16) & 0xFFFF;
-    u32 low = (low_nibble & 0x1);
-    low += 2 * ((low_nibble >> 4) & 0x1);
-    low += 4 * ((low_nibble >> 8) & 0x1);
-    low += 8 * ((low_nibble >> 12) & 0x1);
-    u32 high = (high_nibble & 0x1);
-    high += 2 * ((high_nibble >> 4) & 0x1);
-    high += 4 * ((high_nibble >> 8) & 0x1);
-    high += 8 * ((high_nibble >> 12) & 0x1);
-    return (high << 4) | low;
+    u32 low =  ((low_nibble >> 12) & 0x1);
+    low += 2 * ((low_nibble >> 8) & 0x1);
+    low += 4 * ((low_nibble >> 4) & 0x1);
+    low += 8 * ((low_nibble >> 0) & 0x1);
+    u32 high = ((high_nibble >> 12) & 0x1);
+    high += 2 * ((high_nibble >> 8) & 0x1);
+    high += 4 * ((high_nibble >> 4) & 0x1);
+    high += 8 * ((high_nibble >> 0) & 0x1);
+    return (low << 4) | high;
 }
 
 void
 export_c_file(Tiles *tiles, Palette *palette, FILE *file, bool pack_1bpp) {
     // Output tiles.
     if (pack_1bpp) {
-        fprintf(file, "u32 packed_tiles[] = {\n    ");
+        fprintf(file, "static const u32 packed_tiles[] = {\n    ");
         size_t counter = 0;
         for (size_t i = 0; i < tiles->capacity; ++i) {
             for (size_t j = 0; j < TILE_SIZE; j += 4, counter++) {
@@ -75,10 +76,10 @@ export_c_file(Tiles *tiles, Palette *palette, FILE *file, bool pack_1bpp) {
                 u32 tile_b = tiles->data[i][j + 1];
                 u32 tile_c = tiles->data[i][j + 2];
                 u32 tile_d = tiles->data[i][j + 3];
-                u32 packed = pack_1bb(tile_d);
-                packed |= pack_1bb(tile_c) << 8;
-                packed |= pack_1bb(tile_b) << 16;
-                packed |= pack_1bb(tile_a) << 24;
+                u32 packed = pack_1bb(tile_d) << 0;
+                packed    |= pack_1bb(tile_c) << 8;
+                packed    |= pack_1bb(tile_b) << 16;
+                packed    |= pack_1bb(tile_a) << 24;
                 fprintf(file, "0x%08x,", packed);
                 if (counter < 3) {
                     fprintf(file, " ");
@@ -88,7 +89,7 @@ export_c_file(Tiles *tiles, Palette *palette, FILE *file, bool pack_1bpp) {
         fprintf(file, "\n};\n");
         fprintf(file, "\n");
     } else {
-        fprintf(file, "u32 tiles[%lu][%u] = {\n", tiles->capacity, TILE_SIZE);
+        fprintf(file, "static const u32 tiles[%lu][%u] = {\n", tiles->capacity, TILE_SIZE);
         for (size_t i = 0; i < tiles->capacity; ++i) {
             fprintf(file, "    {");
             for (size_t j = 0; j < TILE_SIZE; ++j) {
@@ -122,6 +123,36 @@ export_c_file(Tiles *tiles, Palette *palette, FILE *file, bool pack_1bpp) {
 }
 
 void
+export_bin_file(Tiles *tiles, Palette *palette, FILE *file, FILE *filepal, bool pack_1bpp) {
+    if (pack_1bpp) {
+        u64 counter = 0;
+        for (size_t i = 0; i < tiles->capacity; ++i) {
+            for (size_t j = 0; j < TILE_SIZE; j += 4, counter++) {
+                u32 tile_a = tiles->data[i][j];
+                u32 tile_b = tiles->data[i][j + 1];
+                u32 tile_c = tiles->data[i][j + 2];
+                u32 tile_d = tiles->data[i][j + 3];
+                u32 packed = pack_1bb(tile_a) << 0;
+                packed    |= pack_1bb(tile_b) << 8;
+                packed    |= pack_1bb(tile_c) << 16;
+                packed    |= pack_1bb(tile_d) << 24;
+                fwrite(&packed, sizeof(u32), 1, file);
+            }
+        }
+        // Pad with zeros to avoid alignment issues.
+        if (counter) {
+            u32 zero = 0;
+            fwrite(&zero, sizeof(u32), counter % 8, file);
+        }
+    } else {
+        for (size_t i = 0; i < tiles->capacity; ++i) {
+            fwrite(&tiles->data[i][0], sizeof(u32), TILE_SIZE, file);
+        }
+        fwrite(palette->data, sizeof(u16), PALETTE_SIZE, filepal);
+    }
+}
+
+void
 extract_tile(Tiles *tiles, Palette *palette, Image *img,
         size_t offset_x, size_t offset_y) {
     for (size_t j = 0; j < TILE_SIZE; ++j) {
@@ -191,24 +222,24 @@ void
 print_usage(void) {
     printf("Usage: %s [options] <filename>\n", BIN_NAME);
     printf("\n");
-    printf("\t-b <RRGGBB>\tSelects the background color used for transparency.\n");
-    printf("\t-o <out_file.c>\tPath to the output file. If blank, stdout will be used.\n");
-    printf("\t-x <0>\tStart x position (in pixels).\n");
-    printf("\t-y <0>\tStart y position (in pixels).\n");
-    printf("\t-W <8>\tSelect the sprite width in pixels. Must be a multiple of the tile size.\n");
-    printf("\t-H <8>\tSelect the sprite height in pixels. Must be a multiple of the tile size.\n");
-    printf("\t-1\tBit pack the output to 1bbp (4x size reduction).\n");
-    printf("\t-w <0>\tWidth of region to extract from (x0,y0). Defaults to image width.\n");
-    printf("\t-h <0>\tHeight of region to extract from (x0,y0). Defaults to image height.\n");
+    printf("\t-b <RRGGBB>   Selects the background color used for transparency.\n");
+    printf("\t-o <out_file> Path to the output file. If blank, stdout will be used with C array export.\n");
+    printf("\t-x <0>        Start x position (in pixels).\n");
+    printf("\t-y <0>        Start y position (in pixels).\n");
+    printf("\t-W <8>        Select the sprite width in pixels. Must be a multiple of the tile size.\n");
+    printf("\t-H <8>        Select the sprite height in pixels. Must be a multiple of the tile size.\n");
+    printf("\t-1            Bit pack the output to 1bbp (4x size reduction).\n");
+    printf("\t-w <0>        Width of region to extract from (x0,y0). Defaults to image width.\n");
+    printf("\t-h <0>        Height of region to extract from (x0,y0). Defaults to image height.\n");
+    printf("\t-v            Verbose mode\n");
     printf("\n");
 }
 
-// TODO: Support multiple files at once?
 int
 main(int argc, char *argv[]) {
     // Initialize default parameters.
     u16 background_color = DEFAULT_BG_COLOR;
-    u16 palette_size = DEFAULT_PALETTE_SIZE;
+    u16 palette_size = PALETTE_SIZE;
     size_t sprite_width = TILE_SIZE;
     size_t sprite_height = TILE_SIZE;
     char *out_file_path = NULL;
@@ -217,9 +248,10 @@ main(int argc, char *argv[]) {
     size_t start_y = 0;
     size_t width = 0;
     size_t height = 0;
+    bool verbose = false;
 
     int option;
-    while ((option = getopt(argc, argv, "b:o:W:H:1x:y:w:h:")) != -1) {
+    while ((option = getopt(argc, argv, "b:o:W:H:1x:y:w:h:v")) != -1) {
         switch (option) {
             case 'b': {
                 // Background color.
@@ -298,6 +330,9 @@ main(int argc, char *argv[]) {
                 // Height of region to extract from (x0,y0).
                 height = atoi(optarg);
             } break;
+            case 'v': {
+                verbose = true;
+            } break;
             default: {
                 print_usage();
                 return EXIT_FAILURE;
@@ -315,7 +350,6 @@ main(int argc, char *argv[]) {
 
     // Fill the palette with the background color if one was given.
     Palette palette = {
-        .data = malloc(palette_size * sizeof(Color)),
         .size = 1,
         .capacity = palette_size,
     };
@@ -357,8 +391,6 @@ main(int argc, char *argv[]) {
         .capacity = n_tiles,
     };
 
-    int offset_x = start_x;
-    int offset_y = start_y;
     size_t n_sprites_x = width / sprite_width;
     size_t n_sprites_y = height / sprite_height;
     size_t n_sprite_tiles_x = sprite_width / TILE_SIZE;
@@ -379,18 +411,42 @@ main(int argc, char *argv[]) {
     if (out_file_path == NULL) {
         export_c_file(&tiles, &palette, stdout, pack_1bpp);
     } else {
-        FILE *file = fopen(out_file_path, "w");
+        char file_name[MAX_FILE_NAME] = {0};
+        char file_name_pal[MAX_FILE_NAME] = {0};
+        strncpy(file_name, out_file_path, MAX_FILE_NAME - 1);
+        strncpy(file_name_pal, out_file_path, MAX_FILE_NAME - 1);
+        FILE *file = fopen(strcat(file_name, ".img.bin"), "w");
         if (!file) {
-            fprintf(stderr, "%s: can't open output file: %s\n", BIN_NAME, out_file_path);
+            fprintf(stderr, "%s: can't open output file: %s\n", BIN_NAME, file_name);
             return EXIT_FAILURE;
         }
-        export_c_file(&tiles, &palette, file, pack_1bpp);
-        fclose(file);
+        if (pack_1bpp) {
+            export_bin_file(&tiles, &palette, file, NULL, pack_1bpp);
+            fclose(file);
+            if (verbose) {
+                printf("Exporting binary file (1bpp packed)\n");
+                printf("FILE IMG: %s\n", file_name);
+            }
+        } else {
+            FILE *file_pal = fopen(strcat(file_name_pal, ".pal.bin"), "w");
+            if (!file_pal) {
+                fprintf(stderr, "%s: can't open output file: %s\n", BIN_NAME, file_name_pal);
+                fclose(file);
+                return EXIT_FAILURE;
+            }
+            if (verbose) {
+                printf("Exporting binary file\n");
+                printf("FILE IMG: %s\n", file_name);
+                printf("FILE PAL: %s\n", file_name_pal);
+            }
+            export_bin_file(&tiles, &palette, file, file_pal, pack_1bpp);
+            fclose(file);
+            fclose(file_pal);
+        }
     }
 
     // Cleanup resources and exit.
     free(tiles.data);
-    free(palette.data);
     stbi_image_free(img.data);
     return EXIT_SUCCESS;
 }
diff --git a/sprite2gba/src/shorthand.h b/img2gba/src/shorthand.h
index 9c2e2f0..9c2e2f0 100644
--- a/sprite2gba/src/shorthand.h
+++ b/img2gba/src/shorthand.h
diff --git a/sprite2gba/src/stb_image.h b/img2gba/src/stb_image.h
index accef48..3448d5f 100644
--- a/sprite2gba/src/stb_image.h
+++ b/img2gba/src/stb_image.h
@@ -4120,7 +4120,7 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
    if (s >= 16) return -1; // invalid code!
    // code size is s, so:
    b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   if (b >= sizeof (z->size)) return -1; // some data was corrupt somewhere!
+   if ((size_t)b >= sizeof (z->size)) return -1; // some data was corrupt somewhere!
    if (z->size[b] != s) return -1;  // was originally an assert, but report failure instead.
    a->code_buffer >>= s;
    a->num_bits -= s;
@@ -6777,6 +6777,8 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
       int stride;
       int out_size = 0;
       int delays_size = 0;
+      (void)out_size;
+      (void)delays_size;
       memset(&g, 0, sizeof(g));
       if (delays) {
          *delays = 0;