Update audio macro names

change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names

1 files changed, 26 insertions, 26 deletions

diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm
index 0fa8daf0..77ac9ffb 100644
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,30 +1,30 @@
-SFX_Cry15_2_Ch4:
-	dutycycle 240
-	squarenote 4, 15, 3, 1920
-	squarenote 15, 14, 7, 1792
-	squarenote 8, 13, 3, 1808
-	squarenote 4, 12, 2, 1792
-	squarenote 4, 13, 2, 1776
-	squarenote 8, 12, 1, 1760
-	endchannel
+SFX_Cry15_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 4, 15, 3, 1920
+	square_note 15, 14, 7, 1792
+	square_note 8, 13, 3, 1808
+	square_note 4, 12, 2, 1792
+	square_note 4, 13, 2, 1776
+	square_note 8, 12, 1, 1760
+	sound_ret
 
 
-SFX_Cry15_2_Ch5:
-	dutycycle 90
-	squarenote 6, 12, 3, 1793
-	squarenote 14, 11, 7, 1665
-	squarenote 7, 11, 3, 1682
-	squarenote 3, 10, 2, 1665
-	squarenote 4, 11, 2, 1650
-	squarenote 8, 10, 1, 1633
-	endchannel
+SFX_Cry15_2_Ch6:
+	duty_cycle_pattern 90
+	square_note 6, 12, 3, 1793
+	square_note 14, 11, 7, 1665
+	square_note 7, 11, 3, 1682
+	square_note 3, 10, 2, 1665
+	square_note 4, 11, 2, 1650
+	square_note 8, 10, 1, 1633
+	sound_ret
 
 
-SFX_Cry15_2_Ch7:
-	noisenote 6, 14, 3, 92
-	noisenote 14, 13, 6, 76
-	noisenote 6, 12, 6, 60
-	noisenote 3, 11, 3, 76
-	noisenote 3, 10, 2, 92
-	noisenote 8, 11, 1, 108
-	endchannel
+SFX_Cry15_2_Ch8:
+	noise_note 6, 14, 3, 92
+	noise_note 14, 13, 6, 76
+	noise_note 6, 12, 6, 60
+	noise_note 3, 11, 3, 76
+	noise_note 3, 10, 2, 92
+	noise_note 8, 11, 1, 108
+	sound_ret