Merge branch 'master' into audio-macros

audio/music/violetcity.asm

@@ -1,40 +1,41 @@
 Music_VioletCity:
-	musicheader 4, 1, Music_VioletCity_Ch1
-	musicheader 1, 2, Music_VioletCity_Ch2
-	musicheader 1, 3, Music_VioletCity_Ch3
-	musicheader 1, 4, Music_VioletCity_Ch4
+	channel_count 4
+	channel 1, Music_VioletCity_Ch1
+	channel 2, Music_VioletCity_Ch2
+	channel 3, Music_VioletCity_Ch3
+	channel 4, Music_VioletCity_Ch4
 
 Music_VioletCity_Ch1:
 	tempo 164
-	volume $77
-	vibrato $12, $25
-	dutycycle $2
-	notetype $c, $95
-	note __, 16
-	stereopanning $f0
+	volume 7, 7
+	vibrato 18, 2, 5
+	duty_cycle 2
+	note_type 12, 9, 5
+	rest 16
+	stereo_panning TRUE, FALSE
 	octave 2
 	note E_, 1
 	note G#, 1
 	note B_, 1
-	stereopanning $ff
+	stereo_panning TRUE, TRUE
 	octave 3
 	note D#, 1
 	note G#, 1
-	note __, 1
+	rest 1
 	note A#, 4
 	note G#, 2
 	note F#, 2
 	note C#, 2
-	stereopanning $f
+	stereo_panning FALSE, TRUE
 	octave 2
 	note D#, 1
 	note F#, 1
 	note A#, 1
-	stereopanning $ff
+	stereo_panning TRUE, TRUE
 	octave 3
 	note C#, 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note D#, 4
 	note G#, 2
 	note D#, 2
@@ -46,10 +47,10 @@ Music_VioletCity_Ch1:
 	note B_, 1
 	octave 3
 	note G#, 1
-	note __, 1
+	rest 1
 	octave 2
 	note B_, 4
-	notetype $6, $91
+	note_type 6, 9, 1
 	octave 3
 	note C#, 2
 	note F_, 2
@@ -57,16 +58,16 @@ Music_VioletCity_Ch1:
 	note F_, 2
 	note G#, 2
 	note B_, 2
-	intensity $a4
+	volume_envelope 10, 4
 	octave 2
 	note B_, 8
-	note __, 4
+	rest 4
 	octave 3
 	note C#, 12
-	note __, 8
+	rest 8
 .mainloop:
-	notetype $6, $95
-	note __, 4
+	note_type 6, 9, 5
+	rest 4
 	octave 2
 	note B_, 2
 	octave 3
@@ -75,14 +76,14 @@ Music_VioletCity_Ch1:
 	note D#, 2
 	note E_, 2
 	note D#, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note G#, 2
-	note __, 2
+	rest 2
 	note B_, 2
-	note __, 2
-	stereopanning $f0
+	rest 2
+	stereo_panning TRUE, FALSE
 	octave 4
 	note C#, 2
 	octave 3
@@ -90,22 +91,22 @@ Music_VioletCity_Ch1:
 	note E_, 2
 	octave 4
 	note C#, 2
-	stereopanning $ff
+	stereo_panning TRUE, TRUE
 	note C_, 2
 	octave 3
 	note G#, 2
 	note E_, 2
 	octave 4
 	note C_, 2
-	stereopanning $f
+	stereo_panning FALSE, TRUE
 	octave 3
 	note B_, 2
-	note __, 2
+	rest 2
 	note B_, 2
-	note __, 2
+	rest 2
 	note A#, 8
-	stereopanning $ff
-	note __, 4
+	stereo_panning TRUE, TRUE
+	rest 4
 	note C#, 2
 	note E_, 2
 	note A#, 4
@@ -114,60 +115,60 @@ Music_VioletCity_Ch1:
 	note C#, 2
 	octave 3
 	note A#, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note E_, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 2
-	stereopanning $f
+	rest 2
+	stereo_panning FALSE, TRUE
 	note D#, 8
-	stereopanning $ff
+	stereo_panning TRUE, TRUE
 	note E_, 8
-	stereopanning $f0
+	stereo_panning TRUE, FALSE
 	note F_, 2
