diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-11 20:37:15 -0400 |
| commit | f5983c0f813d3d908b6016db3ed866e4ca9437dc (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /home/play_time.asm | |
| parent | Character dict; surfing minigame; printer debug (diff) | |
| parent | More syncing with pokered (diff) | |
| download | pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'home/play_time.asm')
| -rw-r--r-- | home/play_time.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/home/play_time.asm b/home/play_time.asm index 09c894fc..8044d15c 100644 --- a/home/play_time.asm +++ b/home/play_time.asm @@ -6,7 +6,7 @@ TrackPlayTime: ; 1ef5 (0:1ef5) ld a,[wd732] bit 0,a ret z - ld a, [wPlayTimeMinutes] + ld a, [wPlayTimeMaxed] and a ret nz ld a, [wPlayTimeFrames] @@ -23,16 +23,16 @@ TrackPlayTime: ; 1ef5 (0:1ef5) ret nz xor a ld [wPlayTimeSeconds], a - ld a, [wPlayTimeMinutes + 1] + ld a, [wPlayTimeMinutes] inc a - ld [wPlayTimeMinutes + 1], a + ld [wPlayTimeMinutes], a cp 60 ret nz xor a - ld [wPlayTimeMinutes + 1], a - ld a, [wPlayTimeHours + 1] + ld [wPlayTimeMinutes], a + ld a, [wPlayTimeHours] inc a - ld [wPlayTimeHours + 1], a + ld [wPlayTimeHours], a cp $ff ret nz ld hl, wd47a @@ -40,10 +40,10 @@ TrackPlayTime: ; 1ef5 (0:1ef5) .maxIGT ld a, 59 ld [wPlayTimeSeconds], a - ld [wPlayTimeMinutes + 1], a - ld a, $ff - ld [wPlayTimeHours + 1], a ld [wPlayTimeMinutes], a + ld a, $ff + ld [wPlayTimeHours], a + ld [wPlayTimeMaxed], a ret CountDownIgnoreInputBitReset: ; 1f54 (0:1f54) |