diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-12 14:48:05 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-12 14:48:05 -0400 |
| commit | bf688645b1f529441570fe69017587f3591d7492 (patch) | |
| tree | 0063d6d3f14e7dd1e1ff67603eb077e85d592f24 | |
| parent | 87faa77b5b2838cd2fd873e2ed87f1ddf37683c1 (diff) | |
Rename SOUND_REST to SOUND_CRY
Fixes #821
| -rw-r--r-- | audio/engine.asm | 14 | ||||
| -rw-r--r-- | constants/audio_constants.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index ca6fd4ab7..db175b7d0 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1158,10 +1158,10 @@ ParseMusic: ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_SFX, [hl] - jp nz, ParseSFXOrRest - bit SOUND_REST, [hl] ; rest - jp nz, ParseSFXOrRest - bit SOUND_NOISE, [hl] ; noise sample + jp nz, ParseSFXOrCry + bit SOUND_CRY, [hl] + jp nz, ParseSFXOrCry + bit SOUND_NOISE, [hl] jp nz, GetNoiseSample ; normal note ; set note duration (bottom nybble) @@ -1220,7 +1220,7 @@ ParseMusic: .chan_5to8 ld hl, CHANNEL_FLAGS1 add hl, bc - bit SOUND_REST, [hl] + bit SOUND_CRY, [hl] call nz, RestoreVolume ; end music ld a, [wCurChannel] @@ -1267,7 +1267,7 @@ RestoreVolume: ld [wSFXPriority], a ret -ParseSFXOrRest: +ParseSFXOrCry: ; turn noise sampling on ld hl, CHANNEL_NOTE_FLAGS add hl, bc @@ -2400,7 +2400,7 @@ _PlayCry:: ld hl, CHANNEL_FLAGS1 add hl, bc - set SOUND_REST, [hl] + set SOUND_CRY, [hl] ld hl, CHANNEL_FLAGS2 add hl, bc diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index bf2753853..7d0989434 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -84,7 +84,7 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 const SOUND_LOOPING ; 2 const SOUND_SFX ; 3 const SOUND_NOISE ; 4 - const SOUND_REST ; 5 + const SOUND_CRY ; 5 ; Flags2 const_def |