-	note __, 2
+	rest 2
 	note F_, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note G_, 4
-	stereopanning $ff
+	stereo_panning TRUE, TRUE
 	note G#, 2
 	note D#, 1
-	note __, 1
+	rest 1
 	octave 2
 	note B_, 1
-	note __, 1
+	rest 1
 	octave 3
 	note D#, 1
-	note __, 1
+	rest 1
 	note B_, 4
 	note G#, 2
 	note G#, 2
 	note A#, 2
-	note __, 2
+	rest 2
 	note A#, 2
-	note __, 2
+	rest 2
 	note D#, 4
 	note F#, 2
-	note __, 2
-	notetype $c, $95
-	note __, 8
+	rest 2
+	note_type 12, 9, 5
+	rest 8
 	octave 4
 	note F_, 3
-	dutycycle $1
-	notetype $6, $75
+	duty_cycle 1
+	note_type 6, 7, 5
 	note G#, 1
 	note B_, 1
 	octave 5
 	note D#, 8
-	notetype $c, $93
-	dutycycle $2
-	note __, 16
-	notetype $6, $91
-	stereopanning $f0
+	note_type 12, 9, 3
+	duty_cycle 2
+	rest 16
+	note_type 6, 9, 1
+	stereo_panning TRUE, FALSE
 	octave 3
 	note E_, 2
 	octave 2
@@ -175,27 +176,27 @@ Music_VioletCity_Ch1:
 	note G#, 2
 	octave 3
 	note E_, 2
-	stereopanning $f
+	stereo_panning FALSE, TRUE
 	octave 2
 	note B_, 2
 	note G#, 2
 	note B_, 2
 	octave 3
 	note E_, 2
-	intensity $a4
-	stereopanning $ff
+	volume_envelope 10, 4
+	stereo_panning TRUE, TRUE
 	note D#, 8
-	note __, 8
-	dutycycle $3
-	intensity $84
-	note __, 4
+	rest 8
+	duty_cycle 3
+	volume_envelope 8, 4
+	rest 4
 	note G_, 2
 	note A_, 2
 	note B_, 4
 	octave 4
 	note D_, 4
 	note C#, 4
-	notetype $8, $84
+	note_type 8, 8, 4
 	octave 3
 	note B_, 1
 	octave 4
@@ -203,36 +204,36 @@ Music_VioletCity_Ch1:
 	octave 3
 	note B_, 1
 	note A_, 3
-	notetype $c, $84
+	note_type 12, 8, 4
 	note F#, 1
-	note __, 1
+	rest 1
 	note F#, 2
 	note C#, 1
-	note __, 1
+	rest 1
 	note F#, 2
 	note D_, 4
 	note E_, 4
 	note F#, 2
 	note B_, 1
-	note __, 1
+	rest 1
 	note B_, 1
 	octave 4
 	note C#, 1
 	note D_, 2
 	note F#, 2
 	note E_, 2
-	notetype $8, $84
+	note_type 8, 8, 4
 	note D_, 1
 	note E_, 1
 	note D_, 1
 	note C#, 3
-	notetype $c, $84
+	note_type 12, 8, 4
 	octave 3
 	note B_, 1
-	note __, 1
+	rest 1
 	note A_, 2
 	note F#, 1
-	note __, 1
+	rest 1
 	note A_, 2
 	octave 4
 	note E_, 4
@@ -245,11 +246,11 @@ Music_VioletCity_Ch1:
 	octave 4
 	note E_, 1
 	note G#, 1
-	note __, 1
+	rest 1
 	note G#, 1
 	note A#, 1
 	note B_, 4
-	note __, 4
+	rest 4
 	note G#, 1
 	note F_, 1
 	octave 3
@@ -257,11 +258,11 @@ Music_VioletCity_Ch1:
 	octave 4
 	note F_, 1
 	note G#, 1
-	note __, 1
+	rest 1
 	note G#, 1
 	note A#, 1
 	note B_, 4
-	note __, 4
+	rest 4
 	note C#, 1
 	octave 3
 	note B_, 1
@@ -285,7 +286,7 @@ Music_VioletCity_Ch1:
 	note A#, 1
 	octave 5
 	note C#, 1
-	dutycycle $2
+	duty_cycle 2
 	octave 4
 	note C#, 6
 	note C_, 1
