summaryrefslogtreecommitdiff
path: root/home/delay.asm
diff options
context:
space:
mode:
authorThomas Winwood <twwinwood@gmail.com>2018-07-21 02:06:31 +0100
committerGitHub <noreply@github.com>2018-07-21 02:06:31 +0100
commit23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch)
tree63c20c67efbdf8334c6e273f78065b83135e3886 /home/delay.asm
parent17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff)
parent2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff)
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/delay.asm')
-rw-r--r--home/delay.asm7
1 files changed, 2 insertions, 5 deletions
diff --git a/home/delay.asm b/home/delay.asm
index 300f65c88..4ad25ef21 100644
--- a/home/delay.asm
+++ b/home/delay.asm
@@ -1,4 +1,4 @@
-DelayFrame:: ; 45a
+DelayFrame::
; Wait for one frame
ld a, 1
ld [wVBlankOccurred], a
@@ -10,13 +10,10 @@ DelayFrame:: ; 45a
and a
jr nz, .halt
ret
-; 468
-
-DelayFrames:: ; 468
+DelayFrames::
; Wait c frames
call DelayFrame
dec c
jr nz, DelayFrames
ret
-; 46f