Merge branch 'master' into audio-macros

audio/music/lookmysticalman.asm

@@ -1,98 +1,99 @@
 Music_LookMysticalMan:
-	musicheader 4, 1, Music_LookMysticalMan_Ch1
-	musicheader 1, 2, Music_LookMysticalMan_Ch2
-	musicheader 1, 3, Music_LookMysticalMan_Ch3
-	musicheader 1, 4, Music_LookMysticalMan_Ch4
+	channel_count 4
+	channel 1, Music_LookMysticalMan_Ch1
+	channel 2, Music_LookMysticalMan_Ch2
+	channel 3, Music_LookMysticalMan_Ch3
+	channel 4, Music_LookMysticalMan_Ch4
 
 Music_LookMysticalMan_Ch1:
 	tempo 136
-	volume $77
-	vibrato $a, $34
-	tone $0001
-	stereopanning $f
-	notetype $c, $b3
-	note __, 8
+	volume 7, 7
+	vibrato 10, 3, 4
+	pitch_offset 1
+	stereo_panning FALSE, TRUE
+	note_type 12, 11, 3
+	rest 8
 .mainloop:
-	dutycycle $3
-	notetype $6, $96
+	duty_cycle 3
+	note_type 6, 9, 6
 	octave 3
 	note F#, 1
-	note __, 1
+	rest 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note E_, 2
 	note F#, 2
-	note __, 4
+	rest 4
 	note F#, 2
-	note __, 9
-	note __, 9
+	rest 9
+	rest 9
 	note E_, 1
-	note __, 1
+	rest 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note D_, 2
 	note E_, 2
-	note __, 4
+	rest 4
 	note E_, 2
-	note __, 9
-	note __, 9
+	rest 9
+	rest 9
 	note E_, 1
-	note __, 1
+	rest 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note C#, 2
 	note E_, 2
-	note __, 4
+	rest 4
 	note E_, 2
-	note __, 9
-	note __, 9
+	rest 9
+	rest 9
 	note E_, 1
-	note __, 1
+	rest 1
 	note E_, 1
-	note __, 1
+	rest 1
 	note C#, 2
 	note E_, 2
-	note __, 3
+	rest 3
 	note F_, 1
 	note F#, 4
-	note __, 4
+	rest 4
 	note E_, 4
-	note __, 4
+	rest 4
 	note C#, 4
-	dutycycle $2
-	callchannel .sub1
+	duty_cycle 2
+	sound_call .sub1
 	octave 4
 	note C#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note B_, 2
-	note __, 2
+	rest 2
 	note A#, 2
 	octave 4
 	note C#, 6
-	note __, 4
+	rest 4
 	octave 3
 	note F#, 4
-	note __, 4
+	rest 4
 	note E_, 4
-	callchannel .sub1
+	sound_call .sub1
 	octave 4
 	note C#, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note A#, 2
 	note B_, 6
 	note A#, 4
 	note F#, 4
-	intensity $a5
-	dutycycle $0
+	volume_envelope 10, 5
+	duty_cycle 0
 	octave 4
 	note F#, 2
 	note A#, 6
-	dutycycle $2
-	intensity $72
+	duty_cycle 2
+	volume_envelope 7, 2
 .loop1:
 	octave 5
 	note D_, 2
@@ -100,7 +101,7 @@ Music_LookMysticalMan_Ch1:
 	note B_, 2
 	note F#, 2
 	note D_, 2
-	loopchannel 4, .loop1
+	sound_loop 4, .loop1
 	octave 5
 	note D_, 2
 	octave 4
@@ -131,7 +132,7 @@ Music_LookMysticalMan_Ch1:
 	note E_, 2
 	octave 3
 	note B_, 2
-	loopchannel 4, .loop2
+	sound_loop 4, .loop2
 	octave 5
 	note C#, 2
 	octave 4
@@ -154,222 +155,222 @@ Music_LookMysticalMan_Ch1:
 	note E_, 2
 	note F#, 2
 	note A#, 2
