summaryrefslogtreecommitdiff
path: root/engine/overworld/scripting.asm
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/overworld/scripting.asm
parentddb01660dd5ef8844986e70e7d12b1e66aab4926 (diff)
Use ~X instead of $ff ^ X
Diffstat (limited to 'engine/overworld/scripting.asm')
-rw-r--r--engine/overworld/scripting.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 28506813..c29961cf 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -705,7 +705,7 @@ Script_musicfadeout:
call GetScriptByte
ld [wMusicFadeID + 1], a
call GetScriptByte
- and $ff ^ (1 << MUSIC_FADE_IN_F)
+ and ~(1 << MUSIC_FADE_IN_F)
ld [wMusicFade], a
ret
@@ -1065,7 +1065,7 @@ Script_startbattle:
call BufferScreen
predef StartBattle
ld a, [wBattleResult]
- and $ff ^ BATTLERESULT_BITMASK
+ and ~BATTLERESULT_BITMASK
ld [wScriptVar], a
ret
@@ -1081,7 +1081,7 @@ Script_reloadmapafterbattle:
ld d, [hl]
ld [hl], 0
ld a, [wBattleResult]
- and $ff ^ BATTLERESULT_BITMASK
+ and ~BATTLERESULT_BITMASK
cp LOSE
jr nz, .notblackedout
ld b, BANK(Script_BattleWhiteout)