From 93872e920e9c82e1299a7f674cba5b56397b359d Mon Sep 17 00:00:00 2001 From: libjet Date: Wed, 11 Dec 2019 01:38:36 +0000 Subject: Updated macros/scripts/text.asm and cleaned up macros.asm --- engine/learn.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engine/learn.asm') diff --git a/engine/learn.asm b/engine/learn.asm index f6e06572..c3cb6a2f 100644 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -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 "@" -- cgit v1.2.3 From 7acf2ec917864acaa267411ffff96f60f50ce703 Mon Sep 17 00:00:00 2001 From: libjet Date: Wed, 11 Dec 2019 21:50:49 +0000 Subject: Update predef_pointers and wram, and correct typo's caused by search + replace --- engine/learn.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/learn.asm') diff --git a/engine/learn.asm b/engine/learn.asm index c3cb6a2f..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 -- cgit v1.2.3