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

diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm
index f4986805..ea4196a8 100644
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,28 +1,28 @@
-SFX_Battle_2A_Ch4:
-	dutycycle 57
-	squarenote 4, 15, 4, 1536
-	squarenote 3, 12, 4, 1280
-	squarenote 5, 11, 5, 1536
-	squarenote 13, 14, 2, 1728
-	loopchannel 3, SFX_Battle_2A_Ch4
-	squarenote 8, 13, 1, 1536
-	endchannel
+SFX_Battle_2A_Ch5:
+	duty_cycle_pattern 57
+	square_note 4, 15, 4, 1536
+	square_note 3, 12, 4, 1280
+	square_note 5, 11, 5, 1536
+	square_note 13, 14, 2, 1728
+	sound_loop 3, SFX_Battle_2A_Ch5
+	square_note 8, 13, 1, 1536
+	sound_ret
 
 
-SFX_Battle_2A_Ch5:
-	dutycycle 141
-	squarenote 5, 14, 4, 1504
-	squarenote 4, 11, 4, 1248
-	squarenote 6, 10, 5, 1512
-	squarenote 14, 13, 1, 1696
-	loopchannel 3, SFX_Battle_2A_Ch5
-	endchannel
+SFX_Battle_2A_Ch6:
+	duty_cycle_pattern 141
+	square_note 5, 14, 4, 1504
+	square_note 4, 11, 4, 1248
+	square_note 6, 10, 5, 1512
+	square_note 14, 13, 1, 1696
+	sound_loop 3, SFX_Battle_2A_Ch6
+	sound_ret
 
 
-SFX_Battle_2A_Ch7:
-	noisenote 5, 12, 3, 51
-	noisenote 3, 9, 2, 67
-	noisenote 10, 11, 5, 51
-	noisenote 15, 12, 3, 50
-	loopchannel 2, SFX_Battle_2A_Ch7
-	endchannel
+SFX_Battle_2A_Ch8:
+	noise_note 5, 12, 3, 51
+	noise_note 3, 9, 2, 67
+	noise_note 10, 11, 5, 51
+	noise_note 15, 12, 3, 50
+	sound_loop 2, SFX_Battle_2A_Ch8
+	sound_ret