From be884e24b5081fec078acfa2557a5b9570682d91 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Fri, 5 Jun 2015 21:03:23 -0400 Subject: Fix home/play_time.asm and add it into the respective location in home.asm --- home.asm | 1 + home/play_time.asm | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/home.asm b/home.asm index 3bb81ec2..f5ce00dc 100644 --- a/home.asm +++ b/home.asm @@ -1092,6 +1092,7 @@ INCLUDE "home/vcopy.asm" INCLUDE "home/init.asm" INCLUDE "home/vblank.asm" INCLUDE "home/fade.asm" +INCLUDE "home/play_time.asm" INCLUDE "home/serial.asm" INCLUDE "home/timer.asm" INCLUDE "home/audio.asm" diff --git a/home/play_time.asm b/home/play_time.asm index 74da9c59..16802f7e 100644 --- a/home/play_time.asm +++ b/home/play_time.asm @@ -1,7 +1,10 @@ -TrackPlayTime: ; 18dee (6:4dee) +TrackPlayTime: ; 1ef5 (0:1ef5) call CountDownIgnoreInputBitReset - ld a, [wd732] - bit 0, a + ld hl, wd47a + bit 0, [hl] + jr nz, .maxIGT + ld a,[wd732] + bit 0,a ret z ld a, [W_PLAYTIMEMINUTES] and a @@ -32,19 +35,26 @@ TrackPlayTime: ; 18dee (6:4dee) ld [W_PLAYTIMEHOURS + 1], a cp $ff ret nz + ld hl, wd47a + set 0, [hl] +.maxIGT + ld a, 59 + ld [W_PLAYTIMEMINUTES + 1], a + ld [W_PLAYTIMESECONDS], a ld a, $ff + ld [W_PLAYTIMEHOURS + 1], a ld [W_PLAYTIMEMINUTES], a ret CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) ld a, [wIgnoreInputCounter] and a - jr nz, .asm_18e40 + jr nz, .asm_1f5e ld a, $ff - jr .asm_18e41 -.asm_18e40 + jr .asm_1f5f +.asm_1f5e dec a -.asm_18e41 +.asm_1f5f ld [wIgnoreInputCounter], a and a ret nz -- cgit v1.3.1-sl0p