summaryrefslogtreecommitdiff
path: root/engine/pokemon/learn.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-10-28 17:16:55 +0100
committermid-kid <esteve.varela@gmail.com>2018-11-05 22:26:18 +0100
commit940256569b84e71c5a448709d67964735ff4a5c9 (patch)
tree33e78661f5317aa93b54e501272bb5c5040a0574 /engine/pokemon/learn.asm
parent0af682d38ae9e60095dc2a0e11830fc8fec15d02 (diff)
text_jump → text_far
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`.
Diffstat (limited to 'engine/pokemon/learn.asm')
-rw-r--r--engine/pokemon/learn.asm16
1 files changed, 8 insertions, 8 deletions
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:
; <MON> learned <MOVE>!
- 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 <MOVE>?
- text_jump UnknownText_0x1c5699
+ text_far UnknownText_0x1c5699
db "@"
Text_DidNotLearn:
; <MON> did not learn <MOVE>.
- text_jump UnknownText_0x1c56af
+ text_far UnknownText_0x1c56af
db "@"
Text_TryingToLearn:
; <MON> is trying to learn <MOVE>. But <MON> can't learn more than
; four moves. Delete an older move to make room for <MOVE>?
- 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! <MON> forgot <MOVE>. 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 "@"