Merge branch 'master' of https://github.com/pret/pokered

crysaudio/music/RBY/introbattle.asm

@@ -1,336 +1,337 @@
 Music_IntroBattle::
-	musicheader 4, 1, Music_IntroBattle_Ch0
-	musicheader 1, 2, Music_IntroBattle_Ch1
-	musicheader 1, 3, Music_IntroBattle_Ch2
-	musicheader 1, 4, Music_IntroBattle_Ch3
-
-Music_IntroBattle_Ch0::
-	tempo 98
-	volume $77
-	dutycycle 3
-	vibrato 6, $34
-	;toggleperfectpitch
-	notetype 12, $b1
-	note __, 8
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D_, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D#, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D_, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $a0
-	note A#, 4
-	notetype 12, $b1
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D_, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $29
-	octave 3
-	note G_, 4
-	notetype 12, $b0
-	note A_, 8
-	octave 2
-	note A_, 8
-	notetype 12, $b7
-	octave 3
-	note F_, 8
-	notetype 12, $4f
-	octave 2
-	note F_, 8
-	notetype 12, $b1
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D_, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note D#, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note F_, 4
-	notetype 12, $b1
-	octave 2
-	note A_, 2
-	note A_, 2
-	notetype 12, $b4
-	octave 3
-	note G_, 4
-	notetype 12, $b0
-	note F#, 16
-	notetype 12, $b1
-	octave 4
-	note D_, 16
-	endchannel
-
+	channel_count 4
+	channel 1, Music_IntroBattle_Ch1
+	channel 2, Music_IntroBattle_Ch2
+	channel 3, Music_IntroBattle_Ch3
+	channel 4, Music_IntroBattle_Ch4
 
 Music_IntroBattle_Ch1::
-	dutycycle 3
-	vibrato 8, $25
-	notetype 12, $c2
-	note __, 8
+	tempo 98
+	volume 7, 7
+	duty_cycle 3
+	vibrato 6, 3, 4
+	;toggle_perfect_pitch
+	note_type 12, 11, 1
+	rest 8
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	note A_, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
+	note D_, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
+	octave 3
+	note D#, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
+	octave 3
+	note D_, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 10, 0
 	note A#, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	note A_, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $b7
-	note C#, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	note A_, 4
-	notetype 12, $c2
+	note_type 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	note D_, 2
-	note D_, 2
-	notetype 12, $c7
-	octave 4
-	note C#, 4
-	note D_, 8
+	note D_, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 2, -1
 	octave 3
-	note D_, 8
-	octave 4
-	note C_, 8
+	note G_, 4
+	note_type 12, 11, 0
+	note A_, 8
+	octave 2
+	note A_, 8
+	note_type 12, 11, 7
 	octave 3
-	note C_, 8
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	note A_, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	note A#, 4
-	notetype 12, $c2
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
-	octave 4
-	note C_, 4
-	notetype 12, $c2
+	note F_, 8
+	note_type 12, 4, -7
+	octave 2
+	note F_, 8
+	note_type 12, 11, 1
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
 	octave 3
-	note D_, 2
-	note D_, 2
-	notetype 12, $c5
+	note D_, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
+	octave 3
+	note D#, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
+	octave 3
+	note F_, 4
+	note_type 12, 11, 1
+	octave 2
+	note A_, 2
+	note A_, 2
+	note_type 12, 11, 4
+	octave 3
+	note G_, 4
+	note_type 12, 11, 0
+	note F#, 16
+	note_type 12, 11, 1
 	octave 4
-	note C#, 4
-	notetype 12, $2f
 	note D_, 16
-	notetype 12, $c1
-	octave 5
-	note D_, 16
-	endchannel
+	sound_ret
 
 
 Music_IntroBattle_Ch2::
-	notetype 12, $10
-	note __, 8
+	duty_cycle 3
+	vibrato 8, 2, 5
+	note_type 12, 12, 2
+	rest 8
+	octave 3
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 11, 7
+	note C#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	octave 3
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 7
+	octave 4
+	note C#, 4
+	note D_, 8
+	octave 3
+	note D_, 8
+	octave 4
+	note C_, 8
+	octave 3
+	note C_, 8
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A_, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	note A#, 4
+	note_type 12, 12, 2
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	octave 4
+	note C_, 4
+	note_type 12, 12, 2
+	octave 3
+	note D_, 2
+	note D_, 2
+	note_type 12, 12, 5
+	octave 4
+	note C#, 4
+	note_type 12, 2, -7
+	note D_, 16
+	note_type 12, 12, 1
+	octave 5
+	note D_, 16
+	sound_ret
+
+
+Music_IntroBattle_Ch3::
+	note_type 12, 1, 0
+	rest 8
 	octave 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note F#, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A#, 4
 	note A_, 8
 	note D_, 8
 	note A#, 8
 	note D_, 8
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A_, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A#, 4
 	note D_, 1
-	note __, 1
+	rest 1
 	note D_, 1
-	note __, 1
+	rest 1
 	note A#, 4
 	note A_, 16
 	note D_, 1
-	note __, 15
-	endchannel
+	rest 15
+	sound_ret
 
 
-Music_IntroBattle_Ch3::
-	togglenoise 1
-	notetype 6
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 1
-	note A_, 1
-	note A_, 4
-	note A_, 4
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 4
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 4
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 4
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A_, 16
-	note A_, 16
-	note A_, 16
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 1
-	note A_, 4
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 4
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A#, 1
-	note A_, 4
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 8
-	note A_, 4
-	note A_, 16
-	note A_, 16
-	note A_, 2
-	note __, 16
-	note __, 14
-	endchannel
+Music_IntroBattle_Ch4::
+	toggle_noise 1
+	drum_speed 6
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 1
+	drum_note 10, 1
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 16
+	drum_note 10, 16
+	drum_note 10, 16
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 1
+	drum_note 10, 1
+	drum_note 10, 1
+	drum_note 10, 1
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 12, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 11, 1
+	drum_note 10, 4
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 8
+	drum_note 10, 4
+	drum_note 10, 16
+	drum_note 10, 16
+	drum_note 10, 2
+	rest 16
+	rest 14
+	sound_ret