diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-10 00:00:12 -0500 |
| commit | 66bc517605860c9f716a176ed467d34097985895 (patch) | |
| tree | 4c126cbb3bbdb2b0a236375c2140e7a6c25260a6 /home/vblank.asm | |
| parent | 8a6d46f3d9ba4fb6939eb9ea9949f47aa8608d4a (diff) | |
| parent | 2b018159997e3b580efd114ff4e3548a0de3cbc5 (diff) | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Diffstat (limited to 'home/vblank.asm')
| -rw-r--r-- | home/vblank.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/vblank.asm b/home/vblank.asm index 6abc3756..3bdbe7cb 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -38,21 +38,21 @@ VBlank:: ld a, [H_VBLANKOCCURRED] and a - jr z, .vblanked + jr z, .skipZeroing xor a ld [H_VBLANKOCCURRED], a -.vblanked +.skipZeroing ld a, [H_FRAMECOUNTER] and a - jr z, .decced + jr z, .skipDec dec a ld [H_FRAMECOUNTER], a -.decced - call Func_28cb +.skipDec + call FadeOutAudio - ld a, [wc0ef] ; music ROM bank + ld a, [wAudioROMBank] ; music ROM bank ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a |