diff options
Diffstat (limited to 'engine/rtc/timeset.asm')
| -rw-r--r-- | engine/rtc/timeset.asm | 110 |
1 files changed, 49 insertions, 61 deletions
diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 146adc072..da1012ff8 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -41,7 +41,7 @@ InitClock: call .ClearScreen call WaitBGMap call RotateFourPalettesRight - ld hl, Text_WokeUpOak + ld hl, OakTimeWokeUpText call PrintText ld hl, wTimeSetBuffer ld bc, wTimeSetBufferEnd - wTimeSetBuffer @@ -51,7 +51,7 @@ InitClock: ld [wInitHourBuffer], a .loop - ld hl, Text_WhatTimeIsIt + ld hl, OakTimeWhatTimeIsItText call PrintText hlcoord 3, 7 ld b, 2 @@ -74,7 +74,7 @@ InitClock: ld a, [wInitHourBuffer] ld [wStringBuffer2 + 1], a call .ClearScreen - ld hl, Text_WhatHrs + ld hl, OakTimeWhatHoursText call PrintText call YesNoBox jr nc, .HourIsSet @@ -82,7 +82,7 @@ InitClock: jr .loop .HourIsSet: - ld hl, Text_HowManyMinutes + ld hl, OakTimeHowManyMinutesText call PrintText hlcoord 11, 7 lb bc, 2, 7 @@ -104,7 +104,7 @@ InitClock: ld a, [wInitMinuteBuffer] ld [wStringBuffer2 + 2], a call .ClearScreen - ld hl, Text_WhoaMins + ld hl, OakTimeWhoaMinutesText call PrintText call YesNoBox jr nc, .MinutesAreSet @@ -273,69 +273,64 @@ SetMinutes: DisplayMinutesWithMinString: ld de, wInitMinuteBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign inc hl ld de, String_min call PlaceString ret -PrintTwoDigitNumberRightAlign: +PrintTwoDigitNumberLeftAlign: push hl ld a, " " ld [hli], a ld [hl], a pop hl - lb bc, PRINTNUM_RIGHTALIGN | 1, 2 + lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum ret -Text_WokeUpOak: - ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_far _OakTimeText1 +OakTimeWokeUpText: + text_far _OakTimeWokeUpText text_end -Text_WhatTimeIsIt: - ; What time is it? - text_far _OakTimeText2 +OakTimeWhatTimeIsItText: + text_far _OakTimeWhatTimeIsItText text_end String_oclock: db "o'clock@" -Text_WhatHrs: +OakTimeWhatHoursText: ; What?@ @ - text_far _OakTimeText3 + text_far _OakTimeWhatHoursText text_asm hlcoord 1, 16 call DisplayHourOClock - ld hl, .QuestionMark + ld hl, .OakTimeHoursQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText4 +.OakTimeHoursQuestionMarkText: + text_far _OakTimeHoursQuestionMarkText text_end -Text_HowManyMinutes: - ; How many minutes? - text_far _OakTimeText5 +OakTimeHowManyMinutesText: + text_far _OakTimeHowManyMinutesText text_end String_min: db "min.@" -Text_WhoaMins: +OakTimeWhoaMinutesText: ; Whoa!@ @ - text_far _OakTimeText6 + text_far _OakTimeWhoaMinutesText text_asm hlcoord 7, 14 call DisplayMinutesWithMinString - ld hl, .QuestionMark + ld hl, .OakTimeMinutesQuestionMarkText ret -.QuestionMark: - ; ? - text_far _OakTimeText7 +.OakTimeMinutesQuestionMarkText: + text_far _OakTimeMinutesQuestionMarkText text_end OakText_ResponseToSetTime: @@ -358,29 +353,26 @@ OakText_ResponseToSetTime: jr c, .morn cp NITE_HOUR jr c, .day -.nite: - ld hl, .sodark +.nite + ld hl, .OakTimeSoDarkText ret -.morn: - ld hl, .overslept +.morn + ld hl, .OakTimeOversleptText ret -.day: - ld hl, .yikes +.day + ld hl, .OakTimeYikesText ret -.overslept - ; ! I overslept! - text_far _OakTimeText8 +.OakTimeOversleptText: + text_far _OakTimeOversleptText text_end -.yikes - ; ! Yikes! I over- slept! - text_far _OakTimeText11 +.OakTimeYikesText: + text_far _OakTimeYikesText text_end -.sodark - ; ! No wonder it's so dark! - text_far _OakTimeText12 +.OakTimeSoDarkText: + text_far _OakTimeSoDarkText text_end TimeSetBackgroundGFX: @@ -410,7 +402,7 @@ SetDayOfWeek: lb bc, 4, 18 call Textbox call LoadStandardMenuHeader - ld hl, .WhatDayIsItText + ld hl, .OakTimeWhatDayIsItText call PrintText hlcoord 9, 3 ld b, 2 @@ -532,21 +524,19 @@ SetDayOfWeek: .Friday: db " FRIDAY@" .Saturday: db "SATURDAY@" -.WhatDayIsItText: - ; What day is it? - text_far _OakTimeText13 +.OakTimeWhatDayIsItText: + text_far _OakTimeWhatDayIsItText text_end .ConfirmWeekdayText: text_asm hlcoord 1, 14 call .PlaceWeekdayString - ld hl, .IsIt + ld hl, .OakTimeIsItText ret -.IsIt: - ; , is it? - text_far _OakTimeText14 +.OakTimeIsItText: + text_far _OakTimeIsItText text_end InitialSetDSTFlag: @@ -569,12 +559,11 @@ InitialSetDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .DSTIsThatOK + ld hl, .DSTIsThatOKText ret -.DSTIsThatOK: - ; DST, is that OK? - text_far Text_DSTIsThatOK +.DSTIsThatOKText: + text_far _DSTIsThatOKText text_end InitialClearDSTFlag: @@ -597,12 +586,11 @@ InitialClearDSTFlag: ld c, a decoord 1, 14 farcall PrintHoursMins - ld hl, .IsThatOK + ld hl, .TimeAskOkayText ret -.IsThatOK: - ; , is that OK? - text_far UnknownText_0x1c5ff1 +.TimeAskOkayText: + text_far _TimeAskOkayText text_end DebugDisplayTime: @@ -696,7 +684,7 @@ PrintHour: call AdjustHourForAMorPM ld [wDeciramBuffer], a ld de, wDeciramBuffer - call PrintTwoDigitNumberRightAlign + call PrintTwoDigitNumberLeftAlign ret GetTimeOfDayString: |