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/reflect_light_screen_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/reflect_light_screen_effect.asm')
| -rw-r--r-- | engine/battle/moveEffects/reflect_light_screen_effect.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index b45fbe20..2805a969 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -10,15 +10,15 @@ ReflectLightScreenEffect_: ld a, [de] cp LIGHT_SCREEN_EFFECT jr nz, .reflect - bit HasLightScreenUp, [hl] ; is mon already protected by light screen? + bit HAS_LIGHT_SCREEN_UP, [hl] ; is mon already protected by light screen? jr nz, .moveFailed - set HasLightScreenUp, [hl] ; mon is now protected by light screen + set HAS_LIGHT_SCREEN_UP, [hl] ; mon is now protected by light screen ld hl, LightScreenProtectedText jr .playAnim .reflect - bit HasReflectUp, [hl] ; is mon already protected by reflect? + bit HAS_REFLECT_UP, [hl] ; is mon already protected by reflect? jr nz, .moveFailed - set HasReflectUp, [hl] ; mon is now protected by reflect + set HAS_REFLECT_UP, [hl] ; mon is now protected by reflect ld hl, ReflectGainedArmorText .playAnim push hl |