From 940256569b84e71c5a448709d67964735ff4a5c9 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 28 Oct 2018 17:16:55 +0100 Subject: =?UTF-8?q?text=5Fjump=20=E2=86=92=20text=5Ffar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous name for this was rather misleading. It isn't an actual jump like you'd expect the `jp` instruction to behave as. Instead, it behaves more like a `farcall`. This also makes it consistent with its current command ID name of `TX_FAR`. --- engine/rtc/reset_password.asm | 8 ++++---- engine/rtc/restart_clock.asm | 8 ++++---- engine/rtc/timeset.asm | 28 ++++++++++++++-------------- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'engine/rtc') diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 7de7a1d73..3b4f242d4 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -33,17 +33,17 @@ _ResetClock: .text_okay ; Password OK. Select CONTINUE & reset settings. - text_jump UnknownText_0x1c55db + text_far UnknownText_0x1c55db db "@" .text_wrong ; Wrong password! - text_jump UnknownText_0x1c560b + text_far UnknownText_0x1c560b db "@" .text_askreset ; Reset the clock? - text_jump UnknownText_0x1c561c + text_far UnknownText_0x1c561c db "@" .NoYes_MenuHeader: @@ -103,7 +103,7 @@ ClockResetPassword: .pleaseenterpasswordtext ; Please enter the password. - text_jump UnknownText_0x1c562e + text_far UnknownText_0x1c562e db "@" .updateIDdisplay diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 309faaed2..b65550f43 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -49,12 +49,12 @@ RestartClock: .Text_ClockTimeMayBeWrong: ; The clock's time may be wrong. Please reset the time. - text_jump UnknownText_0x1c40e6 + text_far UnknownText_0x1c40e6 db "@" .Text_SetWithControlPad: ; Set with the Control Pad. Confirm: A Button Cancel: B Button - text_jump UnknownText_0x1c411c + text_far UnknownText_0x1c411c db "@" .SetClock: @@ -103,12 +103,12 @@ RestartClock: .Text_IsThisOK: ; Is this OK? - text_jump UnknownText_0x1c415b + text_far UnknownText_0x1c415b db "@" .Text_ClockReset: ; The clock has been reset. - text_jump UnknownText_0x1c4168 + text_far UnknownText_0x1c4168 db "@" .joy_loop diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index e634b2180..9ceac6c83 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -291,12 +291,12 @@ PrintTwoDigitNumberRightAlign: Text_WokeUpOak: ; Zzz… Hm? Wha…? You woke me up! Will you check the clock for me? - text_jump UnknownText_0x1bc29c + text_far UnknownText_0x1bc29c db "@" Text_WhatTimeIsIt: ; What time is it? - text_jump UnknownText_0x1bc2eb + text_far UnknownText_0x1bc2eb db "@" String_oclock: @@ -304,7 +304,7 @@ String_oclock: Text_WhatHrs: ; What?@ @ - text_jump UnknownText_0x1bc2fd + text_far UnknownText_0x1bc2fd start_asm hlcoord 1, 16 call DisplayHourOClock @@ -313,12 +313,12 @@ Text_WhatHrs: .QuestionMark: ; ? - text_jump UnknownText_0x1bc305 + text_far UnknownText_0x1bc305 db "@" Text_HowManyMinutes: ; How many minutes? - text_jump UnknownText_0x1bc308 + text_far UnknownText_0x1bc308 db "@" String_min: @@ -326,7 +326,7 @@ String_min: Text_WhoaMins: ; Whoa!@ @ - text_jump UnknownText_0x1bc31b + text_far UnknownText_0x1bc31b start_asm hlcoord 7, 14 call DisplayMinutesWithMinString @@ -335,7 +335,7 @@ Text_WhoaMins: .QuestionMark: ; ? - text_jump UnknownText_0x1bc323 + text_far UnknownText_0x1bc323 db "@" OakText_ResponseToSetTime: @@ -370,17 +370,17 @@ OakText_ResponseToSetTime: .overslept ; ! I overslept! - text_jump UnknownText_0x1bc326 + text_far UnknownText_0x1bc326 db "@" .yikes ; ! Yikes! I over- slept! - text_jump UnknownText_0x1bc336 + text_far UnknownText_0x1bc336 db "@" .sodark ; ! No wonder it's so dark! - text_jump UnknownText_0x1bc34f + text_far UnknownText_0x1bc34f db "@" TimeSetBackgroundGFX: @@ -534,7 +534,7 @@ SetDayOfWeek: .WhatDayIsItText: ; What day is it? - text_jump UnknownText_0x1bc369 + text_far UnknownText_0x1bc369 db "@" .ConfirmWeekdayText: @@ -546,7 +546,7 @@ SetDayOfWeek: .IsIt: ; , is it? - text_jump UnknownText_0x1bc37a + text_far UnknownText_0x1bc37a db "@" InitialSetDSTFlag: @@ -574,7 +574,7 @@ InitialSetDSTFlag: .DSTIsThatOK: ; DST, is that OK? - text_jump Text_DSTIsThatOK + text_far Text_DSTIsThatOK db "@" InitialClearDSTFlag: @@ -602,7 +602,7 @@ InitialClearDSTFlag: .IsThatOK: ; , is that OK? - text_jump UnknownText_0x1c5ff1 + text_far UnknownText_0x1c5ff1 db "@" DebugDisplayTime: -- cgit v1.2.3