diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
tree | a1ce27018f39d98f49d89468df426d0291e18560 /engine/play_time.asm | |
parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'engine/play_time.asm')
-rwxr-xr-x | engine/play_time.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/play_time.asm b/engine/play_time.asm index 74da9c59..79deaf5e 100755 --- a/engine/play_time.asm +++ b/engine/play_time.asm @@ -3,37 +3,37 @@ TrackPlayTime: ; 18dee (6:4dee) ld a, [wd732] bit 0, a ret z - ld a, [W_PLAYTIMEMINUTES] + ld a, [wPlayTimeMaxed] 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] inc a - ld [W_PLAYTIMEMINUTES + 1], a + ld [wPlayTimeMinutes], a cp 60 ret nz xor a - ld [W_PLAYTIMEMINUTES + 1], a - ld a, [W_PLAYTIMEHOURS + 1] + ld [wPlayTimeMinutes], a + ld a, [wPlayTimeHours] inc a - ld [W_PLAYTIMEHOURS + 1], a + ld [wPlayTimeHours], a cp $ff ret nz ld a, $ff - ld [W_PLAYTIMEMINUTES], a + ld [wPlayTimeMaxed], a ret CountDownIgnoreInputBitReset: ; 18e36 (6:4e36) |