summaryrefslogtreecommitdiff
path: root/home/init.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-10-26 01:34:08 -0400
committeryenatch <yenatch@gmail.com>2015-10-26 01:34:08 -0400
commite638cdb74cabff705d4879568e74b8ed43da64e1 (patch)
tree02869ee6058c1b7d00d554af86e6eb6b197cd660 /home/init.asm
parentb8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff)
parent0d17d4a75866d053f5e0b48c66deb2508071d98b (diff)
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts: INSTALL.md
Diffstat (limited to 'home/init.asm')
-rw-r--r--home/init.asm9
1 files changed, 4 insertions, 5 deletions
diff --git a/home/init.asm b/home/init.asm
index 6ada3e267..8325f6294 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -136,15 +136,14 @@ Init:: ; 17d
; BG on
ld [rLCDC], a
- ld a, $ff
+ ld a, -1
ld [$ffcb], a
callba Function9890
- ld a, $9c
- ld [$ffd7], a
-
- xor a
+ ld a, VBGMap1 / $100
+ ld [hBGMapAddress + 1], a
+ xor a ; VBGMap1 % $100
ld [hBGMapAddress], a
callba StartClock