mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
This commit is contained in:
parent
ccb01731fe
commit
9878f01e29
43 changed files with 450 additions and 389 deletions
|
|
@ -21,7 +21,7 @@ HallOfFamePC:
|
|||
ld a, %11000000
|
||||
ld [rBGP], a
|
||||
call EnableLCD
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySoundWaitForCurrent
|
||||
ld c, BANK(Music_Credits)
|
||||
ld a, MUSIC_CREDITS
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ EvolveMon:
|
|||
xor a
|
||||
ld [wLowHealthAlarm], a
|
||||
ld [wChannelSoundIDs + Ch5], a
|
||||
dec a
|
||||
dec a ; SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
ld a, $1
|
||||
|
|
@ -67,7 +67,7 @@ EvolveMon:
|
|||
ld a, [wEvoNewSpecies]
|
||||
.done
|
||||
ld [wWholeScreenPaletteMonSpecies], a
|
||||
ld a, $ff
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound
|
||||
ld a, [wWholeScreenPaletteMonSpecies]
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ SetDefaultNames:
|
|||
jp CopyData
|
||||
|
||||
OakSpeech:
|
||||
ld a, $FF
|
||||
call PlaySound ; stop music
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
call PlaySound
|
||||
ld a, BANK(Music_Routes2)
|
||||
ld c, a
|
||||
ld a, MUSIC_ROUTES2
|
||||
|
|
@ -133,9 +133,9 @@ OakSpeech:
|
|||
ld [wAudioSavedROMBank], a
|
||||
ld a, 10
|
||||
ld [wAudioFadeOutControl], a
|
||||
ld a, $FF
|
||||
ld a, SFX_STOP_ALL_MUSIC
|
||||
ld [wNewSoundID], a
|
||||
call PlaySound ; stop music
|
||||
call PlaySound
|
||||
pop af
|
||||
ld [H_LOADEDROMBANK], a
|
||||
ld [MBC1RomBank], a
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue