diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-08-31 12:47:23 -0500 |
| commit | 12c1d874b94cf51523b072477a59b0cc398fc8d3 (patch) | |
| tree | a3940230cf443d809780f8f7b19748f782b17fdd /engine/vblank.asm | |
| parent | 724215ea7519c28b602f72440e1ec73e2e6cf388 (diff) | |
| parent | c0a01c998240bacae77addbb08a5d2133cf58a21 (diff) | |
Merge branch 'master' into refactor-preprocessor
Conflicts:
preprocessor.py
Also bump the extras submodule to a version of pokemontools with a
suitable version of the preprocessor. The changes from 'master' for
preprocessor.py have been inserted into pokemontools prior to the
submodule bump.
Diffstat (limited to 'engine/vblank.asm')
| -rw-r--r-- | engine/vblank.asm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/vblank.asm b/engine/vblank.asm index 6a319356c..44b3195f8 100644 --- a/engine/vblank.asm +++ b/engine/vblank.asm @@ -6,6 +6,8 @@ ; This prevents the display and audio output from lagging. + +VBlank: ; 283 push af push bc push de @@ -26,7 +28,7 @@ ld l, a ; down to business - call JpHl + call _hl_ ; since this is called once per frame call GameTimer |