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,15 +1,16 @@
Music_SuicuneBattle:
musicheader 3, 1, Music_SuicuneBattle_Ch1
musicheader 1, 2, Music_SuicuneBattle_Ch2
musicheader 1, 3, Music_SuicuneBattle_Ch3
channel_count 3
channel 1, Music_SuicuneBattle_Ch1
channel 2, Music_SuicuneBattle_Ch2
channel 3, Music_SuicuneBattle_Ch3
Music_SuicuneBattle_Ch1:
tempo 101
volume $77
dutycycle $3
tone $0002
vibrato $12, $15
notetype $c, $b7
volume 7, 7
duty_cycle 3
pitch_offset 2
vibrato 18, 1, 5
note_type 12, 11, 7
octave 4
note A_, 1
note G#, 1
@@ -29,7 +30,7 @@ Music_SuicuneBattle_Ch1:
note C#, 4
octave 2
note A#, 2
notetype $c, $b2
note_type 12, 11, 2
note A_, 2
note A_, 4
note A_, 2
@@ -41,11 +42,11 @@ Music_SuicuneBattle_Ch1:
note A_, 2
note A_, 2
note A_, 2
notetype $c, $b3
note_type 12, 11, 3
octave 4
note F_, 4
note E_, 2
notetype $c, $b2
note_type 12, 11, 2
octave 2
note A_, 4
note A_, 2
@@ -57,11 +58,11 @@ Music_SuicuneBattle_Ch1:
note A_, 2
note A_, 2
note A_, 2
notetype $c, $b3
note_type 12, 11, 3
octave 4
note F_, 4
note E_, 2
notetype $c, $b2
note_type 12, 11, 2
octave 2
note A_, 4
note A_, 2
@@ -73,11 +74,11 @@ Music_SuicuneBattle_Ch1:
note A_, 2
note A_, 2
note A_, 2
notetype $c, $b3
note_type 12, 11, 3
octave 4
note F_, 4
note E_, 2
notetype $c, $b2
note_type 12, 11, 2
octave 2
note A_, 4
note A_, 2
@@ -95,7 +96,7 @@ Music_SuicuneBattle_Ch1:
note E_, 1
note G#, 1
.mainloop:
notetype $c, $b4
note_type 12, 11, 4
octave 2
note A_, 2
note B_, 2
@@ -246,12 +247,12 @@ Music_SuicuneBattle_Ch1:
note A_, 2
note G_, 2
note C_, 2
notetype $c, $b3
note_type 12, 11, 3
octave 2
note B_, 2
octave 3
note C_, 2
note __, 2
rest 2
note E_, 4
note D_, 2
note C_, 2
@@ -271,24 +272,24 @@ Music_SuicuneBattle_Ch1:
note C_, 2
octave 2
note G_, 2
note __, 2
notetype $c, $b6
rest 2
note_type 12, 11, 6
octave 3
note G_, 10
notetype $c, $b3
note_type 12, 11, 3
note C_, 2
octave 2
note G_, 2
note __, 2
notetype $c, $b7
rest 2
note_type 12, 11, 7
octave 3
note G_, 10
notetype $c, $b3
note_type 12, 11, 3
octave 2
note B_, 2
octave 3
note C_, 2
note __, 2
rest 2
note E_, 4
note D_, 2
note C_, 2
@@ -329,7 +330,7 @@ Music_SuicuneBattle_Ch1:
note C_, 2
octave 3
note G_, 2
notetype $c, $b2
note_type 12, 11, 2
octave 2
note B_, 2
note B_, 6
@@ -338,31 +339,31 @@ Music_SuicuneBattle_Ch1:
note B_, 2
note B_, 6
note B_, 2
notetype $c, $b4
note_type 12, 11, 4
octave 3
note C_, 6
notetype $c, $b2
note_type 12, 11, 2
octave 2
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 2
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 2
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 2
note B_, 2
octave 3
@@ -374,61 +375,61 @@ Music_SuicuneBattle_Ch1:
note A_, 1
octave 4
note C_, 1
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 4
note C_, 6
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b4
note_type 12, 11, 4
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b4
note_type 12, 11, 4
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
note B_, 2
notetype $c, $b4
note_type 12, 11, 4
octave 1
note F#, 4
notetype $c, $b2
note_type 12, 11, 2
octave 3
note B_, 2
notetype $c, $b5
note_type 12, 11, 5
octave 4
note C_, 6
notetype $c, $b7
note_type 12, 11, 7
octave 2
note B_, 8
note E_, 8
@@ -442,7 +443,7 @@ Music_SuicuneBattle_Ch1:
note C_, 2
note D_, 2
note C_, 2
notetype $c, $a0
note_type 12, 10, 0
octave 1
note F#, 8
note B_, 8
@@ -453,22 +454,22 @@ Music_SuicuneBattle_Ch1:
note B_, 8
note E_, 8
note F_, 8
notetype $c, $a7
note_type 12, 10, 7
note F_, 8
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
notetype $c, $b2
note __, 4
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
note_type 12, 11, 2
rest 4
octave 3
note D_, 8
note D_, 8
@@ -487,19 +488,19 @@ Music_SuicuneBattle_Ch1:
note F_, 8
note F_, 4
note E_, 8
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
note __, 16
vibrato $8, $24
dutycycle $2
notetype $c, $96
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
rest 16
vibrato 8, 2, 4
duty_cycle 2
note_type 12, 9, 6
octave 4
note E_, 6
note F#, 6
@@ -507,15 +508,15 @@ Music_SuicuneBattle_Ch1:
note A_, 4
octave 4
note A_, 16
vibrato $12, $15
dutycycle $3
loopchannel 0, .mainloop
vibrato 18, 1, 5
duty_cycle 3
sound_loop 0, .mainloop
Music_SuicuneBattle_Ch2:
dutycycle $3
vibrato $14, $34
tone $0001
notetype $c, $c3
duty_cycle 3
vibrato 20, 3, 4
pitch_offset 1
note_type 12, 12, 3
octave 5
note E_, 1
octave 4
@@ -556,33 +557,33 @@ Music_SuicuneBattle_Ch2:
octave 4
note E_, 1
note A_, 6
notetype $c, $c2
note_type 12, 12, 2
octave 2
note E_, 8
note E_, 8
note E_, 8
notetype $c, $c3
note_type 12, 12, 3
octave 4
note A#, 4
notetype $c, $c2
note_type 12, 12, 2
note A_, 4
octave 2
note E_, 8
note E_, 8
note E_, 8
notetype $c, $c3
note_type 12, 12, 3
octave 4
note A#, 4
notetype $c, $c2
note_type 12, 12, 2
note A_, 4
octave 4
note E_, 8
note E_, 8
note E_, 8
notetype $c, $c3
note_type 12, 12, 3
octave 4
note A#, 4
notetype $c, $c2
note_type 12, 12, 2
note A_, 4
octave 4
note E_, 8
@@ -590,28 +591,28 @@ Music_SuicuneBattle_Ch2:
note E_, 8
note E_, 4
.mainloop:
notetype $c, $c7
note_type 12, 12, 7
octave 3
note A_, 8
note B_, 8
note D_, 8
notetype $c, $b0
note_type 12, 11, 0
octave 4
note D_, 8
notetype $c, $b6
note_type 12, 11, 6
note D_, 8
vibrato $10, $24
dutycycle $2
notetype $c, $a4
vibrato 16, 2, 4
duty_cycle 2
note_type 12, 10, 4
octave 5
note A_, 6
note B_, 6
note D_, 4
octave 6
note D_, 8
vibrato $14, $34
dutycycle $3
notetype $c, $c7
vibrato 20, 3, 4
duty_cycle 3
note_type 12, 12, 7
octave 4
note C_, 8
note D_, 8
@@ -619,40 +620,40 @@ Music_SuicuneBattle_Ch2:
note G_, 8
octave 4
note F_, 8
notetype $c, $b0
note_type 12, 11, 0
note E_, 10
notetype $c, $b7
note_type 12, 11, 7
note E_, 6
notetype $c, $a5
note_type 12, 10, 5
octave 2
note G_, 4
note A_, 4
note G_, 4
note B_, 4
notetype $c, $c7
note_type 12, 12, 7
octave 3
note A_, 8
note B_, 8
note D_, 8
notetype $c, $c7
note_type 12, 12, 7
octave 4
note D_, 8
notetype $c, $4c
note_type 12, 4, -4
note D_, 4
notetype $c, $c6
note_type 12, 12, 6
note D_, 4
notetype $c, $a4
vibrato $8, $24
dutycycle $2
note_type 12, 10, 4
vibrato 8, 2, 4
duty_cycle 2
octave 5
note A_, 6
note B_, 6
note D_, 4
octave 6
note D_, 8
vibrato $14, $34
notetype $c, $c7
dutycycle $3
vibrato 20, 3, 4
note_type 12, 12, 7
duty_cycle 3
octave 4
note C_, 8
note D_, 8
@@ -660,18 +661,18 @@ Music_SuicuneBattle_Ch2:
note G_, 8
octave 4
note F_, 8
notetype $c, $4c
note_type 12, 4, -4
note E_, 8
notetype $c, $c7
note_type 12, 12, 7
note E_, 8
notetype $c, $c6
note_type 12, 12, 6
note C_, 8
note G_, 8
notetype $c, $c2
note_type 12, 12, 2
octave 3
note F#, 2
note G_, 2
note __, 2
rest 2
note B_, 4
note A_, 2
note G_, 2
@@ -686,23 +687,23 @@ Music_SuicuneBattle_Ch2:
note F#, 2
note G_, 2
note C_, 2
note __, 2
notetype $c, $c7
rest 2
note_type 12, 12, 7
octave 4
note C_, 10
notetype $c, $c3
note_type 12, 12, 3
octave 4
note G_, 2
note C_, 2
note __, 2
notetype $c, $c7
rest 2
note_type 12, 12, 7
octave 5
note C_, 10
notetype $c, $c3
note_type 12, 12, 3
octave 4
note F#, 2
note G_, 2
note __, 2
rest 2
note B_, 4
note A_, 2
note G_, 2
@@ -715,12 +716,12 @@ Music_SuicuneBattle_Ch2:
note F#, 2
note E_, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
note G_, 8
note F#, 8
note E_, 8
note G_, 8
notetype $c, $c2
note_type 12, 12, 2
octave 3
note F#, 2
note F#, 6
@@ -729,85 +730,85 @@ Music_SuicuneBattle_Ch2:
note F#, 2
note F#, 6
note F#, 2
notetype $c, $b7
note_type 12, 11, 7
note G_, 6
notetype $c, $c2
note_type 12, 12, 2
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 3
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 3
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 3
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
note G_, 6
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
note G_, 6
notetype $c, $c2
note_type 12, 12, 2
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 4
notetype $c, $c2
note_type 12, 12, 2
octave 4
note F#, 2
notetype $c, $c7
note_type 12, 12, 7
note G_, 6
notetype $c, $b0
note_type 12, 11, 0
octave 3
note F#, 8
octave 2
@@ -820,10 +821,10 @@ Music_SuicuneBattle_Ch2:
note B_, 8
octave 3
note C_, 8
notetype $c, $b7
note_type 12, 11, 7
octave 3
note C_, 8
notetype $c, $c7
note_type 12, 12, 7
octave 1
note B_, 8
octave 2
@@ -833,13 +834,13 @@ Music_SuicuneBattle_Ch2:
note E_, 8
octave 1
note B_, 8
notetype $c, $b0
note_type 12, 11, 0
octave 2
note C_, 10
notetype $c, $b7
note_type 12, 11, 7
octave 2
note C_, 6
notetype $c, $c3
note_type 12, 12, 3
octave 1
note B_, 2
octave 2
@@ -1060,9 +1061,9 @@ Music_SuicuneBattle_Ch2:
octave 4
note D_, 2
note G_, 2
notetype $c, $c2
note_type 12, 12, 2
note A_, 8
notetype $c, $c3
note_type 12, 12, 3
octave 2
note A_, 2
note B_, 2
@@ -1184,12 +1185,12 @@ Music_SuicuneBattle_Ch2:
note E_, 2
note A_, 2
note B_, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop
Music_SuicuneBattle_Ch3:
notetype $c, $18
note __, 16
note __, 4
note_type 12, 1, 8
rest 16
rest 4
octave 2
note A_, 4
note D_, 2
@@ -1278,7 +1279,7 @@ Music_SuicuneBattle_Ch3:
octave 2
note D_, 2
note E_, 2
notetype $c, $16
note_type 12, 1, 6
.mainloop:
octave 1
note A_, 2
@@ -1581,24 +1582,24 @@ Music_SuicuneBattle_Ch3:
note G_, 2
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note G_, 6
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note F#, 2
note __, 4
rest 4
note F#, 2
note G_, 6
note B_, 2
@@ -1662,27 +1663,27 @@ Music_SuicuneBattle_Ch3:
note B_, 8
octave 2
note C_, 16
note __, 4
rest 4
octave 1
note B_, 2
note __, 6
rest 6
note B_, 2
note __, 2
note __, 4
rest 2
rest 4
note B_, 2
note __, 6
rest 6
note B_, 2
note __, 2
note __, 4
rest 2
rest 4
note B_, 2
note __, 6
rest 6
note B_, 2
note __, 2
note __, 4
rest 2
rest 4
note B_, 2
note __, 6
rest 6
note B_, 2
note __, 2
rest 2
note B_, 2
octave 2
note F_, 2
@@ -1889,7 +1890,7 @@ Music_SuicuneBattle_Ch3:
note D_, 2
note G#, 2
note A_, 4
note __, 4
rest 4
octave 1
note A_, 2
octave 2
@@ -2053,4 +2054,4 @@ Music_SuicuneBattle_Ch3:
note E_, 2
note D_, 2
note E_, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop