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

crysaudio/music/TCG/deckmachine.asm

@@ -1,16 +1,14 @@
-Music_TCGDeckMachine:
-	db $C0
-	dw Music_TCGDeckMachine_Ch1
-	db $01
-	dw Music_TCGDeckMachine_Ch2
-	db $02
-	dw Music_TCGDeckMachine_Ch3
-	db $03
-	dw Music_TCGDeckMachine_Ch4
+Music_DeckMachine:
+	channel_count 4
+	channel 1, Music_DeckMachine_Ch1
+	channel 2, Music_DeckMachine_Ch2
+	channel 3, Music_DeckMachine_Ch3
+	channel 4, Music_DeckMachine_Ch4
 
-Music_TCGDeckMachine_Ch1: 
+Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1)
+	;stereo_panning 1, 1
 	notetype2 8
-	dutycycle 3
+	duty_cycle 3
 .MainLoop
 	octave 5
 	notetype0 1
@@ -50,7 +48,7 @@ Music_TCGDeckMachine_Ch1:
 	notetype2 5
 	notetype1 4
 	note G_, 8
-	loopchannel 9, .Loop1
+	sound_loop 9, .Loop1
 	notetype1 9
 	note C_, 7
 	notetype1 3
@@ -58,183 +56,211 @@ Music_TCGDeckMachine_Ch1:
 	notetype1 4
 	note C_, 15
 	notetype0 10
-	note __, 9
-	loopchannel 0, .MainLoop
+	rest 9
+	sound_loop 0, .MainLoop
 
 
-Music_TCGDeckMachine_Ch2: 
+Music_DeckMachine_Ch2: ; f6f41 (3d:6f41)
+	;stereo_panning 1, 1
 	notetype2 8
-	dutycycle 1
+	duty_cycle 1
 	notetype2 7
 .MainLoop
 	octave 3
 	notetype0 1
 .Loop1
-	note __, 15
+	rest 15
 	notetype1 11
-	note __, 7
+	rest 7
 	note C_, 8
 	notetype1 2
 	note C_, 8
-	note __, 7
+	rest 7
 	notetype1 11
 	note C_, 7
 	notetype1 2
 	note C_, 8
-	note __, 7
+	rest 7
 	notetype1 11
 	dec_octave
 	note A_, 8
 	notetype1 2
 	note A_, 8
-	note __, 7
+	rest 7
 	inc_octave
 	notetype1 11
 	note C_, 7
 	notetype1 2
 	note C_, 8
-	note __, 15
-	loopchannel 9, .Loop1
+	rest 15
+	sound_loop 9, .Loop1
 	notetype1 11
 	note E_, 7
 	notetype1 2
 	note E_, 8
-	note __, 15
+	rest 15
 	notetype0 10
-	note __, 9
-	loopchannel 0, .MainLoop
+	rest 9
+	sound_loop 0, .MainLoop
 
 
-Music_TCGDeckMachine_Ch3: 
+Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b)
+	;stereo_panning 1, 1
 	notetype1 1
 	notetype2 11
+	;echo 96
+	;cutoff 8
 .MainLoop
 	octave 3
 	notetype0 1
 .Loop1
 	note C_, 7
-	note __, 8
+	rest 8
 	note G_, 7
 	inc_octave
+	;cutoff 5
 	note G_, 8
-	note __, 7
+	;cutoff 8
+	rest 7
 	dec_octave
 	note C_, 8
 	inc_octave
+	;cutoff 5
 	note E_, 7
 	dec_octave
+	;cutoff 8
 	note C_, 8
 	note D_, 7
 	inc_octave
+	;cutoff 5
 	note C_, 8
 	dec_octave
-	note __, 7
+	rest 7
+	;cutoff 8
 	note A_, 8
 	inc_octave
+	;cutoff 5
 	note G_, 7
 	dec_octave
 	dec_octave
+	;cutoff 8
 	note A_, 8
 	inc_octave
 	note D_, 7
