diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-02 21:26:20 -0400 |
| commit | 04883f4bf9fa6c0bf935f1aac95d5d48abe3bb30 (patch) | |
| tree | 3ff95e7bbb62d0decfb9e2cba9e3d54f61013706 /home/delay.asm | |
| parent | 956d010d59ad225bea768aec172ccb56977b1775 (diff) | |
| parent | 5fb7140613d6ea00ec1964fde18418c6257c2e27 (diff) | |
Merge branch 'master' into build_more_roms
Diffstat (limited to 'home/delay.asm')
| -rw-r--r-- | home/delay.asm | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/home/delay.asm b/home/delay.asm index dc3ad40..286cc0c 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -4,23 +4,19 @@ SECTION "Delay", ROM0[$0317] DelayFrame:: ; Wait for one frame - ld a, 1 - ld [wVBlankOccurred], a - -; Wait for the next VBlank, halting to conserve battery + ld a, 1 + ld [wVBlankOccurred], a .halt - halt ; rgbasm adds a nop after this instruction by default - ld a, [wVBlankOccurred] - and a - jr nz, .halt - - ret - +; Wait for the next VBlank, halting to conserve battery + halt ; rgbasm adds a nop after this instruction by default + ld a, [wVBlankOccurred] + and a + jr nz, .halt + ret DelayFrames:: ; Wait c frames - call DelayFrame - dec c - jr nz, DelayFrames - - ret + call DelayFrame + dec c + jr nz, DelayFrames + ret |