diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 2c53957..eda537b 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -135,10 +135,25 @@ _CGB_FinishBattleScreenLayout: lb bc, 5, 10 ld a, PAL_BATTLE_BG_PLAYER_HP 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 lb bc, 1, 9 ld a, PAL_BATTLE_BG_EXP 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 ld bc, 6 * SCREEN_WIDTH ld a, PAL_BATTLE_BG_TEXT @@ -237,6 +252,9 @@ _CGB_PokegearPals: ret _CGB_StatsScreenHPPals: + ld a, [wOptions2] + and 1 << MENU_ACCOUNT + jr z, .SGBStats ld de, wBGPals1 ld a, [wCurHPPal] ld l, a @@ -258,7 +276,28 @@ _CGB_StatsScreenHPPals: ld a, BANK(wBGPals1) call FarCopyWRAM 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 lb bc, 8, SCREEN_WIDTH ld a, $1 ; mon palette @@ -295,6 +334,18 @@ _CGB_StatsScreenHPPals: ldh [hCGBPalUpdate], a 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: INCLUDE "gfx/stats/pages.pal" diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 1104825..75820d5 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -370,8 +370,10 @@ ApplyHPBarPals: call FillBoxCGB ret -LoadStatsScreenPals: - call CheckCGB +LoadStatsScreenPals: ; This bit of code colorizes the stats screen with the page colors. + ;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 ld hl, StatsScreenPals ld b, 0