diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /home/vblank.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'home/vblank.asm')
| -rw-r--r-- | home/vblank.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/home/vblank.asm b/home/vblank.asm index 5afecdad0..3b33b1ec5 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -113,27 +113,27 @@ VBlank0:: ; 2b1 ld a, [hOAMUpdate] and a jr nz, .done_oam - call hPushOAM + call hTransferVirtualOAM .done_oam ; vblank-sensitive operations are done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a - ld a, [OverworldDelay] + ld a, [wOverworldDelay] and a jr z, .ok dec a - ld [OverworldDelay], a + ld [wOverworldDelay], a .ok - ld a, [TextDelayFrames] + ld a, [wTextDelayFrames] and a jr z, .ok2 dec a - ld [TextDelayFrames], a + ld [wTextDelayFrames], a .ok2 call Joypad @@ -165,7 +165,7 @@ VBlank2:: ; 325 rst Bankswitch xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ret ; 337 @@ -192,11 +192,11 @@ VBlank1:: ; 337 call UpdateBGMap call Serve2bppRequest_VBlank - call hPushOAM + call hTransferVirtualOAM .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ; get requested ints ld a, [rIF] @@ -282,11 +282,11 @@ VBlank3:: ; 396 call UpdateBGMap call Serve2bppRequest_VBlank - call hPushOAM + call hTransferVirtualOAM .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ld a, [rIF] push af @@ -338,12 +338,12 @@ VBlank4:: ; 3df call UpdateBGMap call Serve2bppRequest - call hPushOAM + call hTransferVirtualOAM call Joypad xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a call AskSerial @@ -379,7 +379,7 @@ VBlank5:: ; 400 .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a call Joypad @@ -429,7 +429,7 @@ VBlank6:: ; 436 .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ld a, BANK(_UpdateSound) rst Bankswitch |