summaryrefslogtreecommitdiff
path: root/engine/title.asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2016-07-21 07:58:36 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2016-07-21 07:58:36 -0400
commit803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch)
tree94632a90406f3b185d82cabee2beb834bd711215 /engine/title.asm
parentc33ba049a5a993fc678fd1698645039ce4974022 (diff)
parenta32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff)
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/title.asm')
-rw-r--r--engine/title.asm11
1 files changed, 5 insertions, 6 deletions
diff --git a/engine/title.asm b/engine/title.asm
index 30804fbe8..787872939 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -188,8 +188,8 @@ _TitleScreen: ; 10ed67
call ByteFill
; Let LCD Stat know we're messing around with SCX
- ld a, rSCX - rJOYP
- ld [hFFC6], a
+ ld a, rSCX - $ff00
+ ld [hLCDCPointer], a
pop af
ld [rSVBK], a
@@ -351,9 +351,8 @@ InitializeBackground: ; 10ef06
ld b, a
ld a, e
ld [hli], a
-rept 2
inc e
-endr
+ inc e
ld a, $80
ld [hli], a
dec c
@@ -378,9 +377,9 @@ AnimateTitleCrystal: ; 10ef32
ld a, [hl]
add 2
ld [hli], a
-rept 3
inc hl
-endr
+ inc hl
+ inc hl
dec c
jr nz, .loop