diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-26 23:23:05 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-26 23:23:05 -0500 |
| commit | d7c5c8cf22c857830aae4da285c91e5e58c2cc02 (patch) | |
| tree | e68f0dda79eda3f9bfe8aa69297cd58cc077e14a /engine/learn_move.asm | |
| parent | 93255d6d17fbb3702a0f8670d7ecc2ed627af2a7 (diff) | |
| parent | bbb86671eaac735fe6ef57da01ef79fd16953238 (diff) | |
Merge branch 'master' of https://github.com/xCrystal/pokered
Diffstat (limited to 'engine/learn_move.asm')
| -rwxr-xr-x | engine/learn_move.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/learn_move.asm b/engine/learn_move.asm index a6a78355..66d27a40 100755 --- a/engine/learn_move.asm +++ b/engine/learn_move.asm @@ -10,12 +10,12 @@ LearnMove: ; 6e43 (1:6e43) DontAbandonLearning: ; 6e5b (1:6e5b) ld hl, wPartyMon1Moves - ld bc, $2c + ld bc, wPartyMon2Moves - wPartyMon1Moves ld a, [wWhichPokemon] call AddNTimes ld d, h ld e, l - ld b, $4 + ld b, NUM_MOVES .asm_6e6b ld a, [hl] and a @@ -38,7 +38,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b) .asm_6e8b ld a, [wMoveNum] ld [hl], a - ld bc, $15 + ld bc, wPartyMon1PP - wPartyMon1Moves add hl, bc push hl push de @@ -66,10 +66,10 @@ DontAbandonLearning: ; 6e5b (1:6e5b) ld de, wBattleMonMoves ld bc, NUM_MOVES call CopyData - ld bc, $11 + ld bc, wPartyMon1PP - wPartyMon1OTID add hl, bc ld de, wBattleMonPP - ld bc, $4 + ld bc, NUM_MOVES call CopyData jp PrintLearnedMove @@ -108,7 +108,7 @@ TryingToLearn: ; 6f07 (1:6f07) ld a, [wCurrentMenuItem] rra ret c - ld bc, $fffc + ld bc, - NUM_MOVES add hl, bc push hl ld de, wMoves |