summaryrefslogtreecommitdiff
path: root/home/vblank.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/vblank.asm')
-rw-r--r--home/vblank.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/home/vblank.asm b/home/vblank.asm
index 15f91437..d660f270 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
@@ -29,7 +29,7 @@ VBlank::
call $ff80 ; hOAMDMA
ld a, Bank(PrepareOAMData)
ld [H_LOADEDROMBANK], a
- ld [MBC3RomBank], a
+ ld [MBC1RomBank], a
call PrepareOAMData
; VBlank-sensitive operations end.
@@ -54,7 +54,7 @@ VBlank::
ld a, [wc0ef] ; music ROM bank
ld [H_LOADEDROMBANK], a
- ld [MBC3RomBank], a
+ ld [MBC1RomBank], a
cp BANK(Music2_UpdateMusic)
jr nz, .notbank2
@@ -72,7 +72,7 @@ VBlank::
call Music1f_UpdateMusic
.afterMusic
- callba Func_18dee ; keep track of time played
+ callba TrackPlayTime ; keep track of time played
ld a, [$fff9]
and a
@@ -80,7 +80,7 @@ VBlank::
ld a, [wd122]
ld [H_LOADEDROMBANK], a
- ld [MBC3RomBank], a
+ ld [MBC1RomBank], a
pop hl
pop de