Mirrors/gbdk-2020
2
0
Fork 0
mirror of https://github.com/gbdk-2020/gbdk-2020.git synced 2026-02-20 00:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

png2asset: fix header output for -use_structs -tiles_only

Browse Source 
- MapInfo should not be emitted
- TilesInfo should have name shortened
- Update test output
This commit is contained in:
bbbbbr
2026-02-13 01:58:07 -08:00
parent 2f79d89430
commit 2127df4dc7
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gbdk-support/png2asset/export_h_file.cpp
View File

@@ -93,8 +93,16 @@ static void export_h_use_structs(PNG2AssetData* assetData, FILE* file) {
fprintf(file, "#include \"TilesInfo.h\"\n"); fprintf(file, "#include \"TilesInfo.h\"\n");
fprintf(file, "#include \"MapInfo.h\"\n"); fprintf(file, "#include \"MapInfo.h\"\n");
fprintf(file, "\n"); fprintf(file, "\n");
fprintf(file, "extern const struct TilesInfo %s_tiles_info;\n", assetData->args->data_name.c_str()); // Analogous to "(output_mode == ZGB_TILES_MODE_TILESONLY)" in the C output
fprintf(file, "extern const struct MapInfo %s;\n", assetData->args->data_name.c_str()); 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 { else {
fprintf(file, "#include \"MetaSpriteInfo.h\"\n"); fprintf(file, "#include \"MetaSpriteInfo.h\"\n");

3
gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.h
View File

@@ -11,7 +11,6 @@
#include "TilesInfo.h" #include "TilesInfo.h"
#include "MapInfo.h" #include "MapInfo.h"
extern const struct TilesInfo zgb_sushi_tiles_tiles_info; extern const struct TilesInfo zgb_sushi_tiles;
extern const struct MapInfo zgb_sushi_tiles;
#endif #endif

3
gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.h
View File

@@ -11,7 +11,6 @@
#include "TilesInfo.h" #include "TilesInfo.h"
#include "MapInfo.h" #include "MapInfo.h"
extern const struct TilesInfo zgb_sushi_tiles_lit_tiles_info; extern const struct TilesInfo zgb_sushi_tiles_lit;
extern const struct MapInfo zgb_sushi_tiles_lit;
#endif #endif