git.y1.nz

commit b83431218fa0006f01cb0a84f6cdc2d30b635875
parent 2f79d8943028fcfdc0be73b1f13e28403d711431
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Fri, 13 Feb 2026 01:59:50 -0800

Merge pull request #860 from bbbbbr/png2asset/fix_zgbstruct_tilesonly_header_output

png2asset: fix header output for -use_structs -tiles_only
Diffstat:
M
gbdk-support/png2asset/export_h_file.cpp
12
++++++++++--
M
gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.h
3
+--
M
gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.h
3
+--

3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gbdk-support/png2asset/export_h_file.cpp b/gbdk-support/png2asset/export_h_file.cpp
@@ -93,8 +93,16 @@ static void export_h_use_structs(PNG2AssetData* assetData, FILE* file) {
         fprintf(file, "#include \"TilesInfo.h\"\n");
         fprintf(file, "#include \"MapInfo.h\"\n");
         fprintf(file, "\n");
-        fprintf(file, "extern const struct TilesInfo %s_tiles_info;\n", assetData->args->data_name.c_str());
-        fprintf(file, "extern const struct MapInfo %s;\n", assetData->args->data_name.c_str());
+        // Analogous to "(output_mode == ZGB_TILES_MODE_TILESONLY)" in the C output
+        if ((assetData->args->includeTileData) && (!assetData->args->includedMapOrMetaspriteData)) {
+            // ZGB Tiles-only mode doesn't append "_tiles_info" to the struct name (and lacks a BANKREF output in the C output)
+            fprintf(file, "extern const struct TilesInfo %s;\n", assetData->args->data_name.c_str());
+        }
+        else { // implied (output_mode == ZGB_TILES_MODE_NORMAL)
+            fprintf(file, "extern const struct TilesInfo %s_tiles_info;\n", assetData->args->data_name.c_str());
+            fprintf(file, "extern const struct MapInfo %s;\n", assetData->args->data_name.c_str());
+        }
+
     }
     else {
         fprintf(file, "#include \"MetaSpriteInfo.h\"\n");
diff --git a/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.h b/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.h
@@ -11,7 +11,6 @@
 #include "TilesInfo.h"
 #include "MapInfo.h"
 
-extern const struct TilesInfo zgb_sushi_tiles_tiles_info;
-extern const struct MapInfo zgb_sushi_tiles;
+extern const struct TilesInfo zgb_sushi_tiles;
 
 #endif
diff --git a/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.h b/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.h
@@ -11,7 +11,6 @@
 #include "TilesInfo.h"
 #include "MapInfo.h"
 
-extern const struct TilesInfo zgb_sushi_tiles_lit_tiles_info;
-extern const struct MapInfo zgb_sushi_tiles_lit;
+extern const struct TilesInfo zgb_sushi_tiles_lit;
 
 #endif

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