shithub: pokecrystal

Download patch

ref: 7c424527481af985a7b3157c274506ab9c2c2712
parent: 96bcf72d96cf59e3e1f5aaefb9b62b5e9b154e18
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sat Feb 16 08:52:19 EST 2019

Standardize on $ff ^ X for bitwise negating 8-bit values

--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -242,7 +242,7 @@
 	ld c, NUM_SPRITE_OAM_STRUCTS
 .loop
 	ld a, [hl]
-	and ~PALETTE_MASK & ~VRAM_BANK_1
+	and $ff ^ (PALETTE_MASK | VRAM_BANK_1)
 	ld [hli], a
 rept SPRITEOAMSTRUCT_LENGTH + -1
 	inc hl
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -171,7 +171,7 @@
 	or b
 	ld b, a
 	ld a, [wBattleAnimTempPalette]
-	and (PRIORITY | Y_FLIP | X_FLIP | OBP_NUM) ^ $ff
+	and PALETTE_MASK | VRAM_BANK_1
 	or b
 	ld [de], a
 
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -37,7 +37,7 @@
 	push af
 	ld a, [hl]
 	push hl
-	and (Y_FLIP << 1 | X_FLIP << 1) ^ $ff
+	and $ff ^ (Y_FLIP << 1 | X_FLIP << 1)
 	ld hl, BATTLEANIMSTRUCT_DURATION
 	add hl, bc
 	ld [hl], a
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -350,7 +350,7 @@
 	and PRIORITY | Y_FLIP | X_FLIP
 	ld b, a
 	ld a, [hl]
-	and (PRIORITY | Y_FLIP | X_FLIP) ^ $ff
+	and $ff ^ (PRIORITY | Y_FLIP | X_FLIP)
 	or b
 	ret
 
@@ -436,7 +436,7 @@
 	push af
 	ld a, [hl]
 	push hl
-	and (Y_FLIP << 1 | X_FLIP << 1) ^ $ff
+	and $ff ^ (Y_FLIP << 1 | X_FLIP << 1)
 	ld hl, SPRITEANIMSTRUCT_DURATIONOFFSET
 	add hl, bc
 	add [hl]
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -1610,7 +1610,7 @@
 Unknown_17da94:
 x = 0
 rept 8
-	db (1 << x) ^ $ff
+	db $ff ^ (1 << x)
 x = x + 1
 endr