diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/delay.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/delay.asm')
| -rw-r--r-- | home/delay.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/home/delay.asm b/home/delay.asm index 300f65c88..7d3e05c03 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,11 @@ DelayFrame:: ; 45a and a jr nz, .halt ret -; 468 -DelayFrames:: ; 468 +DelayFrames:: ; Wait c frames call DelayFrame dec c jr nz, DelayFrames ret -; 46f |