-	loopchannel 0, .mainloop
+	sound_loop 0, .mainloop
 
 .sub1:
 	note D_, 16
 	octave 4
 	note D_, 2
-	note __, 2
+	rest 2
 	note E_, 2
-	note __, 2
+	rest 2
 	note F#, 2
 	note D_, 6
 	octave 3
 	note E_, 16
 	note B_, 2
-	note __, 2
+	rest 2
 	octave 4
 	note C#, 2
-	note __, 2
+	rest 2
 	note D_, 2
 	octave 3
 	note B_, 6
 	octave 4
 	note E_, 2
-	note __, 2
+	rest 2
 	note E_, 2
-	note __, 2
+	rest 2
 	note D_, 2
 	note C#, 6
 	note C#, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note B_, 2
 	note A_, 6
-	endchannel
+	sound_ret
 
 Music_LookMysticalMan_Ch2:
-	dutycycle $3
-	vibrato $a, $34
-	notetype $c, $b3
-	note __, 8
+	duty_cycle 3
+	vibrato 10, 3, 4
+	note_type 12, 11, 3
+	rest 8
 .mainloop:
-	stereopanning $f0
-	notetype $6, $b8
+	stereo_panning TRUE, FALSE
+	note_type 6, 11, 8
 	octave 3
 	note B_, 1
-	note __, 1
+	rest 1
 	note B_, 1
-	note __, 1
+	rest 1
 	note A_, 2
 	note B_, 2
-	note __, 4
+	rest 4
 	note B_, 2
-	note __, 6
-	stereopanning $ff
+	rest 6
+	stereo_panning TRUE, TRUE
 	note B_, 8
 	note A_, 4
-	stereopanning $f0
+	stereo_panning TRUE, FALSE
 	note G#, 1
-	note __, 1
+	rest 1
 	note G#, 1
-	note __, 1
+	rest 1
 	note F#, 2
 	note G#, 2
-	note __, 4
+	rest 4
 	note G#, 2
-	note __, 6
-	stereopanning $ff
+	rest 6
+	stereo_panning TRUE, TRUE
 	note F#, 8
 	note G#, 4
-	stereopanning $f0
+	stereo_panning TRUE, FALSE
 	note A_, 1
-	note __, 1
+	rest 1
 	note A_, 1
-	note __, 1
+	rest 1
 	note G_, 2
 	note A_, 2
-	note __, 4
+	rest 4
 	note A_, 2
-	note __, 6
-	stereopanning $ff
+	rest 6
+	stereo_panning TRUE, TRUE
 	note A_, 8
 	note G_, 4
-	stereopanning $f0
+	stereo_panning TRUE, FALSE
 	note F#, 1
-	note __, 1
+	rest 1
 	note F#, 1
-	note __, 1
+	rest 1
 	note E_, 2
 	note F#, 2
-	note __, 3
+	rest 3
 	note A_, 1
 	note A#, 4
-	note __, 4
+	rest 4
 	note F#, 4
-	note __, 4
+	rest 4
 	note E_, 4
-	callchannel .sub1
+	sound_call .sub1
 	note F#, 2
-	note __, 2
+	rest 2
 	note E_, 2
-	note __, 2
+	rest 2
 	note D_, 2
 	note E_, 6
-	callchannel .sub2
-	callchannel .sub1
+	sound_call .sub2
+	sound_call .sub1
 	note F#, 2
-	note __, 2
+	rest 2
 	note F#, 2
-	note __, 2
+	rest 2
 	note E_, 2
 	note D_, 6
-	callchannel .sub2
-	notetype $c, $b7
+	sound_call .sub2
+	note_type 12, 11, 7
 	note B_, 2
-	note __, 2
+	rest 2
 	note B_, 2
-	note __, 2
+	rest 2
 	octave 4
 	note D_, 2
-	note __, 1
+	rest 1
 	note C#, 2
-	note __, 1
+	rest 1
 	octave 3
 	note B_, 16
-	note __, 2
+	rest 2
 	note B_, 2
