summaryrefslogtreecommitdiff
path: root/engine/battle_anims
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 20:50:17 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-11-23 20:50:17 -0500
commit14a21880a0fad34c946beab55182b338a7be9a9d (patch)
treed576085115ad1e318d8cd50fc3bbc7912301c37c /engine/battle_anims
parentddb01660dd5ef8844986e70e7d12b1e66aab4926 (diff)
Use ~X instead of $ff ^ X
Diffstat (limited to 'engine/battle_anims')
-rw-r--r--engine/battle_anims/anim_commands.asm2
-rw-r--r--engine/battle_anims/helpers.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 52245d6a..a16c076a 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -218,7 +218,7 @@ BattleAnim_ClearOAM:
ld c, NUM_SPRITE_OAM_STRUCTS
.loop
ld a, [hl]
- and $ff ^ (PALETTE_MASK | VRAM_BANK_1) ; zeros out the palette bits
+ and ~(PALETTE_MASK | VRAM_BANK_1) ; zeros out the palette bits
assert PAL_BATTLE_OB_ENEMY == 0
ld [hli], a
rept SPRITEOAMSTRUCT_LENGTH - 1
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm
index b533988e..6685ab73 100644
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -37,7 +37,7 @@ GetBattleAnimFrame:
push af
ld a, [hl]
push hl
- and $ff ^ (Y_FLIP << 1 | X_FLIP << 1)
+ and ~(Y_FLIP << 1 | X_FLIP << 1)
ld hl, BATTLEANIMSTRUCT_DURATION
add hl, bc
ld [hl], a