Merge branch 'master' into audio-macros

This commit is contained in:
mid-kid
2020-02-04 16:01:30 +01:00
117 changed files with 18693 additions and 18128 deletions

View File

@@ -1,48 +1,49 @@
Music_EcruteakCity:
musicheader 3, 1, Music_EcruteakCity_Ch1
musicheader 1, 2, Music_EcruteakCity_Ch2
musicheader 1, 3, Music_EcruteakCity_Ch3
channel_count 3
channel 1, Music_EcruteakCity_Ch1
channel 2, Music_EcruteakCity_Ch2
channel 3, Music_EcruteakCity_Ch3
Music_EcruteakCity_Ch1:
tempo 197
volume $77
stereopanning $f
vibrato $12, $25
dutycycle $2
volume 7, 7
stereo_panning FALSE, TRUE
vibrato 18, 2, 5
duty_cycle 2
.mainloop:
notetype $c, $57
note __, 10
note_type 12, 5, 7
rest 10
octave 4
note C_, 6
note __, 10
rest 10
note C_, 6
note __, 16
rest 16
octave 3
note B_, 4
octave 4
note C_, 4
note D_, 4
intensity $60
note __, 4
note __, 16
note __, 10
volume_envelope 6, 0
rest 4
rest 16
rest 10
note G_, 2
note A_, 2
note A#, 2
note __, 8
rest 8
note G#, 2
note G_, 2
note F_, 2
octave 5
note C_, 6
notetype $6, $67
note_type 6, 6, 7
note C#, 4
note D_, 10
note __, 2
stereopanning $ff
rest 2
stereo_panning TRUE, TRUE
octave 4
note B_, 8
stereopanning $f
stereo_panning FALSE, TRUE
octave 3
note A#, 1
note B_, 11
@@ -52,27 +53,27 @@ Music_EcruteakCity_Ch1:
note G_, 12
note A#, 12
note G_, 4
note __, 4
rest 4
note A#, 4
octave 5
note C#, 4
note E_, 2
note __, 2
rest 2
octave 3
note A_, 8
octave 4
note C_, 8
note F_, 4
note __, 12
rest 12
note E_, 1
note F_, 11
note G_, 2
note __, 2
rest 2
note A_, 4
note G_, 4
note __, 8
intensity $52
callchannel .sub1
rest 8
volume_envelope 5, 2
sound_call .sub1
note D_, 2
octave 4
note B_, 2
@@ -94,8 +95,8 @@ Music_EcruteakCity_Ch1:
note B_, 2
note A_, 2
note B_, 2
callchannel .sub2
intensity $52
sound_call .sub2
volume_envelope 5, 2
note A#, 2
note G_, 2
note E_, 2
@@ -115,7 +116,7 @@ Music_EcruteakCity_Ch1:
note G_, 2
note E_, 2
note C#, 2
callchannel .sub1
sound_call .sub1
note D_, 2
note C_, 2
octave 4
@@ -142,8 +143,8 @@ Music_EcruteakCity_Ch1:
note G#, 2
octave 5
note C_, 2
callchannel .sub2
loopchannel 0, .mainloop
sound_call .sub2
sound_loop 0, .mainloop
.sub1:
octave 5
@@ -159,8 +160,8 @@ Music_EcruteakCity_Ch1:
note C_, 2
note E_, 2
note C_, 2
loopchannel 2, .sub1
endchannel
sound_loop 2, .sub1
sound_ret
.sub2:
octave 5
@@ -223,7 +224,7 @@ Music_EcruteakCity_Ch1:
octave 5
note C_, 2
note F_, 2
loopchannel 2, .sub2loop1
sound_loop 2, .sub2loop1
.sub2loop2:
octave 4
note G_, 2
@@ -239,36 +240,36 @@ Music_EcruteakCity_Ch1:
octave 5
note D_, 2
note G_, 2
loopchannel 2, .sub2loop2
intensity $50
dutycycle $0
sound_loop 2, .sub2loop2
volume_envelope 5, 0
duty_cycle 0
note E_, 16
note G_, 16
dutycycle $2
endchannel
duty_cycle 2
sound_ret
Music_EcruteakCity_Ch2:
vibrato $12, $25
dutycycle $3
stereopanning $f0
vibrato 18, 2, 5
duty_cycle 3
stereo_panning TRUE, FALSE
.mainloop:
notetype $6, $67
note __, 16
note __, 5
note_type 6, 6, 7
rest 16
rest 5
octave 4
note G_, 1
octave 5
note D_, 1
note E_, 9
note __, 16
note __, 5
rest 16
rest 5
octave 4
note A_, 1
octave 5
note E_, 1
note F_, 9
notetype $c, $77
note __, 10
note_type 12, 7, 7
rest 10
note D_, 2
note C_, 2
octave 4
@@ -276,28 +277,28 @@ Music_EcruteakCity_Ch2:
note G_, 4
note A_, 4
note B_, 4
notetype $6, $93
intensity $97
dutycycle $2
note_type 6, 9, 3
volume_envelope 9, 7
duty_cycle 2
octave 3
note G_, 7
octave 4
note C#, 1
note D_, 11
note __, 1
rest 1
note C_, 2
note __, 2
rest 2
note C_, 16
note F_, 8
note __, 4
rest 4
note E_, 4
note __, 4
rest 4
note E_, 4
note F_, 4
note G_, 4
note E_, 4
note C_, 2
note __, 2
rest 2
note C_, 4
octave 3
note A_, 2
@@ -307,23 +308,23 @@ Music_EcruteakCity_Ch2:
note C_, 16
note E_, 4
note G_, 2
note __, 2
rest 2
note E_, 4
note D_, 10
note __, 1
stereopanning $ff
rest 1
stereo_panning TRUE, TRUE
note D#, 9
stereopanning $f0
dutycycle $0
stereo_panning TRUE, FALSE
duty_cycle 0
octave 5
note C#, 1
note D_, 11
note C_, 2
note __, 2
rest 2
note C_, 16
note F_, 12
note E_, 4
note __, 4
rest 4
note E_, 4
note F_, 4
note G_, 2
@@ -334,14 +335,14 @@ Music_EcruteakCity_Ch2:
note E_, 1
note A_, 3
note E_, 2
note __, 2
rest 2
note E_, 4
note C_, 2
note __, 2
rest 2
note C_, 4
octave 4
note A_, 2
note __, 2
rest 2
note B_, 4
octave 5
note C_, 2
@@ -352,9 +353,9 @@ Music_EcruteakCity_Ch2:
note D#, 1
note E_, 11
note D_, 2
note __, 2
rest 2
note D_, 8
dutycycle $1
duty_cycle 1
octave 4
note E_, 4
note G_, 3
@@ -364,36 +365,36 @@ Music_EcruteakCity_Ch2:
note A_, 4
octave 4
note C_, 2
note __, 2
rest 2
note E_, 4
note D_, 12
note C_, 4
note __, 4
rest 4
octave 3
note B_, 4
note __, 4
rest 4
octave 4
note F_, 8
note G_, 12
note F_, 8
note __, 4
rest 4
note E_, 8
note D_, 4
note C_, 2
note __, 2
rest 2
octave 3
note B_, 4
octave 4
note C_, 2
note __, 6
rest 6
octave 3
note B_, 4
note __, 4
rest 4
octave 4
note C_, 4
octave 3
note A_, 16
note __, 4
rest 4
octave 4
note F_, 4
note E_, 4
@@ -401,34 +402,34 @@ Music_EcruteakCity_Ch2:
note C_, 12
octave 3
note B_, 4
note __, 4
rest 4
octave 4
note C_, 4
note D_, 4
note D#, 4
notetype $c, $83
note_type 12, 8, 3
note E_, 16
intensity $80
volume_envelope 8, 0
note D_, 4
note C#, 4
note F_, 4
notetype $6, $80
note_type 6, 8, 0
note G_, 7
note G#, 1
intensity $87
volume_envelope 8, 7
note A_, 12
note E_, 2
note __, 2
rest 2
note E_, 2
note __, 2
rest 2
note E_, 3
note G#, 1
note A_, 4
note E_, 2
note __, 2
rest 2
note E_, 4
note D_, 2
note __, 2
rest 2
note C#, 4
note D_, 12
octave 3
@@ -437,13 +438,13 @@ Music_EcruteakCity_Ch2:
note F_, 4
note G_, 12
note D_, 2
note __, 2
rest 2
note D_, 2
note __, 2
rest 2
note D_, 4
note G_, 4
note D_, 2
note __, 1
rest 1
note A#, 1
note B_, 12
octave 5
@@ -454,26 +455,26 @@ Music_EcruteakCity_Ch2:
note A_, 4
octave 4
note C_, 4
notetype $c, $87
note_type 12, 8, 7
note F_, 10
note G_, 2
note F_, 2
note E_, 2
note D_, 8
note __, 2
rest 2
octave 3
note B_, 2
octave 4
note C_, 2
note D_, 2
note E_, 16
loopchannel 0, .mainloop
sound_loop 0, .mainloop
Music_EcruteakCity_Ch3:
stereopanning $ff
stereo_panning TRUE, TRUE
.mainloop:
vibrato $12, $25
notetype $c, $25
vibrato 18, 2, 5
note_type 12, 2, 5
octave 3
note C_, 2
note G_, 2
@@ -509,18 +510,18 @@ Music_EcruteakCity_Ch3:
note A#, 2
octave 4
note D_, 2
note __, 2
rest 2
note C#, 2
note D_, 2
note E_, 2
octave 3
note D_, 2
note A_, 1
note __, 1
rest 1
octave 4
note E_, 2
note F_, 1
note __, 1
rest 1
note G#, 8
octave 3
note G_, 2
@@ -552,17 +553,17 @@ Music_EcruteakCity_Ch3:
note D_, 2
note F_, 2
note G_, 1
note __, 1
rest 1
octave 3
note F_, 8
octave 4
note A_, 2
octave 5
note C_, 1
note __, 1
rest 1
note D_, 2
note E_, 1
note __, 1
rest 1
octave 2
note G_, 2
octave 3
@@ -574,7 +575,7 @@ Music_EcruteakCity_Ch3:
note B_, 2
octave 4
note D_, 2
callchannel .sub1
sound_call .sub1
octave 4
note C_, 8
note E_, 8
@@ -584,84 +585,84 @@ Music_EcruteakCity_Ch3:
note G_, 8
note E_, 8
note C#, 8
notetype $c, $25
callchannel .sub1
note_type 12, 2, 5
sound_call .sub1
octave 4
note C_, 8
octave 3
note G_, 8
note E_, 8
note D_, 8
loopchannel 0, .mainloop
sound_loop 0, .mainloop
.sub1:
octave 3
note F_, 4
note __, 2
rest 2
note F_, 1
note __, 1
rest 1
note F_, 4
note __, 2
rest 2
note C_, 1
note __, 1
rest 1
note F_, 4
note __, 2
rest 2
note F_, 1
note __, 1
rest 1
note F_, 1
note __, 1
rest 1
note F_, 2
note __, 2
rest 2
note F_, 1
note __, 1
rest 1
note E_, 4
note __, 2
rest 2
note B_, 1
note __, 1
rest 1
note E_, 1
note __, 1
rest 1
note E_, 2
note __, 2
rest 2
note B_, 1
note __, 1
rest 1
note A_, 4
note __, 2
rest 2
note A_, 1
note __, 1
rest 1
note G#, 1
note __, 1
rest 1
note G#, 1
note __, 1
rest 1
note G_, 1
note __, 1
rest 1
note F#, 1
note __, 1
rest 1
note D_, 4
note __, 2
rest 2
note A_, 1
note __, 1
rest 1
note D_, 1
note __, 1
rest 1
note D_, 1
note __, 1
rest 1
note E_, 1
note __, 1
rest 1
note F_, 1
note __, 1
rest 1
note G_, 4
note __, 2
rest 2
octave 4
note D_, 1
note __, 1
rest 1
octave 3
note G_, 1
note __, 1
rest 1
note G_, 1
note __, 1
rest 1
note A_, 1
note __, 1
rest 1
note A#, 1
notetype $6, $25
note __, 1
note_type 6, 2, 5
rest 1
note B_, 1
endchannel
sound_ret