diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-30 17:55:02 -0400 |
| commit | d2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch) | |
| tree | f581489b522fc647477d7b36dee072d553c44fd1 /home/vblank.asm | |
| parent | 3394d8320f35f524231aa13bd9cae34e22246a6d (diff) | |
| parent | 1a987d1e1ab96ca9553d4253c72858057332a03a (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'home/vblank.asm')
| -rw-r--r-- | home/vblank.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/home/vblank.asm b/home/vblank.asm index 66158e50..8eff5bab 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -11,14 +11,14 @@ VBlank:: ; 1de5 (0:1de5) ld [rVBK], a ; reset vram bank to 0 ld a, [H_LOADEDROMBANK] - ld [wd122], a + ld [wVBlankSavedROMBank], a ld a, [hSCX] ld [rSCX], a ld a, [hSCY] ld [rSCY], a - ld a, [wd0a0] + ld a, [wDisableVBlankWYUpdate] and a jr nz, .ok ld a, [hWY] @@ -27,7 +27,7 @@ VBlank:: ; 1de5 (0:1de5) call AutoBgMapTransfer call VBlankCopyBgMap - call RedrawExposedScreenEdge + call RedrawRowOrColumn call VBlankCopy call VBlankCopyDouble call UpdateMovingBgTiles @@ -45,19 +45,18 @@ VBlank:: ; 1de5 (0:1de5) 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_27c2 + call FadeOutAudio ld a, $8 call BankswitchCommon @@ -69,7 +68,7 @@ VBlank:: ; 1de5 (0:1de5) call SerialFunction ; add this - ld a, [wd122] + ld a, [wVBlankSavedROMBank] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a |