diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm
@@ -1,61 +1,61 @@
-SFX_Caught_Mon_Ch4:
-	executemusic
+SFX_Caught_Mon_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 6, 11, 2
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 6, 11, 2
 	octave 3
-	E_ 2
-	F# 2
-	G# 2
-	G# 1
-	G# 1
-	B_ 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	D# 1
-	D# 1
-	notetype 6, 11, 5
-	E_ 8
-	endchannel
+	note C#, 2
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	note_type 6, 11, 5
+	note E_, 8
+	sound_ret
 
 
-SFX_Caught_Mon_Ch5:
-	executemusic
-	duty 2
-	notetype 6, 12, 2
+SFX_Caught_Mon_Ch6:
+	execute_music
+	duty_cycle 2
+	note_type 6, 12, 2
 	octave 4
-	G# 2
-	G# 1
-	G# 1
-	E_ 2
-	E_ 1
-	E_ 1
-	B_ 2
-	B_ 1
-	B_ 1
-	A_ 2
-	A_ 1
-	A_ 1
-	notetype 6, 12, 5
-	G# 8
-	endchannel
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note E_, 2
+	note E_, 1
+	note E_, 1
+	note B_, 2
+	note B_, 1
+	note B_, 1
+	note A_, 2
+	note A_, 1
+	note A_, 1
+	note_type 6, 12, 5
+	note G#, 8
+	sound_ret
 
 
-SFX_Caught_Mon_Ch6:
-	executemusic
-	notetype 6, 1, 0
+SFX_Caught_Mon_Ch7:
+	execute_music
+	note_type 6, 1, 0
 	octave 4
