diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-29 13:15:58 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-29 13:15:58 -0500 |
| commit | 9bbb65166e4f7674bbdec7b1314b0cf42b43a923 (patch) | |
| tree | e6e65f2094fddc71695e517075800ca36124c4f6 /engine/learn.asm | |
| parent | a2a26682330b70629d68f1f159c9b139b237c5ae (diff) | |
More movement stuff
Diffstat (limited to 'engine/learn.asm')
| -rwxr-xr-x | engine/learn.asm | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/engine/learn.asm b/engine/learn.asm index e5ffabc62..64e73c910 100755 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -51,7 +51,7 @@ LearnMove: ; 6508 .not_disabled call GetMoveName - ld hl, UnknownText_0x6684 ; 1, 2 and… + ld hl, Text_1_2_and_Poof ; 1, 2 and… call PrintText pop de pop hl @@ -102,18 +102,18 @@ LearnMove: ; 6508 jp .learned .cancel - ld hl, UnknownText_0x6675 ; Stop learning <MOVE>? + ld hl, Text_StopLearning ; Stop learning <MOVE>? call PrintText call YesNoBox jp c, .loop - ld hl, UnknownText_0x667a ; <MON> did not learn <MOVE>. + ld hl, Text_DidNotLearn ; <MON> did not learn <MOVE>. call PrintText ld b, 0 ret .learned - ld hl, UnknownText_0x666b ; <MON> learned <MOVE>! + ld hl, Text_LearnedMove ; <MON> learned <MOVE>! call PrintText ld b, 1 ret @@ -121,7 +121,7 @@ LearnMove: ; 6508 ForgetMove: ; 65d3 push hl - ld hl, UnknownText_0x667f + ld hl, Text_TryingToLearn call PrintText call YesNoBox pop hl @@ -135,7 +135,7 @@ ForgetMove: ; 65d3 pop hl .loop push hl - ld hl, UnknownText_0x6670 + ld hl, Text_ForgetWhich call PrintText hlcoord 5, 2 ld b, NUM_MOVES * 2 @@ -192,7 +192,7 @@ ForgetMove: ; 65d3 ret .hmmove - ld hl, UnknownText_0x669a + ld hl, Text_CantForgetHM call PrintText pop hl jr .loop @@ -202,55 +202,54 @@ ForgetMove: ; 65d3 ret ; 666b -UnknownText_0x666b: ; 666b +Text_LearnedMove: ; 666b ; <MON> learned <MOVE>! text_jump UnknownText_0x1c5660 db "@" ; 6670 -UnknownText_0x6670: ; 6670 +Text_ForgetWhich: ; 6670 ; Which move should be forgotten? text_jump UnknownText_0x1c5678 db "@" ; 6675 -UnknownText_0x6675: ; 6675 +Text_StopLearning: ; 6675 ; Stop learning <MOVE>? text_jump UnknownText_0x1c5699 db "@" ; 667a -UnknownText_0x667a: ; 667a +Text_DidNotLearn: ; 667a ; <MON> did not learn <MOVE>. text_jump UnknownText_0x1c56af db "@" ; 667f -UnknownText_0x667f: ; 667f +Text_TryingToLearn: ; 667f ; <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 db "@" ; 6684 -UnknownText_0x6684: ; 6684 +Text_1_2_and_Poof: ; 6684 text_jump UnknownText_0x1c5740 ; 1, 2 and… start_asm push de ld de, SFX_SWITCH_POKEMON call PlaySFX pop de - ld hl, UnknownText_0x6695 + ld hl, .PoofForgot ret -; 6695 -UnknownText_0x6695: ; 6695 +.PoofForgot ; Poof! <MON> forgot <MOVE>. And… text_jump UnknownText_0x1c574e db "@" ; 669a -UnknownText_0x669a: ; 669a +Text_CantForgetHM: ; 669a ; HM moves can't be forgotten now. text_jump UnknownText_0x1c5772 db "@" |