git.y1.nz

gbdk-2020

GameBoy Development Kit
download: https://git.y1.nz/archives/gbdk.tar.gz
README | Files | Log | Refs | LICENSE

commit a0cbbae203f02f63322205edaeb5973fa200d63f
parent 3e2ff4dcf4d5712ea7ddbce52dbbc4aca662fc3d
Author: bbbbbr <bbbbbr@users.noreply.github.com>
Date:   Tue, 24 Jun 2025 22:51:43 -0700

Merge pull request #793 from bbbbbr/png2asset/palette_export_format

png2asset: fix palette out line breaks, commas, trailing spaces
Diffstat:
Mgbdk-support/png2asset/export_c_file.cpp33++++++++++++++++++++-------------
Mgbdk-support/png2asset/testing/ref/apaimage_1.c3+--
Mgbdk-support/png2asset/testing/ref/binout.1.bin3+--
Mgbdk-support/png2asset/testing/ref/binout.2.bin3+--
Mgbdk-support/png2asset/testing/ref/color_indexed_nums_map_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_indexed_nums_map_3.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_indexed_nums_map_5.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_indexed_nums_map_7.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_nums_map_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_nums_map_2.c3+--
Mgbdk-support/png2asset/testing/ref/color_nums_map_3.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_nums_map_4.c3+--
Mgbdk-support/png2asset/testing/ref/color_nums_map_5.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_nums_map_6.c3+--
Mgbdk-support/png2asset/testing/ref/color_nums_map_7.c12++++--------
Mgbdk-support/png2asset/testing/ref/color_nums_map_8.c6++----
Mgbdk-support/png2asset/testing/ref/gbdklogo_1.c3+--
Mgbdk-support/png2asset/testing/ref/gbdklogo_2.c12++++--------
Mgbdk-support/png2asset/testing/ref/gbdklogo_3.c9+++------
Mgbdk-support/png2asset/testing/ref/gbdklogo_4.c9++++-----
Mgbdk-support/png2asset/testing/ref/hblankcopy_1.c3+--
Mgbdk-support/png2asset/testing/ref/largemap_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/largemap_2.c12++++--------
Mgbdk-support/png2asset/testing/ref/largemap_3.c12++++--------
Mgbdk-support/png2asset/testing/ref/largemap_4.c12++++--------
Mgbdk-support/png2asset/testing/ref/largemap_5.c9++++-----
Mgbdk-support/png2asset/testing/ref/largemap_6.c9++++-----
Mgbdk-support/png2asset/testing/ref/largemap_7.c12++++--------
Mgbdk-support/png2asset/testing/ref/nums_map_1.c3+--
Mgbdk-support/png2asset/testing/ref/nums_map_3.c3+--
Mgbdk-support/png2asset/testing/ref/nums_map_5.c3+--
Mgbdk-support/png2asset/testing/ref/nums_map_7.c3+--
Mgbdk-support/png2asset/testing/ref/remote.c3+--
Mgbdk-support/png2asset/testing/ref/sgb_border_1.c9++++-----
Mgbdk-support/png2asset/testing/ref/sprite_slon_1.c3+--
Mgbdk-support/png2asset/testing/ref/sprite_slon_2.c3+--
Mgbdk-support/png2asset/testing/ref/sprite_slon_3.c3+--
Mgbdk-support/png2asset/testing/ref/sprite_slon_4.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_2.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_3.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_4.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_nums_map_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_nums_map_2.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_nums_map_3.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_color_nums_map_4.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_largemap_1.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_largemap_2.c9++++-----
Mgbdk-support/png2asset/testing/ref/zgb_largemap_3_attribs_smsgg.c9++++-----
Mgbdk-support/png2asset/testing/ref/zgb_largemap_4_attribs_gbc.c12++++--------
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_1.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_2.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_3.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_4.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_5.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_6.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_7.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_nums_map_8.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_sgb_border_1.c9++++-----
Mgbdk-support/png2asset/testing/ref/zgb_sprite_1.c3+--
Mgbdk-support/png2asset/testing/ref/zgb_sprite_2.c72++++++++++++++++++++++++++++++++----------------------------------------
Mgbdk-support/png2asset/testing/ref/zgb_sushi_tiles.c9++++-----
Mgbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.c9++++-----
63 files changed, 215 insertions(+), 352 deletions(-)

