diff options
| author | yenatch <yenatch@gmail.com> | 2018-05-11 00:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 00:45:00 -0400 |
| commit | 9b0ca7b8c2a6ef6e3b6ef1f591f0ec875432b03a (patch) | |
| tree | 802e2f9d77c263fa501d9c6330033ecc27055d9e /engine/items/item_effects.asm | |
| parent | 59c4d824e65409f6de211d6e0fd354ca4ef6c61e (diff) | |
| parent | 6e91c3a293d94990695e6b002a8c031873aefdf9 (diff) | |
Merge pull request #510 from Rangi42/master
Use explicit HELD_NONE and NO_LIMITS, not 0s; also fix #511
Diffstat (limited to 'engine/items/item_effects.asm')
| -rw-r--r-- | engine/items/item_effects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 597a75e47..a32ce0ef7 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -806,10 +806,10 @@ HeavyBallMultiplier: ld b, h ld c, l - rept 4 +rept 4 srl b rr c - endr +endr call .subbc srl b @@ -2529,9 +2529,9 @@ BattleRestorePP: ; f652 push hl push de push bc - rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves +rept NUM_MOVES + 2 ; wBattleMonPP - wBattleMonMoves inc de - endr +endr ld bc, MON_PP - MON_MOVES add hl, bc ld a, [hl] |