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,21 +1,22 @@
Music_UnionCave:
musicheader 4, 1, Music_UnionCave_Ch1
musicheader 1, 2, Music_UnionCave_Ch2
musicheader 1, 3, Music_UnionCave_Ch3
musicheader 1, 4, Music_UnionCave_Ch4
channel_count 4
channel 1, Music_UnionCave_Ch1
channel 2, Music_UnionCave_Ch2
channel 3, Music_UnionCave_Ch3
channel 4, Music_UnionCave_Ch4
Music_UnionCave_Ch1:
tempo 160
volume $77
dutycycle $1
tone $0002
vibrato $18, $34
stereopanning $f
volume 7, 7
duty_cycle 1
pitch_offset 2
vibrato 24, 3, 4
stereo_panning FALSE, TRUE
.mainloop:
notetype $c, $b3
note_type 12, 11, 3
.loop1:
callchannel .sub1
loopchannel 4, .loop1
sound_call .sub1
sound_loop 4, .loop1
.loop2:
octave 2
note G#, 2
@@ -25,7 +26,7 @@ Music_UnionCave_Ch1:
note C#, 2
note E_, 2
note F_, 4
loopchannel 8, .loop2
sound_loop 8, .loop2
.loop3:
octave 2
note A_, 2
@@ -35,9 +36,9 @@ Music_UnionCave_Ch1:
note D_, 2
note F_, 2
note F#, 4
loopchannel 4, .loop3
note __, 4
intensity $80
sound_loop 4, .loop3
rest 4
volume_envelope 8, 0
note F_, 16
note F#, 16
note G_, 16
@@ -52,17 +53,17 @@ Music_UnionCave_Ch1:
note C_, 8
octave 3
note A_, 8
intensity $95
tone $0004
callchannel .sub1
tone $0008
callchannel .sub1
tone $000c
callchannel .sub1
tone $0010
callchannel .sub1
tone $0002
loopchannel 0, .mainloop
volume_envelope 9, 5
pitch_offset 4
sound_call .sub1
pitch_offset 8
sound_call .sub1
pitch_offset 12
sound_call .sub1
pitch_offset 16
sound_call .sub1
pitch_offset 2
sound_loop 0, .mainloop
.sub1:
octave 2
@@ -70,19 +71,19 @@ Music_UnionCave_Ch1:
octave 3
note C#, 2
note E_, 12
endchannel
sound_ret
Music_UnionCave_Ch2:
dutycycle $3
vibrato $8, $24
duty_cycle 3
vibrato 8, 2, 4
.mainloop:
notetype $c, $c4
callchannel .sub1
intensity $c5
callchannel .sub1
intensity $c7
callchannel .sub1
intensity $c4
note_type 12, 12, 4
sound_call .sub1
volume_envelope 12, 5
sound_call .sub1
volume_envelope 12, 7
sound_call .sub1
volume_envelope 12, 4
note C#, 4
octave 3
note B_, 4
@@ -111,8 +112,8 @@ Music_UnionCave_Ch2:
note C#, 8
note D_, 4
note C#, 4
note __, 4
intensity $a0
rest 4
volume_envelope 10, 0
note C_, 16
note C#, 16
note D_, 16
@@ -121,17 +122,17 @@ Music_UnionCave_Ch2:
note D#, 16
note A#, 16
note A_, 16
intensity $a5
vibrato $6, $44
callchannel .sub2
vibrato $4, $33
callchannel .sub2
vibrato $2, $22
callchannel .sub2
vibrato $1, $41
callchannel .sub2
vibrato $8, $24
loopchannel 0, .mainloop
volume_envelope 10, 5
vibrato 6, 4, 4
sound_call .sub2
vibrato 4, 3, 3
sound_call .sub2
vibrato 2, 2, 2
sound_call .sub2
vibrato 1, 4, 1
sound_call .sub2
vibrato 8, 2, 4
sound_loop 0, .mainloop
.sub1:
octave 4
@@ -163,7 +164,7 @@ Music_UnionCave_Ch2:
note C_, 8
note C#, 4
note C_, 4
endchannel
sound_ret
.sub2:
octave 2
@@ -171,43 +172,43 @@ Music_UnionCave_Ch2:
octave 3
note C#, 2
note E_, 12
endchannel
sound_ret
Music_UnionCave_Ch3:
notetype $c, $16
stereopanning $f0
note_type 12, 1, 6
stereo_panning TRUE, FALSE
.mainloop:
.loop1:
note __, 16
loopchannel 7, .loop1
note __, 14
rest 16
sound_loop 7, .loop1
rest 14
octave 4
note C_, 2
.loop2:
note __, 2
rest 2
octave 3
note E_, 2
note __, 2
rest 2
note E_, 2
note G#, 2
note E_, 2
note __, 2
rest 2
octave 4
note C_, 2
loopchannel 4, .loop2
sound_loop 4, .loop2
.loop3:
note __, 2
rest 2
octave 3
note F_, 2
note __, 2
rest 2
note F_, 2
note A_, 2
note F_, 2
note __, 2
rest 2
octave 4
note C#, 2
loopchannel 4, .loop3
note __, 4
sound_loop 4, .loop3
rest 4
note C_, 8
octave 3
note B_, 8
@@ -228,33 +229,33 @@ Music_UnionCave_Ch3:
octave 3
note A_, 2
note G_, 2
loopchannel 3, .loop4
sound_loop 3, .loop4
note A_, 4
note G_, 4
note A#, 8
.loop5:
note __, 16
loopchannel 4, .loop5
loopchannel 0, .mainloop
rest 16
sound_loop 4, .loop5
sound_loop 0, .mainloop
Music_UnionCave_Ch4:
togglenoise $1
notetype $c
toggle_noise 1
drum_speed 12
.mainloop:
stereopanning $f0
note E_, 4
stereopanning $ff
note F_, 4
stereopanning $f
note G#, 4
note __, 8
stereopanning $f
note E_, 4
stereopanning $ff
note F_, 4
stereopanning $f0
note G#, 4
note __, 8
loopchannel 0, .mainloop
stereo_panning TRUE, FALSE
drum_note 5, 4
stereo_panning TRUE, TRUE
drum_note 6, 4
stereo_panning FALSE, TRUE
drum_note 9, 4
rest 8
stereo_panning FALSE, TRUE
drum_note 5, 4
stereo_panning TRUE, TRUE
drum_note 6, 4
stereo_panning TRUE, FALSE
drum_note 9, 4
rest 8
sound_loop 0, .mainloop
loopchannel 0, .mainloop ; unused
sound_loop 0, .mainloop ; unused