git.y1.nz

commit 2a5f330f1610ff476d1129f26bf5f625bb04cbf1
parent 6f469a971fb8834c7385854562974f2460d6e7c7
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Wed, 15 Feb 2023 22:44:47 -0800

Merge pull request #479 from bbbbbr/png2asset/repair_pal_force_keep_indexed_order

png2asset: force -keep_palette_order if -repair_indexed_pal specified
Diffstat:
M
docs/pages/20_toolchain_settings.md
1
+
M
gbdk-support/png2asset/png2asset.cpp
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/pages/20_toolchain_settings.md b/docs/pages/20_toolchain_settings.md
@@ -489,6 +489,7 @@ usage: png2asset    <file>.png [options]
 -spr16x16msx        use SPRITES_16x16
 -b <bank>           bank (default 0)
 -keep_palette_order use png palette
+-repair_indexed_pal try to repair indexed tile palettes (implies "-keep_palette_order")
 -noflip             disable tile flip
 -map                Export as map (tileset + bg)
 -use_map_attributes Use CGB BG Map attributes
diff --git a/gbdk-support/png2asset/png2asset.cpp b/gbdk-support/png2asset/png2asset.cpp
@@ -684,7 +684,7 @@ int main(int argc, char* argv[])
 		printf("-spr16x16msx        use SPRITES_16x16\n");
 		printf("-b <bank>           bank (default 0)\n");
 		printf("-keep_palette_order use png palette\n");
-		printf("-repair_indexed_pal try to repair tile palettes with \"-keep_palette_order\"\n");
+		printf("-repair_indexed_pal try to repair indexed tile palettes (implies \"-keep_palette_order\")\n");
 		printf("-noflip             disable tile flip\n");
 		printf("-map                Export as map (tileset + bg)\n");
 		printf("-use_map_attributes Use CGB BG Map attributes\n");
@@ -776,6 +776,7 @@ int main(int argc, char* argv[])
 		else if(!strcmp(argv[i], "-repair_indexed_pal"))
 		{
 			repair_indexed_pal = true;
+			keep_palette_order = true; // -repair_indexed_pal requires -keep_palette_order, so force it on
 		}
 		else if(!strcmp(argv[i], "-noflip"))
 		{

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