Update TCG2 songs

they actually don't sound half bad now!
2026-02-22 07:02:17 +13:00 · 2023-01-14 00:08:49 -06:00 · 2023-01-14 00:08:49 -06:00 · 5357fee84f
commit 5357fee84f
parent 867f70ab1e
24 changed files with 12553 additions and 10314 deletions
--- a/audio.asm
+++ b/audio.asm
@ -416,6 +416,9 @@ INCLUDE "crysaudio/music/TCG2/fort1.asm"
 INCLUDE "crysaudio/music/TCG2/fort2.asm"
 INCLUDE "crysaudio/music/TCG2/fort3.asm"
 INCLUDE "crysaudio/music/TCG2/fort4.asm"
 SECTION "TCG2 Songs 1b", ROMX
 INCLUDE "crysaudio/music/TCG2/grcastle.asm"
 INCLUDE "crysaudio/music/TCG2/grchallengecup.asm"
@ -427,6 +430,9 @@ INCLUDE "crysaudio/music/TCG2/grblimp.asm"
 INCLUDE "crysaudio/music/TCG2/grdueltheme1.asm"
 INCLUDE "crysaudio/music/TCG2/grdueltheme2.asm"
 INCLUDE "crysaudio/music/TCG2/grdueltheme3.asm"
 SECTION "TCG2 Songs 2b", ROMX
 INCLUDE "crysaudio/music/TCG2/ishihara.asm"
@ -434,12 +440,12 @@ SECTION "TCG2 Songs 3", ROMX
 INCLUDE "crysaudio/music/TCG2/imakuni2.asm"
 INCLUDE "crysaudio/music/TCG2/credits.asm"
-INCLUDE "crysaudio/music/TCG2/diddly1.asm"
+INCLUDE "crysaudio/music/TCG2/ditty1.asm"
-INCLUDE "crysaudio/music/TCG2/diddly2.asm"
+INCLUDE "crysaudio/music/TCG2/ditty2.asm"
-INCLUDE "crysaudio/music/TCG2/diddly3.asm"
+INCLUDE "crysaudio/music/TCG2/ditty3.asm"
-INCLUDE "crysaudio/music/TCG2/diddly4.asm"
+INCLUDE "crysaudio/music/TCG2/ditty4.asm"
-INCLUDE "crysaudio/music/TCG2/diddly5.asm"
+INCLUDE "crysaudio/music/TCG2/ditty5.asm"
-INCLUDE "crysaudio/music/TCG2/diddly6.asm"
+INCLUDE "crysaudio/music/TCG2/ditty6.asm"
 SECTION "Pinball Songs 1", ROMX
--- a/crysaudio/music/TCG2/credits.asm
+++ b/crysaudio/music/TCG2/credits.asm
--- a/crysaudio/music/TCG2/diddly1.asm
+++ b/crysaudio/music/TCG2/diddly1.asm
@ -1,22 +1,24 @@
-Music_Diddly1:
+Music_Ditty1:
 	channel_count 3
-	channel 1, Music_Diddly1_Ch1
+	channel 1, Music_Ditty1_Ch1
-	channel 2, Music_Diddly1_Ch2
+	channel 2, Music_Ditty1_Ch2
-	channel 3, Music_Diddly1_Ch3
+	channel 3, Music_Ditty1_Ch3
-Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57)
+Music_Ditty1_Ch2:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
 	octave 2
 	note D#, 2
 	note E_, 3
 	note D#, 3
 	note E_, 3
-	;musicef 254
+;	musicef -2
 	note D#, 2
 	note E_, 3
-	;musicef 255
+;	musicef -1
 	note D#, 3
 	note E_, 3
 ;	musicef 1
@ -61,7 +63,7 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57)
 	note D_, 3
 	note F_, 3
 	dec_octave
-	;musicef 253
+;	musicef -3
 	note G#, 2
 	note B_, 3
 	inc_octave
@ -69,20 +71,20 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57)
 	note F_, 3
 	dec_octave
 	note G#, 2
-	;musicef 255
+;	musicef -1
 	note B_, 3
 	inc_octave
 	note D_, 3
 	note F_, 3
 	dec_octave
-	;musicef 254
+;	musicef -2
 	note G#, 2
 	note B_, 3
 	inc_octave
 	note D_, 3
 	note F_, 3
 	dec_octave
-	;musicef 255
+;	musicef -1
 	note G#, 2
 	note B_, 3
 	inc_octave
@ -91,9 +93,11 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57)
 	sound_ret
-Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5)
+Music_Ditty1_Ch1:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
 	octave 1
 ;	musicef 1
@ -101,10 +105,10 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5)
 	note G#, 3
 	note G_, 3
 	note G#, 3
-	;musicef 254
+;	musicef -2
 	note G_, 2
 	note G#, 3
-	;musicef 255
+;	musicef -1
 	note G_, 3
 	note G#, 3
 	note G_, 2
@ -152,28 +156,28 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5)
 	dec_octave
 	note G#, 3
 	note A#, 3
-	;musicef 253
+;	musicef -3
 	note A#, 2
 	inc_octave
 	note D_, 3
 	dec_octave
 	note G#, 3
 	note A#, 3
-	;musicef 254
+;	musicef -2
 	note A#, 2
 	inc_octave
 	note D_, 3
 	dec_octave
 	note G#, 3
 	note A#, 3
-	;musicef 254
+;	musicef -2
 	note A#, 2
 	inc_octave
 	note D_, 3
 	dec_octave
 	note G#, 3
 	note A#, 3
-	;musicef 255
+;	musicef -1
 	note A#, 2
 	inc_octave
 	note D_, 3
@ -183,18 +187,17 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5)
 	sound_ret
-Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17)
+Music_Ditty1_Ch3:
-	channel_volume 1
+	fade_wave 15
 	;fade_wave 15
 	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 2
 	channel_volume 1
 	note C_, 2
 	note C#, 3
 	channel_volume 2
-	;musicef 252
+;	musicef -4
 	note C_, 3
 	note C#, 3
 	note C_, 2
@ -257,4 +260,3 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17)
 	note C_, 3
 	note E_, 3
 	sound_ret
 ; 0x1ebd67
--- a/crysaudio/music/TCG2/diddly2.asm
+++ b/crysaudio/music/TCG2/diddly2.asm
@ -1,14 +1,16 @@
-Music_Diddly2:
+Music_Ditty2:
 	channel_count 3
-	channel 1, Music_Diddly2_Ch1
+	channel 1, Music_Ditty2_Ch1
-	channel 2, Music_Diddly2_Ch2
+	channel 2, Music_Ditty2_Ch2
-	channel 3, Music_Diddly2_Ch3
+	channel 3, Music_Ditty2_Ch3
-Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67)
+Music_Ditty2_Ch2:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 2
 	note B_, 5
 	note D_, 4
@ -58,27 +60,29 @@ Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67)
 	note G#, 3
 	note G_, 3
 	note G#, 3
-	;musicef 254
+;	musicef -2
 	note G_, 4
 	note G#, 3
 	note G_, 3
 	note G#, 3
-	;musicef 254
+;	musicef -2
 	note G_, 3
 	note G#, 3
 	note G_, 3
-	;musicef 255
+;	musicef -1
 	note G#, 3
 	note G_, 4
 	note G#, 3
 	sound_ret
-Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf)
+Music_Ditty2_Ch1:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 2
 	note F_, 4
 	dec_octave
@ -147,13 +151,13 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf)
 	inc_octave
 	note C_, 3
 	dec_octave
-	;musicef 254
+;	musicef -2
 	note B_, 4
 	inc_octave
 	note C_, 3
 	dec_octave
 	note B_, 3
-	;musicef 254
+;	musicef -2
 	inc_octave
 	note C_, 3
 	dec_octave
@ -161,7 +165,7 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf)
 	inc_octave
 	note C_, 3
 	dec_octave
-	;musicef 255
+;	musicef -1
 	note B_, 3
 	inc_octave
 	note C_, 3
@ -172,13 +176,12 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf)
 	sound_ret
-Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13)
+Music_Ditty2_Ch3:
 	channel_volume 1
 	fade_wave 14
 	speed 1
-	;musice9 128
+;	echo 128
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musice8 7
+;	cutoff 7
 	channel_volume 1
 	octave 2
 	note G_, 5
@ -233,4 +236,3 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13)
 	note G_, 4
 	note G_, 4
 	sound_ret
 ; 0x1ebe5d
--- a/crysaudio/music/TCG2/diddly3.asm
+++ b/crysaudio/music/TCG2/diddly3.asm
@ -1,14 +1,16 @@
-Music_Diddly3:
+Music_Ditty3:
 	channel_count 3
-	channel 1, Music_Diddly3_Ch1
+	channel 1, Music_Ditty3_Ch1
-	channel 2, Music_Diddly3_Ch2
+	channel 2, Music_Ditty3_Ch2
-	channel 3, Music_Diddly3_Ch3
+	channel 3, Music_Ditty3_Ch3
-Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d)
+Music_Ditty3_Ch2:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 5
 	note C_, 3
 	dec_octave
@ -27,12 +29,14 @@ Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d)
 	sound_ret
-Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76)
+Music_Ditty3_Ch1:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musicef 253
+;	musicef -3
 	rest 1
 	octave 5
 	note C_, 3
@ -52,16 +56,15 @@ Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76)
 	sound_ret
-Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92)
+Music_Ditty3_Ch3:
-	channel_volume 1
+	fade_wave 15
 	;fade_wave 15
 	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	speed 1
 	channel_volume 2
-	;musice9 128
+;	echo 128
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	speed 1
-	;musice8 7
+;	cutoff 7
 	octave 5
 	note G_, 3
 	dec_octave
@ -75,4 +78,3 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92)
 	channel_volume 3
 	note C_, 4
 	sound_ret
 ; 0x1ebeae
--- a/crysaudio/music/TCG2/diddly4.asm
+++ b/crysaudio/music/TCG2/diddly4.asm
@ -1,14 +1,16 @@
-Music_Diddly4:
+Music_Ditty4:
 	channel_count 3
-	channel 1, Music_Diddly4_Ch1
+	channel 1, Music_Ditty4_Ch1
-	channel 2, Music_Diddly4_Ch2
+	channel 2, Music_Ditty4_Ch2
-	channel 3, Music_Diddly4_Ch3
+	channel 3, Music_Ditty4_Ch3
-Music_Diddly4_Ch2: ; 1ebeae (7a:7eae)
+Music_Ditty4_Ch2:
-	channel_volume 10
+;	preset 0
-	;musicf0 0
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 3
 ;	musicf1 87
 	note C_, 4
