diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-23 23:51:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-23 23:51:44 -0400 |
| commit | 8f1dcf07e598c6e3d34b5d255f04faff1667d83b (patch) | |
| tree | fe962b2c23dd40ad3d69f7145a46a002c3285a76 /audio/engine_2.asm | |
| parent | Remove the Discord webhook and tools/unnamed.py (diff) | |
| download | pokeyellow-8f1dcf07e598c6e3d34b5d255f04faff1667d83b.tar.gz pokeyellow-8f1dcf07e598c6e3d34b5d255f04faff1667d83b.tar.xz pokeyellow-8f1dcf07e598c6e3d34b5d255f04faff1667d83b.zip | |
Identify more flag bits (#464)
Diffstat (limited to 'audio/engine_2.asm')
| -rw-r--r-- | audio/engine_2.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/audio/engine_2.asm b/audio/engine_2.asm index bcaab694..2f11c027 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -17,9 +17,9 @@ Audio2_UpdateMusic:: ld a, [wMuteAudioAndPauseMusic] and a jr z, .applyAffects - bit 7, a + bit BIT_MUTE_AUDIO, a jr nz, .nextChannel - set 7, a + set BIT_MUTE_AUDIO, a ld [wMuteAudioAndPauseMusic], a xor a ; disable all channels' output ldh [rNR51], a @@ -163,8 +163,8 @@ Audio2_PlayNextNote: ld a, c cp CHAN5 jr nz, .beginChecks - ld a, [wLowHealthAlarm] ; low health alarm enabled? - bit 7, a + ld a, [wLowHealthAlarm] + bit BIT_LOW_HEALTH_ALARM, a ret nz .beginChecks ; --- @@ -208,7 +208,7 @@ Audio2_sound_ret: .dontDisable jr .afterDisable .returnFromCall - res 1, [hl] + res BIT_SOUND_CALL, [hl] ld d, $0 ld a, c add a @@ -388,8 +388,8 @@ Audio2_toggle_perfect_pitch: ld hl, wChannelFlags1 add hl, bc ld a, [hl] - xor $1 - ld [hl], a ; flip bit 0 of wChannelFlags1 + xor 1 << BIT_PERFECT_PITCH + ld [hl], a jp Audio2_sound_ret Audio2_vibrato: @@ -978,7 +978,7 @@ Audio2_ResetCryModifiers: cp CHAN5 jr nz, .skip ld a, [wLowHealthAlarm] - bit 7, a + bit BIT_LOW_HEALTH_ALARM, a jr z, .skip xor a ld [wFrequencyModifier], a |