add debug counter print options and move lots of stuff from bank zero

src/config.h

@@ -28,16 +28,15 @@
 enum debug_flag {
     DBG_NONE = 0,
 
-    DBG_MENU = (1 << 0),
-    DBG_MARKER = (1 << 1),
-    DBG_GOD_MODE = (1 << 2),
-    DBG_NO_OBJ = (1 << 3),
-    DBG_NO_FUEL = (1 << 4),
-    DBG_FAST = (1 << 5),
-
-    // TODO could be something other than flags
-    DBG_CLEAR_SCORE = (1 << 6),
-    DBG_ZERO_SCORE = (1 << 7),
+    DBG_MENU        = (1 << 0),
+    DBG_MARKER      = (1 << 1),
+    DBG_GOD_MODE    = (1 << 2),
+    DBG_NO_OBJ      = (1 << 3),
+    DBG_NO_FUEL     = (1 << 4),
+    DBG_FAST        = (1 << 5),
+    DBG_SHOW_FRAMES = (1 << 6),
+    DBG_SHOW_TIMER  = (1 << 7),
+    DBG_SHOW_STACK  = (1 << 8),
 };
 
 struct config {

src/game.c

@@ -496,7 +496,8 @@ int32_t game(enum GAME_MODE mode) NONBANKED {
 
         hide_sprites_range(hiwater, MAX_HARDWARE_SPRITES);
 
-        if ((score != prev_score) || ((_cpu == CGB_TYPE) && (conf_get()->debug_flags))) {
+        if ((score != prev_score) || ((_cpu == CGB_TYPE)
+                && (conf_get()->debug_flags & (DBG_SHOW_FRAMES | DBG_SHOW_TIMER | DBG_SHOW_STACK)))) {
             uint8_t x_off = win_game_draw(score, 0);
             move_win(MINWNDPOSX + DEVICE_SCREEN_PX_WIDTH - x_off, MINWNDPOSY + DEVICE_SCREEN_PX_HEIGHT - 16);
         }

src/main.c

@@ -58,18 +58,28 @@ const struct conf_entry conf_entries[CONF_ENTRY_COUNT] = {
 };
 
 const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT] = {
-    { .name = "marker",   .flag = DBG_MARKER,      .max = 1 }, // 0
-    { .name = "invuln",   .flag = DBG_GOD_MODE,    .max = 1 }, // 1
-    { .name = "no-spawn", .flag = DBG_NO_OBJ,      .max = 1 }, // 2
-    { .name = "no-fuel",  .flag = DBG_NO_FUEL,     .max = 1 }, // 3
-    { .name = "fastmove", .flag = DBG_FAST,        .max = 1 }, // 4
-    { .name = "music",    .flag = DBG_NONE,        .max = SND_COUNT }, // 5
-    { .name = "sfx-test", .flag = DBG_NONE,        .max = SFX_COUNT }, // 6
-    { .name = "cl score", .flag = DBG_CLEAR_SCORE, .max = 1 }, // 7
-    { .name = "0 scores", .flag = DBG_ZERO_SCORE,  .max = 1 }, // 8
+    { .name = "marker",   .flag = DBG_MARKER,      .max = 1         }, // 0
+    { .name = "invuln",   .flag = DBG_GOD_MODE,    .max = 1         }, // 1
+    { .name = "no-spawn", .flag = DBG_NO_OBJ,      .max = 1         }, // 2
+    { .name = "no-fuel",  .flag = DBG_NO_FUEL,     .max = 1         }, // 3
+    { .name = "fastmove", .flag = DBG_FAST,        .max = 1         }, // 4
+    { .name = "s-frames", .flag = DBG_SHOW_FRAMES, .max = 1         }, // 5
+    { .name = "s-timer",  .flag = DBG_SHOW_TIMER,  .max = 1         }, // 6
+    { .name = "s-stack",  .flag = DBG_SHOW_STACK,  .max = 1         }, // 7
+
+    // keep at end
+    { .name = "music",    .flag = DBG_NONE,        .max = SND_COUNT }, // 8
+    { .name = "sfx-test", .flag = DBG_NONE,        .max = SFX_COUNT }, // 9
+    { .name = "cl score", .flag = DBG_NONE,        .max = 1         }, // 10
+    { .name = "0 scores", .flag = DBG_NONE,        .max = 1         }, // 11
 };
 
-static void list_scores(uint8_t is_black) NONBANKED {
+#define DEBUG_MENU_MUSIC_INDEX (DEBUG_ENTRY_COUNT - 4)
+#define DEBUG_MENU_SFX_INDEX   (DEBUG_ENTRY_COUNT - 3)
+#define DEBUG_MENU_CLEAR_INDEX (DEBUG_ENTRY_COUNT - 2)
+#define DEBUG_MENU_ZERO_INDEX  (DEBUG_ENTRY_COUNT - 1)
+
+static void list_scores(uint8_t is_black) {
     for (uint8_t i = 0; i < SCORE_NUM; i++) {
         struct scores score;
         is_black ? score_lowest(i, &score) : score_highest(i, &score);
@@ -77,7 +87,7 @@ static void list_scores(uint8_t is_black) NONBANKED {
     }
 }
 
-static void highscore(uint8_t is_black) NONBANKED {
+static void highscore(uint8_t is_black) {
     HIDE_WIN;
 
     move_win(MINWNDPOSX, MINWNDPOSY);
@@ -118,7 +128,7 @@ static void highscore(uint8_t is_black) NONBANKED {
     }
 }
 
-static void about_screen(void) NONBANKED {
+static void about_screen(void) {
     HIDE_WIN;
 
     move_win(MINWNDPOSX, MINWNDPOSY);
@@ -144,7 +154,7 @@ static void about_screen(void) NONBANKED {
     }
 }
 
-static void conf_screen(void) NONBANKED {
+static void conf_screen(void) {
     HIDE_WIN;
 
     debug_menu_index = 0;
@@ -176,24 +186,20 @@ static void conf_screen(void) NONBANKED {
             }
             win_conf();
         } else if (key_pressed(J_LEFT)) {
-            START_ROM_BANK(BANK(main)) {
-                if (*conf_entries[debug_menu_index].var > 0) {
-                    (*conf_entries[debug_menu_index].var)--;
-                } else {
-                    *conf_entries[debug_menu_index].var = conf_entries[debug_menu_index].max;
-                }
-                conf_write_crc();
-            } END_ROM_BANK
+            if (*conf_entries[debug_menu_index].var > 0) {
+                (*conf_entries[debug_menu_index].var)--;
+            } else {
+                *conf_entries[debug_menu_index].var = conf_entries[debug_menu_index].max;
+            }
+            conf_write_crc();
             win_conf();
         } else if (key_pressed(J_RIGHT)) {
-            START_ROM_BANK(BANK(main)) {
-                if (*conf_entries[debug_menu_index].var < conf_entries[debug_menu_index].max) {
-                    (*conf_entries[debug_menu_index].var)++;
-                } else {
-                    *conf_entries[debug_menu_index].var = 0;
-                }
-                conf_write_crc();
-            } END_ROM_BANK
+            if (*conf_entries[debug_menu_index].var < conf_entries[debug_menu_index].max) {
+                (*conf_entries[debug_menu_index].var)++;
+            } else {
+                *conf_entries[debug_menu_index].var = 0;
+            }
+            conf_write_crc();
             win_conf();
         } else if (key_pressed(J_A) || key_pressed(J_B) || key_pressed(J_START)) {
             break;
@@ -205,7 +211,7 @@ static void conf_screen(void) NONBANKED {
     debug_menu_index = 0;
 }
 
-static void splash_win(void) NONBANKED {
+static void splash_win(void) {
     HIDE_WIN;
 
     if (conf_get()->debug_flags & DBG_MENU) {
@@ -309,7 +315,7 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
     }
 }
 
-static void splash(void) NONBANKED {
+void splash(void) BANKED {
     snd_music_off();
     snd_note_off();
 
@@ -368,20 +374,6 @@ static void splash(void) NONBANKED {
             }
         } else {
             if (conf_get()->debug_flags & DBG_MENU) {
-                // do it here so you quickly see the flag going to 1 and back to 0
-                if (conf_get()->debug_flags & DBG_CLEAR_SCORE) {
-                    score_reset();
-                    conf_get()->debug_flags &= ~DBG_CLEAR_SCORE;
-                    conf_write_crc();
-                    splash_win();
-                }
-                if (conf_get()->debug_flags & DBG_ZERO_SCORE) {
-                    score_zero();
-                    conf_get()->debug_flags &= ~DBG_ZERO_SCORE;
-                    conf_write_crc();
-                    splash_win();
-                }
-
                 uint8_t switch_special = 0;
 
                 if (key_pressed(J_UP)) {
@@ -405,49 +397,43 @@ static void splash(void) NONBANKED {
                     snd_note_off();
                     splash_win();
                 } else if (key_pressed(J_LEFT)) {
-                    START_ROM_BANK(BANK(main)) {
-                        if (debug_entries[debug_menu_index].flag != DBG_NONE) {
-                            conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
-                            conf_write_crc();
+                    if (debug_entries[debug_menu_index].flag != DBG_NONE) {
+                        conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
+                        conf_write_crc();
+                    } else {
+                        if (debug_special_value > 0) {
+                            debug_special_value--;
                         } else {
-                            if (debug_special_value > 0) {
-                                debug_special_value--;
-                            } else {
-                                debug_special_value = debug_entries[debug_menu_index].max;
-                            }
-                            switch_special = 1;
+                            debug_special_value = debug_entries[debug_menu_index].max;
                         }
-                    } END_ROM_BANK
+                        switch_special = 1;
+                    }
                     splash_win();
                 } else if (key_pressed(J_RIGHT)) {
-                    START_ROM_BANK(BANK(main)) {
-                        if (debug_entries[debug_menu_index].flag != DBG_NONE) {
-                            conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
-                            conf_write_crc();
+                    if (debug_entries[debug_menu_index].flag != DBG_NONE) {
+                        conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
+                        conf_write_crc();
+                    } else {
+                        if (debug_special_value < debug_entries[debug_menu_index].max) {
+                            debug_special_value++;
                         } else {
-                            if (debug_special_value < debug_entries[debug_menu_index].max) {
-                                debug_special_value++;
-                            } else {
-                                debug_special_value = 0;
-                            }
-                            switch_special = 1;
+                            debug_special_value = 0;
                         }
-                    } END_ROM_BANK
+                        switch_special = 1;
+                    }
                     splash_win();
                 } else if (key_pressed(J_A)) {
-                    START_ROM_BANK(BANK(main)) {
-                        if (debug_entries[debug_menu_index].flag != DBG_NONE) {
-                            conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
-                            conf_write_crc();
+                    if (debug_entries[debug_menu_index].flag != DBG_NONE) {
+                        conf_get()->debug_flags ^= debug_entries[debug_menu_index].flag;
+                        conf_write_crc();
+                    } else {
+                        if (debug_special_value < debug_entries[debug_menu_index].max) {
+                            debug_special_value++;
                         } else {
-                            if (debug_special_value < debug_entries[debug_menu_index].max) {
-                                debug_special_value++;
-                            } else {
-                                debug_special_value = 0;
-                            }
-                            switch_special = 1;
+                            debug_special_value = 0;
                         }
-                    } END_ROM_BANK
+                        switch_special = 1;
+                    }
                     splash_win();
                 } else if (key_pressed(J_B)) {
                     conf_get()->debug_flags &= ~DBG_MENU;
@@ -457,16 +443,29 @@ static void splash(void) NONBANKED {
                     snd_music(SND_MENU);
                 }
 
-                if (switch_special && (debug_menu_index == 5)) {
+                if (switch_special && (debug_menu_index == DEBUG_MENU_MUSIC_INDEX)) {
                     snd_music_off();
                     if (debug_special_value > 0) {
                         snd_music(debug_special_value - 1);
                     }
                     snd_note_off();
-                } else if ((switch_special || (!sample_running())) && (debug_menu_index == 6)) {
+                } else if ((switch_special || (!sample_running()))
+                        && (debug_menu_index == DEBUG_MENU_SFX_INDEX)) {
                     if (debug_special_value > 0) {
                         sample_play(debug_special_value - 1);
                     }
+                } else if (switch_special && debug_special_value
+                        && (debug_menu_index == DEBUG_MENU_CLEAR_INDEX)) {
+                    debug_special_value = 0;
+                    score_reset();
+                    conf_write_crc();
+                    splash_win();
+                } else if (switch_special && debug_special_value
+                        && (debug_menu_index == DEBUG_MENU_ZERO_INDEX)) {
+                    debug_special_value = 0;
+                    score_zero();
+                    conf_write_crc();
+                    splash_win();
                 }
             }
         }
@@ -498,7 +497,7 @@ static void splash(void) NONBANKED {
     }
 }
 
-static uint16_t ask_name(int32_t score) NONBANKED {
+uint16_t ask_name(int32_t score) BANKED {
     snd_music_off();
     snd_note_off();
 

src/main.h

@@ -45,7 +45,7 @@ extern const struct conf_entry conf_entries[CONF_ENTRY_COUNT];
 extern uint8_t debug_menu_index;
 extern uint8_t debug_special_value;
 
-#define DEBUG_ENTRY_COUNT 9
+#define DEBUG_ENTRY_COUNT 12
 extern const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT];
 
 #endif // __MAIN_H__

src/strings.c

@@ -24,34 +24,35 @@
 
 BANKREF(strings)
 
-static const char string_top[] = "top";
-static const char string_score[] = "score";
-static const char string_black[] = "black";
-static const char string_white[] = "white";
-static const char string_enter[] = "enter";
-static const char string_name[] = "name";
-static const char string_start_ok[] = "start ok";
-static const char string_conf_menu[] = "Conf Menu";
-static const char string_debug_menu[] = "Debug Menu";
-static const char string_duality[] = "Duality";
-static const char string_xythobuz[] = "xythobuz";
-static const char string_git[] = "Git Commit Hash:";
-static const char string_build_date[] = "Build Date:";
-static const char string_date[] = __DATE__;
-static const char string_time[] = __TIME__;
-static const char string_mp_tx[] = "MP Tx:";
-static const char string_wait[] = "Wait";
-static const char string_visit[] = "Visit:";
-static const char string_url[] = "https://xythobuz.de";
-static const char string_printout[] = "printout";
-static const char string_success[] = "success";
-static const char string_error[] = "error";
-static const char string_gb_printer[] = "GB Printer";
+static const char            string_top[] = "top";
+static const char          string_score[] = "score";
+static const char          string_black[] = "black";
+static const char          string_white[] = "white";
+static const char          string_enter[] = "enter";
+static const char           string_name[] = "name";
+static const char       string_start_ok[] = "start ok";
+static const char      string_conf_menu[] = "Conf Menu";
+static const char     string_debug_menu[] = "Debug Menu";
+static const char        string_duality[] = "Duality";
+static const char       string_xythobuz[] = "xythobuz";
+static const char            string_git[] = "Git Commit Hash:";
+static const char     string_build_date[] = "Build Date:";
+static const char           string_date[] = __DATE__;
+static const char           string_time[] = __TIME__;
+static const char          string_mp_tx[] = "MP Tx:";
+static const char           string_wait[] = "Wait";
+static const char          string_visit[] = "Visit:";
+static const char            string_url[] = "https://xythobuz.de";
+static const char       string_printout[] = "printout";
+static const char        string_success[] = "success";
+static const char          string_error[] = "error";
+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%x";
-static const char string_printf_frames[] = "Frames: 0x%x";
-static const char string_printf_timer[] = " Timer: 0x%x";
+static const char         string_result[] = "Result:";
+static const char   string_printf_error[] = "error: 0x%x";
+static const char  string_printf_frames[] = "Frames: 0x%x";
+static const char   string_printf_timer[] = " Timer: 0x%x";
+static const char   string_printf_stack[] = " Stack: 0x%x";
 
 static const char * const strings[COUNT_STRINGS] = {
     string_top,            // STR_TOP
@@ -80,8 +81,9 @@ 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,
+    string_printf_frames,  // STR_PRINTF_FRAMES
+    string_printf_timer,   // STR_PRINTF_TIMER
+    string_printf_stack,   // STR_PRINTF_STACK
 };
 
 #define MAX_STR_LEN 32

src/strings.h

@@ -51,6 +51,7 @@ enum STRINGS {
     STR_PRINTF_ERROR,
     STR_PRINTF_FRAMES,
     STR_PRINTF_TIMER,
+    STR_PRINTF_STACK,
 
     COUNT_STRINGS
 };

src/window.c

@@ -40,6 +40,13 @@
 BANKREF(window)
 
 static char str_buff[128];
+static uint16_t stack_pointer = 0;
+
+static void get_sp(void) {
+    __asm
+    ld (_stack_pointer), sp
+    __endasm;
+}
 
 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;
@@ -265,7 +272,8 @@ uint8_t win_game_draw(int32_t score, uint8_t initial) BANKED {
         is_black = 1;
     }
 
-    if ((_cpu == CGB_TYPE) && (conf_get()->debug_flags)) {
+    if ((_cpu == CGB_TYPE)
+            && (conf_get()->debug_flags & (DBG_SHOW_FRAMES | DBG_SHOW_TIMER | DBG_SHOW_STACK))) {
         static int32_t prev_score = 0;
         if (initial || (score != prev_score)) {
             prev_score = score;
@@ -275,12 +283,26 @@ uint8_t win_game_draw(int32_t score, uint8_t initial) BANKED {
         }
 
         uint8_t x_off = number(score, 0, 0, is_black) >> 3;
+        uint8_t y_off = 0;
+
+        if (conf_get()->debug_flags & DBG_SHOW_FRAMES) {
+            sprintf(str_buff, get_string(STR_PRINTF_FRAMES), (uint16_t)game_get_framecount());
+            str_ascii(str_buff, x_off, y_off, 1);
+            y_off++;
+        }
 
-        sprintf(str_buff, get_string(STR_PRINTF_FRAMES), (uint16_t)game_get_framecount());
-        str_ascii(str_buff, x_off, 0, 1);
+        if (conf_get()->debug_flags & DBG_SHOW_TIMER) {
+            sprintf(str_buff, get_string(STR_PRINTF_TIMER), (uint16_t)timer_get());
+            str_ascii(str_buff, x_off, y_off, 1);
+            y_off++;
+        }
 
-        sprintf(str_buff, get_string(STR_PRINTF_TIMER), (uint16_t)timer_get());
-        str_ascii(str_buff, x_off, 1, 1);
+        if (conf_get()->debug_flags & DBG_SHOW_STACK) {
+            get_sp();
+            sprintf(str_buff, get_string(STR_PRINTF_STACK), (uint16_t)stack_pointer);
+            str_ascii(str_buff, x_off, y_off, 1);
+            y_off++;
+        }
 
         return DEVICE_SCREEN_PX_WIDTH;
     } else {