diff --git a/source/blind.c b/source/blind.c index aaf560ec..aca0f732 100644 --- a/source/blind.c +++ b/source/blind.c @@ -6,7 +6,7 @@ static const u16 small_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x7FFF, 0x34A1, 0x5DCB, 0x5104, 0x55A0, 0x2D01, 0x34E0}; static const u16 big_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x2527, 0x15F5, 0x36FC, 0x1E9C, 0x01B4, 0x0D0A, 0x010E}; -static const u16 boss_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x2CC9, 0x3D0D, 0x5E14, 0x5171}; // This variable is temporary, each boss blind will have its own unique palette +static const u16 boss_blind_token_palette[PAL_ROW_LEN] = {0x0000, 0x2CC9, 0x3D0D, 0x5E14, 0x5171, 0x4D0F, 0x2CC8, 0x3089}; // This variable is temporary, each boss blind will have its own unique palette void blinds_init() { diff --git a/source/game.c b/source/game.c index f08e62c9..835e2cf0 100644 --- a/source/game.c +++ b/source/game.c @@ -490,10 +490,14 @@ void change_background(int id) REG_DISPCNT &= ~DCNT_WIN0; - memcpy(pal_bg_mem, background_blind_select_gfxPal, 64); + memcpy16(pal_bg_mem, background_blind_select_gfxPal, 64); GRIT_CPY(&tile_mem[MAIN_BG_CBB], background_blind_select_gfxTiles); GRIT_CPY(&se_mem[MAIN_BG_SBB], background_blind_select_gfxMap); + // Copy boss blind colors to blind select palette + memset16(&pal_bg_mem[1], blind_get_color(BOSS_BLIND, BLIND_BACKGROUND_MAIN_COLOR_INDEX), 1); + memset16(&pal_bg_mem[7], blind_get_color(BOSS_BLIND, BLIND_BACKGROUND_SHADOW_COLOR_INDEX), 1); + // Disable the button highlight colors // Select button PID is 15 and the outline is 18 memcpy16(&pal_bg_mem[18], &pal_bg_mem[15], 1);