mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4317 from marijnvdwerf/clean/data-palette 

Clean/data palette
This commit is contained in:
Ted John 2016-08-21 13:48:37 +01:00 committed by GitHub
parent 676c734f4c bdb04e3da3
commit 3f1a95cbee
6 changed files with 270 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

262
src/drawing/drawing.c
View File

@ -41,8 +41,32 @@ void *unk_9E3CE4[8];
rct_drawpixelinfo *unk_140E9A8;
#endif
//Originally 0x9ABE0C, 12 elements from 0xF3 are the peep top colour, 12 elements from 0xCA are peep trouser colour
const uint8 peep_palette[0x100] = {
/**
* 12 elements from 0xF3 are the peep top colour, 12 elements from 0xCA are peep trouser colour
*
* rct2: 0x0009ABE0C
*/
uint8 gPeepPalette[256] = {
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
};
/** rct2: 0x009ABF0C */
uint8 gOtherPalette[256] = {
0x00, 0xF3, 0xF4, 0xF5, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
@ -106,6 +130,240 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = {
0x13B4, 0x13B5, 0x13B6, 0x13B7,
};
/** rct2: 0x009DEDF4 */
const uint8 _9DEDF4[] = {
0, // COLOUR_BLACK
0, // COLOUR_GREY
0, // COLOUR_WHITE
0, // COLOUR_DARK_PURPLE
0, // COLOUR_LIGHT_PURPLE
0, // COLOUR_BRIGHT_PURPLE
0, // COLOUR_DARK_BLUE
0, // COLOUR_LIGHT_BLUE
0, // COLOUR_ICY_BLUE
0, // COLOUR_TEAL
0, // COLOUR_AQUAMARINE
0, // COLOUR_SATURATED_GREEN
0, // COLOUR_DARK_GREEN
0, // COLOUR_MOSS_GREEN
0, // COLOUR_BRIGHT_GREEN
0, // COLOUR_OLIVE_GREEN
0, // COLOUR_DARK_OLIVE_GREEN
0, // COLOUR_BRIGHT_YELLOW
0, // COLOUR_YELLOW
0, // COLOUR_DARK_YELLOW
0, // COLOUR_LIGHT_ORANGE
0, // COLOUR_DARK_ORANGE
0, // COLOUR_LIGHT_BROWN
0, // COLOUR_SATURATED_BROWN
0, // COLOUR_DARK_BROWN
0, // COLOUR_SALMON_PINK
0, // COLOUR_BORDEAUX_RED
0, // COLOUR_SATURATED_RED
0, // COLOUR_BRIGHT_RED
0, // COLOUR_DARK_PINK
0, // COLOUR_BRIGHT_PINK
0, // COLOUR_LIGHT_PINK
0, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE
0, // COLOUR_GREY | COLOUR_FLAG_OUTLINE
0, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BLACK | COLOUR_FLAG_INSET
0, // COLOUR_GREY | COLOUR_FLAG_INSET
0, // COLOUR_WHITE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_TEAL | COLOUR_FLAG_INSET
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0x34, // COLOUR_BLACK | COLOUR_FLAG_TRANSLUCENT
0x34, // COLOUR_GREY | COLOUR_FLAG_TRANSLUCENT
0x6D, // COLOUR_WHITE | COLOUR_FLAG_TRANSLUCENT
0x40, // COLOUR_DARK_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x40, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x58, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_DARK_BLUE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_ICY_BLUE | COLOUR_FLAG_TRANSLUCENT
0x61, // COLOUR_TEAL | COLOUR_FLAG_TRANSLUCENT
0x61, // COLOUR_AQUAMARINE | COLOUR_FLAG_TRANSLUCENT
0x52, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_TRANSLUCENT
0x3D, // COLOUR_DARK_GREEN | COLOUR_FLAG_TRANSLUCENT
0x4C, // COLOUR_MOSS_GREEN | COLOUR_FLAG_TRANSLUCENT
0x52, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_TRANSLUCENT
0x4F, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT
0x43, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_DARK_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x5E, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_TRANSLUCENT
0x5E, // COLOUR_DARK_ORANGE | COLOUR_FLAG_TRANSLUCENT
0x46, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_TRANSLUCENT
0x46, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_TRANSLUCENT
0x67, // COLOUR_DARK_BROWN | COLOUR_FLAG_TRANSLUCENT
0x55, // COLOUR_SALMON_PINK | COLOUR_FLAG_TRANSLUCENT
0x3A, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_TRANSLUCENT
0x5B, // COLOUR_SATURATED_RED | COLOUR_FLAG_TRANSLUCENT
0x5B, // COLOUR_BRIGHT_RED | COLOUR_FLAG_TRANSLUCENT
0x64, // COLOUR_DARK_PINK | COLOUR_FLAG_TRANSLUCENT
0x64, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_TRANSLUCENT
0x6A, // COLOUR_LIGHT_PINK | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BLACK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_GREY | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_WHITE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_ICY_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_TEAL | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_AQUAMARINE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
};
void gfx_draw_pixel(rct_drawpixelinfo *dpi, int x, int y, int colour)
{
gfx_fill_rect(dpi, x, y, x, y, colour);

4
src/drawing/drawing.h
View File

@ -124,8 +124,10 @@ typedef struct rct_palette {
extern uint8 gGamePalette[256 * 4];
extern uint32 gPaletteEffectFrame;
extern const uint16 palette_to_g1_offset[];
extern const uint8 peep_palette[];
extern uint8 gPeepPalette[256];
extern uint8 gOtherPalette[256];
extern uint8 text_palette[];
extern const uint8 _9DEDF4[];
extern int gLastDrawStringX;
extern int gLastDrawStringY;

2
src/drawing/rect.c
View File

@ -47,7 +47,7 @@ void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, short left, short top, short ri
if (colour & 0x100) {
colour = NOT_TRANSLUCENT(colour);
} else {
colour = RCT2_ADDRESS(0x009DEDF4,uint8)[colour];
colour = _9DEDF4[colour];
}
colour = colour | 0x2000000; //Transparent

4
src/drawing/sprite.c
View File

@ -377,7 +377,7 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int
else if (image_type && !(image_type & IMAGE_TYPE_USE_PALETTE)){
unk_9E3CDC = NULL;
unknown_pointer = NULL;
palette_pointer = RCT2_ADDRESS(0x9ABF0C, uint8);
palette_pointer = gOtherPalette;
uint32 primary_offset = palette_to_g1_offset[(image_id >> 19) & 0x1F];
uint32 secondary_offset = palette_to_g1_offset[(image_id >> 24) & 0x1F];
@ -403,7 +403,7 @@ void FASTCALL gfx_draw_sprite_software(rct_drawpixelinfo *dpi, int image_id, int
unk_9E3CDC = NULL;
unknown_pointer = NULL;
palette_pointer = RCT2_ADDRESS(0x9ABE0C, uint8);
palette_pointer = gPeepPalette;
//Top
int top_type = (image_id >> 19) & 0x1f;

4
src/windows/dropdown.c
View File

@ -306,8 +306,8 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
b = t;
if (w->colours[0] & COLOUR_FLAG_TRANSLUCENT) {
gfx_fill_rect(dpi, l, t, r, b, (RCT2_ADDRESS(0x009DEDF4, uint8)[w->colours[0]] | 0x02000000) + 1);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, (RCT2_ADDRESS(0x009DEDF4, uint8)[w->colours[0]] | 0x02000000) + 2);
gfx_fill_rect(dpi, l, t, r, b, (_9DEDF4[w->colours[0]] | 0x02000000) + 1);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, (_9DEDF4[w->colours[0]] | 0x02000000) + 2);
} else {
gfx_fill_rect(dpi, l, t, r, b, ColourMapA[w->colours[0]].mid_dark);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, ColourMapA[w->colours[0]].lightest);

4
src/windows/themes.c
View File

@ -810,8 +810,8 @@ void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scroll
if (y + _row_height >= dpi->y) {
if (i + 1 < get_colour_scheme_tab_count()) {
int colour = w->colours[1];
if (colour & 0x80) {
colour = RCT2_ADDRESS(0x009DEDF4, uint8)[colour];
if (colour & COLOUR_FLAG_TRANSLUCENT) {
colour = _9DEDF4[colour];
colour = colour | 0x2000000;
gfx_fill_rect(dpi, 0, y + _row_height - 2, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 2, colour + 1);