@@ -293,21 +294,21 @@ Music_VioletCity_Ch1:
 	note B_, 1
 	octave 4
 	note C#, 4
-	note __, 4
-	loopchannel 0, .mainloop
+	rest 4
+	sound_loop 0, .mainloop
 
 Music_VioletCity_Ch2:
-	vibrato $12, $24
-	dutycycle $2
-	notetype $c, $c7
-	note __, 16
+	vibrato 18, 2, 4
+	duty_cycle 2
+	note_type 12, 12, 7
+	rest 16
 	octave 3
 	note G#, 1
-	note __, 1
+	rest 1
 	note A#, 1
-	note __, 1
+	rest 1
 	note B_, 1
-	note __, 1
+	rest 1
 	octave 4
 	note D#, 4
 	note C#, 2
@@ -315,11 +316,11 @@ Music_VioletCity_Ch2:
 	note A#, 2
 	note G#, 2
 	note F#, 1
-	note __, 1
+	rest 1
 	note G#, 1
-	note __, 1
+	rest 1
 	note A#, 1
-	note __, 1
+	rest 1
 	octave 4
 	note C#, 4
 	octave 3
@@ -327,11 +328,11 @@ Music_VioletCity_Ch2:
 	note A#, 2
 	note B_, 2
 	note G#, 1
-	note __, 1
+	rest 1
 	note A#, 1
-	note __, 1
+	rest 1
 	note B_, 1
-	note __, 1
+	rest 1
 	note G#, 4
 	note A#, 2
 	note B_, 2
@@ -342,63 +343,63 @@ Music_VioletCity_Ch2:
 	note F#, 2
 	octave 4
 	note D#, 1
-	note __, 1
+	rest 1
 	note C#, 6
-	note __, 2
+	rest 2
 	note D#, 1
 	note E_, 1
 .mainloop:
-	intensity $b7
+	volume_envelope 11, 7
 	note F#, 4
-	note __, 2
+	rest 2
 	note F#, 1
 	note G#, 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note D#, 1
-	note __, 1
+	rest 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note E_, 14
 	note C#, 1
 	note D#, 1
 	note E_, 4
-	note __, 2
+	rest 2
 	note E_, 1
 	note F#, 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note D#, 1
-	note __, 1
+	rest 1
 	note C#, 1
-	note __, 1
+	rest 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note D#, 12
-	note __, 2
+	rest 2
 	octave 3
 	note B_, 1
 	octave 4
 	note C#, 1
 	note D#, 4
-	note __, 2
+	rest 2
 	note D#, 1
 	note E_, 1
 	note D#, 1
-	note __, 1
+	rest 1
 	note C#, 1
-	note __, 1
+	rest 1
 	octave 3
 	note B_, 2
 	octave 4
 	note C#, 1
-	note __, 1
+	rest 1
 	note D#, 4
 	note G#, 4
 	note B_, 3
-	note __, 3
+	rest 3
 	note C#, 1
 	note D#, 1
 	note E_, 2
@@ -421,41 +422,41 @@ Music_VioletCity_Ch2:
 	note C#, 1
 	octave 3
 	note B_, 12
-	note __, 4
-	intensity $a7
-	dutycycle $3
-	note __, 2
+	rest 4
+	volume_envelope 10, 7
+	duty_cycle 3
+	rest 2
 	note B_, 1
 	octave 4
 	note C#, 1
 	note D_, 2
 	note F#, 2
 	note E_, 2
-	notetype $8, $a7
+	note_type 8, 10, 7
 	note D_, 1
 	note E_, 1
 	note D_, 1
 	note C#, 3
-	notetype $c, $a7
+	note_type 12, 10, 7
 	octave 3
 	note B_, 1
-	note __, 1
+	rest 1
 	note A_, 2
 	note F#, 1
-	note __, 1
+	rest 1
 	note A_, 2
 	octave 4
 	note E_, 4
 	note D_, 4
 	note C#, 2
-	note __, 2
+	rest 2
 	note G_, 1
 	note A_, 1
 	note B_, 2
 	octave 5
 	note D_, 2
 	note C#, 2
-	notetype $8, $a7
+	note_type 8, 10, 7
 	octave 4
 	note B_, 1
 	octave 5
