diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 11:13:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 11:13:02 -0600 |
| commit | 37ded1d150197b3784bc351eeeb0a8d9713c2e35 (patch) | |
| tree | fcb7bd8f3090cb9f7b47a76af7e474122efe36e4 /engine/battle/moveEffects/haze_effect.asm | |
| parent | Merge pull request #174 from Rangi42/master (diff) | |
| parent | Add space between arguments in assembly instructions and remove redundant a i... (diff) | |
| download | pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.gz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.tar.xz pokeyellow-37ded1d150197b3784bc351eeeb0a8d9713c2e35.zip | |
Merge pull request #171 from xCrystal/master
Misc style fixes
Diffstat (limited to 'engine/battle/moveEffects/haze_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/haze_effect.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index 06907bcc..47723ba2 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -47,14 +47,14 @@ HazeEffect_: jp PrintText CureVolatileStatuses: - res Confused, [hl] + res CONFUSED, [hl] inc hl ; BATTSTATUS2 ld a, [hl] - ; clear UsingXAccuracy, ProtectedByMist, GettingPumped, and Seeded statuses - and $ff ^((1 << UsingXAccuracy) | (1 << ProtectedByMist) | (1 << GettingPumped) | (1 << Seeded)) + ; clear USING_X_ACCURACY, PROTECTED_BY_MIST, GETTING_PUMPED, and SEEDED statuses + and $ff ^((1 << USING_X_ACCURACY) | (1 << PROTECTED_BY_MIST) | (1 << GETTING_PUMPED) | (1 << SEEDED)) ld [hli], a ; BATTSTATUS3 ld a, [hl] - and %11110000 | (1 << Transformed) ; clear Bad Poison, Reflect and Light Screen statuses + and %11110000 | (1 << TRANSFORMED) ; clear Bad Poison, Reflect and Light Screen statuses ld [hl], a ret |