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

diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm
index 378c07bd..545a77cc 100644
--- 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 240
+	square_note 15, 15, 7, 1952
+	square_note 6, 14, 6, 1955
+	square_note 10, 15, 4, 1952
+	duty_cycle_pattern 165
+	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 5
+	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 95
+	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