#641 fixes and additions. (#646)

Name a lot of text labels according to our conventions
This commit is contained in:
mid-kid
2019-10-20 22:24:17 +00:00
committed by Rangi
parent 3fc2ba41f7
commit e3e0bcd653
203 changed files with 4077 additions and 4598 deletions

View File

@@ -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