SGBMode Party and Stats

This commit is contained in:
Zeta_Null 2025-08-03 13:31:35 -04:00
parent e5239b67e3
commit 12ef886236
2 changed files with 55 additions and 2 deletions

View file

@ -135,10 +135,25 @@ _CGB_FinishBattleScreenLayout:
lb bc, 5, 10 lb bc, 5, 10
ld a, PAL_BATTLE_BG_PLAYER_HP ld a, PAL_BATTLE_BG_PLAYER_HP
call FillBoxCGB call FillBoxCGB
; Zetacode, SGB mode should use hp color instead of XP
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr z, .SGBxp
; End Zetacode 1
hlcoord 10, 11, wAttrmap hlcoord 10, 11, wAttrmap
lb bc, 1, 9 lb bc, 1, 9
ld a, PAL_BATTLE_BG_EXP ld a, PAL_BATTLE_BG_EXP
call FillBoxCGB call FillBoxCGB
; Zetacode 2
jr .please_continue
.SGBxp
hlcoord 10, 11, wAttrmap
lb bc, 1, 9
ld a, PAL_BATTLE_BG_PLAYER_HP
call FillBoxCGB
.please_continue
; End Zetacode 2
hlcoord 0, 12, wAttrmap hlcoord 0, 12, wAttrmap
ld bc, 6 * SCREEN_WIDTH ld bc, 6 * SCREEN_WIDTH
ld a, PAL_BATTLE_BG_TEXT ld a, PAL_BATTLE_BG_TEXT
@ -237,6 +252,9 @@ _CGB_PokegearPals:
ret ret
_CGB_StatsScreenHPPals: _CGB_StatsScreenHPPals:
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr z, .SGBStats
ld de, wBGPals1 ld de, wBGPals1
ld a, [wCurHPPal] ld a, [wCurHPPal]
ld l, a ld l, a
@ -258,7 +276,28 @@ _CGB_StatsScreenHPPals:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call WipeAttrmap call WipeAttrmap
jr .contattrmap
.SGBStats
ld de, wBGPals1
ld a, [wCurHPPal]
ld l, a
ld h, 0
add hl, hl
add hl, hl
ld bc, HPBarPals
add hl, bc
call LoadPalette_White_Col1_Col2_Black ; hp palette
ld a, [wCurPartySpecies]
ld bc, wTempMonDVs
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black ; mon palette
;ld a, BANK(wBGPals1)
;call FarCopyWRAM
call WipeAttrmap
jr .contattrmapSGB
.contattrmap
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
lb bc, 8, SCREEN_WIDTH lb bc, 8, SCREEN_WIDTH
ld a, $1 ; mon palette ld a, $1 ; mon palette
@ -295,6 +334,18 @@ _CGB_StatsScreenHPPals:
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
ret ret
.contattrmapSGB
hlcoord 0, 0, wAttrmap
lb bc, 8, 9
ld a, $1 ; mon palette
call FillBoxCGB
call ApplyAttrmap
call ApplyPals
ld a, TRUE
ldh [hCGBPalUpdate], a
ret
StatsScreenPagePals: StatsScreenPagePals:
INCLUDE "gfx/stats/pages.pal" INCLUDE "gfx/stats/pages.pal"

View file

@ -370,8 +370,10 @@ ApplyHPBarPals:
call FillBoxCGB call FillBoxCGB
ret ret
LoadStatsScreenPals: LoadStatsScreenPals: ; This bit of code colorizes the stats screen with the page colors.
call CheckCGB ;call CheckCGB ; This was a check for if this is running on GBC, and fortunately I can very easily replace it with the SGB Color Mode check for similar results
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
ret z ret z
ld hl, StatsScreenPals ld hl, StatsScreenPals
ld b, 0 ld b, 0