summaryrefslogtreecommitdiff
path: root/home/time.asm
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 17:39:09 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2018-01-23 17:39:09 -0500
commita1951cefc09035e11077a433b28ec8c66b3b03db (patch)
tree4de98db5a6edb6d74192028d50893da2b764421f /home/time.asm
parent79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff)
Prefix wram labels with w, part 2.
Diffstat (limited to 'home/time.asm')
-rw-r--r--home/time.asm22
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