-	note __, 2
+	rest 2
 	octave 4
 	note D_, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 1
+	rest 1
 	octave 3
 	note B_, 2
-	note __, 1
+	rest 1
 	note A#, 16
-	note __, 2
-	loopchannel 0, .mainloop
+	rest 2
+	sound_loop 0, .mainloop
 
 .sub1:
 	note B_, 2
-	note __, 2
+	rest 2
 	octave 4
 	note D_, 2
-	note __, 2
+	rest 2
 	note F#, 2
 	note A_, 6
 	note B_, 8
-	note __, 2
+	rest 2
 	note A_, 2
 	note B_, 2
 	octave 5
 	note C#, 2
 	note D_, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 2
+	rest 2
 	note D_, 2
 	note C#, 6
 	octave 4
 	note B_, 12
-	intensity $88
+	volume_envelope 8, 8
 	note A#, 1
 	note A_, 1
-	intensity $68
+	volume_envelope 6, 8
 	note G#, 1
 	note F#, 1
-	intensity $b8
+	volume_envelope 11, 8
 	octave 5
 	note C#, 2
-	note __, 2
+	rest 2
 	note C#, 2
-	note __, 2
+	rest 2
 	octave 4
 	note B_, 2
 	note A_, 6
 	note G_, 2
-	note __, 2
+	rest 2
 	note G_, 2
-	note __, 2
+	rest 2
 	note F#, 2
 	note E_, 6
-	endchannel
+	sound_ret
 
 .sub2:
 	note C#, 8
-	intensity $88
+	volume_envelope 8, 8
 	note C_, 1
 	octave 3
 	note B_, 1
 	note A#, 1
-	intensity $68
+	volume_envelope 6, 8
 	note G#, 1
 	note F#, 1
-	intensity $48
+	volume_envelope 4, 8
 	note E_, 1
 	note C#, 1
-	note __, 1
-	intensity $b8
-	endchannel
+	rest 1
+	volume_envelope 11, 8
+	sound_ret
 
 Music_LookMysticalMan_Ch3:
-	notetype $6, $16
-	note __, 16
+	note_type 6, 1, 6
+	rest 16
 .mainloop:
 	octave 2
 	note B_, 4
 	octave 3
 	note A_, 2
-	note __, 2
+	rest 2
 	note F#, 4
 	octave 2
 	note B_, 1
-	note __, 1
+	rest 1
 	note B_, 4
 	note A_, 2
 	note B_, 2
@@ -385,10 +386,10 @@ Music_LookMysticalMan_Ch3:
 	note F#, 2
 	note E_, 4
 	note G#, 2
-	note __, 2
+	rest 2
 	note B_, 4
 	note E_, 1
-	note __, 1
+	rest 1
 	note E_, 6
 	octave 2
 	note A#, 2
@@ -397,11 +398,11 @@ Music_LookMysticalMan_Ch3:
 	note A_, 4
 	octave 3
 	note G_, 2
-	note __, 2
+	rest 2
 	note E_, 4
 	octave 2
 	note A_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note G_, 2
 	note A_, 2
@@ -419,66 +420,66 @@ Music_LookMysticalMan_Ch3:
 	octave 2
 	note F#, 4
 	note A#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note C#, 4
 	octave 2
 	note F#, 1
-	note __, 1
+	rest 1
 	note F#, 6
 	note G#, 4
-	note __, 4
+	rest 4
 	note A#, 4
 	note B_, 4
 	octave 3
 	note A_, 2
-	note __, 2
+	rest 2
 	note F#, 4
 	octave 2
 	note B_, 1
-	note __, 1
+	rest 1
 	note B_, 6
 	octave 3
 	note D_, 2
-	note __, 2
+	rest 2
 	note F#, 2
 	note D_, 6
 	note E_, 4
 	note G#, 2
-	note __, 2
+	rest 2
 	note B_, 4
 	note E_, 1
-	note __, 1
+	rest 1
 	note E_, 6
 	note D_, 2
