summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-09-03 17:36:55 -0400
committeryenatch <yenatch@gmail.com>2013-09-03 17:36:55 -0400
commitb74e63a20dcdb0cf376977426a9dcbe64586273a (patch)
tree9398efbc22ef1541b0c87e64724d6b256ccd458c /main.asm
parentd2eeab62eac2213b51371ea7359904f652914db3 (diff)
split out delay functions
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm23
1 files changed, 1 insertions, 22 deletions
diff --git a/main.asm b/main.asm
index 1ac24e469..942b5a80e 100644
--- a/main.asm
+++ b/main.asm
@@ -62,28 +62,7 @@ INCLUDE "engine/init.asm"
INCLUDE "engine/vblank.asm"
-DelayFrame: ; 45a
-; Wait for one frame
- ld a, 1
- ld [VBlankOccurred], a
-
-; Wait for the next VBlank, halting to conserve battery
-.halt
- halt ; rgbasm adds a nop after this instruction by default
- ld a, [VBlankOccurred]
- and a
- jr nz, .halt
- ret
-; 468
-
-
-DelayFrames: ; 468
-; Wait c frames
- call DelayFrame
- dec c
- jr nz, DelayFrames
- ret
-; 46f
+INCLUDE "engine/delay.asm"
RTC: ; 46f