@@ -463,64 +464,64 @@ Music_VioletCity_Ch2:
 	octave 4
 	note B_, 1
 	note A_, 3
-	notetype $c, $a7
+	note_type 12, 10, 7
 	note G_, 1
-	note __, 1
+	rest 1
 	note F#, 2
 	note C#, 1
-	note __, 1
+	rest 1
 	note F#, 2
-	vibrato $0, $0
-	intensity $87
+	vibrato 0, 0, 0
+	volume_envelope 8, 7
 	octave 5
 	note E_, 4
 	note F#, 4
 	note D_, 1
 	note E_, 1
 	note F#, 12
-	note __, 2
+	rest 2
 	note D_, 1
 	note E_, 1
 	note F#, 12
-	note __, 2
+	rest 2
 	octave 4
 	note A#, 1
 	note B_, 1
 	octave 5
 	note C#, 11
-	note __, 5
-	vibrato $12, $24
-	intensity $a7
-	dutycycle $2
+	rest 5
+	vibrato 18, 2, 4
+	volume_envelope 10, 7
+	duty_cycle 2
 	octave 4
 	note A#, 6
 	note A_, 1
 	note G#, 1
 	note F#, 4
-	note __, 2
+	rest 2
 	note D#, 1
 	note E_, 1
-	loopchannel 0, .mainloop
+	sound_loop 0, .mainloop
 
 Music_VioletCity_Ch3:
-	notetype $c, $25
-	note __, 16
-	note __, 6
+	note_type 12, 2, 5
+	rest 16
+	rest 6
 	octave 4
 	note E_, 4
-	note __, 6
-	note __, 6
+	rest 6
+	rest 6
 	octave 3
 	note G#, 4
-	note __, 6
-	note __, 6
+	rest 6
+	rest 6
 	note F_, 4
-	note __, 6
+	rest 6
 	octave 2
 	note F#, 4
 	octave 3
 	note C#, 1
-	note __, 1
+	rest 1
 	note A#, 4
 	note A_, 1
 	note G#, 1
@@ -528,65 +529,65 @@ Music_VioletCity_Ch3:
 	octave 2
 	note A#, 2
 .mainloop:
-	notetype $c, $25
+	note_type 12, 2, 5
 	note B_, 1
-	note __, 5
+	rest 5
 	note B_, 1
 	note B_, 1
-	note __, 2
+	rest 2
 	note B_, 1
-	note __, 1
+	rest 1
 	octave 3
 	note F#, 2
 	octave 2
 	note F#, 1
-	note __, 1
+	rest 1
 	octave 3
 	note C#, 1
-	note __, 5
+	rest 5
 	note C#, 1
 	note C#, 1
-	note __, 2
+	rest 2
 	note C#, 1
-	note __, 1
+	rest 1
 	note G#, 2
 	octave 2
 	note G#, 1
-	note __, 1
+	rest 1
 	note F#, 1
-	note __, 5
+	rest 5
 	note F#, 1
 	note F#, 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note F#, 1
-	note __, 1
+	rest 1
 	octave 3
 	note F#, 2
 	note C#, 1
-	note __, 1
+	rest 1
 	octave 2
 	note B_, 1
-	note __, 5
+	rest 5
 	note B_, 1
 	note B_, 1
-	note __, 2
+	rest 2
 	note B_, 1
-	note __, 1
+	rest 1
 	octave 3
 	note B_, 4
 	note G#, 1
-	note __, 5
+	rest 5
 	note G#, 1
 	note G#, 1
 	note G_, 1
-	note __, 1
+	rest 1
 	note G_, 1
-	note __, 1
+	rest 1
 	note F#, 2
 	note F#, 1
-	note __, 1
-	notetype $6, $25
+	rest 1
+	note_type 6, 2, 5
 	octave 3
 	note C#, 2
 	note F_, 2
@@ -599,82 +600,82 @@ Music_VioletCity_Ch3:
 	note B_, 2
 	octave 4
 	note C#, 6
-	notetype $c, $25
-	note __, 5
-	notetype $6, $25
+	note_type 12, 2, 5
+	rest 5
+	note_type 6, 2, 5
 	octave 2
 	note E_, 2
