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

crysaudio/music/TCG/pausemenu.asm

@@ -1,27 +1,25 @@
-Music_TCGPauseMenu:
-	db $C0
-	dw Music_TCGPauseMenu_Ch1
-	db $01
-	dw Music_TCGPauseMenu_Ch2
-	db $02
-	dw Music_TCGPauseMenu_Ch3
-	db $03
-	dw Music_TCGPauseMenu_Ch4
+Music_PauseMenu:
+	channel_count 4
+	channel 1, Music_PauseMenu_Ch1
+	channel 2, Music_PauseMenu_Ch2
+	channel 3, Music_PauseMenu_Ch3
+	channel 4, Music_PauseMenu_Ch4
 
-Music_TCGPauseMenu_Ch2: 
+Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7)
 	notetype0 7
+	;stereo_panning 1, 1
 	notetype2 8
-	dutycycle 2
+	duty_cycle 2
 .MainLoop
 	notetype1 7
 .Loop1
-	note __, 16
-	loopchannel 4, .Loop1
+	rest 16
+	sound_loop 4, .Loop1
 	notetype0 1
 	octave 6
 	note C_, 4
 	dec_octave
-	note __, 3
+	rest 3
 	note B_, 4
 	inc_octave
 	notetype1 3
@@ -35,8 +33,8 @@ Music_TCGPauseMenu_Ch2:
 	note D_, 4
 	notetype1 3
 	note G_, 3
-	callchannel Branch_f6c24
-	callchannel Branch_f6c60
+	sound_call Branch_f6c24
+	sound_call Branch_f6c60
 	notetype1 7
 	octave 6
 	note C_, 4
@@ -57,25 +55,25 @@ Music_TCGPauseMenu_Ch2:
 	note D_, 4
 	notetype1 3
 	note G_, 3
-	callchannel Branch_f6c24
-	callchannel Branch_f6c60
+	sound_call Branch_f6c24
+	sound_call Branch_f6c60
 	octave 6
 	notetype1 6
 	note C_, 4
 	dec_octave
 	notetype1 3
 	note E_, 3
-	callchannel Branch_f6ce9
-	callchannel Branch_f6c80
+	sound_call Branch_f6ce9
+	sound_call Branch_f6c80
 .Loop2
 	octave 6
 	notetype2 4
 	note C_, 1
-	callchannel Branch_f6ce9
-	callchannel Branch_f6c80
-	loopchannel 3, .Loop2
+	sound_call Branch_f6ce9
+	sound_call Branch_f6c80
+	sound_loop 3, .Loop2
 	notetype2 8
-	loopchannel 0, .MainLoop
+	sound_loop 0, .MainLoop
 
 Branch_f6c24:
 .Loop3
@@ -99,7 +97,7 @@ Branch_f6c24:
 	note D_, 4
 	notetype1 3
 	note G_, 3
-	loopchannel 3, .Loop3
+	sound_loop 3, .Loop3
 	inc_octave
 	notetype1 7
 	note C_, 4
@@ -120,7 +118,7 @@ Branch_f6c24:
 	note E_, 4
 	notetype1 3
 	note G_, 3
-	endchannel
+	sound_ret
 
 Branch_f6c60:
 .Loop4
@@ -144,8 +142,8 @@ Branch_f6c60:
 	note E_, 4
 	notetype1 3
 	note G_, 3
-	loopchannel 3, .Loop4
-	endchannel
+	sound_loop 3, .Loop4
+	sound_ret
 
 Branch_f6c80:
 	octave 6
@@ -216,7 +214,7 @@ Branch_f6c80:
 	note B_, 1
 	note G_, 1
 	note E_, 1
-	endchannel
+	sound_ret
 
 Branch_f6ce9:
 	octave 2
@@ -284,20 +282,21 @@ Branch_f6ce9:
 	note B_, 1
 	note G_, 1
 	note D_, 1
