aboutsummaryrefslogtreecommitdiffstats
path: root/home/lcd.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
committerdannye <33dannye@gmail.com>2025-07-02 21:15:13 -0500
commitca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch)
tree209a500e3bda6c2109e5acec60448e9e52f8c2af /home/lcd.asm
parentUse more ldpikacry (diff)
parentRequire RGBDS 0.9.3 for its DMG palette specs (#513) (diff)
downloadpokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz
pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home/lcd.asm')
-rw-r--r--home/lcd.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/home/lcd.asm b/home/lcd.asm
index aef6d43f..1e9e8888 100644
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -3,16 +3,16 @@ DisableLCD::
ldh [rIF], a
ldh a, [rIE]
ld b, a
- res rIE_VBLANK, a
+ res B_IE_VBLANK, a
ldh [rIE], a
.wait
ldh a, [rLY]
- cp LY_VBLANK
+ cp LY_VBLANK + 1
jr nz, .wait
ldh a, [rLCDC]
- and ~(1 << rLCDC_ENABLE)
+ and ~LCDC_ON
ldh [rLCDC], a
ld a, b
ldh [rIE], a
@@ -20,6 +20,6 @@ DisableLCD::
EnableLCD::
ldh a, [rLCDC]
- set rLCDC_ENABLE, a
+ set B_LCDC_ENABLE, a
ldh [rLCDC], a
ret