-	note __, 10
+	rest 10
 	note E_, 2
 	note E_, 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note C#, 4
 	note C_, 4
 	octave 2
 	note B_, 2
-	note __, 10
+	rest 10
 	note B_, 2
 	note B_, 2
-	note __, 4
+	rest 4
 	note B_, 2
-	note __, 2
+	rest 2
 	note A_, 8
-	callchannel .sub1
+	sound_call .sub1
 	note F#, 2
-	note __, 10
+	rest 10
 	note B_, 2
 	note B_, 2
 	note B_, 2
-	note __, 2
+	rest 2
 	note A#, 8
 	note A_, 2
-	note __, 2
-	callchannel .sub1
+	rest 2
+	sound_call .sub1
 	note F#, 2
-	note __, 10
+	rest 10
 	note B_, 2
 	note B_, 2
 	note B_, 2
-	note __, 2
+	rest 2
 	note A#, 8
 	note A_, 2
-	note __, 2
+	rest 2
 	octave 3
 	note E_, 2
-	note __, 10
+	rest 10
 	note E_, 2
 	note E_, 2
-	note __, 4
+	rest 4
 	note E_, 2
-	note __, 2
+	rest 2
 	note B_, 4
 	note G#, 2
 	note F#, 2
 	note F_, 2
-	note __, 10
+	rest 10
 	note F_, 2
 	note F_, 2
-	note __, 4
+	rest 4
 	note F_, 2
-	note __, 2
+	rest 2
 	octave 4
 	note C#, 4
 	octave 3
 	note A#, 2
 	note G#, 2
 	note F#, 2
-	note __, 10
+	rest 10
 	note F#, 2
 	note F#, 2
 	octave 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note F#, 4
 	octave 2
@@ -685,90 +686,90 @@ Music_VioletCity_Ch3:
 	note G#, 2
 	note A_, 2
 	note A#, 8
-	note __, 4
+	rest 4
 	octave 2
 	note A#, 4
-	loopchannel 0, .mainloop
+	sound_loop 0, .mainloop
 
 .sub1:
 	note G_, 2
-	note __, 10
+	rest 10
 	note G_, 2
 	note G_, 2
 	note A_, 2
-	note __, 2
+	rest 2
 	note A_, 2
-	note __, 2
+	rest 2
 	octave 3
 	note E_, 4
 	octave 2
 	note A_, 4
-	endchannel
+	sound_ret
 
 Music_VioletCity_Ch4:
-	togglenoise $3
-	notetype $c
-	note D#, 2
-	note D_, 2
-	note D#, 1
-	note D#, 1
-	note D_, 2
-	note D_, 4
-	note F#, 4
-	callchannel .sub1
-	callchannel .sub1
-	callchannel .sub1
-	note D_, 2
-	note D#, 1
-	note D#, 1
-	note D_, 2
-	note C_, 8
-	note D#, 2
+	toggle_noise 3
+	drum_speed 12
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 3, 4
+	drum_note 7, 4
+	sound_call .sub1
+	sound_call .sub1
+	sound_call .sub1
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 1, 8
+	drum_note 4, 2
 .mainloop:
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	callchannel .sub2
-	loopchannel 0, .mainloop
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_call .sub2
+	sound_loop 0, .mainloop
 
 .sub1:
-	note D_, 1
-	note D_, 1
-	note D#, 1
-	note D#, 1
-	note D_, 2
-	note G_, 2
-	note G_, 1
-	note G_, 1
-	note F#, 2
-	note G_, 1
-	note G_, 1
-	note G_, 1
-	note G_, 1
-	endchannel
+	drum_note 3, 1
+	drum_note 3, 1
+	drum_note 4, 1
+	drum_note 4, 1
+	drum_note 3, 2
+	drum_note 8, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 7, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	sound_ret
 
 .sub2:
-	note D#, 2
-	note G_, 1
-	note G_, 1
-	note G_, 1
-	note __, 1
-	note D#, 1
-	note D#, 1
-	note __, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	endchannel
+	drum_note 4, 2
+	drum_note 8, 1
+	drum_note 8, 1
+	drum_note 8, 1
+	rest 1
+	drum_note 4, 1
+	drum_note 4, 1
+	rest 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 4, 2
+	sound_ret