@ -29,11 +31,13 @@ Music_Diddly4_Ch2: ; 1ebeae (7a:7eae)
 	sound_ret
-Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7)
+Music_Ditty4_Ch1:
-	channel_volume 10
+;	preset 0
-	;musicf0 0
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 2
 ;	musicf1 87
 	note A_, 4
@ -54,15 +58,14 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7)
 	sound_ret
-Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0)
+Music_Ditty4_Ch3:
 	channel_volume 1
 	fade_wave 14
 	speed 1
 	channel_volume 2
-	;musice9 128
+;	echo 128
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	speed 1
-	;musice8 1
+;	cutoff 1
 	rest 6
 	rest 5
 	rest 6
@ -74,4 +77,3 @@ Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0)
 ;	tie
 	note F_, 6
 	sound_ret
 ; 0x1ebefa
--- a/crysaudio/music/TCG2/diddly5.asm
+++ b/crysaudio/music/TCG2/diddly5.asm
@ -1,13 +1,15 @@
-Music_Diddly5:
+Music_Ditty5:
 	channel_count 2
-	channel 1, Music_Diddly5_Ch1
+	channel 1, Music_Ditty5_Ch1
-	channel 2, Music_Diddly5_Ch2
+	channel 2, Music_Ditty5_Ch2
-Music_Diddly5_Ch2: ; 1ebefa (7a:7efa)
+Music_Ditty5_Ch2:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	octave 3
 	note G_, 2
 	note B_, 3
@ -31,17 +33,19 @@ Music_Diddly5_Ch2: ; 1ebefa (7a:7efa)
 	inc_octave
 	note D_, 3
 	note G_, 3
-	;musicef 252
+;	musicef -4
 	note G_, 3
 	sound_ret
-Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b)
+Music_Ditty5_Ch1:
-	channel_volume 10
+;	preset 2
-	;musicf0 2
+	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musicef 254
+;	musicef -2
 	octave 2
 	note B_, 2
 	inc_octave
@ -65,7 +69,6 @@ Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b)
 	note D_, 3
 	note G_, 3
 	note B_, 3
-	;musicef 252
+;	musicef -4
 	note B_, 3
 	sound_ret
 ; 0x1ebf3e
--- a/crysaudio/music/TCG2/diddly6.asm
+++ b/crysaudio/music/TCG2/diddly6.asm
@ -1,16 +1,18 @@
-Music_Diddly6:
+Music_Ditty6:
 	channel_count 4
-	channel 1, Music_Diddly6_Ch1
+	channel 1, Music_Ditty6_Ch1
-	channel 2, Music_Diddly6_Ch2
+	channel 2, Music_Ditty6_Ch2
-	channel 3, Music_Diddly6_Ch3
+	channel 3, Music_Ditty6_Ch3
-	channel 4, Music_Diddly6_Ch4
+	channel 4, Music_Ditty6_Ch4
-Music_Diddly6_Ch2: ; 1f76dc (7d:76dc)
+Music_Ditty6_Ch2:
-	channel_volume 10
+;	preset 34
-	;musicf0 34
+	volume_envelope 11, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musicef 252
+;	musicef -4
 	octave 3
 	note F_, 2
 ;	musicef 1
@ -84,12 +86,14 @@ Music_Diddly6_Ch2: ; 1f76dc (7d:76dc)
 	sound_ret
-Music_Diddly6_Ch1: ; 1f7731 (7d:7731)
+Music_Ditty6_Ch1:
-	channel_volume 10
+;	preset 23
-	;musicf0 23
+	volume_envelope 6, 7
 	duty_cycle 2
 	vibrato 28, 3, 3
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musicef 252
+;	musicef -4
 	octave 3
 	note C_, 2
 ;	musicef 1
@ -161,11 +165,17 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731)
 	note C_, 5
 	note A_, 5
 	octave 4
-	;musicf0 34
+;	preset 34
-	;musicef 253
+	volume_envelope 11, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -3
 	note D_, 6
 	octave 4
-	;musicf0 23
+;	preset 23
 	volume_envelope 6, 7
 	duty_cycle 2
 	vibrato 28, 3, 3
 	note G_, 5
 	note D_, 5
 	note B_, 5
@ -214,7 +224,10 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731)
 	note B_, 5
 	inc_octave
 	note D_, 5
-	;musicf0 26
+;	preset 26
 	volume_envelope 6, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf1 87
 	note G_, 16
 ;	tie
@ -232,18 +245,17 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731)
 	sound_ret
-Music_Diddly6_Ch3: ; 1f77cf (7d:77cf)
+Music_Ditty6_Ch3:
-	channel_volume 1
+	fade_wave 15
 	;fade_wave 15
 	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	channel_volume 1
-	;musice9 96
+;	echo 96
 	speed 1
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 	rest 10
 	rest 10
 	octave 2
-	;musice8 4
+;	cutoff 4
 	note D#, 16
 ;	tie
 	note D#, 16
@ -267,7 +279,7 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf)
 ;	tie
 	note D_, 2
 .Loop1
-	;musice8 4
+;	cutoff 4
 	speed 7
 	note G_, 3
 	speed 10
@ -286,41 +298,33 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf)
 ;	tie
 	note G_, 2
 	speed 2
-	;musice8 1
+;	cutoff 1
 	note G_, 10
 	sound_ret
-Music_Diddly6_Ch4: ; 1f7812 (7d:7812)
+Music_Ditty6_Ch4:
 	toggle_noise 6
 	octave 1
 	drum_speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	rest 10
 	rest 10
 ;	musicef 1
 	drum_note 2, 6
-	;musicef 254
+;	musicef -2
 .Loop1
 	drum_note 3, 5
 	sound_loop 7, .Loop1
 .Loop2
 	drum_note 3, 6
 	;rept 7
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;---
 	drum_note 3, 5
 	;endr
 	sound_loop 3, .Loop2
 ;	musicef 0
 .Loop3
@ -333,4 +337,3 @@ Music_Diddly6_Ch4: ; 1f7812 (7d:7812)
 	drum_speed 7
 	drum_note 6, 12
 	sound_ret
 ; 0x1f783b
--- a/crysaudio/music/TCG2/fort1.asm
+++ b/crysaudio/music/TCG2/fort1.asm
--- a/crysaudio/music/TCG2/fort2.asm
+++ b/crysaudio/music/TCG2/fort2.asm
@ -5,13 +5,15 @@ Music_Fort2:
 	channel 3, Music_Fort2_Ch3
 	channel 4, Music_Fort2_Ch4
-Music_Fort2_Ch2: ; 1edefc (7b:5efc)
+Music_Fort2_Ch2:
 	channel_volume 10
 	speed 1
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 .MainLoop
 	octave 3
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicf3
 .Loop1
 	rest 8
@ -25,7 +27,10 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc)
 	note F#, 3
 	note G_, 4
 	sound_loop 4, .Loop1
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	vibrato 30, 3, 3
 	octave 2
 ;	musicef 2
@ -179,11 +184,17 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc)
 ;	tie
 	note D_, 10
 	note D_, 8
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 ;	musicf3
 	octave 3
 	note D#, 15
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	vibrato 30, 3, 3
 	octave 2
 	note A_, 3
@ -544,15 +555,17 @@ Branch_1ee109:
 	sound_ret
-Music_Fort2_Ch1: ; 1ee12f (7b:612f)
+Music_Fort2_Ch1:
 	channel_volume 10
 	speed 1
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 .MainLoop
-	;musicf0 23
+;	preset 23
 	volume_envelope 6, 7
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf1 71
 	octave 3
-	;musicef 254
+;	musicef -2
 	note E_, 4
 	note E_, 4
 	inc_octave
@ -666,7 +679,10 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	dec_octave
 	note E_, 4
 	sound_loop 14, .Loop1
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicf3
 .Loop2
 	rest 8
@ -763,7 +779,10 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	rest 4
 	inc_octave
 	note D_, 4
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 	octave 3
 	note F#, 4
 	note G_, 7
@ -771,7 +790,10 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	note G_, 8
 	note G_, 3
 	rest 4
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicf3
 .Loop3
 	octave 2
@ -884,7 +906,7 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	note G_, 16
 	vibrato 0, 3, 3
 	sound_loop 2, .Loop4
-	;musicec 1
+;	pitch_offset 1
 ;	musicf1 32
 	note F_, 4
 	note F_, 4
@ -953,8 +975,11 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	note F_, 12
 	note C_, 3
 	note C_, 4
-	;musicec 0
+;	pitch_offset 0
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 ;	musicef 1
 	note C_, 2
 ;	musicf1 64
@ -995,13 +1020,12 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f)
 	sound_loop 0, .MainLoop
-Music_Fort2_Ch3: ; 1ee319 (7b:6319)
+Music_Fort2_Ch3:
-	channel_volume 1
+	fade_wave 15
 	;fade_wave 15
 	load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	channel_volume 2
-	;musice9 0
+;	echo 0
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 	octave 4
 ;	musicf3
 	octave 3
@ -1055,7 +1079,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	rest 4
 	rest 7
 	channel_volume 1
-	;musice8 8
+;	cutoff 8
 	octave 2
 	note A_, 2
 ;	tie
@ -1319,11 +1343,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note B_, 7
 	rest 8
 	octave 2
-	;musice8 7
+;	cutoff 7
 	note E_, 2
 ;	tie
 	note F_, 13
-	;musice8 8
+;	cutoff 8
 	note F#, 4
 	rest 3
 	octave 2
@ -1587,7 +1611,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	rest 4
 	octave 3
 	note E_, 7
-	;musice8 8
+;	cutoff 8
 	octave 2
 .Loop3
 	note C_, 15
@ -1608,10 +1632,10 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note C_, 8
 	note C_, 4
 	rest 3
-	;musice8 7
+;	cutoff 7
 	note D_, 15
 	note D_, 15
-	;musice8 8
+;	cutoff 8
 	note C_, 15
 	rest 8
 	note C_, 4
@ -1630,11 +1654,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note C_, 8
 	note C_, 4
 	rest 3
-	;musice8 7
+;	cutoff 7
 	note D_, 15
 ;	tie
 	note D_, 15
-	;musice8 8
+;	cutoff 8
 	sound_loop 2, .Loop3
 	octave 2
 	note D#, 15
@ -1655,10 +1679,10 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note D#, 8
 	note D#, 4
 	rest 3
-	;musice8 7
+;	cutoff 7
 	note F_, 15
 	note F_, 15
