diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/play_time.asm | 32 | ||||
| -rw-r--r-- | home/vblank.asm | 11 |
2 files changed, 19 insertions, 24 deletions
diff --git a/home/play_time.asm b/home/play_time.asm index 7b34491e..09c894fc 100644 --- a/home/play_time.asm +++ b/home/play_time.asm @@ -6,44 +6,44 @@ TrackPlayTime: ; 1ef5 (0:1ef5) ld a,[wd732] bit 0,a ret z - ld a, [W_PLAYTIMEMINUTES] + ld a, [wPlayTimeMinutes] and a ret nz - ld a, [W_PLAYTIMEFRAMES] + ld a, [wPlayTimeFrames] inc a - ld [W_PLAYTIMEFRAMES], a + ld [wPlayTimeFrames], a cp 60 ret nz xor a - ld [W_PLAYTIMEFRAMES], a - ld a, [W_PLAYTIMESECONDS] + ld [wPlayTimeFrames], a + ld a, [wPlayTimeSeconds] inc a - ld [W_PLAYTIMESECONDS], a + ld [wPlayTimeSeconds], a cp 60 ret nz xor a - ld [W_PLAYTIMESECONDS], a - ld a, [W_PLAYTIMEMINUTES + 1] + ld [wPlayTimeSeconds], a + ld a, [wPlayTimeMinutes + 1] inc a - ld [W_PLAYTIMEMINUTES + 1], a + ld [wPlayTimeMinutes + 1], a cp 60 ret nz xor a - ld [W_PLAYTIMEMINUTES + 1], a - ld a, [W_PLAYTIMEHOURS + 1] + ld [wPlayTimeMinutes + 1], a + ld a, [wPlayTimeHours + 1] inc a - ld [W_PLAYTIMEHOURS + 1], a + ld [wPlayTimeHours + 1], a cp $ff ret nz ld hl, wd47a set 0, [hl] .maxIGT ld a, 59 - ld [W_PLAYTIMESECONDS], a - ld [W_PLAYTIMEMINUTES + 1], a + ld [wPlayTimeSeconds], a + ld [wPlayTimeMinutes + 1], a ld a, $ff - ld [W_PLAYTIMEHOURS + 1], a - ld [W_PLAYTIMEMINUTES], a + ld [wPlayTimeHours + 1], a + ld [wPlayTimeMinutes], a ret CountDownIgnoreInputBitReset: ; 1f54 (0:1f54) diff --git a/home/vblank.asm b/home/vblank.asm index 0e529dd0..cab6f944 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -59,15 +59,10 @@ VBlank:: ; 1de5 (0:1de5) call FadeOutAudio - ld a, $8 - call BankswitchCommon - call Music_DoLowHealthAlarm + callbs Music_DoLowHealthAlarm + callbs Audio1_UpdateMusic - ld a, $2 - call BankswitchCommon - call Audio1_UpdateMusic - - call SerialFunction ; add this + call SerialFunction ld a, [wVBlankSavedROMBank] ld [H_LOADEDROMBANK], a |