diff --git a/gbdk-support/png2asset/export_c_file.cpp b/gbdk-support/png2asset/export_c_file.cpp @@ -120,31 +120,38 @@ static void export_c_palette_data(PNG2AssetData* assetData, FILE* file) { fprintf(file, "const palette_color_t %s_palettes[%d] = {\n", assetData->args->data_name.c_str(), (unsigned int)exportOpt.color_count); const size_t palette_start = exportOpt.color_start / assetData->image.colors_per_pal; const size_t total_palette_count = assetData->image.total_color_count / assetData->image.colors_per_pal; - for(size_t i = palette_start; i < total_palette_count; ++i) - { - if(i > palette_start) - fprintf(file, ",\n"); - fprintf(file, "\t"); + int cur_color = exportOpt.color_start; + fprintf(file, "\t"); + for (size_t i = palette_start; i < total_palette_count; ++i) + { unsigned char* pal_ptr = &assetData->image.palette[i * (assetData->image.colors_per_pal * RGBA32_SZ)]; - for(int c = 0; c < (int)assetData->image.colors_per_pal; ++c, pal_ptr += RGBA32_SZ) + for (int c = 0; c < (int)assetData->image.colors_per_pal; ++c, pal_ptr += RGBA32_SZ) { size_t rgb222 = (((pal_ptr[2] >> 6) & 0x3) << 4) | (((pal_ptr[1] >> 6) & 0x3) << 2) | (((pal_ptr[0] >> 6) & 0x3) << 0); - if(assetData->args->convert_rgb_to_nes) { + + if (assetData->args->convert_rgb_to_nes) fprintf(file, "0x%0X", rgb_to_nes[rgb222]); - } else fprintf(file, "RGB8(%3d,%3d,%3d)", pal_ptr[0], pal_ptr[1], pal_ptr[2]); - if(c != (int)assetData->image.colors_per_pal - 1) - fprintf(file, ", "); - // Line break every 4 color entries, to keep line width down - if(((c + 1) % 4) == 0) + + // Trailing comma except for the last entry + if (cur_color < ((int)assetData->image.total_color_count - 1)) + fprintf(file, ","); + + // Line break every 4 colors to keep line width down, + // otherwise a trailing space (except on the last color/array item) + if (((cur_color + 1) % 4) == 0) fprintf(file, "\n\t"); + else if (cur_color < ((int)assetData->image.total_color_count - 1)) + fprintf(file, " "); + + cur_color++; } } - fprintf(file, "\n};\n"); + fprintf(file, "};\n"); } } diff --git a/gbdk-support/png2asset/testing/ref/apaimage_1.c b/gbdk-support/png2asset/testing/ref/apaimage_1.c @@ -8,8 +8,7 @@ BANKREF(apaimage_1) const palette_color_t apaimage_1_palettes[4] = { RGB8(255,255,255), RGB8(160,160,160), RGB8( 78, 78, 78), RGB8( 0, 0, 0) - -}; + }; const uint8_t apaimage_1_tiles[5760] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/binout.1.bin b/gbdk-support/png2asset/testing/ref/binout.1.bin @@ -8,8 +8,7 @@ BANKREF(binout) const palette_color_t binout_palettes[4] = { RGB8(255,254,245), RGB8(224,223,175), RGB8(172,182,127), RGB8( 63, 67, 40) - -}; + }; const uint8_t binout_tiles[1088] = { 0x3f,0x3f,0x60,0x7f,0xc0,0xc0,0x80,0xc0,0x80,0xc0,0x80,0xc0,0x80,0xc0,0x80,0xc0, diff --git a/gbdk-support/png2asset/testing/ref/binout.2.bin b/gbdk-support/png2asset/testing/ref/binout.2.bin @@ -8,8 +8,7 @@ BANKREF(binout) const palette_color_t binout_palettes[4] = { RGB8(255,254,245), RGB8(224,223,175), RGB8(172,182,127), RGB8( 63, 67, 40) - -}; + }; const metasprite_t binout_metasprite0[] = { METASPR_ITEM(-48, -28, 0, S_PAL(0)), METASPR_ITEM(0, 8, 2, S_PAL(0)), diff --git a/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_1.c b/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_1.c @@ -7,15 +7,11 @@ BANKREF(color_indexed_nums_map_1) const palette_color_t color_indexed_nums_map_1_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t color_indexed_nums_map_1_tiles[640] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_3.c b/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_3.c @@ -7,15 +7,11 @@ BANKREF(color_indexed_nums_map_3) const palette_color_t color_indexed_nums_map_3_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t color_indexed_nums_map_3_tiles[480] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_5.c b/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_5.c @@ -7,15 +7,11 @@ BANKREF(color_indexed_nums_map_5) const palette_color_t color_indexed_nums_map_5_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t color_indexed_nums_map_5_tiles[640] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_7.c b/gbdk-support/png2asset/testing/ref/color_indexed_nums_map_7.c @@ -7,15 +7,11 @@ BANKREF(color_indexed_nums_map_7) const palette_color_t color_indexed_nums_map_7_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t color_indexed_nums_map_7_tiles[640] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_1.c b/gbdk-support/png2asset/testing/ref/color_nums_map_1.c @@ -7,15 +7,11 @@ BANKREF(color_nums_map_1) const palette_color_t color_nums_map_1_palettes[16] = { - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , - RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - , + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), + RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_1_tiles[640] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_2.c b/gbdk-support/png2asset/testing/ref/color_nums_map_2.c @@ -8,8 +8,7 @@ BANKREF(color_nums_map_2) const palette_color_t color_nums_map_2_palettes[4] = { RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_2_tiles[480] = { 0x00,0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_3.c b/gbdk-support/png2asset/testing/ref/color_nums_map_3.c @@ -7,15 +7,11 @@ BANKREF(color_nums_map_3) const palette_color_t color_nums_map_3_palettes[16] = { - RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - , - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , + RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0), + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_3_tiles[480] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_4.c b/gbdk-support/png2asset/testing/ref/color_nums_map_4.c @@ -8,8 +8,7 @@ BANKREF(color_nums_map_4) const palette_color_t color_nums_map_4_palettes[4] = { RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_4_tiles[320] = { 0x00,0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_5.c b/gbdk-support/png2asset/testing/ref/color_nums_map_5.c @@ -7,15 +7,11 @@ BANKREF(color_nums_map_5) const palette_color_t color_nums_map_5_palettes[16] = { - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , - RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - , + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), + RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_5_tiles[640] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_6.c b/gbdk-support/png2asset/testing/ref/color_nums_map_6.c @@ -8,8 +8,7 @@ BANKREF(color_nums_map_6) const palette_color_t color_nums_map_6_palettes[4] = { RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_6_tiles[480] = { 0x00,0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_7.c b/gbdk-support/png2asset/testing/ref/color_nums_map_7.c @@ -7,15 +7,11 @@ BANKREF(color_nums_map_7) const palette_color_t color_nums_map_7_palettes[16] = { - RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - , - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , + RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0), + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_7_tiles[640] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/color_nums_map_8.c b/gbdk-support/png2asset/testing/ref/color_nums_map_8.c @@ -7,11 +7,9 @@ BANKREF(color_nums_map_8) const palette_color_t color_nums_map_8_palettes[8] = { - RGB8(255,255,255), RGB8(255,242, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - , + RGB8(255,255,255), RGB8(255,242, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t color_nums_map_8_tiles[464] = { 0xff,0x00,0xff,0x00,0xb3,0x4c,0xad,0x52,0xad,0x52,0xad,0x52,0xf3,0x0c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/gbdklogo_1.c b/gbdk-support/png2asset/testing/ref/gbdklogo_1.c @@ -8,8 +8,7 @@ BANKREF(gbdklogo_1) const palette_color_t gbdklogo_1_palettes[4] = { RGB8(224,248,208), RGB8(136,192,112), RGB8( 52,104, 86), RGB8( 7, 23, 26) - -}; + }; const uint8_t gbdklogo_1_tiles[624] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/gbdklogo_2.c b/gbdk-support/png2asset/testing/ref/gbdklogo_2.c @@ -7,15 +7,11 @@ BANKREF(gbdklogo_2) const palette_color_t gbdklogo_2_palettes[16] = { - RGB8(255,255,255), RGB8(221, 51, 51), RGB8( 68, 68,187), RGB8( 17, 17,119) - , - RGB8(255,255,255), RGB8(170,170,204), RGB8( 68, 68,187), RGB8( 17, 17,119) - , - RGB8(255,255,255), RGB8(119,119,119), RGB8(187, 34, 85), RGB8( 17, 34, 34) - , + RGB8(255,255,255), RGB8(221, 51, 51), RGB8( 68, 68,187), RGB8( 17, 17,119), + RGB8(255,255,255), RGB8(170,170,204), RGB8( 68, 68,187), RGB8( 17, 17,119), + RGB8(255,255,255), RGB8(119,119,119), RGB8(187, 34, 85), RGB8( 17, 34, 34), RGB8(255,255,255), RGB8(221,255,204), RGB8(119,119,119), RGB8( 17, 34, 34) - -}; + }; const uint8_t gbdklogo_2_tiles[656] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/gbdklogo_3.c b/gbdk-support/png2asset/testing/ref/gbdklogo_3.c @@ -7,13 +7,10 @@ BANKREF(gbdklogo_3) const palette_color_t gbdklogo_3_palettes[12] = { - 0x20, 0x0, 0x17, 0x1D - , - 0x20, 0x3D, 0x22, 0x13 - , + 0x20, 0x0, 0x17, 0x1D, + 0x20, 0x3D, 0x22, 0x13, 0x20, 0x3C, 0x21, 0x1D - -}; + }; const uint8_t gbdklogo_3_tiles[640] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/gbdklogo_4.c b/gbdk-support/png2asset/testing/ref/gbdklogo_4.c @@ -7,12 +7,11 @@ BANKREF(gbdklogo_4) const palette_color_t gbdklogo_4_palettes[16] = { - RGB8(255,255,255), RGB8(136,238, 85), RGB8(170,170,204), RGB8(153,153,153), - RGB8(238, 51, 51), RGB8(221, 51, 51), RGB8( 85, 85, 85), RGB8( 68, 68,187), - RGB8( 68, 51,204), RGB8( 51, 51, 51), RGB8( 34, 34, 34), RGB8( 17, 17,119), + RGB8(255,255,255), RGB8(136,238, 85), RGB8(170,170,204), RGB8(153,153,153), + RGB8(238, 51, 51), RGB8(221, 51, 51), RGB8( 85, 85, 85), RGB8( 68, 68,187), + RGB8( 68, 51,204), RGB8( 51, 51, 51), RGB8( 34, 34, 34), RGB8( 17, 17,119), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t gbdklogo_4_tiles[1312] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/hblankcopy_1.c b/gbdk-support/png2asset/testing/ref/hblankcopy_1.c @@ -10,8 +10,7 @@ BANKREF(hblankcopy_1) const palette_color_t hblankcopy_1_palettes[4] = { RGB8(195,205,187), RGB8(143,181,119), RGB8( 53,115, 89), RGB8( 9, 25, 35) - -}; + }; const uint8_t hblankcopy_1_tiles[2016] = { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, diff --git a/gbdk-support/png2asset/testing/ref/largemap_1.c b/gbdk-support/png2asset/testing/ref/largemap_1.c @@ -7,15 +7,11 @@ BANKREF(largemap_1) const palette_color_t largemap_1_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_1_tiles[3744] = { 0x5c,0x63,0x33,0x3c,0x2d,0x10,0x5a,0x20,0xdd,0x20,0xbf,0x40,0xbf,0x40,0x1b,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_2.c b/gbdk-support/png2asset/testing/ref/largemap_2.c @@ -7,15 +7,11 @@ BANKREF(largemap_2) const palette_color_t largemap_2_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_2_tiles[3360] = { 0x5c,0x63,0x33,0x3c,0x2d,0x10,0x5a,0x20,0xdd,0x20,0xbf,0x40,0xbf,0x40,0x1b,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_3.c b/gbdk-support/png2asset/testing/ref/largemap_3.c @@ -7,15 +7,11 @@ BANKREF(largemap_3) const palette_color_t largemap_3_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_3_tiles[3744] = { 0x5c,0x63,0x33,0x3c,0x2d,0x10,0x5a,0x20,0xdd,0x20,0xbf,0x40,0xbf,0x40,0x1b,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_4.c b/gbdk-support/png2asset/testing/ref/largemap_4.c @@ -7,15 +7,11 @@ BANKREF(largemap_4) const palette_color_t largemap_4_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_4_tiles[3744] = { 0x5c,0x63,0x33,0x3c,0x2d,0x10,0x5a,0x20,0xdd,0x20,0xbf,0x40,0xbf,0x40,0x1b,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_5.c b/gbdk-support/png2asset/testing/ref/largemap_5.c @@ -7,12 +7,11 @@ BANKREF(largemap_5) const palette_color_t largemap_5_palettes[16] = { - RGB8(240,224,176), RGB8(104,176,255), RGB8( 40,248, 40), RGB8(160,160,160), - RGB8(144,104, 0), RGB8( 88, 88, 88), RGB8( 0, 96,208), RGB8( 96, 80, 8), - RGB8( 24,100, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 40,248, 40), RGB8(160,160,160), + RGB8(144,104, 0), RGB8( 88, 88, 88), RGB8( 0, 96,208), RGB8( 96, 80, 8), + RGB8( 24,100, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_5_tiles[6944] = { 0x40,0x1c,0x00,0x63,0x30,0x03,0x00,0x3c,0x00,0x2d,0x00,0x10,0x00,0x5a,0x00,0x20,0x00,0xdd,0x00,0x20,0x00,0xbf,0x00,0x40,0x00,0xbf,0x00,0x40,0x00,0x1b,0x00,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_6.c b/gbdk-support/png2asset/testing/ref/largemap_6.c @@ -7,12 +7,11 @@ BANKREF(largemap_6) const palette_color_t largemap_6_palettes[16] = { - RGB8(240,224,176), RGB8(104,176,255), RGB8( 40,248, 40), RGB8(160,160,160), - RGB8(144,104, 0), RGB8( 88, 88, 88), RGB8( 0, 96,208), RGB8( 96, 80, 8), - RGB8( 24,100, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 40,248, 40), RGB8(160,160,160), + RGB8(144,104, 0), RGB8( 88, 88, 88), RGB8( 0, 96,208), RGB8( 96, 80, 8), + RGB8( 24,100, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_6_tiles[6944] = { 0x40,0x1c,0x00,0x63,0x30,0x03,0x00,0x3c,0x00,0x2d,0x00,0x10,0x00,0x5a,0x00,0x20,0x00,0xdd,0x00,0x20,0x00,0xbf,0x00,0x40,0x00,0xbf,0x00,0x40,0x00,0x1b,0x00,0x64, diff --git a/gbdk-support/png2asset/testing/ref/largemap_7.c b/gbdk-support/png2asset/testing/ref/largemap_7.c @@ -9,15 +9,11 @@ BANKREF(largemap_7) const palette_color_t largemap_7_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t largemap_7_tiles[3600] = { 0x5c,0x33,0x2d,0x5a,0xdd,0xbf,0xbf,0x1b,0x63,0x3c,0x10,0x20,0x20,0x40,0x40,0x64, diff --git a/gbdk-support/png2asset/testing/ref/nums_map_1.c b/gbdk-support/png2asset/testing/ref/nums_map_1.c @@ -8,8 +8,7 @@ BANKREF(nums_map_1) const palette_color_t nums_map_1_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t nums_map_1_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/nums_map_3.c b/gbdk-support/png2asset/testing/ref/nums_map_3.c @@ -8,8 +8,7 @@ BANKREF(nums_map_3) const palette_color_t nums_map_3_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t nums_map_3_tiles[480] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/nums_map_5.c b/gbdk-support/png2asset/testing/ref/nums_map_5.c @@ -8,8 +8,7 @@ BANKREF(nums_map_5) const palette_color_t nums_map_5_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t nums_map_5_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/nums_map_7.c b/gbdk-support/png2asset/testing/ref/nums_map_7.c @@ -8,8 +8,7 @@ BANKREF(nums_map_7) const palette_color_t nums_map_7_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t nums_map_7_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/remote.c b/gbdk-support/png2asset/testing/ref/remote.c @@ -8,8 +8,7 @@ BANKREF(remote) const palette_color_t remote_palettes[4] = { RGB8(255,255,255), RGB8(171,171,171), RGB8( 84, 84, 84), RGB8( 0, 0, 0) - -}; + }; const uint8_t remote_tiles[2256] = { 0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/sgb_border_1.c b/gbdk-support/png2asset/testing/ref/sgb_border_1.c @@ -7,12 +7,11 @@ BANKREF(sgb_border_1) const palette_color_t sgb_border_1_palettes[16] = { - RGB8(255,255,255), RGB8(231,222,231), RGB8(206,198,198), RGB8(165,165,165), - RGB8(255,115,181), RGB8(198, 99,115), RGB8(123,123,140), RGB8(115,115,132), - RGB8(107,107,123), RGB8( 90,107,165), RGB8(140, 66, 99), RGB8( 74, 82, 57), + RGB8(255,255,255), RGB8(231,222,231), RGB8(206,198,198), RGB8(165,165,165), + RGB8(255,115,181), RGB8(198, 99,115), RGB8(123,123,140), RGB8(115,115,132), + RGB8(107,107,123), RGB8( 90,107,165), RGB8(140, 66, 99), RGB8( 74, 82, 57), RGB8(107, 57, 90), RGB8( 49, 66,123), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t sgb_border_1_tiles[3424] = { 0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/sprite_slon_1.c b/gbdk-support/png2asset/testing/ref/sprite_slon_1.c @@ -8,8 +8,7 @@ BANKREF(sprite_slon_1) const palette_color_t sprite_slon_1_palettes[4] = { RGB8(255,255,255), RGB8(224,248,207), RGB8(134,192,108), RGB8( 7, 24, 33) - -}; + }; const uint8_t sprite_slon_1_tiles[768] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x0d,0x0e,0x1f,0x10,0x3f,0x20,0x3f,0x20, diff --git a/gbdk-support/png2asset/testing/ref/sprite_slon_2.c b/gbdk-support/png2asset/testing/ref/sprite_slon_2.c @@ -8,8 +8,7 @@ BANKREF(sprite_slon_2) const palette_color_t sprite_slon_2_palettes[4] = { RGB8(255,255,255), RGB8(224,248,207), RGB8(134,192,108), RGB8( 7, 24, 33) - -}; + }; const uint8_t sprite_slon_2_tiles[960] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/sprite_slon_3.c b/gbdk-support/png2asset/testing/ref/sprite_slon_3.c @@ -8,8 +8,7 @@ BANKREF(sprite_slon_3) const palette_color_t sprite_slon_3_palettes[4] = { RGB8(255,255,255), RGB8(224,248,207), RGB8(134,192,108), RGB8( 7, 24, 33) - -}; + }; const metasprite_t sprite_slon_3_metasprite0[] = { METASPR_ITEM(-24, -24, 0, S_PAL(0)), METASPR_ITEM(0, 8, 2, S_PAL(0)), diff --git a/gbdk-support/png2asset/testing/ref/sprite_slon_4.c b/gbdk-support/png2asset/testing/ref/sprite_slon_4.c @@ -8,8 +8,7 @@ BANKREF(sprite_slon_4) const palette_color_t sprite_slon_4_palettes[4] = { RGB8(255,255,255), RGB8(224,248,207), RGB8(134,192,108), RGB8( 7, 24, 33) - -}; + }; const uint8_t sprite_slon_4_tiles[960] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_1.c b/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_1.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_indexed_nums_map_1) const palette_color_t zgb_color_indexed_nums_map_1_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t zgb_color_indexed_nums_map_1_tiles[640] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_2.c b/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_2.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_indexed_nums_map_2) const palette_color_t zgb_color_indexed_nums_map_2_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t zgb_color_indexed_nums_map_2_tiles[480] = { 0xff,0x00,0xff,0x00,0xff,0x4c,0xff,0x52,0xff,0x52,0xff,0x52,0xff,0x0c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_3.c b/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_3.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_indexed_nums_map_3) const palette_color_t zgb_color_indexed_nums_map_3_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t zgb_color_indexed_nums_map_3_tiles[480] = { 0xff,0x00,0xff,0x3c,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x24,0xff,0x3c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_4.c b/gbdk-support/png2asset/testing/ref/zgb_color_indexed_nums_map_4.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_indexed_nums_map_4) const palette_color_t zgb_color_indexed_nums_map_4_palettes[16] = { - RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0) - , - RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88) - , - RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2) - , + RGB8(253,207,207), RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), + RGB8(187,210,247), RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), + RGB8(190,255,210), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8(253,253,139), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2) - -}; + }; const uint8_t zgb_color_indexed_nums_map_4_tiles[320] = { 0xff,0x00,0xff,0x00,0xff,0x4c,0xff,0x52,0xff,0x52,0xff,0x52,0xff,0x0c,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_1.c b/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_1.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_nums_map_1) const palette_color_t zgb_color_nums_map_1_palettes[16] = { - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , - RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - , + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), + RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_color_nums_map_1_tiles[640] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_2.c b/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_2.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_nums_map_2) const palette_color_t zgb_color_nums_map_2_palettes[16] = { - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - , + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_color_nums_map_2_tiles[480] = { 0x00,0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_3.c b/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_3.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_nums_map_3) const palette_color_t zgb_color_nums_map_3_palettes[16] = { - RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - , - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , + RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0), + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_color_nums_map_3_tiles[480] = { 0x00,0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_4.c b/gbdk-support/png2asset/testing/ref/zgb_color_nums_map_4.c @@ -9,15 +9,11 @@ BANKREF(zgb_color_nums_map_4) const palette_color_t zgb_color_nums_map_4_palettes[16] = { - RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0) - , - RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0) - , + RGB8( 77,171,255), RGB8( 35,129,235), RGB8( 9, 5, 88), RGB8( 0, 0, 0), + RGB8(241,131,131), RGB8(231, 40, 40), RGB8( 76, 0, 0), RGB8( 0, 0, 0), + RGB8( 0,237, 22), RGB8( 0,167, 15), RGB8( 10, 59, 2), RGB8( 0, 0, 0), RGB8(255,242, 0), RGB8(179,170, 0), RGB8( 75, 61, 2), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_color_nums_map_4_tiles[320] = { 0x00,0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_largemap_1.c b/gbdk-support/png2asset/testing/ref/zgb_largemap_1.c @@ -11,15 +11,11 @@ BANKREF(zgb_largemap_1) const palette_color_t zgb_largemap_1_palettes[16] = { - RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0) - , - RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0) - , + RGB8(240,224,176), RGB8( 40,248, 40), RGB8( 24,100, 0), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(104,176,255), RGB8( 0, 96,208), RGB8( 0, 0, 0), + RGB8(240,224,176), RGB8(144,104, 0), RGB8( 96, 80, 8), RGB8( 0, 0, 0), RGB8(240,224,176), RGB8(160,160,160), RGB8( 88, 88, 88), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_largemap_1_tiles[3744] = { 0x5c,0x63,0x33,0x3c,0x2d,0x10,0x5a,0x20,0xdd,0x20,0xbf,0x40,0xbf,0x40,0x1b,0x64, diff --git a/gbdk-support/png2asset/testing/ref/zgb_largemap_2.c b/gbdk-support/png2asset/testing/ref/zgb_largemap_2.c @@ -11,12 +11,11 @@ BANKREF(zgb_largemap_2) const palette_color_t zgb_largemap_2_palettes[16] = { - RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176), - RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176), - RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176), RGB8( 0, 0, 0), RGB8( 88, 88, 88), RGB8(160,160,160), RGB8(240,224,176) - -}; + }; const uint8_t zgb_largemap_2_tiles[7104] = { 0xa3,0x9c,0x00,0x00,0xcc,0xc3,0x00,0x00,0xd2,0xef,0x00,0x00,0xa5,0xdf,0x00,0x00,0x22,0xdf,0x00,0x00,0x40,0xbf,0x00,0x00,0x40,0xbf,0x00,0x00,0xe4,0x9b,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_largemap_3_attribs_smsgg.c b/gbdk-support/png2asset/testing/ref/zgb_largemap_3_attribs_smsgg.c @@ -11,12 +11,11 @@ BANKREF(zgb_largemap_3_attribs_smsgg) const palette_color_t zgb_largemap_3_attribs_smsgg_palettes[16] = { - RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176), - RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176), - RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176), RGB8( 0, 0, 0), RGB8( 88, 88, 88), RGB8(160,160,160), RGB8(240,224,176) - -}; + }; const uint8_t zgb_largemap_3_attribs_smsgg_tiles[7104] = { 0xa3,0x9c,0x00,0x00,0xcc,0xc3,0x00,0x00,0xd2,0xef,0x00,0x00,0xa5,0xdf,0x00,0x00,0x22,0xdf,0x00,0x00,0x40,0xbf,0x00,0x00,0x40,0xbf,0x00,0x00,0xe4,0x9b,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_largemap_4_attribs_gbc.c b/gbdk-support/png2asset/testing/ref/zgb_largemap_4_attribs_gbc.c @@ -11,15 +11,11 @@ BANKREF(zgb_largemap_4_attribs_gbc) const palette_color_t zgb_largemap_4_attribs_gbc_palettes[16] = { - RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176) - , - RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176) - , - RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176) - , + RGB8( 0, 0, 0), RGB8( 24,100, 0), RGB8( 40,248, 40), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 0, 96,208), RGB8(104,176,255), RGB8(240,224,176), + RGB8( 0, 0, 0), RGB8( 96, 80, 8), RGB8(144,104, 0), RGB8(240,224,176), RGB8( 0, 0, 0), RGB8( 88, 88, 88), RGB8(160,160,160), RGB8(240,224,176) - -}; + }; const uint8_t zgb_largemap_4_attribs_gbc_tiles[3360] = { 0xa3,0x9c,0xcc,0xc3,0xd2,0xef,0xa5,0xdf,0x22,0xdf,0x40,0xbf,0x40,0xbf,0xe4,0x9b, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_1.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_1.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_1) const palette_color_t zgb_nums_map_1_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_1_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_2.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_2.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_2) const palette_color_t zgb_nums_map_2_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_2_tiles[480] = { 0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_3.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_3.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_3) const palette_color_t zgb_nums_map_3_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_3_tiles[480] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_4.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_4.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_4) const palette_color_t zgb_nums_map_4_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_4_tiles[320] = { 0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_5.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_5.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_5) const palette_color_t zgb_nums_map_5_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_5_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_6.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_6.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_6) const palette_color_t zgb_nums_map_6_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_6_tiles[480] = { 0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_7.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_7.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_7) const palette_color_t zgb_nums_map_7_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_7_tiles[640] = { 0x00,0x00,0x3c,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x24,0x00,0x3c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_nums_map_8.c b/gbdk-support/png2asset/testing/ref/zgb_nums_map_8.c @@ -10,8 +10,7 @@ BANKREF(zgb_nums_map_8) const palette_color_t zgb_nums_map_8_palettes[4] = { RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_nums_map_8_tiles[320] = { 0x00,0x00,0x00,0x00,0x4c,0x00,0x52,0x00,0x52,0x00,0x52,0x00,0x0c,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_sgb_border_1.c b/gbdk-support/png2asset/testing/ref/zgb_sgb_border_1.c @@ -11,12 +11,11 @@ BANKREF(zgb_sgb_border_1) const palette_color_t zgb_sgb_border_1_palettes[16] = { - RGB8(255,255,255), RGB8(231,222,231), RGB8(206,198,198), RGB8(165,165,165), - RGB8(255,115,181), RGB8(198, 99,115), RGB8(123,123,140), RGB8(115,115,132), - RGB8(107,107,123), RGB8( 90,107,165), RGB8(140, 66, 99), RGB8( 74, 82, 57), + RGB8(255,255,255), RGB8(231,222,231), RGB8(206,198,198), RGB8(165,165,165), + RGB8(255,115,181), RGB8(198, 99,115), RGB8(123,123,140), RGB8(115,115,132), + RGB8(107,107,123), RGB8( 90,107,165), RGB8(140, 66, 99), RGB8( 74, 82, 57), RGB8(107, 57, 90), RGB8( 49, 66,123), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_sgb_border_1_tiles[3424] = { 0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_sprite_1.c b/gbdk-support/png2asset/testing/ref/zgb_sprite_1.c @@ -12,8 +12,7 @@ BANKREF(zgb_sprite_1) const palette_color_t zgb_sprite_1_palettes[4] = { RGB8(255,255,255), RGB8(224,248,207), RGB8(134,192,108), RGB8( 7, 24, 33) - -}; + }; const uint8_t zgb_sprite_1_tiles[896] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_sprite_2.c b/gbdk-support/png2asset/testing/ref/zgb_sprite_2.c @@ -11,47 +11,39 @@ BANKREF(zgb_sprite_2) const palette_color_t zgb_sprite_2_palettes[128] = { - RGB8( 7, 24, 33), RGB8(134,192,108), RGB8(101,255, 0), RGB8(224,248,207), - RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 7, 24, 33), RGB8(134,192,108), RGB8(101,255, 0), RGB8(224,248,207), + RGB8(255,255,255), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), + RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - , - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), - RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0) - -}; + }; const uint8_t zgb_sprite_2_tiles[1984] = { 0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00, diff --git a/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.c b/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles.c @@ -10,12 +10,11 @@ BANKREF(zgb_sushi_tiles) const palette_color_t zgb_sushi_tiles_palettes[16] = { - RGB8( 24, 32, 40), RGB8( 48, 32, 56), RGB8( 80, 40, 56), RGB8(112, 48, 64), - RGB8(120, 64, 88), RGB8(232,104,112), RGB8(248,168,112), RGB8(248,248,200), - RGB8(200,168,112), RGB8(152,104, 56), RGB8(104, 72, 48), RGB8( 48, 40, 32), + RGB8( 24, 32, 40), RGB8( 48, 32, 56), RGB8( 80, 40, 56), RGB8(112, 48, 64), + RGB8(120, 64, 88), RGB8(232,104,112), RGB8(248,168,112), RGB8(248,248,200), + RGB8(200,168,112), RGB8(152,104, 56), RGB8(104, 72, 48), RGB8( 48, 40, 32), RGB8( 8, 32, 64), RGB8( 48, 40, 32), RGB8( 0,128, 0), RGB8( 0,192, 0) - -}; + }; const uint8_t zgb_sushi_tiles_tiles[2848] = { 0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff, diff --git a/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.c b/gbdk-support/png2asset/testing/ref/zgb_sushi_tiles_lit.c @@ -10,12 +10,11 @@ BANKREF(zgb_sushi_tiles_lit) const palette_color_t zgb_sushi_tiles_lit_palettes[16] = { - RGB8( 24, 32, 40), RGB8( 48, 32, 56), RGB8( 80, 40, 56), RGB8(112, 48, 64), - RGB8(120, 64, 88), RGB8(232,104,112), RGB8(248,168,112), RGB8(248,248,200), - RGB8(200,168,112), RGB8(152,104, 56), RGB8(104, 72, 48), RGB8( 48, 40, 32), + RGB8( 24, 32, 40), RGB8( 48, 32, 56), RGB8( 80, 40, 56), RGB8(112, 48, 64), + RGB8(120, 64, 88), RGB8(232,104,112), RGB8(248,168,112), RGB8(248,248,200), + RGB8(200,168,112), RGB8(152,104, 56), RGB8(104, 72, 48), RGB8( 48, 40, 32), RGB8( 8, 32, 64), RGB8( 48, 40, 32), RGB8( 0,128, 0), RGB8( 0,192, 0) - -}; + }; const uint8_t zgb_sushi_tiles_lit_tiles[2848] = { 0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0xff,

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