-	note __, 8
+	rest 8
 	note E_, 7
-	note __, 8
+	rest 8
 	note G_, 7
 	inc_octave
+	;cutoff 5
 	note G_, 8
-	note __, 7
+	rest 7
 	dec_octave
+	;cutoff 8
 	note E_, 8
 	inc_octave
+	;cutoff 5
 	note E_, 7
 	dec_octave
+	;cutoff 8
 	note C_, 8
 	note F_, 7
 	inc_octave
+	;cutoff 5
 	note C_, 8
-	note __, 7
+	rest 7
 	dec_octave
+	;cutoff 8
 	note F_, 8
 	inc_octave
+	;cutoff 5
 	note G_, 7
 	dec_octave
+	;cutoff 8
 	note E_, 8
 	note D_, 7
-	note __, 8
-	loopchannel 4, .Loop1
+	rest 8
+	sound_loop 4, .Loop1
 	note C_, 7
-	note __, 8
+	rest 8
 	note G_, 7
 	inc_octave
+	;cutoff 5
 	note G_, 8
-	note __, 7
+	rest 7
 	dec_octave
+	;cutoff 8
 	note C_, 8
 	inc_octave
+	;cutoff 5
 	note E_, 7
 	dec_octave
 	dec_octave
+	;cutoff 8
 	note G_, 8
 	inc_octave
 	note C_, 7
 	inc_octave
+	;cutoff 5
 	note C_, 8
-	note __, 7
+	rest 7
 	dec_octave
+	;cutoff 8
 	note F_, 8
 	inc_octave
+	;cutoff 5
 	note G_, 7
 	dec_octave
+	;cutoff 8
 	note E_, 8
 	note D_, 7
-	note __, 8
+	rest 8
 	note C_, 15
-	note __, 15
+	rest 15
 	notetype0 10
-	note __, 3
+	rest 3
 	notetype0 1
-	note __, 7
+	rest 7
 	dec_octave
 	note G_, 15
-	note __, 8
+	rest 8
 	note A_, 7
-	note __, 8
+	rest 8
 	note B_, 7
-	note __, 8
-	loopchannel 0, .MainLoop
+	rest 8
+	sound_loop 0, .MainLoop
 
 
-Music_TCGDeckMachine_Ch4: 
-	togglenoise $06
-	notetype 1
+Music_DeckMachine_Ch4: ; f7018 (3d:7018)
+	toggle_noise 6
+	drum_speed 1
 	octave 1
 .MainLoop
 .Loop1
-	callchannel Branch_f7031
-	note E_, 15
-	note C#, 7
-	note D#, 8
-	note E_, 15
-	loopchannel 9, .Loop1
-	callchannel Branch_f7031
-	note E_, 7
-	note D_, 4
-	note D_, 4
-	note C#, 7
-	note C#, 8
-	note C#, 7
-	note C#, 8
-	loopchannel 0, .MainLoop
+	sound_call Branch_f7031
+	drum_note 5, 15
+	drum_note 2, 7
+	drum_note 4, 8
+	drum_note 5, 15
+	sound_loop 9, .Loop1
+	sound_call Branch_f7031
+	drum_note 5, 7
+	drum_note 3, 4
+	drum_note 3, 4
+	drum_note 2, 7
+	drum_note 2, 8
+	drum_note 2, 7
+	drum_note 2, 8
+	sound_loop 0, .MainLoop
 
 Branch_f7031:
-	note C_, 7
-	note D#, 8
-	note E_, 15
-	note C#, 7
-	note D#, 8
-	note E_, 15
-	note C_, 7
-	note D#, 8
-	endchannel
-
+	drum_note 1, 7
+	drum_note 4, 8
+	drum_note 5, 15
+	drum_note 2, 7
+	drum_note 4, 8
+	drum_note 5, 15
+	drum_note 1, 7
+	drum_note 4, 8
+	sound_ret
+; 0xf703a