-	note __, 2
+	rest 2
 	octave 2
 	note B_, 2
 	note G#, 6
 	note A_, 4
 	octave 3
 	note C#, 2
-	note __, 2
+	rest 2
 	note E_, 4
 	octave 2
 	note A_, 1
-	note __, 1
+	rest 1
 	note A_, 6
 	octave 3
 	note E_, 4
 	note C#, 2
 	octave 2
 	note E_, 6
-	loopchannel 2, .loop1
+	sound_loop 2, .loop1
 	note F#, 4
 	note A#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note C#, 2
 	note F#, 6
 	octave 2
 	note F#, 2
-	note __, 2
+	rest 2
 	octave 3
 	note C#, 4
 	octave 2
@@ -501,11 +502,11 @@ Music_LookMysticalMan_Ch3:
 	octave 2
 	note B_, 4
 	note A_, 4
-	note __, 2
+	rest 2
 	note A#, 4
-	note __, 2
+	rest 2
 	note B_, 6
-	note __, 2
+	rest 2
 	note B_, 4
 	note A_, 4
 	note F#, 4
@@ -523,87 +524,87 @@ Music_LookMysticalMan_Ch3:
 	octave 3
 	note E_, 4
 	note F#, 4
-	note __, 2
+	rest 2
 	note E_, 4
-	note __, 2
+	rest 2
 	note C#, 8
 	octave 2
 	note B_, 8
 	note A#, 4
-	loopchannel 0, .mainloop
+	sound_loop 0, .mainloop
 
 Music_LookMysticalMan_Ch4:
-	togglenoise $3
-	notetype $c
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D_, 1
-	note D_, 1
+	toggle_noise 3
+	drum_speed 12
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 .mainloop:
 .loop1:
-	callchannel .sub1
-	callchannel .sub2
-	callchannel .sub1
-	callchannel .sub3
-	loopchannel 2, .loop1
-	callchannel .sub1
-	callchannel .sub2
-	callchannel .sub1
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 1
-	note D_, 1
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D_, 1
-	note D_, 1
+	sound_call .sub1
+	sound_call .sub2
+	sound_call .sub1
+	sound_call .sub3
+	sound_loop 2, .loop1
+	sound_call .sub1
+	sound_call .sub2
+	sound_call .sub1
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 3, 1
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
 .loop2:
-	note D_, 2
-	note D#, 2
-	note D_, 3
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 3
-	note D#, 1
-	note D#, 2
-	note D_, 2
-	note D_, 2
-	note D_, 1
-	note D_, 1
-	loopchannel 2, .loop2
-	loopchannel 0, .mainloop
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 3
+	drum_note 4, 1
+	drum_note 4, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 3
+	drum_note 4, 1
+	drum_note 4, 2
+	drum_note 3, 2
+	drum_note 3, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	sound_loop 2, .loop2
+	sound_loop 0, .mainloop
 
 .sub1:
-	note D#, 4
-	note D_, 3
-	note D#, 3
-	note D#, 2
-	note D_, 4
-	endchannel
+	drum_note 4, 4
+	drum_note 3, 3
+	drum_note 4, 3
+	drum_note 4, 2
+	drum_note 3, 4
+	sound_ret
 
 .sub2:
-	note D#, 4
-	note D_, 3
-	note D_, 3
-	note D#, 2
-	note D_, 4
-	endchannel
+	drum_note 4, 4
+	drum_note 3, 3
+	drum_note 3, 3
+	drum_note 4, 2
+	drum_note 3, 4
+	sound_ret
 
 .sub3:
-	note D#, 4
-	note D_, 2
-	note D#, 1
-	note D_, 3
-	note D_, 2
-	note D#, 2
-	note D_, 1
-	note D_, 1
-	endchannel
+	drum_note 4, 4
+	drum_note 3, 2
+	drum_note 4, 1
+	drum_note 3, 3
+	drum_note 3, 2
+	drum_note 4, 2
+	drum_note 3, 1
+	drum_note 3, 1
+	sound_ret