-	;musice8 8
+;	cutoff 8
 	note D#, 15
 	rest 8
 	note D#, 4
@ -1677,11 +1701,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note D#, 8
 	note D#, 4
 	rest 3
-	;musice8 7
+;	cutoff 7
 	note F_, 15
 ;	tie
 	note F_, 15
-	;musice8 8
+;	cutoff 8
 	note D#, 15
 	rest 8
 	note D#, 4
@ -1700,11 +1724,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	note D#, 8
 	note D#, 4
 	rest 3
-	;musice8 7
+;	cutoff 7
 	note F_, 15
 	note F_, 15
-	;musice8 8
+;	cutoff 8
-	;musicec 0
+;	pitch_offset 0
 	note D#, 15
 	rest 8
 	note D#, 4
@ -1768,7 +1792,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319)
 	sound_loop 0, .MainLoop
-Music_Fort2_Ch4: ; 1ee637 (7b:6637)
+Music_Fort2_Ch4:
 	toggle_noise 6
 	drum_speed 1
 	octave 1
@ -1802,7 +1826,7 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637)
 	drum_note 1, 8
 	drum_note 4, 7
 	drum_note 5, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 ;	musicef 2
 	drum_note 2, 4
@ -1843,38 +1867,38 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637)
 	drum_note 2, 8
 	drum_note 4, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 4
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 .Loop2
@ -1914,38 +1938,38 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637)
 	drum_note 2, 8
 	drum_note 4, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 4
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 8
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	sound_call Branch_1ee785
@ -2071,4 +2095,3 @@ Branch_1ee785:
 	drum_note 2, 15
 	drum_note 2, 15
 	sound_ret
 ; 0x1ee797
--- a/crysaudio/music/TCG2/fort3.asm
+++ b/crysaudio/music/TCG2/fort3.asm
@ -5,14 +5,16 @@ Music_Fort3:
 	channel 3, Music_Fort3_Ch3
 	channel 4, Music_Fort3_Ch4
-Music_Fort3_Ch2: ; 1ee797 (7b:6797)
+Music_Fort3_Ch2:
 	channel_volume 10
 	speed 1
 	rest 14
 .MainLoop
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 	octave 3
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 ;	musicf1 87
 ;	musicf3
 ;	vibrato_type 5
@ -162,23 +164,26 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	note A#, 7
 	note G_, 7
 	note F_, 7
-	;musicf0 33
+;	preset 33
 	volume_envelope 9, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicef 1
 ;	musicf1 87
 ;	musicf3
 	octave 3
 	note G_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note G_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note G#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A_, 14
 	inc_octave
 	note C_, 15
@ -216,28 +221,28 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	note D_, 15
 	note F_, 4
 ;	tie
-	;musice4 4
+;	frequency_offset 4
 	note F_, 3
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note F_, 4
 ;	tie
-	;musice4 13
+;	frequency_offset 13
 	note F_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F#, 4
 ;	tie
-	;musice4 4
+;	frequency_offset 4
 	note F#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note F#, 4
 ;	tie
-	;musice4 13
+;	frequency_offset 13
 	note F#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G_, 14
 ;	tie
 	note G_, 15
@ -259,20 +264,23 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 ;	tie
 	note G_, 14
 ;	musicf3
-	;musicf0 33
+;	preset 33
 	volume_envelope 9, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 	octave 3
 	note G_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note G_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note G#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A_, 14
 	inc_octave
 	note C_, 15
@ -311,28 +319,28 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	dec_octave
 	note F_, 4
 ;	tie
-	;musice4 14
+;	frequency_offset 14
 	note F_, 3
 ;	tie
-	;musice4 28
+;	frequency_offset 28
 	note F_, 4
 ;	tie
-	;musice4 43
+;	frequency_offset 43
 	note F_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F#, 4
 ;	tie
-	;musice4 14
+;	frequency_offset 14
 	note F#, 4
 ;	tie
-	;musice4 28
+;	frequency_offset 28
 	note F#, 4
 ;	tie
-	;musice4 43
+;	frequency_offset 43
 	note F#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G_, 14
 ;	tie
 	note G_, 15
@ -358,16 +366,16 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	vibrato 11, 3, 3
 	note C_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 14
 	vibrato 0, 3, 3
 	note C_, 15
@ -400,15 +408,15 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	vibrato 11, 3, 3
 	note C_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C_, 4
 ;	tie
 	note C#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 14
 	note D_, 15
 	dec_octave
@ -442,16 +450,16 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	vibrato 11, 3, 3
 	note C_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 14
 	vibrato 0, 3, 3
 	note C_, 15
@ -484,28 +492,28 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	vibrato 11, 3, 3
 	note C_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C_, 4
 ;	tie
-	;musice4 19
+;	frequency_offset 19
 	note C_, 4
 ;	tie
-	;musice4 28
+;	frequency_offset 28
 	note C_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note C#, 3
 ;	tie
-	;musice4 19
+;	frequency_offset 19
 	note C#, 4
 ;	tie
-	;musice4 28
+;	frequency_offset 28
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	vibrato 30, 3, 3
 	note D_, 15
 ;	tie
@ -533,7 +541,10 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	note D_, 15
 ;	tie
 	note D_, 14
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 ;	musicf1 64
 ;	musicf3
 .Loop1
@ -611,11 +622,11 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 ;	musicf3
 	note B_, 4
 ;	tie
-	;musice4 7
+;	frequency_offset 7
 	note B_, 4
 ;	tie
 	inc_octave
-	;musice4 0
+;	frequency_offset 0
 	note C_, 7
 	dec_octave
 	note A#, 14
@ -712,17 +723,19 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797)
 	sound_loop 0, .MainLoop
-Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
+Music_Fort3_Ch1:
 	channel_volume 10
 	speed 1
 	rest 14
 .MainLoop
-	;musicf0 9
+;	preset 9
 	volume_envelope 9, 0
 	duty_cycle 1
 	vibrato 11, 3, 3
 	octave 3
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 ;	vibrato_type 5
 	vibrato 60, 3, 3
-	;musicec 251
+;	pitch_offset 251
 ;	musicf1 87
 ;	musicf3
 	rest 15
@ -855,8 +868,8 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	note A#, 15
 ;	tie
 	note A#, 14
-	;musicef 252
+;	musicef -4
-	;musicec 0
+;	pitch_offset 0
 	octave 2
 	note A#, 8
 	rest 7
@ -906,10 +919,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note A_, 4
 ;	tie
-	;musice4 17
+;	frequency_offset 17
 	note A_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 7
 	note A_, 7
 	rest 7
@ -952,11 +965,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note B_, 4
 ;	tie
-	;musice4 15
+;	frequency_offset 15
 	note B_, 4
 ;	tie
 	inc_octave
-	;musice4 0
+;	frequency_offset 0
 	note C_, 7
 	dec_octave
 	note A#, 7
@ -1000,10 +1013,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	dec_octave
 	note A_, 4
 ;	tie
-	;musice4 17
+;	frequency_offset 17
 	note A_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 7
 	note F_, 7
 	rest 7
@ -1047,11 +1060,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note B_, 4
 ;	tie
-	;musice4 15
+;	frequency_offset 15
 	note B_, 4
 ;	tie
 	inc_octave
-	;musice4 0
+;	frequency_offset 0
 	note C_, 7
 	dec_octave
 	note A#, 7
@ -1094,10 +1107,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	dec_octave
 	note A_, 4
 ;	tie
-	;musice4 17
+;	frequency_offset 17
 	note A_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 7
 	note F_, 7
 	rest 7
@ -1137,10 +1150,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note A_, 4
 ;	tie
-	;musice4 9
+;	frequency_offset 9
 	note A_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 7
 	note F_, 7
 	rest 7
@ -1177,10 +1190,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note F#, 4
 ;	tie
-	;musice4 10
+;	frequency_offset 10
 	note F#, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G_, 7
 	note F_, 14
 	rest 15
@ -1248,10 +1261,10 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	rest 14
 	note F#, 4
 ;	tie
-	;musice4 10
+;	frequency_offset 10
 	note F#, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note G_, 7
 	note F_, 14
 	rest 15
@ -1290,14 +1303,13 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0)
 	sound_loop 0, .MainLoop
-Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
+Music_Fort3_Ch3:
 	channel_volume 1
 	speed 1
 	fade_wave 11
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	channel_volume 1
-	;musice9 96
+;	echo 96
-	;musicec 244
+;	pitch_offset 244
 	octave 3
 	note F_, 7
 	note F#, 7
@ -1307,9 +1319,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	octave 3
 	note G_, 15
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 14
-	;musice8 8
+;	cutoff 8
 	channel_volume 2
 	note F_, 4
 ;	tie
@ -1345,9 +1357,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	note F#, 7
 	note G_, 15
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 14
-	;musice8 8
+;	cutoff 8
 	channel_volume 2
 	note D#, 4
 ;	tie
@ -1383,9 +1395,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	note F#, 7
 	note G_, 15
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 14
-	;musice8 8
+;	cutoff 8
 	channel_volume 2
 	note F_, 4
 ;	tie
@ -1421,9 +1433,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	note F#, 7
 	note G_, 15
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 14
-	;musice8 8
+;	cutoff 8
 	channel_volume 2
 	note D#, 4
 ;	tie
@ -1448,9 +1460,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	dec_octave
 	channel_volume 1
 	note F_, 7
-	;musice8 3
+;	cutoff 3
 	note G_, 15
-	;musice8 8
+;	cutoff 8
 	inc_octave
 	note C#, 7
 	note C_, 7
@ -1812,10 +1824,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	inc_octave
 	note E_, 4
 ;	tie
-	;musice4 12
+;	frequency_offset 12
 	note E_, 4
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F_, 7
 	sound_call Branch_1ef06f
 	dec_octave
@ -1826,9 +1838,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	note G_, 3
 	rest 12
 	inc_octave
-	;musice8 2
+;	cutoff 2
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
@ -1836,27 +1848,27 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	rest 3
 	inc_octave
 	note F_, 7
-	;musice8 4
+;	cutoff 4
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
 	inc_octave
 	inc_octave
-	;musice8 3
+;	cutoff 3
 	note D_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note D_, 4
 	rest 3
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note F_, 8
 	note F#, 7
-	;musice8 2
+;	cutoff 2
 	note G_, 14
-	;musice8 8
+;	cutoff 8
 	sound_call Branch_1ef040
 	octave 2
 	note G_, 3
@ -1869,35 +1881,35 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	rest 3
 	inc_octave
 	note F_, 7
