diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-08 00:17:03 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-08 00:17:03 -0800 |
| commit | 1347023128e141dc4cfc71ee6bc689f909e96919 (patch) | |
| tree | e9b5e0db057f8e912f479f7421144091458b2456 /engine/items | |
| parent | 72bbaed99f725b2b8b0d2653968042ce1625354c (diff) | |
move-related things
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 2 | ||||
| -rwxr-xr-x | engine/items/tmhm.asm | 8 | ||||
| -rwxr-xr-x | engine/items/tms.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index aaee9403..c9b1aead 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -2084,7 +2084,7 @@ ItemUseTMHM: ; e479 (3:6479) ld [wd11e],a predef TMToMove ; get move ID from TM/HM ID ld a,[wd11e] - ld [wd0e0],a + ld [wMoveNum],a call GetMoveName call CopyStringToCF4B ; copy name to wcf4b pop af diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 01a48ebb..0fcc5710 100755 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,12 +1,12 @@ -; checks if the mon in wWhichPokemon already knows the move in wd0e0 +; checks if the mon in [wWhichPokemon] already knows the move in [wMoveNum] CheckIfMoveIsKnown: ; 2fe18 (b:7e18) ld a, [wWhichPokemon] ld hl, wPartyMon1Moves - ld bc, $2c + ld bc, wPartyMon2 - wPartyMon1 call AddNTimes - ld a, [wd0e0] + ld a, [wMoveNum] ld b, a - ld c, $4 ; nubmer of moves + ld c, NUM_MOVES .loop ld a, [hli] cp b diff --git a/engine/items/tms.asm b/engine/items/tms.asm index ef427860..511aab5b 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -1,11 +1,11 @@ -; tests if mon [wcf91] can learn move [wd0e0] +; tests if mon [wcf91] can learn move [wMoveNum] CanLearnTM: ; 1373e (4:773e) ld a, [wcf91] ld [wd0b5], a call GetMonHeader ld hl, W_MONHLEARNSET push hl - ld a, [wd0e0] + ld a, [wMoveNum] ld b, a ld c, $0 ld hl, TechnicalMachines |