summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:00:07 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 21:00:07 -0500
commit09e92c554c7563b52a9484b26d96d903c7635b0d (patch)
tree6a992ea21650f5841bb8b60f7937986a4f8da38b /engine/battle/core.asm
parent865d37e02ad6af386e7f596659ebec12266be3ce (diff)
Use ~X instead of $ff ^ X
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r--engine/battle/core.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index efcba34b..4a166f7e 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3433,7 +3433,7 @@ CheckPlayerStatusConditions:
ld hl, wPlayerBattleStatus1
ld a, [hl]
; clear bide, thrashing, charging up, and trapping moves such as warp (already cleared for confusion damage)
- and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE))
+ and ~((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE))
ld [hl], a
ld a, [wPlayerMoveEffect]
cp FLY_EFFECT
@@ -5940,7 +5940,7 @@ CheckEnemyStatusConditions:
ld hl, wEnemyBattleStatus1
ld a, [hl]
; clear bide, thrashing about, charging up, and multi-turn moves such as warp
- and $ff ^ ((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE))
+ and ~((1 << STORING_ENERGY) | (1 << THRASHING_ABOUT) | (1 << CHARGING_UP) | (1 << USING_TRAPPING_MOVE))
ld [hl], a
ld a, [wEnemyMoveEffect]
cp FLY_EFFECT