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

diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm
index ca1afc42..c509b8d5 100644
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,27 +1,27 @@
-SFX_Battle_2E_Ch4:
-	duty 0
-	squarenote 2, 15, 1, 512
-	squarenote 3, 15, 1, 1792
-	squarenote 4, 15, 1, 1280
-	squarenote 5, 15, 1, 2032
-	loopchannel 8, SFX_Battle_2E_Ch4
-	endchannel
+SFX_Battle_2E_Ch5:
+	duty_cycle 0
+	square_note 2, 15, 1, 512
+	square_note 3, 15, 1, 1792
+	square_note 4, 15, 1, 1280
+	square_note 5, 15, 1, 2032
+	sound_loop 8, SFX_Battle_2E_Ch5
+	sound_ret
 
 
-SFX_Battle_2E_Ch5:
-	dutycycle 179
-	squarenote 2, 14, 1, 770
-	squarenote 3, 14, 1, 2034
-	squarenote 4, 14, 1, 1538
-	squarenote 5, 14, 1, 1794
-	loopchannel 8, SFX_Battle_2E_Ch5
-	endchannel
+SFX_Battle_2E_Ch6:
+	duty_cycle_pattern 179
+	square_note 2, 14, 1, 770
+	square_note 3, 14, 1, 2034
+	square_note 4, 14, 1, 1538
+	square_note 5, 14, 1, 1794
+	sound_loop 8, SFX_Battle_2E_Ch6
+	sound_ret
 
 
-SFX_Battle_2E_Ch7:
-	noisenote 2, 13, 3, 16
-	noisenote 3, 13, 3, 17
-	noisenote 2, 13, 2, 16
-	noisenote 5, 13, 2, 18
-	loopchannel 9, SFX_Battle_2E_Ch7
-	endchannel
+SFX_Battle_2E_Ch8:
+	noise_note 2, 13, 3, 16
+	noise_note 3, 13, 3, 17
+	noise_note 2, 13, 2, 16
+	noise_note 5, 13, 2, 18
+	sound_loop 9, SFX_Battle_2E_Ch8
+	sound_ret