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/transform_effect.asm | |
parent | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (diff) | |
parent | 237aeb8fbdb204948d611830565d4a00c6b0ab70 (diff) |
Merge pull request #171 from xCrystal/master
Misc style fixes
Diffstat (limited to 'engine/battle/moveEffects/transform_effect.asm')
-rw-r--r-- | engine/battle/moveEffects/transform_effect.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 45f8c910..9a5de9cc 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -12,7 +12,7 @@ TransformEffect_: ld [wPlayerMoveListIndex], a ld a, [wPlayerBattleStatus1] .hitTest - bit Invulnerable, a ; is mon invulnerable to typical attacks? (fly/dig) + bit INVULNERABLE, a ; is mon invulnerable to typical attacks? (fly/dig) jp nz, .failed push hl push de @@ -24,7 +24,7 @@ TransformEffect_: ld hl, wEnemyBattleStatus2 .transformEffect ; animation(s) played are different if target has Substitute up - bit HasSubstituteUp, [hl] + bit HAS_SUBSTITUTE_UP, [hl] push af ld hl, HideSubstituteShowMonAnim ld b, BANK(HideSubstituteShowMonAnim) @@ -44,7 +44,7 @@ TransformEffect_: call nz, Bankswitch pop bc ld a, [bc] - set Transformed, a ; mon is now Transformed + set TRANSFORMED, a ; mon is now transformed ld [bc], a pop de pop hl |