diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /home/time.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'home/time.asm')
| -rw-r--r-- | home/time.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/time.asm b/home/time.asm index 9ed703686..5ede49173 100644 --- a/home/time.asm +++ b/home/time.asm @@ -140,12 +140,12 @@ FixDays:: ; 5e8 FixTime:: ; 61d ; add ingame time (set at newgame) to current time ; day hr min sec -; store time in CurDay, hHours, hMinutes, hSeconds +; store time in wCurDay, hHours, hMinutes, hSeconds ; second ld a, [hRTCSeconds] ; S ld c, a - ld a, [StartSecond] + ld a, [wStartSecond] add c sub 60 jr nc, .updatesec @@ -157,7 +157,7 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCMinutes] ; M ld c, a - ld a, [StartMinute] + ld a, [wStartMinute] adc c sub 60 jr nc, .updatemin @@ -169,7 +169,7 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCHours] ; H ld c, a - ld a, [StartHour] + ld a, [wStartHour] adc c sub 24 jr nc, .updatehr @@ -181,27 +181,27 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCDayLo] ; DL ld c, a - ld a, [StartDay] + ld a, [wStartDay] adc c - ld [CurDay], a + ld [wCurDay], a ret ; 658 SetTimeOfDay:: ; 658 xor a - ld [StringBuffer2], a + ld [wStringBuffer2], a ld a, $0 ; useless - ld [StringBuffer2 + 3], a + ld [wStringBuffer2 + 3], a jr InitTime SetDayOfWeek:: ; 663 call UpdateTime ld a, [hHours] - ld [StringBuffer2 + 1], a + ld [wStringBuffer2 + 1], a ld a, [hMinutes] - ld [StringBuffer2 + 2], a + ld [wStringBuffer2 + 2], a ld a, [hSeconds] - ld [StringBuffer2 + 3], a + ld [wStringBuffer2 + 3], a jr InitTime ; useless InitTime:: ; 677 |