-	;musice8 4
+;	cutoff 4
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
 	inc_octave
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note D_, 4
 	rest 3
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note F_, 8
 	note F#, 7
-	;musice8 2
+;	cutoff 2
 	note G_, 14
-	;musice8 8
+;	cutoff 8
 	sound_call Branch_1ef040
 	octave 2
 	note G_, 3
 	rest 12
 	inc_octave
-	;musice8 2
+;	cutoff 2
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
@ -1905,34 +1917,34 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	rest 3
 	inc_octave
 	note F_, 7
-	;musice8 4
+;	cutoff 4
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
 	inc_octave
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note D_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note D_, 4
 	rest 3
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note F_, 8
 	note F#, 7
-	;musice8 2
+;	cutoff 2
 	note G_, 14
 	sound_call Branch_1ef040
 	octave 2
 	note G_, 3
 	rest 12
 	inc_octave
-	;musice8 2
+;	cutoff 2
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 3
 	rest 12
@ -1940,9 +1952,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb)
 	rest 3
 	inc_octave
 	note F_, 7
-	;musice8 4
+;	cutoff 4
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 4
 	rest 4
@ -1963,26 +1975,26 @@ Branch_1ef040:
 	note G_, 4
 	rest 3
 	inc_octave
-	;musice8 2
+;	cutoff 2
 	note G_, 8
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 4
 	rest 3
 	inc_octave
 	note F_, 7
-	;musice8 4
+;	cutoff 4
 	note G_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note G_, 2
 	rest 6
 	inc_octave
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note A#, 7
 	note D_, 7
-	;musice8 8
+;	cutoff 8
 	dec_octave
 	note D_, 4
 	rest 3
@ -2005,11 +2017,11 @@ Branch_1ef06f:
 	sound_ret
-Music_Fort3_Ch4: ; 1ef074 (7b:7074)
+Music_Fort3_Ch4:
 	toggle_noise 6
 	drum_speed 1
 	octave 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	rest 14
 .MainLoop
 	drum_note 1, 15
@ -2336,9 +2348,9 @@ Music_Fort3_Ch4: ; 1ef074 (7b:7074)
 	drum_note 4, 7
 	drum_note 3, 7
 	drum_note 4, 8
-	;musicef 250
+;	musicef -6
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 3
 ;	musicef 0
 	drum_note 2, 7
@ -2363,4 +2375,3 @@ Branch_1ef1de:
 	drum_note 4, 15
 	drum_note 10, 14
 	sound_ret
 ; 0x1ef1ec
--- a/crysaudio/music/TCG2/fort4.asm
+++ b/crysaudio/music/TCG2/fort4.asm
--- a/crysaudio/music/TCG2/gamecorner.asm
+++ b/crysaudio/music/TCG2/gamecorner.asm
@ -5,10 +5,12 @@ Music_TCG2GameCorner:
 	channel 3, Music_TCG2GameCorner_Ch3
 	channel 4, Music_TCG2GameCorner_Ch4
-Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
+Music_TCG2GameCorner_Ch2:
 	channel_volume 10
 .MainLoop
-	;musicf0 17
+;	preset 17
 	volume_envelope 15, 1
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 1
 ;	musicf3
 	vibrato 1, 3, 3
@ -43,7 +45,10 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 	rest 16
 	rest 11
 	sound_call Branch_1e75c7
-	;musicf0 20
+;	preset 20
 	volume_envelope 12, 1
 	duty_cycle 1
 	vibrato 1, 3, 3
 	octave 4
 	note A_, 7
 	rest 6
@ -58,10 +63,16 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 	note A_, 7
 	rest 13
 	sound_call Branch_1e75c7
-	;musicf0 20
+;	preset 20
 	volume_envelope 12, 1
 	duty_cycle 1
 	vibrato 1, 3, 3
 	octave 4
 	note A_, 7
-	;musicf0 18
+;	preset 18
 	volume_envelope 7, -4
 	duty_cycle 2
 	vibrato 1, 3, 3
 	octave 4
 ;	vibrato_type 18
 	vibrato 1, 3, 3
@ -126,7 +137,7 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 ;	musicf3
 	note C_, 6
 ;	musicf2
-	;musicef 255
+;	musicef -1
 ;	musicf1 146
 	note C#, 14
 ;	tie
@ -146,7 +157,7 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 	note C#, 7
 ;	tie
 	note D_, 7
-	;musicef 255
+;	musicef -1
 	note D#, 6
 ;	musicf1 39
 	note E_, 7
@ -205,7 +216,10 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 ;	musicef 1
 	note A_, 12
 	note A_, 2
-	;musicf0 20
+;	preset 20
 	volume_envelope 12, 1
 	duty_cycle 1
 	vibrato 1, 3, 3
 ;	musicf3
 	octave 3
 	note A_, 7
@ -227,7 +241,10 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4)
 	sound_loop 0, .MainLoop
 Branch_1e75c7:
-	;musicf0 18
+;	preset 18
 	volume_envelope 7, -4
 	duty_cycle 2
 	vibrato 1, 3, 3
 ;	musicf1 39
 ;	musicf3
 ;	vibrato_type 18
@ -371,13 +388,12 @@ Branch_1e75c7:
 	sound_ret
-Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c)
+Music_TCG2GameCorner_Ch1:
 	channel_volume 10
 .MainLoop
-	channel_volume 12
+	volume_envelope 12, 2
 	duty_cycle 2
 ;	musicee 30
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	vibrato 0, 3, 3
 	speed 1
 .Loop1
@ -409,7 +425,10 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c)
 	rest 16
 	rest 11
 ;	musicee 0
-	;musicf0 20
+;	preset 20
 	volume_envelope 12, 1
 	duty_cycle 1
 	vibrato 1, 3, 3
 ;	musicf3
 	sound_call Branch_1e778f
 	octave 3
@ -667,7 +686,10 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c)
 	sound_loop 0, .MainLoop
 Branch_1e778f:
-	;musicf0 20
+;	preset 20
 	volume_envelope 12, 1
 	duty_cycle 1
 	vibrato 1, 3, 3
 ;	musicf3
 	octave 2
 	note A_, 6
@ -828,13 +850,12 @@ Branch_1e778f:
 	sound_ret
-Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f)
+Music_TCG2GameCorner_Ch3:
 	channel_volume 1
 	fade_wave 11
 	channel_volume 1
-	;musice9 64
+;	echo 64
 	speed 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 .MainLoop
 	octave 2
 	note A_, 11
@ -1379,27 +1400,27 @@ Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f)
 	sound_loop 0, .MainLoop
-Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
+Music_TCG2GameCorner_Ch4:
 	toggle_noise 6
 .MainLoop
 	octave 1
 	drum_speed 1
 .Loop1
-	;musicef 251
+;	musicef -5
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 6
 	sound_loop 13, .Loop1
-	;musicef 251
+;	musicef -5
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 6
 ;	musicef 1
 	drum_note 2, 14
@ -1411,7 +1432,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1424,24 +1445,24 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 2, 14
 	drum_note 2, 7
-	;musicef 255
+;	musicef -1
 	drum_note 2, 6
 ;	musicef 0
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1453,7 +1474,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1464,20 +1485,20 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 2, 13
 .Loop3
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 6
 ;	musicef 0
 	sound_loop 5, .Loop3
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 3
 ;	musicef 0
@ -1489,16 +1510,16 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 ;	musicef 0
 .Loop4
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 6
 ;	musicef 0
 	sound_loop 14, .Loop4
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 4
 ;	musicef 0
@ -1511,7 +1532,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1524,7 +1545,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1532,14 +1553,14 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 2, 7
 	drum_note 2, 13
 	drum_note 2, 14
-	;musicef 255
+;	musicef -1
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 6
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1551,7 +1572,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1562,20 +1583,20 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 2, 13
 .Loop6
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 6
 ;	musicef 0
 	sound_loop 5, .Loop6
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 3
 ;	musicef 0
@ -1589,18 +1610,18 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 6
@ -1608,7 +1629,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
@ -1620,51 +1641,51 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 2, 5
 	drum_note 2, 5
 	drum_note 2, 4
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
 	drum_note 2, 5
 ;	musicef 0
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 255
+;	musicef -1
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 6
 	drum_note 1, 14
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 13
 	drum_note 1, 7
-	;musicef 255
+;	musicef -1
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 6
 	drum_note 2, 14
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 3
 ;	musicef 0
@ -1674,7 +1695,7 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 1, 6
 	drum_note 2, 14
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 3
 ;	musicef 0
@ -1685,13 +1706,13 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 2, 7
 	drum_note 2, 6
 	drum_note 1, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 2, 6
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 3
 	drum_note 2, 4
 ;	musicef 0
@ -1701,4 +1722,3 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57)
 	drum_note 10, 13
 ;	musicef 0
 	sound_loop 0, .MainLoop
 ; 0x1e7bfa
--- a/crysaudio/music/TCG2/grblimp.asm
+++ b/crysaudio/music/TCG2/grblimp.asm
@ -5,18 +5,20 @@ Music_GRBlimp:
 	channel 3, Music_GRBlimp_Ch3
 	channel 4, Music_GRBlimp_Ch4
-Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa)
+Music_GRBlimp_Ch2:
-	channel_volume 10
+	stereo_panning TRUE, TRUE
 	;musicdc 17
 ;	vibrato_type 1
 	vibrato 28, 3, 3
-	fade_wave 8
+;	cutoff 8
 	octave 4
 	duty_cycle 2
-	channel_volume 7
+	volume_envelope 7, 5
 	vibrato 28, 3, 3
-	;musicf0 0
+;	preset 0
-	;musicdc 255
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	stereo_panning TRUE, TRUE
 ;	musicf1 48
 	sound_call Branch_1e7cf5
 	note G#, 16
@ -71,7 +73,10 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa)
 	note C_, 14
 	speed 1
 	note C_, 14
-	;musicf0 2
+;	preset 2
 	volume_envelope 9, 0
 	duty_cycle 3
 	vibrato 28, 3, 3
 ;	musicf3
 	speed 1
 	note C_, 5
@ -332,15 +337,17 @@ Branch_1e7cf5:
 	sound_ret
-Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c)
+Music_GRBlimp_Ch1:
-	channel_volume 10
+	stereo_panning TRUE, TRUE
 	;musicdc 17
 ;	vibrato_type 1
 	vibrato 28, 3, 3
-	fade_wave 8
+;	cutoff 8
 	speed 7
 	octave 3
