summaryrefslogtreecommitdiff
path: root/home/vblank.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
commit5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch)
tree97319f45578efa0901fb1986678c16bbdeda6bcc /home/vblank.asm
parente181c27c5e396aea254b471b182df3237eeb03ce (diff)
parent2bb64d11e6015e39e934e7359697c08636645994 (diff)
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'home/vblank.asm')
-rw-r--r--home/vblank.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/home/vblank.asm b/home/vblank.asm
index cab6f944..24159a4c 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -9,7 +9,7 @@ VBlank:: ; 1de5 (0:1de5)
push af
xor a
ld [rVBK], a ; reset vram bank to 0
-
+
ld a, [H_LOADEDROMBANK]
ld [wVBlankSavedROMBank], a
@@ -39,7 +39,7 @@ VBlank:: ; 1de5 (0:1de5)
; VBlank-sensitive operations end.
call TrackPlayTime ; keep track of time played
-
+
call Random
call ReadJoypad
@@ -58,10 +58,10 @@ VBlank:: ; 1de5 (0:1de5)
.skipDec
call FadeOutAudio
-
+
callbs Music_DoLowHealthAlarm
callbs Audio1_UpdateMusic
-
+
call SerialFunction
ld a, [wVBlankSavedROMBank]
@@ -70,7 +70,7 @@ VBlank:: ; 1de5 (0:1de5)
pop af
ld [rVBK],a
-
+
pop hl
pop de
pop bc