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/pokemon/learn.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engine/pokemon/learn.asm') diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 9031c6857..dfeb7f97f 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -202,32 +202,32 @@ ForgetMove: Text_LearnedMove: ; learned ! - text_jump UnknownText_0x1c5660 + text_far UnknownText_0x1c5660 db "@" Text_ForgetWhich: ; Which move should be forgotten? - text_jump UnknownText_0x1c5678 + text_far UnknownText_0x1c5678 db "@" Text_StopLearning: ; Stop learning ? - text_jump UnknownText_0x1c5699 + text_far UnknownText_0x1c5699 db "@" Text_DidNotLearn: ; did not learn . - text_jump UnknownText_0x1c56af + text_far UnknownText_0x1c56af db "@" Text_TryingToLearn: ; is trying to learn . But can't learn more than ; four moves. Delete an older move to make room for ? - text_jump UnknownText_0x1c56c9 + text_far UnknownText_0x1c56c9 db "@" Text_1_2_and_Poof: - text_jump UnknownText_0x1c5740 ; 1, 2 and… + text_far UnknownText_0x1c5740 ; 1, 2 and… start_asm push de ld de, SFX_SWITCH_POKEMON @@ -238,10 +238,10 @@ Text_1_2_and_Poof: .PoofForgot: ; Poof! forgot . And… - text_jump UnknownText_0x1c574e + text_far UnknownText_0x1c574e db "@" Text_CantForgetHM: ; HM moves can't be forgotten now. - text_jump UnknownText_0x1c5772 + text_far UnknownText_0x1c5772 db "@" -- cgit v1.2.3