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/items/items.asm | |
| parent | 93255d6d17fbb3702a0f8670d7ecc2ed627af2a7 (diff) | |
| parent | bbb86671eaac735fe6ef57da01ef79fd16953238 (diff) | |
Merge branch 'master' of https://github.com/xCrystal/pokered
Diffstat (limited to 'engine/items/items.asm')
| -rwxr-xr-x | engine/items/items.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 7f16691d..953f953a 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -2417,11 +2417,11 @@ GetMaxPP: ; e677 (3:6677) ld b,a ; b = normal max PP pop hl push bc - ld bc,21 ; PP offset if not player's in-battle pokemon data + ld bc,wPartyMon1PP - wPartyMon1Moves ; PP offset if not player's in-battle pokemon data ld a,[wMonDataLocation] cp a,4 ; player's in-battle pokemon? jr nz,.addPPOffset - ld bc,17 ; PP offset if player's in-battle pokemon data + ld bc,wBattleMonPP - wBattleMonMoves ; PP offset if player's in-battle pokemon data .addPPOffset add hl,bc ld a,[hl] ; a = current PP @@ -2601,7 +2601,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) pop hl ld d, h ld e, l - ld bc, $fff5 + ld bc, -$b add hl, bc pop bc dec b @@ -2635,7 +2635,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) pop hl ld d, h ld e, l - ld bc, $fff5 + ld bc, -$b add hl, bc pop bc dec b @@ -2669,7 +2669,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) pop hl ld d, h ld e, l - ld bc, $ffdf + ld bc, wBoxMon1 - wBoxMon2 add hl, bc pop bc dec b @@ -2679,7 +2679,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld [wEnemyMonBoxLevel], a ld hl, wEnemyMon ld de, wBoxMon1 - ld bc, $c + ld bc, wEnemyMonDVs - wEnemyMon call CopyData ld hl, wPlayerID ld a, [hli] @@ -2703,7 +2703,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld [de], a inc de xor a - ld b, $a + ld b, NUM_STATS * 2 .asm_e89f ld [de], a inc de @@ -2716,7 +2716,7 @@ SendNewMonToBox: ; e7a4 (3:67a4) ld a, [hli] ld [de], a ld hl, wEnemyMonPP - ld b, $4 + ld b, NUM_MOVES .asm_e8b1 ld a, [hli] inc de |