From 1c209cbfa2d6189161a422745b5e4f77b1ac3136 Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Fri, 1 Aug 2025 21:14:14 -0400
Subject: [PATCH] Pack and Party SGB colors

---
 engine/gfx/cgb_layouts.asm | 48 +++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 782b7db..2c53957 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -702,9 +702,25 @@ _CGB_PartyMenu:
 	call CopyFourPalettes
 	call InitPartyMenuBGPal0
 	call InitPartyMenuBGPal7
+	ld a, [wOptions2]
+	and 1 << MENU_ACCOUNT
+	jr z, .SGBmode
 	call InitPartyMenuOBPals
 	call ApplyAttrmap
 	ret
+	
+.SGBmode
+	ld a, PREDEFPAL_PARTY_ICON ; SGB Party object Palette
+	call GetPredefPal
+	ld de, wOBPals1 
+; Copy 8 OB palettes
+	ld b, 8
+.ob_loop
+	call LoadHLOBPaletteIntoDE
+	dec b
+	jr nz, .ob_loop
+	call ApplyAttrmap
+	ret
 
 _CGB_Evolution:
 	ld de, wBGPals1
@@ -941,9 +957,7 @@ INCLUDE "gfx/trainer_card/badges.pal"
 ; Copy 8 OB palettes
 	ld b, 8
 .ob_loop
-	push hl
-	call LoadHLPaletteIntoDE
-	pop hl
+	call LoadHLOBPaletteIntoDE
 	dec b
 	jr nz, .ob_loop
 	ret
@@ -1102,9 +1116,7 @@ INCLUDE "gfx/trainer_card/kanto_badges.pal"
 ; Copy 8 OB palettes
 	ld b, 8
 .ob_loop
-	push hl
-	call LoadHLPaletteIntoDE
-	pop hl
+	call LoadHLOBPaletteIntoDE
 	dec b
 	jr nz, .ob_loop
 	ret
@@ -1157,6 +1169,10 @@ _CGB_PokedexSearchOption:
 
 _CGB_PackPals:
 ; pack pals
+	ld a, [wOptions2]	; Are we in SGB mode?
+	and 1 << MENU_ACCOUNT
+	jp z, .SGBpack		; Get SGB style palettes
+	
 	ld a, [wBattleType]
 	cp BATTLETYPE_TUTORIAL
 	jr z, .tutorial_male
@@ -1218,6 +1234,26 @@ INCLUDE "gfx/pack/pack_f.pal"
 .EnbyPackPals:
 INCLUDE "gfx/pack/pack_nb.pal"
 
+.SGBpack
+	ld a, PREDEFPAL_PACK ; SGB Pack Palette
+	call GetPredefPal
+	ld de, wBGPals1 
+; Copy 8 BG palettes
+	ld b, 8
+.bg_loop
+	push hl
+	call LoadHLPaletteIntoDE
+	pop hl
+	dec b
+	jr nz, .bg_loop
+; Copy 8 OB palettes
+	ld b, 8
+.ob_loop
+	call LoadHLOBPaletteIntoDE
+	dec b
+	jr nz, .ob_loop
+	ret
+
 _CGB_Pokepic:
 	call _CGB_MapPals
 	ld de, SCREEN_WIDTH