summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/init.asm4
-rw-r--r--home/overworld.asm2
-rw-r--r--home/vblank.asm6
3 files changed, 6 insertions, 6 deletions
diff --git a/home/init.asm b/home/init.asm
index b79b19d9..cf8f448e 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -25,7 +25,7 @@ rLCDC_DEFAULT EQU %11100011
ld [rIE], a
ld [$ff43], a
ld [$ff42], a
- ld [$ff01], a
+ ld [rSB], a
ld [$ff02], a
ld [$ff4b], a
ld [$ff4a], a
@@ -74,7 +74,7 @@ rLCDC_DEFAULT EQU %11100011
ld [rIE], a
ld a, 144 ; move the window off-screen
- ld [$ffb0], a
+ ld [hVBlankWY], a
ld [rWY], a
ld a, 7
ld [rWX], a
diff --git a/home/overworld.asm b/home/overworld.asm
index cf36aba8..91f46dc0 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -766,7 +766,7 @@ HandleFlyOrTeleportAway::
call UpdateSprites
call Delay3
xor a
- ld [wcf0b], a
+ ld [wBattleResult], a
ld [wd700], a
ld [W_ISINBATTLE], a
ld [wd35d], a
diff --git a/home/vblank.asm b/home/vblank.asm
index 15f91437..b4daaa8b 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -8,15 +8,15 @@ VBlank::
ld a, [H_LOADEDROMBANK]
ld [wd122], a
- ld a, [$ffae]
+ ld a, [hVBlankSCX]
ld [rSCX], a
- ld a, [$ffaf]
+ ld a, [hVBlankSCY]
ld [rSCY], a
ld a, [wd0a0]
and a
jr nz, .ok
- ld a, [$ffb0]
+ ld a, [hVBlankWY]
ld [rWY], a
.ok