ref: bf688645b1f529441570fe69017587f3591d7492
parent: 87faa77b5b2838cd2fd873e2ed87f1ddf37683c1
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Apr 12 10:48:05 EDT 2021
Rename SOUND_REST to SOUND_CRY Fixes #821
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1158,10 +1158,10 @@
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 @@
.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 @@
ld [wSFXPriority], a
ret
-ParseSFXOrRest:
+ParseSFXOrCry:
; turn noise sampling on
ld hl, CHANNEL_NOTE_FLAGS
add hl, bc
@@ -2400,7 +2400,7 @@
ld hl, CHANNEL_FLAGS1
add hl, bc
- set SOUND_REST, [hl]
+ set SOUND_CRY, [hl]
ld hl, CHANNEL_FLAGS2
add hl, bc
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -84,7 +84,7 @@
const SOUND_LOOPING ; 2
const SOUND_SFX ; 3
const SOUND_NOISE ; 4
- const SOUND_REST ; 5
+ const SOUND_CRY ; 5
; Flags2
const_def