summaryrefslogtreecommitdiff
path: root/engine/delay.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-09-09 15:56:49 -0500
committerBryan Bishop <kanzure@gmail.com>2013-09-09 15:56:49 -0500
commit37e1aa4e8ec2400ba97db4c767bd3a9fcd43a1ac (patch)
tree68cb6273ed885d69512c4ba099298aad1534c6e4 /engine/delay.asm
parent35324ae43f845f4ce8346ef05fdf1bed8bed1e28 (diff)
parent705e6824687ed247a28cfbaedd47bf33bd1da32a (diff)
Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
Diffstat (limited to 'engine/delay.asm')
-rw-r--r--engine/delay.asm23
1 files changed, 0 insertions, 23 deletions
diff --git a/engine/delay.asm b/engine/delay.asm
deleted file mode 100644
index 4e8b2147c..000000000
--- a/engine/delay.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-