summaryrefslogtreecommitdiff
path: root/engine/learn.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2020-02-09 02:20:05 -0700
committerIIMarckus <iimarckus@gmail.com>2020-02-09 02:20:05 -0700
commita7e3a999ff21ecac0bfbe7f091f9ff901075a323 (patch)
tree8032e91c6a426b355b6d1d3505bbc1fdc9c40fa6 /engine/learn.asm
parentd561a6d2db176240549fa605dc3e7e1f59e86607 (diff)
parent0543e933915a65127a8b803789d049478c7889d5 (diff)
Merge https://github.com/libjet/pokegold
Diffstat (limited to 'engine/learn.asm')
-rw-r--r--engine/learn.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/learn.asm b/engine/learn.asm
index f6e06572..d285d326 100644
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -121,7 +121,7 @@ LearnMove:
hlcoord 5, 2
ld b, $8
ld c, $d
- call TextBox
+ call Textbox
hlcoord 7, 4
ld a, $28
ld [wBuffer1], a
@@ -182,28 +182,28 @@ LearnMove:
ret
Text_LearnedMove:
- text_jump Text_LearnedMove_
+ text_far Text_LearnedMove_
db "@"
Text_ForgetWhich:
- text_jump Text_ForgetWhich_
+ text_far Text_ForgetWhich_
db "@"
Text_StopLearning:
- text_jump Text_StopLearning_
+ text_far Text_StopLearning_
db "@"
Text_DidNotLearn:
- text_jump Text_DidNotLearn_
+ text_far Text_DidNotLearn_
db "@"
Text_TryingToLearn:
- text_jump Text_TryingToLearn_
+ text_far Text_TryingToLearn_
db "@"
Text_1_2_and_Poof:
- text_jump Text_1_2_and_Poof_
- start_asm
+ text_far Text_1_2_and_Poof_
+ text_asm
push de
ld de, SFX_SWITCH_POKEMON
call PlaySFX
@@ -212,9 +212,9 @@ Text_1_2_and_Poof:
ret
.PoofForgot:
- text_jump Text_PoofForgot_
+ text_far Text_PoofForgot_
db "@"
Text_CantForgetHM:
- text_jump Text_CantForgetHM_
+ text_far Text_CantForgetHM_
db "@"