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, 29 insertions, 29 deletions

diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm
index 9773793c..b23a020e 100644
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,33 +1,33 @@
-SFX_Cry24_2_Ch4:
-	dutycycle 240
-	squarenote 15, 15, 7, 1664
-	squarenote 10, 14, 6, 1668
-	squarenote 15, 13, 7, 1680
-	squarenote 8, 13, 5, 1680
-	squarenote 6, 12, 4, 1672
-	squarenote 5, 13, 3, 1648
-	squarenote 4, 13, 3, 1632
-	squarenote 8, 12, 1, 1600
-	endchannel
+SFX_Cry24_2_Ch5:
+	duty_cycle_pattern 240
+	square_note 15, 15, 7, 1664
+	square_note 10, 14, 6, 1668
+	square_note 15, 13, 7, 1680
+	square_note 8, 13, 5, 1680
+	square_note 6, 12, 4, 1672
+	square_note 5, 13, 3, 1648
+	square_note 4, 13, 3, 1632
+	square_note 8, 12, 1, 1600
+	sound_ret
 
 
-SFX_Cry24_2_Ch5:
-	dutycycle 5
-	squarenote 15, 11, 7, 1601
-	squarenote 10, 9, 6, 1602
-	squarenote 15, 10, 7, 1617
-	squarenote 8, 10, 5, 1617
-	squarenote 6, 9, 4, 1607
-	squarenote 5, 10, 3, 1585
-	squarenote 4, 9, 3, 1570
-	squarenote 8, 7, 1, 1537
-	endchannel
+SFX_Cry24_2_Ch6:
+	duty_cycle_pattern 5
+	square_note 15, 11, 7, 1601
+	square_note 10, 9, 6, 1602
+	square_note 15, 10, 7, 1617
+	square_note 8, 10, 5, 1617
+	square_note 6, 9, 4, 1607
+	square_note 5, 10, 3, 1585
+	square_note 4, 9, 3, 1570
+	square_note 8, 7, 1, 1537
+	sound_ret
 
 
-SFX_Cry24_2_Ch7:
-	noisenote 15, 14, 4, 60
-	noisenote 10, 12, 7, 76
-	noisenote 10, 12, 7, 60
-	noisenote 12, 11, 7, 76
-	noisenote 15, 10, 2, 92
-	endchannel
+SFX_Cry24_2_Ch8:
+	noise_note 15, 14, 4, 60
+	noise_note 10, 12, 7, 76
+	noise_note 10, 12, 7, 60
+	noise_note 12, 11, 7, 76
+	noise_note 15, 10, 2, 92
+	sound_ret