summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 22:13:46 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-23 22:13:46 -0400
commita91aa18daeb7fdd24fe512468d549ca49fe524fc (patch)
tree707978bcf2cb323ed9f45896765aa097d5aa4b31
parent1840af8b4f02d6b8f748ea917344c64cb1c5ff2d (diff)
Use constants more
-rw-r--r--engine/overworld/map_objects.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index d2ce598e1..e38112db9 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -2574,7 +2574,7 @@ ContinueSpawnFacing: ; 57db
_SetPlayerPalette: ; 57e2
ld a, d
- and %10000000
+ and 1 << 7
ret z
ld bc, 0 ; debug?
ld hl, OBJECT_FACING
@@ -2584,13 +2584,13 @@ _SetPlayerPalette: ; 57e2
ld [hl], a
ld a, d
swap a
- and %00000111
+ and PALETTE_MASK
ld d, a
ld bc, wPlayerStruct
ld hl, OBJECT_PALETTE
add hl, bc
ld a, [hl]
- and %11111000
+ and $ff ^ PALETTE_MASK
or d
ld [hl], a
ret