diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-30 01:54:27 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-30 01:54:27 +0100 |
| commit | 237aeb8fbdb204948d611830565d4a00c6b0ab70 (patch) | |
| tree | 94dea41b4af4a3374a1a1e2f56665cff2ea5baa9 /engine/battle/decrement_pp.asm | |
| parent | 94b9a86c8b9b6ea29653e98921205056790d6617 (diff) | |
Add space between arguments in assembly instructions and remove redundant a in instructions like add a, x
Diffstat (limited to 'engine/battle/decrement_pp.asm')
| -rw-r--r-- | engine/battle/decrement_pp.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index 39cd0809..b7c428f7 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -1,13 +1,13 @@ DecrementPP: ; after using a move, decrement pp in battle and (if not transformed?) in party ld a, [de] - cp a, STRUGGLE + cp STRUGGLE ret z ; if the pokemon is using "struggle", there's nothing to do ; we don't decrement PP for "struggle" ld hl, wPlayerBattleStatus1 ld a, [hli] ; load the wPlayerBattleStatus1 pokemon status flags and increment hl to load the ; wPlayerBattleStatus2 status flags later - and a, (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) + and (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) ret nz ; if any of these statuses are true, don't decrement PP bit USING_RAGE, [hl] ret nz ; don't decrement PP either if Pokemon is using Rage |