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

diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm
index def5b459..f2f2a0c7 100644
--- 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 240
+	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 90
+	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