summaryrefslogtreecommitdiff
path: root/home/init.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/init.asm')
-rw-r--r--home/init.asm13
1 files changed, 6 insertions, 7 deletions
diff --git a/home/init.asm b/home/init.asm
index cb5c6583..6aa14608 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -3,8 +3,6 @@ SoftReset::
call GBPalWhiteOut
ld c, 32
call DelayFrames
- ; fallthrough
-
Init::
; Program init.
@@ -51,10 +49,10 @@ rLCDC_DEFAULT EQU %11100011
or c
jr nz, .loop
- call ClearVram
+ call ClearVram ; 1dc6
ld hl, $ff80
- ld bc, $ffff - $ff80
+ ld bc, $fffe - $ff80
call FillMemory
call ClearSprites
@@ -70,6 +68,8 @@ rLCDC_DEFAULT EQU %11100011
ld [hSCX], a
ld [hSCY], a
ld [rIF], a
+ ld [wc0f3], a
+ ld [wc0f4], a
ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL
ld [rIE], a
@@ -126,12 +126,11 @@ ClearVram:
StopAllSounds::
- ld a, BANK(Audio1_UpdateMusic)
+ ld a, $2
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
xor a
ld [wAudioFadeOutControl], a
ld [wNewSoundID], a
ld [wLastMusicSoundID], a
- dec a
- jp PlaySound
+ jp StopAllMusic