diff options
Diffstat (limited to 'home/game_time.asm')
| -rw-r--r-- | home/game_time.asm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/home/game_time.asm b/home/game_time.asm index f80d9a462..0300db73d 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -1,4 +1,4 @@ -ResetGameTime:: ; 208a +ResetGameTime:: xor a ld [wGameTimeCap], a ld [wGameTimeHours], a @@ -7,11 +7,8 @@ ResetGameTime:: ; 208a ld [wGameTimeSeconds], a ld [wGameTimeFrames], a ret -; 209e - - -GameTimer:: ; 209e +GameTimer:: nop ld a, [rSVBK] @@ -24,14 +21,11 @@ GameTimer:: ; 209e pop af ld [rSVBK], a ret -; 20ad - -UpdateGameTimer:: ; 20ad +UpdateGameTimer:: ; Increment the game timer by one frame. ; The game timer is capped at 999:59:59.00. - ; Don't update if game logic is paused. ld a, [wGameLogicPaused] and a @@ -47,7 +41,6 @@ UpdateGameTimer:: ; 20ad bit 0, [hl] ret nz - ; +1 frame ld hl, wGameTimeFrames ld a, [hl] @@ -59,7 +52,6 @@ UpdateGameTimer:: ; 20ad ld [hl], a ret - .second xor a ld [hl], a @@ -75,7 +67,6 @@ UpdateGameTimer:: ; 20ad ld [hl], a ret - .minute xor a ld [hl], a @@ -91,7 +82,6 @@ UpdateGameTimer:: ; 20ad ld [hl], a ret - .hour xor a ld [hl], a @@ -103,7 +93,6 @@ UpdateGameTimer:: ; 20ad ld l, a inc hl - ; Cap the timer after 1000 hours. ld a, h cp HIGH(1000) @@ -121,11 +110,9 @@ UpdateGameTimer:: ; 20ad ld [wGameTimeSeconds], a ret - .ok ld a, h ld [wGameTimeHours], a ld a, l ld [wGameTimeHours + 1], a ret -; 210f |