aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorSatoMew <SatoMew@users.noreply.github.com>2025-01-30 22:13:40 +0000
committerGitHub <noreply@github.com>2025-01-30 17:13:40 -0500
commit79518a602e6241ff6bd6e905fabaf644680f7469 (patch)
tree60e3722888ffeaa3f0cc99c9551a59582332a56c /engine
parentConsistently capitalize `ASSERT` directives (#489) (diff)
downloadpokeyellow-79518a602e6241ff6bd6e905fabaf644680f7469.tar.gz
pokeyellow-79518a602e6241ff6bd6e905fabaf644680f7469.tar.xz
pokeyellow-79518a602e6241ff6bd6e905fabaf644680f7469.zip
Consistently refer to CGB, not GBC (#491)
Diffstat (limited to 'engine')
-rw-r--r--engine/gfx/palettes.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 05202079..f69eeba9 100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -396,11 +396,11 @@ LoadSGB:
ret nc
ld a, 1
ld [wOnSGB], a
- ld a, [wGBC]
+ ld a, [wOnCGB]
and a
- jr z, .notGBC
+ jr z, .notCGB
ret
-.notGBC
+.notCGB
di
call PrepareSuperNintendoVRAMTransfer
ei
@@ -563,21 +563,21 @@ Wait7000:
ret
SendSGBPackets:
- ld a, [wGBC]
+ ld a, [wOnCGB]
and a
- jr z, .notGBC
+ jr z, .notCGB
push de
- call InitGBCPalettes
+ call InitCGBPalettes
pop hl
call EmptyFunc3
ret
-.notGBC
+.notCGB
push de
call SendSGBPacket
pop hl
jp SendSGBPacket
-InitGBCPalettes:
+InitCGBPalettes:
ld a, $80 ; index 0 with auto-increment
ldh [rBGPI], a
inc hl