add letters to show names in highscore

Makefile

@@ -85,9 +85,9 @@ $(BUILD_DIR)/$(DATA_DIR)/%.c $(BUILD_DIR)/$(DATA_DIR)/%.h: $(DATA_DIR)/%.png
 	$(if $(findstring _map,$<),           \
 		@echo "Converting map $<" &&  \
 		$(PNGA) $< -o $@ -spr8x8 -map -use_map_attributes -noflip \
-	,$(if $(findstring numbers,$<), \
+	,$(if $(findstring _fnt,$<), \
 		@echo "Converting font $<" && \
-		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -map \
+		$(PNGA) $< -o $@ -spr8x8 -sw 16 -sh 16 -map -noflip \
 	,                                     \
 		@echo "Converting tile $<" && \
 		$(PNGA) $< -o $@ -spr8x8      \

src/game.c

@@ -103,6 +103,7 @@ int32_t game(void) NONBANKED {
     obj_add(SPR_SHOT_LIGHT, 32, 32, 0, 0);
     obj_add(SPR_SHOT_DARK, -32, -32, 0, 0);
 
+    win_init(0);
     uint8_t x_off = win_game_draw(score);
     move_win(MINWNDPOSX + DEVICE_SCREEN_PX_WIDTH - x_off, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - 16);
 

src/main.c

@@ -36,10 +36,11 @@ static void highscore(uint8_t is_black) NONBANKED {
     HIDE_WIN;
 
     hide_sprites_range(SPR_NUM_START, MAX_HARDWARE_SPRITES);
-    win_score_clear();
+    win_score_clear(is_black);
 
     for (uint8_t i = 0; i < SCORE_NUM; i++) {
-        int32_t score = is_black ? -score_lowest(i).score : score_highest(i).score;
+
+        struct scores score = is_black ? score_lowest(i) : score_highest(i);
         win_score_draw(score, i, is_black);
     }
 
@@ -85,6 +86,7 @@ static void splash(void) NONBANKED {
     obj_add(SPR_LIGHT, 42, -42, 0, 0);
     obj_add(SPR_DARK, -42, -42, 0, 0);
 
+    win_init(1);
     splash_win();
 
     DISPLAY_ON;
@@ -114,7 +116,6 @@ static void splash(void) NONBANKED {
 void main(void) NONBANKED {
     spr_init();
     snd_init();
-    win_init();
 
     splash();
 

src/maps.c

@@ -22,22 +22,32 @@
 #include "maps.h"
 
 #include "gb/gb.h"
+#include "score.h"
 #include "title_map.h"
 #include "bg_map.h"
-#include "numbers.h"
+#include "numbers_fnt.h"
+#include "text_fnt.h"
 
 #define MAX_DIGITS 7
 
 // TODO inverted score color not visible on DMG
 
-const unsigned char num_attr_1[40] = {
+const unsigned char num_attr_1[104] = {
     0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
     0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+    0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+    0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+    0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+    0x81,0x81,0x81,0x81,
 };
 
-const unsigned char num_attr_2[40] = {
+const unsigned char num_attr_2[104] = {
+    0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,
+    0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,
+    0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,
     0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,
     0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,0x82,
+    0x82,0x82,0x82,0x82,
 };
 
 const palette_color_t num_pal_inv[4] = {
@@ -45,6 +55,8 @@ const palette_color_t num_pal_inv[4] = {
     RGB8(  0,  0,  0), RGB8(  0,  0,  0), RGB8(248,252,248), RGB8(  0,  0,  0)
 };
 
+static uint8_t fnt_off = 0;
+
 void map_title(void) NONBANKED {
     SWITCH_ROM(BANK(title_map));
     set_bkg_palette(OAMF_CGB_PAL0, title_map_PALETTE_COUNT, title_map_palettes);
@@ -61,11 +73,18 @@ void map_game(void) NONBANKED {
     set_bkg_tiles(0, 0, bg_map_WIDTH / bg_map_TILE_W, bg_map_HEIGHT / bg_map_TILE_H, bg_map_map);
 }
 
-void win_init(void) NONBANKED {
-    SWITCH_ROM(BANK(numbers));
-    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT, numbers_PALETTE_COUNT, numbers_palettes);
-    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT + 1, numbers_PALETTE_COUNT, num_pal_inv);
-    set_win_data(bg_map_TILE_COUNT, numbers_TILE_COUNT, numbers_tiles);
+void win_init(uint8_t is_splash) NONBANKED {
+    fnt_off = is_splash ? title_map_TILE_COUNT : bg_map_TILE_COUNT;
+
+    SWITCH_ROM(BANK(numbers_fnt));
+    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT, numbers_fnt_PALETTE_COUNT, numbers_fnt_palettes);
+    set_bkg_palette(OAMF_CGB_PAL0 + bg_map_PALETTE_COUNT + numbers_fnt_PALETTE_COUNT, numbers_fnt_PALETTE_COUNT, num_pal_inv);
+    set_win_data(fnt_off, numbers_fnt_TILE_COUNT, numbers_fnt_tiles);
+
+    if (is_splash) {
+        SWITCH_ROM(BANK(text_fnt));
+        set_win_data(fnt_off + numbers_fnt_TILE_COUNT, text_fnt_TILE_COUNT, text_fnt_tiles);
+    }
 }
 
 static void set_win_based(uint8_t x, uint8_t y, uint8_t w, uint8_t h,
@@ -76,18 +95,47 @@ static void set_win_based(uint8_t x, uint8_t y, uint8_t w, uint8_t h,
     set_win_based_tiles(x, y, w, h, tiles, base_tile);
 }
 
-static void digit(uint8_t val, uint8_t digit, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
-    SWITCH_ROM(BANK(numbers));
-    uint8_t off = val * numbers_WIDTH / numbers_TILE_W;
+static void character(uint8_t c, uint8_t pos, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
+    SWITCH_ROM(BANK(text_fnt));
+    uint8_t off = c * text_fnt_WIDTH / text_fnt_TILE_W;
+
+    set_win_based(x_off + (pos * text_fnt_WIDTH / text_fnt_TILE_W), y_off,
+                  text_fnt_WIDTH / text_fnt_TILE_W, 1,
+                  text_fnt_map + off, fnt_off + numbers_fnt_TILE_COUNT,
+                  (is_black ? num_attr_2 : num_attr_1) + off);
+
+    set_win_based(x_off + (pos * text_fnt_WIDTH / text_fnt_TILE_W), y_off + 1,
+                  text_fnt_WIDTH / text_fnt_TILE_W, 1,
+                  text_fnt_map + off + (sizeof(text_fnt_map) / 2), fnt_off + numbers_fnt_TILE_COUNT,
+                  (is_black ? num_attr_2 : num_attr_1) + off);
+}
+
+static void str3(uint16_t name, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
+    character((name >> 10) & 0x1F, 0, x_off, y_off, is_black);
+    character((name >>  5) & 0x1F, 1, x_off, y_off, is_black);
+    character((name >>  0) & 0x1F, 2, x_off, y_off, is_black);
+}
 
-    set_win_based(x_off + (digit * numbers_WIDTH / numbers_TILE_W), y_off,
-                  numbers_WIDTH / numbers_TILE_W, 1,
-                  numbers_map + off, bg_map_TILE_COUNT,
+static void str(const char *s, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
+    uint8_t n = 0;
+    while (*s) {
+        character(*s - 'a', n++, x_off, y_off, is_black);
+        s++;
+    }
+}
+
+static void digit(uint8_t val, uint8_t pos, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
+    SWITCH_ROM(BANK(numbers_fnt));
+    uint8_t off = val * numbers_fnt_WIDTH / numbers_fnt_TILE_W;
+
+    set_win_based(x_off + (pos * numbers_fnt_WIDTH / numbers_fnt_TILE_W), y_off,
+                  numbers_fnt_WIDTH / numbers_fnt_TILE_W, 1,
+                  numbers_fnt_map + off, fnt_off,
                   (is_black ? num_attr_2 : num_attr_1) + off);
 
-    set_win_based(x_off + (digit * numbers_WIDTH / numbers_TILE_W), y_off + 1,
-                  numbers_WIDTH / numbers_TILE_W, 1,
-                  numbers_map + off + (sizeof(numbers_map) / 2), bg_map_TILE_COUNT,
+    set_win_based(x_off + (pos * numbers_fnt_WIDTH / numbers_fnt_TILE_W), y_off + 1,
+                  numbers_fnt_WIDTH / numbers_fnt_TILE_W, 1,
+                  numbers_fnt_map + off + (sizeof(numbers_fnt_map) / 2), fnt_off,
                   (is_black ? num_attr_2 : num_attr_1) + off);
 }
 
@@ -134,20 +182,22 @@ void win_splash_draw(int32_t lowest, int32_t highest) NONBANKED {
     number(highest, 0xFE, 0, 0);
 }
 
-void win_score_clear(void) NONBANKED {
+void win_score_clear(uint8_t is_black) NONBANKED {
     SWITCH_ROM(BANK(title_map));
     set_win_based(0, 0,
                   title_map_WIDTH / title_map_TILE_W, title_map_HEIGHT / title_map_TILE_H,
                   title_map_map, 0, title_map_MAP_ATTRIBUTES);
+
+    str(is_black ? "black" : "white", 10 - 5, 1, is_black);
 }
 
-void win_score_draw(int32_t score, uint8_t off, uint8_t is_black) NONBANKED {
-    number(off, 1, 4 + off * 3, is_black);
-    number(score, 5, 4 + off * 3, is_black);
+void win_score_draw(struct scores score, uint8_t off, uint8_t is_black) NONBANKED {
+    str3(score.name, 0, 4 + off * 3, is_black);
+    number(is_black ? -score.score : score.score, 7, 4 + off * 3, is_black);
 }
 
 uint8_t win_game_draw(int32_t score) NONBANKED {
-    fill_win(0, 0, 10, 2, (uint8_t)bg_map_TILE_COUNT + (uint8_t)numbers_TILE_COUNT, 0x81);
+    fill_win(0, 0, 10, 2, fnt_off + numbers_fnt_TILE_COUNT, 0x81);
 
     uint8_t is_black = 0;
     if (score < 0) {

src/maps.h

@@ -21,14 +21,15 @@
 #define __MAPS_H__
 
 #include <stdint.h>
+#include "score.h"
 
 void map_title(void);
 void map_game(void);
 
-void win_init(void);
+void win_init(uint8_t is_splash);
 void win_splash_draw(int32_t lowest, int32_t highest);
-void win_score_clear(void);
-void win_score_draw(int32_t score, uint8_t off, uint8_t is_black);
+void win_score_clear(uint8_t is_black);
+void win_score_draw(struct scores score, uint8_t off, uint8_t is_black);
 uint8_t win_game_draw(int32_t score);
 
 #endif // __MAPS_H__

src/score.ba0.c

@@ -69,13 +69,13 @@ static void score_init(void) NONBANKED {
     scores[0].score = 10000;
 
     scores[1].name = convert_name('a', 'b', 'c');
-    scores[1].score = 8000;
+    scores[1].score = 8765;
 
     scores[2].name = convert_name('a', 'b', 'c');
-    scores[2].score = 6000;
+    scores[2].score = 6999;
 
     scores[3].name = convert_name('a', 'b', 'c');
-    scores[3].score = 4000;
+    scores[3].score = 4321;
 
     scores[4].name = convert_name('a', 'b', 'c');
     scores[4].score = 2000;
@@ -84,13 +84,13 @@ static void score_init(void) NONBANKED {
     scores[5].score = -2000;
 
     scores[6].name = convert_name('a', 'b', 'c');
-    scores[6].score = -4000;
+    scores[6].score = -4321;
 
     scores[7].name = convert_name('a', 'b', 'c');
-    scores[7].score = -6000;
+    scores[7].score = -6999;
 
     scores[8].name = convert_name('a', 'b', 'c');
-    scores[8].score = -8000;
+    scores[8].score = -8765;
 
     scores[9].name = convert_name('a', 'b', 'c');
     scores[9].score = -10000;