diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /home/vblank.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'home/vblank.asm')
| -rw-r--r-- | home/vblank.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/vblank.asm b/home/vblank.asm index 5afecdad0..d7a58cc1a 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -120,20 +120,20 @@ VBlank0:: ; 2b1 ; 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 @@ -196,7 +196,7 @@ VBlank1:: ; 337 .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ; get requested ints ld a, [rIF] @@ -286,7 +286,7 @@ VBlank3:: ; 396 .done xor a - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ld a, [rIF] push af @@ -343,7 +343,7 @@ VBlank4:: ; 3df 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 |