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,22 +1,23 @@
Music_JohtoGymBattle:
musicheader 3, 1, Music_JohtoGymBattle_Ch1
musicheader 1, 2, Music_JohtoGymBattle_Ch2
musicheader 1, 3, Music_JohtoGymBattle_Ch3
channel_count 3
channel 1, Music_JohtoGymBattle_Ch1
channel 2, Music_JohtoGymBattle_Ch2
channel 3, Music_JohtoGymBattle_Ch3
Music_JohtoGymBattle_Ch1:
tempo 101
volume $77
dutycycle $3
tone $0002
vibrato $12, $15
notetype $c, $b2
volume 7, 7
duty_cycle 3
pitch_offset 2
vibrato 18, 1, 5
note_type 12, 11, 2
.loop1:
octave 3
note A#, 1
note A_, 1
note G#, 1
note A_, 1
loopchannel 4, .loop1
sound_loop 4, .loop1
.loop2:
note C#, 1
note C_, 1
@@ -24,10 +25,10 @@ Music_JohtoGymBattle_Ch1:
note A#, 1
octave 3
note C_, 1
loopchannel 3, .loop2
intensity $4b
sound_loop 3, .loop2
volume_envelope 4, -3
note C#, 4
intensity $b2
volume_envelope 11, 2
note D_, 6
note D#, 6
note C_, 4
@@ -39,9 +40,9 @@ Music_JohtoGymBattle_Ch1:
note C_, 4
note F_, 6
note G_, 6
intensity $b7
volume_envelope 11, 7
note C_, 4
intensity $b2
volume_envelope 11, 2
note G_, 6
note G#, 6
note F_, 4
@@ -58,7 +59,7 @@ Music_JohtoGymBattle_Ch1:
note G#, 2
note F_, 2
.mainloop:
intensity $b5
volume_envelope 11, 5
note D_, 6
note G_, 6
note F_, 2
@@ -67,16 +68,16 @@ Music_JohtoGymBattle_Ch1:
note G_, 4
note F_, 4
note G_, 4
intensity $b7
volume_envelope 11, 7
note G#, 12
intensity $b2
volume_envelope 11, 2
note G_, 4
intensity $b7
volume_envelope 11, 7
octave 4
note C#, 12
intensity $b2
volume_envelope 11, 2
note C_, 4
intensity $b5
volume_envelope 11, 5
octave 3
note D_, 6
note G_, 6
@@ -86,42 +87,42 @@ Music_JohtoGymBattle_Ch1:
note G_, 4
note F_, 4
note G_, 4
intensity $b7
volume_envelope 11, 7
note G#, 8
note G_, 8
note F_, 8
note D#, 8
intensity $70
volume_envelope 7, 0
note C_, 8
intensity $77
volume_envelope 7, 7
note C_, 8
intensity $b4
volume_envelope 11, 4
note D#, 2
note E_, 2
note F_, 6
note G_, 2
note D#, 4
intensity $77
volume_envelope 7, 7
octave 2
note A#, 8
note A#, 8
intensity $c5
volume_envelope 12, 5
octave 3
note G_, 2
note G#, 2
note A#, 6
note A#, 2
note G#, 4
intensity $c7
volume_envelope 12, 7
note G_, 8
note F_, 4
note E_, 2
note C#, 2
intensity $a0
volume_envelope 10, 0
note C_, 8
intensity $a7
volume_envelope 10, 7
note C_, 8
intensity $b2
volume_envelope 11, 2
note F_, 6
note F_, 4
note E_, 2
@@ -174,24 +175,24 @@ Music_JohtoGymBattle_Ch1:
note D#, 6
note D#, 6
note D#, 4
intensity $80
volume_envelope 8, 0
note G_, 16
intensity $90
volume_envelope 9, 0
note G#, 16
intensity $a0
volume_envelope 10, 0
note A_, 8
note A#, 2
note A_, 2
note G#, 2
note A_, 2
intensity $b0
volume_envelope 11, 0
note A#, 8
note B_, 2
note A#, 2
note A_, 2
octave 4
note C#, 2
intensity $b7
volume_envelope 11, 7
note C_, 8
note C#, 4
note C_, 4
@@ -251,7 +252,7 @@ Music_JohtoGymBattle_Ch1:
note A_, 8
note G#, 8
note F#, 8
intensity $b4
volume_envelope 11, 4
note A_, 4
octave 4
note C#, 4
@@ -259,51 +260,51 @@ Music_JohtoGymBattle_Ch1:
note B_, 4
octave 4
note E_, 4
intensity $92
volume_envelope 9, 2
note D#, 2
note D#, 2
note D#, 2
note D#, 2
intensity $b2
volume_envelope 11, 2
note D#, 2
note D#, 2
note D#, 2
note D#, 2
intensity $c2
volume_envelope 12, 2
note D#, 16
intensity $50
volume_envelope 5, 0
octave 3
note C_, 16
note F_, 16
note E_, 16
intensity $97
volume_envelope 9, 7
note D#, 10
intensity $b4
volume_envelope 11, 4
octave 2
note A#, 2
octave 3
note D#, 2
note F#, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop
Music_JohtoGymBattle_Ch2:
dutycycle $3
vibrato $8, $36
tone $0001
notetype $c, $c2
duty_cycle 3
vibrato 8, 3, 6
pitch_offset 1
note_type 12, 12, 2
.loop1:
octave 4
note F#, 1
note F_, 1
note E_, 1
note A#, 1
loopchannel 4, .loop1
sound_loop 4, .loop1
.loop2:
note F#, 1
note F_, 1
note F#, 1
note A#, 1
loopchannel 4, .loop2
sound_loop 4, .loop2
note A_, 6
octave 3
note A#, 6
@@ -319,86 +320,86 @@ Music_JohtoGymBattle_Ch2:
octave 4
note D_, 6
note D#, 6
intensity $b0
volume_envelope 11, 0
octave 3
note D#, 4
intensity $c2
volume_envelope 12, 2
octave 4
note D_, 2
intensity $92
volume_envelope 9, 2
octave 3
note D_, 2
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note D#, 4
intensity $92
volume_envelope 9, 2
octave 3
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note C_, 4
note G_, 2
notetype $c, $92
note_type 12, 9, 2
octave 3
note D_, 2
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note D_, 4
intensity $92
volume_envelope 9, 2
octave 3
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note D#, 2
intensity $92
volume_envelope 9, 2
octave 3
note D#, 2
intensity $c2
volume_envelope 12, 2
octave 4
note D_, 2
intensity $92
volume_envelope 9, 2
octave 3
note D_, 2
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note D#, 4
intensity $92
volume_envelope 9, 2
octave 3
note D_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note C_, 2
intensity $92
volume_envelope 9, 2
octave 3
note D#, 2
intensity $c2
volume_envelope 12, 2
octave 4
note G_, 2
intensity $92
volume_envelope 9, 2
octave 3
note F_, 2
note F_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note G#, 2
intensity $92
volume_envelope 9, 2
octave 3
note F_, 2
note F_, 2
intensity $c2
volume_envelope 12, 2
octave 4
note F#, 2
intensity $b2
volume_envelope 11, 2
octave 3
note G#, 1
note A_, 1
.mainloop:
intensity $c7
volume_envelope 12, 7
note A#, 8
intensity $c4
volume_envelope 12, 4
octave 4
note D_, 2
note C_, 2
@@ -406,29 +407,29 @@ Music_JohtoGymBattle_Ch2:
note A#, 2
octave 4
note C_, 2
intensity $c7
volume_envelope 12, 7
note C#, 8
intensity $c4
volume_envelope 12, 4
note F_, 2
note D#, 2
note C#, 2
note D#, 2
intensity $b0
volume_envelope 11, 0
note F_, 6
intensity $b7
volume_envelope 11, 7
note F_, 6
intensity $c2
volume_envelope 12, 2
note D#, 4
intensity $b0
volume_envelope 11, 0
note G#, 6
intensity $b7
volume_envelope 11, 7
note G#, 6
intensity $c2
volume_envelope 12, 2
note F_, 4
intensity $c7
volume_envelope 12, 7
octave 3
note A#, 8
intensity $c4
volume_envelope 12, 4
octave 4
note D_, 2
note C_, 2
@@ -436,48 +437,48 @@ Music_JohtoGymBattle_Ch2:
note A#, 2
octave 4
note C_, 2
intensity $c7
volume_envelope 12, 7
note C#, 8
intensity $c4
volume_envelope 12, 4
note F_, 2
note D#, 2
note C#, 2
note D#, 2
intensity $b0
volume_envelope 11, 0
note C#, 16
intensity $b7
volume_envelope 11, 7
note C#, 16
intensity $a4
volume_envelope 10, 4
octave 3
note F_, 6
note D#, 6
note F_, 4
intensity $c6
volume_envelope 12, 6
octave 4
note C_, 6
octave 3
note A#, 6
octave 4
note C_, 4
intensity $a4
volume_envelope 10, 4
octave 3
note C#, 6
note C_, 6
note C#, 4
intensity $c6
volume_envelope 12, 6
octave 4
note C#, 6
note C_, 6
note C#, 4
intensity $3c
volume_envelope 3, -4
note C_, 10
intensity $b7
volume_envelope 11, 7
note C_, 6
intensity $b0
volume_envelope 11, 0
note E_, 8
intensity $b7
volume_envelope 11, 7
note E_, 8
intensity $b0
volume_envelope 11, 0
octave 3
note C#, 16
octave 2
@@ -487,27 +488,27 @@ Music_JohtoGymBattle_Ch2:
note D#, 2
note C_, 16
note E_, 16
intensity $a0
volume_envelope 10, 0
octave 5
note C#, 4
intensity $a7
volume_envelope 10, 7
octave 5
note C#, 12
intensity $b7
volume_envelope 11, 7
octave 4
note A#, 8
octave 5
note C#, 6
note D#, 2
intensity $a0
volume_envelope 10, 0
note C_, 8
intensity $a7
volume_envelope 10, 7
note C_, 8
intensity $3e
volume_envelope 3, -6
note E_, 6
intensity $a6
volume_envelope 10, 6
note E_, 10
intensity $c2
volume_envelope 12, 2
octave 3
note F_, 6
note F_, 6
@@ -521,21 +522,21 @@ Music_JohtoGymBattle_Ch2:
note G#, 6
note G#, 6
note G#, 4
intensity $90
volume_envelope 9, 0
octave 4
note C_, 16
intensity $a0
volume_envelope 10, 0
note C#, 16
intensity $b0
volume_envelope 11, 0
note D_, 16
intensity $b7
volume_envelope 11, 7
note D#, 8
intensity $4c
volume_envelope 4, -4
note D#, 6
intensity $c2
volume_envelope 12, 2
note F#, 1
note G_, 1
intensity $c7
volume_envelope 12, 7
note G#, 8
note A_, 2
note G#, 2
@@ -596,13 +597,13 @@ Music_JohtoGymBattle_Ch2:
note G#, 4
note E_, 4
note A_, 4
intensity $c0
volume_envelope 12, 0
note G#, 8
intensity $c7
volume_envelope 12, 7
note G#, 8
intensity $c2
volume_envelope 12, 2
note G#, 16
intensity $80
volume_envelope 8, 0
octave 3
note F_, 16
octave 4
@@ -610,44 +611,44 @@ Music_JohtoGymBattle_Ch2:
octave 3
note B_, 16
note G_, 16
loopchannel 0, .mainloop
sound_loop 0, .mainloop
Music_JohtoGymBattle_Ch3:
notetype $c, $19
note_type 12, 1, -1
octave 4
note F_, 1
note __, 1
rest 1
octave 3
note A_, 2
octave 4
note F_, 1
note __, 1
rest 1
octave 3
note G#, 2
octave 4
note F_, 1
note __, 1
rest 1
octave 3
note G_, 2
octave 4
note F_, 1
note __, 1
rest 1
octave 3
note F#, 2
octave 4
note G#, 1
note __, 1
rest 1
octave 3
note F_, 2
octave 4
note G#, 1
note __, 1
rest 1
octave 3
note E_, 2
note F_, 2
note G_, 2
note G#, 4
callchannel .sub1
sound_call .sub1
note G_, 2
note D_, 2
note F_, 2
@@ -663,7 +664,7 @@ Music_JohtoGymBattle_Ch3:
note G#, 2
note D#, 2
note F#, 4
callchannel .sub1
sound_call .sub1
note G_, 2
note D_, 2
note F_, 2
@@ -683,9 +684,9 @@ Music_JohtoGymBattle_Ch3:
note A#, 2
note G#, 2
.mainloop:
callchannel .sub2
callchannel .sub2
callchannel .sub3
sound_call .sub2
sound_call .sub2
sound_call .sub3
note C#, 2
note G#, 2
note C#, 2
@@ -694,7 +695,7 @@ Music_JohtoGymBattle_Ch3:
note A#, 2
note A_, 2
note G#, 2
callchannel .sub2
sound_call .sub2
note D_, 2
note G_, 2
note D_, 2
@@ -703,8 +704,8 @@ Music_JohtoGymBattle_Ch3:
note G_, 2
note G#, 2
note G_, 2
callchannel .sub3
callchannel .sub3
sound_call .sub3
sound_call .sub3
note C_, 2
note G_, 2
note A#, 2
@@ -713,14 +714,14 @@ Music_JohtoGymBattle_Ch3:
note F_, 2
note G_, 2
note A#, 2
callchannel .sub4
callchannel .sub3
callchannel .sub5
sound_call .sub4
sound_call .sub3
sound_call .sub5
octave 3
note G_, 2
note G#, 2
note F_, 2
callchannel .sub4
sound_call .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -729,13 +730,13 @@ Music_JohtoGymBattle_Ch3:
note E_, 2
note F_, 2
note G_, 2
callchannel .sub3
callchannel .sub5
sound_call .sub3
sound_call .sub5
octave 3
note C_, 2
note C#, 2
note G#, 2
callchannel .sub4
sound_call .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -744,15 +745,15 @@ Music_JohtoGymBattle_Ch3:
note E_, 2
note F_, 2
note G_, 2
callchannel .sub3
callchannel .sub5
sound_call .sub3
sound_call .sub5
octave 3
note F_, 2
octave 2
note A#, 2
octave 3
note G#, 2
callchannel .sub4
sound_call .sub4
note C_, 2
note G_, 2
note C_, 2
@@ -763,13 +764,13 @@ Music_JohtoGymBattle_Ch3:
note G_, 2
note F_, 2
note G_, 2
callchannel .sub6
note __, 2
callchannel .sub7
sound_call .sub6
rest 2
sound_call .sub7
octave 4
note C#, 2
callchannel .sub8
note __, 2
sound_call .sub8
rest 2
note D#, 2
note A#, 2
octave 4
@@ -783,11 +784,11 @@ Music_JohtoGymBattle_Ch3:
note D#, 2
octave 4
note D#, 2
callchannel .sub6
sound_call .sub6
note G_, 2
callchannel .sub7
sound_call .sub7
note G#, 2
callchannel .sub8
sound_call .sub8
note A_, 2
octave 4
note D#, 2
@@ -801,7 +802,7 @@ Music_JohtoGymBattle_Ch3:
octave 4
note D#, 2
note D_, 4
callchannel .sub9
sound_call .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -812,7 +813,7 @@ Music_JohtoGymBattle_Ch3:
note A_, 2
note D#, 2
note G#, 2
callchannel .sub9
sound_call .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -821,7 +822,7 @@ Music_JohtoGymBattle_Ch3:
note A_, 2
note G#, 2
note F#, 2
callchannel .sub10
sound_call .sub10
note C#, 2
note F#, 2
note C#, 2
@@ -832,7 +833,7 @@ Music_JohtoGymBattle_Ch3:
note A_, 2
note C#, 2
note G_, 2
callchannel .sub10
sound_call .sub10
note C#, 2
note F#, 2
note C#, 2
@@ -841,7 +842,7 @@ Music_JohtoGymBattle_Ch3:
note D#, 2
note E_, 2
note A_, 2
callchannel .sub9
sound_call .sub9
note D#, 2
note G#, 2
note D#, 2
@@ -878,7 +879,7 @@ Music_JohtoGymBattle_Ch3:
note F#, 2
note E_, 2
note F#, 2
callchannel .sub11
sound_call .sub11
note F_, 2
note C_, 2
note D#, 2
@@ -887,7 +888,7 @@ Music_JohtoGymBattle_Ch3:
note D#, 2
note C#, 2
note D#, 2
callchannel .sub11
sound_call .sub11
note F_, 2
note C_, 2
note D#, 2
@@ -896,7 +897,7 @@ Music_JohtoGymBattle_Ch3:
note F#, 2
note F_, 2
note D#, 2
loopchannel 0, .mainloop
sound_loop 0, .mainloop
.sub1:
note G_, 2
@@ -915,28 +916,28 @@ Music_JohtoGymBattle_Ch3:
note F_, 2
note D#, 2
note F_, 2
endchannel
sound_ret
.sub2:
.sub2loop1:
note D_, 2
note G_, 2
loopchannel 4, .sub2loop1
endchannel
sound_loop 4, .sub2loop1
sound_ret
.sub3:
.sub3loop1:
note C#, 2
note G#, 2
loopchannel 4, .sub3loop1
endchannel
sound_loop 4, .sub3loop1
sound_ret
.sub4:
.sub4loop1:
note C_, 2
note G_, 2
loopchannel 4, .sub4loop1
endchannel
sound_loop 4, .sub4loop1
sound_ret
.sub5:
octave 2
@@ -949,7 +950,7 @@ Music_JohtoGymBattle_Ch3:
note F_, 2
octave 2
note A#, 2
endchannel
sound_ret
.sub6:
octave 3
@@ -964,7 +965,7 @@ Music_JohtoGymBattle_Ch3:
note C_, 2
octave 3
note C_, 2
endchannel
sound_ret
.sub7:
note C#, 2
@@ -978,7 +979,7 @@ Music_JohtoGymBattle_Ch3:
note C#, 2
octave 3
note C#, 2
endchannel
sound_ret
.sub8:
octave 3
@@ -993,22 +994,22 @@ Music_JohtoGymBattle_Ch3:
note D_, 2
octave 3
note D_, 2
endchannel
sound_ret
.sub9:
.sub9loop1:
octave 3
note D#, 2
note G#, 2
loopchannel 4, .sub9loop1
endchannel
sound_loop 4, .sub9loop1
sound_ret
.sub10:
.sub10loop1:
note C#, 2
note F#, 2
loopchannel 4, .sub10loop1
endchannel
sound_loop 4, .sub10loop1
sound_ret
.sub11:
note F_, 2
@@ -1019,4 +1020,4 @@ Music_JohtoGymBattle_Ch3:
note F#, 2
note F_, 2
note D#, 2
endchannel
sound_ret