diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-05-10 15:52:11 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-05-10 15:52:11 -0400 |
| commit | 455cd75b9a0c0aa6969c48a98efe83a54cd0f548 (patch) | |
| tree | c6d5fc0a4e2a875fe37226b262dd988442664fe8 | |
| parent | ff3eec920a463fbc8854edf73371dee377dff054 (diff) | |
Fixed Vblank.asm
| -rw-r--r-- | home/vblank.asm | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/home/vblank.asm b/home/vblank.asm index d8288187..08348f79 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -5,6 +5,11 @@ VBlank:: push de push hl + ld a, [rVBK] ; vram bank + push af + xor a + ld [rVBK], a ; reset vram bank to 0 + ld a, [H_LOADEDROMBANK] ld [wd122], a @@ -33,8 +38,10 @@ VBlank:: call PrepareOAMData ; VBlank-sensitive operations end. - + call TrackPlayTime ; keep track of time played + call Random + call ReadJoypad ld a, [H_VBLANKOCCURRED] and a @@ -51,37 +58,24 @@ VBlank:: .decced call Func_28cb - - ld a, [wc0ef] ; music ROM bank - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a - - cp BANK(Music2_UpdateMusic) - jr nz, .notbank2 -.bank2 - call Music2_UpdateMusic - jr .afterMusic -.notbank2 - cp BANK(Music8_UpdateMusic) - jr nz, .bank1F -.bank8 + + ld a, $8 + call BankswitchCommon call Music_DoLowHealthAlarm - call Music8_UpdateMusic - jr .afterMusic -.bank1F - call Music1f_UpdateMusic -.afterMusic - - callba TrackPlayTime ; keep track of time played - - ld a, [$fff9] - and a - call z, ReadJoypad + + ld a, $2 + call BankswitchCommon + call Music2_UpdateMusic + + call SerialFunction ; add this ld a, [wd122] ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a + pop af + ld [rVBK],a + pop hl pop de pop bc |