diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-08-26 13:49:38 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-08-26 13:49:38 -0400 |
| commit | 557ce82073dc7c84ad701099713b00bcb7194860 (patch) | |
| tree | 6d6a604f834d17cd622528b78c3926ca422e3fa1 /engine/items | |
| parent | cb32c895e479f4a470ca7fb113dc8db870302a5e (diff) | |
hQuotient is a four-byte buffer (fixes #558)
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 |