diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 17:59:46 -0400 |
| commit | 31b118ab428a7ed88a62b31870a1946f7dbcd2d2 (patch) | |
| tree | 6941b2b38a2615223b30e8cceb7aab636768dabd /engine/items | |
| parent | Split default names strings into separate lines to make it less unpleasant to... (diff) | |
| parent | Fix typo: ninetails.asm -> ninetales.asm (diff) | |
| download | pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.gz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.tar.xz pokeyellow-31b118ab428a7ed88a62b31870a1946f7dbcd2d2.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/items.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 55dcb53e..1dd0a6f7 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -863,7 +863,7 @@ ItemUseMedicine: ; dabb (3:5abb) jr nc,.healHP ; if it's a Full Restore or one of the potions ; fall through if it's one of the status-specifc healing items .cureStatusAilment - ld bc,4 + ld bc,wPartyMon1Status - wPartyMon1 add hl,bc ; hl now points to status ld a,[wcf91] lb bc, ANTIDOTE_MSG, 1 << PSN @@ -2039,7 +2039,7 @@ ItemUsePPRestore: ; e31e (3:631e) cp a,ETHER jr nc,.useEther ; if Ether or Max Ether .usePPUp - ld bc,21 + ld bc,wPartyMon1PP - wPartyMon1Moves add hl,bc ld a,[hl] ; move PP cp a,3 << 6 ; have 3 PP Ups already been used? |