diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-11-06 00:45:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 19:45:09 -0400 |
| commit | f68af5c6e95a11daa3bc8daaf28c4e9a779615b9 (patch) | |
| tree | ac8bdd875ab87440b0a829fa1ac26c015738b169 /engine/battle | |
| parent | 8349bfd8e646002105dfd6a7f997c26cf0e0624b (diff) | |
Add some constants for options (#344)
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/animations.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/substitute.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index a93af9e9..476e937f 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -395,7 +395,7 @@ MoveAnimation: .moveAnimation ; check if battle animations are disabled in the options ld a, [wOptions] - bit 7, a + bit BIT_BATTLE_ANIMATION, a jr nz, .animationsDisabled call ShareMoveAnimations call PlayAnimation diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 6c0585b6..efcba34b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1372,7 +1372,7 @@ EnemySendOutFirstMon: cp LINK_STATE_BATTLING jr z, .next4 ld a, [wOptions] - bit 6, a + bit BIT_BATTLE_SHIFT, a jr nz, .next4 ld hl, TrainerAboutToUseText call PrintText diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index 860b76b6..b1fd8ac2 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -45,7 +45,7 @@ SubstituteEffect_: ld l, c set HAS_SUBSTITUTE_UP, [hl] ld a, [wOptions] - bit 7, a ; battle animation is enabled? + bit BIT_BATTLE_ANIMATION, a ld hl, PlayCurrentMoveAnimation ld b, BANK(PlayCurrentMoveAnimation) jr z, .animationEnabled |