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

audio/sfx/caught_mon.asm

@@ -1,61 +1,61 @@
-SFX_Caught_Mon_Ch4:
-	executemusic
+SFX_Caught_Mon_Ch5:
+	execute_music
 	tempo 256
 	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 6, 11, 2
+	duty_cycle 3
+	toggle_perfect_pitch
+	note_type 6, 11, 2
 	octave 3
-	E_ 2
-	F# 2
-	G# 2
-	G# 1
-	G# 1
-	B_ 2
+	note E_, 2
+	note F#, 2
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note B_, 2
 	octave 4
-	C# 2
-	D# 2
-	D# 1
-	D# 1
-	notetype 6, 11, 5
-	E_ 8
-	endchannel
-
-
-SFX_Caught_Mon_Ch5:
-	executemusic
-	duty 2
-	notetype 6, 12, 2
-	octave 4
-	G# 2
-	G# 1
-	G# 1
-	E_ 2
-	E_ 1
-	E_ 1
-	B_ 2
-	B_ 1
-	B_ 1
-	A_ 2
-	A_ 1
-	A_ 1
-	notetype 6, 12, 5
-	G# 8
-	endchannel
+	note C#, 2
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	note_type 6, 11, 5
+	note E_, 8
+	sound_ret
 
 
 SFX_Caught_Mon_Ch6:
-	executemusic
-	notetype 6, 1, 0
+	execute_music
+	duty_cycle 2
+	note_type 6, 12, 2
 	octave 4
-	B_ 2
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note E_, 2
+	note E_, 1
+	note E_, 1
+	note B_, 2
+	note B_, 1
+	note B_, 1
+	note A_, 2
+	note A_, 1
+	note A_, 1
+	note_type 6, 12, 5
+	note G#, 8
+	sound_ret
+
+
+SFX_Caught_Mon_Ch7:
+	execute_music
+	note_type 6, 1, 0
+	octave 4
+	note B_, 2
 	rest 2
 	octave 5
-	C# 2
+	note C#, 2
 	rest 2
-	D# 2
+	note D#, 2
 	rest 2
-	F# 2
-	G_ 2
-	G# 4
-	endchannel
+	note F#, 2
+	note G_, 2
+	note G#, 4
+	sound_ret