diff options
| author | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
| commit | e7be25948dfeef257697a7aa30706339f6ba014b (patch) | |
| tree | 973d0ad95361a1dfd1c371be59a300be19532e47 /engine/pokemon/learn.asm | |
| parent | 99d16d616d5f70754dd6aa567e478e587a733d8c (diff) | |
| parent | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'engine/pokemon/learn.asm')
| -rw-r--r-- | engine/pokemon/learn.asm | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index d73dd7094..6722c4fe1 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -102,25 +102,25 @@ LearnMove: jp .learned .cancel - ld hl, Text_StopLearning ; Stop learning <MOVE>? + ld hl, StopLearningMoveText call PrintText call YesNoBox jp c, .loop - ld hl, Text_DidNotLearn ; <MON> did not learn <MOVE>. + ld hl, DidNotLearnMoveText call PrintText ld b, 0 ret .learned - ld hl, Text_LearnedMove ; <MON> learned <MOVE>! + ld hl, LearnedMoveText call PrintText ld b, 1 ret ForgetMove: push hl - ld hl, Text_TryingToLearn + ld hl, AskForgetMoveText call PrintText call YesNoBox pop hl @@ -134,7 +134,7 @@ ForgetMove: pop hl .loop push hl - ld hl, Text_ForgetWhich + ld hl, MoveAskForgetText call PrintText hlcoord 5, 2 ld b, NUM_MOVES * 2 @@ -191,7 +191,7 @@ ForgetMove: ret .hmmove - ld hl, Text_CantForgetHM + ld hl, MoveCantForgetHMText call PrintText pop hl jr .loop @@ -200,48 +200,40 @@ ForgetMove: scf ret -Text_LearnedMove: -; <MON> learned <MOVE>! - text_far UnknownText_0x1c5660 +LearnedMoveText: + text_far _LearnedMoveText text_end -Text_ForgetWhich: -; Which move should be forgotten? - text_far UnknownText_0x1c5678 +MoveAskForgetText: + text_far _MoveAskForgetText text_end -Text_StopLearning: -; Stop learning <MOVE>? - text_far UnknownText_0x1c5699 +StopLearningMoveText: + text_far _StopLearningMoveText text_end -Text_DidNotLearn: -; <MON> did not learn <MOVE>. - text_far UnknownText_0x1c56af +DidNotLearnMoveText: + text_far _DidNotLearnMoveText text_end -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_far UnknownText_0x1c56c9 +AskForgetMoveText: + text_far _AskForgetMoveText text_end Text_1_2_and_Poof: - text_far UnknownText_0x1c5740 ; 1, 2 and… + text_far Text_MoveForgetCount ; 1, 2 and… text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX pop de - ld hl, .PoofForgot + ld hl, .MoveForgotText ret -.PoofForgot: -; Poof! <MON> forgot <MOVE>. And… - text_far UnknownText_0x1c574e +.MoveForgotText: + text_far _MoveForgotText text_end -Text_CantForgetHM: -; HM moves can't be forgotten now. - text_far UnknownText_0x1c5772 +MoveCantForgetHMText: + text_far _MoveCantForgetHMText text_end |