Update audio macros and arguments

and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
This commit is contained in:
dannye
2019-09-02 03:40:58 -05:00
parent abee217ce0
commit fc051f2130
115 changed files with 18560 additions and 18044 deletions

View File

@@ -1,24 +1,25 @@
Music_CeladonCity:
musicheader 3, 1, Music_CeladonCity_Ch1
musicheader 1, 2, Music_CeladonCity_Ch2
musicheader 1, 3, Music_CeladonCity_Ch3
channel_count 3
channel 1, Music_CeladonCity_Ch1
channel 2, Music_CeladonCity_Ch2
channel 3, Music_CeladonCity_Ch3
Music_CeladonCity_Ch1:
tempo 146
volume $77
tone $0001
volume 7, 7
pitch_offset 1
Music_CeladonCity_branch_f436c:
stereopanning $f
notetype $c, $a6
stereo_panning 0, 1
note_type 12, 10, 6
octave 3
note A_, 7
intensity $a1
volume_envelope 10, 1
note G#, 1
note A_, 1
note D_, 3
note E_, 2
note F#, 2
callchannel Music_CeladonCity_branch_f43cc
sound_call Music_CeladonCity_branch_f43cc
Music_CeladonCity_branch_f437d:
note D_, 2
note F#, 1
@@ -27,7 +28,7 @@ Music_CeladonCity_branch_f437d:
note F#, 1
note A_, 1
note F#, 1
loopchannel 3, Music_CeladonCity_branch_f437d
sound_loop 3, Music_CeladonCity_branch_f437d
note D_, 2
note G_, 1
note B_, 1
@@ -37,7 +38,7 @@ Music_CeladonCity_branch_f437d:
octave 3
note B_, 1
note G_, 1
callchannel Music_CeladonCity_branch_f43cc
sound_call Music_CeladonCity_branch_f43cc
note D_, 1
note C#, 1
note D_, 1
@@ -51,8 +52,8 @@ Music_CeladonCity_branch_f437d:
note F#, 2
note E_, 2
note F#, 16
callchannel Music_CeladonCity_branch_f43e1
callchannel Music_CeladonCity_branch_f43fe
sound_call Music_CeladonCity_branch_f43e1
sound_call Music_CeladonCity_branch_f43fe
octave 2
note B_, 2
note A#, 1
@@ -72,8 +73,8 @@ Music_CeladonCity_branch_f437d:
octave 3
note B_, 1
note A_, 1
callchannel Music_CeladonCity_branch_f43e1
callchannel Music_CeladonCity_branch_f43fe
sound_call Music_CeladonCity_branch_f43e1
sound_call Music_CeladonCity_branch_f43fe
note D_, 2
note C#, 1
note D_, 1
@@ -82,7 +83,7 @@ Music_CeladonCity_branch_f437d:
note A_, 1
note G_, 1
note A_, 8
loopchannel 0, Music_CeladonCity_branch_f436c
sound_loop 0, Music_CeladonCity_branch_f436c
Music_CeladonCity_branch_f43cc:
note D_, 2
@@ -92,7 +93,7 @@ Music_CeladonCity_branch_f43cc:
note G_, 1
note B_, 1
note G_, 1
loopchannel 3, Music_CeladonCity_branch_f43cc
sound_loop 3, Music_CeladonCity_branch_f43cc
note D_, 2
note F#, 1
note A_, 1
@@ -102,7 +103,7 @@ Music_CeladonCity_branch_f43cc:
note D_, 1
octave 3
note A_, 1
endchannel
sound_ret
Music_CeladonCity_branch_f43e1:
octave 2
@@ -110,7 +111,7 @@ Music_CeladonCity_branch_f43e1:
note B_, 1
octave 3
note D_, 1
loopchannel 4, Music_CeladonCity_branch_f43e1
sound_loop 4, Music_CeladonCity_branch_f43e1
note C_, 2
octave 2
note B_, 1
@@ -130,20 +131,20 @@ Music_CeladonCity_branch_f43e1:
note D_, 1
octave 3
note B_, 1
endchannel
sound_ret
Music_CeladonCity_branch_f43fe:
note D_, 2
note F#, 1
note A_, 1
loopchannel 4, Music_CeladonCity_branch_f43fe
endchannel
sound_loop 4, Music_CeladonCity_branch_f43fe
sound_ret
Music_CeladonCity_Ch2:
vibrato $12, $34
dutycycle $2
stereopanning $f0
notetype $c, $b7
vibrato 18, 3, 4
duty_cycle 2
stereo_panning 1, 0
note_type 12, 11, 7
octave 4
note D_, 1
note C#, 1
@@ -155,7 +156,7 @@ Music_CeladonCity_Ch2:
note G_, 1
note A_, 8
Music_CeladonCity_branch_f441a:
callchannel Music_CeladonCity_branch_f4463
sound_call Music_CeladonCity_branch_f4463
note A_, 4
note F#, 4
note A_, 2
@@ -168,8 +169,8 @@ Music_CeladonCity_branch_f441a:
note B_, 2
note G_, 4
note B_, 4
callchannel Music_CeladonCity_branch_f4463
intensity $c1
sound_call Music_CeladonCity_branch_f4463
volume_envelope 12, 1
note A_, 2
note G_, 2
note F#, 2
@@ -183,13 +184,13 @@ Music_CeladonCity_branch_f441a:
note E_, 1
note F#, 1
note A_, 1
intensity $b3
volume_envelope 11, 3
octave 5
note D_, 6
intensity $a2
volume_envelope 10, 2
octave 1
note F#, 2
callchannel Music_CeladonCity_branch_f4474
sound_call Music_CeladonCity_branch_f4474
octave 1
note G_, 3
note B_, 1
@@ -199,23 +200,23 @@ Music_CeladonCity_branch_f441a:
octave 1
note A_, 6
note F#, 2
callchannel Music_CeladonCity_branch_f4474
sound_call Music_CeladonCity_branch_f4474
octave 1
note A_, 3
octave 2
note D_, 1
note A_, 4
note D_, 6
intensity $97
volume_envelope 9, 7
octave 4
note F#, 1
note A_, 1
octave 5
note D_, 16
loopchannel 0, Music_CeladonCity_branch_f441a
sound_loop 0, Music_CeladonCity_branch_f441a
Music_CeladonCity_branch_f4463:
intensity $b2
volume_envelope 11, 2
octave 4
note B_, 4
note G_, 4
@@ -230,7 +231,7 @@ Music_CeladonCity_branch_f4463:
octave 4
note B_, 2
note A_, 8
endchannel
sound_ret
Music_CeladonCity_branch_f4474:
note G_, 3
@@ -262,66 +263,66 @@ Music_CeladonCity_branch_f4474:
octave 2
note D_, 2
note F#, 4
endchannel
sound_ret
Music_CeladonCity_Ch3:
vibrato $12, $24
vibrato 18, 2, 4
Music_CeladonCity_branch_f4495:
notetype $c, $25
note_type 12, 2, 5
octave 3
note A_, 2
note __, 2
rest 2
note F#, 2
note __, 2
rest 2
note D_, 8
callchannel Music_CeladonCity_branch_f44fd
sound_call Music_CeladonCity_branch_f44fd
Music_CeladonCity_branch_f44a1:
octave 2
note A_, 2
note __, 2
rest 2
octave 3
note D_, 4
loopchannel 3, Music_CeladonCity_branch_f44a1
sound_loop 3, Music_CeladonCity_branch_f44a1
octave 2
note G_, 1
note __, 1
rest 1
note B_, 1
note __, 1
rest 1
octave 3
note D_, 3
octave 2
note F#, 1
callchannel Music_CeladonCity_branch_f44fd
sound_call Music_CeladonCity_branch_f44fd
note A_, 1
note __, 1
rest 1
octave 3
note D_, 1
note __, 1
rest 1
octave 3
note F#, 3
octave 2
note G#, 1
note A_, 1
note __, 1
rest 1
octave 3
note C#, 1
note __, 1
rest 1
note E_, 2
note C#, 2
note D_, 2
note __, 6
rest 6
octave 2
note A_, 2
note __, 6
intensity $10
callchannel Music_CeladonCity_branch_f4510
rest 6
volume_envelope 1, 0
sound_call Music_CeladonCity_branch_f4510
octave 5
note E_, 2
note __, 2
rest 2
note F#, 2
note __, 2
rest 2
note D_, 4
note __, 4
rest 4
note C_, 8
octave 4
note A_, 2
@@ -330,19 +331,19 @@ Music_CeladonCity_branch_f44a1:
note C_, 2
note D_, 2
note E_, 2
note __, 2
rest 2
note D_, 2
note E_, 2
note D_, 4
note __, 4
callchannel Music_CeladonCity_branch_f4510
rest 4
sound_call Music_CeladonCity_branch_f4510
octave 5
note E_, 2
note __, 2
rest 2
note D_, 2
note E_, 2
note D_, 4
note __, 4
rest 4
note C_, 8
note A_, 2
note G_, 2
@@ -353,26 +354,26 @@ Music_CeladonCity_branch_f44a1:
note D_, 2
note E_, 2
note D_, 2
note __, 6
loopchannel 0, Music_CeladonCity_branch_f4495
rest 6
sound_loop 0, Music_CeladonCity_branch_f4495
Music_CeladonCity_branch_f44fd:
octave 2
note G_, 2
note __, 2
rest 2
octave 3
note D_, 4
loopchannel 3, Music_CeladonCity_branch_f44fd
sound_loop 3, Music_CeladonCity_branch_f44fd
octave 2
note A_, 1
note __, 1
rest 1
octave 3
note D_, 1
note __, 1
rest 1
note F#, 3
octave 2
note G#, 1
endchannel
sound_ret
Music_CeladonCity_branch_f4510:
octave 5
@@ -382,4 +383,5 @@ Music_CeladonCity_branch_f4510:
note B_, 2
note A_, 2
note B_, 2
endchannel
sound_ret