diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-11-18 12:44:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 12:44:39 -0500 |
| commit | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (patch) | |
| tree | f71e627c4af610124b7f77cc4a9c2dad2adf02f6 /engine/pokemon/learn.asm | |
| parent | c05a2d255befc2d3b7fdf3c5375fa9a015c13632 (diff) | |
| parent | 3202c4f3dfeac64d815e3b5ee3ee8e891c2b1ba2 (diff) | |
Merge pull request #577 from Rangi42/master
Resolve issue #575: Rename text commands
Diffstat (limited to 'engine/pokemon/learn.asm')
| -rw-r--r-- | engine/pokemon/learn.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index dfeb7f97f..55e673ecc 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -203,32 +203,32 @@ ForgetMove: Text_LearnedMove: ; <MON> learned <MOVE>! text_far UnknownText_0x1c5660 - db "@" + text_end Text_ForgetWhich: ; Which move should be forgotten? text_far UnknownText_0x1c5678 - db "@" + text_end Text_StopLearning: ; Stop learning <MOVE>? text_far UnknownText_0x1c5699 - db "@" + text_end Text_DidNotLearn: ; <MON> did not learn <MOVE>. text_far UnknownText_0x1c56af - db "@" + 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 - db "@" + text_end Text_1_2_and_Poof: text_far UnknownText_0x1c5740 ; 1, 2 and… - start_asm + text_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX @@ -239,9 +239,9 @@ Text_1_2_and_Poof: .PoofForgot: ; Poof! <MON> forgot <MOVE>. And… text_far UnknownText_0x1c574e - db "@" + text_end Text_CantForgetHM: ; HM moves can't be forgotten now. text_far UnknownText_0x1c5772 - db "@" + text_end |