git.y1.nz

commit b24c0215271cb3ed128f64cb1b9f9219ba09129d
parent 52279b5cb5295b0dbf9ae10df8428c217f835a2b
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Wed, 29 May 2024 00:11:07 -0700

png2asset: if using either 1bpp flag, enable the other one (#680)

* png2asset: if using either 1bpp flag, enable the other one
* docs: update for png2asset help output
Diffstat:
M
docs/pages/20_toolchain_settings.md
4
++--
M
gbdk-support/png2asset/process_arguments.cpp
16
+++++++++++-----

2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/docs/pages/20_toolchain_settings.md b/docs/pages/20_toolchain_settings.md
@@ -591,10 +591,10 @@ usage: png2asset    <file>.png [options]
 -use_nes_attributes Use NES BG Map attributes
 -use_nes_colors     Convert RGB color values to NES PPU colors
 -use_structs        Group the exported info into structs (default: false) (used by ZGB Game Engine)
--bpp                bits per pixel: 1, 2, 4 (default: 2)
+-bpp                bits per pixel: 1, 2, 4 (default: 2. using 1 auto-enables "-pack_mode 1bpp")
 -max_palettes       max number of palettes allowed (default: 8)
                     (note: max colors = max_palettes x num colors per palette)
--pack_mode          gb, nes, sgb, sms, 1bpp (default: gb)
+-pack_mode          gb, nes, sgb, sms, 1bpp (default: gb. using 1bpp auto-enables "-bpp 1")
 -tile_origin        tile index offset for maps (default: 0)
 -tiles_only         export tile data only
 -maps_only          export map tilemap only
diff --git a/gbdk-support/png2asset/process_arguments.cpp b/gbdk-support/png2asset/process_arguments.cpp
@@ -108,10 +108,10 @@ int processPNG2AssetArguments(int argc, char* argv[], PNG2AssetArguments* args) 
         printf("-use_nes_attributes Use NES BG Map attributes\n");
         printf("-use_nes_colors     Convert RGB color values to NES PPU colors\n");
         printf("-use_structs        Group the exported info into structs (default: false) (used by ZGB Game Engine)\n");
-        printf("-bpp                bits per pixel: 1, 2, 4 (default: 2)\n");
+        printf("-bpp                bits per pixel: 1, 2, 4 (default: 2. using 1 auto-enables \"-pack_mode 1bpp\")\n");
         printf("-max_palettes       max number of palettes allowed (default: 8)\n");
         printf("                    (note: max colors = max_palettes x num colors per palette)\n");
-        printf("-pack_mode          gb, nes, sgb, sms, 1bpp (default: gb)\n");
+        printf("-pack_mode          gb, nes, sgb, sms, 1bpp (default: gb. using 1bpp auto-enables \"-bpp 1\")\n");
         printf("-tile_origin        tile index offset for maps (default: 0)\n");
 
         printf("-tiles_only         export tile data only\n");
@@ -231,6 +231,8 @@ int processPNG2AssetArguments(int argc, char* argv[], PNG2AssetArguments* args) 
         else if(!strcmp(argv[i], "-bpp"))
         {
             args->bpp = atoi(argv[++i]);
+            // If set to "-bpp 1" auto-enable "-pack_mode 1bpp"
+            if (atoi(argv[i]) == 1) args->pack_mode = Tile::BPP1;
         }
         else if(!strcmp(argv[i], "-max_palettes"))
         {
@@ -248,15 +250,19 @@ int processPNG2AssetArguments(int argc, char* argv[], PNG2AssetArguments* args) 
             else if(pack_mode_str == "nes") args->pack_mode = Tile::NES;
             else if(pack_mode_str == "sgb") {
                 args->pack_mode = Tile::SGB;
-                 // SGB attributes are packed in map data, so 2 bytes per map tile
+                // SGB attributes are packed in map data, so 2 bytes per map tile
                 args->map_entry_size_bytes = 2;
             }
             else if(pack_mode_str == "sms") {
                 args->pack_mode = Tile::SMS;
-                 // SMS attributes are packed in map data, so 2 bytes per map tile
+                // SMS attributes are packed in map data, so 2 bytes per map tile
                 args->map_entry_size_bytes = 2;
             }
-            else if(pack_mode_str == "1bpp") args->pack_mode = Tile::BPP1;
+            else if(pack_mode_str == "1bpp") {
+                args->pack_mode = Tile::BPP1;
+                // If set to "-pack_mode 1bpp" auto-enable "-bpp 1"
+                args->bpp = 1;
+            }
             else
             {
                 printf("-pack_mode must be one of gb, nes, sgb, sms, 1bpp\n");

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.