diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/gfx/palettes.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/gfx/palettes.asm')
| -rw-r--r-- | engine/gfx/palettes.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index a618fe91..16869869 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -226,7 +226,7 @@ SetPal_TrainerCard: srl a push af jr c, .haveBadge -; The player doens't have the badge, so zero the badge's blk data. +; The player doesn't have the badge, so zero the badge's blk data. push bc ld a, [de] ld c, a @@ -723,7 +723,7 @@ SendSGBPackets: pop hl call InitCGBPalettes ldh a, [rLCDC] - and 1 << rLCDC_ENABLE + and LCDC_ON ret z call Delay3 ret @@ -853,7 +853,7 @@ TransferCurBGPData:: ld hl, wCGBPal ld b, %10 ; mask for non-V-blank/non-H-blank STAT mode ldh a, [rLCDC] - and 1 << rLCDC_ENABLE + and LCDC_ON jr nz, .lcdEnabled REPT NUM_PAL_COLORS call TransferPalColorLCDDisabled @@ -892,7 +892,7 @@ BufferBGPPal:: TransferBGPPals:: ; Transfer the buffered BG palettes. ldh a, [rLCDC] - and 1 << rLCDC_ENABLE + and LCDC_ON jr z, .lcdDisabled di .waitLoop @@ -929,7 +929,7 @@ TransferCurOBPData: ld hl, wCGBPal ld b, %10 ; mask for non-V-blank/non-H-blank STAT mode ldh a, [rLCDC] - and 1 << rLCDC_ENABLE + and LCDC_ON jr nz, .lcdEnabled REPT NUM_PAL_COLORS call TransferPalColorLCDDisabled |