Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into audio-macros

Browse Source
This commit is contained in:
dannye
2020-01-06 22:07:33 -06:00
parent 99d16d616d 94ebdab6d3
commit e7be25948d
451 changed files with 10496 additions and 10448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/engine.asm
View File

@@ -6,7 +6,7 @@
; FadeMusic
; PlayStereoSFX
_MapSetup_Sound_Off::
_InitSound::
; restart sound operation
; clear all relevant hardware registers & wram
push hl
@@ -62,7 +62,7 @@ MusicFadeRestart:
push af
ld a, [wMusicFadeID]
push af
call _MapSetup_Sound_Off
call _InitSound
pop af
ld [wMusicFadeID], a
pop af
@@ -1364,7 +1364,7 @@ ParseMusicCommand:
jp hl
MusicCommands:
; entries correspond to macros/sound.asm enumeration
; entries correspond to macros/scripts/audio.asm enumeration
dw Music_Octave8 ; octave 8
dw Music_Octave7 ; octave 7
dw Music_Octave6 ; octave 6
@@ -2798,7 +2798,7 @@ ChannelPointers:
ClearChannels::
; runs ClearChannel for all 4 channels
; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
; doesn't seem to be used, but functionally identical to InitSound
ld hl, rNR50
xor a
ld [hli], a