diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-03 14:17:10 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-03 14:18:33 -0500 |
| commit | 28dc5686b05477e13a9cc078975315140bee9800 (patch) | |
| tree | f242eec26b51c08505ecb5b8d39bfe5eaac14cd5 /engine/play_time.asm | |
| parent | Label elite four scripts more completely. (diff) | |
| download | pokeyellow-28dc5686b05477e13a9cc078975315140bee9800.tar.gz pokeyellow-28dc5686b05477e13a9cc078975315140bee9800.tar.xz pokeyellow-28dc5686b05477e13a9cc078975315140bee9800.zip | |
Fix game time labels
Diffstat (limited to 'engine/play_time.asm')
| -rwxr-xr-x | engine/play_time.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/play_time.asm b/engine/play_time.asm index 237883ed..79deaf5e 100755 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -3,7 +3,7 @@ TrackPlayTime: ; 18dee (6:4dee) ld a, [wd732] bit 0, a ret z - ld a, [wPlayTimeMinutes] + ld a, [wPlayTimeMaxed] and a ret nz ld a, [wPlayTimeFrames] @@ -20,20 +20,20 @@ TrackPlayTime: ; 18dee (6:4dee) 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 a, $ff - ld [wPlayTimeMinutes], a + ld [wPlayTimeMaxed], a ret CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) |