summaryrefslogtreecommitdiff
path: root/home/init.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2020-02-09 02:20:05 -0700
committerIIMarckus <iimarckus@gmail.com>2020-02-09 02:20:05 -0700
commita7e3a999ff21ecac0bfbe7f091f9ff901075a323 (patch)
tree8032e91c6a426b355b6d1d3505bbc1fdc9c40fa6 /home/init.asm
parentd561a6d2db176240549fa605dc3e7e1f59e86607 (diff)
parent0543e933915a65127a8b803789d049478c7889d5 (diff)
Merge https://github.com/libjet/pokegold
Diffstat (limited to 'home/init.asm')
-rw-r--r--home/init.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/home/init.asm b/home/init.asm
index cf5c18c9..747d7817 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -47,7 +47,7 @@ Init:: ; 5d1 (0:05d1)
ld [rLCDC], a
; Clear WRAM
- ld hl, wc000
+ ld hl, wMusicPlaying
ld bc, $2000
.ByteFill
ld [hl], $0
@@ -101,14 +101,14 @@ Init:: ; 5d1 (0:05d1)
ld h, $9c
call BlankBGMap
- callab InitCGBPals
+ callfar InitCGBPals
ld a, $9c
ld [hBGMapAddress + 1], a
xor a
ld [hBGMapAddress], a
- callba StartClock
+ farcall StartClock
ld a, SRAM_ENABLE
ld [MBC3SRamEnable], a