Browse Source

add new menu music

Thomas B 1 month ago
parent
commit
3f16dd2cc3
3 changed files with 167 additions and 17 deletions
  1. 0
    8
      src/sound.c
  2. 0
    6
      src/sound_game.c
  3. 167
    3
      src/sound_menu.c

+ 0
- 8
src/sound.c View File

151
 }
151
 }
152
 
152
 
153
 void snd_menu_music(void) BANKED {
153
 void snd_menu_music(void) BANKED {
154
-    // TODO
155
-    snd_gameover_music();
156
-    return;
157
-
158
     CRITICAL {
154
     CRITICAL {
159
         music = &music_menu;
155
         music = &music_menu;
160
         bank = BANK(sound_menu);
156
         bank = BANK(sound_menu);
165
 }
161
 }
166
 
162
 
167
 void snd_game_music(void) BANKED {
163
 void snd_game_music(void) BANKED {
168
-    // TODO
169
-    snd_music_off();
170
-    return;
171
-
172
     CRITICAL {
164
     CRITICAL {
173
         music = &music_game;
165
         music = &music_game;
174
         bank = BANK(sound_game);
166
         bank = BANK(sound_game);

+ 0
- 6
src/sound_game.c View File

29
 BANKREF(sound_game)
29
 BANKREF(sound_game)
30
 
30
 
31
 const enum notes game_music[] = {
31
 const enum notes game_music[] = {
32
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
33
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
34
-    G3, G3, F3, F3, E3, E3, D3, D3,
35
-    G3, G3, F3, F3, E3, E3, D3, D3,
36
-    C3, C3, G3, G3, A3, A3, G3, SILENCE,
37
-    F3, F3, E3, E3, D3, D3, C3, SILENCE,
38
     SILENCE, SILENCE, END
32
     SILENCE, SILENCE, END
39
 };
33
 };
40
 
34
 

+ 167
- 3
src/sound_menu.c View File

29
 BANKREF(sound_menu)
29
 BANKREF(sound_menu)
30
 
30
 
31
 const enum notes menu_music[] = {
31
 const enum notes menu_music[] = {
32
-    SILENCE, SILENCE, END
32
+    // intro
33
+
34
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 1
35
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 1
36
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 2
37
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, Ab2, // 2
38
+
39
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 3
40
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 3
41
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 4
42
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, Ab2, // 4
43
+
44
+    // repeat 1
45
+
46
+     G2,  G2,  G3,  G3,  G4,  G4, Eb4, Eb4, // 5
47
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 5
48
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 6
49
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 6
50
+
51
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 7
52
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 7
53
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 8
54
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 8
55
+
56
+     G2,  G2,  G3,  G3,  G4,  G4, Eb4, Eb4, // 9
57
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 9
58
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 10
59
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 10
60
+
61
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 11
62
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 11
63
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 12
64
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 12
65
+
66
+    // bridge
67
+
68
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 13
69
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 13
70
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 14
71
+     G3,  C4, Bb1, Bb1, SIL, SIL,  G3,  G3, // 14
72
+
73
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 15
74
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 15
75
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 16
76
+     G3,  C4, Bb1,  G3, Bb3, Bb3,  G3,  G3, // 16
77
+
78
+    // repeat 2
79
+
80
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 17
81
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 17
82
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 18
83
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 18
84
+
85
+     G2,  G2,  D2,  D2,  G4,  G4, Eb4, Eb4, // 19
86
+     D4, Eb4,  D4,  C4,  D4,  D4,  D4,  G1, // 19
87
+     G1,  G1, Bb3, Bb3,  C4, Bb3,  C4,  C4, // 20
88
+     D4,  D4,  G3,  G3,  C4,  C4, Bb3,  G3, // 20
89
+
90
+    // bridge
91
+
92
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 21
93
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 21
94
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 22
95
+     G3,  C4, Bb1, Bb1, SIL, SIL,  G3,  G3, // 22
96
+
97
+     G2,  G2,  D2,  D2,  F1,  F1,  G1,  G1, // 23
98
+     G1,  G1, SIL, SIL, SIL, SIL, SIL,  G1, // 23
99
+     G1,  G1,  G3,  D4,  D4,  G3, Db4, Db4, // 24
100
+     G3,  C4, Bb1,  G3, Bb3, Bb3,  G3,  G3, // 24
101
+
102
+    // end
103
+
104
+     G2,  G2,  G2,  G2, SIL, SIL,  G1,  G1, // 25
105
+     G1,  G1,  G1,  G1,  G1,  G1,  G1,  G1, // 25
106
+     G1,  G1,  G1,  G1, SIL, SIL, SIL, SIL, // 26
107
+
108
+    SILENCE, SILENCE, SILENCE, SILENCE,
109
+    SILENCE, SILENCE, SILENCE, SILENCE,
110
+    SILENCE, SILENCE, SILENCE, SILENCE,
111
+    SILENCE, SILENCE, SILENCE, SILENCE,
112
+    END
113
+};
114
+
115
+const enum notes menu_music2[] = {
116
+    // intro
117
+
118
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
119
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
120
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
121
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
122
+
123
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
124
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
125
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
126
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
127
+
128
+    // repeat 1
129
+
130
+    SIL, SIL,  D2,  D2,  F1,  F1,  G1,  G1,
131
+     G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
132
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
133
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
134
+
135
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
136
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
137
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
138
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
139
+
140
+    SIL, SIL,  D2,  D2,  F1,  F1,  G1,  G1,
141
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
142
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
143
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
144
+
145
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
146
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
147
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
148
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
149
+
150
+    // bridge
151
+
152
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
153
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
154
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
155
+    SIL, SIL, SIL,  G3, Bb3, Bb3, Ab2, Ab2,
156
+
157
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
158
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
159
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
160
+    SIL, SIL, SIL, SIL, SIL, SIL, Ab2, Ab2,
161
+
162
+    // repeat 2
163
+
164
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
165
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
166
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
167
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
168
+
169
+    SIL, SIL, SIL, SIL,  F1,  F1,  G1,  G1,
170
+    G1,  G1, SIL, SIL, SIL, SIL, SIL, SIL,
171
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
172
+    SIL, SIL, Bb1, Bb1, Bb1, Bb1, Ab2, SIL,
173
+
174
+    // bridge
175
+
176
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
177
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
178
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
179
+    SIL, SIL, SIL,  G3, Bb3, Bb3, Ab2, Ab2,
180
+
181
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
182
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
183
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
184
+    SIL, SIL, SIL, SIL, SIL, SIL, Ab2, Ab2,
185
+
186
+    // end
187
+
188
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
189
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
190
+    SIL, SIL, SIL, SIL, SIL, SIL, SIL, SIL,
191
+
192
+    SILENCE, SILENCE, SILENCE, SILENCE,
193
+    SILENCE, SILENCE, SILENCE, SILENCE,
194
+    SILENCE, SILENCE, SILENCE, SILENCE,
195
+    SILENCE, SILENCE, SILENCE, SILENCE,
196
+    END
33
 };
197
 };
34
 
198
 
35
 const struct music music_menu = {
199
 const struct music music_menu = {
36
     .notes = menu_music,
200
     .notes = menu_music,
37
-    .notes2 = NULL,
201
+    .notes2 = menu_music2,
38
     .drums = NULL,
202
     .drums = NULL,
39
-    .duration = 200,
203
+    .duration = 150,
40
 };
204
 };

Loading…
Cancel
Save