handle bg music in isr and add second pulse channel

src/game.c

@@ -60,6 +60,7 @@ enum ACCELERATION {
 
 static uint8_t pause_screen(void) NONBANKED {
     snd_music_off();
+    snd_note_off();
 
     uint8_t n = 0;
 
@@ -122,6 +123,7 @@ static void status(uint8_t health, uint8_t power, uint8_t *hiwater) NONBANKED {
 
 static void show_explosion(uint16_t power) NONBANKED {
     snd_music_off();
+    snd_note_off();
     sample_play_explosion_ship();
 
     for (uint8_t n = 0; n < (4 * 4 * 4); n++) {
@@ -136,6 +138,9 @@ static void show_explosion(uint16_t power) NONBANKED {
 }
 
 int32_t game(void) NONBANKED {
+    snd_music_off();
+    snd_note_off();
+
     disable_interrupts();
     DISPLAY_OFF;
     map_game();
@@ -166,11 +171,9 @@ int32_t game(void) NONBANKED {
     DISPLAY_ON;
     enable_interrupts();
 
-    snd_music_off();
     snd_game_music();
 
     while(1) {
-        snd_play();
         key_read();
 
         enum ACCELERATION acc = 0;
@@ -333,6 +336,9 @@ int32_t game(void) NONBANKED {
                 break;
             }
 
+            // restart bg music
+            snd_game_music();
+
             // re-draw ship sprite
             redraw = 1;
         }

src/main.c

@@ -69,7 +69,6 @@ static void highscore(uint8_t is_black) NONBANKED {
     }
 
     while (1) {
-        snd_play();
         key_read();
 
         if (key_pressed(J_A) || key_pressed(J_B)) {
@@ -90,7 +89,6 @@ static void about_screen(void) NONBANKED {
     SHOW_WIN;
 
     while (1) {
-        snd_play();
         key_read();
 
         if (key_pressed(J_A) || key_pressed(J_B) || key_pressed(J_SELECT)) {
@@ -190,6 +188,9 @@ static void splash_anim(uint8_t *hiwater) NONBANKED {
 }
 
 static void splash(void) NONBANKED {
+    snd_music_off();
+    snd_note_off();
+
     disable_interrupts();
     DISPLAY_OFF;
     map_title();
@@ -209,11 +210,9 @@ static void splash(void) NONBANKED {
     DISPLAY_ON;
     enable_interrupts();
 
-    snd_music_off();
     snd_menu_music();
 
     while (1) {
-        snd_play();
         key_read();
 
         if (key_pressed(J_LEFT)) {
@@ -295,6 +294,9 @@ static void splash(void) NONBANKED {
 }
 
 static uint16_t ask_name(int32_t score) NONBANKED {
+    snd_music_off();
+    snd_note_off();
+
     disable_interrupts();
     DISPLAY_OFF;
     map_title();
@@ -315,7 +317,6 @@ static uint16_t ask_name(int32_t score) NONBANKED {
     DISPLAY_ON;
     enable_interrupts();
 
-    snd_music_off();
     snd_gameover_music();
 
     char name[3] = { 'a', 'a', 'a' };
@@ -323,7 +324,6 @@ static uint16_t ask_name(int32_t score) NONBANKED {
     win_name_draw(convert_name(name[0], name[1], name[2]), score < 0, pos);
 
     while (1) {
-        snd_play();
         key_read();
 
         if (key_pressed(J_LEFT)) {

src/obj.c

@@ -361,6 +361,10 @@ int16_t obj_do(int16_t *spd_off_x, int16_t *spd_off_y, int32_t *score, uint8_t *
                 break;
         }
 
+        if (!objs[i].active) {
+            continue;
+        }
+
         spr_draw(objs[i].sprite, FLIP_NONE, objs[i].off_x >> POS_SCALE_OBJS, objs[i].off_y >> POS_SCALE_OBJS, 0, hiwater);
     }
 

src/sound.c

@@ -65,6 +65,24 @@ static void play_note(enum notes note) NONBANKED {
     }
 }
 
+static void play_note2(enum notes note) NONBANKED {
+    if (note < SILENCE) {
+        START_ROM_BANK(BANK(sound));
+        uint16_t freq = frequencies[note];
+        END_ROM_BANK();
+
+        NR21_REG = 0x80 | 0x3F; // 50% duty, shortest initial length
+        NR22_REG = 0x70; // half volume, no change
+        NR23_REG = freq & 0xFF; // given frequency
+        NR24_REG = 0x80 | ((freq >> 8) & 0x07); // trigger, upper freq bits
+    } else {
+        NR21_REG = 0x80 | 0x3F; // 50% duty, shortest initial length
+        NR22_REG = 0x10; // 'lowest' volume without pop, no change
+        NR23_REG = 0x00; // lowest frequency
+        NR24_REG = 0x80 | 0x40 | 0x00; // trigger, enable length, upper freq bits
+    }
+}
+
 static void play_drum(enum drums drum) NONBANKED {
     switch (drum) {
         case dKick:
@@ -98,7 +116,14 @@ void snd_init(void) BANKED {
 }
 
 void snd_music_off(void) BANKED {
+    CRITICAL {
+        music = NULL;
+    }
+}
+
+void snd_note_off(void) BANKED {
     play_note(SILENCE);
+    play_note2(SILENCE);
 }
 
 static void play_current_note(void) NONBANKED {
@@ -107,41 +132,60 @@ static void play_current_note(void) NONBANKED {
     }
 
     START_ROM_BANK(bank);
-    if (music->notes) {
-        if (music->notes[off] != END) {
-            play_note(music->notes[off]);
+        if (music->notes) {
+            if (music->notes[off] != END) {
+                play_note(music->notes[off]);
+            }
         }
-    }
-    if (music->drums) {
-        if (music->drums[off] != dEND) {
-            play_drum(music->drums[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 {
-    music = &music_menu;
-    bank = BANK(sound_menu);
-    off = 0;
-    last_t = timer_get();
-    play_current_note();
+    // TODO
+    snd_gameover_music();
+    return;
+
+    CRITICAL {
+        music = &music_menu;
+        bank = BANK(sound_menu);
+        off = 0;
+        last_t = timer_get();
+        play_current_note();
+    }
 }
 
 void snd_game_music(void) BANKED {
-    music = &music_game;
-    bank = BANK(sound_game);
-    off = 0;
-    last_t = timer_get();
-    play_current_note();
+    // TODO
+    snd_music_off();
+    return;
+
+    CRITICAL {
+        music = &music_game;
+        bank = BANK(sound_game);
+        off = 0;
+        last_t = timer_get();
+        play_current_note();
+    }
 }
 
 void snd_gameover_music(void) BANKED {
-    music = &music_over;
-    bank = BANK(sound_over);
-    off = 0;
-    last_t = timer_get();
-    play_current_note();
+    CRITICAL {
+        music = &music_over;
+        bank = BANK(sound_over);
+        off = 0;
+        last_t = timer_get();
+        play_current_note();
+    }
 }
 
 void snd_play(void) NONBANKED {
@@ -150,6 +194,7 @@ void snd_play(void) NONBANKED {
     }
 
     START_ROM_BANK(bank);
+    CRITICAL {
         uint16_t diff = timer_get() - last_t;
         if (diff >= music->duration) {
             off++;
@@ -163,6 +208,14 @@ void snd_play(void) NONBANKED {
                 }
             }
 
+            if (music->notes2) {
+                if (music->notes2[off] != END) {
+                    play_note2(music->notes2[off]);
+                } else {
+                    off = 0xFFFF;
+                }
+            }
+
             if (music->drums) {
                 if (music->drums[off] != dEND) {
                     play_drum(music->drums[off]);
@@ -171,5 +224,6 @@ void snd_play(void) NONBANKED {
                 }
             }
         }
+    }
     END_ROM_BANK();
 }

src/sound.h

@@ -61,6 +61,7 @@ enum drums {
 
 struct music {
     enum notes * const notes;
+    enum notes * const notes2;
     enum drums * const drums;
     uint16_t duration;
 };
@@ -68,6 +69,7 @@ struct music {
 void snd_init(void) BANKED;
 
 void snd_music_off(void) BANKED;
+void snd_note_off(void) BANKED;
 void snd_menu_music(void) BANKED;
 void snd_game_music(void) BANKED;
 void snd_gameover_music(void) BANKED;

src/sound_game.c

@@ -40,6 +40,7 @@ const enum notes game_music[] = {
 
 const struct music music_game = {
     .notes = game_music,
+    .notes2 = NULL,
     .drums = NULL,
     .duration = 200,
 };

src/sound_menu.c

@@ -29,17 +29,12 @@
 BANKREF(sound_menu)
 
 const enum notes menu_music[] = {
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
-    G3, G3, F3, F3, E3, E3, D3, D3,
-    G3, G3, F3, F3, E3, E3, D3, D3,
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
     SILENCE, SILENCE, END
 };
 
 const struct music music_menu = {
     .notes = menu_music,
+    .notes2 = NULL,
     .drums = NULL,
     .duration = 200,
 };

src/sound_over.c

@@ -108,6 +108,58 @@ const enum notes over_notes[] = {
     END
 };
 
+#define ADD_LOOP \
+    Ab2, SIL, Ab2, SIL, Ab2, SIL, Ab2, SIL, \
+    Ab2, SIL, Ab2, SIL, Ab2, SIL, Ab2, SIL
+
+#define ADD_LOOP_2 \
+     A2, SIL,  A2, SIL,  A2, SIL,  A2, SIL, \
+     A2, SIL,  A2, SIL,  A2, SIL,  A2, SIL
+
+#define ADD_LOOP_3 \
+     E2, SIL,  E2, SIL,  E2, SIL,  E2, SIL, \
+     E2, SIL,  E2, SIL,  E2, SIL,  E2, SIL
+
+const enum notes over_notes2[] = {
+    ADD_LOOP, ADD_LOOP_2,
+    ADD_LOOP, ADD_LOOP_3,
+    ADD_LOOP, ADD_LOOP_2,
+
+    Db3, Db3, Db3, Db3, Db3, Db3, Db3, Db3,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+     D3,  D3,  D3,  D3,  D3,  D3,  D3,  D3,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+    // repeat
+
+    ADD_LOOP, ADD_LOOP_2,
+    ADD_LOOP, ADD_LOOP_3,
+    ADD_LOOP, ADD_LOOP_2,
+
+    Db3, Db3, Db3, Db3, Db3, Db3, Db3, Db3,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+    D3,  D3,  D3,  D3,  D3,  D3,  D3,  D3,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+    // end
+
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    END
+};
+
 #define DRUM_LOOP \
     dKi, dSI, dSI, dSI, dSI, dSI, dKi, dSI, \
     dSn, dSI, dSI, dSI, dKi, dSI, dSI, dSI \
@@ -142,6 +194,7 @@ const enum drums over_drums[] = {
 
 const struct music music_over = {
     .notes = over_notes,
+    .notes2 = over_notes2,
     .drums = over_drums,
     .duration = 120,
 };

src/timer.c

@@ -18,6 +18,7 @@
  */
 
 #include "sample.h"
+#include "sound.h"
 #include "timer.h"
 
 static volatile uint16_t count = 0;
@@ -26,6 +27,7 @@ static void timer_isr(void) NONBANKED {
     if ((count & 0x03) == 0) {
         sample_isr();
     }
+    snd_play();
     count++;
 }