add music repeat option and music debug menu

src/main.c

@@ -44,13 +44,15 @@ enum debug_flag debug_flags = 0;
 #endif
 
 uint8_t debug_menu_index = 0;
+uint8_t debug_special_value = 0;
 
 BANKREF(main)
 
 const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT] = {
-    { .name = "marker", .flag = DBG_MARKER },
-    { .name = "invuln", .flag = DBG_GOD_MODE },
-    { .name = "cl score", .flag = DBG_CLEAR_SCORE },
+    { .name = "marker",   .flag = DBG_MARKER,      .max = 1 },
+    { .name = "invuln",   .flag = DBG_GOD_MODE,    .max = 1 },
+    { .name = "music",    .flag = DBG_NONE,        .max = 3 },
+    { .name = "cl score", .flag = DBG_CLEAR_SCORE, .max = 1 },
 };
 
 static void highscore(uint8_t is_black) NONBANKED {
@@ -210,15 +212,17 @@ static void splash(void) NONBANKED {
     DISPLAY_ON;
     enable_interrupts();
 
-    snd_menu_music();
+    if (!(debug_flags & DBG_MENU)) {
+        snd_menu_music();
+    }
 
     while (1) {
         key_read();
 
-        if (key_pressed(J_LEFT)) {
+        if (key_pressed(J_LEFT) && (!(debug_flags & DBG_MENU))) {
             highscore(1);
             splash_win();
-        } else if (key_pressed(J_RIGHT)) {
+        } else if (key_pressed(J_RIGHT) && (!(debug_flags & DBG_MENU))) {
             highscore(0);
             splash_win();
         } else if (key_pressed(J_SELECT)) {
@@ -227,6 +231,8 @@ static void splash(void) NONBANKED {
         } else if (key_pressed(J_START)) {
             if ((key_debug() == 0) && (!(debug_flags & DBG_MENU))) {
                 debug_flags |= DBG_MENU;
+                snd_music_off();
+                snd_note_off();
                 splash_win();
             } else {
                 break;
@@ -240,12 +246,17 @@ static void splash(void) NONBANKED {
                     splash_win();
                 }
 
+                uint8_t switch_special = 0;
+
                 if (key_pressed(J_UP)) {
                     if (debug_menu_index > 0) {
                         debug_menu_index--;
                     } else {
                         debug_menu_index = DEBUG_ENTRY_COUNT - 1;
                     }
+                    debug_special_value = 0;
+                    snd_music_off();
+                    snd_note_off();
                     splash_win();
                 } else if (key_pressed(J_DOWN)) {
                     if (debug_menu_index < (DEBUG_ENTRY_COUNT - 1)) {
@@ -253,15 +264,84 @@ static void splash(void) NONBANKED {
                     } else {
                         debug_menu_index = 0;
                     }
+                    debug_special_value = 0;
+                    snd_music_off();
+                    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) {
+                            debug_flags ^= debug_entries[debug_menu_index].flag;
+                        } else {
+                            if (debug_special_value > 0) {
+                                debug_special_value--;
+                            } else {
+                                debug_special_value = debug_entries[debug_menu_index].max;
+                            }
+                            switch_special = 1;
+                        }
+                    END_ROM_BANK();
+                    splash_win();
+                } else if (key_pressed(J_RIGHT)) {
+                    START_ROM_BANK(BANK(main));
+                        if (debug_entries[debug_menu_index].flag != DBG_NONE) {
+                            debug_flags ^= debug_entries[debug_menu_index].flag;
+                        } else {
+                            if (debug_special_value < debug_entries[debug_menu_index].max) {
+                                debug_special_value++;
+                            } else {
+                                debug_special_value = 0;
+                            }
+                            switch_special = 1;
+                        }
+                    END_ROM_BANK();
                     splash_win();
                 } else if (key_pressed(J_A)) {
                     START_ROM_BANK(BANK(main));
-                        debug_flags ^= debug_entries[debug_menu_index].flag;
+                        if (debug_entries[debug_menu_index].flag != DBG_NONE) {
+                            debug_flags ^= debug_entries[debug_menu_index].flag;
+                        } else {
+                            if (debug_special_value < debug_entries[debug_menu_index].max) {
+                                debug_special_value++;
+                            } else {
+                                debug_special_value = 0;
+                            }
+                            switch_special = 1;
+                        }
                     END_ROM_BANK();
                     splash_win();
                 } else if (key_pressed(J_B)) {
                     debug_flags &= ~DBG_MENU;
+                    debug_special_value = 0;
                     splash_win();
+                    snd_menu_music();
+                }
+
+                if (switch_special) {
+                    switch (debug_special_value) {
+                        case 0:
+                            snd_music_off();
+                            snd_note_off();
+                            break;
+
+                        case 1:
+                            snd_menu_music();
+                            snd_note_off();
+                            break;
+
+                        case 2:
+                            snd_game_music();
+                            snd_note_off();
+                            break;
+
+                        case 3:
+                            snd_gameover_music();
+                            snd_note_off();
+                            break;
+
+                        default:
+                            break;
+                    }
                 }
             }
         }

src/main.h

@@ -27,12 +27,12 @@
 #include <stdint.h>
 
 enum debug_flag {
+    DBG_NONE = 0,
+
     DBG_MENU = (1 << 0),
     DBG_MARKER = (1 << 1),
     DBG_GOD_MODE = (1 << 2),
     DBG_CLEAR_SCORE = (1 << 3),
-
-    DBG_FLAG_COUNT = 2
 };
 
 #define DEBUG_ENTRY_NAME_LEN 8
@@ -40,15 +40,16 @@ enum debug_flag {
 struct debug_entry {
     char name[DEBUG_ENTRY_NAME_LEN + 1];
     enum debug_flag flag;
+    uint8_t max;
 };
 
 BANKREF_EXTERN(main)
 
 extern enum debug_flag debug_flags;
 extern uint8_t debug_menu_index;
+extern uint8_t debug_special_value;
 
-#define DEBUG_ENTRY_COUNT 3
-
+#define DEBUG_ENTRY_COUNT 4
 extern const struct debug_entry debug_entries[DEBUG_ENTRY_COUNT];
 
 #endif // __MAIN_H__

src/maps.c

@@ -283,7 +283,15 @@ void win_debug(void) NONBANKED {
 
             uint8_t n_len = strlen(name_buff);
             name_buff[n_len] = ' ';
-            name_buff[n_len + 1] = (debug_flags & debug_entries[i].flag) ? '1' : '0';
+            if (debug_entries[i].flag == DBG_NONE) {
+                if (debug_menu_index == i) {
+                    name_buff[n_len + 1] = debug_special_value + '0';
+                } else {
+                    name_buff[n_len + 1] = '0';
+                }
+            } else {
+                name_buff[n_len + 1] = (debug_flags & debug_entries[i].flag) ? '1' : '0';
+            }
             name_buff[n_len + 2] = '\0';
             n_len += 2;
         END_ROM_BANK();

src/sound.c

@@ -126,37 +126,12 @@ void snd_note_off(void) BANKED {
     play_note2(SILENCE);
 }
 
-static void play_current_note(void) NONBANKED {
-    if (!music) {
-        return;
-    }
-
-    START_ROM_BANK(bank);
-        if (music->notes) {
-            if (music->notes[off] != END) {
-                play_note(music->notes[off]);
-            }
-        }
-        if (music->notes2) {
-            if (music->notes2[off] != END) {
-                play_note(music->notes2[off]);
-            }
-        }
-        if (music->drums) {
-            if (music->drums[off] != dEND) {
-                play_drum(music->drums[off]);
-            }
-        }
-    END_ROM_BANK();
-}
-
 void snd_menu_music(void) BANKED {
     CRITICAL {
         music = &music_menu;
         bank = BANK(sound_menu);
         off = 0;
         last_t = timer_get();
-        play_current_note();
     }
 }
 
@@ -166,7 +141,6 @@ void snd_game_music(void) BANKED {
         bank = BANK(sound_game);
         off = 0;
         last_t = timer_get();
-        play_current_note();
     }
 }
 
@@ -176,7 +150,6 @@ void snd_gameover_music(void) BANKED {
         bank = BANK(sound_over);
         off = 0;
         last_t = timer_get();
-        play_current_note();
     }
 }
 
@@ -186,36 +159,52 @@ void snd_play(void) NONBANKED {
     }
 
     START_ROM_BANK(bank);
-    CRITICAL {
+
         uint16_t diff = timer_get() - last_t;
         if (diff >= music->duration) {
-            off++;
-            last_t += music->duration;
-
             if (music->notes) {
                 if (music->notes[off] != END) {
                     play_note(music->notes[off]);
                 } else {
-                    off = 0xFFFF;
+                    if (music->repeat != MUSIC_NO_REPEAT) {
+                        off = music->repeat;
+                    } else {
+                        music = NULL;
+                        goto end;
+                    }
                 }
             }
 
-            if (music->notes2) {
+            if (music && music->notes2) {
                 if (music->notes2[off] != END) {
                     play_note2(music->notes2[off]);
                 } else {
-                    off = 0xFFFF;
+                    if (music->repeat != MUSIC_NO_REPEAT) {
+                        off = music->repeat;
+                    } else {
+                        music = NULL;
+                        goto end;
+                    }
                 }
             }
 
-            if (music->drums) {
+            if (music && music->drums) {
                 if (music->drums[off] != dEND) {
                     play_drum(music->drums[off]);
                 } else {
-                    off = 0xFFFF;
+                    if (music->repeat != MUSIC_NO_REPEAT) {
+                        off = music->repeat;
+                    } else {
+                        music = NULL;
+                        goto end;
+                    }
                 }
             }
+
+            off++;
+            last_t += music->duration;
         }
-    }
+
+end:
     END_ROM_BANK();
 }

src/sound.h

@@ -59,11 +59,14 @@ enum drums {
     dEND,
 };
 
+#define MUSIC_NO_REPEAT 0xFFFF
+
 struct music {
     enum notes * const notes;
     enum notes * const notes2;
     enum drums * const drums;
     uint16_t duration;
+    uint16_t repeat;
 };
 
 void snd_init(void) BANKED;

src/sound_game.c

@@ -37,4 +37,5 @@ const struct music music_game = {
     .notes2 = NULL,
     .drums = NULL,
     .duration = 200,
+    .repeat = 0,
 };

src/sound_menu.c

@@ -201,4 +201,5 @@ const struct music music_menu = {
     .notes2 = menu_music2,
     .drums = NULL,
     .duration = 150,
+    .repeat = 0,
 };

src/sound_over.c

@@ -24,6 +24,7 @@
  */
 
 #include "banks.h"
+#include "sound.h"
 #include "sound_over.h"
 
 BANKREF(sound_over)
@@ -197,4 +198,5 @@ const struct music music_over = {
     .notes2 = over_notes2,
     .drums = over_drums,
     .duration = 120,
+    .repeat = MUSIC_NO_REPEAT,
 };