aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/moveEffects/substitute_effect.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2017-12-30 00:59:48 +0100
committerxCrystal <rgr.crystal@gmail.com>2017-12-30 00:59:48 +0100
commit94b9a86c8b9b6ea29653e98921205056790d6617 (patch)
treebff3c6553162ced5b7b463198e336036c805dd6e /engine/battle/moveEffects/substitute_effect.asm
parentReplace hardcoded address offset (diff)
downloadpokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.tar.gz
pokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.tar.xz
pokeyellow-94b9a86c8b9b6ea29653e98921205056790d6617.zip
Uppercase battle status constants
Diffstat (limited to 'engine/battle/moveEffects/substitute_effect.asm')
-rw-r--r--engine/battle/moveEffects/substitute_effect.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/moveEffects/substitute_effect.asm
index 6cca3eae..b5d006fc 100644
--- a/engine/battle/moveEffects/substitute_effect.asm
+++ b/engine/battle/moveEffects/substitute_effect.asm
@@ -12,7 +12,7 @@ SubstituteEffect_:
ld bc, wEnemyBattleStatus2
.notEnemy
ld a, [bc]
- bit HasSubstituteUp, a ; user already has substitute?
+ bit HAS_SUBSTITUTE_UP, a ; user already has substitute?
jr nz, .alreadyHasSubstitute
; quarter health to remove from user
; assumes max HP is 1023 or lower
@@ -43,7 +43,7 @@ SubstituteEffect_:
ld [hl], d
ld h, b
ld l, c
- set HasSubstituteUp, [hl]
+ set HAS_SUBSTITUTE_UP, [hl]
ld a, [wOptions]
bit 7, a ; battle animation is enabled?
ld hl, PlayCurrentMoveAnimation