diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index f11b530..760e7e7 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -193,6 +193,7 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_OCHRE_TOWN_MORN const PREDEFPAL_POKEGEAR_KRIS const PREDEFPAL_POKEGEAR_TOPAZ + const PREDEFPAL_YELLOW_HUMAN DEF NUM_PREDEF_PALS EQU const_value ; SGB system command codes diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index a50cba1..782b7db 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -913,7 +913,21 @@ _CGB_TrainerCard: INCLUDE "gfx/trainer_card/badges.pal" .TrainercardSGB: - ld a, PREDEFPAL_DIPLOMA ; Gen 1 Human Palette (Do we want to do something per gender with this?) + ld a, [wPlayerGender] + and a ; MALE + jr z, .male4 + dec a ; FEMALE + jr z, .female4 + ld a, PREDEFPAL_CGB_BADGE ; RB Grey Palette + jr .got_card_sgb_pal + +.male4 + ld a, PREDEFPAL_DIPLOMA ; RB Human Palette + jr .got_card_sgb_pal +.female4 + ld a, PREDEFPAL_YELLOW_HUMAN ; Yellow Human Palette + +.got_card_sgb_pal call GetPredefPal ld de, wBGPals1 ; Copy 8 BG palettes @@ -1060,7 +1074,21 @@ _CGB_TrainerCardKanto: INCLUDE "gfx/trainer_card/kanto_badges.pal" .TrainercardSGB2: - ld a, PREDEFPAL_DIPLOMA ; Gen 1 Human Palette (Do we want to do something per gender with this?) + ld a, [wPlayerGender] + and a ; MALE + jr z, .male4 + dec a ; FEMALE + jr z, .female4 + ld a, PREDEFPAL_CGB_BADGE ; RB Grey Palette + jr .got_card_sgb_pal2 + +.male4 + ld a, PREDEFPAL_DIPLOMA ; RB Human Palette + jr .got_card_sgb_pal2 +.female4 + ld a, PREDEFPAL_YELLOW_HUMAN ; Yellow Human Palette + +.got_card_sgb_pal2 call GetPredefPal ld de, wBGPals1 ; Copy 8 BG palettes diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 268ceb6..7f1e8d1 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -144,4 +144,5 @@ RGB 31,31,31, 28,17,00, 12,15,20, 00,00,00 ; PREDEFPAL_OCHRE_TOWN_MORN # RGB 31,31,31, 26,28,31, 17,24,30, 00,00,00 ; PREDEFPAL_POKEGEAR_KRIS RGB 31,31,31, 29,24,31, 23,17,31, 00,00,00 ; PREDEFPAL_POKEGEAR_TOPAZ + RGB 31,31,31, 31,30,22, 27,16,16, 00,00,00 ; PREDEFPAL_YELLOW_HUMAN \ No newline at end of file