show frame and timer values in debug mode

src/game.c

@@ -72,6 +72,7 @@ static enum ACCELERATION acc = 0;
 static uint16_t health = HEALTH_MAX;
 static uint16_t power = POWER_MAX;
 static int32_t score = 0;
+static uint16_t frame_count = 0;
 
 static uint8_t pause_screen(void) NONBANKED {
     snd_music_off();
@@ -251,6 +252,7 @@ int32_t game(enum GAME_MODE mode) NONBANKED {
     health = HEALTH_MAX;
     power = POWER_MAX;
     score = 0;
+    frame_count = 0;
 
     obj_init();
 
@@ -494,13 +496,18 @@ int32_t game(enum GAME_MODE mode) NONBANKED {
 
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
 
-        if (score != prev_score) {
+        if ((score != prev_score) || ((_cpu == CGB_TYPE) && (conf_get()->debug_flags))) {
             uint8_t x_off = win_game_draw(score);
             move_win(MINWNDPOSX + DEVICE_SCREEN_PX_WIDTH - x_off, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - 16);
         }
 
         vsync();
+        frame_count++;
     }
 
     return score;
 }
+
+uint16_t game_get_framecount(void) NONBANKED {
+    return frame_count;
+}

src/game.h

@@ -43,6 +43,7 @@ void game_set_mp_player2(struct mp_player_state *state);
 void game_set_mp_shot(struct mp_shot_state *state);
 
 int32_t game(enum GAME_MODE mode);
+uint16_t game_get_framecount(void);
 
 BANKREF_EXTERN(game)
 

src/strings.c

@@ -50,6 +50,8 @@ static const char string_gb_printer[] = "GB Printer";
 static const char string_score_printout[] = "Score Printout";
 static const char string_result[] = "Result:";
 static const char string_printf_error[] = "error: 0x%04x";
+static const char string_printf_frames[] = "Frames: %u";
+static const char string_printf_timer[] = "Timer: %u";
 
 static const char * const strings[COUNT_STRINGS] = {
     string_top,            // STR_TOP
@@ -78,6 +80,8 @@ static const char * const strings[COUNT_STRINGS] = {
     string_score_printout, // STR_SCORE_PRINTOUT
     string_result,         // STR_RESULT
     string_printf_error,   // STR_PRINTF_ERROR
+    string_printf_frames,  // STR_PRINTF_FRAMES,
+    string_printf_timer,   // STR_PRINTF_TIMER,
 };
 
 #define MAX_STR_LEN 32

src/strings.h

@@ -49,6 +49,8 @@ enum STRINGS {
     STR_SCORE_PRINTOUT,
     STR_RESULT,
     STR_PRINTF_ERROR,
+    STR_PRINTF_FRAMES,
+    STR_PRINTF_TIMER,
 
     COUNT_STRINGS
 };

src/timer.c

@@ -44,7 +44,7 @@ void timer_init(void) BANKED {
     }
 }
 
-uint16_t timer_get(void) BANKED {
+uint16_t timer_get(void) NONBANKED {
     uint16_t r;
     CRITICAL {
         r = count;

src/timer.h

@@ -24,6 +24,6 @@
 #include <stdint.h>
 
 void timer_init(void) BANKED;
-uint16_t timer_get(void) BANKED;
+uint16_t timer_get(void);
 
 #endif // __TIMER_H__

src/window.c

@@ -23,6 +23,7 @@
 
 #include "banks.h"
 #include "config.h"
+#include "gb/hardware.h"
 #include "score.h"
 #include "text.h"
 #include "git.h"
@@ -32,10 +33,14 @@
 #include "gbprinter.h"
 #include "multiplayer.h"
 #include "strings.h"
+#include "timer.h"
+#include "game.h"
 #include "window.h"
 
 BANKREF(window)
 
+static char str_buff[128];
+
 static void fill_win(uint8_t x, uint8_t y, uint8_t w, uint8_t h, uint8_t tile, uint8_t attr) {
     VBK_REG = VBK_ATTRIBUTES;
     fill_win_rect(x, y, w, h, attr);
@@ -67,7 +72,7 @@ void win_splash_mp(void) BANKED {
 
 void win_score_clear(uint8_t is_black, uint8_t no_bg) BANKED {
     if (no_bg) {
-        fill_win(0, 0, DEVICE_SCREEN_WIDTH, DEVICE_SCREEN_HEIGHT, 1, 0x00);
+        fill_win(0, 0, DEVICE_SCREEN_WIDTH, DEVICE_SCREEN_HEIGHT, 1, BKGF_CGB_PAL0);
     } else {
         map_fill(MAP_TITLE, 0);
     }
@@ -83,8 +88,6 @@ void win_score_draw(struct scores score, uint8_t off, uint8_t is_black) BANKED {
 }
 
 void win_score_print(enum PRN_STATUS status) BANKED {
-    static char buff[128];
-
     if (_cpu == CGB_TYPE) {
         str_ascii(get_string(STR_GB_PRINTER), 0, 0, 0);
         str_ascii(get_string(STR_SCORE_PRINTOUT), 0, 1, 0);
@@ -93,11 +96,11 @@ void win_score_print(enum PRN_STATUS status) BANKED {
         if (status == PRN_STATUS_OK) {
             str_ascii(get_string(STR_SUCCESS), 0, 8, 0);
         } else {
-            sprintf(buff, get_string(STR_PRINTF_ERROR), (uint16_t)status);
-            str_ascii(buff, 0, 5, 0);
+            sprintf(str_buff, get_string(STR_PRINTF_ERROR), (uint16_t)status);
+            str_ascii(str_buff, 0, 5, 0);
 
-            gbprinter_error(status, buff);
-            str_ascii_lines(buff, 6, 0);
+            gbprinter_error(status, str_buff);
+            str_ascii_lines(str_buff, 6, 0);
         }
     } else {
         str(get_string(STR_PRINTOUT), 0, 4, 0);
@@ -256,13 +259,29 @@ void win_name_draw(uint16_t name, uint8_t is_black, uint8_t pos) BANKED {
 }
 
 uint8_t win_game_draw(int32_t score) BANKED {
-    fill_win(0, 0, 10, 2, maps[FNT_ASCII_8].tile_offset, 0x81);
-
     uint8_t is_black = 0;
     if (score < 0) {
         score = -score;
         is_black = 1;
     }
 
-    return number(score, 0, 0, is_black);
+    if ((_cpu == CGB_TYPE) && (conf_get()->debug_flags)) {
+        // TODO hard-coded black bg tile
+        fill_win(0, 0, 20, 2, 0x80, BKGF_CGB_PAL3);
+
+        uint8_t x_off = number(score, 0, 0, is_black) >> 3;
+
+        sprintf(str_buff, get_string(STR_PRINTF_FRAMES), (uint16_t)game_get_framecount());
+        str_ascii(str_buff, x_off + 1, 0, 1);
+
+        sprintf(str_buff, get_string(STR_PRINTF_TIMER), (uint16_t)timer_get());
+        str_ascii(str_buff, x_off + 1, 1, 1);
+
+        return DEVICE_SCREEN_PX_WIDTH;
+    } else {
+        // TODO hard-coded black bg tile
+        fill_win(0, 0, 10, 2, 0x80, BKGF_CGB_PAL3);
+
+        return number(score, 0, 0, is_black);
+    }
 }