fix music note duration reading from proper bank, start working on game music

src/sound.c

@@ -24,6 +24,7 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
+#include "asm/types.h"
 #include "banks.h"
 #include "config.h"
 #include "timer.h"
@@ -134,6 +135,14 @@ void snd_note_off(void) BANKED {
     play_note2(SILENCE);
 }
 
+static uint16_t snd_duration(enum SOUNDS snd) NONBANKED {
+    uint16_t r;
+    START_ROM_BANK(snds[snd].bank) {
+        r = snds[snd].snd->duration;
+    } END_ROM_BANK
+    return r;
+}
+
 void snd_music(enum SOUNDS snd) BANKED {
     if (snd >= SND_COUNT) {
         return;
@@ -142,7 +151,7 @@ void snd_music(enum SOUNDS snd) BANKED {
     CRITICAL {
         music = snds[snd].snd;
         bank = snds[snd].bank;
-        duration = 0x3F - MIN((snds[snd].snd->duration >> 2) + 1, 0x3F);
+        duration = 0x3F - MIN((snd_duration(snd) >> 2) + 1, 0x3F);
         off = 0;
         last_t = timer_get();
     }

src/sound_game.c

@@ -28,14 +28,39 @@
 
 BANKREF(sound_game)
 
-const enum notes game_music[] = {
-    SILENCE, SILENCE, END
+#define NOTE_LOOP \
+    F1,  F1,  F1,  G1, Gd2, Gd1, Cd1,  D1, \
+    D2,  D2,  D2, Fd1, Fd1,  D2,  D2,  D2
+
+
+static const enum notes game_music[] = {
+    NOTE_LOOP, NOTE_LOOP, NOTE_LOOP, NOTE_LOOP,
+    NOTE_LOOP, NOTE_LOOP, NOTE_LOOP, NOTE_LOOP,
+
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    END
+};
+
+#define DRUM_LOOP \
+dSn, dSI, dSn, dSI, dKi, dSI, dSI, dSI, \
+dSn, dSI, dSn, dSI, dKi, dSI, dSI, dSI  \
+
+static const enum drums game_drums[] = {
+    DRUM_LOOP, DRUM_LOOP, DRUM_LOOP, DRUM_LOOP,
+    DRUM_LOOP, DRUM_LOOP, DRUM_LOOP, DRUM_LOOP,
+
+    dSI, dSI, dSI, dSI, dSI, dSI, dSI, dSI,
+    dSI, dSI, dSI, dSI, dSI, dSI, dSI, dSI,
+    dEND
 };
 
 const struct music music_game = {
     .notes = game_music,
     .notes2 = NULL,
-    .drums = NULL,
-    .duration = 200,
+    .drums = game_drums,
+    .duration = 160,
     .repeat = 0,
 };

src/sound_menu.c

@@ -28,7 +28,7 @@
 
 BANKREF(sound_menu)
 
-const enum notes menu_music[] = {
+static const enum notes menu_music[] = {
     // intro
 
      G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 1
@@ -112,7 +112,7 @@ const enum notes menu_music[] = {
     END
 };
 
-const enum notes menu_music2[] = {
+static const enum notes menu_music2[] = {
     // intro
 
     SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
@@ -200,7 +200,7 @@ const enum notes menu_music2[] = {
     dSI, dSI, dSn, dSI, dKi, dSI, dSI, dSI, \
     dSn, dSI, dSI, dSI, dKi, dSI, dSI, dSI  \
 
-const enum drums menu_drums[] = {
+static const enum drums menu_drums[] = {
     // intro
 
     DRUM_LOOP,

src/sound_over.c

@@ -29,7 +29,7 @@
 
 BANKREF(sound_over)
 
-const enum notes over_notes[] = {
+static const enum notes over_notes[] = {
     // fanfare
     /*
      C3,  C3,  C3,  C3, Ab2, Ab2, Bb2, Bb2,
@@ -121,7 +121,7 @@ const enum notes over_notes[] = {
      E2, SIL,  E2, SIL,  E2, SIL,  E2, SIL, \
      E2, SIL,  E2, SIL,  E2, SIL,  E2, SIL
 
-const enum notes over_notes2[] = {
+static const enum notes over_notes2[] = {
     ADD_LOOP, ADD_LOOP_2,
     ADD_LOOP, ADD_LOOP_3,
     ADD_LOOP, ADD_LOOP_2,
@@ -165,7 +165,7 @@ const enum notes over_notes2[] = {
     dKi, dSI, dSI, dSI, dSI, dSI, dKi, dSI, \
     dSn, dSI, dSI, dSI, dKi, dSI, dSI, dSI  \
 
-const enum drums over_drums[] = {
+static const enum drums over_drums[] = {
     DRUM_LOOP,
     DRUM_LOOP,
     DRUM_LOOP,