add new menu music

src/sound.c

@@ -151,10 +151,6 @@ static void play_current_note(void) NONBANKED {
 }
 
 void snd_menu_music(void) BANKED {
-    // TODO
-    snd_gameover_music();
-    return;
-
     CRITICAL {
         music = &music_menu;
         bank = BANK(sound_menu);
@@ -165,10 +161,6 @@ void snd_menu_music(void) BANKED {
 }
 
 void snd_game_music(void) BANKED {
-    // TODO
-    snd_music_off();
-    return;
-
     CRITICAL {
         music = &music_game;
         bank = BANK(sound_game);

src/sound_game.c

@@ -29,12 +29,6 @@
 BANKREF(sound_game)
 
 const enum notes game_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
 };
 

src/sound_menu.c

@@ -29,12 +29,176 @@
 BANKREF(sound_menu)
 
 const enum notes menu_music[] = {
-    SILENCE, SILENCE, END
+    // intro
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 1
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 1
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 2
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, Ab2, // 2
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 3
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 3
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 4
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, Ab2, // 4
+
+    // repeat 1
+
+     G2,  G2,  G3,  G3,  G4,  G4, Eb4, Eb4, // 5
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 5
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 6
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 6
+
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 7
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 7
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 8
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 8
+
+     G2,  G2,  G3,  G3,  G4,  G4, Eb4, Eb4, // 9
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 9
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 10
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 10
+
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 11
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 11
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 12
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 12
+
+    // bridge
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 13
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 13
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 14
+     G3,  C4, Bb1, Bb1, SIL, SIL,  G3,  G3, // 14
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 15
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 15
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 16
+     G3,  C4, Bb1,  G3, Bb3, Bb3,  G3,  G3, // 16
+
+    // repeat 2
+
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 17
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 17
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 18
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 18
+
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 19
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 19
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 20
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 20
+
+    // bridge
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 21
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 21
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 22
+     G3,  C4, Bb1, Bb1, SIL, SIL,  G3,  G3, // 22
+
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 23
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 23
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 24
+     G3,  C4, Bb1,  G3, Bb3, Bb3,  G3,  G3, // 24
+
+    // end
+
+     G2,  G2,  G2,  G2, SIL, SIL,  G1,  G1, // 25
+     G1,  G1,  G1,  G1,  G1,  G1,  G1,  G1, // 25
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 26
+
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    END
+};
+
+const enum notes menu_music2[] = {
+    // intro
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    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 1
+
+    SIL, SIL,  D2,  D2,  F1,  F1,  G1,  G1,
+     G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    SIL, SIL,  D2,  D2,  F1,  F1,  G1,  G1,
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    // bridge
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL,  G3, Bb3, Bb3, Ab2, Ab2,
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, Ab2, Ab2,
+
+    // repeat 2
+
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
+
+    // bridge
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL,  G3, Bb3, Bb3, Ab2, Ab2,
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, Ab2, Ab2,
+
+    // end
+
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
+
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    SILENCE, SILENCE, SILENCE, SILENCE,
+    END
 };
 
 const struct music music_menu = {
     .notes = menu_music,
-    .notes2 = NULL,
+    .notes2 = menu_music2,
     .drums = NULL,
-    .duration = 200,
+    .duration = 150,
 };