git.y1.nz

commit 568bf98b11a8ea7d5fea81208e7798d7ebd4260d
parent ae0adcb6336edaa3abe2f93b140e2fbfe0df1bac
Author: Toxa <untoxa@mail.ru>
Date:   Tue,  7 May 2024 18:05:43 +0300

Merge branch 'develop' of https://github.com/gbdk-2020/gbdk-2020 into develop

Diffstat:
M
docs/pages/06b_supported_consoles.md
2
+-
M
gbdk-support/png2asset/export_c_file.cpp
2
+-
M
gbdk-support/png2asset/testing/ref/zgb_nums_map_2.c
2
+-
M
gbdk-support/png2asset/testing/ref/zgb_nums_map_4.c
2
+-
M
gbdk-support/png2asset/testing/ref/zgb_nums_map_6.c
2
+-
M
gbdk-support/png2asset/testing/ref/zgb_nums_map_8.c
2
+-

6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/pages/06b_supported_consoles.md b/docs/pages/06b_supported_consoles.md
@@ -368,7 +368,7 @@ This entire section is written as a guide on porting GB projects to NES. If you 
 
 ### Mapper
 
-Currently the NES support in GBDK uses UNROM-512 (Mapper30) with single-screen mirroring (the mapper2 subset of Mapper30).
+Currently the NES support in GBDK uses UNROM-512 (Mapper30) with single-screen mirroring.
 
 ### Buffered mode vs direct mode
 
diff --git a/gbdk-support/png2asset/export_c_file.cpp b/gbdk-support/png2asset/export_c_file.cpp
@@ -340,7 +340,7 @@ static void export_c_zgb_tiles_struct(PNG2AssetData* assetData, FILE* file, int 
 
     fprintf(file, "\t.num_frames=%d,"            " // num tiles\n",    (unsigned int)assetData->tiles.size() * (assetData->image.tile_h >> 3));
     fprintf(file, "\t.data=%s_tiles,"            " // tiles\n",        assetData->args->data_name.c_str());
-    fprintf(file, "\t.num_pals=%d,"              " // num palettes\n", (unsigned int)(assetData->image.total_color_count / assetData->image.colors_per_pal));
+    fprintf(file, "\t.num_pals=%d,"              " // num palettes\n", (unsigned int)(exportOpt.color_count / assetData->image.colors_per_pal));
     fprintf(file, "\t.pals=%s_palettes,"         " // palettes\n",     assetData->args->data_name.c_str());
 
     if(!assetData->args->use_map_attributes)
diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_2.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_2.c
@@ -147,7 +147,7 @@ BANKREF(zgb_nums_map_2_tiles_info)
 const struct TilesInfo zgb_nums_map_2_tiles_info = {
 	.num_frames=40, // num tiles
 	.data=zgb_nums_map_2_tiles, // tiles
-	.num_pals=1, // num palettes
+	.num_pals=0, // num palettes
 	.pals=zgb_nums_map_2_palettes, // palettes
 	.color_data=zgb_nums_map_2_tile_pals, // tile palettes
 };
diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_4.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_4.c
@@ -107,7 +107,7 @@ BANKREF(zgb_nums_map_4_tiles_info)
 const struct TilesInfo zgb_nums_map_4_tiles_info = {
 	.num_frames=30, // num tiles
 	.data=zgb_nums_map_4_tiles, // tiles
-	.num_pals=1, // num palettes
+	.num_pals=0, // num palettes
 	.pals=zgb_nums_map_4_palettes, // palettes
 	.color_data=zgb_nums_map_4_tile_pals, // tile palettes
 };
diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_6.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_6.c
@@ -147,7 +147,7 @@ BANKREF(zgb_nums_map_6_tiles_info)
 const struct TilesInfo zgb_nums_map_6_tiles_info = {
 	.num_frames=40, // num tiles
 	.data=zgb_nums_map_6_tiles, // tiles
-	.num_pals=1, // num palettes
+	.num_pals=0, // num palettes
 	.pals=zgb_nums_map_6_palettes, // palettes
 	.color_data=zgb_nums_map_6_tile_pals, // tile palettes
 };
diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_8.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_8.c
@@ -107,7 +107,7 @@ BANKREF(zgb_nums_map_8_tiles_info)
 const struct TilesInfo zgb_nums_map_8_tiles_info = {
 	.num_frames=30, // num tiles
 	.data=zgb_nums_map_8_tiles, // tiles
-	.num_pals=1, // num palettes
+	.num_pals=0, // num palettes
 	.pals=zgb_nums_map_8_palettes, // palettes
 	.color_data=zgb_nums_map_8_tile_pals, // tile palettes
 };

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