diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index 316ce8d68b..e2962e68c1 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -199,7 +199,7 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = { SPR_PALETTE_3110, SPR_PALETTE_3105, SPR_PALETTE_4948, - SPR_PALETTE_4949, + SPR_PALETTE_4949, // PALETTE_45 SPR_PALETTE_4950, SPR_PALETTE_4951, // PALETTE_47 SPR_PALETTE_4952, @@ -207,27 +207,27 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = { SPR_PALETTE_4954, // PALETTE_50 (construction marker) SPR_PALETTE_4955, // PALETTE_51 -// base shadow highlight - 0x135C, 0x135D, 0x135E, // 52-54 - 0x135F, 0x1360, 0x1361, // 55 - 0x1362, 0x1363, 0x1364, // 58 - 0x1365, 0x1366, 0x1367, // 61 - 0x1368, 0x1369, 0x136A, // 64 - 0x136B, 0x136C, 0x136D, // 67 - 0x136E, 0x136F, 0x1370, // 70 - 0x1371, 0x1372, 0x1373, // 73 - 0x1374, 0x1375, 0x1376, // 76 - 0x1377, 0x1378, 0x1379, // 79 - 0x137A, 0x137B, 0x137C, // 82 - 0x137D, 0x137E, 0x137F, // 85 - 0x1380, 0x1381, 0x1382, // 88 - 0x1383, 0x1384, 0x1385, // 91 - 0x1386, 0x1387, 0x1388, // 94 - 0x1389, 0x138A, 0x138B, // 97 - 0x138C, 0x138D, 0x138E, // 100 - 0x138F, 0x1390, 0x1391, // 103 - 0x1392, 0x1393, 0x1394, // 106 - 0x1395, 0x1396, 0x1397, // 109-111 +// base shadow highlight + 4956, 0x135D, 0x135E, // PALETTE_TRANSLUCENT_GREY + 4959, 0x1360, 0x1361, // PALETTE_TRANSLUCENT_LIGHT_BLUE + 4962, 0x1363, 0x1364, // PALETTE_TRANSLUCENT_BORDEAUX_RED + 4965, 0x1366, 0x1367, // PALETTE_TRANSLUCENT_DARK_GREEN + 4968, 0x1369, 0x136A, // PALETTE_TRANSLUCENT_LIGHT_PURPLE + 4971, 0x136C, 0x136D, // PALETTE_TRANSLUCENT_DARK_OLIVE_GREEN + 4974, 0x136F, 0x1370, // PALETTE_TRANSLUCENT_LIGHT_BROWN + 4977, 0x1372, 0x1373, // PALETTE_TRANSLUCENT_YELLOW + 4980, 0x1375, 0x1376, // PALETTE_TRANSLUCENT_MOSS_GREEN + 4983, 0x1378, 0x1379, // PALETTE_TRANSLUCENT_OLIVE_GREEN + 4986, 0x137B, 0x137C, // PALETTE_TRANSLUCENT_BRIGHT_GREEN + 4989, 0x137E, 0x137F, // PALETTE_TRANSLUCENT_SALMON_PINK + 4992, 0x1381, 0x1382, // PALETTE_TRANSLUCENT_BRIGHT_PURPLE + 4995, 0x1384, 0x1385, // PALETTE_TRANSLUCENT_BRIGHT_RED + 4998, 0x1387, 0x1388, // PALETTE_TRANSLUCENT_LIGHT_ORANGE + 5001, 0x138A, 0x138B, // PALETTE_TRANSLUCENT_TEAL + 5004, 0x138D, 0x138E, // PALETTE_TRANSLUCENT_BRIGHT_PINK + 5007, 0x1390, 0x1391, // PALETTE_TRANSLUCENT_DARK_BROWN + 5010, 0x1393, 0x1394, // PALETTE_TRANSLUCENT_LIGHT_PINK + 5013, 0x1396, 0x1397, // PALETTE_TRANSLUCENT_WHITE // Used by SMALL_SCENERY_FLAG_HAS_GLASS 0x1398, // 112 + BLACK @@ -398,38 +398,38 @@ const FILTER_PALETTE_ID _9DEDF4[] = { 0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET 0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET - PALETTE_TRANSLUCENT_BLACK, // COLOUR_BLACK | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BLACK, // COLOUR_GREY | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_GREY, // COLOUR_BLACK | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_GREY, // COLOUR_GREY | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_WHITE, // COLOUR_WHITE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PURPLE, // COLOUR_DARK_PURPLE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PURPLE, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PURPLE_2, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BLUE, // COLOUR_DARK_BLUE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BLUE, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BLUE, // COLOUR_ICY_BLUE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_PURPLE, // COLOUR_DARK_PURPLE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_PURPLE, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_PURPLE, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_BLUE, // COLOUR_DARK_BLUE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_BLUE, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_BLUE, // COLOUR_ICY_BLUE | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_TEAL, // COLOUR_TEAL | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_TEAL, // COLOUR_AQUAMARINE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN_5, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN, // COLOUR_DARK_GREEN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN_3, // COLOUR_MOSS_GREEN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN_5, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN_4, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_GREEN_2, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_GREEN, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_DARK_GREEN, // COLOUR_DARK_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_MOSS_GREEN, // COLOUR_MOSS_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_GREEN, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_OLIVE_GREEN, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_DARK_OLIVE_GREEN, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_YELLOW, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_YELLOW, // COLOUR_YELLOW | COLOUR_FLAG_TRANSLUCENT PALETTE_TRANSLUCENT_YELLOW, // COLOUR_DARK_YELLOW | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_ORANGE, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_ORANGE, // COLOUR_DARK_ORANGE | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BROWN, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BROWN, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_BROWN_DARK, // COLOUR_DARK_BROWN | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PINK, // COLOUR_SALMON_PINK | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_RED, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_RED_2, // COLOUR_SATURATED_RED | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_RED_2, // COLOUR_BRIGHT_RED | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PINK_2, // COLOUR_DARK_PINK | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PINK_2, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_TRANSLUCENT - PALETTE_TRANSLUCENT_PINK_3, // COLOUR_LIGHT_PINK | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_ORANGE, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_ORANGE, // COLOUR_DARK_ORANGE | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_BROWN, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_BROWN, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_DARK_BROWN, // COLOUR_DARK_BROWN | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_SALMON_PINK, // COLOUR_SALMON_PINK | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BORDEAUX_RED, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_RED, // COLOUR_SATURATED_RED | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_RED, // COLOUR_BRIGHT_RED | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_PINK, // COLOUR_DARK_PINK | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_BRIGHT_PINK, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_TRANSLUCENT + PALETTE_TRANSLUCENT_LIGHT_PINK, // COLOUR_LIGHT_PINK | COLOUR_FLAG_TRANSLUCENT PALETTE_34, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT PALETTE_32, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index cf90cd0ce1..8fe4f36dd5 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -110,27 +110,27 @@ typedef enum { PALETTE_50 = 50, PALETTE_51 = 51, - PALETTE_TRANSLUCENT_BLACK = 0x34, - PALETTE_TRANSLUCENT_BLUE = 0x37, - PALETTE_TRANSLUCENT_BLUE_HIGHLIGHT = PALETTE_TRANSLUCENT_BLUE + 1, // used by console - PALETTE_TRANSLUCENT_RED = 0x3A, - PALETTE_TRANSLUCENT_GREEN = 0x3D, - PALETTE_TRANSLUCENT_PURPLE = 0x40, - PALETTE_TRANSLUCENT_GREEN_2 = 0x43, - PALETTE_TRANSLUCENT_BROWN = 0x46, - PALETTE_TRANSLUCENT_YELLOW = 0x49, - PALETTE_TRANSLUCENT_GREEN_3 = 0x4C, - PALETTE_TRANSLUCENT_GREEN_4 = 0x4F, - PALETTE_TRANSLUCENT_GREEN_5 = 0x52, - PALETTE_TRANSLUCENT_PINK = 0x55, - PALETTE_TRANSLUCENT_PURPLE_2 = 0x58, - PALETTE_TRANSLUCENT_RED_2 = 0x5B, - PALETTE_TRANSLUCENT_ORANGE = 0x5E, - PALETTE_TRANSLUCENT_TEAL = 0x61, - PALETTE_TRANSLUCENT_PINK_2 = 0x64, - PALETTE_TRANSLUCENT_BROWN_DARK = 0x67, - PALETTE_TRANSLUCENT_PINK_3 = 0x6A, - PALETTE_TRANSLUCENT_WHITE = 0x6D, + PALETTE_TRANSLUCENT_GREY = 52, + PALETTE_TRANSLUCENT_LIGHT_BLUE = 55, + PALETTE_TRANSLUCENT_LIGHT_BLUE_HIGHLIGHT = PALETTE_TRANSLUCENT_LIGHT_BLUE + 1, // used by console + PALETTE_TRANSLUCENT_BORDEAUX_RED = 58, + PALETTE_TRANSLUCENT_DARK_GREEN = 61, + PALETTE_TRANSLUCENT_LIGHT_PURPLE = 64, + PALETTE_TRANSLUCENT_DARK_OLIVE_GREEN = 67, + PALETTE_TRANSLUCENT_LIGHT_BROWN = 70, + PALETTE_TRANSLUCENT_YELLOW = 73, + PALETTE_TRANSLUCENT_MOSS_GREEN = 76, + PALETTE_TRANSLUCENT_OLIVE_GREEN = 79, + PALETTE_TRANSLUCENT_BRIGHT_GREEN = 82, + PALETTE_TRANSLUCENT_SALMON_PINK = 85, + PALETTE_TRANSLUCENT_BRIGHT_PURPLE = 88, + PALETTE_TRANSLUCENT_BRIGHT_RED = 91, + PALETTE_TRANSLUCENT_LIGHT_ORANGE = 94, + PALETTE_TRANSLUCENT_TEAL = 97, + PALETTE_TRANSLUCENT_BRIGHT_PINK = 100, + PALETTE_TRANSLUCENT_DARK_BROWN = 103, + PALETTE_TRANSLUCENT_LIGHT_PINK = 106, + PALETTE_TRANSLUCENT_WHITE = 109, PALETTE_132 = 112 + COLOUR_LIGHT_ORANGE, PALETTE_139 = 112 + COLOUR_SATURATED_RED, diff --git a/src/interface/console.c b/src/interface/console.c index 24b8775389..935e34988a 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -167,7 +167,7 @@ void console_draw(rct_drawpixelinfo *dpi) // Background console_invalidate(); - gfx_filter_rect(dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, PALETTE_TRANSLUCENT_BLUE_HIGHLIGHT); + gfx_filter_rect(dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, PALETTE_TRANSLUCENT_LIGHT_BLUE_HIGHLIGHT); int x = _consoleLeft + 4; int y = _consoleTop + 4;