-	;musicf0 1
+;	preset 1
 	volume_envelope 8, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf1 64
 	sound_call Branch_1e7e8a
 	note C#, 14
@ -688,13 +695,12 @@ Branch_1e7e8a:
 	sound_ret
-Music_GRBlimp_Ch3: ; 1e7eed (79:7eed)
+Music_GRBlimp_Ch3:
-	channel_volume 1
+	stereo_panning TRUE, TRUE
 	;musicdc 17
 	fade_wave 11
 	channel_volume 1
-	;musice8 3
+;	cutoff 3
-	;musice9 96
+;	echo 96
 	octave 2
 	speed 1
 	rest 14
@ -753,7 +759,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed)
 	note E_, 4
 	note D#, 4
 	note A#, 4
-	;musice8 2
+;	cutoff 2
 	speed 1
 	note G#, 10
 ;	tie
@ -764,7 +770,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed)
 	note G#, 10
 ;	tie
 	note G#, 8
-	;musice8 1
+;	cutoff 1
 	note G#, 4
 ;	tie
 	note A_, 4
@ -778,7 +784,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed)
 	sound_ret
-Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
+Music_GRBlimp_Ch4:
 	toggle_noise 6
 	drum_speed 9
 	octave 1
@ -786,70 +792,62 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 	rest 14
 .Loop1
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 14
 ;	musicef 0
 	drum_note 3, 3
-	;musicef 252
+;	musicef -4
 	drum_note 3, 4
 	drum_note 3, 3
 	drum_note 3, 4
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 14
 ;	musicef 0
 	drum_note 3, 3
-	;musicef 253
+;	musicef -3
 	drum_note 3, 4
 	;rept 3
 	drum_note 3, 3
 	drum_note 3, 4
 	;---
 	drum_note 3, 3
 	drum_note 3, 4
 	;---
 	drum_note 3, 3
 	drum_note 3, 4
 	;endr
 ;	musicef 0
 	drum_note 2, 14
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 7
 ;	musicef 0
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 14
 ;	musicef 0
 	drum_note 3, 3
-	;musicef 253
+;	musicef -3
 	drum_note 3, 4
 	;rept 3
 	drum_note 3, 3
 	drum_note 3, 4
 	;---
 	drum_note 3, 3
 	drum_note 3, 4
 	;---
 	drum_note 3, 3
 	drum_note 3, 4
 	;endr
 ;	musicef 0
 	sound_loop 11, .Loop1
 	drum_note 2, 14
-	;musicef 253
+;	musicef -3
 	drum_note 2, 14
 ;	musicef 0
 	drum_note 3, 3
-	;musicef 253
+;	musicef -3
 	drum_note 3, 4
 	drum_note 3, 3
 	drum_note 3, 4
@ -857,11 +855,11 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 ;	musicef 0
 	drum_note 2, 7
 	drum_note 3, 3
-	;musicef 253
+;	musicef -3
 	drum_note 3, 4
 	drum_note 3, 3
 	drum_note 3, 4
-	;musicef 255
+;	musicef -1
 	drum_note 2, 5
 ;	musicef 1
 	drum_note 2, 16
@ -871,18 +869,18 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 ;	tie
 	rest 2
 	drum_note 3, 3
-	;musicef 251
+;	musicef -5
 	drum_note 3, 4
 .Loop2
 	drum_note 3, 3
 	drum_note 3, 4
 	sound_loop 5, .Loop2
-	;musicef 252
+;	musicef -4
 .Loop3
 	drum_note 3, 3
 	drum_note 3, 4
 	sound_loop 5, .Loop3
-	;musicef 253
+;	musicef -3
 .Loop4
 	drum_note 3, 3
 	drum_note 3, 4
@ -890,4 +888,3 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50)
 ;	musicef 2
 	drum_note 3, 14
 	sound_ret
 ; 0x1e7fd6
--- a/crysaudio/music/TCG2/grcastle.asm
+++ b/crysaudio/music/TCG2/grcastle.asm
@ -5,17 +5,19 @@ Music_GRCastle:
 	channel 3, Music_GRCastle_Ch3
 	channel 4, Music_GRCastle_Ch4
-Music_GRCastle_Ch2: ; 1f213c (7c:613c)
+Music_GRCastle_Ch2:
 	channel_volume 10
 	speed 1
 	rest 12
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 1
 ;	vibrato_type 5
 	vibrato 1, 3, 3
 ;	musicf1 80
 ;	musicf3
-	;musice4 0
+;	frequency_offset 0
 	note B_, 9
 	rest 4
 	note B_, 9
@ -82,26 +84,32 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	rest 3
 	note A_, 3
 ;	tie
-	;musice4 17
+;	frequency_offset 17
 	note A_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 6
 	note A_, 13
 	note G_, 12
 .MainLoop
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf3
 	octave 2
-	channel_volume 7
+	volume_envelope 6, -4
 	note E_, 16
 ;	tie
 	note E_, 9
-	channel_volume 11
+	volume_envelope 11, 0
 	note E_, 16
 ;	tie
 	note E_, 9
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef 2
 ;	musicf1 119
 	octave 2
@ -109,28 +117,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	vibrato 37, 3, 3
 	note A_, 4
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A_, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A_, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 13
 ;	tie
 	note B_, 12
@ -177,28 +185,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 ;	musicf3
 	note C_, 4
 ;	tie
-	;musice4 7
+;	frequency_offset 7
 	note C_, 3
 ;	tie
-	;musice4 14
+;	frequency_offset 14
 	note C_, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note C_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note C#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note C#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 13
 ;	tie
 	note D_, 12
@ -215,28 +223,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 ;	musicf3
 	note A_, 4
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A_, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A_, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 13
 	inc_octave
 	note C_, 12
@ -283,28 +291,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	inc_octave
 	note C_, 4
 ;	tie
-	;musice4 7
+;	frequency_offset 7
 	note C_, 3
 ;	tie
-	;musice4 14
+;	frequency_offset 14
 	note C_, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note C_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note C#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note C#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 13
 	dec_octave
 	note A_, 12
@ -319,28 +327,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	dec_octave
 	note A_, 4
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A_, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A_, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note A#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 13
 ;	tie
 	note B_, 12
@ -385,28 +393,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	note C_, 12
 	note C_, 4
 ;	tie
-	;musice4 7
+;	frequency_offset 7
 	note C_, 3
 ;	tie
-	;musice4 14
+;	frequency_offset 14
 	note C_, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note C_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note C#, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note C#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note C#, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note C#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 13
 ;	tie
 	note D_, 12
@ -422,28 +430,28 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 ;	musicf3
 	note E_, 4
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note E_, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note E_, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note E_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F_, 3
 ;	tie
-	;musice4 8
+;	frequency_offset 8
 	note F_, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note F_, 3
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note F_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F#, 13
 	note G_, 12
 ;	musicf2
@ -494,38 +502,44 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 ;	tie
 	note E_, 4
 ;	tie
-	;musice4 249
+;	frequency_offset -7
 	note E_, 3
 ;	tie
-	;musice4 242
+;	frequency_offset -14
 	note E_, 3
 ;	tie
-	;musice4 235
+;	frequency_offset -21
 	note E_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D#, 3
 ;	tie
-	;musice4 250
+;	frequency_offset -6
 	note D#, 3
 ;	tie
-	;musice4 244
+;	frequency_offset -12
 	note D#, 3
 ;	tie
-	;musice4 240
+;	frequency_offset -16
 	note D#, 2
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note D_, 1
-	;musicf0 14
+;	preset 14
 	volume_envelope 10, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf1 71
 ;	musicf3
 	octave 2
-	channel_volume 8
+	volume_envelope 7, -4
 	note B_, 16
 ;	tie
 	note B_, 9
-	;musicf0 14
+;	preset 14
 	volume_envelope 10, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 	note B_, 3
 	inc_octave
 ;	musicef 1
@ -786,10 +800,13 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	note F#, 12
 ;	musicf3
 	octave 1
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	vibrato_type 5
 	vibrato 50, 3, 3
-	;musice4 247
+;	frequency_offset -9
 .Loop1
 	note E_, 16
 ;	tie
@ -805,8 +822,11 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 ;	tie
 	sound_loop 4, .Loop1
 	note E_, 16
-	;musice4 0
+;	frequency_offset 0
-	;musicf0 23
+;	preset 23
 	volume_envelope 6, 7
 	duty_cycle 2
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 32
 ;	musicf2
@ -902,17 +922,19 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c)
 	sound_loop 0, .MainLoop
-Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
+Music_GRCastle_Ch1:
 	channel_volume 10
 	speed 1
 	rest 12
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 1
 ;	vibrato_type 5
 	vibrato 1, 3, 3
 ;	musicf1 80
 ;	musicf3
-	;musice4 0
+;	frequency_offset 0
 	rest 13
 	rest 12
 	rest 13
@ -969,10 +991,10 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	inc_octave
 	note E_, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note E_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F_, 6
 	note E_, 13
 	note D_, 12
@ -982,7 +1004,10 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	note A_, 13
 	note A#, 12
 .MainLoop
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 2
 ;	vibrato_type 5
 	vibrato 0, 3, 3
@ -1310,7 +1335,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	dec_octave
 	note A_, 12
 	octave 2
-	;musicef 254
+;	musicef -2
 	note E_, 13
 ;	tie
 	note E_, 12
@ -1324,28 +1349,28 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	inc_octave
 	note D_, 4
 ;	tie
-	;musice4 6
+;	frequency_offset 6
 	note D_, 3
 ;	tie
-	;musice4 12
+;	frequency_offset 12
 	note D_, 3
 ;	tie
-	;musice4 15
+;	frequency_offset 15
 	note D_, 3
 ;	tie
-	;musice4 254
+;	frequency_offset -2
 	note D#, 3
 ;	tie
-	;musice4 5
+;	frequency_offset 5
 	note D#, 3
 ;	tie
-	;musice4 10
+;	frequency_offset 10
 	note D#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note D#, 3
 ;	tie
-	;musice4 255
+;	frequency_offset -1
 	note E_, 13
 ;	tie
 	note E_, 12
@ -1456,7 +1481,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	note A_, 13
 ;	tie
 	note A_, 12
-	;musicef 253
+;	musicef -3
 	inc_octave
 	note G_, 13
 ;	tie
@ -1472,28 +1497,28 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	inc_octave
 	note D_, 4
 ;	tie
-	;musice4 6
+;	frequency_offset 6
 	note D_, 3
 ;	tie
