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

diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 2ca5cbe8..4f7f6277 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,7 +1,7 @@
 ; The second of three duplicated sound engines.
 
 Audio2_UpdateMusic::
-	ld c, Ch0
+	ld c, Ch1
 .loop
 	ld b, $0
 	ld hl, wChannelSoundIDs
@@ -10,7 +10,7 @@ Audio2_UpdateMusic::
 	and a
 	jr z, .nextChannel
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .applyAffects ; if sfx channel
 	ld a, [wMuteAudioAndPauseMusic]
 	and a
@@ -30,7 +30,7 @@ Audio2_UpdateMusic::
 .nextChannel
 	ld a, c
 	inc c
-	cp Ch7
+	cp Ch8
 	jr nz, .loop
 	ret
 
@@ -52,9 +52,9 @@ Audio2_ApplyMusicAffects:
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .startChecks ; if a sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -160,7 +160,7 @@ Audio2_PlayNextNote:
 	res 4, [hl]
 	res 5, [hl]
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nz, .beginChecks
 	ld a, [wLowHealthAlarm] ;low health alarm enabled?
 	bit 7, a
@@ -180,7 +180,7 @@ Audio2_endchannel:
 	bit 1, [hl]
 	jr nz, .returnFromCall
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr nc, .noiseOrSfxChannel
 	jr .asm_219c0
 .noiseOrSfxChannel
@@ -188,7 +188,7 @@ Audio2_endchannel:
 	ld hl, wChannelFlags2
 	add hl, bc
 	res 0, [hl]
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 	ld a, $0
 	ld [rNR30], a
@@ -231,19 +231,19 @@ Audio2_endchannel:
 	and [hl]
 	ld [rNR51], a
 .asm_219c9
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $14
 	jr nc, .asm_219d2
 	jr .asm_219ef
 .asm_219d2
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $86
 	jr z, .asm_219ef
 	jr c, .asm_219dd
 	jr .asm_219ef
 .asm_219dd
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr z, .asm_219e6
 	call Audio2_21e6d
 	ret c
@@ -344,14 +344,14 @@ Audio2_notetype:
 	add hl, bc
 	ld [hl], a ; store low nibble as speed
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr z, .noiseChannel ; noise channel has 0 params
 	call Audio2_GetNextMusicByte
 	ld d, a
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notChannel3
 	ld hl, wSfxWaveInstrument
 	jr .sfxChannel3
@@ -471,7 +471,7 @@ Audio2_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
 	call Audio2_GetNextMusicByte
 	ld [wMusicTempo], a ; store first param
@@ -514,10 +514,10 @@ Audio2_unknownmusic0xef:
 	ld a, [wDisableChannelOutputWhenSfxEnds]
 	and a
 	jr nz, .skip
-	ld a, [wChannelSoundIDs + Ch7]
+	ld a, [wChannelSoundIDs + Ch8]
 	ld [wDisableChannelOutputWhenSfxEnds], a
 	xor a
-	ld [wChannelSoundIDs + Ch7], a
+	ld [wChannelSoundIDs + Ch8], a
 .skip
 	jp Audio2_endchannel
 
@@ -571,7 +571,7 @@ Audio2_sfxnote:
 	cp $20 ; is this command an sfxnote?
 	jr nz, Audio2_pitchenvelope ; no
 	ld a, c
-	cp Ch3 ; is this a noise or sfx channel?
+	cp Ch4 ; is this a noise or sfx channel?
 	jr c, Audio2_pitchenvelope ; no
 	ld b, $0
 	ld hl, wChannelFlags2
@@ -597,7 +597,7 @@ Audio2_sfxnote:
 	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
@@ -614,7 +614,7 @@ Audio2_sfxnote:
 
 Audio2_pitchenvelope:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, Audio2_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a pitchenvelope?
@@ -630,7 +630,7 @@ Audio2_pitchenvelope:
 
 Audio2_note:
 	ld a, c
-	cp Ch3
+	cp Ch4
 	jr nz, Audio2_notelength ; if not noise channel
 	ld a, d
 	and $f0
