pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename SOUND_REST to SOUND_CRY

Browse Source 
Fixes #821
This commit is contained in:
Rangi 2021-04-12 14:48:05 -04:00
parent 87faa77b5b
commit bf688645b1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/engine.asm
View File

@ -1158,10 +1158,10 @@ ParseMusic:
ld hl, CHANNEL_FLAGS1 ld hl, CHANNEL_FLAGS1
add hl, bc add hl, bc
bit SOUND_SFX, [hl] bit SOUND_SFX, [hl]
jp nz, ParseSFXOrRest jp nz, ParseSFXOrCry
bit SOUND_REST, [hl] ; rest bit SOUND_CRY, [hl]
jp nz, ParseSFXOrRest jp nz, ParseSFXOrCry
bit SOUND_NOISE, [hl] ; noise sample bit SOUND_NOISE, [hl]
jp nz, GetNoiseSample jp nz, GetNoiseSample
; normal note ; normal note
; set note duration (bottom nybble) ; set note duration (bottom nybble)
@ -1220,7 +1220,7 @@ ParseMusic:
.chan_5to8 .chan_5to8
ld hl, CHANNEL_FLAGS1 ld hl, CHANNEL_FLAGS1
add hl, bc add hl, bc
bit SOUND_REST, [hl] bit SOUND_CRY, [hl]
call nz, RestoreVolume call nz, RestoreVolume
; end music ; end music
ld a, [wCurChannel] ld a, [wCurChannel]
@ -1267,7 +1267,7 @@ RestoreVolume:
ld [wSFXPriority], a ld [wSFXPriority], a
ret ret
ParseSFXOrRest: ParseSFXOrCry:
; turn noise sampling on ; turn noise sampling on
ld hl, CHANNEL_NOTE_FLAGS ld hl, CHANNEL_NOTE_FLAGS
add hl, bc add hl, bc
@ -2400,7 +2400,7 @@ _PlayCry::
ld hl, CHANNEL_FLAGS1 ld hl, CHANNEL_FLAGS1
add hl, bc add hl, bc
set SOUND_REST, [hl] set SOUND_CRY, [hl]
ld hl, CHANNEL_FLAGS2 ld hl, CHANNEL_FLAGS2
add hl, bc add hl, bc

2
constants/audio_constants.asm
View File

@ -84,7 +84,7 @@ NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7
const SOUND_LOOPING ; 2 const SOUND_LOOPING ; 2
const SOUND_SFX ; 3 const SOUND_SFX ; 3
const SOUND_NOISE ; 4 const SOUND_NOISE ; 4
const SOUND_REST ; 5 const SOUND_CRY ; 5
; Flags2 ; Flags2
const_def const_def