-	endchannel
+	sound_ret
 
 
-Music_TCGPauseMenu_Ch1: 
+Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e)
 	notetype0 7
+	;stereo_panning 1, 1
 	notetype2 8
-	dutycycle 2
+	duty_cycle 2
 .MainLoop
 	notetype1 8
 .Loop1
-	note __, 16
-	loopchannel 7, .Loop1
+	rest 16
+	sound_loop 7, .Loop1
 	octave 5
-	note __, 8
+	rest 8
 	notetype0 1
 .Loop2
 	note B_, 4
@@ -305,7 +304,7 @@ Music_TCGPauseMenu_Ch1:
 	note E_, 4
 	note C_, 3
 	dec_octave
-	loopchannel 4, .Loop2
+	sound_loop 4, .Loop2
 	notetype0 7
 .Loop3
 	octave 1
@@ -436,16 +435,20 @@ Music_TCGPauseMenu_Ch1:
 	note C#, 1
 	inc_octave
 	note D_, 1
-	loopchannel 4, .Loop3
-	loopchannel 0, .MainLoop
+	sound_loop 4, .Loop3
+	sound_loop 0, .MainLoop
 
 
-Music_TCGPauseMenu_Ch3: 
+Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d)
 	notetype0 1
 	notetype2 13
+	;stereo_panning 1, 1
 	notetype1 2
+	;echo 96
+	;cutoff 4
 	octave 5
 	note G_, 7
+	;cutoff 8
 	note F#, 4
 	notetype1 3
 	note G_, 3
@@ -482,7 +485,7 @@ Music_TCGPauseMenu_Ch3:
 	inc_octave
 	notetype1 3
 	note D_, 3
-	loopchannel 3, .Loop1
+	sound_loop 3, .Loop1
 	notetype1 2
 	note G_, 4
 	dec_octave
@@ -524,7 +527,7 @@ Music_TCGPauseMenu_Ch3:
 	inc_octave
 	notetype1 3
 	note C_, 3
-	loopchannel 3, .Loop2
+	sound_loop 3, .Loop2
 	notetype1 2
 	note G_, 4
 	dec_octave
@@ -545,44 +548,44 @@ Music_TCGPauseMenu_Ch3:
 	inc_octave
 	notetype1 3
 	note D_, 3
-	loopchannel 0, .MainLoop
+	sound_loop 0, .MainLoop
 
 
-Music_TCGPauseMenu_Ch4: 
-	togglenoise $06
-	notetype 7
+Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8)
+	toggle_noise 6
+	drum_speed 7
 	octave 1
 .MainLoop
 .Loop1
 	rept 7
-	note C_, 1
-	note D#, 1
-	note E_, 2
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
-	note E_, 2
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note C#, 1
+	drum_note 1, 1
+	drum_note 4, 1
+	drum_note 5, 2
+	drum_note 2, 1
+	drum_note 4, 1
+	drum_note 5, 1
+	drum_note 3, 1
+	drum_note 1, 1
+	drum_note 4, 1
+	drum_note 5, 2
+	drum_note 2, 1
+	drum_note 4, 1
+	drum_note 5, 1
+	drum_note 2, 1
 	endr
-	note C_, 1
-	note D#, 1
-	note E_, 2
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	notetype 1
-	note D_, 4
-	note D_, 3
-	notetype 7
+	drum_note 1, 1
+	drum_note 4, 1
+	drum_note 5, 2
+	drum_note 2, 1
+	drum_note 4, 1
+	drum_note 5, 1
+	drum_speed 1
+	drum_note 3, 4
+	drum_note 3, 3
+	drum_speed 7
 	rept 8
-	note C#, 1
+	drum_note 2, 1
 	endr
-	loopchannel 2, .Loop1
-	loopchannel 0, .MainLoop
-
+	sound_loop 2, .Loop1
+	sound_loop 0, .MainLoop
+; 0xf6ef1