diff options
Diffstat (limited to 'engine/vblank.asm')
| -rw-r--r-- | engine/vblank.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/engine/vblank.asm b/engine/vblank.asm index 5080a56ad..6a319356c 100644 --- a/engine/vblank.asm +++ b/engine/vblank.asm @@ -71,31 +71,31 @@ VBlank0: ; 2b1 ; advance rng ld a, [rDIV] ld b, a - ld a, [$ffe1] + ld a, [hRandomAdd] adc b - ld [$ffe1], a + ld [hRandomAdd], a ld a, [rDIV] ld b, a - ld a, [$ffe2] + ld a, [hRandomSub] sbc b - ld [$ffe2], a + ld [hRandomSub], a ; save bank - ld a, [$ff9d] ; current bank + ld a, [hROMBank] ; current bank ld [$ff8a], a ; scroll x - ld a, [$ffcf] + ld a, [hSCX] ld [rSCX], a ; scroll y - ld a, [$ffd0] + ld a, [hSCY] ld [rSCY], a ; window y - ld a, [$ffd2] + ld a, [hWY] ld [rWY], a ; window x + 7 - ld a, [$ffd1] + ld a, [hWX] ld [rWX], a ; some time management is in order @@ -123,7 +123,7 @@ VBlank0: ; 2b1 .doneframeaction ; oam update off? - ld a, [$ffd8] + ld a, [hOAMUpdate] and a jr nz, .vblankoccurred @@ -146,12 +146,12 @@ VBlank0: ; 2b1 xor a ld [VBlankOccurred], a -; dec $cfb1 until 0 - ld a, [$cfb1] +; dec OverworldDelay until 0 + ld a, [OverworldDelay] and a jr z, .textdelay dec a - ld [$cfb1], a + ld [OverworldDelay], a .textdelay ; dec text delay counter until 0 @@ -172,7 +172,7 @@ VBlank0: ; 2b1 rst Bankswitch ; restore bank ; - ld a, [$ff98] + ld a, [hSeconds] ld [$ffe3], a ret @@ -183,7 +183,7 @@ VBlank2: ; 325 ; sound only ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a ; update sound @@ -211,15 +211,15 @@ VBlank1: ; 337 ; sound / lcd stat ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a ; scroll x - ld a, [$ffcf] + ld a, [hSCX] ld [rSCX], a ; scroll y - ld a, [$ffd0] + ld a, [hSCY] ld [rSCY], a ; time-sensitive fns @@ -291,7 +291,7 @@ UpdatePals: ; 37f ; update pals for either dmg or cgb ; check cgb - ld a, [$ffe6] + ld a, [hCGB] and a jp nz, UpdateCGBPals @@ -319,18 +319,18 @@ VBlank3: ; 396 ; sound / lcd stat ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a ; scroll x - ld a, [$ffcf] + ld a, [hSCX] ld [rSCX], a ; scroll y - ld a, [$ffd0] + ld a, [hSCY] ld [rSCY], a ; any pals to update? - ld a, [$ffe5] + ld a, [hCGBPalUpdate] and a call nz, ForceUpdateCGBPals jr c, .vblankoccurred @@ -404,7 +404,7 @@ VBlank4: ; 3df ; sound ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a call UpdateBGMap @@ -451,11 +451,11 @@ VBlank5: ; 400 ; ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a ; scroll x - ld a, [$ffcf] + ld a, [hSCX] ld [rSCX], a ; if we can update pals, skip this part @@ -509,7 +509,7 @@ VBlank6: ; 436 ; sound ; save bank - ld a, [$ff9d] + ld a, [hROMBank] ld [$ff8a], a ; inc frame counter |