diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-26 22:54:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 22:54:11 -0400 |
| commit | a71b28e5b724564fe19f329f5cbb474f8b111acb (patch) | |
| tree | 0fbb1d3add4c64eb72e9c6790bf35b884fbcee8a /engine/items | |
| parent | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (diff) | |
| parent | b42ba692c49f09bb51b2fd233a8a97e7eb3208db (diff) | |
Merge pull request #557 from Rangi42/master
Miscellaneous changes
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 8e167281f..caa7d42a9 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -310,10 +310,10 @@ PokeBallEffect: ld a, b ldh [hDivisor], a - ld b, $4 + ld b, 4 call Divide - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] and a jr nz, .statuscheck ld a, 1 @@ -1313,7 +1313,7 @@ RareCandyEffect: ld a, MON_EXP call GetPartyParamLocation - ldh a, [hMultiplicand] + ldh a, [hMultiplicand + 0] ld [hli], a ldh a, [hMultiplicand + 1] ld [hli], a @@ -1963,9 +1963,9 @@ GetOneFifthMaxHP: ldh [hDivisor], a ld b, 2 call Divide - ldh a, [hQuotient + 1] - ld d, a ldh a, [hQuotient + 2] + ld d, a + ldh a, [hQuotient + 3] ld e, a pop bc ret @@ -2814,7 +2814,7 @@ ComputeMaxPP: ; Since this would overflow into bit 6, we prevent that from happening ; by decreasing the extra amount of PP each PP Up provides, resulting ; in a maximum of 61. - ldh a, [hQuotient + 2] + ldh a, [hQuotient + 3] cp $8 jr c, .okay ld a, $7 |