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,14 +1,15 @@
Music_TrainerVictory:
musicheader 3, 1, Music_TrainerVictory_Ch1
musicheader 1, 2, Music_TrainerVictory_Ch2
musicheader 1, 3, Music_TrainerVictory_Ch3
channel_count 3
channel 1, Music_TrainerVictory_Ch1
channel 2, Music_TrainerVictory_Ch2
channel 3, Music_TrainerVictory_Ch3
Music_TrainerVictory_Ch1:
tempo 120
volume $77
dutycycle $2
tone $0001
notetype $8, $b1
volume 7, 7
duty_cycle 2
pitch_offset 1
note_type 8, 11, 1
octave 4
note E_, 2
note E_, 2
@@ -16,14 +17,14 @@ Music_TrainerVictory_Ch1:
note E_, 2
note F#, 2
note G_, 2
intensity $b6
volume_envelope 11, 6
note A_, 12
stereopanning $f
stereo_panning FALSE, TRUE
.mainloop:
.loop1:
intensity $72
callchannel .sub1
intensity $51
volume_envelope 7, 2
sound_call .sub1
volume_envelope 5, 1
note C#, 2
note E_, 2
note F#, 2
@@ -31,31 +32,31 @@ Music_TrainerVictory_Ch1:
note B_, 2
octave 4
note C#, 2
intensity $72
volume_envelope 7, 2
octave 3
note A_, 2
note __, 2
rest 2
octave 4
note C#, 2
note E_, 6
loopchannel 2, .loop1
callchannel .sub1
sound_loop 2, .loop1
sound_call .sub1
note A_, 2
note __, 2
rest 2
note F_, 2
note A_, 6
note A#, 2
note __, 2
rest 2
note G_, 2
note A#, 6
.loop2:
intensity $72
volume_envelope 7, 2
octave 4
note D_, 2
note C#, 2
octave 3
note A_, 2
loopchannel 3, .loop2
sound_loop 3, .loop2
note F#, 2
note A_, 2
octave 4
@@ -66,28 +67,28 @@ Music_TrainerVictory_Ch1:
octave 3
note B_, 2
note A_, 2
loopchannel 3, .loop3
sound_loop 3, .loop3
note E_, 2
note F#, 2
note G_, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop
.sub1:
octave 3
note F#, 2
note __, 2
rest 2
note D_, 2
note F#, 6
note G_, 2
note __, 2
rest 2
note E_, 2
note G_, 6
endchannel
sound_ret
Music_TrainerVictory_Ch2:
vibrato $12, $34
dutycycle $3
notetype $8, $d1
vibrato 18, 3, 4
duty_cycle 3
note_type 8, 13, 1
octave 4
note A_, 2
note A_, 2
@@ -96,62 +97,62 @@ Music_TrainerVictory_Ch2:
note B_, 2
octave 5
note C#, 2
intensity $d6
volume_envelope 13, 6
note D_, 12
stereopanning $f0
stereo_panning TRUE, FALSE
.mainloop:
.loop1:
notetype $8, $82
callchannel .sub1
note_type 8, 8, 2
sound_call .sub1
note F#, 2
note __, 2
rest 2
note G_, 2
note A_, 6
note E_, 2
note __, 2
rest 2
note F#, 2
note G_, 6
loopchannel 2, .loop1
callchannel .sub1
sound_loop 2, .loop1
sound_call .sub1
note F_, 2
note __, 2
rest 2
note C_, 2
note F_, 6
note G_, 2
note __, 2
rest 2
note D_, 2
note G_, 6
notetype $c, $88
note_type 12, 8, 8
note F#, 16
note E_, 16
loopchannel 0, .mainloop
sound_loop 0, .mainloop
.sub1:
octave 4
note D_, 2
note __, 2
rest 2
octave 3
note A_, 2
octave 4
note D_, 6
note E_, 2
note __, 2
rest 2
octave 3
note B_, 2
octave 4
note E_, 6
endchannel
sound_ret
Music_TrainerVictory_Ch3:
notetype $8, $25
note_type 8, 2, 5
octave 3
note G_, 6
note G_, 1
note __, 1
rest 1
note G_, 1
note __, 1
rest 1
note G_, 1
note __, 1
rest 1
note F#, 6
note D_, 2
note C#, 2
@@ -159,32 +160,32 @@ Music_TrainerVictory_Ch3:
note B_, 2
.mainloop:
.loop1:
callchannel .sub1
sound_call .sub1
octave 3
note C#, 2
note __, 2
rest 2
note C#, 2
note A_, 2
note F#, 2
note C#, 2
octave 2
note A_, 2
note __, 2
rest 2
octave 3
note A_, 1
note __, 1
rest 1
note A_, 6
loopchannel 2, .loop1
callchannel .sub1
sound_loop 2, .loop1
sound_call .sub1
octave 3
note C_, 2
note __, 2
rest 2
note C_, 2
note A_, 2
note F_, 2
note C_, 2
note D_, 2
note __, 2
rest 2
note D_, 2
octave 4
note D_, 2
@@ -209,12 +210,12 @@ Music_TrainerVictory_Ch3:
note G_, 2
note E_, 2
note C#, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop
.sub1:
octave 2
note A_, 2
note __, 2
rest 2
note A_, 2
octave 3
note F#, 2
@@ -222,11 +223,11 @@ Music_TrainerVictory_Ch3:
octave 2
note A_, 2
note B_, 2
note __, 2
rest 2
note B_, 2
octave 3
note G_, 2
note E_, 2
octave 2
note B_, 2
endchannel
sound_ret