From 468488e7a52591701367c841ebe7e09984786544 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 11 Aug 2025 16:38:46 -0400 Subject: [PATCH] Identify `JOYP_SGB_MLT_REQ` constant --- constants/misc_constants.asm | 3 +++ engine/gfx/color.asm | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index b11a648bc..e2a92f717 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -53,3 +53,6 @@ DEF HOF_MASTER_COUNT EQU 200 ; card flip DEF CARDFLIP_DECK_SIZE EQU 4 * 6 + +; SGB command MLT_REQ can be used to detect SGB hardware +DEF JOYP_SGB_MLT_REQ EQU %00000011 diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index b0bfae81a..59876c737 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -990,8 +990,8 @@ PushSGBBorderPalsAndWait: call _PushSGBPals call SGBDelayCycles ldh a, [rJOYP] - and $3 - cp $3 + and JOYP_SGB_MLT_REQ + cp JOYP_SGB_MLT_REQ jr nz, .carry ld a, JOYP_SGB_ZERO ldh [rJOYP], a @@ -1018,8 +1018,8 @@ endr call SGBDelayCycles call SGBDelayCycles ldh a, [rJOYP] - and $3 - cp $3 + and JOYP_SGB_MLT_REQ + cp JOYP_SGB_MLT_REQ jr nz, .carry call .FinalPush and a