@@ -678,7 +678,7 @@ Audio2_notelength:
 	ld l, b
 	call Audio2_22006
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
 	ld a, [wMusicTempo]
 	ld d, a
@@ -688,7 +688,7 @@ Audio2_notelength:
 .sfxChannel
 	ld d, $1
 	ld e, $0
-	cp Ch7
+	cp Ch8
 	jr z, .skip ; if noise channel
 	call Audio2_21e2f
 	ld a, [wSfxTempo]
@@ -728,9 +728,9 @@ Audio2_notepitch:
 	cp $c0 ; compare to rest
 	jr nz, .notRest
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .sfxChannel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -738,9 +738,9 @@ Audio2_notepitch:
 	; fall through
 .sfxChannel
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 .musicChannel3
 	ld b, $0
@@ -776,9 +776,9 @@ Audio2_notepitch:
 .asm_21d39
 	push de
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld d, $0
 	ld e, a
 	add hl, de
@@ -823,11 +823,11 @@ Audio2_21d79:
 	or [hl]
 	ld d, a
 	ld a, c
-	cp Ch7
+	cp Ch8
 	jr z, .sfxNoiseChannel
-	cp Ch4
+	cp Ch5
 	jr nc, .skip ; if sfx channel
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	add hl, bc
 	ld a, [hl]
 	and a
@@ -855,9 +855,9 @@ Audio2_21daa:
 	add hl, bc
 	ld d, [hl]
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3 ; if music channel 3
-	cp Ch6
+	cp Ch7
 	jr z, .channel3 ; if sfx channel 3
 	ld a, d
 	and $3f
@@ -875,15 +875,15 @@ Audio2_21daa:
 
 Audio2_21dcc:
 	ld a, c
-	cp Ch2
+	cp Ch3
 	jr z, .channel3
-	cp Ch6
+	cp Ch7
 	jr nz, .notSfxChannel3
 	; fall through
 .channel3
 	push de
 	ld de, wMusicWaveInstrument
-	cp Ch2
+	cp Ch3
 	jr z, .musicChannel3
 	ld de, wSfxWaveInstrument
 .musicChannel3
@@ -922,7 +922,7 @@ Audio2_21dcc:
 	inc hl
 	ld [hl], d
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr c, .musicChannel
 	call Audio2_21e56
 .musicChannel
@@ -930,7 +930,7 @@ Audio2_21dcc:
 
 Audio2_21e19:
 	ld a, c
-	cp Ch4
+	cp Ch5
 	jr nz, .asm_21e2e
 	ld a, [wLowHealthAlarm]
 	bit 7, a
@@ -1009,7 +1009,7 @@ Audio2_21e6d:
 	ret
 
 Audio2_21e8b:
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	cp $14
 	jr nc, .asm_21e94
 	jr .asm_21e9a
@@ -1026,9 +1026,9 @@ Audio2_21e8b:
 	ret
 
 Audio2_21e9f:
-	ld a, [wChannelSoundIDs + Ch7]
+	ld a, [wChannelSoundIDs + Ch8]
 	ld b, a
-	ld a, [wChannelSoundIDs + Ch4]
+	ld a, [wChannelSoundIDs + Ch5]
 	or b
 	cp $9d
 	jr nc, .asm_21ead
@@ -1314,7 +1314,7 @@ Audio2_22017:
 	ld d, [hl]
 	ld a, b
 .loop
-	cp Ch7
+	cp Ch8
 	jr z, .done
 	sra d
 	rr e
@@ -1683,12 +1683,12 @@ Audio2_2224e:
 	jr c, .asm_222b5
 	jr .asm_222d4
 .asm_222b5
-	ld hl, wChannelSoundIDs + Ch4
+	ld hl, wChannelSoundIDs + Ch5
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wChannelCommandPointers + Ch6 * 2 ; sfx noise channel pointer
+	ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx noise channel pointer
 	ld de, Noise2_endchannel
 	ld [hl], e
 	inc hl
@@ -1704,7 +1704,7 @@ Audio2_2224e:
 	ret
 
 Noise2_endchannel:
-	endchannel
+	sound_ret
 
 Unknown_222d6:
 	db $10, $15, $1A, $1F ; channels 0-3