aboutsummaryrefslogtreecommitdiffstats
path: root/engine/gfx/bg_map_attributes.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
committerdannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
commita02a98ee7ada1a658e28698484058be2796dc0df (patch)
tree945986054565bd8b5212fc755415096050d1d3a8 /engine/gfx/bg_map_attributes.asm
parentUse long option flags for rgbgfx, same as tools/gfx (diff)
parentUse `const_skip` (diff)
downloadpokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/gfx/bg_map_attributes.asm')
-rw-r--r--engine/gfx/bg_map_attributes.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/gfx/bg_map_attributes.asm b/engine/gfx/bg_map_attributes.asm
index 55313846..740e9994 100644
--- a/engine/gfx/bg_map_attributes.asm
+++ b/engine/gfx/bg_map_attributes.asm
@@ -34,7 +34,7 @@ LoadBGMapAttributes::
ldh [rHDMA4], a
ldh a, [rLCDC]
- and rLCDC_ENABLE_MASK ; is LCD off?
+ and 1 << rLCDC_ENABLE ; is LCD off?
jr z, .lcdOff ; if off, transfer immediately
; wait for VBlank if LCD is on
.waitForVBlankLoop1
@@ -68,7 +68,7 @@ LoadBGMapAttributes::
ldh [rHDMA4], a
; LCD check again
ldh a, [rLCDC]
- and rLCDC_ENABLE_MASK ; is LCD off?
+ and 1 << rLCDC_ENABLE ; is LCD off?
jr z, .lcdOff2 ; if off, transfer immediately
; wait for VBlank if LCD is on
.waitForVBlankLoop2