can enter name for score

src/main.c

@@ -26,6 +26,7 @@
 #include <stdint.h>
 
 #include "asm/types.h"
+#include "gb/gb.h"
 #include "maps.h"
 #include "obj.h"
 #include "sprites.h"
@@ -134,36 +135,60 @@ uint16_t ask_name(int32_t score) NONBANKED {
     win_init(1);
     win_name(score);
 
-    // TODO ask for name
-
     move_win(MINWNDPOSX, MINWNDPOSY);
     SHOW_WIN;
 
     DISPLAY_ON;
     enable_interrupts();
 
-    uint16_t name = convert_name('a', 'a', 'a');
+    char name[3] = { 'a', 'a', 'a' };
+    uint8_t pos = 0;
+    win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
 
     while (1) {
         key_read();
 
         if (key_pressed(J_LEFT)) {
-            // TODO
+            if (pos > 0) {
+                pos--;
+                win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
+            }
         } else if (key_pressed(J_RIGHT)) {
-            // TODO
+            if (pos < 3) {
+                pos++;
+                win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
+            }
         } else if (key_pressed(J_UP)) {
-            // TODO
+            if (pos < 3) {
+                name[pos]++;
+                if (name[pos] > 'z') {
+                    name[pos] -= 'z' - 'a' + 1;
+                }
+                win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
+            }
         } else if (key_pressed(J_DOWN)) {
-            // TODO
+            if (pos < 3) {
+                name[pos]--;
+                if (name[pos] < 'a') {
+                    name[pos] += 'z' - 'a' + 1;
+                }
+                win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
+            }
         } else if (key_pressed(J_A)) {
-            // TODO
+            if (pos < 3) {
+                pos++;
+                win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
+            } else {
+                break;
+            }
+        } else if (key_pressed(J_START)) {
             break;
         }
 
         vsync();
     }
 
-    return name;
+    return convert_name(name[0], name[1], name[2]);
 }
 
 static void sgb_init(void) NONBANKED {

src/maps.c

@@ -115,10 +115,11 @@ static void character(uint8_t c, uint8_t pos, uint8_t x_off, uint8_t y_off, uint
                   (is_black ? num_attr_2 : num_attr_1) + off, BANK(maps));
 }
 
-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);
+static void str3(uint16_t name, uint8_t x_off, uint8_t y_off,
+                 uint8_t is_black_a, uint8_t is_black_b, uint8_t is_black_c) NONBANKED {
+    character((name >> 10) & 0x1F, 0, x_off, y_off, is_black_a);
+    character((name >>  5) & 0x1F, 1, x_off, y_off, is_black_b);
+    character((name >>  0) & 0x1F, 2, x_off, y_off, is_black_c);
 }
 
 static void str(const char *s, uint8_t x_off, uint8_t y_off, uint8_t is_black) NONBANKED {
@@ -202,7 +203,7 @@ void win_score_clear(uint8_t is_black) NONBANKED {
 }
 
 void win_score_draw(struct scores score, uint8_t off, uint8_t is_black) NONBANKED {
-    str3(score.name, 0, 4 + off * 3, is_black);
+    str3(score.name, 0, 4 + off * 3, is_black, is_black, is_black);
     number(is_black ? -score.score : score.score, 7, 4 + off * 3, is_black);
 }
 
@@ -217,12 +218,16 @@ void win_name(int32_t score) NONBANKED {
     str("enter", 10 - 5, 6, score < 0);
     str("name", 10 - 4, 8, score < 0);
 
-    // placeholder
-    str("aaa", 10 - 3, 12, score < 0);
-
     str("start ok", 10 - 8, 16, score < 0);
 }
 
+void win_name_draw(uint16_t name, uint8_t is_black, uint8_t pos) NONBANKED {
+    str3(name, 10 - 3, 12,
+         (pos == 0) ? !is_black : is_black,
+         (pos == 1) ? !is_black : is_black,
+         (pos == 2) ? !is_black : is_black);
+}
+
 uint8_t win_game_draw(int32_t score) NONBANKED {
     fill_win(0, 0, 10, 2, fnt_off + numbers_fnt_TILE_COUNT, 0x81);
 

src/maps.h

@@ -31,6 +31,7 @@ void win_splash_draw(int32_t lowest, int32_t highest);
 void win_score_clear(uint8_t is_black);
 void win_score_draw(struct scores score, uint8_t off, uint8_t is_black);
 void win_name(int32_t score);
+void win_name_draw(uint16_t name, uint8_t is_black, uint8_t pos);
 uint8_t win_game_draw(int32_t score);
 
 BANKREF_EXTERN(maps)

src/score.ba0.c

@@ -98,6 +98,11 @@ static void score_init(void) NONBANKED {
     scores_crc = calc_crc();
 }
 
+static uint8_t score_pos(int32_t score) NONBANKED {
+    // TODO find place for new score
+    return (score < 0) ? 9 : 0;
+}
+
 uint8_t score_ranking(int32_t score) NONBANKED {
     ENABLE_RAM;
     SWITCH_RAM(0);
@@ -107,8 +112,7 @@ uint8_t score_ranking(int32_t score) NONBANKED {
         score_init();
     }
 
-    // TODO
-    uint8_t r = 1;
+    uint8_t r = (score_pos(score) < (SCORE_NUM * 2)) ? 1 : 0;
 
     DISABLE_RAM;
     return r;
@@ -123,7 +127,12 @@ void score_add(struct scores score) NONBANKED {
         score_init();
     }
 
-    // TODO
+    uint8_t new = score_pos(score.score);
+
+    // TODO move old scores out of the way
+
+    scores[new] = score;
+    scores_crc = calc_crc();
 
     DISABLE_RAM;
 }