-	B_ 2
+	note B_, 2
 	rest 2
 	octave 5
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	F# 2
-	G_ 2
-	G# 4
-	endchannel
+	note F#, 2
+	note G_, 2
+	note G#, 4
+	sound_ret
diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm
@@ -1,6 +1,6 @@
-SFX_Collision_1_Ch4:
-	duty 2
-	pitchenvelope 5, -2
-	squarenote 15, 15, 1, 768
-	pitchenvelope 0, 0
-	endchannel
+SFX_Collision_1_Ch5:
+	duty_cycle 2
+	pitch_sweep 5, -2
+	square_note 15, 15, 1, 768
+	pitch_sweep 0, 8
+	sound_ret
diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm
@@ -1,6 +1,6 @@
-SFX_Collision_3_Ch4:
-	duty 2
-	pitchenvelope 5, -2
-	squarenote 15, 15, 1, 768
-	pitchenvelope 0, 0
-	endchannel
+SFX_Collision_3_Ch5:
+	duty_cycle 2
+	pitch_sweep 5, -2
+	square_note 15, 15, 1, 768
+	pitch_sweep 0, 8
+	sound_ret
diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_1_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_1_Ch5:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_1_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_1_Ch6:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_1_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_1_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_2_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_2_Ch5:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_2_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_2_Ch6:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_2_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_2_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry00_3_Ch4:
-	dutycycle 245
-	squarenote 4, 15, 3, 1816
-	squarenote 15, 14, 5, 1944
-	squarenote 8, 9, 1, 1880
-	endchannel
+SFX_Cry00_3_Ch5:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 4, 15, 3, 1816
+	square_note 15, 14, 5, 1944
+	square_note 8, 9, 1, 1880
+	sound_ret
 
 
-SFX_Cry00_3_Ch5:
-	dutycycle 160
-	squarenote 5, 11, 3, 1800
-	squarenote 15, 12, 5, 1928
-	squarenote 8, 7, 1, 1864
-	endchannel
+SFX_Cry00_3_Ch6:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 5, 11, 3, 1800
+	square_note 15, 12, 5, 1928
+	square_note 8, 7, 1, 1864
+	sound_ret
 
 
-SFX_Cry00_3_Ch7:
-	noisenote 3, 10, 1, 28
-	noisenote 14, 9, 4, 44
-	noisenote 8, 8, 1, 28
-	endchannel
+SFX_Cry00_3_Ch8:
+	noise_note 3, 10, 1, 28
+	noise_note 14, 9, 4, 44
+	noise_note 8, 8, 1, 28
+	sound_ret
diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_1_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_1_Ch5:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_1_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_1_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_1_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_1_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_2_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_2_Ch5:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_2_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_2_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_2_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_2_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm
@@ -1,24 +1,24 @@
-SFX_Cry01_3_Ch4:
-	dutycycle 160
-	squarenote 4, 15, 3, 1536
-	squarenote 8, 13, 5, 1888
-	squarenote 3, 14, 2, 1824
-	squarenote 8, 13, 1, 1808
-	endchannel
+SFX_Cry01_3_Ch5:
+	duty_cycle_pattern 2, 2, 0, 0
+	square_note 4, 15, 3, 1536
+	square_note 8, 13, 5, 1888
+	square_note 3, 14, 2, 1824
+	square_note 8, 13, 1, 1808
+	sound_ret
 
 
-SFX_Cry01_3_Ch5:
-	dutycycle 90
-	squarenote 5, 11, 3, 1777
-	squarenote 7, 12, 5, 1874
-	squarenote 3, 10, 2, 1809
-	squarenote 8, 11, 1, 1537
-	endchannel
+SFX_Cry01_3_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 5, 11, 3, 1777
+	square_note 7, 12, 5, 1874
+	square_note 3, 10, 2, 1809
+	square_note 8, 11, 1, 1537
+	sound_ret
 
 
-SFX_Cry01_3_Ch7:
-	noisenote 3, 10, 2, 60
-	noisenote 12, 9, 4, 44
-	noisenote 3, 8, 2, 28
-	noisenote 8, 7, 1, 44
-	endchannel
+SFX_Cry01_3_Ch8:
+	noise_note 3, 10, 2, 60
+	noise_note 12, 9, 4, 44
+	noise_note 3, 8, 2, 28
+	noise_note 8, 7, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_1_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_1_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_1_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_1_Ch6:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_1_Ch7:
-	endchannel
+SFX_Cry02_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_2_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_2_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_2_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_2_Ch6:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_2_Ch7:
-	endchannel
+SFX_Cry02_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm
@@ -1,17 +1,17 @@
-SFX_Cry02_3_Ch4:
-	duty 0
-	squarenote 8, 15, 5, 1152
-	squarenote 2, 14, 1, 1504
-	squarenote 8, 13, 1, 1500
-	endchannel
+SFX_Cry02_3_Ch5:
+	duty_cycle 0
+	square_note 8, 15, 5, 1152
+	square_note 2, 14, 1, 1504
+	square_note 8, 13, 1, 1500
+	sound_ret
 
 
-SFX_Cry02_3_Ch5:
-	dutycycle 165
-	squarenote 7, 9, 5, 1089
-	squarenote 2, 8, 1, 1313
-	squarenote 8, 6, 1, 1306
+SFX_Cry02_3_Ch6:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 7, 9, 5, 1089
+	square_note 2, 8, 1, 1313
+	square_note 8, 6, 1, 1306
 
 
-SFX_Cry02_3_Ch7:
-	endchannel
+SFX_Cry02_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_1_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_1_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_1_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_1_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_2_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_2_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_2_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_2_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm
@@ -1,30 +1,30 @@
-SFX_Cry03_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1544
-	squarenote 6, 14, 6, 1536
-	squarenote 6, 13, 7, 1520
-	squarenote 6, 12, 4, 1504
-	squarenote 5, 13, 3, 1472
-	squarenote 4, 13, 3, 1440
-	squarenote 8, 14, 1, 1408
-	endchannel
+SFX_Cry03_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1544
+	square_note 6, 14, 6, 1536
+	square_note 6, 13, 7, 1520
+	square_note 6, 12, 4, 1504
+	square_note 5, 13, 3, 1472
+	square_note 4, 13, 3, 1440
+	square_note 8, 14, 1, 1408
+	sound_ret
 
 
-SFX_Cry03_3_Ch5:
-	dutycycle 10
-	squarenote 4, 12, 7, 1284
-	squarenote 6, 10, 6, 1282
-	squarenote 6, 9, 7, 1265
-	squarenote 4, 11, 4, 1249
-	squarenote 5, 10, 3, 1218
-	squarenote 4, 11, 3, 1187
-	squarenote 8, 12, 1, 1154
-	endchannel
+SFX_Cry03_3_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 12, 7, 1284
+	square_note 6, 10, 6, 1282
+	square_note 6, 9, 7, 1265
+	square_note 4, 11, 4, 1249
+	square_note 5, 10, 3, 1218
+	square_note 4, 11, 3, 1187
+	square_note 8, 12, 1, 1154
+	sound_ret
 
 
-SFX_Cry03_3_Ch7:
-	noisenote 12, 14, 4, 76
-	noisenote 10, 12, 7, 92
-	noisenote 12, 11, 6, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry03_3_Ch8:
+	noise_note 12, 14, 4, 76
+	noise_note 10, 12, 7, 92
+	noise_note 12, 11, 6, 76
+	noise_note 15, 10, 2, 92
+	sound_ret
diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_1_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_1_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_1_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_1_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_2_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_2_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_2_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_2_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm
@@ -1,32 +1,32 @@
-SFX_Cry04_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 7, 1696
-	squarenote 8, 14, 6, 1700
-	squarenote 4, 13, 6, 1696
-	squarenote 12, 13, 3, 1568
-	squarenote 8, 12, 3, 1572
-	squarenote 4, 12, 2, 1568
-	squarenote 8, 11, 1, 1552
-	endchannel
+SFX_Cry04_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 7, 1696
+	square_note 8, 14, 6, 1700
+	square_note 4, 13, 6, 1696
+	square_note 12, 13, 3, 1568
+	square_note 8, 12, 3, 1572
+	square_note 4, 12, 2, 1568
+	square_note 8, 11, 1, 1552
+	sound_ret
 
 
-SFX_Cry04_3_Ch5:
-	dutycycle 90
-	squarenote 4, 14, 7, 1537
-	squarenote 8, 13, 6, 1539
-	squarenote 4, 12, 6, 1537
-	squarenote 12, 12, 3, 1409
-	squarenote 8, 11, 3, 1411
-	squarenote 4, 11, 2, 1410
-	squarenote 8, 10, 1, 1393
-	endchannel
+SFX_Cry04_3_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 4, 14, 7, 1537
+	square_note 8, 13, 6, 1539
+	square_note 4, 12, 6, 1537
+	square_note 12, 12, 3, 1409
+	square_note 8, 11, 3, 1411
+	square_note 4, 11, 2, 1410
+	square_note 8, 10, 1, 1393
+	sound_ret
 
 
-SFX_Cry04_3_Ch7:
-	noisenote 7, 13, 6, 92
-	noisenote 8, 14, 6, 76
-	noisenote 4, 13, 4, 92
-	noisenote 4, 13, 4, 76
-	noisenote 7, 12, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry04_3_Ch8:
+	noise_note 7, 13, 6, 92
+	noise_note 8, 14, 6, 76
+	noise_note 4, 13, 4, 92
+	noise_note 4, 13, 4, 76
+	noise_note 7, 12, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_1_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_1_Ch5:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_1_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_1_Ch6:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_1_Ch7:
-	endchannel
+SFX_Cry05_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_2_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_2_Ch5:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_2_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_2_Ch6:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_2_Ch7:
-	endchannel
+SFX_Cry05_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm
@@ -1,19 +1,19 @@
-SFX_Cry05_3_Ch4:
-	dutycycle 10
-	squarenote 6, 14, 2, 1280
-	squarenote 6, 14, 3, 1408
-	squarenote 6, 13, 3, 1392
-	squarenote 8, 10, 1, 1376
-	endchannel
+SFX_Cry05_3_Ch5:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 6, 14, 2, 1280
+	square_note 6, 14, 3, 1408
+	square_note 6, 13, 3, 1392
+	square_note 8, 10, 1, 1376
+	sound_ret
 
 
-SFX_Cry05_3_Ch5:
-	dutycycle 245
-	squarenote 6, 14, 2, 1154
-	squarenote 6, 13, 3, 1281
-	squarenote 6, 11, 2, 1250
-	squarenote 8, 8, 1, 1217
+SFX_Cry05_3_Ch6:
+	duty_cycle_pattern 3, 3, 1, 1
+	square_note 6, 14, 2, 1154
+	square_note 6, 13, 3, 1281
+	square_note 6, 11, 2, 1250
+	square_note 8, 8, 1, 1217
 
 
-SFX_Cry05_3_Ch7:
-	endchannel
+SFX_Cry05_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_1_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_1_Ch5:
+	duty_cycle_pattern 3, 3, 2, 2
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_1_Ch5:
-	endchannel
+SFX_Cry06_1_Ch6:
+	sound_ret
 
 
-SFX_Cry06_1_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_1_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_2_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_2_Ch5:
+	duty_cycle_pattern 3, 3, 2, 2
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_2_Ch5:
-	endchannel
+SFX_Cry06_2_Ch6:
+	sound_ret
 
 
-SFX_Cry06_2_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_2_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm
@@ -1,22 +1,22 @@
-SFX_Cry06_3_Ch4:
-	dutycycle 250
-	squarenote 6, 8, 3, 583
-	squarenote 15, 6, 2, 550
-	squarenote 4, 5, 2, 581
-	squarenote 9, 6, 3, 518
-	squarenote 15, 8, 2, 549
-	squarenote 15, 4, 2, 519
+SFX_Cry06_3_Ch5:
+	duty_cycle_pattern 3, 3, 2, 2
+	square_note 6, 8, 3, 583
+	square_note 15, 6, 2, 550
+	square_note 4, 5, 2, 581
+	square_note 9, 6, 3, 518
+	square_note 15, 8, 2, 549
+	square_note 15, 4, 2, 519
 
 
-SFX_Cry06_3_Ch5:
-	endchannel
+SFX_Cry06_3_Ch6:
+	sound_ret
 
 
-SFX_Cry06_3_Ch7:
-	noisenote 8, 13, 4, 140
-	noisenote 4, 14, 2, 156
-	noisenote 15, 12, 6, 140
-	noisenote 8, 14, 4, 172
-	noisenote 15, 13, 7, 156
-	noisenote 15, 15, 2, 172
-	endchannel
+SFX_Cry06_3_Ch8:
+	noise_note 8, 13, 4, 140
+	noise_note 4, 14, 2, 156
+	noise_note 15, 12, 6, 140
+	noise_note 8, 14, 4, 172
+	noise_note 15, 13, 7, 156
+	noise_note 15, 15, 2, 172
+	sound_ret
diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_1_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_1_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_1_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_1_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_1_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_2_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_2_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_2_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_2_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm
@@ -1,21 +1,21 @@
-SFX_Cry07_3_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1760
-	squarenote 15, 14, 4, 1600
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry07_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 4, 15, 3, 1760
+	square_note 15, 14, 4, 1600
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry07_3_Ch5:
-	dutycycle 10
-	squarenote 3, 12, 3, 1667
-	squarenote 14, 11, 4, 1538
-	squarenote 8, 10, 1, 1537
-	endchannel
+SFX_Cry07_3_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 3, 12, 3, 1667
+	square_note 14, 11, 4, 1538
+	square_note 8, 10, 1, 1537
+	sound_ret
 
 
-SFX_Cry07_3_Ch7:
-	noisenote 4, 13, 3, 92
-	noisenote 15, 14, 6, 76
-	noisenote 8, 11, 1, 92
-	endchannel
+SFX_Cry07_3_Ch8:
+	noise_note 4, 13, 3, 92
+	noise_note 15, 14, 6, 76
+	noise_note 8, 11, 1, 92
+	sound_ret
diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_1_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_1_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_1_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_1_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_2_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_2_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_2_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_2_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm
@@ -1,23 +1,23 @@
-SFX_Cry08_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 6, 1381
-	squarenote 10, 14, 4, 1404
-	squarenote 3, 12, 2, 1372
-	squarenote 15, 11, 2, 1340
-	endchannel
+SFX_Cry08_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 6, 1381
+	square_note 10, 14, 4, 1404
+	square_note 3, 12, 2, 1372
+	square_note 15, 11, 2, 1340
+	sound_ret
 
 
-SFX_Cry08_3_Ch5:
-	dutycycle 90
-	squarenote 14, 13, 6, 1283
-	squarenote 9, 11, 4, 1307
-	squarenote 4, 9, 2, 1274
-	squarenote 15, 10, 2, 1243
-	endchannel
+SFX_Cry08_3_Ch6:
+	duty_cycle_pattern 1, 1, 2, 2
+	square_note 14, 13, 6, 1283
+	square_note 9, 11, 4, 1307
+	square_note 4, 9, 2, 1274
+	square_note 15, 10, 2, 1243
+	sound_ret
 
 
-SFX_Cry08_3_Ch7:
-	noisenote 12, 14, 6, 76
-	noisenote 11, 13, 7, 92
-	noisenote 15, 12, 2, 76
-	endchannel
+SFX_Cry08_3_Ch8:
+	noise_note 12, 14, 6, 76
+	noise_note 11, 13, 7, 92
+	noise_note 15, 12, 2, 76
+	sound_ret
diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_1_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_1_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_1_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 1, 1, 3, 3
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_1_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_1_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_2_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_2_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 1, 1, 3, 3
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_2_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_2_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm
@@ -1,35 +1,35 @@
-SFX_Cry09_3_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1952
-	squarenote 6, 14, 6, 1955
-	squarenote 10, 15, 4, 1952
-	dutycycle 165
-	squarenote 10, 15, 6, 2008
-	squarenote 4, 14, 3, 2007
-	squarenote 15, 15, 2, 2008
-	endchannel
+SFX_Cry09_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 10, 15, 6, 2008
+	square_note 4, 14, 3, 2007
+	square_note 15, 15, 2, 2008
+	sound_ret
 
 
-SFX_Cry09_3_Ch5:
-	dutycycle 5
-	squarenote 2, 0, 8, 0
-	squarenote 15, 10, 7, 1697
-	squarenote 6, 8, 6, 1698
-	squarenote 10, 7, 4, 1697
-	dutycycle 95
-	squarenote 10, 7, 6, 1750
-	squarenote 4, 8, 3, 1753
-	squarenote 15, 10, 2, 1751
-	endchannel
+SFX_Cry09_3_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 2, 0, 8, 0
+	square_note 15, 10, 7, 1697
+	square_note 6, 8, 6, 1698
+	square_note 10, 7, 4, 1697
+	duty_cycle_pattern 1, 1, 3, 3
+	square_note 10, 7, 6, 1750
+	square_note 4, 8, 3, 1753
+	square_note 15, 10, 2, 1751
+	sound_ret
 
 
-SFX_Cry09_3_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 15, 13, 7, 60
-	noisenote 6, 12, 5, 59
-	noisenote 6, 14, 4, 61
-	noisenote 8, 11, 6, 60
-	noisenote 6, 13, 4, 61
-	noisenote 8, 12, 1, 59
-	endchannel
+SFX_Cry09_3_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 15, 13, 7, 60
+	noise_note 6, 12, 5, 59
+	noise_note 6, 14, 4, 61
+	noise_note 8, 11, 6, 60
+	noise_note 6, 13, 4, 61
+	noise_note 8, 12, 1, 59
+	sound_ret
diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_1_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_1_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_1_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_1_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_1_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_2_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_2_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_2_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_2_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_2_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm
@@ -1,35 +1,35 @@
-SFX_Cry0A_3_Ch4:
-	dutycycle 240
-	squarenote 8, 15, 7, 1760
-	squarenote 6, 14, 6, 1765
-	squarenote 3, 15, 4, 1760
-	squarenote 3, 15, 6, 1744
-	squarenote 3, 14, 3, 1728
-	squarenote 4, 15, 2, 1712
-	squarenote 15, 10, 2, 1736
-	endchannel
+SFX_Cry0A_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 8, 15, 7, 1760
+	square_note 6, 14, 6, 1765
+	square_note 3, 15, 4, 1760
+	square_note 3, 15, 6, 1744
+	square_note 3, 14, 3, 1728
+	square_note 4, 15, 2, 1712
+	square_note 15, 10, 2, 1736
+	sound_ret
 
 
-SFX_Cry0A_3_Ch5:
-	dutycycle 5
-	squarenote 3, 0, 8, 0
-	squarenote 8, 10, 7, 1697
-	squarenote 6, 8, 6, 1699
-	squarenote 3, 7, 4, 1697
-	squarenote 3, 7, 6, 1681
-	squarenote 3, 8, 3, 1666
-	squarenote 4, 10, 2, 1649
-	squarenote 15, 7, 2, 1673
-	endchannel
+SFX_Cry0A_3_Ch6:
+	duty_cycle_pattern 0, 0, 1, 1
+	square_note 3, 0, 8, 0
+	square_note 8, 10, 7, 1697
+	square_note 6, 8, 6, 1699
+	square_note 3, 7, 4, 1697
+	square_note 3, 7, 6, 1681
+	square_note 3, 8, 3, 1666
+	square_note 4, 10, 2, 1649
+	square_note 15, 7, 2, 1673
+	sound_ret
 
 
-SFX_Cry0A_3_Ch7:
-	noisenote 2, 15, 2, 60
-	noisenote 8, 14, 4, 62
-	noisenote 8, 13, 7, 60
-	noisenote 5, 12, 5, 59
-	noisenote 3, 13, 4, 44
-	noisenote 2, 11, 6, 60
-	noisenote 3, 10, 4, 44
-	noisenote 8, 9, 1, 60
-	endchannel
+SFX_Cry0A_3_Ch8:
+	noise_note 2, 15, 2, 60
+	noise_note 8, 14, 4, 62
+	noise_note 8, 13, 7, 60
+	noise_note 5, 12, 5, 59
+	noise_note 3, 13, 4, 44
+	noise_note 2, 11, 6, 60
+	noise_note 3, 10, 4, 44
+	noise_note 8, 9, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_1_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_1_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_1_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_1_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_1_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_1_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_2_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_2_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_2_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_2_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_2_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_2_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm
@@ -1,37 +1,37 @@
-SFX_Cry0B_3_Ch4:
-	dutycycle 204
-	squarenote 4, 15, 1, 1792
-	squarenote 4, 14, 1, 1920
-	squarenote 4, 13, 1, 1856
-	squarenote 4, 14, 1, 1856
-	squarenote 4, 15, 1, 1920
-	squarenote 4, 13, 1, 1792
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 13, 1, 1922
-	squarenote 4, 12, 1, 1858
-	squarenote 8, 11, 1, 1857
-	endchannel
+SFX_Cry0B_3_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 4, 15, 1, 1792
+	square_note 4, 14, 1, 1920
+	square_note 4, 13, 1, 1856
+	square_note 4, 14, 1, 1856
+	square_note 4, 15, 1, 1920
+	square_note 4, 13, 1, 1792
+	square_note 4, 15, 1, 1793
+	square_note 4, 13, 1, 1922
+	square_note 4, 12, 1, 1858
+	square_note 8, 11, 1, 1857
+	sound_ret
 
 
-SFX_Cry0B_3_Ch5:
-	dutycycle 68
-	squarenote 12, 0, 8, 0
-	squarenote 4, 15, 1, 1793
-	squarenote 4, 14, 1, 1922
-	squarenote 4, 13, 1, 1857
-	squarenote 4, 14, 1, 1857
-	squarenote 4, 15, 1, 1922
-	squarenote 8, 13, 1, 1793
-	endchannel
+SFX_Cry0B_3_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 0, 8, 0
+	square_note 4, 15, 1, 1793
+	square_note 4, 14, 1, 1922
+	square_note 4, 13, 1, 1857
+	square_note 4, 14, 1, 1857
+	square_note 4, 15, 1, 1922
+	square_note 8, 13, 1, 1793
+	sound_ret
 
 
-SFX_Cry0B_3_Ch7:
-	noisenote 15, 0, 8, 0
-	noisenote 4, 0, 8, 0
-	noisenote 4, 13, 1, 76
-	noisenote 4, 11, 1, 44
-	noisenote 4, 13, 1, 60
-	noisenote 4, 11, 1, 60
-	noisenote 4, 12, 1, 44
-	noisenote 8, 10, 1, 76
-	endchannel
+SFX_Cry0B_3_Ch8:
+	noise_note 15, 0, 8, 0
+	noise_note 4, 0, 8, 0
+	noise_note 4, 13, 1, 76
+	noise_note 4, 11, 1, 44
+	noise_note 4, 13, 1, 60
+	noise_note 4, 11, 1, 60
+	noise_note 4, 12, 1, 44
+	noise_note 8, 10, 1, 76
+	sound_ret
diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_1_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_1_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_1_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_1_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_1_Ch7:
-	endchannel
+SFX_Cry0C_1_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_2_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_2_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_2_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_2_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_2_Ch7:
-	endchannel
+SFX_Cry0C_2_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm
@@ -1,29 +1,29 @@
-SFX_Cry0C_3_Ch4:
-	dutycycle 204
-	squarenote 8, 15, 5, 1536
-	squarenote 2, 13, 2, 1592
-	squarenote 2, 12, 2, 1584
-	squarenote 2, 12, 2, 1576
-	squarenote 2, 11, 2, 1568
-	squarenote 2, 11, 2, 1552
-	squarenote 2, 10, 2, 1560
-	squarenote 2, 11, 2, 1552
-	squarenote 8, 12, 1, 1568
-	endchannel
+SFX_Cry0C_3_Ch5:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 8, 15, 5, 1536
+	square_note 2, 13, 2, 1592
+	square_note 2, 12, 2, 1584
+	square_note 2, 12, 2, 1576
+	square_note 2, 11, 2, 1568
+	square_note 2, 11, 2, 1552
+	square_note 2, 10, 2, 1560
+	square_note 2, 11, 2, 1552
+	square_note 8, 12, 1, 1568
+	sound_ret
 
 
-SFX_Cry0C_3_Ch5:
-	dutycycle 68
-	squarenote 12, 12, 3, 1472
-	squarenote 3, 11, 1, 1529
-	squarenote 2, 10, 1, 1521
-	squarenote 2, 10, 1, 1513
-	squarenote 2, 9, 1, 1505
-	squarenote 2, 9, 1, 1497
-	squarenote 2, 8, 1, 1489
-	squarenote 2, 9, 1, 1497
-	squarenote 8, 9, 1, 1505
+SFX_Cry0C_3_Ch6:
+	duty_cycle_pattern 1, 0, 1, 0
+	square_note 12, 12, 3, 1472
+	square_note 3, 11, 1, 1529
+	square_note 2, 10, 1, 1521
+	square_note 2, 10, 1, 1513
+	square_note 2, 9, 1, 1505
+	square_note 2, 9, 1, 1497
+	square_note 2, 8, 1, 1489
+	square_note 2, 9, 1, 1497
+	square_note 8, 9, 1, 1505
 
 
-SFX_Cry0C_3_Ch7:
-	endchannel
+SFX_Cry0C_3_Ch8:
+	sound_ret
diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_1_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_1_Ch4
-	endchannel
+SFX_Cry0D_1_Ch5:
+	duty_cycle_pattern 2, 0, 2, 0
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_1_Ch5
+	sound_ret
 
 
-SFX_Cry0D_1_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_1_Ch6:
+	duty_cycle_pattern 1, 0, 0, 0
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_1_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_1_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_2_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_2_Ch4
-	endchannel
+SFX_Cry0D_2_Ch5:
+	duty_cycle_pattern 2, 0, 2, 0
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_2_Ch5
+	sound_ret
 
 
-SFX_Cry0D_2_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_2_Ch6:
+	duty_cycle_pattern 1, 0, 0, 0
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_2_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_2_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm
@@ -1,40 +1,40 @@
-SFX_Cry0D_3_Ch4:
-	dutycycle 136
-	squarenote 5, 15, 2, 1616
-	squarenote 9, 13, 1, 1632
-	squarenote 5, 14, 2, 1554
-	squarenote 9, 12, 1, 1570
-	squarenote 5, 15, 2, 1552
-	squarenote 6, 13, 1, 1568
-	loopchannel 2, SFX_Cry0D_3_Ch4
-	endchannel
+SFX_Cry0D_3_Ch5:
+	duty_cycle_pattern 2, 0, 2, 0
+	square_note 5, 15, 2, 1616
+	square_note 9, 13, 1, 1632
+	square_note 5, 14, 2, 1554
+	square_note 9, 12, 1, 1570
+	square_note 5, 15, 2, 1552
+	square_note 6, 13, 1, 1568
+	sound_loop 2, SFX_Cry0D_3_Ch5
+	sound_ret
 
 
-SFX_Cry0D_3_Ch5:
-	dutycycle 64
-	squarenote 4, 0, 8, 0
-	squarenote 5, 15, 2, 1617
-	squarenote 9, 13, 1, 1633
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 12, 13, 1, 1569
-	squarenote 5, 14, 2, 1556
-	squarenote 8, 12, 1, 1572
-	squarenote 5, 15, 2, 1553
-	squarenote 4, 13, 1, 1569
-	endchannel
+SFX_Cry0D_3_Ch6:
+	duty_cycle_pattern 1, 0, 0, 0
+	square_note 4, 0, 8, 0
+	square_note 5, 15, 2, 1617
+	square_note 9, 13, 1, 1633
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 12, 13, 1, 1569
+	square_note 5, 14, 2, 1556
+	square_note 8, 12, 1, 1572
+	square_note 5, 15, 2, 1553
+	square_note 4, 13, 1, 1569
+	sound_ret
 
 
-SFX_Cry0D_3_Ch7:
-	noisenote 6, 13, 2, 28
-	noisenote 9, 11, 1, 44
-	noisenote 8, 12, 2, 44
-	noisenote 9, 11, 1, 60
-	noisenote 6, 12, 2, 44
-	noisenote 9, 10, 2, 60
-	noisenote 7, 12, 2, 44
-	noisenote 5, 10, 1, 60
-	noisenote 9, 12, 2, 44
-	noisenote 4, 10, 1, 60
-	endchannel
+SFX_Cry0D_3_Ch8:
+	noise_note 6, 13, 2, 28
+	noise_note 9, 11, 1, 44
+	noise_note 8, 12, 2, 44
+	noise_note 9, 11, 1, 60
+	noise_note 6, 12, 2, 44
+	noise_note 9, 10, 2, 60
+	noise_note 7, 12, 2, 44
+	noise_note 5, 10, 1, 60
+	noise_note 9, 12, 2, 44
+	noise_note 4, 10, 1, 60
+	sound_ret
diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_1_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_1_Ch5:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_1_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_1_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_1_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_1_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_2_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_2_Ch5:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_2_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_2_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_2_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_2_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm
@@ -1,23 +1,23 @@
-SFX_Cry0E_3_Ch4:
-	dutycycle 165
-	squarenote 4, 14, 1, 1792
-	squarenote 4, 15, 2, 1920
-	squarenote 2, 9, 2, 1856
-	squarenote 8, 14, 1, 1536
-	endchannel
+SFX_Cry0E_3_Ch5:
+	duty_cycle_pattern 2, 2, 1, 1
+	square_note 4, 14, 1, 1792
+	square_note 4, 15, 2, 1920
+	square_note 2, 9, 2, 1856
+	square_note 8, 14, 1, 1536
+	sound_ret
 
 
-SFX_Cry0E_3_Ch5:
-	dutycycle 10
-	squarenote 4, 11, 1, 1761
-	squarenote 3, 12, 2, 1761
-	squarenote 3, 6, 2, 1665
-	squarenote 8, 11, 1, 1505
-	endchannel
+SFX_Cry0E_3_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 11, 1, 1761
+	square_note 3, 12, 2, 1761
+	square_note 3, 6, 2, 1665
+	square_note 8, 11, 1, 1505
+	sound_ret
 
 
-SFX_Cry0E_3_Ch7:
-	noisenote 2, 6, 1, 50
-	noisenote 2, 6, 1, 33
-	noisenote 8, 6, 1, 17
-	endchannel
+SFX_Cry0E_3_Ch8:
+	noise_note 2, 6, 1, 50
+	noise_note 2, 6, 1, 33
+	noise_note 8, 6, 1, 17
+	sound_ret
diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_1_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 1
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_1_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_1_Ch6:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_1_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_1_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_2_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 1
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_2_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_2_Ch6:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_2_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_2_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm
@@ -1,29 +1,29 @@
-SFX_Cry0F_3_Ch4:
-	dutycycle 241
-	squarenote 4, 15, 7, 1984
-	squarenote 12, 14, 6, 1986
-	squarenote 6, 11, 5, 1664
-	squarenote 4, 12, 4, 1648
-	squarenote 4, 11, 5, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry0F_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 1
+	square_note 4, 15, 7, 1984
+	square_note 12, 14, 6, 1986
+	square_note 6, 11, 5, 1664
+	square_note 4, 12, 4, 1648
+	square_note 4, 11, 5, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry0F_3_Ch5:
-	dutycycle 204
-	squarenote 3, 12, 7, 1921
-	squarenote 12, 11, 6, 1920
-	squarenote 6, 10, 5, 1601
-	squarenote 4, 12, 4, 1586
-	squarenote 6, 11, 5, 1569
-	squarenote 8, 10, 1, 1538
-	endchannel
+SFX_Cry0F_3_Ch6:
+	duty_cycle_pattern 3, 0, 3, 0
+	square_note 3, 12, 7, 1921
+	square_note 12, 11, 6, 1920
+	square_note 6, 10, 5, 1601
+	square_note 4, 12, 4, 1586
+	square_note 6, 11, 5, 1569
+	square_note 8, 10, 1, 1538
+	sound_ret
 
 
-SFX_Cry0F_3_Ch7:
-	noisenote 3, 14, 4, 60
-	noisenote 12, 13, 6, 44
-	noisenote 4, 14, 4, 60
-	noisenote 8, 11, 7, 92
-	noisenote 15, 12, 2, 93
-	endchannel
+SFX_Cry0F_3_Ch8:
+	noise_note 3, 14, 4, 60
+	noise_note 12, 13, 6, 44
+	noise_note 4, 14, 4, 60
+	noise_note 8, 11, 7, 92
+	noise_note 15, 12, 2, 93
+	sound_ret
diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_1_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_1_Ch5:
+	duty_cycle_pattern 3, 0, 2, 1
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_1_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_1_Ch6:
+	duty_cycle_pattern 1, 3, 2, 1
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_1_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_1_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_2_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_2_Ch5:
+	duty_cycle_pattern 3, 0, 2, 1
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_2_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_2_Ch6:
+	duty_cycle_pattern 1, 3, 2, 1
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_2_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_2_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm
@@ -1,31 +1,31 @@
-SFX_Cry10_3_Ch4:
-	dutycycle 201
-	squarenote 8, 15, 7, 1664
-	squarenote 2, 15, 7, 1632
-	squarenote 1, 14, 7, 1600
-	squarenote 1, 14, 7, 1568
-	squarenote 15, 13, 1, 1536
-	squarenote 4, 12, 7, 1856
-	squarenote 4, 10, 7, 1840
-	squarenote 15, 9, 1, 1824
-	endchannel
+SFX_Cry10_3_Ch5:
+	duty_cycle_pattern 3, 0, 2, 1
+	square_note 8, 15, 7, 1664
+	square_note 2, 15, 7, 1632
+	square_note 1, 14, 7, 1600
+	square_note 1, 14, 7, 1568
+	square_note 15, 13, 1, 1536
+	square_note 4, 12, 7, 1856
+	square_note 4, 10, 7, 1840
+	square_note 15, 9, 1, 1824
+	sound_ret
 
 
-SFX_Cry10_3_Ch5:
-	dutycycle 121
-	squarenote 10, 14, 7, 1666
-	squarenote 2, 14, 7, 1634
-	squarenote 1, 13, 7, 1602
-	squarenote 1, 13, 7, 1570
-	squarenote 15, 12, 1, 1538
-	squarenote 4, 11, 7, 1858
-	squarenote 2, 9, 7, 1842
-	squarenote 15, 8, 1, 1826
-	endchannel
+SFX_Cry10_3_Ch6:
+	duty_cycle_pattern 1, 3, 2, 1
+	square_note 10, 14, 7, 1666
+	square_note 2, 14, 7, 1634
+	square_note 1, 13, 7, 1602
+	square_note 1, 13, 7, 1570
+	square_note 15, 12, 1, 1538
+	square_note 4, 11, 7, 1858
+	square_note 2, 9, 7, 1842
+	square_note 15, 8, 1, 1826
+	sound_ret
 
 
-SFX_Cry10_3_Ch7:
-	noisenote 4, 7, 4, 33
-	noisenote 4, 7, 4, 16
-	noisenote 4, 7, 1, 32
-	endchannel
+SFX_Cry10_3_Ch8:
+	noise_note 4, 7, 4, 33
+	noise_note 4, 7, 4, 16
+	noise_note 4, 7, 1, 32
+	sound_ret
diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_1_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_1_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_1_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_1_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_1_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_1_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_2_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_2_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_2_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_2_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_2_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_2_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret
diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm
@@ -1,34 +1,34 @@
-SFX_Cry11_3_Ch4:
-	dutycycle 240
-	squarenote 6, 15, 7, 1952
-	squarenote 8, 14, 6, 1956
-	squarenote 4, 13, 6, 1952
-	squarenote 15, 13, 3, 1824
-	squarenote 8, 12, 3, 1827
-	squarenote 2, 12, 2, 1832
-	squarenote 8, 11, 1, 1840
-	endchannel
+SFX_Cry11_3_Ch5:
+	duty_cycle_pattern 3, 3, 0, 0
+	square_note 6, 15, 7, 1952
+	square_note 8, 14, 6, 1956
+	square_note 4, 13, 6, 1952
+	square_note 15, 13, 3, 1824
+	square_note 8, 12, 3, 1827
+	square_note 2, 12, 2, 1832
+	square_note 8, 11, 1, 1840
+	sound_ret
 
 
-SFX_Cry11_3_Ch5:
-	dutycycle 10
-	squarenote 4, 0, 8, 0
-	squarenote 6, 10, 7, 1857
-	squarenote 8, 8, 6, 1859
-	squarenote 4, 7, 6, 1857
-	squarenote 13, 8, 3, 1730
-	squarenote 7, 7, 3, 1729
-	squarenote 3, 8, 2, 1740
-	squarenote 8, 7, 1, 1752
-	endchannel
+SFX_Cry11_3_Ch6:
+	duty_cycle_pattern 0, 0, 2, 2
+	square_note 4, 0, 8, 0
+	square_note 6, 10, 7, 1857
+	square_note 8, 8, 6, 1859
+	square_note 4, 7, 6, 1857
+	square_note 13, 8, 3, 1730
+	square_note 7, 7, 3, 1729
+	square_note 3, 8, 2, 1740
+	square_note 8, 7, 1, 1752
+	sound_ret
 
 
-SFX_Cry11_3_Ch7:
-	noisenote 2, 15, 2, 76
-	noisenote 6, 14, 6, 58
-	noisenote 4, 13, 7, 58
-	noisenote 6, 13, 6, 44
-	noisenote 8, 14, 5, 60
-	noisenote 12, 13, 2, 61
-	noisenote 8, 13, 1, 44
-	endchannel
+SFX_Cry11_3_Ch8:
+	noise_note 2, 15, 2, 76
+	noise_note 6, 14, 6, 58
+	noise_note 4, 13, 7, 58
+	noise_note 6, 13, 6, 44
+	noise_note 8, 14, 5, 60
+	noise_note 12, 13, 2, 61
+	noise_note 8, 13, 1, 44
+	sound_ret