summaryrefslogtreecommitdiff
path: root/audio/engine.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-04-12 14:48:17 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-04-12 14:48:17 -0400
commit44a1d2c52673775e1857aa6ad4382f3f5f31e84e (patch)
tree1d76aca792008f3680a6ef8abdea9128225f0763 /audio/engine.asm
parente746d745f30ee8eaec51a41ba9a9301e5ad6fadd (diff)
Rename SOUND_REST to SOUND_CRY
Diffstat (limited to 'audio/engine.asm')
-rw-r--r--audio/engine.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/audio/engine.asm b/audio/engine.asm
index ca6fd4ab..db175b7d 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