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/cry13_1.asm b/audio/sfx/cry13_1.asm
index 67db31fe..6392f327 100644
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,30 +1,30 @@
-SFX_Cry13_1_Ch4:
-	dutycycle 51
-	squarenote 15, 15, 6, 1472
-	squarenote 8, 14, 3, 1468
-	squarenote 6, 13, 2, 1488
-	squarenote 6, 11, 2, 1504
-	squarenote 6, 12, 2, 1520
-	squarenote 8, 11, 1, 1536
-	endchannel
+SFX_Cry13_1_Ch5:
+	duty_cycle_pattern 51
+	square_note 15, 15, 6, 1472
+	square_note 8, 14, 3, 1468
+	square_note 6, 13, 2, 1488
+	square_note 6, 11, 2, 1504
+	square_note 6, 12, 2, 1520
+	square_note 8, 11, 1, 1536
+	sound_ret
 
 
-SFX_Cry13_1_Ch5:
-	dutycycle 153
-	squarenote 14, 12, 6, 1201
-	squarenote 7, 12, 3, 1197
-	squarenote 5, 11, 2, 1217
-	squarenote 8, 9, 2, 1233
-	squarenote 6, 10, 2, 1249
-	squarenote 8, 9, 1, 1265
-	endchannel
+SFX_Cry13_1_Ch6:
+	duty_cycle_pattern 153
+	square_note 14, 12, 6, 1201
+	square_note 7, 12, 3, 1197
+	square_note 5, 11, 2, 1217
+	square_note 8, 9, 2, 1233
+	square_note 6, 10, 2, 1249
+	square_note 8, 9, 1, 1265
+	sound_ret
 
 
-SFX_Cry13_1_Ch7:
-	noisenote 10, 14, 6, 92
-	noisenote 10, 13, 6, 108
-	noisenote 4, 12, 2, 76
-	noisenote 6, 13, 3, 92
-	noisenote 8, 11, 3, 76
-	noisenote 8, 10, 1, 92
-	endchannel
+SFX_Cry13_1_Ch8:
+	noise_note 10, 14, 6, 92
+	noise_note 10, 13, 6, 108
+	noise_note 4, 12, 2, 76
+	noise_note 6, 13, 3, 92
+	noise_note 8, 11, 3, 76
+	noise_note 8, 10, 1, 92
+	sound_ret