-	;musice4 12
+;	frequency_offset 12
 	note D_, 3
 ;	tie
-	;musice4 15
+;	frequency_offset 15
 	note D_, 3
 ;	tie
-	;musice4 254
+;	frequency_offset -2
 	note D#, 3
 ;	tie
-	;musice4 5
+;	frequency_offset 5
 	note D#, 3
 ;	tie
-	;musice4 10
+;	frequency_offset 10
 	note D#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note D#, 3
 ;	tie
-	;musice4 255
+;	frequency_offset -1
 	note E_, 13
 ;	tie
 	note E_, 12
@ -1580,16 +1605,16 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	inc_octave
 	note D_, 3
 ;	tie
-	;musice4 6
+;	frequency_offset 6
 	note D_, 3
 ;	tie
-	;musice4 253
+;	frequency_offset -3
 	note D#, 3
 ;	tie
-	;musice4 13
+;	frequency_offset 13
 	note D#, 3
 ;	tie
-	;musice4 254
+;	frequency_offset -2
 	note E_, 13
 ;	tie
 	note E_, 12
@ -1612,7 +1637,10 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 ;	tie
 	note D#, 12
 ;	musicf3
-	;musicf0 23
+;	preset 23
 	volume_envelope 6, 7
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf1 32
 ;	musicf3
 	octave 3
@ -1817,12 +1845,11 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525)
 	sound_loop 0, .MainLoop
-Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
+Music_GRCastle_Ch3:
 	channel_volume 1
 	fade_wave 11
 	channel_volume 1
-	;musice9 96
+;	echo 96
-	;musicdc 255
+	stereo_panning TRUE, TRUE
 	speed 1
 	rest 12
 ;	vibrato_type 5
@ -1894,13 +1921,13 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 	note E_, 9
 	rest 3
 	rest 13
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f2b72
 	note D_, 13
 	note E_, 9
 	rest 3
 	rest 13
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f2b9e
 	note B_, 9
 	rest 3
@ -1967,13 +1994,13 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 	note E_, 9
 	rest 3
 	rest 13
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f2b72
 	note D_, 13
 	note E_, 9
 	rest 3
 	rest 13
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f2b9e
 	note B_, 9
 	rest 3
@ -2066,10 +2093,10 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 ;	tie
 	note A#, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 3
 ;	tie
 	note B_, 13
@ -2200,10 +2227,10 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 ;	tie
 	note A#, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 3
 ;	tie
 	note B_, 13
@ -2234,16 +2261,16 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 	note C_, 12
 	note D#, 4
 ;	tie
-	;musice4 24
+;	frequency_offset 24
 	note D#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note E_, 3
 ;	tie
-	;musice4 22
+;	frequency_offset 22
 	note E_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note F_, 12
 ;	tie
 	note F_, 13
@ -2275,16 +2302,16 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 	vibrato 40, 3, 3
 	note A_, 4
 ;	tie
-	;musice4 17
+;	frequency_offset 17
 	note A_, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 3
 ;	tie
-	;musice4 16
+;	frequency_offset 16
 	note A#, 3
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note B_, 12
 ;	tie
 	note B_, 16
@ -2299,34 +2326,34 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 ;	tie
 	note B_, 2
 ;	tie
-	;musice4 250
+;	frequency_offset -6
 	note B_, 3
 ;	tie
-	;musice4 244
+;	frequency_offset -12
 	note B_, 2
 ;	tie
-	;musice4 238
+;	frequency_offset -18
 	note B_, 2
 ;	tie
-	;musice4 232
+;	frequency_offset -24
 	note B_, 2
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A#, 2
 ;	tie
-	;musice4 248
+;	frequency_offset -8
 	note A#, 2
 ;	tie
-	;musice4 240
+;	frequency_offset -16
 	note A#, 2
 ;	tie
-	;musice4 232
+;	frequency_offset -24
 	note A#, 2
 ;	tie
-	;musice4 0
+;	frequency_offset 0
 	note A_, 1
 	vibrato 50, 3, 3
-	;musicec 244
+;	pitch_offset 244
 	octave 2
 	speed 10
 	note E_, 10
@ -2345,7 +2372,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903)
 	channel_volume 3
 	note E_, 15
 	channel_volume 1
-	;musicec 0
+;	pitch_offset 0
 	speed 1
 	note D_, 13
 	note E_, 12
@ -2381,7 +2408,7 @@ Branch_1f2b72:
 	vibrato 0, 3, 3
 	channel_volume 1
 	octave 2
-	;musicec 0
+;	pitch_offset 0
 	sound_ret
 Branch_1f2b88:
@ -2400,7 +2427,7 @@ Branch_1f2b88:
 	vibrato 0, 3, 3
 	channel_volume 1
 	octave 2
-	;musicec 0
+;	pitch_offset 0
 	sound_ret
 Branch_1f2b9e:
@ -2411,7 +2438,7 @@ Branch_1f2b9e:
 	note D_, 13
 	channel_volume 1
 	octave 2
-	;musicec 0
+;	pitch_offset 0
 	sound_ret
 Branch_1f2baa:
@ -2446,12 +2473,12 @@ Branch_1f2bbf:
 	sound_ret
-Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
+Music_GRCastle_Ch4:
 	toggle_noise 6
 	drum_speed 1
 	octave 1
-	;musicdc 255
+	stereo_panning TRUE, TRUE
-	;musicef 251
+;	musicef -5
 	drum_note 2, 4
 	drum_note 2, 4
 	drum_note 2, 4
@ -2472,7 +2499,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	rest 9
 	drum_note 1, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2494,7 +2521,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	drum_note 2, 6
 	drum_note 2, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2516,7 +2543,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	rest 9
 	drum_note 1, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2537,7 +2564,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	drum_note 2, 12
 	drum_note 1, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2558,7 +2585,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	rest 9
 	drum_note 1, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2583,9 +2610,9 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	drum_note 2, 6
 	drum_note 2, 13
 	drum_note 2, 4
-	;musicef 254
+;	musicef -2
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 ;	musicef 0
 	sound_call Branch_1f2d0c
@ -2641,9 +2668,9 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	drum_note 2, 13
 	drum_note 1, 12
 	drum_note 5, 13
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 ;	musicef 0
 	drum_note 2, 4
@ -2673,7 +2700,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	rest 16
 	rest 16
 	rest 8
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 	drum_note 2, 4
@ -2694,7 +2721,7 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb)
 	rest 9
 	drum_note 1, 13
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 4
 	drum_note 2, 4
 ;	musicef 0
@ -2743,4 +2770,3 @@ Branch_1f2d18:
 	drum_note 4, 4
 	drum_note 4, 4
 	sound_ret
 ; 0x1f2d24
--- a/crysaudio/music/TCG2/grchallengecup.asm
+++ b/crysaudio/music/TCG2/grchallengecup.asm
@ -5,15 +5,16 @@ Music_GRChallengeCup:
 	channel 3, Music_GRChallengeCup_Ch3
 	channel 4, Music_GRChallengeCup_Ch4
-Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
+Music_GRChallengeCup_Ch2:
 ;.MainLoop
 	channel_volume 10
 	speed 1
-	;musicdc 17
+	stereo_panning TRUE, TRUE
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 4
 	vibrato 24, 3, 3
-	;musicef 255
+;	musicef -1
 	note C_, 4
 	note C#, 4
 	note D_, 4
@ -69,8 +70,8 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note G_, 5
 	note B_, 15
 	note B_, 5
-	;musicef 250
+;	musicef -6
-	channel_volume 2
+	volume_envelope 1, -6
 ;	musicf3
 	speed 6
 	note A_, 10
@ -79,19 +80,22 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note A_, 15
 ;	tie
 	note A_, 10
-	channel_volume 10
+	volume_envelope 10, 0
 ;	musicf1 54
 	note A_, 5
 	note A_, 15
 ;	tie
 	note A_, 15
-	;musicf0 8
+;	preset 8
-	;musicef 255
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -1
 ;	musicf1 67
 .Loop1
 	octave 2
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note E_, 5
 	note E_, 10
 	note E_, 5
@ -107,13 +111,16 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note E_, 2
 	sound_loop 2, .Loop1
 .MainLoop
-	;musicf0 8
+;	preset 8
-	;musicef 255
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -1
 ;	musicf1 67
 .Loop2
 	octave 2
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note F_, 5
 	note F_, 10
 	note F_, 5
@ -131,7 +138,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 .Loop3
 	octave 2
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note F#, 5
 	note F#, 10
 	note F#, 5
@ -148,7 +155,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	sound_loop 2, .Loop3
 	octave 2
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note F_, 5
 	note F_, 10
 	note F_, 5
@ -164,7 +171,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note F_, 2
 	octave 2
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note F_, 5
 	note F_, 10
 	note F_, 5
@ -172,12 +179,15 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note F_, 5
 	note F_, 2
 ;	musicf3
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef 1
 ;	vibrato_type 1
 	vibrato 15, 3, 3
 	octave 3
-	;musice4 0
+;	frequency_offset 0
 ;	musicf1 70
 	note E_, 15
 	note E_, 8
@ -461,7 +471,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	note C_, 8
 	note D_, 7
 	vibrato 30, 3, 3
-	;musicef 255
+;	musicef -1
 	note E_, 15
 ;	tie
 	note E_, 15
@ -480,13 +490,14 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24)
 	sound_loop 0, .MainLoop
-Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
+Music_GRChallengeCup_Ch1:
 ;.MainLoop
 	channel_volume 10
 	speed 1
-	;musicdc 17
+	stereo_panning TRUE, TRUE
-	;musicf0 1
+;	preset 1
-	;musicef 255
+	volume_envelope 8, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -1
 	octave 3
 	vibrato 24, 3, 3
 	note G_, 4
@ -549,8 +560,8 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	inc_octave
 	note D_, 15
 	note D_, 5
-	;musicef 250
+;	musicef -6
-	channel_volume 2
+	volume_envelope 1, -6
 ;	musicf3
 	speed 6
 	note C#, 10
@ -559,18 +570,21 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note C#, 15
 ;	tie
 	note C#, 10
-	channel_volume 9
+	volume_envelope 9, 0
 ;	musicf1 54
 	note C#, 5
 	note C#, 15
 ;	tie
 	note C#, 15
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf1 67
 .Loop1
 	octave 1
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note A_, 5
 	note A_, 10
 	note A_, 5
@ -592,7 +606,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 .Loop2
 	octave 1
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note A_, 5
 	note A_, 10
 	note A_, 5
