diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-08-11 00:34:32 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-08-11 00:34:32 -0500 |
| commit | fb0a630c062cbb18026abe2792339dea27fac4d8 (patch) | |
| tree | 0b55bb02a3539b132c8e3f9347cc51a4ce58aa1c /engine/learn_move.asm | |
| parent | Replace hardcoded name lengths with NAME_LENGTH (diff) | |
| download | pokeyellow-fb0a630c062cbb18026abe2792339dea27fac4d8.tar.gz pokeyellow-fb0a630c062cbb18026abe2792339dea27fac4d8.tar.xz pokeyellow-fb0a630c062cbb18026abe2792339dea27fac4d8.zip | |
More joypad constants
Diffstat (limited to 'engine/learn_move.asm')
| -rwxr-xr-x | engine/learn_move.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/learn_move.asm b/engine/learn_move.asm index aeb7d23d..46d30bd9 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -116,7 +116,7 @@ TryingToLearn: ; 6f07 (1:6f07) call CopyData callab FormatMovesString pop hl -.asm_6f39 +.loop push hl ld hl, WhichMoveToForgetText call PrintText @@ -155,8 +155,8 @@ TryingToLearn: ; 6f07 (1:6f07) call LoadScreenTilesFromBuffer1 pop af pop hl - bit 1, a - jr nz, .asm_6fab + bit 1, a ; pressed b + jr nz, .cancel push hl ld a, [wCurrentMenuItem] ld c, a @@ -169,17 +169,17 @@ TryingToLearn: ; 6f07 (1:6f07) pop bc pop de ld a, d - jr c, .asm_6fa2 + jr c, .hm pop hl add hl, bc and a ret -.asm_6fa2 +.hm ld hl, HMCantDeleteText call PrintText pop hl - jr .asm_6f39 -.asm_6fab + jr .loop +.cancel scf ret |