diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-07-10 21:11:03 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-07-10 21:27:24 -0400 |
| commit | 96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0 (patch) | |
| tree | 103935618b8f9c8050b37fd4e51387e0a6fe0099 /audio | |
| parent | Replace "branch" labels in SFX files with local names (diff) | |
| download | pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.tar.gz pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.tar.xz pokeyellow-96656fdc69964c2f4d7e0ce2c3dbfd1729f75af0.zip | |
Identify some `.asm_*` labels
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/low_health_alarm.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm index 08060aab..65e19aa7 100644 --- a/audio/low_health_alarm.asm +++ b/audio/low_health_alarm.asm @@ -7,25 +7,25 @@ Music_DoLowHealthAlarm:: ret z ;nope and $7f ;low 7 bits are the timer. - jr nz, .asm_21383 ;if timer > 0, play low tone. + jr nz, .notToneHi ;if timer > 0, play low tone. call .playToneHi ld a, 30 ;keep this tone for 30 frames. - jr .asm_21395 ;reset the timer. + jr .resetTimer -.asm_21383 +.notToneHi cp 20 - jr nz, .asm_2138a ;if timer == 20, - call .playToneLo ;actually set the sound registers. + jr nz, .noTone ;if timer == 20, + call .playToneLo ;actually set the sound registers. -.asm_2138a +.noTone ld a, $86 ld [wChannelSoundIDs + Ch5], a ;disable sound channel? ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a -.asm_21395 +.resetTimer ; reset the timer and enable flag. set 7, a ld [wLowHealthAlarm], a |