@ -611,7 +625,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	sound_loop 5, .Loop2
 	octave 1
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note A_, 5
 	note A_, 10
 	note A_, 5
@ -624,8 +638,11 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 ;	tie
 	note B_, 8
 	dec_octave
-	;musicf0 21
+;	preset 21
-	channel_volume 8
+	volume_envelope 8, 7
 	duty_cycle 2
 	vibrato 15, 3, 3
 	volume_envelope 8, 0
 	octave 2
 	note A_, 5
 	rest 2
@ -637,20 +654,20 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	rest 15
 	rest 15
 	note E_, 15
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	note G_, 15
 	note F#, 15
 ;	tie
 	note F#, 15
-	;musicec 2
+;	pitch_offset 2
 	sound_call Branch_1f3140
 	note F#, 8
 	rest 7
 	note F#, 15
 ;	tie
 	note F#, 15
-	;musicec 2
+;	pitch_offset 2
 	sound_call Branch_1f3140
 	note F#, 5
 	rest 3
@ -659,14 +676,14 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note F_, 15
 ;	tie
 	note F_, 15
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	note F_, 8
 	rest 7
 	note D_, 15
 	note C_, 8
 	rest 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	note D_, 8
 	rest 7
@ -690,20 +707,20 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	rest 15
 	rest 15
 	note E_, 15
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	note G_, 15
 	note F#, 15
 ;	tie
 	note F#, 15
-	;musicec 2
+;	pitch_offset 2
 	sound_call Branch_1f3140
 	note F#, 8
 	rest 7
 	note F#, 15
 ;	tie
 	note F#, 15
-	;musicec 2
+;	pitch_offset 2
 	sound_call Branch_1f3140
 	note F#, 5
 	rest 3
@ -713,21 +730,21 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 ;	tie
 	note F_, 8
 	rest 7
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	rest 8
 	rest 7
 	note B_, 15
 	rest 5
 	note B_, 10
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	rest 15
 	inc_octave
 	note C_, 15
 ;	tie
 	note C_, 15
-	;musicec 8
+;	pitch_offset 8
 	sound_call Branch_1f3140
 	octave 3
 	note G_, 8
@ -735,7 +752,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note G_, 15
 ;	tie
 	note G_, 15
-	;musicec 6
+;	pitch_offset 6
 	sound_call Branch_1f3140
 	note A_, 8
 	note A#, 7
@ -743,7 +760,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note C_, 15
 ;	tie
 	note C_, 15
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	octave 4
 	note C_, 8
@ -752,7 +769,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note B_, 15
 	note B_, 8
 	rest 7
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	octave 4
 	note D_, 8
@ -770,7 +787,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	sound_call Branch_1f3150
 	rest 8
 	rest 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	octave 3
 	note F_, 8
@ -778,7 +795,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note A_, 15
 ;	tie
 	note A_, 15
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f3140
 	note A_, 8
 	rest 7
@ -786,7 +803,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	rest 2
 	note G#, 8
 	rest 7
-	;musicec 4
+;	pitch_offset 4
 	sound_call Branch_1f3140
 	note G#, 8
 	rest 7
@ -798,21 +815,21 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	rest 8
 	sound_call Branch_1f3150
 	rest 15
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	note E_, 8
 	note G_, 7
 	note A_, 15
 ;	tie
 	note A_, 15
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	note A_, 8
 	rest 7
 	note B_, 15
 	note A_, 5
 	rest 10
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	note F_, 8
 	rest 7
@ -820,15 +837,15 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 ;	tie
 	note E_, 15
 	inc_octave
-	channel_volume 6
+	volume_envelope 5, -7
 	note D_, 15
 ;	tie
 	note D_, 15
-	channel_volume 6
+	volume_envelope 6, 0
 	note C#, 15
 ;	tie
 	note C#, 15
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f3140
 	rest 8
 	dec_octave
@ -837,20 +854,20 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note A_, 15
 ;	tie
 	note A_, 15
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	note A_, 8
 	note F_, 7
 	note D_, 15
 	rest 5
 	note F_, 10
-	;musicec 4
+;	pitch_offset 4
 	sound_call Branch_1f3140
 	rest 15
 	note G_, 15
 ;	tie
 	note G_, 15
-	;musicec 1
+;	pitch_offset 1
 	sound_call Branch_1f3140
 	note G_, 4
 	note D_, 4
@ -865,14 +882,17 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	note A_, 15
 ;	tie
 	note A_, 15
-	;musicf0 8
+;	preset 8
-	;musicef 255
+	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -1
 	octave 2
 ;	musicf1 67
 ;	musicf3
 	note B_, 15
 ;	musicf2
-	fade_wave 8
+;	cutoff 8
 	note E_, 5
 	note E_, 3
 	note E_, 5
@ -892,37 +912,48 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36)
 	sound_loop 0, .MainLoop
 Branch_1f3140:
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 2
-	;musicef 255
+;	musicef -1
 	note E_, 15
 ;	musicef 1
-	;musicf0 21
+;	preset 21
 	volume_envelope 8, 7
 	duty_cycle 2
 	vibrato 15, 3, 3
 ;	musicf1 128
 	octave 3
-	;musicec 0
+;	pitch_offset 0
 	sound_ret
 Branch_1f3150:
-	;musicf0 8
+;	preset 8
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 2
 ;	musicf2
 	note G_, 4
 	note G_, 3
-	;musicf0 21
+;	preset 21
-	channel_volume 8
+	volume_envelope 8, 7
 	duty_cycle 2
 	vibrato 15, 3, 3
 	volume_envelope 8, 0
 	octave 3
 ;	musicf3
 	sound_ret
-Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
+Music_GRChallengeCup_Ch3:
 	channel_volume 1
 	speed 1
 	fade_wave 11
 	channel_volume 1
-	;musice9 96
+;	echo 96
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 	octave 5
 	rest 16
 	octave 2
@ -987,7 +1018,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 10
 	rest 16
 	rest 14
-	;musice8 4
+;	cutoff 4
 	note A_, 15
 	note A_, 8
 	note A_, 7
@ -1003,7 +1034,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 8
 	note A_, 7
 .MainLoop
-	;musice8 4
+;	cutoff 4
 	octave 2
 .Loop1
 	note A_, 15
@ -1030,7 +1061,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 15
 	note A_, 8
 	note A_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note A_, 8
 	note A_, 7
@ -1049,14 +1080,14 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 15
 	note A_, 8
 	note A_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note A_, 8
 	note A_, 7
 	note A_, 15
 	note A_, 8
 	note A_, 7
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f333b
 	note A_, 8
 	note A_, 7
@ -1068,16 +1099,16 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 7
 	note A_, 8
 	octave 4
-	;musice8 4
+;	cutoff 4
 	note C_, 4
 	rest 3
-	;musice8 8
+;	cutoff 8
 	octave 2
-	;musice8 8
+;	cutoff 8
 	note F#, 15
 	note G_, 15
 	note G#, 15
-	;musice8 4
+;	cutoff 4
 	note A_, 15
 	note A_, 8
 	note A_, 7
@ -1087,7 +1118,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 15
 	note A_, 8
 	note A_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note A_, 8
 	note A_, 7
@ -1106,14 +1137,14 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note A_, 15
 	note A_, 8
 	note A_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note A_, 8
 	note A_, 7
 	note B_, 15
 	note B_, 8
 	note B_, 7
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f333b
 	note B_, 8
 	note B_, 7
@ -1121,7 +1152,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note C_, 15
 	note C_, 8
 	note C_, 7
-	;musicec 8
+;	pitch_offset 8
 	sound_call Branch_1f333b
 	octave 3
 	note C_, 8
@ -1130,22 +1161,22 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note C_, 8
 	inc_octave
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note E_, 4
 	rest 3
-	;musice8 4
+;	cutoff 4
 	dec_octave
 	dec_octave
 	note C_, 8
 	note C_, 7
-	;musice8 8
+;	cutoff 8
 	note D_, 15
 	note E_, 15
-	;musice8 4
+;	cutoff 4
 	note F_, 15
 	note F_, 8
 	note F_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note F_, 8
 	note F_, 7
@ -1158,35 +1189,35 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	note E_, 15
 	note E_, 8
 	note E_, 7
-	;musicec 254
+;	pitch_offset 254
 	sound_call Branch_1f333b
 	note E_, 8
 	note E_, 7
 	note E_, 8
 	inc_octave
 	inc_octave
-	;musice8 4
+;	cutoff 4
 	note C_, 4
 	rest 3
 	dec_octave
 	dec_octave
 	note E_, 8
 	note E_, 7
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f333b
 	note E_, 8
 	note E_, 7
 	note D_, 15
 	note D_, 8
 	note D_, 7
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f333b
 	note D_, 8
 	note D_, 7
 	note E_, 15
 	note E_, 8
 	note E_, 7
-	;musicec 7
+;	pitch_offset 7
 	sound_call Branch_1f333b
 	note E_, 8
 	note E_, 7
@ -1205,28 +1236,28 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	dec_octave
 	note G_, 8
 	note G_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note G_, 8
 	note G_, 7
 	note F_, 15
 	note F_, 8
 	note F_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note F_, 8
 	note F_, 7
 	note F_, 15
 	note F_, 8
 	note F_, 7
-	;musicec 5
+;	pitch_offset 5
 	sound_call Branch_1f333b
 	note F_, 8
 	note F_, 7
 	note E_, 15
 	note E_, 8
 	note E_, 7
-	;musicec 254
+;	pitch_offset 254
 	sound_call Branch_1f333b
 	note E_, 8
 	note E_, 7
@ -1239,40 +1270,40 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 	dec_octave
 	note D#, 8
 	note D#, 7
-	;musicec 4
+;	pitch_offset 4
 	sound_call Branch_1f333b
 	note D#, 8
 	note D#, 7
 	note D_, 15
 	note D_, 8
 	note D_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note D_, 8
 	note D_, 7
 	note D_, 15
 	note D_, 8
 	note D_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	note D_, 8
 	note D_, 7
 	note G_, 15
 	note G_, 8
 	note G_, 7
-	;musicec 3
+;	pitch_offset 3
 	sound_call Branch_1f333b
 	inc_octave
 	note D_, 8
 	note D_, 7
-	;musice8 8
+;	cutoff 8
 	note G_, 15
 	dec_octave
 	note G_, 15
 	note G#, 15
 	inc_octave
 	note G#, 15
-	;musice8 4
+;	cutoff 4
 	dec_octave
 	note A_, 15
 	note A_, 8
