diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-30 00:59:48 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-30 00:59:48 +0100 |
| commit | 94b9a86c8b9b6ea29653e98921205056790d6617 (patch) | |
| tree | bff3c6553162ced5b7b463198e336036c805dd6e /engine/battle/decrement_pp.asm | |
| parent | Replace hardcoded address offset (diff) | |
| download | pokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.tar.gz pokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.tar.xz pokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.zip | |
Uppercase battle status constants
Diffstat (limited to 'engine/battle/decrement_pp.asm')
| -rw-r--r-- | engine/battle/decrement_pp.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/decrement_pp.asm b/engine/battle/decrement_pp.asm index e23a85ba..39cd0809 100644 --- a/engine/battle/decrement_pp.asm +++ b/engine/battle/decrement_pp.asm @@ -7,9 +7,9 @@ DecrementPP: 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 << StoringEnergy) | (1 << ThrashingAbout) | (1 << AttackingMultipleTimes) + and a, (1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << ATTACKING_MULTIPLE_TIMES) ret nz ; if any of these statuses are true, don't decrement PP - bit UsingRage, [hl] + bit USING_RAGE, [hl] ret nz ; don't decrement PP either if Pokemon is using Rage ld hl, wBattleMonPP ; PP of first move (in battle) @@ -18,7 +18,7 @@ DecrementPP: ; decrement PP in the party struct ld a, [wPlayerBattleStatus3] - bit Transformed, a + bit TRANSFORMED, a ret nz ; Return if transformed. Pokemon Red stores the "current pokemon's" PP ; separately from the "Pokemon in your party's" PP. This is ; duplication -- in all cases *other* than Pokemon with Transform. |