summaryrefslogtreecommitdiff
path: root/engine/rtc/restart_clock.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2019-10-20 22:24:17 +0000
committerRangi <35663410+Rangi42@users.noreply.github.com>2019-10-20 18:24:17 -0400
commite3e0bcd653f8d671f6fd1390fa922e3b644f4a34 (patch)
tree27c9b465e4d3e0de2649a5755a9f0b5021b05798 /engine/rtc/restart_clock.asm
parent3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (diff)
#641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
Diffstat (limited to 'engine/rtc/restart_clock.asm')
-rw-r--r--engine/rtc/restart_clock.asm28
1 files changed, 12 insertions, 16 deletions
diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm
index 16f25cddd..357e69667 100644
--- a/engine/rtc/restart_clock.asm
+++ b/engine/rtc/restart_clock.asm
@@ -29,7 +29,7 @@ endr
RestartClock:
; If we're here, we had an RTC overflow.
- ld hl, .Text_ClockTimeMayBeWrong
+ ld hl, .ClockTimeMayBeWrongText
call PrintText
ld hl, wOptions
ld a, [hl]
@@ -37,7 +37,7 @@ RestartClock:
set NO_TEXT_SCROLL, [hl]
call LoadStandardMenuHeader
call ClearTileMap
- ld hl, .Text_SetWithControlPad
+ ld hl, .ClockSetWithControlPadText
call PrintText
call .SetClock
call ExitMenu
@@ -47,14 +47,12 @@ RestartClock:
ld c, a
ret
-.Text_ClockTimeMayBeWrong:
- ; The clock's time may be wrong. Please reset the time.
- text_far UnknownText_0x1c40e6
+.ClockTimeMayBeWrongText:
+ text_far _ClockTimeMayBeWrongText
text_end
-.Text_SetWithControlPad:
- ; Set with the Control Pad. Confirm: A Button Cancel: B Button
- text_far UnknownText_0x1c411c
+.ClockSetWithControlPadText:
+ text_far _ClockSetWithControlPadText
text_end
.SetClock:
@@ -77,7 +75,7 @@ RestartClock:
and a
ret nz
call .PrintTime
- ld hl, .Text_IsThisOK
+ ld hl, .ClockIsThisOKText
call PrintText
call YesNoBox
jr c, .cancel
@@ -91,7 +89,7 @@ RestartClock:
ld [wStringBuffer2 + 3], a
call InitTime
call .PrintTime
- ld hl, .Text_ClockReset
+ ld hl, .ClockHasResetText
call PrintText
call WaitPressAorB_BlinkCursor
xor a
@@ -101,14 +99,12 @@ RestartClock:
ld a, $1
ret
-.Text_IsThisOK:
- ; Is this OK?
- text_far UnknownText_0x1c415b
+.ClockIsThisOKText:
+ text_far _ClockIsThisOKText
text_end
-.Text_ClockReset:
- ; The clock has been reset.
- text_far UnknownText_0x1c4168
+.ClockHasResetText:
+ text_far _ClockHasResetText
text_end
.joy_loop