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/delay.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/delay.asm')
| -rw-r--r-- | home/delay.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/delay.asm b/home/delay.asm index 450b4190c..300f65c88 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -1,12 +1,12 @@ DelayFrame:: ; 45a ; Wait for one frame ld a, 1 - ld [VBlankOccurred], a + ld [wVBlankOccurred], a ; Wait for the next VBlank, halting to conserve battery .halt halt ; rgbasm adds a nop after this instruction by default - ld a, [VBlankOccurred] + ld a, [wVBlankOccurred] and a jr nz, .halt ret |