From 56c405de09ce267c4cfbc68a15c37b2ff51c635a Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Mon, 30 Jun 2025 12:47:22 -0400 Subject: Replace hardware_constants.asm with hardware.inc (#511) --- audio/engine_3.asm | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'audio/engine_3.asm') diff --git a/audio/engine_3.asm b/audio/engine_3.asm index f524875f..76115420 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -20,10 +20,10 @@ Audio3_UpdateMusic:: set BIT_MUTE_AUDIO, a ld [wMuteAudioAndPauseMusic], a xor a ; disable all channels' output - ldh [rNR51], a - ldh [rNR30], a + ldh [rAUDTERM], a + ldh [rAUD3ENA], a ld a, $80 - ldh [rNR30], a + ldh [rAUD3ENA], a jr .nextChannel .applyAffects call Audio3_ApplyMusicAffects @@ -183,9 +183,9 @@ Audio3_sound_ret: jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 - ldh [rNR30], a + ldh [rAUD3ENA], a ld a, $80 - ldh [rNR30], a + ldh [rAUD3ENA], a .skipSfxChannel3 jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] @@ -219,9 +219,9 @@ Audio3_sound_ret: .disableChannelOutput ld hl, Audio3_HWChannelDisableMasks add hl, bc - ldh a, [rNR51] + ldh a, [rAUDTERM] and [hl] - ldh [rNR51], a + ldh [rAUDTERM], a .afterDisable ld a, [wChannelSoundIDs + CHAN5] cp CRY_SFX_START @@ -241,7 +241,7 @@ Audio3_sound_ret: ret c .skipRewind ld a, [wSavedVolume] - ldh [rNR50], a + ldh [rAUDVOL], a xor a ld [wSavedVolume], a .skipCry @@ -548,7 +548,7 @@ Audio3_volume: cp volume_cmd jr nz, Audio3_execute_music call Audio3_GetNextMusicByte - ldh [rNR50], a ; store volume + ldh [rAUDVOL], a ; store volume jp Audio3_sound_ret Audio3_execute_music: @@ -638,7 +638,7 @@ Audio3_pitch_sweep: bit BIT_EXECUTE_MUSIC, [hl] jr nz, Audio3_note ; no call Audio3_GetNextMusicByte - ldh [rNR10], a + ldh [rAUD1SWEEP], a jp Audio3_sound_ret Audio3_note: @@ -770,9 +770,9 @@ Audio3_note_pitch: ld b, 0 ld hl, Audio3_HWChannelDisableMasks add hl, bc - ldh a, [rNR51] + ldh a, [rAUDTERM] and [hl] - ldh [rNR51], a ; disable hardware channel 3's output + ldh [rAUDTERM], a ; disable hardware channel 3's output jr .done .notChannel3 ld b, REG_VOLUME_ENVELOPE @@ -845,7 +845,7 @@ Audio3_EnableChannelOutput: ld b, 0 ld hl, Audio3_HWChannelEnableMasks add hl, bc - ldh a, [rNR51] + ldh a, [rAUDTERM] or [hl] ; set this channel's bits ld d, a ld a, c @@ -867,7 +867,7 @@ Audio3_EnableChannelOutput: add hl, bc and [hl] ld d, a - ldh a, [rNR51] + ldh a, [rAUDTERM] ld hl, Audio3_HWChannelDisableMasks add hl, bc and [hl] ; reset this channel's output bits @@ -875,7 +875,7 @@ Audio3_EnableChannelOutput: ld d, a .skip ld a, d - ldh [rNR51], a + ldh [rAUDTERM], a ret Audio3_ApplyDutyCycleAndSoundLength: @@ -926,10 +926,10 @@ Audio3_ApplyWavePatternAndFrequency: ld e, [hl] inc hl ld d, [hl] - ld hl, rWave_0 + ld hl, _AUD3WAVERAM ld b, $f ld a, $0 ; stop hardware channel 3 - ldh [rNR30], a + ldh [rAUD3ENA], a .loop ld a, [de] inc de @@ -939,7 +939,7 @@ Audio3_ApplyWavePatternAndFrequency: and a jr nz, .loop ld a, $80 ; start hardware channel 3 - ldh [rNR30], a + ldh [rAUD3ENA], a pop de .notChannel3 ld a, d @@ -1400,17 +1400,17 @@ Audio3_PlaySound:: ld a, $ff ld [wStereoPanning], a xor a - ldh [rNR50], a + ldh [rAUDVOL], a ld a, $8 - ldh [rNR10], a + ldh [rAUD1SWEEP], a ld a, 0 - ldh [rNR51], a + ldh [rAUDTERM], a xor a - ldh [rNR30], a + ldh [rAUD3ENA], a ld a, $80 - ldh [rNR30], a + ldh [rAUD3ENA], a ld a, $77 - ldh [rNR50], a + ldh [rAUDVOL], a jp .playSoundCommon .playSfx @@ -1556,7 +1556,7 @@ Audio3_PlaySound:: cp CHAN5 jr nz, .skipSweepDisable ld a, $8 - ldh [rNR10], a ; sweep off + ldh [rAUD1SWEEP], a ; sweep off .skipSweepDisable ld a, c and a @@ -1566,22 +1566,22 @@ Audio3_PlaySound:: .stopAllAudio ld a, $80 - ldh [rNR52], a ; sound hardware on - ldh [rNR30], a ; wave playback on + ldh [rAUDENA], a ; sound hardware on + ldh [rAUD3ENA], a ; wave playback on xor a - ldh [rNR51], a ; no sound output - ldh [rNR32], a ; mute channel 3 (wave channel) + ldh [rAUDTERM], a ; no sound output + ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel) ld a, $8 - ldh [rNR10], a ; sweep off - ldh [rNR12], a ; mute channel 1 (pulse channel 1) - ldh [rNR22], a ; mute channel 2 (pulse channel 2) - ldh [rNR42], a ; mute channel 4 (noise channel) + ldh [rAUD1SWEEP], a ; sweep off + ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1) + ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2) + ldh [rAUD4ENV], a ; mute channel 4 (noise channel) ld a, $40 - ldh [rNR14], a ; counter mode - ldh [rNR24], a - ldh [rNR44], a + ldh [rAUD1HIGH], a ; counter mode + ldh [rAUD2HIGH], a + ldh [rAUD4GO], a ld a, $77 - ldh [rNR50], a ; full volume + ldh [rAUDVOL], a ; full volume xor a ld [wUnusedMusicByte], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -1700,10 +1700,10 @@ Audio3_PlaySound:: ld a, [wSavedVolume] and a jr nz, .done - ldh a, [rNR50] + ldh a, [rAUDVOL] ld [wSavedVolume], a ld a, $77 - ldh [rNR50], a ; full volume + ldh [rAUDVOL], a ; full volume .done ret -- cgit v1.3.1-sl0p From 1e997474be15950eb3176864b346b96504760e67 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 30 Jun 2025 13:42:56 -0400 Subject: Use more audio constants --- audio/engine_1.asm | 22 +++++++++++----------- audio/engine_2.asm | 22 +++++++++++----------- audio/engine_3.asm | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'audio/engine_3.asm') diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 57eb12ed..98c6a71d 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -22,7 +22,7 @@ Audio1_UpdateMusic:: xor a ; disable all channels' output ldh [rAUDTERM], a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a jr .nextChannel .applyAffects @@ -182,9 +182,9 @@ Audio1_sound_ret: cp CHAN7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output - ld a, $0 + ld a, AUD3ENA_OFF ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a .skipSfxChannel3 jr nz, .dontDisable @@ -927,7 +927,7 @@ Audio1_ApplyWavePatternAndFrequency: inc hl ld d, [hl] ld hl, _AUD3WAVERAM - ld b, $f + ld b, AUD3WAVE_SIZE - 1 ld a, $0 ; stop hardware channel 3 ldh [rAUD3ENA], a .loop @@ -938,7 +938,7 @@ Audio1_ApplyWavePatternAndFrequency: dec b and a jr nz, .loop - ld a, $80 ; start hardware channel 3 + ld a, AUD3ENA_ON ; start hardware channel 3 ldh [rAUD3ENA], a pop de .notChannel3 @@ -1401,13 +1401,13 @@ Audio1_PlaySound:: ld [wStereoPanning], a xor a ldh [rAUDVOL], a - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ld a, 0 ldh [rAUDTERM], a xor a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a ld a, $77 ldh [rAUDVOL], a @@ -1555,7 +1555,7 @@ Audio1_PlaySound:: ld a, e cp CHAN5 jr nz, .skipSweepDisable - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off .skipSweepDisable ld a, c @@ -1565,18 +1565,18 @@ Audio1_PlaySound:: jp .sfxChannelLoop .stopAllAudio - ld a, $80 + ld a, AUDENA_ON ldh [rAUDENA], a ; sound hardware on ldh [rAUD3ENA], a ; wave playback on xor a ldh [rAUDTERM], a ; no sound output ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel) - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1) ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2) ldh [rAUD4ENV], a ; mute channel 4 (noise channel) - ld a, $40 + ld a, AUD1HIGH_LENGTH_ON ldh [rAUD1HIGH], a ; counter mode ldh [rAUD2HIGH], a ldh [rAUD4GO], a diff --git a/audio/engine_2.asm b/audio/engine_2.asm index a7c8692a..296a5a2f 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -24,7 +24,7 @@ Audio2_UpdateMusic:: xor a ; disable all channels' output ldh [rAUDTERM], a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a jr .nextChannel .applyAffects @@ -193,9 +193,9 @@ Audio2_sound_ret: cp CHAN7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output - ld a, $0 + ld a, AUD3ENA_OFF ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a .skipSfxChannel3 jr nz, .dontDisable @@ -938,7 +938,7 @@ Audio2_ApplyWavePatternAndFrequency: inc hl ld d, [hl] ld hl, _AUD3WAVERAM - ld b, $f + ld b, AUD3WAVE_SIZE - 1 ld a, $0 ; stop hardware channel 3 ldh [rAUD3ENA], a .loop @@ -949,7 +949,7 @@ Audio2_ApplyWavePatternAndFrequency: dec b and a jr nz, .loop - ld a, $80 ; start hardware channel 3 + ld a, AUD3ENA_ON ; start hardware channel 3 ldh [rAUD3ENA], a pop de .notChannel3 @@ -1464,13 +1464,13 @@ Audio2_PlaySound:: ld [wStereoPanning], a xor a ldh [rAUDVOL], a - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ld a, 0 ldh [rAUDTERM], a xor a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a ld a, $77 ldh [rAUDVOL], a @@ -1618,7 +1618,7 @@ Audio2_PlaySound:: ld a, e cp CHAN5 jr nz, .skipSweepDisable - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off .skipSweepDisable ld a, c @@ -1628,18 +1628,18 @@ Audio2_PlaySound:: jp .sfxChannelLoop .stopAllAudio - ld a, $80 + ld a, AUDENA_ON ldh [rAUDENA], a ; sound hardware on ldh [rAUD3ENA], a ; wave playback on xor a ldh [rAUDTERM], a ; no sound output ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel) - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1) ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2) ldh [rAUD4ENV], a ; mute channel 4 (noise channel) - ld a, $40 + ld a, AUD1HIGH_LENGTH_ON ldh [rAUD1HIGH], a ; counter mode ldh [rAUD2HIGH], a ldh [rAUD4GO], a diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 76115420..3fffb82f 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -22,7 +22,7 @@ Audio3_UpdateMusic:: xor a ; disable all channels' output ldh [rAUDTERM], a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a jr .nextChannel .applyAffects @@ -182,9 +182,9 @@ Audio3_sound_ret: cp CHAN7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output - ld a, $0 + ld a, AUD3ENA_OFF ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a .skipSfxChannel3 jr nz, .dontDisable @@ -927,7 +927,7 @@ Audio3_ApplyWavePatternAndFrequency: inc hl ld d, [hl] ld hl, _AUD3WAVERAM - ld b, $f + ld b, AUD3WAVE_SIZE - 1 ld a, $0 ; stop hardware channel 3 ldh [rAUD3ENA], a .loop @@ -938,7 +938,7 @@ Audio3_ApplyWavePatternAndFrequency: dec b and a jr nz, .loop - ld a, $80 ; start hardware channel 3 + ld a, AUD3ENA_ON ; start hardware channel 3 ldh [rAUD3ENA], a pop de .notChannel3 @@ -1401,13 +1401,13 @@ Audio3_PlaySound:: ld [wStereoPanning], a xor a ldh [rAUDVOL], a - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ld a, 0 ldh [rAUDTERM], a xor a ldh [rAUD3ENA], a - ld a, $80 + ld a, AUD3ENA_ON ldh [rAUD3ENA], a ld a, $77 ldh [rAUDVOL], a @@ -1555,7 +1555,7 @@ Audio3_PlaySound:: ld a, e cp CHAN5 jr nz, .skipSweepDisable - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off .skipSweepDisable ld a, c @@ -1565,18 +1565,18 @@ Audio3_PlaySound:: jp .sfxChannelLoop .stopAllAudio - ld a, $80 + ld a, AUDENA_ON ldh [rAUDENA], a ; sound hardware on ldh [rAUD3ENA], a ; wave playback on xor a ldh [rAUDTERM], a ; no sound output ldh [rAUD3LEVEL], a ; mute channel 3 (wave channel) - ld a, $8 + ld a, AUD1SWEEP_DOWN ldh [rAUD1SWEEP], a ; sweep off ldh [rAUD1ENV], a ; mute channel 1 (pulse channel 1) ldh [rAUD2ENV], a ; mute channel 2 (pulse channel 2) ldh [rAUD4ENV], a ; mute channel 4 (noise channel) - ld a, $40 + ld a, AUD1HIGH_LENGTH_ON ldh [rAUD1HIGH], a ; counter mode ldh [rAUD2HIGH], a ldh [rAUD4GO], a -- cgit v1.3.1-sl0p