@ -1291,16 +1322,16 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d)
 Branch_1f333b:
 	octave 3
 	channel_volume 2
-	;musice8 8
+;	cutoff 8
 	note A_, 15
 	channel_volume 1
-	;musice8 4
+;	cutoff 4
-	;musicec 0
+;	pitch_offset 0
 	octave 2
 	sound_ret
-Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349)
+Music_GRChallengeCup_Ch4:
 	toggle_noise 6
 	drum_speed 1
 	octave 1
@ -1310,7 +1341,7 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349)
 	rest 16
 	rest 13
 	drum_note 2, 5
-	;musicef 254
+;	musicef -2
 	drum_note 2, 5
 	drum_note 2, 5
 ;	musicef 0
@ -1339,14 +1370,14 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349)
 	drum_note 2, 8
 	drum_note 4, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
 	drum_note 2, 3
 ;	musicef 0
 	drum_note 2, 8
 	drum_note 2, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
 	drum_note 2, 3
 ;	musicef 0
@ -1387,7 +1418,7 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349)
 	drum_note 1, 8
 	drum_note 2, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
 	drum_note 2, 3
 ;	musicef 0
@ -1407,7 +1438,7 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349)
 	drum_note 2, 8
 	drum_note 4, 7
 	drum_note 4, 8
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
 	drum_note 2, 3
 ;	musicef 0
@ -1463,4 +1494,3 @@ Branch_1f33fd:
 	drum_note 5, 8
 	drum_note 2, 7
 	sound_ret
 ; 0x1f3411
--- a/crysaudio/music/TCG2/grdueltheme1.asm
+++ b/crysaudio/music/TCG2/grdueltheme1.asm
@ -5,11 +5,13 @@ Music_GRDuelTheme1:
 	channel 3, Music_GRDuelTheme1_Ch3
 	channel 4, Music_GRDuelTheme1_Ch4
-Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
+Music_GRDuelTheme1_Ch2:
-	channel_volume 10
+	stereo_panning TRUE, TRUE
 	;musicdc 255
 	speed 1
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 54
 	rest 15
@ -118,7 +120,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 	note F_, 15
 	rest 7
 	sound_call Branch_1f5ae8
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicf1 54
 	octave 3
 	note G_, 7
@ -171,7 +176,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 	note F_, 15
 	rest 7
 	sound_call Branch_1f5ae8
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicf1 54
 	octave 3
 	note G_, 7
@ -217,7 +225,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 ;	tie
 	note G_, 7
 	note F_, 8
-	;musicf0 4
+;	preset 4
 	volume_envelope 10, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf3
 	octave 2
 	note A_, 7
@ -392,7 +403,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 	note A_, 7
 	note A_, 7
 .Loop2
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf3
 	octave 2
 	note A_, 5
@ -494,7 +508,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 	note E_, 5
 	note F_, 5
 	note G_, 4
-	;musicf0 4
+;	preset 4
 	volume_envelope 10, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf3
 	note G#, 3
 	note A_, 12
@ -533,7 +550,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 	note A_, 15
 ;	tie
 	note A_, 14
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf3
 	octave 2
 	note G_, 5
@ -584,7 +604,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 ;	tie
 	note E_, 14
 	note E_, 15
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 54
 	octave 3
@ -607,7 +630,10 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865)
 Branch_1f5ae8:
 ;	musicf3
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef 1
 	octave 2
 	note A#, 3
@ -686,13 +712,19 @@ Branch_1f5ae8:
 ;	tie
 	note A_, 14
 	note A_, 8
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicef 1
 ;	musicf1 54
 	note F_, 7
 	note F_, 14
-	;musicf0 0
+;	preset 0
 	volume_envelope 10, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 3
 ;	musicef 1
 ;	musicf1 55
@ -905,12 +937,14 @@ Branch_1f5ae8:
 	sound_ret
-Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
+Music_GRDuelTheme1_Ch1:
-	channel_volume 10
+	stereo_panning TRUE, TRUE
 	;musicdc 255
 	speed 1
-	;musicf0 16
+;	preset 16
-	;musicef 255
+	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicef -1
 	octave 3
 ;	musicf1 54
 	rest 15
@ -1131,7 +1165,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note F_, 7
 	note F_, 15
 	rest 14
-	;musicef 255
+;	musicef -1
 	rest 15
 	octave 3
 	note E_, 7
@ -1183,8 +1217,11 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note C#, 7
 	note C#, 15
 	rest 7
-	;musicf0 1
+;	preset 1
-	;musicef 255
+	volume_envelope 8, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicef -1
 ;	musicf1 55
 ;	musicf3
 	octave 2
@ -1261,14 +1298,20 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 ;	tie
 	note F_, 14
 	note F_, 8
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 54
 	note C#, 7
 	note C#, 14
-	;musicf0 1
+;	preset 1
 	volume_envelope 8, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 	octave 2
-	;musicef 255
+;	musicef -1
 ;	musicf1 55
 	note A_, 15
 ;	tie
@ -1452,9 +1495,12 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note F#, 7
 	note F#, 7
 	note E_, 15
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
-	;musicef 255
+;	musicef -1
 ;	musicf1 54
 	octave 3
 	note E_, 7
@ -1511,9 +1557,12 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 ;	tie
 	note E_, 7
 	note C#, 8
-	;musicf0 4
+;	preset 4
-	;musicef 251
+	volume_envelope 10, 0
-	;musice4 254
+	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicef -5
 ;	frequency_offset -2
 	rest 7
 ;	musicf3
 	octave 2
@ -1527,9 +1576,12 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note A_, 7
 	note A#, 4
 	rest 4
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicef 1
-	;musice4 0
+;	frequency_offset 0
 ;	musicf1 70
 	rest 7
 	note D_, 7
@ -1666,7 +1718,10 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	rest 15
 	note C#, 7
 	note C#, 7
-	;musicf0 1
+;	preset 1
 	volume_envelope 8, 0
 	duty_cycle 0
 	vibrato 28, 3, 3
 ;	musicf3
 	octave 2
 	note F_, 5
@ -1826,7 +1881,10 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	inc_octave
 	note C#, 5
 	note E_, 4
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 54
 	rest 15
@ -1848,9 +1906,12 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note F_, 8
 	note F_, 14
 	note F_, 7
-	;musicf0 4
+;	preset 4
 	volume_envelope 10, 0
 	duty_cycle 2
 	vibrato 28, 3, 3
 ;	musicf3
-	;musicef 254
+;	musicef -2
 	octave 3
 ;	musicf1 71
 	note D_, 15
@ -1868,18 +1929,24 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	note A#, 9
 ;	musicf3
 	note G_, 7
-	;musicf0 16
+;	preset 16
 	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 	octave 3
 ;	musicf1 53
-	channel_volume 7
+	volume_envelope 7, 0
 .Loop6
 	note C#, 15
 ;	tie
 	note C#, 7
 	note C#, 7
 	sound_loop 2, .Loop6
-	;musicf0 16
+;	preset 16
-	;musicef 255
+	volume_envelope 8, 7
 	duty_cycle 1
 	vibrato 28, 3, 3
 ;	musicef -1
 	octave 3
 ;	musicf1 54
 	rest 15
@ -1913,16 +1980,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b)
 	sound_loop 0, .MainLoop
-Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f)
+Music_GRDuelTheme1_Ch3:
 	channel_volume 1
 	speed 1
 	fade_wave 11
 	channel_volume 1
-	;musice9 64
+;	echo 64
-	;musicdc 17
+	stereo_panning TRUE, TRUE
 	octave 3
-	;musice8 7
+;	cutoff 7
-	;musicec 244
+;	pitch_offset 244
 .Loop1
 	sound_call Branch_1f6313
 	sound_loop 2, .Loop1
@ -2448,7 +2514,7 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f)
 	note D_, 2
 	speed 1
 	note G_, 14
-	;musice8 7
+;	cutoff 7
 	speed 1
 	note D#, 16
 ;	tie
@ -2456,15 +2522,15 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f)
 	note D#, 16
 ;	tie
 	note D#, 13
-	;musice8 7
+;	cutoff 7
 	sound_call Branch_1f6313
 	sound_call Branch_1f6313
 	sound_loop 0, .MainLoop
 Branch_1f6313:
 	octave 3
-	;musicec 244
+;	pitch_offset 244
-	;musice8 7
+;	cutoff 7
 	speed 11
 	note D_, 2
 	note A_, 2
@ -2478,7 +2544,7 @@ Branch_1f6313:
 	sound_ret
-Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327)
+Music_GRDuelTheme1_Ch4:
 	toggle_noise 6
 	drum_speed 1
 	octave 1
@ -2824,11 +2890,11 @@ Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327)
 	drum_note 4, 7
 	drum_note 7, 7
 	drum_note 2, 4
-	;musicef 252
+;	musicef -4
 	drum_note 2, 5
-	;musicef 253
+;	musicef -3
 	drum_note 2, 5
-	;musicef 254
+;	musicef -2
 	drum_note 2, 5
 ;	musicef 0
 	drum_note 2, 5
@ -2885,11 +2951,11 @@ Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327)
 	drum_note 2, 7
 	drum_note 4, 8
 	drum_note 2, 7
-	;musicef 253
+;	musicef -3
 	drum_note 2, 4
-	;musicef 254
+;	musicef -2
 	drum_note 2, 5
-	;musicef 255
+;	musicef -1
 	drum_note 2, 5
 ;	musicef 0
 	drum_note 1, 15
@ -2953,4 +3019,3 @@ Branch_1f6503:
 	drum_note 5, 7
 	drum_note 4, 7
 	sound_ret
 ; 0x1f6517
--- a/crysaudio/music/TCG2/grdueltheme2.asm
+++ b/crysaudio/music/TCG2/grdueltheme2.asm
--- a/crysaudio/music/TCG2/grdueltheme3.asm
+++ b/crysaudio/music/TCG2/grdueltheme3.asm
--- a/crysaudio/music/TCG2/groverworld.asm
+++ b/crysaudio/music/TCG2/groverworld.asm
--- a/crysaudio/music/TCG2/herecomesgr.asm
+++ b/crysaudio/music/TCG2/herecomesgr.asm
--- a/crysaudio/music/TCG2/imakuni2.asm
+++ b/crysaudio/music/TCG2/imakuni2.asm
--- a/crysaudio/music/TCG2/ishihara.asm
+++ b/crysaudio/music/TCG2/ishihara.asm
--- a/crysaudio/music/TCG2/titlescreen.asm
+++ b/crysaudio/music/TCG2/titlescreen.asm