summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2014-02-19 06:07:32 +0000
committer Aaron Giles <aaron@aarongiles.com>2014-02-19 06:07:32 +0000
commit57cfaa163ee656de8f25e079eb721b3cb9720a9a (patch)
tree8b235effed1208b1c9b18d554f27154ce4df741d /src/mess
parent5c2b6036df886a416ea727ecb72da2827b43bd93 (diff)
Switched rgb_t to a class, replacing macros with methods. Mappings are
as follows: MAKE_RGB(r,g,b) == rgb_t(r,g,b) MAKE_ARGB(a,r,g,b) == rgb_t(a,r,g,b) RGB_ALPHA(data) == data.a() RGB_RED(data) == data.r() RGB_GREEN(data) == data.g() RGB_BLUE(data) == data.b() RGB_BLACK == rgb_t::black RGB_WHITE == rgb_t::white Implicit conversions to/from UINT32 are built in as well as simple addition, subtraction, and scaling (with clamping). As a result of being a class, some stricter typing was needed in a few places but overall not too much.
Diffstat (limited to 'src/mess')
-rw-r--r--src/mess/drivers/a5105.c2
-rw-r--r--src/mess/drivers/a7800.c896
-rw-r--r--src/mess/drivers/alesis.c4
-rw-r--r--src/mess/drivers/alphasma.c4
-rw-r--r--src/mess/drivers/apexc.c8
-rw-r--r--src/mess/drivers/apple2.c32
-rw-r--r--src/mess/drivers/applix.c2
-rw-r--r--src/mess/drivers/apricot.c2
-rw-r--r--src/mess/drivers/arcadia.c16
-rw-r--r--src/mess/drivers/bbc.c16
-rw-r--r--src/mess/drivers/c64dtv.c2
-rw-r--r--src/mess/drivers/camplynx.c2
-rw-r--r--src/mess/drivers/casloopy.c2
-rw-r--r--src/mess/drivers/cgenie.c4
-rw-r--r--src/mess/drivers/clcd.c4
-rw-r--r--src/mess/drivers/compucolor.c2
-rw-r--r--src/mess/drivers/cxhumax.c2
-rw-r--r--src/mess/drivers/cybiko.c2
-rw-r--r--src/mess/drivers/einstein.c4
-rw-r--r--src/mess/drivers/electron.c16
-rw-r--r--src/mess/drivers/gp2x.c2
-rw-r--r--src/mess/drivers/gp32.c2
-rw-r--r--src/mess/drivers/hprot1.c4
-rw-r--r--src/mess/drivers/hyperscan.c6
-rw-r--r--src/mess/drivers/ie15.c2
-rw-r--r--src/mess/drivers/intv.c4
-rw-r--r--src/mess/drivers/lcmate2.c4
-rw-r--r--src/mess/drivers/mac.c16
-rw-r--r--src/mess/drivers/micronic.c4
-rw-r--r--src/mess/drivers/mmodular.c6
-rw-r--r--src/mess/drivers/ms0515.c34
-rw-r--r--src/mess/drivers/mstation.c4
-rw-r--r--src/mess/drivers/nakajies.c4
-rw-r--r--src/mess/drivers/p2000t.c8
-rw-r--r--src/mess/drivers/pb1000.c4
-rw-r--r--src/mess/drivers/pc1500.c4
-rw-r--r--src/mess/drivers/pc2000.c4
-rw-r--r--src/mess/drivers/pc4.c4
-rw-r--r--src/mess/drivers/pc6001.c56
-rw-r--r--src/mess/drivers/pc8001.c16
-rw-r--r--src/mess/drivers/pce220.c4
-rw-r--r--src/mess/drivers/pdp1.c6
-rw-r--r--src/mess/drivers/pokemini.c8
-rw-r--r--src/mess/drivers/portfoli.c4
-rw-r--r--src/mess/drivers/prestige.c4
-rw-r--r--src/mess/drivers/psion.c4
-rw-r--r--src/mess/drivers/px4.c8
-rw-r--r--src/mess/drivers/rd110.c4
-rw-r--r--src/mess/drivers/replicator.c4
-rw-r--r--src/mess/drivers/rex6000.c4
-rw-r--r--src/mess/drivers/rmt32.c4
-rw-r--r--src/mess/drivers/rt1715.c6
-rw-r--r--src/mess/drivers/rx78.c4
-rw-r--r--src/mess/drivers/samcoupe.c2
-rw-r--r--src/mess/drivers/sm1800.c4
-rw-r--r--src/mess/drivers/socrates.c2
-rw-r--r--src/mess/drivers/studio2.c8
-rw-r--r--src/mess/drivers/svmu.c4
-rw-r--r--src/mess/drivers/ti89.c4
-rw-r--r--src/mess/drivers/ti99_2.c4
-rw-r--r--src/mess/drivers/tim100.c6
-rw-r--r--src/mess/drivers/trs80m2.c2
-rw-r--r--src/mess/drivers/tx0.c6
-rw-r--r--src/mess/drivers/unior.c6
-rw-r--r--src/mess/drivers/uzebox.c2
-rw-r--r--src/mess/drivers/vboy.c8
-rw-r--r--src/mess/drivers/vc4000.c16
-rw-r--r--src/mess/drivers/vta2000.c2
-rw-r--r--src/mess/drivers/vtech1.c32
-rw-r--r--src/mess/drivers/vtech2.c32
-rw-r--r--src/mess/drivers/x07.c4
-rw-r--r--src/mess/drivers/x1.c4
-rw-r--r--src/mess/drivers/ymmu100.c4
-rw-r--r--src/mess/drivers/z80ne.c36
-rw-r--r--src/mess/drivers/zx.c16
-rw-r--r--src/mess/machine/amstrad.c128
-rw-r--r--src/mess/machine/pk8020.c2
-rw-r--r--src/mess/machine/s3c44b0.c4
-rw-r--r--src/mess/machine/sms.c8
-rw-r--r--src/mess/machine/sms_lphaser.c2
-rw-r--r--src/mess/machine/vector06.c2
-rw-r--r--src/mess/video/733_asr.c4
-rw-r--r--src/mess/video/911_vdt.c2
-rw-r--r--src/mess/video/abc1600.c2
-rw-r--r--src/mess/video/abc800.c22
-rw-r--r--src/mess/video/abc806.c18
-rw-r--r--src/mess/video/aquarius.c32
-rw-r--r--src/mess/video/avigo.c4
-rw-r--r--src/mess/video/b2m.c8
-rw-r--r--src/mess/video/bbc.c2
-rw-r--r--src/mess/video/busicom.c6
-rw-r--r--src/mess/video/cgc7900.c18
-rw-r--r--src/mess/video/channelf.c16
-rw-r--r--src/mess/video/fm7.c24
-rw-r--r--src/mess/video/gf4500.c2
-rw-r--r--src/mess/video/hec2video.c32
-rw-r--r--src/mess/video/hp48.c2
-rw-r--r--src/mess/video/kaypro.c6
-rw-r--r--src/mess/video/kyocera.c8
-rw-r--r--src/mess/video/mac.c8
-rw-r--r--src/mess/video/mbee.c12
-rw-r--r--src/mess/video/mos6566.c32
-rw-r--r--src/mess/video/mz700.c2
-rw-r--r--src/mess/video/nc.c8
-rw-r--r--src/mess/video/newbrain.c2
-rw-r--r--src/mess/video/nick.c2
-rw-r--r--src/mess/video/orion.c36
-rw-r--r--src/mess/video/pc1512.c34
-rw-r--r--src/mess/video/pc8401a.c4
-rw-r--r--src/mess/video/pcw.c4
-rw-r--r--src/mess/video/pcw16.c64
-rw-r--r--src/mess/video/pds_tpdfpd.c6
-rw-r--r--src/mess/video/pk8020.c2
-rw-r--r--src/mess/video/pocketc.c2
-rw-r--r--src/mess/video/pp01.c16
-rw-r--r--src/mess/video/radio86.c6
-rw-r--r--src/mess/video/special.c52
-rw-r--r--src/mess/video/spectrum.c32
-rw-r--r--src/mess/video/super80.c2
-rw-r--r--src/mess/video/ti85.c6
-rw-r--r--src/mess/video/trs80.c16
-rw-r--r--src/mess/video/uv201.c16
-rw-r--r--src/mess/video/vector06.c2
-rw-r--r--src/mess/video/z88.c6
-rw-r--r--src/mess/video/zx8301.c18
125 files changed, 1111 insertions, 1111 deletions
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index e7ae2cce5cb..d3c2fd94ba1 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -527,7 +527,7 @@ void a5105_state::palette_init()
g = i & 2 ? ((i & 8) ? 0xaa : 0xff) : 0x00;
b = i & 1 ? ((i & 8) ? 0xaa : 0xff) : 0x00;
- palette_set_color(machine(), i, MAKE_RGB(r,g,b));
+ palette_set_color(machine(), i, rgb_t(r,g,b));
}
}
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c
index ac506df5629..466f1acefe4 100644
--- a/src/mess/drivers/a7800.c
+++ b/src/mess/drivers/a7800.c
@@ -224,100 +224,100 @@ upon display type.
***************************************************************************/
#define NTSC_GREY \
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
#define NTSC_GOLD \
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 )
#define NTSC_ORANGE \
- MAKE_RGB(0x31,0x00,0x00), MAKE_RGB(0x42,0x06,0x00), MAKE_RGB(0x53,0x17,0x00), MAKE_RGB(0x64,0x28,0x00), \
- MAKE_RGB(0x75,0x39,0x00), MAKE_RGB(0x86,0X4A,0x00), MAKE_RGB(0x97,0x5B,0x0B), MAKE_RGB(0xA8,0x6C,0x1C), \
- MAKE_RGB(0xB9,0x7D,0x2D), MAKE_RGB(0xCA,0x8E,0x3E), MAKE_RGB(0xDB,0x9F,0x4F), MAKE_RGB(0xEC,0xB0,0x60), \
- MAKE_RGB(0xFD,0xC1,0x71), MAKE_RGB(0xFF,0xD2,0x86), MAKE_RGB(0xFF,0xE3,0x9D), MAKE_RGB(0xFF,0xF4,0xB3 )
+ rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \
+ rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0B), rgb_t(0xA8,0x6C,0x1C), \
+ rgb_t(0xB9,0x7D,0x2D), rgb_t(0xCA,0x8E,0x3E), rgb_t(0xDB,0x9F,0x4F), rgb_t(0xEC,0xB0,0x60), \
+ rgb_t(0xFD,0xC1,0x71), rgb_t(0xFF,0xD2,0x86), rgb_t(0xFF,0xE3,0x9D), rgb_t(0xFF,0xF4,0xB3 )
#define NTSC_RED_ORANGE \
- MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x08,0x00), MAKE_RGB(0x71,0x19,0x00), \
- MAKE_RGB(0x82,0x2A,0x0F), MAKE_RGB(0x93,0x3B,0x20), MAKE_RGB(0xA4,0x4C,0x31), MAKE_RGB(0xB5,0x5D,0x42), \
- MAKE_RGB(0xC6,0x6E,0x53), MAKE_RGB(0xD7,0x7F,0x64), MAKE_RGB(0xE8,0x90,0x75), MAKE_RGB(0xF9,0xA1,0x86), \
- MAKE_RGB(0xFF,0xB2,0x9A), MAKE_RGB(0xFF,0xC3,0xB0), MAKE_RGB(0xFF,0xD4,0xC6), MAKE_RGB(0xFF,0xE5,0xDC )
+ rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \
+ rgb_t(0x82,0x2A,0x0F), rgb_t(0x93,0x3B,0x20), rgb_t(0xA4,0x4C,0x31), rgb_t(0xB5,0x5D,0x42), \
+ rgb_t(0xC6,0x6E,0x53), rgb_t(0xD7,0x7F,0x64), rgb_t(0xE8,0x90,0x75), rgb_t(0xF9,0xA1,0x86), \
+ rgb_t(0xFF,0xB2,0x9A), rgb_t(0xFF,0xC3,0xB0), rgb_t(0xFF,0xD4,0xC6), rgb_t(0xFF,0xE5,0xDC )
#define NTSC_PINK \
- MAKE_RGB(0x3E,0x00,0x06), MAKE_RGB(0x4F,0x00,0x12), MAKE_RGB(0x60,0x00,0x1E), MAKE_RGB(0x71,0x0E,0x2E), \
- MAKE_RGB(0x82,0x1F,0x3F), MAKE_RGB(0x93,0x30,0x50), MAKE_RGB(0xA4,0x41,0x61), MAKE_RGB(0xB5,0x52,0x72), \
- MAKE_RGB(0xC6,0x63,0x83), MAKE_RGB(0xD7,0x74,0x94), MAKE_RGB(0xE8,0x85,0xA5), MAKE_RGB(0xF9,0x96,0xB6), \
- MAKE_RGB(0xFF,0xA7,0xCB), MAKE_RGB(0xFF,0xB8,0xE1), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 )
+ rgb_t(0x3E,0x00,0x06), rgb_t(0x4F,0x00,0x12), rgb_t(0x60,0x00,0x1E), rgb_t(0x71,0x0E,0x2E), \
+ rgb_t(0x82,0x1F,0x3F), rgb_t(0x93,0x30,0x50), rgb_t(0xA4,0x41,0x61), rgb_t(0xB5,0x52,0x72), \
+ rgb_t(0xC6,0x63,0x83), rgb_t(0xD7,0x74,0x94), rgb_t(0xE8,0x85,0xA5), rgb_t(0xF9,0x96,0xB6), \
+ rgb_t(0xFF,0xA7,0xCB), rgb_t(0xFF,0xB8,0xE1), rgb_t(0xFF,0xC9,0xEF), rgb_t(0xFF,0xDA,0xF4 )
#define NTSC_PURPLE \
- MAKE_RGB(0x32,0x00,0x38), MAKE_RGB(0x43,0x00,0x44), MAKE_RGB(0x54,0x00,0x50), MAKE_RGB(0x65,0x0C,0x5F), \
- MAKE_RGB(0x76,0x1D,0x70), MAKE_RGB(0x87,0x2E,0x81), MAKE_RGB(0x98,0x3F,0x92), MAKE_RGB(0xA9,0x50,0xA3), \
- MAKE_RGB(0xBA,0x61,0xB4), MAKE_RGB(0xCB,0x72,0xC5), MAKE_RGB(0xDC,0x83,0xD6), MAKE_RGB(0xED,0x94,0xE4), \
- MAKE_RGB(0xFE,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x32,0x00,0x38), rgb_t(0x43,0x00,0x44), rgb_t(0x54,0x00,0x50), rgb_t(0x65,0x0C,0x5F), \
+ rgb_t(0x76,0x1D,0x70), rgb_t(0x87,0x2E,0x81), rgb_t(0x98,0x3F,0x92), rgb_t(0xA9,0x50,0xA3), \
+ rgb_t(0xBA,0x61,0xB4), rgb_t(0xCB,0x72,0xC5), rgb_t(0xDC,0x83,0xD6), rgb_t(0xED,0x94,0xE4), \
+ rgb_t(0xFE,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
#define NTSC_PURPLE_BLUE \
- MAKE_RGB(0x1B,0x00,0x5F), MAKE_RGB(0x2C,0x00,0x6B), MAKE_RGB(0x3D,0x00,0x77), MAKE_RGB(0x4E,0x11,0x88), \
- MAKE_RGB(0x5F,0x22,0x99), MAKE_RGB(0x70,0x33,0xAA), MAKE_RGB(0x81,0x44,0xBB), MAKE_RGB(0x92,0x55,0xCC), \
- MAKE_RGB(0xA3,0x66,0xDD), MAKE_RGB(0xB4,0x77,0xED), MAKE_RGB(0xC5,0x88,0xED), MAKE_RGB(0xD6,0x99,0xED), \
- MAKE_RGB(0xE7,0xAA,0xED), MAKE_RGB(0xF8,0xBB,0xED), MAKE_RGB(0xFF,0xCC,0xF0), MAKE_RGB(0xFF,0xDD,0xF5 )
+ rgb_t(0x1B,0x00,0x5F), rgb_t(0x2C,0x00,0x6B), rgb_t(0x3D,0x00,0x77), rgb_t(0x4E,0x11,0x88), \
+ rgb_t(0x5F,0x22,0x99), rgb_t(0x70,0x33,0xAA), rgb_t(0x81,0x44,0xBB), rgb_t(0x92,0x55,0xCC), \
+ rgb_t(0xA3,0x66,0xDD), rgb_t(0xB4,0x77,0xED), rgb_t(0xC5,0x88,0xED), rgb_t(0xD6,0x99,0xED), \
+ rgb_t(0xE7,0xAA,0xED), rgb_t(0xF8,0xBB,0xED), rgb_t(0xFF,0xCC,0xF0), rgb_t(0xFF,0xDD,0xF5 )
#define NTSC_BLUE1 \
- MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x10,0x00,0x7E), MAKE_RGB(0x21,0x0D,0x8E), MAKE_RGB(0x32,0x1E,0x9F), \
- MAKE_RGB(0x43,0x2F,0xB0), MAKE_RGB(0x54,0x40,0xC1), MAKE_RGB(0x65,0x51,0xD2), MAKE_RGB(0x76,0x62,0xE3), \
- MAKE_RGB(0x87,0x73,0xF4), MAKE_RGB(0x98,0x84,0xF9), MAKE_RGB(0xA9,0x95,0xF9), MAKE_RGB(0xBA,0xA6,0xF9), \
- MAKE_RGB(0xCB,0xB7,0xF9), MAKE_RGB(0xDC,0xC8,0xF9), MAKE_RGB(0xED,0xD9,0xF9), MAKE_RGB(0xFE,0xEA,0xF9 )
+ rgb_t(0x00,0x00,0x72), rgb_t(0x10,0x00,0x7E), rgb_t(0x21,0x0D,0x8E), rgb_t(0x32,0x1E,0x9F), \
+ rgb_t(0x43,0x2F,0xB0), rgb_t(0x54,0x40,0xC1), rgb_t(0x65,0x51,0xD2), rgb_t(0x76,0x62,0xE3), \
+ rgb_t(0x87,0x73,0xF4), rgb_t(0x98,0x84,0xF9), rgb_t(0xA9,0x95,0xF9), rgb_t(0xBA,0xA6,0xF9), \
+ rgb_t(0xCB,0xB7,0xF9), rgb_t(0xDC,0xC8,0xF9), rgb_t(0xED,0xD9,0xF9), rgb_t(0xFE,0xEA,0xF9 )
#define NTSC_BLUE2 \
- MAKE_RGB(0x00,0x00,0x65), MAKE_RGB(0x00,0x0C,0x7A), MAKE_RGB(0x05,0x1D,0x8E), MAKE_RGB(0x16,0x2E,0x9F), \
- MAKE_RGB(0x27,0x3F,0xB0), MAKE_RGB(0x38,0x50,0xC1), MAKE_RGB(0x49,0x61,0xD2), MAKE_RGB(0x5A,0x72,0xE3), \
- MAKE_RGB(0x6B,0x83,0xF4), MAKE_RGB(0x7C,0x94,0xFF), MAKE_RGB(0x8D,0xA5,0xFF), MAKE_RGB(0x9E,0xB6,0xFF), \
- MAKE_RGB(0xAF,0xC7,0xFF), MAKE_RGB(0xC0,0xD8,0xFF), MAKE_RGB(0xD1,0xE9,0xFF), MAKE_RGB(0xE2,0xFA,0xFF )
+ rgb_t(0x00,0x00,0x65), rgb_t(0x00,0x0C,0x7A), rgb_t(0x05,0x1D,0x8E), rgb_t(0x16,0x2E,0x9F), \
+ rgb_t(0x27,0x3F,0xB0), rgb_t(0x38,0x50,0xC1), rgb_t(0x49,0x61,0xD2), rgb_t(0x5A,0x72,0xE3), \
+ rgb_t(0x6B,0x83,0xF4), rgb_t(0x7C,0x94,0xFF), rgb_t(0x8D,0xA5,0xFF), rgb_t(0x9E,0xB6,0xFF), \
+ rgb_t(0xAF,0xC7,0xFF), rgb_t(0xC0,0xD8,0xFF), rgb_t(0xD1,0xE9,0xFF), rgb_t(0xE2,0xFA,0xFF )
#define NTSC_LIGHT_BLUE \
- MAKE_RGB(0x00,0x0D,0x48), MAKE_RGB(0x00,0x1E,0x5E), MAKE_RGB(0x00,0x2F,0x74), MAKE_RGB(0x00,0x40,0x8A), \
- MAKE_RGB(0x11,0x51,0x9B), MAKE_RGB(0x22,0x62,0xAC), MAKE_RGB(0x33,0x73,0xBD), MAKE_RGB(0x44,0x84,0xCE), \
- MAKE_RGB(0x55,0x95,0xDF), MAKE_RGB(0x66,0xA6,0xF0), MAKE_RGB(0x77,0xB7,0xFF), MAKE_RGB(0x88,0xC8,0xFF), \
- MAKE_RGB(0x99,0xD9,0xFF), MAKE_RGB(0xAA,0xEA,0xFF), MAKE_RGB(0xBB,0xFB,0xFF), MAKE_RGB(0xCC,0xFF,0xFF )
+ rgb_t(0x00,0x0D,0x48), rgb_t(0x00,0x1E,0x5E), rgb_t(0x00,0x2F,0x74), rgb_t(0x00,0x40,0x8A), \
+ rgb_t(0x11,0x51,0x9B), rgb_t(0x22,0x62,0xAC), rgb_t(0x33,0x73,0xBD), rgb_t(0x44,0x84,0xCE), \
+ rgb_t(0x55,0x95,0xDF), rgb_t(0x66,0xA6,0xF0), rgb_t(0x77,0xB7,0xFF), rgb_t(0x88,0xC8,0xFF), \
+ rgb_t(0x99,0xD9,0xFF), rgb_t(0xAA,0xEA,0xFF), rgb_t(0xBB,0xFB,0xFF), rgb_t(0xCC,0xFF,0xFF )
#define NTSC_TURQUOISE \
- MAKE_RGB(0x00,0x1C,0x1C), MAKE_RGB(0x00,0x2D,0x32), MAKE_RGB(0x00,0x3E,0x49), MAKE_RGB(0x00,0x4F,0x5F), \
- MAKE_RGB(0x05,0x60,0x73), MAKE_RGB(0x16,0x71,0x84), MAKE_RGB(0x27,0x82,0x95), MAKE_RGB(0x38,0x93,0xA6), \
- MAKE_RGB(0x49,0xA4,0xB7), MAKE_RGB(0x5A,0xB5,0xC8), MAKE_RGB(0x6B,0xC6,0xD9), MAKE_RGB(0x7C,0xD7,0xEA), \
- MAKE_RGB(0x8D,0xE8,0xFB), MAKE_RGB(0x9E,0xF9,0xFF), MAKE_RGB(0xAF,0xFF,0xFF), MAKE_RGB(0xC0,0xFF,0xFF )
+ rgb_t(0x00,0x1C,0x1C), rgb_t(0x00,0x2D,0x32), rgb_t(0x00,0x3E,0x49), rgb_t(0x00,0x4F,0x5F), \
+ rgb_t(0x05,0x60,0x73), rgb_t(0x16,0x71,0x84), rgb_t(0x27,0x82,0x95), rgb_t(0x38,0x93,0xA6), \
+ rgb_t(0x49,0xA4,0xB7), rgb_t(0x5A,0xB5,0xC8), rgb_t(0x6B,0xC6,0xD9), rgb_t(0x7C,0xD7,0xEA), \
+ rgb_t(0x8D,0xE8,0xFB), rgb_t(0x9E,0xF9,0xFF), rgb_t(0xAF,0xFF,0xFF), rgb_t(0xC0,0xFF,0xFF )
#define NTSC_GREEN_BLUE \
- MAKE_RGB(0x00,0x25,0x0B), MAKE_RGB(0x00,0x36,0x10), MAKE_RGB(0x00,0x47,0x18), MAKE_RGB(0x00,0x58,0x2E), \
- MAKE_RGB(0x07,0x69,0x42), MAKE_RGB(0x18,0x7A,0x53), MAKE_RGB(0x29,0x8B,0x64), MAKE_RGB(0x3A,0x9C,0x75), \
- MAKE_RGB(0x4B,0xAD,0x86), MAKE_RGB(0x5C,0xBE,0x97), MAKE_RGB(0x6D,0xCF,0xA8), MAKE_RGB(0x7E,0xE0,0xB9), \
- MAKE_RGB(0x8F,0xF1,0xCA), MAKE_RGB(0xA0,0xFF,0xDA), MAKE_RGB(0xB1,0xFF,0xE6), MAKE_RGB(0xC2,0xFF,0xF2 )
+ rgb_t(0x00,0x25,0x0B), rgb_t(0x00,0x36,0x10), rgb_t(0x00,0x47,0x18), rgb_t(0x00,0x58,0x2E), \
+ rgb_t(0x07,0x69,0x42), rgb_t(0x18,0x7A,0x53), rgb_t(0x29,0x8B,0x64), rgb_t(0x3A,0x9C,0x75), \
+ rgb_t(0x4B,0xAD,0x86), rgb_t(0x5C,0xBE,0x97), rgb_t(0x6D,0xCF,0xA8), rgb_t(0x7E,0xE0,0xB9), \
+ rgb_t(0x8F,0xF1,0xCA), rgb_t(0xA0,0xFF,0xDA), rgb_t(0xB1,0xFF,0xE6), rgb_t(0xC2,0xFF,0xF2 )
#define NTSC_GREEN \
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x04,0x5A,0x1A), \
- MAKE_RGB(0x15,0x6B,0x1A), MAKE_RGB(0x26,0x7C,0x22), MAKE_RGB(0x37,0x8D,0x33), MAKE_RGB(0x48,0x9E,0x44), \
- MAKE_RGB(0x59,0xAF,0x55), MAKE_RGB(0x6A,0xC0,0x66), MAKE_RGB(0x7B,0xD1,0x77), MAKE_RGB(0x8C,0xE2,0x88), \
- MAKE_RGB(0x9D,0xF3,0x99), MAKE_RGB(0xAE,0xFF,0xA8), MAKE_RGB(0xBF,0xFF,0xB4), MAKE_RGB(0xD0,0xFF,0xC0 )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x04,0x5A,0x1A), \
+ rgb_t(0x15,0x6B,0x1A), rgb_t(0x26,0x7C,0x22), rgb_t(0x37,0x8D,0x33), rgb_t(0x48,0x9E,0x44), \
+ rgb_t(0x59,0xAF,0x55), rgb_t(0x6A,0xC0,0x66), rgb_t(0x7B,0xD1,0x77), rgb_t(0x8C,0xE2,0x88), \
+ rgb_t(0x9D,0xF3,0x99), rgb_t(0xAE,0xFF,0xA8), rgb_t(0xBF,0xFF,0xB4), rgb_t(0xD0,0xFF,0xC0 )
#define NTSC_YELLOW_GREEN \
- MAKE_RGB(0x00,0x21,0x0A), MAKE_RGB(0x00,0x32,0x0F), MAKE_RGB(0x0A,0x43,0x11), MAKE_RGB(0x1B,0x54,0x11), \
- MAKE_RGB(0x2C,0x65,0x11), MAKE_RGB(0x3D,0x76,0x11), MAKE_RGB(0x4E,0x87,0x11), MAKE_RGB(0x5F,0x98,0x1E), \
- MAKE_RGB(0x70,0xA9,0x2F), MAKE_RGB(0x81,0xBA,0x40), MAKE_RGB(0x92,0xCB,0x51), MAKE_RGB(0xA3,0xDC,0x62), \
- MAKE_RGB(0xB4,0xED,0x73), MAKE_RGB(0xC5,0xFE,0x84), MAKE_RGB(0xD6,0xFF,0x90), MAKE_RGB(0xE7,0xFF,0x9C )
+ rgb_t(0x00,0x21,0x0A), rgb_t(0x00,0x32,0x0F), rgb_t(0x0A,0x43,0x11), rgb_t(0x1B,0x54,0x11), \
+ rgb_t(0x2C,0x65,0x11), rgb_t(0x3D,0x76,0x11), rgb_t(0x4E,0x87,0x11), rgb_t(0x5F,0x98,0x1E), \
+ rgb_t(0x70,0xA9,0x2F), rgb_t(0x81,0xBA,0x40), rgb_t(0x92,0xCB,0x51), rgb_t(0xA3,0xDC,0x62), \
+ rgb_t(0xB4,0xED,0x73), rgb_t(0xC5,0xFE,0x84), rgb_t(0xD6,0xFF,0x90), rgb_t(0xE7,0xFF,0x9C )
#define NTSC_ORANGE_GREEN \
- MAKE_RGB(0x05,0x13,0x04), MAKE_RGB(0x16,0x24,0x04), MAKE_RGB(0x27,0x35,0x04), MAKE_RGB(0x38,0x46,0x04), \
- MAKE_RGB(0x49,0x57,0x04), MAKE_RGB(0x5A,0x68,0x04), MAKE_RGB(0x6B,0x79,0x04), MAKE_RGB(0x7C,0x8A,0x09), \
- MAKE_RGB(0x8D,0x9B,0x1A), MAKE_RGB(0x9E,0xAC,0x2B), MAKE_RGB(0xAF,0xBD,0x3C), MAKE_RGB(0xC0,0xCE,0x4D), \
- MAKE_RGB(0xD1,0xDF,0x5E), MAKE_RGB(0xE2,0xF0,0x6F), MAKE_RGB(0xF3,0xFF,0x80), MAKE_RGB(0xFF,0xFF,0x8D )
+ rgb_t(0x05,0x13,0x04), rgb_t(0x16,0x24,0x04), rgb_t(0x27,0x35,0x04), rgb_t(0x38,0x46,0x04), \
+ rgb_t(0x49,0x57,0x04), rgb_t(0x5A,0x68,0x04), rgb_t(0x6B,0x79,0x04), rgb_t(0x7C,0x8A,0x09), \
+ rgb_t(0x8D,0x9B,0x1A), rgb_t(0x9E,0xAC,0x2B), rgb_t(0xAF,0xBD,0x3C), rgb_t(0xC0,0xCE,0x4D), \
+ rgb_t(0xD1,0xDF,0x5E), rgb_t(0xE2,0xF0,0x6F), rgb_t(0xF3,0xFF,0x80), rgb_t(0xFF,0xFF,0x8D )
#define NTSC_LIGHT_ORANGE \
- MAKE_RGB(0x21,0x02,0x00), MAKE_RGB(0x32,0x13,0x00), MAKE_RGB(0x43,0x24,0x00), MAKE_RGB(0x54,0x35,0x00), \
- MAKE_RGB(0x65,0x46,0x00), MAKE_RGB(0x76,0x57,0x00), MAKE_RGB(0x87,0x68,0x00), MAKE_RGB(0x98,0x79,0x0C), \
- MAKE_RGB(0xA9,0x8A,0x1D), MAKE_RGB(0xBA,0x9B,0x2E), MAKE_RGB(0xCB,0xAC,0x3F), MAKE_RGB(0xDC,0xBD,0x50), \
- MAKE_RGB(0xED,0xCE,0x61), MAKE_RGB(0xFE,0xDF,0x72), MAKE_RGB(0xFF,0xF0,0x87), MAKE_RGB(0xFF,0xFF,0x9D )
+ rgb_t(0x21,0x02,0x00), rgb_t(0x32,0x13,0x00), rgb_t(0x43,0x24,0x00), rgb_t(0x54,0x35,0x00), \
+ rgb_t(0x65,0x46,0x00), rgb_t(0x76,0x57,0x00), rgb_t(0x87,0x68,0x00), rgb_t(0x98,0x79,0x0C), \
+ rgb_t(0xA9,0x8A,0x1D), rgb_t(0xBA,0x9B,0x2E), rgb_t(0xCB,0xAC,0x3F), rgb_t(0xDC,0xBD,0x50), \
+ rgb_t(0xED,0xCE,0x61), rgb_t(0xFE,0xDF,0x72), rgb_t(0xFF,0xF0,0x87), rgb_t(0xFF,0xFF,0x9D )
static const rgb_t a7800_palette[256*3] =
{
@@ -364,100 +364,100 @@ static const rgb_t a7800p_palette[256*3] =
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x30,0x00,0x00), MAKE_RGB(0x41,0x07,0x00), MAKE_RGB(0x52,0x18,0x00), MAKE_RGB(0x63,0x29,0x00), \
- MAKE_RGB(0x74,0x3A,0x00), MAKE_RGB(0x85,0x4B,0x00), MAKE_RGB(0x96,0x5C,0x0A), MAKE_RGB(0xA7,0x6D,0x1B), \
- MAKE_RGB(0xB8,0x7E,0x2C), MAKE_RGB(0xC9,0x8F,0x3D), MAKE_RGB(0xDA,0xA0,0x4E), MAKE_RGB(0xEB,0xB1,0x5F), \
- MAKE_RGB(0xFC,0xC2,0x70), MAKE_RGB(0xFF,0xD3,0x85), MAKE_RGB(0xFF,0xE4,0x9B), MAKE_RGB(0xFF,0xF5,0xB1 )
+ rgb_t(0x30,0x00,0x00), rgb_t(0x41,0x07,0x00), rgb_t(0x52,0x18,0x00), rgb_t(0x63,0x29,0x00), \
+ rgb_t(0x74,0x3A,0x00), rgb_t(0x85,0x4B,0x00), rgb_t(0x96,0x5C,0x0A), rgb_t(0xA7,0x6D,0x1B), \
+ rgb_t(0xB8,0x7E,0x2C), rgb_t(0xC9,0x8F,0x3D), rgb_t(0xDA,0xA0,0x4E), rgb_t(0xEB,0xB1,0x5F), \
+ rgb_t(0xFC,0xC2,0x70), rgb_t(0xFF,0xD3,0x85), rgb_t(0xFF,0xE4,0x9B), rgb_t(0xFF,0xF5,0xB1 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3D,0x00,0x00), MAKE_RGB(0x4E,0x00,0x00), MAKE_RGB(0x5F,0x09,0x00), MAKE_RGB(0x70,0x1A,0x00), \
- MAKE_RGB(0x81,0x2B,0x09), MAKE_RGB(0x92,0x3C,0x1A), MAKE_RGB(0xA3,0x4D,0x2B), MAKE_RGB(0xB4,0x5E,0x3C), \
- MAKE_RGB(0xC5,0x6F,0x4D), MAKE_RGB(0xD6,0x80,0x5E), MAKE_RGB(0xE7,0x91,0x6F), MAKE_RGB(0xF8,0xA2,0x80), \
- MAKE_RGB(0xFF,0xB3,0x94), MAKE_RGB(0xFF,0xC4,0xAA), MAKE_RGB(0xFF,0xD5,0xC0), MAKE_RGB(0xFF,0xE6,0xD6 )
+ rgb_t(0x3D,0x00,0x00), rgb_t(0x4E,0x00,0x00), rgb_t(0x5F,0x09,0x00), rgb_t(0x70,0x1A,0x00), \
+ rgb_t(0x81,0x2B,0x09), rgb_t(0x92,0x3C,0x1A), rgb_t(0xA3,0x4D,0x2B), rgb_t(0xB4,0x5E,0x3C), \
+ rgb_t(0xC5,0x6F,0x4D), rgb_t(0xD6,0x80,0x5E), rgb_t(0xE7,0x91,0x6F), rgb_t(0xF8,0xA2,0x80), \
+ rgb_t(0xFF,0xB3,0x94), rgb_t(0xFF,0xC4,0xAA), rgb_t(0xFF,0xD5,0xC0), rgb_t(0xFF,0xE6,0xD6 )
define NTSC_PINK
- MAKE_RGB(0x3F,0x00,0x00), MAKE_RGB(0x50,0x00,0x09), MAKE_RGB(0x61,0x00,0x15), MAKE_RGB(0x72,0x10,0x26), \
- MAKE_RGB(0x83,0x21,0x37), MAKE_RGB(0x94,0x32,0x48), MAKE_RGB(0xA5,0x43,0x59), MAKE_RGB(0xB6,0x54,0x6A), \
- MAKE_RGB(0xC7,0x65,0x7B), MAKE_RGB(0xD8,0x76,0x8C), MAKE_RGB(0xE9,0x87,0x9D), MAKE_RGB(0xFA,0x98,0xAE), \
- MAKE_RGB(0xFF,0xA9,0xC2), MAKE_RGB(0xFF,0xBA,0xD8), MAKE_RGB(0xFF,0xCB,0xEE), MAKE_RGB(0xFF,0xDC,0xF4 )
+ rgb_t(0x3F,0x00,0x00), rgb_t(0x50,0x00,0x09), rgb_t(0x61,0x00,0x15), rgb_t(0x72,0x10,0x26), \
+ rgb_t(0x83,0x21,0x37), rgb_t(0x94,0x32,0x48), rgb_t(0xA5,0x43,0x59), rgb_t(0xB6,0x54,0x6A), \
+ rgb_t(0xC7,0x65,0x7B), rgb_t(0xD8,0x76,0x8C), rgb_t(0xE9,0x87,0x9D), rgb_t(0xFA,0x98,0xAE), \
+ rgb_t(0xFF,0xA9,0xC2), rgb_t(0xFF,0xBA,0xD8), rgb_t(0xFF,0xCB,0xEE), rgb_t(0xFF,0xDC,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x36,0x00,0x2E), MAKE_RGB(0x47,0x00,0x3A), MAKE_RGB(0x58,0x00,0x46), MAKE_RGB(0x69,0x0C,0x55), \
- MAKE_RGB(0x7A,0x1D,0x66), MAKE_RGB(0x8B,0x2E,0x77), MAKE_RGB(0x9C,0x3F,0x88), MAKE_RGB(0xAD,0x50,0x99), \
- MAKE_RGB(0xBE,0x61,0xAA), MAKE_RGB(0xCF,0x72,0xBB), MAKE_RGB(0xE0,0x83,0xCC), MAKE_RGB(0xF1,0x94,0xDD), \
- MAKE_RGB(0xFF,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x36,0x00,0x2E), rgb_t(0x47,0x00,0x3A), rgb_t(0x58,0x00,0x46), rgb_t(0x69,0x0C,0x55), \
+ rgb_t(0x7A,0x1D,0x66), rgb_t(0x8B,0x2E,0x77), rgb_t(0x9C,0x3F,0x88), rgb_t(0xAD,0x50,0x99), \
+ rgb_t(0xBE,0x61,0xAA), rgb_t(0xCF,0x72,0xBB), rgb_t(0xE0,0x83,0xCC), rgb_t(0xF1,0x94,0xDD), \
+ rgb_t(0xFF,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x23,0x00,0x55), MAKE_RGB(0x34,0x00,0x61), MAKE_RGB(0x45,0x00,0x6D), MAKE_RGB(0x56,0x0F,0x7E), \
- MAKE_RGB(0x67,0x20,0x8F), MAKE_RGB(0x78,0x31,0xA0), MAKE_RGB(0x89,0x42,0xB1), MAKE_RGB(0x9A,0x53,0xC2), \
- MAKE_RGB(0xAB,0x64,0xD3), MAKE_RGB(0xBC,0x75,0xE4), MAKE_RGB(0xCD,0x86,0xEA), MAKE_RGB(0xDE,0x97,0xEA), \
- MAKE_RGB(0xEF,0xA8,0xEA), MAKE_RGB(0xFF,0xB9,0xEA), MAKE_RGB(0xFF,0xCA,0xEF), MAKE_RGB(0xFF,0xDB,0xF4 )
+ rgb_t(0x23,0x00,0x55), rgb_t(0x34,0x00,0x61), rgb_t(0x45,0x00,0x6D), rgb_t(0x56,0x0F,0x7E), \
+ rgb_t(0x67,0x20,0x8F), rgb_t(0x78,0x31,0xA0), rgb_t(0x89,0x42,0xB1), rgb_t(0x9A,0x53,0xC2), \
+ rgb_t(0xAB,0x64,0xD3), rgb_t(0xBC,0x75,0xE4), rgb_t(0xCD,0x86,0xEA), rgb_t(0xDE,0x97,0xEA), \
+ rgb_t(0xEF,0xA8,0xEA), rgb_t(0xFF,0xB9,0xEA), rgb_t(0xFF,0xCA,0xEF), rgb_t(0xFF,0xDB,0xF4 )
define NTSC_BLUE1
- MAKE_RGB(0x09,0x00,0x6E), MAKE_RGB(0x1A,0x00,0x7A), MAKE_RGB(0x2B,0x08,0x88), MAKE_RGB(0x3C,0x19,0x99), \
- MAKE_RGB(0x4D,0x2A,0xAA), MAKE_RGB(0x5E,0x3B,0xBB), MAKE_RGB(0x6F,0x4C,0xCC), MAKE_RGB(0x80,0x5D,0xDD), \
- MAKE_RGB(0x91,0x6E,0xEE), MAKE_RGB(0xA2,0x7F,0xF4), MAKE_RGB(0xB3,0x90,0xF4), MAKE_RGB(0xC4,0xA1,0xF4), \
- MAKE_RGB(0xD5,0xB2,0xF4), MAKE_RGB(0xE6,0xC3,0xF4), MAKE_RGB(0xF7,0xD4,0xF4), MAKE_RGB(0xFF,0xE5,0xF7 )
+ rgb_t(0x09,0x00,0x6E), rgb_t(0x1A,0x00,0x7A), rgb_t(0x2B,0x08,0x88), rgb_t(0x3C,0x19,0x99), \
+ rgb_t(0x4D,0x2A,0xAA), rgb_t(0x5E,0x3B,0xBB), rgb_t(0x6F,0x4C,0xCC), rgb_t(0x80,0x5D,0xDD), \
+ rgb_t(0x91,0x6E,0xEE), rgb_t(0xA2,0x7F,0xF4), rgb_t(0xB3,0x90,0xF4), rgb_t(0xC4,0xA1,0xF4), \
+ rgb_t(0xD5,0xB2,0xF4), rgb_t(0xE6,0xC3,0xF4), rgb_t(0xF7,0xD4,0xF4), rgb_t(0xFF,0xE5,0xF7 )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x00,0x6D), MAKE_RGB(0x00,0x05,0x80), MAKE_RGB(0x10,0x16,0x91), MAKE_RGB(0x21,0x27,0xA2), \
- MAKE_RGB(0x32,0x38,0xB3), MAKE_RGB(0x43,0x49,0xC4), MAKE_RGB(0x54,0x5A,0xD5), MAKE_RGB(0x65,0x6B,0xE6), \
- MAKE_RGB(0x76,0x7C,0xF7), MAKE_RGB(0x87,0x8D,0xFF), MAKE_RGB(0x98,0x9E,0xFF), MAKE_RGB(0xA9,0xAF,0xFF), \
- MAKE_RGB(0xBA,0xC0,0xFF), MAKE_RGB(0xCB,0xD1,0xFF), MAKE_RGB(0xDC,0xE2,0xFF), MAKE_RGB(0xED,0xF3,0xFF )
+ rgb_t(0x00,0x00,0x6D), rgb_t(0x00,0x05,0x80), rgb_t(0x10,0x16,0x91), rgb_t(0x21,0x27,0xA2), \
+ rgb_t(0x32,0x38,0xB3), rgb_t(0x43,0x49,0xC4), rgb_t(0x54,0x5A,0xD5), rgb_t(0x65,0x6B,0xE6), \
+ rgb_t(0x76,0x7C,0xF7), rgb_t(0x87,0x8D,0xFF), rgb_t(0x98,0x9E,0xFF), rgb_t(0xA9,0xAF,0xFF), \
+ rgb_t(0xBA,0xC0,0xFF), rgb_t(0xCB,0xD1,0xFF), rgb_t(0xDC,0xE2,0xFF), rgb_t(0xED,0xF3,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x05,0x57), MAKE_RGB(0x00,0x16,0x6E), MAKE_RGB(0x00,0x27,0x84), MAKE_RGB(0x09,0x38,0x97), \
- MAKE_RGB(0x1A,0x49,0xA8), MAKE_RGB(0x2B,0x5A,0xB9), MAKE_RGB(0x3C,0x6B,0xCA), MAKE_RGB(0x4D,0x7C,0xDB), \
- MAKE_RGB(0x5E,0x8D,0xEC), MAKE_RGB(0x6F,0x9E,0xFD), MAKE_RGB(0x80,0xAF,0xFF), MAKE_RGB(0x91,0xC0,0xFF), \
- MAKE_RGB(0xA2,0xD1,0xFF), MAKE_RGB(0xB3,0xE2,0xFF), MAKE_RGB(0xC4,0xF3,0xFF), MAKE_RGB(0xD5,0xFF,0xFF )
+ rgb_t(0x00,0x05,0x57), rgb_t(0x00,0x16,0x6E), rgb_t(0x00,0x27,0x84), rgb_t(0x09,0x38,0x97), \
+ rgb_t(0x1A,0x49,0xA8), rgb_t(0x2B,0x5A,0xB9), rgb_t(0x3C,0x6B,0xCA), rgb_t(0x4D,0x7C,0xDB), \
+ rgb_t(0x5E,0x8D,0xEC), rgb_t(0x6F,0x9E,0xFD), rgb_t(0x80,0xAF,0xFF), rgb_t(0x91,0xC0,0xFF), \
+ rgb_t(0xA2,0xD1,0xFF), rgb_t(0xB3,0xE2,0xFF), rgb_t(0xC4,0xF3,0xFF), rgb_t(0xD5,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x15,0x34), MAKE_RGB(0x00,0x26,0x4A), MAKE_RGB(0x00,0x37,0x60), MAKE_RGB(0x00,0x48,0x77), \
- MAKE_RGB(0x0A,0x59,0x8A), MAKE_RGB(0x1B,0x6A,0x9B), MAKE_RGB(0x2C,0x7B,0xAC), MAKE_RGB(0x3D,0x8C,0xBD), \
- MAKE_RGB(0x4E,0x9D,0xCE), MAKE_RGB(0x5F,0xAE,0xDF), MAKE_RGB(0x70,0xBF,0xF0), MAKE_RGB(0x81,0xD0,0xFF), \
- MAKE_RGB(0x92,0xE1,0xFF), MAKE_RGB(0xA3,0xF2,0xFF), MAKE_RGB(0xB4,0xFF,0xFF), MAKE_RGB(0xC5,0xFF,0xFF )
+ rgb_t(0x00,0x15,0x34), rgb_t(0x00,0x26,0x4A), rgb_t(0x00,0x37,0x60), rgb_t(0x00,0x48,0x77), \
+ rgb_t(0x0A,0x59,0x8A), rgb_t(0x1B,0x6A,0x9B), rgb_t(0x2C,0x7B,0xAC), rgb_t(0x3D,0x8C,0xBD), \
+ rgb_t(0x4E,0x9D,0xCE), rgb_t(0x5F,0xAE,0xDF), rgb_t(0x70,0xBF,0xF0), rgb_t(0x81,0xD0,0xFF), \
+ rgb_t(0x92,0xE1,0xFF), rgb_t(0xA3,0xF2,0xFF), rgb_t(0xB4,0xFF,0xFF), rgb_t(0xC5,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x21,0x0A), MAKE_RGB(0x00,0x32,0x1F), MAKE_RGB(0x00,0x43,0x35), MAKE_RGB(0x00,0x54,0x4B), \
- MAKE_RGB(0x04,0x65,0x60), MAKE_RGB(0x15,0x76,0x71), MAKE_RGB(0x26,0x87,0x82), MAKE_RGB(0x37,0x98,0x93), \
- MAKE_RGB(0x48,0xA9,0xA4), MAKE_RGB(0x59,0xBA,0xB5), MAKE_RGB(0x6A,0xCB,0xC6), MAKE_RGB(0x7B,0xDC,0xD7), \
- MAKE_RGB(0x8C,0xED,0xE8), MAKE_RGB(0x9D,0xFE,0xF9), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF )
+ rgb_t(0x00,0x21,0x0A), rgb_t(0x00,0x32,0x1F), rgb_t(0x00,0x43,0x35), rgb_t(0x00,0x54,0x4B), \
+ rgb_t(0x04,0x65,0x60), rgb_t(0x15,0x76,0x71), rgb_t(0x26,0x87,0x82), rgb_t(0x37,0x98,0x93), \
+ rgb_t(0x48,0xA9,0xA4), rgb_t(0x59,0xBA,0xB5), rgb_t(0x6A,0xCB,0xC6), rgb_t(0x7B,0xDC,0xD7), \
+ rgb_t(0x8C,0xED,0xE8), rgb_t(0x9D,0xFE,0xF9), rgb_t(0xAE,0xFF,0xFF), rgb_t(0xBF,0xFF,0xFF )
define NTSC_GREEN
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x00,0x5A,0x1D), \
- MAKE_RGB(0x0A,0x6B,0x30), MAKE_RGB(0x1B,0x7C,0x41), MAKE_RGB(0x2C,0x8D,0x52), MAKE_RGB(0x3D,0x9E,0x63), \
- MAKE_RGB(0x4E,0xAF,0x74), MAKE_RGB(0x5F,0xC0,0x85), MAKE_RGB(0x70,0xD1,0x96), MAKE_RGB(0x81,0xE2,0xA7), \
- MAKE_RGB(0x92,0xF3,0xB8), MAKE_RGB(0xA3,0xFF,0xC8), MAKE_RGB(0xB4,0xFF,0xD3), MAKE_RGB(0xC5,0xFF,0xDF )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1D), \
+ rgb_t(0x0A,0x6B,0x30), rgb_t(0x1B,0x7C,0x41), rgb_t(0x2C,0x8D,0x52), rgb_t(0x3D,0x9E,0x63), \
+ rgb_t(0x4E,0xAF,0x74), rgb_t(0x5F,0xC0,0x85), rgb_t(0x70,0xD1,0x96), rgb_t(0x81,0xE2,0xA7), \
+ rgb_t(0x92,0xF3,0xB8), rgb_t(0xA3,0xFF,0xC8), rgb_t(0xB4,0xFF,0xD3), rgb_t(0xC5,0xFF,0xDF )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x0A,0x59,0x18), \
- MAKE_RGB(0x1B,0x6A,0x18), MAKE_RGB(0x2C,0x7B,0x18), MAKE_RGB(0x3D,0x8C,0x27), MAKE_RGB(0x4E,0x9D,0x38), \
- MAKE_RGB(0x5F,0xAE,0x49), MAKE_RGB(0x70,0xBF,0x5A), MAKE_RGB(0x81,0xD0,0x6B), MAKE_RGB(0x92,0xE1,0x7C), \
- MAKE_RGB(0xA3,0xF2,0x8D), MAKE_RGB(0xB4,0xFF,0x9C), MAKE_RGB(0xC5,0xFF,0xA8), MAKE_RGB(0xD6,0xFF,0xB4 )
+ rgb_t(0x00,0x26,0x0B), rgb_t(0x00,0x37,0x10), rgb_t(0x00,0x48,0x16), rgb_t(0x0A,0x59,0x18), \
+ rgb_t(0x1B,0x6A,0x18), rgb_t(0x2C,0x7B,0x18), rgb_t(0x3D,0x8C,0x27), rgb_t(0x4E,0x9D,0x38), \
+ rgb_t(0x5F,0xAE,0x49), rgb_t(0x70,0xBF,0x5A), rgb_t(0x81,0xD0,0x6B), rgb_t(0x92,0xE1,0x7C), \
+ rgb_t(0xA3,0xF2,0x8D), rgb_t(0xB4,0xFF,0x9C), rgb_t(0xC5,0xFF,0xA8), rgb_t(0xD6,0xFF,0xB4 )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x00,0x1E,0x09), MAKE_RGB(0x00,0x2F,0x0E), MAKE_RGB(0x11,0x40,0x0E), MAKE_RGB(0x22,0x51,0x0E), \
- MAKE_RGB(0x33,0x62,0x0E), MAKE_RGB(0x44,0x73,0x0E), MAKE_RGB(0x55,0x84,0x0E), MAKE_RGB(0x66,0x95,0x17), \
- MAKE_RGB(0x77,0xA6,0x28), MAKE_RGB(0x88,0xB7,0x39), MAKE_RGB(0x99,0xC8,0x4A), MAKE_RGB(0xAA,0xD9,0x5B), \
- MAKE_RGB(0xBB,0xEA,0x6C), MAKE_RGB(0xCC,0xFB,0x7D), MAKE_RGB(0xDD,0xFF,0x8A), MAKE_RGB(0xEE,0xFF,0x96 )
+ rgb_t(0x00,0x1E,0x09), rgb_t(0x00,0x2F,0x0E), rgb_t(0x11,0x40,0x0E), rgb_t(0x22,0x51,0x0E), \
+ rgb_t(0x33,0x62,0x0E), rgb_t(0x44,0x73,0x0E), rgb_t(0x55,0x84,0x0E), rgb_t(0x66,0x95,0x17), \
+ rgb_t(0x77,0xA6,0x28), rgb_t(0x88,0xB7,0x39), rgb_t(0x99,0xC8,0x4A), rgb_t(0xAA,0xD9,0x5B), \
+ rgb_t(0xBB,0xEA,0x6C), rgb_t(0xCC,0xFB,0x7D), rgb_t(0xDD,0xFF,0x8A), rgb_t(0xEE,0xFF,0x96 )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x0A,0x11,0x02), MAKE_RGB(0x1B,0x22,0x02), MAKE_RGB(0x2C,0x33,0x02), MAKE_RGB(0x3D,0x44,0x02), \
- MAKE_RGB(0x4E,0x55,0x02), MAKE_RGB(0x5F,0x66,0x02), MAKE_RGB(0x70,0x77,0x02), MAKE_RGB(0x81,0x88,0x09), \
- MAKE_RGB(0x92,0x99,0x1A), MAKE_RGB(0xA3,0xAA,0x2B), MAKE_RGB(0xB4,0xBB,0x3C), MAKE_RGB(0xC5,0xCC,0x4D), \
- MAKE_RGB(0xD6,0xDD,0x5E), MAKE_RGB(0xE7,0xEE,0x6F), MAKE_RGB(0xF8,0xFF,0x80), MAKE_RGB(0xFF,0xFF,0x8F )
+ rgb_t(0x0A,0x11,0x02), rgb_t(0x1B,0x22,0x02), rgb_t(0x2C,0x33,0x02), rgb_t(0x3D,0x44,0x02), \
+ rgb_t(0x4E,0x55,0x02), rgb_t(0x5F,0x66,0x02), rgb_t(0x70,0x77,0x02), rgb_t(0x81,0x88,0x09), \
+ rgb_t(0x92,0x99,0x1A), rgb_t(0xA3,0xAA,0x2B), rgb_t(0xB4,0xBB,0x3C), rgb_t(0xC5,0xCC,0x4D), \
+ rgb_t(0xD6,0xDD,0x5E), rgb_t(0xE7,0xEE,0x6F), rgb_t(0xF8,0xFF,0x80), rgb_t(0xFF,0xFF,0x8F )
***************************************************************************/
/***************************************************************************
@@ -465,100 +465,100 @@ define NTSC_LIGHT_ORANGE
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x30,0x00,0x00), MAKE_RGB(0x41,0x07,0x00), MAKE_RGB(0x52,0x18,0x00), MAKE_RGB(0x63,0x29,0x00), \
- MAKE_RGB(0x74,0x3A,0x00), MAKE_RGB(0x85,0x4B,0x00), MAKE_RGB(0x96,0x5C,0x0A), MAKE_RGB(0xA7,0x6D,0x1B), \
- MAKE_RGB(0xB8,0x7E,0x2C), MAKE_RGB(0xC9,0x8F,0x3D), MAKE_RGB(0xDA,0xA0,0x4E), MAKE_RGB(0xEB,0xB1,0x5F), \
- MAKE_RGB(0xFC,0xC2,0x70), MAKE_RGB(0xFF,0xD3,0x85), MAKE_RGB(0xFF,0xE4,0x9B), MAKE_RGB(0xFF,0xF5,0xB1 )
+ rgb_t(0x30,0x00,0x00), rgb_t(0x41,0x07,0x00), rgb_t(0x52,0x18,0x00), rgb_t(0x63,0x29,0x00), \
+ rgb_t(0x74,0x3A,0x00), rgb_t(0x85,0x4B,0x00), rgb_t(0x96,0x5C,0x0A), rgb_t(0xA7,0x6D,0x1B), \
+ rgb_t(0xB8,0x7E,0x2C), rgb_t(0xC9,0x8F,0x3D), rgb_t(0xDA,0xA0,0x4E), rgb_t(0xEB,0xB1,0x5F), \
+ rgb_t(0xFC,0xC2,0x70), rgb_t(0xFF,0xD3,0x85), rgb_t(0xFF,0xE4,0x9B), rgb_t(0xFF,0xF5,0xB1 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x09,0x00), MAKE_RGB(0x71,0x1A,0x00), \
- MAKE_RGB(0x82,0x2B,0x0B), MAKE_RGB(0x93,0x3C,0x1C), MAKE_RGB(0xA4,0x4D,0x2D), MAKE_RGB(0xB5,0x5E,0x3E), \
- MAKE_RGB(0xC6,0x6F,0x4F), MAKE_RGB(0xD7,0x80,0x60), MAKE_RGB(0xE8,0x91,0x71), MAKE_RGB(0xF9,0xA2,0x82), \
- MAKE_RGB(0xFF,0xB3,0x96), MAKE_RGB(0xFF,0xC4,0xAC), MAKE_RGB(0xFF,0xD5,0xC2), MAKE_RGB(0xFF,0xE6,0xD8 )
+ rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x09,0x00), rgb_t(0x71,0x1A,0x00), \
+ rgb_t(0x82,0x2B,0x0B), rgb_t(0x93,0x3C,0x1C), rgb_t(0xA4,0x4D,0x2D), rgb_t(0xB5,0x5E,0x3E), \
+ rgb_t(0xC6,0x6F,0x4F), rgb_t(0xD7,0x80,0x60), rgb_t(0xE8,0x91,0x71), rgb_t(0xF9,0xA2,0x82), \
+ rgb_t(0xFF,0xB3,0x96), rgb_t(0xFF,0xC4,0xAC), rgb_t(0xFF,0xD5,0xC2), rgb_t(0xFF,0xE6,0xD8 )
define NTSC_PINK
- MAKE_RGB(0x3F,0x00,0x00), MAKE_RGB(0x50,0x00,0x0C), MAKE_RGB(0x61,0x00,0x18), MAKE_RGB(0x72,0x0F,0x28), \
- MAKE_RGB(0x83,0x20,0x39), MAKE_RGB(0x94,0x31,0x4A), MAKE_RGB(0xA5,0x42,0x5B), MAKE_RGB(0xB6,0x53,0x6C), \
- MAKE_RGB(0xC7,0x64,0x7D), MAKE_RGB(0xD8,0x75,0x8E), MAKE_RGB(0xE9,0x86,0x9F), MAKE_RGB(0xFA,0x97,0xB0), \
- MAKE_RGB(0xFF,0xA8,0xC5), MAKE_RGB(0xFF,0xB9,0xDB), MAKE_RGB(0xFF,0xCA,0xEF), MAKE_RGB(0xFF,0xDB,0xF4 )
+ rgb_t(0x3F,0x00,0x00), rgb_t(0x50,0x00,0x0C), rgb_t(0x61,0x00,0x18), rgb_t(0x72,0x0F,0x28), \
+ rgb_t(0x83,0x20,0x39), rgb_t(0x94,0x31,0x4A), rgb_t(0xA5,0x42,0x5B), rgb_t(0xB6,0x53,0x6C), \
+ rgb_t(0xC7,0x64,0x7D), rgb_t(0xD8,0x75,0x8E), rgb_t(0xE9,0x86,0x9F), rgb_t(0xFA,0x97,0xB0), \
+ rgb_t(0xFF,0xA8,0xC5), rgb_t(0xFF,0xB9,0xDB), rgb_t(0xFF,0xCA,0xEF), rgb_t(0xFF,0xDB,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x35,0x00,0x31), MAKE_RGB(0x46,0x00,0x3D), MAKE_RGB(0x57,0x00,0x49), MAKE_RGB(0x68,0x0C,0x58), \
- MAKE_RGB(0x79,0x1D,0x69), MAKE_RGB(0x8A,0x2E,0x7A), MAKE_RGB(0x9B,0x3F,0x8B), MAKE_RGB(0xAC,0x50,0x9C), \
- MAKE_RGB(0xBD,0x61,0xAD), MAKE_RGB(0xCE,0x72,0xBE), MAKE_RGB(0xDF,0x83,0xCF), MAKE_RGB(0xF0,0x94,0xE0), \
- MAKE_RGB(0xFF,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x35,0x00,0x31), rgb_t(0x46,0x00,0x3D), rgb_t(0x57,0x00,0x49), rgb_t(0x68,0x0C,0x58), \
+ rgb_t(0x79,0x1D,0x69), rgb_t(0x8A,0x2E,0x7A), rgb_t(0x9B,0x3F,0x8B), rgb_t(0xAC,0x50,0x9C), \
+ rgb_t(0xBD,0x61,0xAD), rgb_t(0xCE,0x72,0xBE), rgb_t(0xDF,0x83,0xCF), rgb_t(0xF0,0x94,0xE0), \
+ rgb_t(0xFF,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x20,0x00,0x59), MAKE_RGB(0x31,0x00,0x65), MAKE_RGB(0x42,0x00,0x71), MAKE_RGB(0x53,0x10,0x82), \
- MAKE_RGB(0x64,0x21,0x93), MAKE_RGB(0x75,0x32,0xA4), MAKE_RGB(0x86,0x43,0xB5), MAKE_RGB(0x97,0x54,0xC6), \
- MAKE_RGB(0xA8,0x65,0xD7), MAKE_RGB(0xB9,0x76,0xE8), MAKE_RGB(0xCA,0x87,0xEB), MAKE_RGB(0xDB,0x98,0xEB), \
- MAKE_RGB(0xEC,0xA9,0xEB), MAKE_RGB(0xFD,0xBA,0xEB), MAKE_RGB(0xFF,0xCB,0xEF), MAKE_RGB(0xFF,0xDC,0xF4 )
+ rgb_t(0x20,0x00,0x59), rgb_t(0x31,0x00,0x65), rgb_t(0x42,0x00,0x71), rgb_t(0x53,0x10,0x82), \
+ rgb_t(0x64,0x21,0x93), rgb_t(0x75,0x32,0xA4), rgb_t(0x86,0x43,0xB5), rgb_t(0x97,0x54,0xC6), \
+ rgb_t(0xA8,0x65,0xD7), rgb_t(0xB9,0x76,0xE8), rgb_t(0xCA,0x87,0xEB), rgb_t(0xDB,0x98,0xEB), \
+ rgb_t(0xEC,0xA9,0xEB), rgb_t(0xFD,0xBA,0xEB), rgb_t(0xFF,0xCB,0xEF), rgb_t(0xFF,0xDC,0xF4 )
define NTSC_BLUE1
- MAKE_RGB(0x05,0x00,0x70), MAKE_RGB(0x16,0x00,0x7C), MAKE_RGB(0x27,0x09,0x8B), MAKE_RGB(0x38,0x1A,0x9C), \
- MAKE_RGB(0x49,0x2B,0xAD), MAKE_RGB(0x5A,0x3C,0xBE), MAKE_RGB(0x6B,0x4D,0xCF), MAKE_RGB(0x7C,0x5E,0xE0), \
- MAKE_RGB(0X8D,0x6F,0xF1), MAKE_RGB(0x9E,0x80,0xF6), MAKE_RGB(0xAF,0x91,0xF6), MAKE_RGB(0xC0,0xA2,0xF6), \
- MAKE_RGB(0xD1,0xB3,0xF6), MAKE_RGB(0xE2,0xC4,0xF6), MAKE_RGB(0xF3,0xD5,0xF6), MAKE_RGB(0xFF,0xE6,0xF7 )
+ rgb_t(0x05,0x00,0x70), rgb_t(0x16,0x00,0x7C), rgb_t(0x27,0x09,0x8B), rgb_t(0x38,0x1A,0x9C), \
+ rgb_t(0x49,0x2B,0xAD), rgb_t(0x5A,0x3C,0xBE), rgb_t(0x6B,0x4D,0xCF), rgb_t(0x7C,0x5E,0xE0), \
+ rgb_t(0X8D,0x6F,0xF1), rgb_t(0x9E,0x80,0xF6), rgb_t(0xAF,0x91,0xF6), rgb_t(0xC0,0xA2,0xF6), \
+ rgb_t(0xD1,0xB3,0xF6), rgb_t(0xE2,0xC4,0xF6), rgb_t(0xF3,0xD5,0xF6), rgb_t(0xFF,0xE6,0xF7 )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x00,0x6B), MAKE_RGB(0x00,0x08,0x7E), MAKE_RGB(0x0C,0x19,0x91), MAKE_RGB(0x1D,0x2A,0xA2), \
- MAKE_RGB(0x2E,0x3B,0xB3), MAKE_RGB(0x3F,0x4C,0xC4), MAKE_RGB(0x50,0x5D,0xD5), MAKE_RGB(0x61,0x6E,0xE6), \
- MAKE_RGB(0x72,0x7F,0xF7), MAKE_RGB(0x83,0x90,0xFF), MAKE_RGB(0x94,0xA1,0xFF), MAKE_RGB(0xA5,0xB2,0xFF), \
- MAKE_RGB(0xB6,0xC3,0xFF), MAKE_RGB(0xC7,0xD4,0xFF), MAKE_RGB(0xD8,0xE5,0xFF), MAKE_RGB(0xE9,0xF6,0xFF )
+ rgb_t(0x00,0x00,0x6B), rgb_t(0x00,0x08,0x7E), rgb_t(0x0C,0x19,0x91), rgb_t(0x1D,0x2A,0xA2), \
+ rgb_t(0x2E,0x3B,0xB3), rgb_t(0x3F,0x4C,0xC4), rgb_t(0x50,0x5D,0xD5), rgb_t(0x61,0x6E,0xE6), \
+ rgb_t(0x72,0x7F,0xF7), rgb_t(0x83,0x90,0xFF), rgb_t(0x94,0xA1,0xFF), rgb_t(0xA5,0xB2,0xFF), \
+ rgb_t(0xB6,0xC3,0xFF), rgb_t(0xC7,0xD4,0xFF), rgb_t(0xD8,0xE5,0xFF), rgb_t(0xE9,0xF6,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x08,0x52), MAKE_RGB(0x00,0x19,0x68), MAKE_RGB(0x00,0x2A,0x7F), MAKE_RGB(0x05,0x3B,0x93), \
- MAKE_RGB(0x16,0x4C,0xA4), MAKE_RGB(0x27,0x5D,0xB5), MAKE_RGB(0x38,0x6E,0xC6), MAKE_RGB(0x49,0x7F,0xD7), \
- MAKE_RGB(0x5A,0x90,0xE8), MAKE_RGB(0x6B,0xA1,0xF9), MAKE_RGB(0x7C,0xB2,0xFF), MAKE_RGB(0x8D,0xC3,0xFF), \
- MAKE_RGB(0x9E,0xD4,0xFF), MAKE_RGB(0xAF,0xE5,0xFF), MAKE_RGB(0xC0,0xF6,0xFF), MAKE_RGB(0xD1,0xFF,0xFF )
+ rgb_t(0x00,0x08,0x52), rgb_t(0x00,0x19,0x68), rgb_t(0x00,0x2A,0x7F), rgb_t(0x05,0x3B,0x93), \
+ rgb_t(0x16,0x4C,0xA4), rgb_t(0x27,0x5D,0xB5), rgb_t(0x38,0x6E,0xC6), rgb_t(0x49,0x7F,0xD7), \
+ rgb_t(0x5A,0x90,0xE8), rgb_t(0x6B,0xA1,0xF9), rgb_t(0x7C,0xB2,0xFF), rgb_t(0x8D,0xC3,0xFF), \
+ rgb_t(0x9E,0xD4,0xFF), rgb_t(0xAF,0xE5,0xFF), rgb_t(0xC0,0xF6,0xFF), rgb_t(0xD1,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x17,0x2D), MAKE_RGB(0x00,0x28,0x43), MAKE_RGB(0x00,0x39,0x59), MAKE_RGB(0x00,0x4A,0x6F), \
- MAKE_RGB(0x08,0x5B,0x83), MAKE_RGB(0x19,0x6C,0x94), MAKE_RGB(0x2A,0x7D,0xA5), MAKE_RGB(0x3B,0x8E,0xB6), \
- MAKE_RGB(0x4C,0x9F,0xC7), MAKE_RGB(0x5D,0xB0,0xD8), MAKE_RGB(0x6E,0xC1,0xE9), MAKE_RGB(0x7F,0xD2,0xFA), \
- MAKE_RGB(0x90,0xE3,0xFF), MAKE_RGB(0xA1,0xF4,0xFF), MAKE_RGB(0xB2,0xFF,0xFF), MAKE_RGB(0xC3,0xFF,0xFF )
+ rgb_t(0x00,0x17,0x2D), rgb_t(0x00,0x28,0x43), rgb_t(0x00,0x39,0x59), rgb_t(0x00,0x4A,0x6F), \
+ rgb_t(0x08,0x5B,0x83), rgb_t(0x19,0x6C,0x94), rgb_t(0x2A,0x7D,0xA5), rgb_t(0x3B,0x8E,0xB6), \
+ rgb_t(0x4C,0x9F,0xC7), rgb_t(0x5D,0xB0,0xD8), rgb_t(0x6E,0xC1,0xE9), rgb_t(0x7F,0xD2,0xFA), \
+ rgb_t(0x90,0xE3,0xFF), rgb_t(0xA1,0xF4,0xFF), rgb_t(0xB2,0xFF,0xFF), rgb_t(0xC3,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x23,0x0A), MAKE_RGB(0x00,0x34,0x15), MAKE_RGB(0x00,0x45,0x2B), MAKE_RGB(0x00,0x56,0x41), \
- MAKE_RGB(0x04,0x67,0x56), MAKE_RGB(0x15,0x78,0x67), MAKE_RGB(0x26,0x89,0x78), MAKE_RGB(0x37,0x9A,0x89), \
- MAKE_RGB(0x48,0xAB,0x9A), MAKE_RGB(0x59,0xBC,0xAB), MAKE_RGB(0x6A,0xCD,0xBC), MAKE_RGB(0x7B,0xDE,0xCD), \
- MAKE_RGB(0x8C,0xEF,0xDE), MAKE_RGB(0x9D,0xFF,0xEE), MAKE_RGB(0xAE,0xFF,0xFA), MAKE_RGB(0xBF,0xFF,0xFF )
+ rgb_t(0x00,0x23,0x0A), rgb_t(0x00,0x34,0x15), rgb_t(0x00,0x45,0x2B), rgb_t(0x00,0x56,0x41), \
+ rgb_t(0x04,0x67,0x56), rgb_t(0x15,0x78,0x67), rgb_t(0x26,0x89,0x78), rgb_t(0x37,0x9A,0x89), \
+ rgb_t(0x48,0xAB,0x9A), rgb_t(0x59,0xBC,0xAB), rgb_t(0x6A,0xCD,0xBC), rgb_t(0x7B,0xDE,0xCD), \
+ rgb_t(0x8C,0xEF,0xDE), rgb_t(0x9D,0xFF,0xEE), rgb_t(0xAE,0xFF,0xFA), rgb_t(0xBF,0xFF,0xFF )
define NTSC_GREEN
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x00,0x5A,0x1B), \
- MAKE_RGB(0x0D,0x6B,0x25), MAKE_RGB(0x1E,0x7C,0x36), MAKE_RGB(0x2F,0x8D,0x47), MAKE_RGB(0x40,0x9E,0x58), \
- MAKE_RGB(0x51,0xAF,0x69), MAKE_RGB(0x62,0xC0,0x7A), MAKE_RGB(0x73,0xD1,0x8B), MAKE_RGB(0x84,0xE2,0x9C), \
- MAKE_RGB(0x95,0xF3,0xAD), MAKE_RGB(0xA6,0xFF,0xBD), MAKE_RGB(0xB7,0xFF,0xC9), MAKE_RGB(0xC8,0xFF,0xD4 )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1B), \
+ rgb_t(0x0D,0x6B,0x25), rgb_t(0x1E,0x7C,0x36), rgb_t(0x2F,0x8D,0x47), rgb_t(0x40,0x9E,0x58), \
+ rgb_t(0x51,0xAF,0x69), rgb_t(0x62,0xC0,0x7A), rgb_t(0x73,0xD1,0x8B), rgb_t(0x84,0xE2,0x9C), \
+ rgb_t(0x95,0xF3,0xAD), rgb_t(0xA6,0xFF,0xBD), rgb_t(0xB7,0xFF,0xC9), rgb_t(0xC8,0xFF,0xD4 )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x24,0x0B), MAKE_RGB(0x00,0x35,0x10), MAKE_RGB(0x00,0x46,0x15), MAKE_RGB(0x10,0x57,0x15), \
- MAKE_RGB(0x21,0x68,0x15), MAKE_RGB(0x32,0x79,0x15), MAKE_RGB(0x43,0x8A,0x1C), MAKE_RGB(0x54,0x9B,0x2D), \
- MAKE_RGB(0x65,0xAC,0x3E), MAKE_RGB(0x76,0xBD,0x4F), MAKE_RGB(0x87,0xCE,0x60), MAKE_RGB(0x98,0xDF,0x71), \
- MAKE_RGB(0xA9,0xF0,0x82), MAKE_RGB(0xBA,0xFF,0x93), MAKE_RGB(0xCB,0xFF,0x9F), MAKE_RGB(0xDC,0xFF,0xAA )
+ rgb_t(0x00,0x24,0x0B), rgb_t(0x00,0x35,0x10), rgb_t(0x00,0x46,0x15), rgb_t(0x10,0x57,0x15), \
+ rgb_t(0x21,0x68,0x15), rgb_t(0x32,0x79,0x15), rgb_t(0x43,0x8A,0x1C), rgb_t(0x54,0x9B,0x2D), \
+ rgb_t(0x65,0xAC,0x3E), rgb_t(0x76,0xBD,0x4F), rgb_t(0x87,0xCE,0x60), rgb_t(0x98,0xDF,0x71), \
+ rgb_t(0xA9,0xF0,0x82), rgb_t(0xBA,0xFF,0x93), rgb_t(0xCB,0xFF,0x9F), rgb_t(0xDC,0xFF,0xAA )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x00,0x1B,0x08), MAKE_RGB(0x08,0x2C,0x0B), MAKE_RGB(0x19,0x3D,0x0B), MAKE_RGB(0x2A,0x4E,0x0B), \
- MAKE_RGB(0x3B,0x5F,0x0B), MAKE_RGB(0x4C,0x70,0x0B), MAKE_RGB(0x5D,0x81,0x0B), MAKE_RGB(0x6E,0x92,0x11), \
- MAKE_RGB(0x7F,0xA3,0x22), MAKE_RGB(0x90,0xB4,0x33), MAKE_RGB(0xA1,0xC5,0x44), MAKE_RGB(0xB2,0xD6,0x55), \
- MAKE_RGB(0xC3,0xE7,0x66), MAKE_RGB(0xD4,0xF8,0x77), MAKE_RGB(0xE5,0xFF,0x85), MAKE_RGB(0xF6,0xFF,0x91 )
+ rgb_t(0x00,0x1B,0x08), rgb_t(0x08,0x2C,0x0B), rgb_t(0x19,0x3D,0x0B), rgb_t(0x2A,0x4E,0x0B), \
+ rgb_t(0x3B,0x5F,0x0B), rgb_t(0x4C,0x70,0x0B), rgb_t(0x5D,0x81,0x0B), rgb_t(0x6E,0x92,0x11), \
+ rgb_t(0x7F,0xA3,0x22), rgb_t(0x90,0xB4,0x33), rgb_t(0xA1,0xC5,0x44), rgb_t(0xB2,0xD6,0x55), \
+ rgb_t(0xC3,0xE7,0x66), rgb_t(0xD4,0xF8,0x77), rgb_t(0xE5,0xFF,0x85), rgb_t(0xF6,0xFF,0x91 )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x12,0x0C,0x00), MAKE_RGB(0x23,0x1D,0x00), MAKE_RGB(0x34,0x2E,0x00), MAKE_RGB(0x45,0x3F,0x00), \
- MAKE_RGB(0x56,0x50,0x00), MAKE_RGB(0x67,0x61,0x00), MAKE_RGB(0x78,0x72,0x00), MAKE_RGB(0x89,0x83,0x08), \
- MAKE_RGB(0x9A,0x94,0x19), MAKE_RGB(0xAB,0xA5,0x2A), MAKE_RGB(0xBC,0xB6,0x3B), MAKE_RGB(0xCD,0xC7,0x4C), \
- MAKE_RGB(0xDE,0xD8,0x5D), MAKE_RGB(0xEF,0xE9,0x6E), MAKE_RGB(0xFF,0xFA,0x80), MAKE_RGB(0xFF,0xFF,0x92 )
+ rgb_t(0x12,0x0C,0x00), rgb_t(0x23,0x1D,0x00), rgb_t(0x34,0x2E,0x00), rgb_t(0x45,0x3F,0x00), \
+ rgb_t(0x56,0x50,0x00), rgb_t(0x67,0x61,0x00), rgb_t(0x78,0x72,0x00), rgb_t(0x89,0x83,0x08), \
+ rgb_t(0x9A,0x94,0x19), rgb_t(0xAB,0xA5,0x2A), rgb_t(0xBC,0xB6,0x3B), rgb_t(0xCD,0xC7,0x4C), \
+ rgb_t(0xDE,0xD8,0x5D), rgb_t(0xEF,0xE9,0x6E), rgb_t(0xFF,0xFA,0x80), rgb_t(0xFF,0xFF,0x92 )
***************************************************************************/
/***************************************************************************
@@ -566,100 +566,100 @@ define NTSC_LIGHT_ORANGE
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x31,0x00,0x00), MAKE_RGB(0x42,0x06,0x00), MAKE_RGB(0x53,0x17,0x00), MAKE_RGB(0x64,0x28,0x00), \
- MAKE_RGB(0x75,0x39,0x00), MAKE_RGB(0x86,0X4A,0x00), MAKE_RGB(0x97,0x5B,0x0A), MAKE_RGB(0xA8,0x6C,0x1B), \
- MAKE_RGB(0xB9,0x7D,0x2C), MAKE_RGB(0xCA,0x8E,0x3D), MAKE_RGB(0xDB,0x9F,0x4E), MAKE_RGB(0xEC,0xB0,0x5F), \
- MAKE_RGB(0xFD,0xC1,0x70), MAKE_RGB(0xFF,0xD2,0x85), MAKE_RGB(0xFF,0xE3,0x9C), MAKE_RGB(0xFF,0xF4,0xB2 )
+ rgb_t(0x31,0x00,0x00), rgb_t(0x42,0x06,0x00), rgb_t(0x53,0x17,0x00), rgb_t(0x64,0x28,0x00), \
+ rgb_t(0x75,0x39,0x00), rgb_t(0x86,0X4A,0x00), rgb_t(0x97,0x5B,0x0A), rgb_t(0xA8,0x6C,0x1B), \
+ rgb_t(0xB9,0x7D,0x2C), rgb_t(0xCA,0x8E,0x3D), rgb_t(0xDB,0x9F,0x4E), rgb_t(0xEC,0xB0,0x5F), \
+ rgb_t(0xFD,0xC1,0x70), rgb_t(0xFF,0xD2,0x85), rgb_t(0xFF,0xE3,0x9C), rgb_t(0xFF,0xF4,0xB2 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x08,0x00), MAKE_RGB(0x71,0x19,0x00), \
- MAKE_RGB(0x82,0x2A,0x0D), MAKE_RGB(0x93,0x3B,0x1E), MAKE_RGB(0xA4,0x4C,0x2F), MAKE_RGB(0xB5,0x5D,0x40), \
- MAKE_RGB(0xC6,0x6E,0x51), MAKE_RGB(0xD7,0x7F,0x62), MAKE_RGB(0xE8,0x90,0x73), MAKE_RGB(0xF9,0xA1,0x83), \
- MAKE_RGB(0xFF,0xB2,0x98), MAKE_RGB(0xFF,0xC3,0xAE), MAKE_RGB(0xFF,0xD4,0xC4), MAKE_RGB(0xFF,0xE5,0xDA )
+ rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x08,0x00), rgb_t(0x71,0x19,0x00), \
+ rgb_t(0x82,0x2A,0x0D), rgb_t(0x93,0x3B,0x1E), rgb_t(0xA4,0x4C,0x2F), rgb_t(0xB5,0x5D,0x40), \
+ rgb_t(0xC6,0x6E,0x51), rgb_t(0xD7,0x7F,0x62), rgb_t(0xE8,0x90,0x73), rgb_t(0xF9,0xA1,0x83), \
+ rgb_t(0xFF,0xB2,0x98), rgb_t(0xFF,0xC3,0xAE), rgb_t(0xFF,0xD4,0xC4), rgb_t(0xFF,0xE5,0xDA )
define NTSC_PINK
- MAKE_RGB(0x3F,0x00,0x03), MAKE_RGB(0x50,0x00,0x0F), MAKE_RGB(0x61,0x00,0x1B), MAKE_RGB(0x72,0x0F,0x2B), \
- MAKE_RGB(0x83,0x20,0x3C), MAKE_RGB(0x94,0x31,0x4D), MAKE_RGB(0xA5,0x42,0x5E), MAKE_RGB(0xB6,0x53,0x6F), \
- MAKE_RGB(0xC7,0x64,0x80), MAKE_RGB(0xD8,0x75,0x91), MAKE_RGB(0xE9,0x86,0xA2), MAKE_RGB(0xFA,0x97,0xB3), \
- MAKE_RGB(0xFF,0xA8,0xC8), MAKE_RGB(0xFF,0xB9,0xDE), MAKE_RGB(0xFF,0xCA,0xEF), MAKE_RGB(0xFF,0xDB,0xF4 )
+ rgb_t(0x3F,0x00,0x03), rgb_t(0x50,0x00,0x0F), rgb_t(0x61,0x00,0x1B), rgb_t(0x72,0x0F,0x2B), \
+ rgb_t(0x83,0x20,0x3C), rgb_t(0x94,0x31,0x4D), rgb_t(0xA5,0x42,0x5E), rgb_t(0xB6,0x53,0x6F), \
+ rgb_t(0xC7,0x64,0x80), rgb_t(0xD8,0x75,0x91), rgb_t(0xE9,0x86,0xA2), rgb_t(0xFA,0x97,0xB3), \
+ rgb_t(0xFF,0xA8,0xC8), rgb_t(0xFF,0xB9,0xDE), rgb_t(0xFF,0xCA,0xEF), rgb_t(0xFF,0xDB,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x33,0x00,0x35), MAKE_RGB(0x44,0x00,0x41), MAKE_RGB(0x55,0x00,0x4C), MAKE_RGB(0x66,0x0C,0x5C), \
- MAKE_RGB(0x77,0x1D,0x6D), MAKE_RGB(0x88,0x2E,0x7E), MAKE_RGB(0x99,0x3F,0x8F), MAKE_RGB(0xAA,0x50,0xA0), \
- MAKE_RGB(0xBB,0x61,0xB1), MAKE_RGB(0xCC,0x72,0xC2), MAKE_RGB(0xDD,0x83,0xD3), MAKE_RGB(0xEE,0x94,0xE4), \
- MAKE_RGB(0xFF,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x33,0x00,0x35), rgb_t(0x44,0x00,0x41), rgb_t(0x55,0x00,0x4C), rgb_t(0x66,0x0C,0x5C), \
+ rgb_t(0x77,0x1D,0x6D), rgb_t(0x88,0x2E,0x7E), rgb_t(0x99,0x3F,0x8F), rgb_t(0xAA,0x50,0xA0), \
+ rgb_t(0xBB,0x61,0xB1), rgb_t(0xCC,0x72,0xC2), rgb_t(0xDD,0x83,0xD3), rgb_t(0xEE,0x94,0xE4), \
+ rgb_t(0xFF,0xA5,0xE4), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x1D,0x00,0x5C), MAKE_RGB(0x2E,0x00,0x68), MAKE_RGB(0x40,0x00,0x74), MAKE_RGB(0x51,0x10,0x84), \
- MAKE_RGB(0x62,0x21,0x95), MAKE_RGB(0x73,0x32,0xA6), MAKE_RGB(0x84,0x43,0xB7), MAKE_RGB(0x95,0x54,0xC8), \
- MAKE_RGB(0xA6,0x65,0xD9), MAKE_RGB(0xB7,0x76,0xEA), MAKE_RGB(0xC8,0x87,0xEB), MAKE_RGB(0xD9,0x98,0xEB), \
- MAKE_RGB(0xE9,0xA9,0xEC), MAKE_RGB(0xFB,0xBA,0xEB), MAKE_RGB(0xFF,0xCB,0xEF), MAKE_RGB(0xFF,0xDC,0xF4 )
+ rgb_t(0x1D,0x00,0x5C), rgb_t(0x2E,0x00,0x68), rgb_t(0x40,0x00,0x74), rgb_t(0x51,0x10,0x84), \
+ rgb_t(0x62,0x21,0x95), rgb_t(0x73,0x32,0xA6), rgb_t(0x84,0x43,0xB7), rgb_t(0x95,0x54,0xC8), \
+ rgb_t(0xA6,0x65,0xD9), rgb_t(0xB7,0x76,0xEA), rgb_t(0xC8,0x87,0xEB), rgb_t(0xD9,0x98,0xEB), \
+ rgb_t(0xE9,0xA9,0xEC), rgb_t(0xFB,0xBA,0xEB), rgb_t(0xFF,0xCB,0xEF), rgb_t(0xFF,0xDC,0xF4 )
define NTSC_BLUE1
- MAKE_RGB(0x02,0x00,0x71), MAKE_RGB(0x13,0x00,0x7D), MAKE_RGB(0x24,0x0B,0x8C), MAKE_RGB(0x35,0x1C,0x9D), \
- MAKE_RGB(0x46,0x2D,0xAE), MAKE_RGB(0x57,0x3E,0xBF), MAKE_RGB(0x68,0x4F,0xD0), MAKE_RGB(0x79,0x60,0xE1), \
- MAKE_RGB(0x8A,0x71,0xF2), MAKE_RGB(0x9B,0x82,0xF7), MAKE_RGB(0xAC,0x93,0xF7), MAKE_RGB(0xBD,0xA4,0xF7), \
- MAKE_RGB(0xCE,0xB5,0xF7), MAKE_RGB(0xDF,0xC6,0xF7), MAKE_RGB(0xF0,0xD7,0xF7), MAKE_RGB(0xFF,0xE8,0xF8 )
+ rgb_t(0x02,0x00,0x71), rgb_t(0x13,0x00,0x7D), rgb_t(0x24,0x0B,0x8C), rgb_t(0x35,0x1C,0x9D), \
+ rgb_t(0x46,0x2D,0xAE), rgb_t(0x57,0x3E,0xBF), rgb_t(0x68,0x4F,0xD0), rgb_t(0x79,0x60,0xE1), \
+ rgb_t(0x8A,0x71,0xF2), rgb_t(0x9B,0x82,0xF7), rgb_t(0xAC,0x93,0xF7), rgb_t(0xBD,0xA4,0xF7), \
+ rgb_t(0xCE,0xB5,0xF7), rgb_t(0xDF,0xC6,0xF7), rgb_t(0xF0,0xD7,0xF7), rgb_t(0xFF,0xE8,0xF8 )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x00,0x68), MAKE_RGB(0x00,0x0A,0x7C), MAKE_RGB(0x08,0x1B,0x90), MAKE_RGB(0x19,0x2C,0xA1), \
- MAKE_RGB(0x2A,0x3D,0xB2), MAKE_RGB(0x3B,0x4E,0xC3), MAKE_RGB(0x4C,0x5F,0xD4), MAKE_RGB(0x5D,0x70,0xE5), \
- MAKE_RGB(0x6E,0x81,0xF6), MAKE_RGB(0x7F,0x92,0xFF), MAKE_RGB(0x90,0xA3,0xFF), MAKE_RGB(0xA1,0xB4,0xFF), \
- MAKE_RGB(0xB2,0xC5,0xFF), MAKE_RGB(0xC3,0xD6,0xFF), MAKE_RGB(0xD4,0xE7,0xFF), MAKE_RGB(0xE5,0xF8,0xFF )
+ rgb_t(0x00,0x00,0x68), rgb_t(0x00,0x0A,0x7C), rgb_t(0x08,0x1B,0x90), rgb_t(0x19,0x2C,0xA1), \
+ rgb_t(0x2A,0x3D,0xB2), rgb_t(0x3B,0x4E,0xC3), rgb_t(0x4C,0x5F,0xD4), rgb_t(0x5D,0x70,0xE5), \
+ rgb_t(0x6E,0x81,0xF6), rgb_t(0x7F,0x92,0xFF), rgb_t(0x90,0xA3,0xFF), rgb_t(0xA1,0xB4,0xFF), \
+ rgb_t(0xB2,0xC5,0xFF), rgb_t(0xC3,0xD6,0xFF), rgb_t(0xD4,0xE7,0xFF), rgb_t(0xE5,0xF8,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x0A,0x4D), MAKE_RGB(0x00,0x1B,0x63), MAKE_RGB(0x00,0x2C,0x79), MAKE_RGB(0x02,0x3D,0x8F), \
- MAKE_RGB(0x13,0x4E,0xA0), MAKE_RGB(0x24,0x5F,0xB1), MAKE_RGB(0x35,0x70,0xC2), MAKE_RGB(0x46,0x81,0xD3), \
- MAKE_RGB(0x57,0x92,0xE4), MAKE_RGB(0x68,0xA3,0xF5), MAKE_RGB(0x79,0xB4,0xFF), MAKE_RGB(0x8A,0xC5,0xFF), \
- MAKE_RGB(0x9B,0xD6,0xFF), MAKE_RGB(0xAC,0xE7,0xFF), MAKE_RGB(0xBD,0xF8,0xFF), MAKE_RGB(0xCE,0xFF,0xFF )
+ rgb_t(0x00,0x0A,0x4D), rgb_t(0x00,0x1B,0x63), rgb_t(0x00,0x2C,0x79), rgb_t(0x02,0x3D,0x8F), \
+ rgb_t(0x13,0x4E,0xA0), rgb_t(0x24,0x5F,0xB1), rgb_t(0x35,0x70,0xC2), rgb_t(0x46,0x81,0xD3), \
+ rgb_t(0x57,0x92,0xE4), rgb_t(0x68,0xA3,0xF5), rgb_t(0x79,0xB4,0xFF), rgb_t(0x8A,0xC5,0xFF), \
+ rgb_t(0x9B,0xD6,0xFF), rgb_t(0xAC,0xE7,0xFF), rgb_t(0xBD,0xF8,0xFF), rgb_t(0xCE,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x1A,0x26), MAKE_RGB(0x00,0x2B,0x3C), MAKE_RGB(0x00,0x3C,0x52), MAKE_RGB(0x00,0x4D,0x68), \
- MAKE_RGB(0x06,0x5E,0x7C), MAKE_RGB(0x17,0x6F,0x8D), MAKE_RGB(0x28,0x80,0x9E), MAKE_RGB(0x39,0x91,0xAF), \
- MAKE_RGB(0x4A,0xA2,0xC0), MAKE_RGB(0x5B,0xB3,0xD1), MAKE_RGB(0x6C,0xC4,0xE2), MAKE_RGB(0x7D,0xD5,0xF3), \
- MAKE_RGB(0x8E,0xE6,0xFF), MAKE_RGB(0x9F,0xF7,0xFF), MAKE_RGB(0xB0,0xFF,0xFF), MAKE_RGB(0xC1,0xFF,0xFF )
+ rgb_t(0x00,0x1A,0x26), rgb_t(0x00,0x2B,0x3C), rgb_t(0x00,0x3C,0x52), rgb_t(0x00,0x4D,0x68), \
+ rgb_t(0x06,0x5E,0x7C), rgb_t(0x17,0x6F,0x8D), rgb_t(0x28,0x80,0x9E), rgb_t(0x39,0x91,0xAF), \
+ rgb_t(0x4A,0xA2,0xC0), rgb_t(0x5B,0xB3,0xD1), rgb_t(0x6C,0xC4,0xE2), rgb_t(0x7D,0xD5,0xF3), \
+ rgb_t(0x8E,0xE6,0xFF), rgb_t(0x9F,0xF7,0xFF), rgb_t(0xB0,0xFF,0xFF), rgb_t(0xC1,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x24,0x0B), MAKE_RGB(0x00,0x35,0x10), MAKE_RGB(0x00,0x46,0x22), MAKE_RGB(0x00,0x57,0x38), \
- MAKE_RGB(0x05,0x68,0x4D), MAKE_RGB(0x16,0x79,0x5E), MAKE_RGB(0x27,0x8A,0x6F), MAKE_RGB(0x38,0x9B,0x80), \
- MAKE_RGB(0x49,0xAC,0x91), MAKE_RGB(0x5A,0xBD,0xA2), MAKE_RGB(0x6B,0xCE,0xB3), MAKE_RGB(0x7C,0xDF,0xC4), \
- MAKE_RGB(0x8D,0xF0,0xD5), MAKE_RGB(0x9E,0xFF,0xE5), MAKE_RGB(0xAF,0xFF,0xF1), MAKE_RGB(0xC0,0xFF,0xFD )
+ rgb_t(0x00,0x24,0x0B), rgb_t(0x00,0x35,0x10), rgb_t(0x00,0x46,0x22), rgb_t(0x00,0x57,0x38), \
+ rgb_t(0x05,0x68,0x4D), rgb_t(0x16,0x79,0x5E), rgb_t(0x27,0x8A,0x6F), rgb_t(0x38,0x9B,0x80), \
+ rgb_t(0x49,0xAC,0x91), rgb_t(0x5A,0xBD,0xA2), rgb_t(0x6B,0xCE,0xB3), rgb_t(0x7C,0xDF,0xC4), \
+ rgb_t(0x8D,0xF0,0xD5), rgb_t(0x9E,0xFF,0xE5), rgb_t(0xAF,0xFF,0xF1), rgb_t(0xC0,0xFF,0xFD )
define NTSC_GREEN
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x00,0x5A,0x1B), \
- MAKE_RGB(0x10,0x6B,0x1B), MAKE_RGB(0x21,0x7C,0x2C), MAKE_RGB(0x32,0x8D,0x3D), MAKE_RGB(0x43,0x9E,0x4E), \
- MAKE_RGB(0x54,0xAF,0x5F), MAKE_RGB(0x65,0xC0,0x70), MAKE_RGB(0x76,0xD1,0x81), MAKE_RGB(0x87,0xE2,0x92), \
- MAKE_RGB(0x98,0xF3,0xA3), MAKE_RGB(0xA9,0xFF,0xB3), MAKE_RGB(0xBA,0xFF,0xBF), MAKE_RGB(0xCB,0xFF,0xCB )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1B), \
+ rgb_t(0x10,0x6B,0x1B), rgb_t(0x21,0x7C,0x2C), rgb_t(0x32,0x8D,0x3D), rgb_t(0x43,0x9E,0x4E), \
+ rgb_t(0x54,0xAF,0x5F), rgb_t(0x65,0xC0,0x70), rgb_t(0x76,0xD1,0x81), rgb_t(0x87,0xE2,0x92), \
+ rgb_t(0x98,0xF3,0xA3), rgb_t(0xA9,0xFF,0xB3), rgb_t(0xBA,0xFF,0xBF), rgb_t(0xCB,0xFF,0xCB )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x23,0x0A), MAKE_RGB(0x00,0x34,0x10), MAKE_RGB(0x04,0x45,0x13), MAKE_RGB(0x15,0x56,0x13), \
- MAKE_RGB(0x26,0x67,0x13), MAKE_RGB(0x37,0x78,0x13), MAKE_RGB(0x48,0x89,0x14), MAKE_RGB(0x59,0x9A,0x25), \
- MAKE_RGB(0x6A,0xAB,0x36), MAKE_RGB(0x7B,0xBC,0x47), MAKE_RGB(0x8C,0xCD,0x58), MAKE_RGB(0x9D,0xDE,0x69), \
- MAKE_RGB(0xAE,0xEF,0x7A), MAKE_RGB(0xBF,0xFF,0x8B), MAKE_RGB(0xD0,0xFF,0x97), MAKE_RGB(0xE1,0xFF,0xA3 )
+ rgb_t(0x00,0x23,0x0A), rgb_t(0x00,0x34,0x10), rgb_t(0x04,0x45,0x13), rgb_t(0x15,0x56,0x13), \
+ rgb_t(0x26,0x67,0x13), rgb_t(0x37,0x78,0x13), rgb_t(0x48,0x89,0x14), rgb_t(0x59,0x9A,0x25), \
+ rgb_t(0x6A,0xAB,0x36), rgb_t(0x7B,0xBC,0x47), rgb_t(0x8C,0xCD,0x58), rgb_t(0x9D,0xDE,0x69), \
+ rgb_t(0xAE,0xEF,0x7A), rgb_t(0xBF,0xFF,0x8B), rgb_t(0xD0,0xFF,0x97), rgb_t(0xE1,0xFF,0xA3 )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x00,0x17,0x07), MAKE_RGB(0x0E,0x28,0x08), MAKE_RGB(0x1F,0x39,0x08), MAKE_RGB(0x30,0x4A,0x08), \
- MAKE_RGB(0x41,0x5B,0x08), MAKE_RGB(0x52,0x6C,0x08), MAKE_RGB(0x63,0x7D,0x08), MAKE_RGB(0x74,0x8E,0x0D), \
- MAKE_RGB(0x85,0x9F,0x1E), MAKE_RGB(0x96,0xB0,0x2F), MAKE_RGB(0xA7,0xC1,0x40), MAKE_RGB(0xB8,0xD2,0x51), \
- MAKE_RGB(0xC9,0xE3,0x62), MAKE_RGB(0xDA,0xF4,0x73), MAKE_RGB(0xEB,0xFF,0x82), MAKE_RGB(0xFC,0xFF,0x8E )
+ rgb_t(0x00,0x17,0x07), rgb_t(0x0E,0x28,0x08), rgb_t(0x1F,0x39,0x08), rgb_t(0x30,0x4A,0x08), \
+ rgb_t(0x41,0x5B,0x08), rgb_t(0x52,0x6C,0x08), rgb_t(0x63,0x7D,0x08), rgb_t(0x74,0x8E,0x0D), \
+ rgb_t(0x85,0x9F,0x1E), rgb_t(0x96,0xB0,0x2F), rgb_t(0xA7,0xC1,0x40), rgb_t(0xB8,0xD2,0x51), \
+ rgb_t(0xC9,0xE3,0x62), rgb_t(0xDA,0xF4,0x73), rgb_t(0xEB,0xFF,0x82), rgb_t(0xFC,0xFF,0x8E )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x19,0x07,0x00), MAKE_RGB(0x2A,0x18,0x00), MAKE_RGB(0x3B,0x29,0x00), MAKE_RGB(0x4C,0x3A,0x00), \
- MAKE_RGB(0x5D,0x4B,0x00), MAKE_RGB(0x6E,0x5C,0x00), MAKE_RGB(0x7F,0x6D,0x00), MAKE_RGB(0x90,0x7E,0x09), \
- MAKE_RGB(0xA1,0x8F,0x1A), MAKE_RGB(0xB2,0xA0,0x2B), MAKE_RGB(0xC3,0xB1,0x3C), MAKE_RGB(0xD4,0xC2,0x4D), \
- MAKE_RGB(0xE5,0xD3,0x5E), MAKE_RGB(0xF6,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x82), MAKE_RGB(0xFF,0xFF,0x96 )
+ rgb_t(0x19,0x07,0x00), rgb_t(0x2A,0x18,0x00), rgb_t(0x3B,0x29,0x00), rgb_t(0x4C,0x3A,0x00), \
+ rgb_t(0x5D,0x4B,0x00), rgb_t(0x6E,0x5C,0x00), rgb_t(0x7F,0x6D,0x00), rgb_t(0x90,0x7E,0x09), \
+ rgb_t(0xA1,0x8F,0x1A), rgb_t(0xB2,0xA0,0x2B), rgb_t(0xC3,0xB1,0x3C), rgb_t(0xD4,0xC2,0x4D), \
+ rgb_t(0xE5,0xD3,0x5E), rgb_t(0xF6,0xE4,0x6F), rgb_t(0xFF,0xF5,0x82), rgb_t(0xFF,0xFF,0x96 )
***************************************************************************/
/***************************************************************************
@@ -667,100 +667,100 @@ define NTSC_LIGHT_ORANGE
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xFF,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xFF,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x32,0x00,0x00), MAKE_RGB(0x43,0x06,0x00), MAKE_RGB(0x54,0x17,0x00), MAKE_RGB(0x65,0x28,0x00), \
- MAKE_RGB(0x79,0x39,0x00), MAKE_RGB(0x87,0x4A,0x00), MAKE_RGB(0x98,0x5B,0x0C), MAKE_RGB(0xA9,0x6C,0x1D), \
- MAKE_RGB(0xBA,0x7D,0x2E), MAKE_RGB(0xCB,0x8E,0x3F), MAKE_RGB(0xDC,0x9F,0x50), MAKE_RGB(0xED,0xB0,0x61), \
- MAKE_RGB(0xFE,0xC1,0x72), MAKE_RGB(0xFF,0xD2,0x87), MAKE_RGB(0xFF,0xE3,0x9E), MAKE_RGB(0xFF,0xF4,0xB4 )
+ rgb_t(0x32,0x00,0x00), rgb_t(0x43,0x06,0x00), rgb_t(0x54,0x17,0x00), rgb_t(0x65,0x28,0x00), \
+ rgb_t(0x79,0x39,0x00), rgb_t(0x87,0x4A,0x00), rgb_t(0x98,0x5B,0x0C), rgb_t(0xA9,0x6C,0x1D), \
+ rgb_t(0xBA,0x7D,0x2E), rgb_t(0xCB,0x8E,0x3F), rgb_t(0xDC,0x9F,0x50), rgb_t(0xED,0xB0,0x61), \
+ rgb_t(0xFE,0xC1,0x72), rgb_t(0xFF,0xD2,0x87), rgb_t(0xFF,0xE3,0x9E), rgb_t(0xFF,0xF4,0xB4 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x07,0x00), MAKE_RGB(0x71,0x18,0x00), \
- MAKE_RGB(0x82,0x29,0x10), MAKE_RGB(0x93,0x3A,0x21), MAKE_RGB(0xA4,0x4B,0x32), MAKE_RGB(0xB5,0x5C,0x43), \
- MAKE_RGB(0xC6,0x6D,0x54), MAKE_RGB(0xD7,0x7E,0x65), MAKE_RGB(0xE8,0x8F,0x76), MAKE_RGB(0xF9,0xA0,0x87), \
- MAKE_RGB(0xFF,0xB1,0x9C), MAKE_RGB(0xFF,0xC2,0xB2), MAKE_RGB(0xFF,0xD3,0xC8), MAKE_RGB(0xFF,0xE4,0xDE )
+ rgb_t(0x3E,0x00,0x00), rgb_t(0x4F,0x00,0x00), rgb_t(0x60,0x07,0x00), rgb_t(0x71,0x18,0x00), \
+ rgb_t(0x82,0x29,0x10), rgb_t(0x93,0x3A,0x21), rgb_t(0xA4,0x4B,0x32), rgb_t(0xB5,0x5C,0x43), \
+ rgb_t(0xC6,0x6D,0x54), rgb_t(0xD7,0x7E,0x65), rgb_t(0xE8,0x8F,0x76), rgb_t(0xF9,0xA0,0x87), \
+ rgb_t(0xFF,0xB1,0x9C), rgb_t(0xFF,0xC2,0xB2), rgb_t(0xFF,0xD3,0xC8), rgb_t(0xFF,0xE4,0xDE )
define NTSC_PINK
- MAKE_RGB(0x3E,0x00,0x09), MAKE_RGB(0x4F,0x00,0x15), MAKE_RGB(0x60,0x00,0x21), MAKE_RGB(0x71,0x0E,0x31), \
- MAKE_RGB(0x82,0x1F,0x42), MAKE_RGB(0x93,0x30,0x53), MAKE_RGB(0xA4,0x41,0x64), MAKE_RGB(0xB5,0x52,0x75), \
- MAKE_RGB(0xC6,0x63,0x86), MAKE_RGB(0xD7,0x74,0x97), MAKE_RGB(0xE8,0x85,0xA8), MAKE_RGB(0xF9,0x96,0xB9), \
- MAKE_RGB(0xFF,0xA7,0xCE), MAKE_RGB(0xFF,0xB8,0xE4), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 )
+ rgb_t(0x3E,0x00,0x09), rgb_t(0x4F,0x00,0x15), rgb_t(0x60,0x00,0x21), rgb_t(0x71,0x0E,0x31), \
+ rgb_t(0x82,0x1F,0x42), rgb_t(0x93,0x30,0x53), rgb_t(0xA4,0x41,0x64), rgb_t(0xB5,0x52,0x75), \
+ rgb_t(0xC6,0x63,0x86), rgb_t(0xD7,0x74,0x97), rgb_t(0xE8,0x85,0xA8), rgb_t(0xF9,0x96,0xB9), \
+ rgb_t(0xFF,0xA7,0xCE), rgb_t(0xFF,0xB8,0xE4), rgb_t(0xFF,0xC9,0xEF), rgb_t(0xFF,0xDA,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x30,0x00,0x3D), MAKE_RGB(0x41,0x00,0x48), MAKE_RGB(0x52,0x00,0x54), MAKE_RGB(0x63,0x0C,0x64), \
- MAKE_RGB(0x74,0x1D,0x75), MAKE_RGB(0x85,0x2E,0x86), MAKE_RGB(0x96,0x3F,0x97), MAKE_RGB(0xA7,0x50,0xA8), \
- MAKE_RGB(0xB8,0x61,0xB9), MAKE_RGB(0xC9,0x72,0xCA), MAKE_RGB(0xDA,0x83,0xDB), MAKE_RGB(0xEB,0x94,0xE5), \
- MAKE_RGB(0xFC,0xA5,0xE5), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x30,0x00,0x3D), rgb_t(0x41,0x00,0x48), rgb_t(0x52,0x00,0x54), rgb_t(0x63,0x0C,0x64), \
+ rgb_t(0x74,0x1D,0x75), rgb_t(0x85,0x2E,0x86), rgb_t(0x96,0x3F,0x97), rgb_t(0xA7,0x50,0xA8), \
+ rgb_t(0xB8,0x61,0xB9), rgb_t(0xC9,0x72,0xCA), rgb_t(0xDA,0x83,0xDB), rgb_t(0xEB,0x94,0xE5), \
+ rgb_t(0xFC,0xA5,0xE5), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x18,0x00,0x62), MAKE_RGB(0x29,0x00,0x6E), MAKE_RGB(0x3A,0x01,0x7A), MAKE_RGB(0x4B,0x12,0x8B), \
- MAKE_RGB(0x5C,0x23,0x9C), MAKE_RGB(0x6D,0x34,0xAD), MAKE_RGB(0x7E,0x45,0xBE), MAKE_RGB(0x8F,0x56,0xCF), \
- MAKE_RGB(0xA0,0x67,0xE0), MAKE_RGB(0xB1,0x78,0xEE), MAKE_RGB(0xC2,0x89,0xEE), MAKE_RGB(0xD3,0x9A,0xEE), \
- MAKE_RGB(0xE4,0xAB,0xEE), MAKE_RGB(0xF5,0xBC,0xEE), MAKE_RGB(0xFF,0xCD,0xE0), MAKE_RGB(0xFF,0xDE,0xF5 )
+ rgb_t(0x18,0x00,0x62), rgb_t(0x29,0x00,0x6E), rgb_t(0x3A,0x01,0x7A), rgb_t(0x4B,0x12,0x8B), \
+ rgb_t(0x5C,0x23,0x9C), rgb_t(0x6D,0x34,0xAD), rgb_t(0x7E,0x45,0xBE), rgb_t(0x8F,0x56,0xCF), \
+ rgb_t(0xA0,0x67,0xE0), rgb_t(0xB1,0x78,0xEE), rgb_t(0xC2,0x89,0xEE), rgb_t(0xD3,0x9A,0xEE), \
+ rgb_t(0xE4,0xAB,0xEE), rgb_t(0xF5,0xBC,0xEE), rgb_t(0xFF,0xCD,0xE0), rgb_t(0xFF,0xDE,0xF5 )
define NTSC_BLUE1
- MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x0C,0x00,0x7F), MAKE_RGB(0x1D,0x0E,0x8F), MAKE_RGB(0x2E,0x1F,0xA0), \
- MAKE_RGB(0x3F,0x30,0xB1), MAKE_RGB(0x50,0x41,0xC2), MAKE_RGB(0x61,0x52,0xD3), MAKE_RGB(0x72,0x63,0xE4), \
- MAKE_RGB(0x83,0x74,0xF5), MAKE_RGB(0x94,0x85,0xFA), MAKE_RGB(0xA5,0x96,0xFA), MAKE_RGB(0xB6,0xA7,0xFA), \
- MAKE_RGB(0xC7,0xB8,0xFA), MAKE_RGB(0xD8,0xC9,0xFA), MAKE_RGB(0xE9,0xDA,0xFA), MAKE_RGB(0xFA,0xE8,0xFA )
+ rgb_t(0x00,0x00,0x72), rgb_t(0x0C,0x00,0x7F), rgb_t(0x1D,0x0E,0x8F), rgb_t(0x2E,0x1F,0xA0), \
+ rgb_t(0x3F,0x30,0xB1), rgb_t(0x50,0x41,0xC2), rgb_t(0x61,0x52,0xD3), rgb_t(0x72,0x63,0xE4), \
+ rgb_t(0x83,0x74,0xF5), rgb_t(0x94,0x85,0xFA), rgb_t(0xA5,0x96,0xFA), rgb_t(0xB6,0xA7,0xFA), \
+ rgb_t(0xC7,0xB8,0xFA), rgb_t(0xD8,0xC9,0xFA), rgb_t(0xE9,0xDA,0xFA), rgb_t(0xFA,0xE8,0xFA )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x00,0x62), MAKE_RGB(0x00,0x0F,0x77), MAKE_RGB(0x01,0x20,0x8D), MAKE_RGB(0x12,0x31,0x9E), \
- MAKE_RGB(0x23,0x42,0xAF), MAKE_RGB(0x34,0x53,0xC0), MAKE_RGB(0x45,0x64,0xD1), MAKE_RGB(0x56,0x75,0xE2), \
- MAKE_RGB(0x67,0x86,0xF3), MAKE_RGB(0x78,0x97,0xFF), MAKE_RGB(0x89,0xA8,0xFF), MAKE_RGB(0x9A,0xB9,0xFF), \
- MAKE_RGB(0xAB,0xCA,0xFF), MAKE_RGB(0xBC,0xDB,0xFF), MAKE_RGB(0xCD,0xEC,0xFF), MAKE_RGB(0xDE,0xFD,0xFF )
+ rgb_t(0x00,0x00,0x62), rgb_t(0x00,0x0F,0x77), rgb_t(0x01,0x20,0x8D), rgb_t(0x12,0x31,0x9E), \
+ rgb_t(0x23,0x42,0xAF), rgb_t(0x34,0x53,0xC0), rgb_t(0x45,0x64,0xD1), rgb_t(0x56,0x75,0xE2), \
+ rgb_t(0x67,0x86,0xF3), rgb_t(0x78,0x97,0xFF), rgb_t(0x89,0xA8,0xFF), rgb_t(0x9A,0xB9,0xFF), \
+ rgb_t(0xAB,0xCA,0xFF), rgb_t(0xBC,0xDB,0xFF), rgb_t(0xCD,0xEC,0xFF), rgb_t(0xDE,0xFD,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x10,0x42), MAKE_RGB(0x00,0x21,0x58), MAKE_RGB(0x00,0x32,0x6E), MAKE_RGB(0x00,0x43,0x84), \
- MAKE_RGB(0x0E,0x54,0x96), MAKE_RGB(0x1F,0x65,0xA7), MAKE_RGB(0x30,0x76,0xB8), MAKE_RGB(0x41,0x87,0xC9), \
- MAKE_RGB(0x52,0x98,0xDA), MAKE_RGB(0x63,0xA9,0xEB), MAKE_RGB(0x74,0xBA,0xFC), MAKE_RGB(0x85,0xCB,0xFF), \
- MAKE_RGB(0x96,0xDC,0xFF), MAKE_RGB(0xA7,0xED,0xFF), MAKE_RGB(0xB8,0xFE,0xFF), MAKE_RGB(0xC9,0xFF,0xFF )
+ rgb_t(0x00,0x10,0x42), rgb_t(0x00,0x21,0x58), rgb_t(0x00,0x32,0x6E), rgb_t(0x00,0x43,0x84), \
+ rgb_t(0x0E,0x54,0x96), rgb_t(0x1F,0x65,0xA7), rgb_t(0x30,0x76,0xB8), rgb_t(0x41,0x87,0xC9), \
+ rgb_t(0x52,0x98,0xDA), rgb_t(0x63,0xA9,0xEB), rgb_t(0x74,0xBA,0xFC), rgb_t(0x85,0xCB,0xFF), \
+ rgb_t(0x96,0xDC,0xFF), rgb_t(0xA7,0xED,0xFF), rgb_t(0xB8,0xFE,0xFF), rgb_t(0xC9,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x1E,0x14), MAKE_RGB(0x00,0x2F,0x2A), MAKE_RGB(0x00,0x40,0x40), MAKE_RGB(0x00,0x51,0x56), \
- MAKE_RGB(0x04,0x62,0x6B), MAKE_RGB(0x15,0x73,0x7C), MAKE_RGB(0x26,0x84,0x8D), MAKE_RGB(0x37,0x95,0x9E), \
- MAKE_RGB(0x48,0xA6,0xAF), MAKE_RGB(0x59,0xB7,0xC0), MAKE_RGB(0x6A,0xC8,0xD1), MAKE_RGB(0x7B,0xD9,0xE2), \
- MAKE_RGB(0x8C,0xEA,0xF3), MAKE_RGB(0x9D,0xFB,0xFF), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF )
+ rgb_t(0x00,0x1E,0x14), rgb_t(0x00,0x2F,0x2A), rgb_t(0x00,0x40,0x40), rgb_t(0x00,0x51,0x56), \
+ rgb_t(0x04,0x62,0x6B), rgb_t(0x15,0x73,0x7C), rgb_t(0x26,0x84,0x8D), rgb_t(0x37,0x95,0x9E), \
+ rgb_t(0x48,0xA6,0xAF), rgb_t(0x59,0xB7,0xC0), rgb_t(0x6A,0xC8,0xD1), rgb_t(0x7B,0xD9,0xE2), \
+ rgb_t(0x8C,0xEA,0xF3), rgb_t(0x9D,0xFB,0xFF), rgb_t(0xAE,0xFF,0xFF), rgb_t(0xBF,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x00,0x59,0x25), \
- MAKE_RGB(0x08,0x6A,0x38), MAKE_RGB(0x19,0x7B,0x49), MAKE_RGB(0x2A,0x8C,0x5A), MAKE_RGB(0x3B,0x9D,0x6B), \
- MAKE_RGB(0x4C,0xAE,0x7C), MAKE_RGB(0x5D,0xBF,0x8D), MAKE_RGB(0x6E,0xD0,0x9E), MAKE_RGB(0x7F,0xE1,0xAF), \
- MAKE_RGB(0x90,0xF2,0xC0), MAKE_RGB(0xA1,0xFF,0xD0), MAKE_RGB(0xB2,0xFF,0xDC), MAKE_RGB(0xC3,0xFF,0xE8 )
+ rgb_t(0x00,0x26,0x0B), rgb_t(0x00,0x37,0x10), rgb_t(0x00,0x48,0x16), rgb_t(0x00,0x59,0x25), \
+ rgb_t(0x08,0x6A,0x38), rgb_t(0x19,0x7B,0x49), rgb_t(0x2A,0x8C,0x5A), rgb_t(0x3B,0x9D,0x6B), \
+ rgb_t(0x4C,0xAE,0x7C), rgb_t(0x5D,0xBF,0x8D), rgb_t(0x6E,0xD0,0x9E), rgb_t(0x7F,0xE1,0xAF), \
+ rgb_t(0x90,0xF2,0xC0), rgb_t(0xA1,0xFF,0xD0), rgb_t(0xB2,0xFF,0xDC), rgb_t(0xC3,0xFF,0xE8 )
define NTSC_GREEN
- MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x08,0x59,0x18), \
- MAKE_RGB(0x19,0x6A,0x18), MAKE_RGB(0x2A,0x7B,0x18), MAKE_RGB(0x3B,0x8C,0x29), MAKE_RGB(0x4C,0x9D,0x3A), \
- MAKE_RGB(0x5D,0xAE,0x4B), MAKE_RGB(0x6E,0xBF,0x5C), MAKE_RGB(0x7F,0xD0,0x6D), MAKE_RGB(0x90,0xE1,0x7E), \
- MAKE_RGB(0xA1,0xF2,0x8F), MAKE_RGB(0xB2,0xFF,0x9F), MAKE_RGB(0xC3,0xFF,0xAB), MAKE_RGB(0xD4,0xFF,0xB7 )
+ rgb_t(0x00,0x26,0x0B), rgb_t(0x00,0x37,0x10), rgb_t(0x00,0x48,0x16), rgb_t(0x08,0x59,0x18), \
+ rgb_t(0x19,0x6A,0x18), rgb_t(0x2A,0x7B,0x18), rgb_t(0x3B,0x8C,0x29), rgb_t(0x4C,0x9D,0x3A), \
+ rgb_t(0x5D,0xAE,0x4B), rgb_t(0x6E,0xBF,0x5C), rgb_t(0x7F,0xD0,0x6D), rgb_t(0x90,0xE1,0x7E), \
+ rgb_t(0xA1,0xF2,0x8F), rgb_t(0xB2,0xFF,0x9F), rgb_t(0xC3,0xFF,0xAB), rgb_t(0xD4,0xFF,0xB7 )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x1E,0x09), MAKE_RGB(0x00,0x2F,0x0E), MAKE_RGB(0x11,0x40,0x0E), MAKE_RGB(0x22,0x51,0x0E), \
- MAKE_RGB(0x33,0x62,0x0E), MAKE_RGB(0x44,0x73,0x0E), MAKE_RGB(0x55,0x84,0x0E), MAKE_RGB(0x66,0x95,0x17), \
- MAKE_RGB(0x77,0xA6,0x28), MAKE_RGB(0x88,0xB7,0x39), MAKE_RGB(0x99,0xC8,0x4A), MAKE_RGB(0xAA,0xD9,0x5B), \
- MAKE_RGB(0xBB,0xEA,0x6C), MAKE_RGB(0xCC,0xFB,0x7D), MAKE_RGB(0xDD,0xFF,0x8A), MAKE_RGB(0xEE,0xFF,0x96 )
+ rgb_t(0x00,0x1E,0x09), rgb_t(0x00,0x2F,0x0E), rgb_t(0x11,0x40,0x0E), rgb_t(0x22,0x51,0x0E), \
+ rgb_t(0x33,0x62,0x0E), rgb_t(0x44,0x73,0x0E), rgb_t(0x55,0x84,0x0E), rgb_t(0x66,0x95,0x17), \
+ rgb_t(0x77,0xA6,0x28), rgb_t(0x88,0xB7,0x39), rgb_t(0x99,0xC8,0x4A), rgb_t(0xAA,0xD9,0x5B), \
+ rgb_t(0xBB,0xEA,0x6C), rgb_t(0xCC,0xFB,0x7D), rgb_t(0xDD,0xFF,0x8A), rgb_t(0xEE,0xFF,0x96 )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x0D,0x0F,0x01), MAKE_RGB(0x1E,0x20,0x01), MAKE_RGB(0x2F,0x31,0x01), MAKE_RGB(0x40,0x42,0x01), \
- MAKE_RGB(0x51,0x53,0x01), MAKE_RGB(0x62,0x64,0x01), MAKE_RGB(0x73,0x75,0x01), MAKE_RGB(0x84,0x86,0x08), \
- MAKE_RGB(0x95,0x97,0x19), MAKE_RGB(0xA6,0xA8,0x2A), MAKE_RGB(0xB7,0xB9,0x3B), MAKE_RGB(0xC8,0xCA,0x4C), \
- MAKE_RGB(0xD9,0xDB,0x5D), MAKE_RGB(0xEA,0xEC,0x6E), MAKE_RGB(0xFB,0xFD,0x7F), MAKE_RGB(0xFF,0xFF,0x8F )
+ rgb_t(0x0D,0x0F,0x01), rgb_t(0x1E,0x20,0x01), rgb_t(0x2F,0x31,0x01), rgb_t(0x40,0x42,0x01), \
+ rgb_t(0x51,0x53,0x01), rgb_t(0x62,0x64,0x01), rgb_t(0x73,0x75,0x01), rgb_t(0x84,0x86,0x08), \
+ rgb_t(0x95,0x97,0x19), rgb_t(0xA6,0xA8,0x2A), rgb_t(0xB7,0xB9,0x3B), rgb_t(0xC8,0xCA,0x4C), \
+ rgb_t(0xD9,0xDB,0x5D), rgb_t(0xEA,0xEC,0x6E), rgb_t(0xFB,0xFD,0x7F), rgb_t(0xFF,0xFF,0x8F )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x28,0x00,0x00), MAKE_RGB(0x39,0x0E,0x00), MAKE_RGB(0x4A,0x1F,0x00), MAKE_RGB(0x5B,0x30,0x00), \
- MAKE_RGB(0x6C,0x41,0x00), MAKE_RGB(0x7D,0x52,0x00), MAKE_RGB(0x8E,0x63,0x00), MAKE_RGB(0x9F,0x74,0x10), \
- MAKE_RGB(0xB0,0x85,0x21), MAKE_RGB(0xC1,0x96,0x32), MAKE_RGB(0xD2,0xA7,0x43), MAKE_RGB(0xE3,0xB8,0x54), \
- MAKE_RGB(0xF4,0xC9,0x65), MAKE_RGB(0xFF,0xDA,0x78), MAKE_RGB(0xFF,0xEB,0x8E), MAKE_RGB(0xFF,0xFC,0xA4 )
+ rgb_t(0x28,0x00,0x00), rgb_t(0x39,0x0E,0x00), rgb_t(0x4A,0x1F,0x00), rgb_t(0x5B,0x30,0x00), \
+ rgb_t(0x6C,0x41,0x00), rgb_t(0x7D,0x52,0x00), rgb_t(0x8E,0x63,0x00), rgb_t(0x9F,0x74,0x10), \
+ rgb_t(0xB0,0x85,0x21), rgb_t(0xC1,0x96,0x32), rgb_t(0xD2,0xA7,0x43), rgb_t(0xE3,0xB8,0x54), \
+ rgb_t(0xF4,0xC9,0x65), rgb_t(0xFF,0xDA,0x78), rgb_t(0xFF,0xEB,0x8E), rgb_t(0xFF,0xFC,0xA4 )
***************************************************************************/
@@ -769,100 +769,100 @@ define NTSC_LIGHT_ORANGE
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xF7,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x32,0x00,0x00), MAKE_RGB(0x43,0x05,0x00), MAKE_RGB(0x54,0x16,0x00), MAKE_RGB(0x65,0x27,0x00), \
- MAKE_RGB(0x76,0x38,0x00), MAKE_RGB(0x87,0X49,0x00), MAKE_RGB(0x98,0x5A,0x0C), MAKE_RGB(0xA9,0x6B,0x1D), \
- MAKE_RGB(0xBA,0x7C,0x2E), MAKE_RGB(0xCB,0x8D,0x3F), MAKE_RGB(0xDC,0x9E,0x50), MAKE_RGB(0xED,0xAF,0x61), \
- MAKE_RGB(0xFE,0xC0,0x72), MAKE_RGB(0xFF,0xD1,0x88), MAKE_RGB(0xFF,0xE2,0x9E), MAKE_RGB(0xFF,0xF3,0xB4 )
+ rgb_t(0x32,0x00,0x00), rgb_t(0x43,0x05,0x00), rgb_t(0x54,0x16,0x00), rgb_t(0x65,0x27,0x00), \
+ rgb_t(0x76,0x38,0x00), rgb_t(0x87,0X49,0x00), rgb_t(0x98,0x5A,0x0C), rgb_t(0xA9,0x6B,0x1D), \
+ rgb_t(0xBA,0x7C,0x2E), rgb_t(0xCB,0x8D,0x3F), rgb_t(0xDC,0x9E,0x50), rgb_t(0xED,0xAF,0x61), \
+ rgb_t(0xFE,0xC0,0x72), rgb_t(0xFF,0xD1,0x88), rgb_t(0xFF,0xE2,0x9E), rgb_t(0xFF,0xF3,0xB4 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3F,0x00,0x00), MAKE_RGB(0x50,0x00,0x00), MAKE_RGB(0x61,0x07,0x00), MAKE_RGB(0x72,0x18,0x01), \
- MAKE_RGB(0x83,0x29,0x12), MAKE_RGB(0x94,0x3A,0x23), MAKE_RGB(0xA5,0x4B,0x34), MAKE_RGB(0xB6,0x5C,0x45), \
- MAKE_RGB(0xC7,0x6D,0x56), MAKE_RGB(0xD8,0x7E,0x67), MAKE_RGB(0xE9,0x8F,0x78), MAKE_RGB(0xFA,0xA0,0x89), \
- MAKE_RGB(0xFF,0xB1,0x9E), MAKE_RGB(0xFF,0xC2,0xB4), MAKE_RGB(0xFF,0xD3,0xCA), MAKE_RGB(0xFF,0xE4,0xE0 )
+ rgb_t(0x3F,0x00,0x00), rgb_t(0x50,0x00,0x00), rgb_t(0x61,0x07,0x00), rgb_t(0x72,0x18,0x01), \
+ rgb_t(0x83,0x29,0x12), rgb_t(0x94,0x3A,0x23), rgb_t(0xA5,0x4B,0x34), rgb_t(0xB6,0x5C,0x45), \
+ rgb_t(0xC7,0x6D,0x56), rgb_t(0xD8,0x7E,0x67), rgb_t(0xE9,0x8F,0x78), rgb_t(0xFA,0xA0,0x89), \
+ rgb_t(0xFF,0xB1,0x9E), rgb_t(0xFF,0xC2,0xB4), rgb_t(0xFF,0xD3,0xCA), rgb_t(0xFF,0xE4,0xE0 )
define NTSC_PINK
- MAKE_RGB(0x3E,0x00,0x0C), MAKE_RGB(0x4F,0x00,0x18), MAKE_RGB(0x60,0x00,0x24), MAKE_RGB(0x71,0x0E,0x34), \
- MAKE_RGB(0x82,0x1F,0x45), MAKE_RGB(0x93,0x30,0x56), MAKE_RGB(0xA4,0x41,0x67), MAKE_RGB(0xB5,0x52,0x78), \
- MAKE_RGB(0xC6,0x63,0x89), MAKE_RGB(0xD7,0x74,0x9A), MAKE_RGB(0xE8,0x85,0xAB), MAKE_RGB(0xF9,0x96,0xB6), \
- MAKE_RGB(0xFF,0xA7,0xD1), MAKE_RGB(0xFF,0xB8,0xE7), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 )
+ rgb_t(0x3E,0x00,0x0C), rgb_t(0x4F,0x00,0x18), rgb_t(0x60,0x00,0x24), rgb_t(0x71,0x0E,0x34), \
+ rgb_t(0x82,0x1F,0x45), rgb_t(0x93,0x30,0x56), rgb_t(0xA4,0x41,0x67), rgb_t(0xB5,0x52,0x78), \
+ rgb_t(0xC6,0x63,0x89), rgb_t(0xD7,0x74,0x9A), rgb_t(0xE8,0x85,0xAB), rgb_t(0xF9,0x96,0xB6), \
+ rgb_t(0xFF,0xA7,0xD1), rgb_t(0xFF,0xB8,0xE7), rgb_t(0xFF,0xC9,0xEF), rgb_t(0xFF,0xDA,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x2F,0x00,0x3F), MAKE_RGB(0x40,0x00,0x4B), MAKE_RGB(0x51,0x00,0x57), MAKE_RGB(0x62,0x0C,0x66), \
- MAKE_RGB(0x73,0x1D,0x77), MAKE_RGB(0x84,0x2E,0x88), MAKE_RGB(0x95,0x3F,0x99), MAKE_RGB(0xA6,0x50,0xAA), \
- MAKE_RGB(0xB7,0x61,0xBB), MAKE_RGB(0xC8,0x72,0xCC), MAKE_RGB(0xD9,0x83,0xDD), MAKE_RGB(0xEA,0x94,0xE5), \
- MAKE_RGB(0xFB,0xA5,0xE5), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x2F,0x00,0x3F), rgb_t(0x40,0x00,0x4B), rgb_t(0x51,0x00,0x57), rgb_t(0x62,0x0C,0x66), \
+ rgb_t(0x73,0x1D,0x77), rgb_t(0x84,0x2E,0x88), rgb_t(0x95,0x3F,0x99), rgb_t(0xA6,0x50,0xAA), \
+ rgb_t(0xB7,0x61,0xBB), rgb_t(0xC8,0x72,0xCC), rgb_t(0xD9,0x83,0xDD), rgb_t(0xEA,0x94,0xE5), \
+ rgb_t(0xFB,0xA5,0xE5), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x16,0x00,0x64), MAKE_RGB(0x27,0x00,0x70), MAKE_RGB(0x38,0x02,0x7D), MAKE_RGB(0x49,0x13,0x8E), \
- MAKE_RGB(0x5A,0x24,0x9F), MAKE_RGB(0x6B,0x35,0xB0), MAKE_RGB(0x7C,0x46,0xC1), MAKE_RGB(0x8D,0x57,0xD2), \
- MAKE_RGB(0x9E,0x68,0xE3), MAKE_RGB(0xAF,0x79,0xEF), MAKE_RGB(0xC0,0x8A,0xEF), MAKE_RGB(0xD1,0x9D,0xEF), \
- MAKE_RGB(0xE2,0xAC,0xEF), MAKE_RGB(0xF3,0xBD,0xEF), MAKE_RGB(0xFF,0xCE,0xF0), MAKE_RGB(0xFF,0xDF,0xF5 )
+ rgb_t(0x16,0x00,0x64), rgb_t(0x27,0x00,0x70), rgb_t(0x38,0x02,0x7D), rgb_t(0x49,0x13,0x8E), \
+ rgb_t(0x5A,0x24,0x9F), rgb_t(0x6B,0x35,0xB0), rgb_t(0x7C,0x46,0xC1), rgb_t(0x8D,0x57,0xD2), \
+ rgb_t(0x9E,0x68,0xE3), rgb_t(0xAF,0x79,0xEF), rgb_t(0xC0,0x8A,0xEF), rgb_t(0xD1,0x9D,0xEF), \
+ rgb_t(0xE2,0xAC,0xEF), rgb_t(0xF3,0xBD,0xEF), rgb_t(0xFF,0xCE,0xF0), rgb_t(0xFF,0xDF,0xF5 )
define NTSC_BLUE1
- MAKE_RGB(0x00,0x00,0x71), MAKE_RGB(0x09,0x00,0x7F), MAKE_RGB(0x1A,0x10,0x90), MAKE_RGB(0x2B,0x21,0xA1), \
- MAKE_RGB(0x3C,0x32,0xB2), MAKE_RGB(0x4D,0x43,0xC3), MAKE_RGB(0x5E,0x54,0xD4), MAKE_RGB(0x6F,0x65,0xE5), \
- MAKE_RGB(0x80,0x76,0xF6), MAKE_RGB(0x91,0x87,0xFC), MAKE_RGB(0xA2,0x98,0xFC), MAKE_RGB(0xB3,0xA9,0xFC), \
- MAKE_RGB(0xC4,0xBA,0xFC), MAKE_RGB(0xD5,0xCB,0xFC), MAKE_RGB(0xE6,0xDC,0xFC), MAKE_RGB(0xF7,0xED,0xFC )
+ rgb_t(0x00,0x00,0x71), rgb_t(0x09,0x00,0x7F), rgb_t(0x1A,0x10,0x90), rgb_t(0x2B,0x21,0xA1), \
+ rgb_t(0x3C,0x32,0xB2), rgb_t(0x4D,0x43,0xC3), rgb_t(0x5E,0x54,0xD4), rgb_t(0x6F,0x65,0xE5), \
+ rgb_t(0x80,0x76,0xF6), rgb_t(0x91,0x87,0xFC), rgb_t(0xA2,0x98,0xFC), rgb_t(0xB3,0xA9,0xFC), \
+ rgb_t(0xC4,0xBA,0xFC), rgb_t(0xD5,0xCB,0xFC), rgb_t(0xE6,0xDC,0xFC), rgb_t(0xF7,0xED,0xFC )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x00,0x5E), MAKE_RGB(0x00,0x11,0x74), MAKE_RGB(0x00,0x22,0x8A), MAKE_RGB(0x0F,0x33,0x9C), \
- MAKE_RGB(0x20,0x44,0xAD), MAKE_RGB(0x31,0x55,0xBE), MAKE_RGB(0x42,0x66,0xCF), MAKE_RGB(0x53,0x77,0xE0), \
- MAKE_RGB(0x64,0x88,0xF1), MAKE_RGB(0x75,0x99,0xFF), MAKE_RGB(0x86,0xAA,0xFF), MAKE_RGB(0x97,0xBB,0xFF), \
- MAKE_RGB(0xA8,0xCC,0xFF), MAKE_RGB(0xB9,0xDD,0xFF), MAKE_RGB(0xCA,0xEE,0xFF), MAKE_RGB(0xDB,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x5E), rgb_t(0x00,0x11,0x74), rgb_t(0x00,0x22,0x8A), rgb_t(0x0F,0x33,0x9C), \
+ rgb_t(0x20,0x44,0xAD), rgb_t(0x31,0x55,0xBE), rgb_t(0x42,0x66,0xCF), rgb_t(0x53,0x77,0xE0), \
+ rgb_t(0x64,0x88,0xF1), rgb_t(0x75,0x99,0xFF), rgb_t(0x86,0xAA,0xFF), rgb_t(0x97,0xBB,0xFF), \
+ rgb_t(0xA8,0xCC,0xFF), rgb_t(0xB9,0xDD,0xFF), rgb_t(0xCA,0xEE,0xFF), rgb_t(0xDB,0xFF,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x12,0x3B), MAKE_RGB(0x00,0x23,0x51), MAKE_RGB(0x00,0x34,0x68), MAKE_RGB(0x00,0x45,0x7E), \
- MAKE_RGB(0x0C,0x56,0x90), MAKE_RGB(0x1D,0x67,0xA1), MAKE_RGB(0x2E,0x78,0xB2), MAKE_RGB(0x3F,0x89,0xC3), \
- MAKE_RGB(0x50,0x9A,0xD4), MAKE_RGB(0x61,0xAB,0xE5), MAKE_RGB(0x72,0xBC,0xF6), MAKE_RGB(0x83,0xCD,0xFF), \
- MAKE_RGB(0x94,0xDE,0xFF), MAKE_RGB(0xA5,0xEF,0xFF), MAKE_RGB(0xB6,0xFF,0xFF), MAKE_RGB(0xC7,0xFF,0xFF )
+ rgb_t(0x00,0x12,0x3B), rgb_t(0x00,0x23,0x51), rgb_t(0x00,0x34,0x68), rgb_t(0x00,0x45,0x7E), \
+ rgb_t(0x0C,0x56,0x90), rgb_t(0x1D,0x67,0xA1), rgb_t(0x2E,0x78,0xB2), rgb_t(0x3F,0x89,0xC3), \
+ rgb_t(0x50,0x9A,0xD4), rgb_t(0x61,0xAB,0xE5), rgb_t(0x72,0xBC,0xF6), rgb_t(0x83,0xCD,0xFF), \
+ rgb_t(0x94,0xDE,0xFF), rgb_t(0xA5,0xEF,0xFF), rgb_t(0xB6,0xFF,0xFF), rgb_t(0xC7,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x20,0x0C), MAKE_RGB(0x00,0x31,0x22), MAKE_RGB(0x00,0x42,0x38), MAKE_RGB(0x00,0x53,0x4E), \
- MAKE_RGB(0x04,0x64,0x63), MAKE_RGB(0x15,0x75,0x74), MAKE_RGB(0x26,0x86,0x85), MAKE_RGB(0x37,0x97,0x96), \
- MAKE_RGB(0x48,0xA8,0xA7), MAKE_RGB(0x59,0xB9,0xB8), MAKE_RGB(0x6A,0xCA,0xC9), MAKE_RGB(0x7B,0xDB,0xDA), \
- MAKE_RGB(0x8C,0xEC,0xEB), MAKE_RGB(0x9D,0xFD,0xFC), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF )
+ rgb_t(0x00,0x20,0x0C), rgb_t(0x00,0x31,0x22), rgb_t(0x00,0x42,0x38), rgb_t(0x00,0x53,0x4E), \
+ rgb_t(0x04,0x64,0x63), rgb_t(0x15,0x75,0x74), rgb_t(0x26,0x86,0x85), rgb_t(0x37,0x97,0x96), \
+ rgb_t(0x48,0xA8,0xA7), rgb_t(0x59,0xB9,0xB8), rgb_t(0x6A,0xCA,0xC9), rgb_t(0x7B,0xDB,0xDA), \
+ rgb_t(0x8C,0xEC,0xEB), rgb_t(0x9D,0xFD,0xFC), rgb_t(0xAE,0xFF,0xFF), rgb_t(0xBF,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x00,0x5A,0x1C), \
- MAKE_RGB(0x0B,0x6B,0x2F), MAKE_RGB(0x1C,0x7C,0x40), MAKE_RGB(0x2D,0x8D,0x51), MAKE_RGB(0x3E,0x9E,0x62), \
- MAKE_RGB(0x4F,0xAF,0x73), MAKE_RGB(0x60,0xC0,0x84), MAKE_RGB(0x71,0xD1,0x95), MAKE_RGB(0x82,0xE2,0xA6), \
- MAKE_RGB(0x93,0xF3,0xB7), MAKE_RGB(0xA4,0xFF,0xC6), MAKE_RGB(0xB5,0xFF,0xD2), MAKE_RGB(0xC6,0xFF,0xDE )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1C), \
+ rgb_t(0x0B,0x6B,0x2F), rgb_t(0x1C,0x7C,0x40), rgb_t(0x2D,0x8D,0x51), rgb_t(0x3E,0x9E,0x62), \
+ rgb_t(0x4F,0xAF,0x73), rgb_t(0x60,0xC0,0x84), rgb_t(0x71,0xD1,0x95), rgb_t(0x82,0xE2,0xA6), \
+ rgb_t(0x93,0xF3,0xB7), rgb_t(0xA4,0xFF,0xC6), rgb_t(0xB5,0xFF,0xD2), rgb_t(0xC6,0xFF,0xDE )
define NTSC_GREEN
- MAKE_RGB(0x00,0x25,0x0B), MAKE_RGB(0x00,0x36,0x10), MAKE_RGB(0x00,0x47,0x15), MAKE_RGB(0x0D,0x58,0x16), \
- MAKE_RGB(0x1E,0x69,0x16), MAKE_RGB(0x2F,0x7A,0x16), MAKE_RGB(0x40,0x8B,0x21), MAKE_RGB(0x51,0x9C,0x32), \
- MAKE_RGB(0x62,0xAD,0x43), MAKE_RGB(0x73,0xBE,0x54), MAKE_RGB(0x84,0xCF,0x65), MAKE_RGB(0x95,0xE0,0x76), \
- MAKE_RGB(0xA6,0xF1,0x87), MAKE_RGB(0xB7,0xFF,0x98), MAKE_RGB(0xC8,0xFF,0xA3), MAKE_RGB(0xD9,0xFF,0xAF )
+ rgb_t(0x00,0x25,0x0B), rgb_t(0x00,0x36,0x10), rgb_t(0x00,0x47,0x15), rgb_t(0x0D,0x58,0x16), \
+ rgb_t(0x1E,0x69,0x16), rgb_t(0x2F,0x7A,0x16), rgb_t(0x40,0x8B,0x21), rgb_t(0x51,0x9C,0x32), \
+ rgb_t(0x62,0xAD,0x43), rgb_t(0x73,0xBE,0x54), rgb_t(0x84,0xCF,0x65), rgb_t(0x95,0xE0,0x76), \
+ rgb_t(0xA6,0xF1,0x87), rgb_t(0xB7,0xFF,0x98), rgb_t(0xC8,0xFF,0xA3), rgb_t(0xD9,0xFF,0xAF )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x1B,0x08), MAKE_RGB(0x06,0x2C,0x0B), MAKE_RGB(0x17,0x3D,0x0B), MAKE_RGB(0x28,0x4E,0x0B), \
- MAKE_RGB(0x39,0x5F,0x0B), MAKE_RGB(0x4A,0x70,0x0B), MAKE_RGB(0x5B,0x81,0x0B), MAKE_RGB(0x6C,0x92,0x12), \
- MAKE_RGB(0x7D,0xA3,0x23), MAKE_RGB(0x8E,0xB4,0x34), MAKE_RGB(0x9F,0xC5,0x45), MAKE_RGB(0xB0,0xD6,0x56), \
- MAKE_RGB(0xC1,0xE7,0x67), MAKE_RGB(0xD2,0xF8,0x78), MAKE_RGB(0xE3,0xFF,0x86), MAKE_RGB(0xF4,0xFF,0x92 )
+ rgb_t(0x00,0x1B,0x08), rgb_t(0x06,0x2C,0x0B), rgb_t(0x17,0x3D,0x0B), rgb_t(0x28,0x4E,0x0B), \
+ rgb_t(0x39,0x5F,0x0B), rgb_t(0x4A,0x70,0x0B), rgb_t(0x5B,0x81,0x0B), rgb_t(0x6C,0x92,0x12), \
+ rgb_t(0x7D,0xA3,0x23), rgb_t(0x8E,0xB4,0x34), rgb_t(0x9F,0xC5,0x45), rgb_t(0xB0,0xD6,0x56), \
+ rgb_t(0xC1,0xE7,0x67), rgb_t(0xD2,0xF8,0x78), rgb_t(0xE3,0xFF,0x86), rgb_t(0xF4,0xFF,0x92 )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x13,0x0B,0x00), MAKE_RGB(0x24,0x1C,0x00), MAKE_RGB(0x35,0x2D,0x00), MAKE_RGB(0x46,0x3E,0x00), \
- MAKE_RGB(0x57,0x4F,0x00), MAKE_RGB(0x68,0x60,0x00), MAKE_RGB(0x79,0x71,0x00), MAKE_RGB(0x8A,0x82,0x08), \
- MAKE_RGB(0x9B,0x93,0x19), MAKE_RGB(0xAC,0xA4,0x2A), MAKE_RGB(0xBD,0xB5,0x3B), MAKE_RGB(0xCE,0xC6,0x4C), \
- MAKE_RGB(0xDF,0xD7,0x5D), MAKE_RGB(0xF0,0xE8,0x6E), MAKE_RGB(0xFF,0xF9,0x7F), MAKE_RGB(0xFF,0xFF,0x92 )
+ rgb_t(0x13,0x0B,0x00), rgb_t(0x24,0x1C,0x00), rgb_t(0x35,0x2D,0x00), rgb_t(0x46,0x3E,0x00), \
+ rgb_t(0x57,0x4F,0x00), rgb_t(0x68,0x60,0x00), rgb_t(0x79,0x71,0x00), rgb_t(0x8A,0x82,0x08), \
+ rgb_t(0x9B,0x93,0x19), rgb_t(0xAC,0xA4,0x2A), rgb_t(0xBD,0xB5,0x3B), rgb_t(0xCE,0xC6,0x4C), \
+ rgb_t(0xDF,0xD7,0x5D), rgb_t(0xF0,0xE8,0x6E), rgb_t(0xFF,0xF9,0x7F), rgb_t(0xFF,0xFF,0x92 )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x2D,0x00,0x00), MAKE_RGB(0x3E,0x0A,0x00), MAKE_RGB(0x4F,0x1B,0x00), MAKE_RGB(0x60,0x2C,0x00), \
- MAKE_RGB(0x71,0x3D,0x00), MAKE_RGB(0x82,0x4E,0x00), MAKE_RGB(0x93,0x5F,0x05), MAKE_RGB(0xA4,0x70,0x16), \
- MAKE_RGB(0xB5,0x81,0x27), MAKE_RGB(0xC4,0x90,0x37), MAKE_RGB(0xD7,0xA3,0x49), MAKE_RGB(0xE8,0xB4,0x5A), \
- MAKE_RGB(0xF9,0xC5,0x6B), MAKE_RGB(0xFF,0xD6,0x80), MAKE_RGB(0xFF,0xE7,0x96), MAKE_RGB(0xFF,0xF8,0xAC )
+ rgb_t(0x2D,0x00,0x00), rgb_t(0x3E,0x0A,0x00), rgb_t(0x4F,0x1B,0x00), rgb_t(0x60,0x2C,0x00), \
+ rgb_t(0x71,0x3D,0x00), rgb_t(0x82,0x4E,0x00), rgb_t(0x93,0x5F,0x05), rgb_t(0xA4,0x70,0x16), \
+ rgb_t(0xB5,0x81,0x27), rgb_t(0xC4,0x90,0x37), rgb_t(0xD7,0xA3,0x49), rgb_t(0xE8,0xB4,0x5A), \
+ rgb_t(0xF9,0xC5,0x6B), rgb_t(0xFF,0xD6,0x80), rgb_t(0xFF,0xE7,0x96), rgb_t(0xFF,0xF8,0xAC )
***************************************************************************/
@@ -871,100 +871,100 @@ define NTSC_LIGHT_ORANGE
define NTSC_GREY
- MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \
- MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \
- MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \
- MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF )
+ rgb_t(0x00,0x00,0x00), rgb_t(0x11,0x11,0x11), rgb_t(0x22,0x22,0x22), rgb_t(0x33,0x33,0x33), \
+ rgb_t(0x44,0x44,0x44), rgb_t(0x55,0x55,0x55), rgb_t(0x66,0x66,0x66), rgb_t(0x77,0x77,0x77), \
+ rgb_t(0x88,0x88,0x88), rgb_t(0x99,0x99,0x99), rgb_t(0xAA,0xAA,0xAA), rgb_t(0xBB,0xBB,0xBB), \
+ rgb_t(0xCC,0xCC,0xCC), rgb_t(0xDD,0xDD,0xDD), rgb_t(0xEE,0xEE,0xEE), rgb_t(0xFF,0xFF,0xFF )
define NTSC_GOLD
- MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \
- MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \
- MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \
- MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xFF,0x97 )
+ rgb_t(0x1A,0x07,0x00), rgb_t(0x2B,0x18,0x00), rgb_t(0x3C,0x29,0x00), rgb_t(0x4D,0x3A,0x00), \
+ rgb_t(0x5E,0x4B,0x00), rgb_t(0x6F,0x5C,0x00), rgb_t(0x80,0x6D,0x00), rgb_t(0x91,0x7E,0x09), \
+ rgb_t(0xA2,0x8F,0x1A), rgb_t(0xB3,0xA0,0x2B), rgb_t(0xC4,0xB1,0x3C), rgb_t(0xD5,0xC2,0x4D), \
+ rgb_t(0xE6,0xD3,0x5E), rgb_t(0xF7,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xFF,0x97 )
define NTSC_ORANGE
- MAKE_RGB(0x32,0x00,0x00), MAKE_RGB(0x43,0x05,0x00), MAKE_RGB(0x54,0x16,0x00), MAKE_RGB(0x65,0x27,0x00), \
- MAKE_RGB(0x76,0x38,0x00), MAKE_RGB(0x87,0x49,0x00), MAKE_RGB(0x98,0x5A,0x0C), MAKE_RGB(0xA9,0x6B,0x1D), \
- MAKE_RGB(0xBA,0x7C,0x2E), MAKE_RGB(0xCB,0x8D,0x3F), MAKE_RGB(0xDC,0x9E,0x50), MAKE_RGB(0xED,0xAF,0x61), \
- MAKE_RGB(0xFE,0xC0,0x72), MAKE_RGB(0xFF,0xD1,0x88), MAKE_RGB(0xFF,0xE2,0x9E), MAKE_RGB(0xFF,0xF3,0xB4 )
+ rgb_t(0x32,0x00,0x00), rgb_t(0x43,0x05,0x00), rgb_t(0x54,0x16,0x00), rgb_t(0x65,0x27,0x00), \
+ rgb_t(0x76,0x38,0x00), rgb_t(0x87,0x49,0x00), rgb_t(0x98,0x5A,0x0C), rgb_t(0xA9,0x6B,0x1D), \
+ rgb_t(0xBA,0x7C,0x2E), rgb_t(0xCB,0x8D,0x3F), rgb_t(0xDC,0x9E,0x50), rgb_t(0xED,0xAF,0x61), \
+ rgb_t(0xFE,0xC0,0x72), rgb_t(0xFF,0xD1,0x88), rgb_t(0xFF,0xE2,0x9E), rgb_t(0xFF,0xF3,0xB4 )
define NTSC_RED_ORANGE
- MAKE_RGB(0x3F,0x00,0x00), MAKE_RGB(0x50,0x00,0x00), MAKE_RGB(0x61,0x06,0x00), MAKE_RGB(0x72,0x17,0x03), \
- MAKE_RGB(0x83,0x28,0x14), MAKE_RGB(0x94,0x39,0x25), MAKE_RGB(0xA5,0x4A,0x36), MAKE_RGB(0xB6,0x5B,0x47), \
- MAKE_RGB(0xC7,0x6C,0x58), MAKE_RGB(0xD8,0x7D,0x69), MAKE_RGB(0xE9,0x8E,0x7A), MAKE_RGB(0xFA,0x9F,0x8B), \
- MAKE_RGB(0xFF,0xB0,0x9F), MAKE_RGB(0xFF,0xC1,0xB5), MAKE_RGB(0xFF,0xD2,0xCB), MAKE_RGB(0xFF,0xE3,0xE1 )
+ rgb_t(0x3F,0x00,0x00), rgb_t(0x50,0x00,0x00), rgb_t(0x61,0x06,0x00), rgb_t(0x72,0x17,0x03), \
+ rgb_t(0x83,0x28,0x14), rgb_t(0x94,0x39,0x25), rgb_t(0xA5,0x4A,0x36), rgb_t(0xB6,0x5B,0x47), \
+ rgb_t(0xC7,0x6C,0x58), rgb_t(0xD8,0x7D,0x69), rgb_t(0xE9,0x8E,0x7A), rgb_t(0xFA,0x9F,0x8B), \
+ rgb_t(0xFF,0xB0,0x9F), rgb_t(0xFF,0xC1,0xB5), rgb_t(0xFF,0xD2,0xCB), rgb_t(0xFF,0xE3,0xE1 )
define NTSC_PINK
- MAKE_RGB(0x3D,0x00,0x10), MAKE_RGB(0x4E,0x00,0x1C), MAKE_RGB(0x5F,0x00,0x27), MAKE_RGB(0x70,0x0D,0x37), \
- MAKE_RGB(0x81,0x1E,0x48), MAKE_RGB(0x92,0x2F,0x59), MAKE_RGB(0xA3,0x40,0x6A), MAKE_RGB(0xB4,0x51,0x7B), \
- MAKE_RGB(0xC5,0x62,0x8C), MAKE_RGB(0xD6,0x73,0x9D), MAKE_RGB(0xE7,0x84,0xAE), MAKE_RGB(0xF8,0x95,0xBF), \
- MAKE_RGB(0xFF,0xA6,0xD3), MAKE_RGB(0xFF,0xB7,0xE9), MAKE_RGB(0xFF,0xC8,0xEE), MAKE_RGB(0xFF,0xD9,0xF4 )
+ rgb_t(0x3D,0x00,0x10), rgb_t(0x4E,0x00,0x1C), rgb_t(0x5F,0x00,0x27), rgb_t(0x70,0x0D,0x37), \
+ rgb_t(0x81,0x1E,0x48), rgb_t(0x92,0x2F,0x59), rgb_t(0xA3,0x40,0x6A), rgb_t(0xB4,0x51,0x7B), \
+ rgb_t(0xC5,0x62,0x8C), rgb_t(0xD6,0x73,0x9D), rgb_t(0xE7,0x84,0xAE), rgb_t(0xF8,0x95,0xBF), \
+ rgb_t(0xFF,0xA6,0xD3), rgb_t(0xFF,0xB7,0xE9), rgb_t(0xFF,0xC8,0xEE), rgb_t(0xFF,0xD9,0xF4 )
define NTSC_PURPLE
- MAKE_RGB(0x2D,0x00,0x42), MAKE_RGB(0x3E,0x00,0x4E), MAKE_RGB(0x4F,0x00,0x5A), MAKE_RGB(0x60,0x0C,0x6A), \
- MAKE_RGB(0x71,0x1D,0x7B), MAKE_RGB(0x82,0x2E,0x8C), MAKE_RGB(0x93,0x3F,0x9D), MAKE_RGB(0xA4,0x50,0xAE), \
- MAKE_RGB(0xB5,0x61,0xBF), MAKE_RGB(0xC6,0x72,0xD0), MAKE_RGB(0xD7,0x83,0xE1), MAKE_RGB(0xE8,0x94,0xE6), \
- MAKE_RGB(0xF9,0xA5,0xE6), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 )
+ rgb_t(0x2D,0x00,0x42), rgb_t(0x3E,0x00,0x4E), rgb_t(0x4F,0x00,0x5A), rgb_t(0x60,0x0C,0x6A), \
+ rgb_t(0x71,0x1D,0x7B), rgb_t(0x82,0x2E,0x8C), rgb_t(0x93,0x3F,0x9D), rgb_t(0xA4,0x50,0xAE), \
+ rgb_t(0xB5,0x61,0xBF), rgb_t(0xC6,0x72,0xD0), rgb_t(0xD7,0x83,0xE1), rgb_t(0xE8,0x94,0xE6), \
+ rgb_t(0xF9,0xA5,0xE6), rgb_t(0xFF,0xB6,0xE9), rgb_t(0xFF,0xC7,0xEE), rgb_t(0xFF,0xD8,0xF3 )
define NTSC_PURPLE_BLUE
- MAKE_RGB(0x13,0x00,0x67), MAKE_RGB(0x24,0x00,0x73), MAKE_RGB(0x35,0x03,0x80), MAKE_RGB(0x46,0x14,0x91), \
- MAKE_RGB(0x57,0x25,0xA2), MAKE_RGB(0x68,0x36,0xB3), MAKE_RGB(0x79,0x47,0xC4), MAKE_RGB(0x8A,0x58,0xD5), \
- MAKE_RGB(0x9B,0x69,0xE6), MAKE_RGB(0xAC,0x7A,0xF0), MAKE_RGB(0xBD,0x8B,0xF0), MAKE_RGB(0xCE,0x9C,0xF0), \
- MAKE_RGB(0xDF,0xAD,0xF0), MAKE_RGB(0xF0,0xBE,0xF0), MAKE_RGB(0xFF,0xCF,0xF1), MAKE_RGB(0xFF,0xE0,0xF6 )
+ rgb_t(0x13,0x00,0x67), rgb_t(0x24,0x00,0x73), rgb_t(0x35,0x03,0x80), rgb_t(0x46,0x14,0x91), \
+ rgb_t(0x57,0x25,0xA2), rgb_t(0x68,0x36,0xB3), rgb_t(0x79,0x47,0xC4), rgb_t(0x8A,0x58,0xD5), \
+ rgb_t(0x9B,0x69,0xE6), rgb_t(0xAC,0x7A,0xF0), rgb_t(0xBD,0x8B,0xF0), rgb_t(0xCE,0x9C,0xF0), \
+ rgb_t(0xDF,0xAD,0xF0), rgb_t(0xF0,0xBE,0xF0), rgb_t(0xFF,0xCF,0xF1), rgb_t(0xFF,0xE0,0xF6 )
define NTSC_BLUE1
- MAKE_RGB(0x00,0x00,0x70), MAKE_RGB(0x05,0x01,0x80), MAKE_RGB(0x16,0x12,0x91), MAKE_RGB(0x27,0x23,0xA2), \
- MAKE_RGB(0x38,0x34,0xB3), MAKE_RGB(0x49,0x45,0xC4), MAKE_RGB(0x5A,0x56,0xD5), MAKE_RGB(0x6B,0x67,0xE6), \
- MAKE_RGB(0x7C,0x78,0xF7), MAKE_RGB(0x8D,0x89,0xFE), MAKE_RGB(0x9E,0x9A,0xFE), MAKE_RGB(0xAF,0xAB,0xFE), \
- MAKE_RGB(0xC0,0xBC,0xFE), MAKE_RGB(0xD1,0xCD,0xFE), MAKE_RGB(0xE2,0xDE,0xFE), MAKE_RGB(0xF3,0xEF,0xFE )
+ rgb_t(0x00,0x00,0x70), rgb_t(0x05,0x01,0x80), rgb_t(0x16,0x12,0x91), rgb_t(0x27,0x23,0xA2), \
+ rgb_t(0x38,0x34,0xB3), rgb_t(0x49,0x45,0xC4), rgb_t(0x5A,0x56,0xD5), rgb_t(0x6B,0x67,0xE6), \
+ rgb_t(0x7C,0x78,0xF7), rgb_t(0x8D,0x89,0xFE), rgb_t(0x9E,0x9A,0xFE), rgb_t(0xAF,0xAB,0xFE), \
+ rgb_t(0xC0,0xBC,0xFE), rgb_t(0xD1,0xCD,0xFE), rgb_t(0xE2,0xDE,0xFE), rgb_t(0xF3,0xEF,0xFE )
define NTSC_BLUE2
- MAKE_RGB(0x00,0x03,0x5B), MAKE_RGB(0x00,0x14,0x71), MAKE_RGB(0x00,0x25,0x87), MAKE_RGB(0x0C,0x36,0x9A), \
- MAKE_RGB(0x1D,0x47,0xAB), MAKE_RGB(0x2E,0x58,0xBC), MAKE_RGB(0x3F,0x69,0xCD), MAKE_RGB(0x50,0x7A,0xDE), \
- MAKE_RGB(0x61,0x8B,0xEF), MAKE_RGB(0x72,0x9C,0xFF), MAKE_RGB(0x83,0xAD,0xFF), MAKE_RGB(0x94,0xBE,0xFF), \
- MAKE_RGB(0xA5,0xCF,0xFF), MAKE_RGB(0xB6,0xE0,0xFF), MAKE_RGB(0xC7,0xF1,0xFF), MAKE_RGB(0xD8,0xFF,0xFF )
+ rgb_t(0x00,0x03,0x5B), rgb_t(0x00,0x14,0x71), rgb_t(0x00,0x25,0x87), rgb_t(0x0C,0x36,0x9A), \
+ rgb_t(0x1D,0x47,0xAB), rgb_t(0x2E,0x58,0xBC), rgb_t(0x3F,0x69,0xCD), rgb_t(0x50,0x7A,0xDE), \
+ rgb_t(0x61,0x8B,0xEF), rgb_t(0x72,0x9C,0xFF), rgb_t(0x83,0xAD,0xFF), rgb_t(0x94,0xBE,0xFF), \
+ rgb_t(0xA5,0xCF,0xFF), rgb_t(0xB6,0xE0,0xFF), rgb_t(0xC7,0xF1,0xFF), rgb_t(0xD8,0xFF,0xFF )
define NTSC_LIGHT_BLUE
- MAKE_RGB(0x00,0x15,0x35), MAKE_RGB(0x00,0x26,0x4B), MAKE_RGB(0x00,0x37,0x61), MAKE_RGB(0x00,0x48,0x78), \
- MAKE_RGB(0x0A,0x59,0x8B), MAKE_RGB(0x1B,0x6A,0x9C), MAKE_RGB(0x2C,0x7B,0xAD), MAKE_RGB(0x3D,0x8C,0xBE), \
- MAKE_RGB(0x4E,0x9D,0xCF), MAKE_RGB(0x5F,0xAE,0xE0), MAKE_RGB(0x70,0xBF,0xF1), MAKE_RGB(0x81,0xD0,0xFF), \
- MAKE_RGB(0x92,0xE1,0xFF), MAKE_RGB(0xA3,0xF2,0xFF), MAKE_RGB(0xB4,0xFF,0xFF), MAKE_RGB(0xC5,0xFF,0xFF )
+ rgb_t(0x00,0x15,0x35), rgb_t(0x00,0x26,0x4B), rgb_t(0x00,0x37,0x61), rgb_t(0x00,0x48,0x78), \
+ rgb_t(0x0A,0x59,0x8B), rgb_t(0x1B,0x6A,0x9C), rgb_t(0x2C,0x7B,0xAD), rgb_t(0x3D,0x8C,0xBE), \
+ rgb_t(0x4E,0x9D,0xCF), rgb_t(0x5F,0xAE,0xE0), rgb_t(0x70,0xBF,0xF1), rgb_t(0x81,0xD0,0xFF), \
+ rgb_t(0x92,0xE1,0xFF), rgb_t(0xA3,0xF2,0xFF), rgb_t(0xB4,0xFF,0xFF), rgb_t(0xC5,0xFF,0xFF )
define NTSC_TURQUOISE
- MAKE_RGB(0x00,0x22,0x0A), MAKE_RGB(0x00,0x33,0x19), MAKE_RGB(0x00,0x44,0x2F), MAKE_RGB(0x00,0x55,0x45), \
- MAKE_RGB(0x04,0x66,0x5A), MAKE_RGB(0x15,0x77,0x6B), MAKE_RGB(0x26,0x88,0x7C), MAKE_RGB(0x37,0x99,0x8D), \
- MAKE_RGB(0x48,0xAA,0x9E), MAKE_RGB(0x59,0xBB,0xAF), MAKE_RGB(0x6A,0xCC,0xC0), MAKE_RGB(0x7B,0xDD,0xD1), \
- MAKE_RGB(0x8C,0xEE,0xE2), MAKE_RGB(0x9D,0xFF,0xF3), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF )
+ rgb_t(0x00,0x22,0x0A), rgb_t(0x00,0x33,0x19), rgb_t(0x00,0x44,0x2F), rgb_t(0x00,0x55,0x45), \
+ rgb_t(0x04,0x66,0x5A), rgb_t(0x15,0x77,0x6B), rgb_t(0x26,0x88,0x7C), rgb_t(0x37,0x99,0x8D), \
+ rgb_t(0x48,0xAA,0x9E), rgb_t(0x59,0xBB,0xAF), rgb_t(0x6A,0xCC,0xC0), rgb_t(0x7B,0xDD,0xD1), \
+ rgb_t(0x8C,0xEE,0xE2), rgb_t(0x9D,0xFF,0xF3), rgb_t(0xAE,0xFF,0xFF), rgb_t(0xBF,0xFF,0xFF )
define NTSC_GREEN_BLUE
- MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x00,0x5A,0x1B), \
- MAKE_RGB(0x0D,0x6B,0x25), MAKE_RGB(0x1E,0x7C,0x36), MAKE_RGB(0x2F,0x8D,0x47), MAKE_RGB(0x40,0x9E,0x58), \
- MAKE_RGB(0x51,0xAF,0x69), MAKE_RGB(0x62,0xC0,0x7A), MAKE_RGB(0x73,0xD1,0x8B), MAKE_RGB(0x84,0xE2,0x9C), \
- MAKE_RGB(0x95,0xF3,0xAD), MAKE_RGB(0xA6,0xFF,0xBD), MAKE_RGB(0xB7,0xFF,0xC9), MAKE_RGB(0xC8,0xFF,0xD4 )
+ rgb_t(0x00,0x27,0x0C), rgb_t(0x00,0x38,0x11), rgb_t(0x00,0x49,0x16), rgb_t(0x00,0x5A,0x1B), \
+ rgb_t(0x0D,0x6B,0x25), rgb_t(0x1E,0x7C,0x36), rgb_t(0x2F,0x8D,0x47), rgb_t(0x40,0x9E,0x58), \
+ rgb_t(0x51,0xAF,0x69), rgb_t(0x62,0xC0,0x7A), rgb_t(0x73,0xD1,0x8B), rgb_t(0x84,0xE2,0x9C), \
+ rgb_t(0x95,0xF3,0xAD), rgb_t(0xA6,0xFF,0xBD), rgb_t(0xB7,0xFF,0xC9), rgb_t(0xC8,0xFF,0xD4 )
define NTSC_GREEN
- MAKE_RGB(0x00,0x24,0x0B), MAKE_RGB(0x00,0x35,0x10), MAKE_RGB(0x01,0x46,0x15), MAKE_RGB(0x12,0x57,0x15), \
- MAKE_RGB(0x23,0x68,0x15), MAKE_RGB(0x34,0x79,0x15), MAKE_RGB(0x45,0x8A,0x19), MAKE_RGB(0x56,0x9B,0x2A), \
- MAKE_RGB(0x67,0xAC,0x3B), MAKE_RGB(0x78,0xBD,0x4C), MAKE_RGB(0x89,0xCE,0x5D), MAKE_RGB(0x9A,0xDF,0x6E), \
- MAKE_RGB(0xAB,0xF0,0x7F), MAKE_RGB(0xBC,0xFF,0x8F), MAKE_RGB(0xCD,0xFF,0x9B), MAKE_RGB(0xDE,0xFF,0xA7 )
+ rgb_t(0x00,0x24,0x0B), rgb_t(0x00,0x35,0x10), rgb_t(0x01,0x46,0x15), rgb_t(0x12,0x57,0x15), \
+ rgb_t(0x23,0x68,0x15), rgb_t(0x34,0x79,0x15), rgb_t(0x45,0x8A,0x19), rgb_t(0x56,0x9B,0x2A), \
+ rgb_t(0x67,0xAC,0x3B), rgb_t(0x78,0xBD,0x4C), rgb_t(0x89,0xCE,0x5D), rgb_t(0x9A,0xDF,0x6E), \
+ rgb_t(0xAB,0xF0,0x7F), rgb_t(0xBC,0xFF,0x8F), rgb_t(0xCD,0xFF,0x9B), rgb_t(0xDE,0xFF,0xA7 )
define NTSC_YELLOW_GREEN
- MAKE_RGB(0x00,0x18,0x07), MAKE_RGB(0x00,0x29,0x0C), MAKE_RGB(0x1E,0x3A,0x08), MAKE_RGB(0x2F,0x4B,0x08), \
- MAKE_RGB(0x40,0x5C,0x08), MAKE_RGB(0x51,0x6D,0x08), MAKE_RGB(0x62,0x7E,0x08), MAKE_RGB(0x73,0x8F,0x0D), \
- MAKE_RGB(0x84,0xA0,0x1E), MAKE_RGB(0x95,0xB1,0x2F), MAKE_RGB(0xA6,0xC2,0x40), MAKE_RGB(0xB7,0xD3,0x51), \
- MAKE_RGB(0xC8,0xE4,0x62), MAKE_RGB(0xD9,0xF5,0x73), MAKE_RGB(0xEA,0xFF,0x82), MAKE_RGB(0xFB,0xFF,0x8E )
+ rgb_t(0x00,0x18,0x07), rgb_t(0x00,0x29,0x0C), rgb_t(0x1E,0x3A,0x08), rgb_t(0x2F,0x4B,0x08), \
+ rgb_t(0x40,0x5C,0x08), rgb_t(0x51,0x6D,0x08), rgb_t(0x62,0x7E,0x08), rgb_t(0x73,0x8F,0x0D), \
+ rgb_t(0x84,0xA0,0x1E), rgb_t(0x95,0xB1,0x2F), rgb_t(0xA6,0xC2,0x40), rgb_t(0xB7,0xD3,0x51), \
+ rgb_t(0xC8,0xE4,0x62), rgb_t(0xD9,0xF5,0x73), rgb_t(0xEA,0xFF,0x82), rgb_t(0xFB,0xFF,0x8E )
define NTSC_ORANGE_GREEN
- MAKE_RGB(0x1B,0x07,0x00), MAKE_RGB(0x2C,0x18,0x00), MAKE_RGB(0x3D,0x29,0x00), MAKE_RGB(0x4E,0x3A,0x00), \
- MAKE_RGB(0x5F,0x4B,0x00), MAKE_RGB(0x70,0x5C,0x00), MAKE_RGB(0x81,0x6D,0x00), MAKE_RGB(0x92,0x7E,0x09), \
- MAKE_RGB(0xA3,0x8F,0x1A), MAKE_RGB(0xB4,0xA0,0x2B), MAKE_RGB(0xC5,0xB1,0x3C), MAKE_RGB(0xD6,0xC2,0x4D), \
- MAKE_RGB(0xE7,0xD3,0x5E), MAKE_RGB(0xF8,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xFF,0x97 )
+ rgb_t(0x1B,0x07,0x00), rgb_t(0x2C,0x18,0x00), rgb_t(0x3D,0x29,0x00), rgb_t(0x4E,0x3A,0x00), \
+ rgb_t(0x5F,0x4B,0x00), rgb_t(0x70,0x5C,0x00), rgb_t(0x81,0x6D,0x00), rgb_t(0x92,0x7E,0x09), \
+ rgb_t(0xA3,0x8F,0x1A), rgb_t(0xB4,0xA0,0x2B), rgb_t(0xC5,0xB1,0x3C), rgb_t(0xD6,0xC2,0x4D), \
+ rgb_t(0xE7,0xD3,0x5E), rgb_t(0xF8,0xE4,0x6F), rgb_t(0xFF,0xF5,0x83), rgb_t(0xFF,0xFF,0x97 )
define NTSC_LIGHT_ORANGE
- MAKE_RGB(0x33,0x00,0x00), MAKE_RGB(0x44,0x05,0x00), MAKE_RGB(0x55,0x16,0x00), MAKE_RGB(0x66,0x27,0x00), \
- MAKE_RGB(0x77,0x38,0x00), MAKE_RGB(0x88,0x49,0x00), MAKE_RGB(0x99,0x5A,0x0D), MAKE_RGB(0xAA,0x6B,0x1E), \
- MAKE_RGB(0xBB,0x7C,0x2F), MAKE_RGB(0xCC,0x8D,0x40), MAKE_RGB(0xDD,0x9E,0x51), MAKE_RGB(0xEE,0xAF,0x62), \
- MAKE_RGB(0xFF,0xC0,0x73), MAKE_RGB(0xFF,0xD1,0x89), MAKE_RGB(0xFF,0xE2,0x9F), MAKE_RGB(0xFF,0xF3,0xB5 )
+ rgb_t(0x33,0x00,0x00), rgb_t(0x44,0x05,0x00), rgb_t(0x55,0x16,0x00), rgb_t(0x66,0x27,0x00), \
+ rgb_t(0x77,0x38,0x00), rgb_t(0x88,0x49,0x00), rgb_t(0x99,0x5A,0x0D), rgb_t(0xAA,0x6B,0x1E), \
+ rgb_t(0xBB,0x7C,0x2F), rgb_t(0xCC,0x8D,0x40), rgb_t(0xDD,0x9E,0x51), rgb_t(0xEE,0xAF,0x62), \
+ rgb_t(0xFF,0xC0,0x73), rgb_t(0xFF,0xD1,0x89), rgb_t(0xFF,0xE2,0x9F), rgb_t(0xFF,0xF3,0xB5 )
***************************************************************************/
/* Initialise the palette */
diff --git a/src/mess/drivers/alesis.c b/src/mess/drivers/alesis.c
index 672e20ef951..dd3b8253d13 100644
--- a/src/mess/drivers/alesis.c
+++ b/src/mess/drivers/alesis.c
@@ -222,8 +222,8 @@ INPUT_PORTS_END
void alesis_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
void alesis_state::machine_reset()
diff --git a/src/mess/drivers/alphasma.c b/src/mess/drivers/alphasma.c
index da2bb082d22..600ca7be2cd 100644
--- a/src/mess/drivers/alphasma.c
+++ b/src/mess/drivers/alphasma.c
@@ -347,8 +347,8 @@ INPUT_PORTS_END
void alphasmart_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
UINT32 alphasmart_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c
index de4ff424181..41bbf800708 100644
--- a/src/mess/drivers/apexc.c
+++ b/src/mess/drivers/apexc.c
@@ -512,10 +512,10 @@ INTERRUPT_GEN_MEMBER(apexc_state::apexc_interrupt)
static const rgb_t apexc_palette[] =
{
- RGB_WHITE,
- RGB_BLACK,
- MAKE_RGB(255, 0, 0),
- MAKE_RGB(50, 0, 0)
+ rgb_t::white,
+ rgb_t::black,
+ rgb_t(255, 0, 0),
+ rgb_t(50, 0, 0)
};
static const unsigned short apexc_colortable[] =
diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c
index 1160aa706a5..c4d287d669c 100644
--- a/src/mess/drivers/apple2.c
+++ b/src/mess/drivers/apple2.c
@@ -912,22 +912,22 @@ INPUT_PORTS_END
*/
static const rgb_t apple2_palette[] =
{
- RGB_BLACK,
- MAKE_RGB(0xE3, 0x1E, 0x60), /* Dark Red */
- MAKE_RGB(0x60, 0x4E, 0xBD), /* Dark Blue */
- MAKE_RGB(0xFF, 0x44, 0xFD), /* Purple */
- MAKE_RGB(0x00, 0xA3, 0x60), /* Dark Green */
- MAKE_RGB(0x9C, 0x9C, 0x9C), /* Dark Gray */
- MAKE_RGB(0x14, 0xCF, 0xFD), /* Medium Blue */
- MAKE_RGB(0xD0, 0xC3, 0xFF), /* Light Blue */
- MAKE_RGB(0x60, 0x72, 0x03), /* Brown */
- MAKE_RGB(0xFF, 0x6A, 0x3C), /* Orange */
- MAKE_RGB(0x9C, 0x9C, 0x9C), /* Light Grey */
- MAKE_RGB(0xFF, 0xA0, 0xD0), /* Pink */
- MAKE_RGB(0x14, 0xF5, 0x3C), /* Light Green */
- MAKE_RGB(0xD0, 0xDD, 0x8D), /* Yellow */
- MAKE_RGB(0x72, 0xFF, 0xD0), /* Aquamarine */
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0xE3, 0x1E, 0x60), /* Dark Red */
+ rgb_t(0x60, 0x4E, 0xBD), /* Dark Blue */
+ rgb_t(0xFF, 0x44, 0xFD), /* Purple */
+ rgb_t(0x00, 0xA3, 0x60), /* Dark Green */
+ rgb_t(0x9C, 0x9C, 0x9C), /* Dark Gray */
+ rgb_t(0x14, 0xCF, 0xFD), /* Medium Blue */
+ rgb_t(0xD0, 0xC3, 0xFF), /* Light Blue */
+ rgb_t(0x60, 0x72, 0x03), /* Brown */
+ rgb_t(0xFF, 0x6A, 0x3C), /* Orange */
+ rgb_t(0x9C, 0x9C, 0x9C), /* Light Grey */
+ rgb_t(0xFF, 0xA0, 0xD0), /* Pink */
+ rgb_t(0x14, 0xF5, 0x3C), /* Light Green */
+ rgb_t(0xD0, 0xDD, 0x8D), /* Yellow */
+ rgb_t(0x72, 0xFF, 0xD0), /* Aquamarine */
+ rgb_t::white
};
/* Initialize the palette */
diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c
index 908789ab8e5..af159a354da 100644
--- a/src/mess/drivers/applix.c
+++ b/src/mess/drivers/applix.c
@@ -759,7 +759,7 @@ void applix_state::palette_init()
for (i = 0; i < 48; color_count++)
{
r = colors[i++]; g = colors[i++]; b = colors[i++];
- palette_set_color(machine(), color_count, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), color_count, rgb_t(r, g, b));
}
}
diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c
index 01e76a39a75..13181f738bc 100644
--- a/src/mess/drivers/apricot.c
+++ b/src/mess/drivers/apricot.c
@@ -272,7 +272,7 @@ UINT32 apricot_state::screen_update_apricot(screen_device &screen, bitmap_rgb32
if (!m_display_on)
m_crtc->screen_update(screen, bitmap, cliprect);
else
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
return 0;
}
diff --git a/src/mess/drivers/arcadia.c b/src/mess/drivers/arcadia.c
index 8ea8bdb8403..8f433f1e446 100644
--- a/src/mess/drivers/arcadia.c
+++ b/src/mess/drivers/arcadia.c
@@ -414,14 +414,14 @@ GFXDECODE_END
static const rgb_t arcadia_colors[] =
{
- RGB_WHITE, /* white */
- MAKE_RGB(0xff, 0xff, 0x00), /* yellow */
- MAKE_RGB(0x00, 0xff, 0xff), /* cyan */
- MAKE_RGB(0x00, 0xff, 0x00), /* green */
- MAKE_RGB(0xff, 0x00, 0xff), /* magenta */
- MAKE_RGB(0xff, 0x00, 0x00), /* red */
- MAKE_RGB(0x00, 0x00, 0xff), /* blue */
- RGB_BLACK /* black */
+ rgb_t::white, /* white */
+ rgb_t(0xff, 0xff, 0x00), /* yellow */
+ rgb_t(0x00, 0xff, 0xff), /* cyan */
+ rgb_t(0x00, 0xff, 0x00), /* green */
+ rgb_t(0xff, 0x00, 0xff), /* magenta */
+ rgb_t(0xff, 0x00, 0x00), /* red */
+ rgb_t(0x00, 0x00, 0xff), /* blue */
+ rgb_t::black /* black */
};
static const unsigned short arcadia_palette[128+8] = /* bgnd, fgnd */
diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c
index 8b3ab93434d..7020dd1e9f1 100644
--- a/src/mess/drivers/bbc.c
+++ b/src/mess/drivers/bbc.c
@@ -288,14 +288,14 @@ ADDRESS_MAP_END
static const rgb_t bbc_palette[8]=
{
- MAKE_RGB(0x0ff,0x0ff,0x0ff),
- MAKE_RGB(0x000,0x0ff,0x0ff),
- MAKE_RGB(0x0ff,0x000,0x0ff),
- MAKE_RGB(0x000,0x000,0x0ff),
- MAKE_RGB(0x0ff,0x0ff,0x000),
- MAKE_RGB(0x000,0x0ff,0x000),
- MAKE_RGB(0x0ff,0x000,0x000),
- MAKE_RGB(0x000,0x000,0x000)
+ rgb_t(0x0ff,0x0ff,0x0ff),
+ rgb_t(0x000,0x0ff,0x0ff),
+ rgb_t(0x0ff,0x000,0x0ff),
+ rgb_t(0x000,0x000,0x0ff),
+ rgb_t(0x0ff,0x0ff,0x000),
+ rgb_t(0x000,0x0ff,0x000),
+ rgb_t(0x0ff,0x000,0x000),
+ rgb_t(0x000,0x000,0x000)
};
PALETTE_INIT_MEMBER(bbc_state, bbc)
diff --git a/src/mess/drivers/c64dtv.c b/src/mess/drivers/c64dtv.c
index 8ce0d0096fc..af886122d8f 100644
--- a/src/mess/drivers/c64dtv.c
+++ b/src/mess/drivers/c64dtv.c
@@ -16,7 +16,7 @@ public:
UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(RGB_BLACK);
+ bitmap.fill(rgb_t::black);
return 0;
}
};
diff --git a/src/mess/drivers/camplynx.c b/src/mess/drivers/camplynx.c
index 745fea461ce..fdb33da528f 100644
--- a/src/mess/drivers/camplynx.c
+++ b/src/mess/drivers/camplynx.c
@@ -377,7 +377,7 @@ void camplynx_state::palette_init()
while (color_count--)
{
r = lynx48k_palette[i++]; g = lynx48k_palette[i++]; b = lynx48k_palette[i++];
- palette_set_color(machine(), 7-color_count, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), 7-color_count, rgb_t(r, g, b));
}
}
diff --git a/src/mess/drivers/casloopy.c b/src/mess/drivers/casloopy.c
index 5cb18a2ca98..101d158abdb 100644
--- a/src/mess/drivers/casloopy.c
+++ b/src/mess/drivers/casloopy.c
@@ -252,7 +252,7 @@ UINT32 casloopy_state::screen_update_casloopy(screen_device &screen, bitmap_ind1
r = pal5bit((m_vregs[0x4/4] >> 10) & 0x1f);
g = pal5bit((m_vregs[0x4/4] >> 5) & 0x1f);
b = pal5bit((m_vregs[0x4/4] >> 0) & 0x1f);
- palette_set_color(machine(),0x100,MAKE_RGB(r^0xff,g^0xff,b^0xff));
+ palette_set_color(machine(),0x100,rgb_t(r^0xff,g^0xff,b^0xff));
bitmap.fill( 0x100 ,cliprect);
#endif
diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c
index bf8bb879b0d..15ae711bc7b 100644
--- a/src/mess/drivers/cgenie.c
+++ b/src/mess/drivers/cgenie.c
@@ -452,7 +452,7 @@ PALETTE_INIT_MEMBER(cgenie_state,cgenie)
for ( i = 0; i < 49; i++ )
{
r = cgenie_colors[i*3]; g = cgenie_colors[i*3+1]; b = cgenie_colors[i*3+2];
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
}
for(i=0; i<108; i++)
@@ -468,7 +468,7 @@ PALETTE_INIT_MEMBER(cgenie_state,cgenienz)
for ( i = 0; i < 49; i++ )
{
r = cgenienz_colors[i*3]; g = cgenienz_colors[i*3+1]; b = cgenienz_colors[i*3+2];
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
}
for(i=0; i<108; i++)
diff --git a/src/mess/drivers/clcd.c b/src/mess/drivers/clcd.c
index 71288f57d2b..c1aaa66b503 100644
--- a/src/mess/drivers/clcd.c
+++ b/src/mess/drivers/clcd.c
@@ -91,8 +91,8 @@ public:
void palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(36,72,36));
- palette_set_color(machine(), 1, MAKE_RGB(2,4,2));
+ palette_set_color(machine(), 0, rgb_t(36,72,36));
+ palette_set_color(machine(), 1, rgb_t(2,4,2));
}
UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/drivers/compucolor.c b/src/mess/drivers/compucolor.c
index 592b052d140..4c89bfa05a5 100644
--- a/src/mess/drivers/compucolor.c
+++ b/src/mess/drivers/compucolor.c
@@ -446,7 +446,7 @@ void compucolor2_state::palette_init()
{
for (int i = 0; i < 8; i++)
{
- m_palette[i] = MAKE_RGB(BIT(i, 0) * 0xff, BIT(i, 1) * 0xff, BIT(i, 2) * 0xff);
+ m_palette[i] = rgb_t(BIT(i, 0) * 0xff, BIT(i, 1) * 0xff, BIT(i, 2) * 0xff);
}
}
diff --git a/src/mess/drivers/cxhumax.c b/src/mess/drivers/cxhumax.c
index 5b1f4945243..63bbad9847d 100644
--- a/src/mess/drivers/cxhumax.c
+++ b/src/mess/drivers/cxhumax.c
@@ -886,7 +886,7 @@ INLINE UINT32 ycc_to_rgb(UINT32 ycc)
b = (common + 516 * cb - 13696);
/* Now clamp and shift back */
- return MAKE_RGB(clamp16_shift8(r), clamp16_shift8(g), clamp16_shift8(b));
+ return rgb_t(clamp16_shift8(r), clamp16_shift8(g), clamp16_shift8(b));
}
UINT32 cxhumax_state::screen_update_cxhumax(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/drivers/cybiko.c b/src/mess/drivers/cybiko.c
index 4e342fb451b..17844d56355 100644
--- a/src/mess/drivers/cybiko.c
+++ b/src/mess/drivers/cybiko.c
@@ -289,7 +289,7 @@ void cybiko_state::palette_init()
// init palette
for (int i = 0; i < 4; i++)
{
- palette_set_color(machine(), i, RGB_WHITE);
+ palette_set_color(machine(), i, rgb_t::white);
#ifndef HD66421_BRIGHTNESS_DOES_NOT_WORK
palette_set_pen_contrast(machine(), i, 1.0 * i / (4 - 1));
#endif
diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c
index 43fa006be90..4ae807aac1a 100644
--- a/src/mess/drivers/einstein.c
+++ b/src/mess/drivers/einstein.c
@@ -445,8 +445,8 @@ MACHINE_RESET_MEMBER(einstein_state,einstein2)
einstein_state::machine_reset();
/* 80 column card palette */
- palette_set_color(machine(), TMS9928A_PALETTE_SIZE, RGB_BLACK);
- palette_set_color(machine(), TMS9928A_PALETTE_SIZE + 1, MAKE_RGB(0, 224, 0));
+ palette_set_color(machine(), TMS9928A_PALETTE_SIZE, rgb_t::black);
+ palette_set_color(machine(), TMS9928A_PALETTE_SIZE + 1, rgb_t(0, 224, 0));
}
MACHINE_START_MEMBER(einstein_state,einstein2)
diff --git a/src/mess/drivers/electron.c b/src/mess/drivers/electron.c
index 1b9f52bd620..8f8ee523237 100644
--- a/src/mess/drivers/electron.c
+++ b/src/mess/drivers/electron.c
@@ -34,14 +34,14 @@ Missing:
static const rgb_t electron_palette[8]=
{
- MAKE_RGB(0x0ff,0x0ff,0x0ff),
- MAKE_RGB(0x000,0x0ff,0x0ff),
- MAKE_RGB(0x0ff,0x000,0x0ff),
- MAKE_RGB(0x000,0x000,0x0ff),
- MAKE_RGB(0x0ff,0x0ff,0x000),
- MAKE_RGB(0x000,0x0ff,0x000),
- MAKE_RGB(0x0ff,0x000,0x000),
- MAKE_RGB(0x000,0x000,0x000)
+ rgb_t(0x0ff,0x0ff,0x0ff),
+ rgb_t(0x000,0x0ff,0x0ff),
+ rgb_t(0x0ff,0x000,0x0ff),
+ rgb_t(0x000,0x000,0x0ff),
+ rgb_t(0x0ff,0x0ff,0x000),
+ rgb_t(0x000,0x0ff,0x000),
+ rgb_t(0x0ff,0x000,0x000),
+ rgb_t(0x000,0x000,0x000)
};
void electron_state::palette_init()
diff --git a/src/mess/drivers/gp2x.c b/src/mess/drivers/gp2x.c
index bf2e03cfddc..c4357f3b237 100644
--- a/src/mess/drivers/gp2x.c
+++ b/src/mess/drivers/gp2x.c
@@ -168,7 +168,7 @@ UINT32 gp2x_state::screen_update_gp2x(screen_device &screen, bitmap_rgb32 &bitma
{
UINT16 pixel = vram[(320*y)+x];
- *scanline++ = MAKE_ARGB(0xff, (pixel>>11)<<3, ((pixel>>5)&0x3f)<<2, (pixel&0x1f)<<3);
+ *scanline++ = rgb_t(0xff, (pixel>>11)<<3, ((pixel>>5)&0x3f)<<2, (pixel&0x1f)<<3);
}
}
}
diff --git a/src/mess/drivers/gp32.c b/src/mess/drivers/gp32.c
index 4303ef3a0a6..1816057fc14 100644
--- a/src/mess/drivers/gp32.c
+++ b/src/mess/drivers/gp32.c
@@ -60,7 +60,7 @@ inline rgb_t gp32_state::s3c240x_get_color_5551( UINT16 data)
g = BITS( data, 10, 6) << 3;
b = BITS( data, 5, 1) << 3;
i = BIT( data, 1) << 2;
- return MAKE_RGB( r | i, g | i, b | i);
+ return rgb_t( r | i, g | i, b | i);
}
void gp32_state::s3c240x_lcd_dma_reload()
diff --git a/src/mess/drivers/hprot1.c b/src/mess/drivers/hprot1.c
index 1e331a547ab..0eacb71d004 100644
--- a/src/mess/drivers/hprot1.c
+++ b/src/mess/drivers/hprot1.c
@@ -212,8 +212,8 @@ WRITE8_MEMBER(hprot1_state::henry_io_w)
void hprot1_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static const gfx_layout henry_prot_charlayout =
diff --git a/src/mess/drivers/hyperscan.c b/src/mess/drivers/hyperscan.c
index 5387f80060e..346116e218e 100644
--- a/src/mess/drivers/hyperscan.c
+++ b/src/mess/drivers/hyperscan.c
@@ -406,7 +406,7 @@ void hyperscan_state::spg290_argb1555(bitmap_rgb32 &bitmap, const rectangle &cli
{
if (!(argb & 0x8000) && cliprect.contains(posx, posy))
{
- rgb_t color = MAKE_RGB(pal5bit(argb >> 10), pal5bit(argb >> 5), pal5bit(argb >> 0));
+ rgb_t color = rgb_t(pal5bit(argb >> 10), pal5bit(argb >> 5), pal5bit(argb >> 0));
bitmap.pix32(posy, posx) = color;
}
}
@@ -415,7 +415,7 @@ void hyperscan_state::spg290_rgb565(bitmap_rgb32 &bitmap, const rectangle &clipr
{
if ((!(transrgb & 0x10000) || (transrgb & 0xffff) != rgb) && cliprect.contains(posx, posy))
{
- rgb_t color = MAKE_RGB(pal5bit(rgb >> 11), pal6bit(rgb >> 5), pal5bit(rgb >> 0));
+ rgb_t color = rgb_t(pal5bit(rgb >> 11), pal6bit(rgb >> 5), pal5bit(rgb >> 0));
bitmap.pix32(posy, posx) = color;
}
}
@@ -515,7 +515,7 @@ UINT32 hyperscan_state::spg290_screen_update(screen_device &screen, bitmap_rgb32
}
else
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;
diff --git a/src/mess/drivers/ie15.c b/src/mess/drivers/ie15.c
index fddd3396f68..d9a894c0296 100644
--- a/src/mess/drivers/ie15.c
+++ b/src/mess/drivers/ie15.c
@@ -615,7 +615,7 @@ GFXDECODE_END
void ie15_state::palette_init()
{
- palette_set_color(machine(), 0, RGB_BLACK); // black
+ palette_set_color(machine(), 0, rgb_t::black); // black
palette_set_color_rgb(machine(), 1, 0x00, 0xc0, 0x00); // green
}
diff --git a/src/mess/drivers/intv.c b/src/mess/drivers/intv.c
index 9ee2490f5d6..02ff6b182b7 100644
--- a/src/mess/drivers/intv.c
+++ b/src/mess/drivers/intv.c
@@ -97,8 +97,8 @@ void intv_state::palette_init()
r = intv_colors[i * 3 + 0];
g = intv_colors[i * 3 + 1];
b = intv_colors[i * 3 + 2];
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
- colortable_palette_set_color(machine().colortable, i + 16, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
+ colortable_palette_set_color(machine().colortable, i + 16, rgb_t(r, g, b));
}
for (int i = 0; i < 16; i++)
diff --git a/src/mess/drivers/lcmate2.c b/src/mess/drivers/lcmate2.c
index 33106f7b10f..0f9cf9a9b01 100644
--- a/src/mess/drivers/lcmate2.c
+++ b/src/mess/drivers/lcmate2.c
@@ -196,8 +196,8 @@ INPUT_PORTS_END
void lcmate2_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
void lcmate2_state::machine_start()
diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c
index 4d030612610..de2cb1c7c61 100644
--- a/src/mess/drivers/mac.c
+++ b/src/mess/drivers/mac.c
@@ -135,15 +135,15 @@ WRITE32_MEMBER( mac_state::rbv_ramdac_w )
// Color Classic has no MONTYPE so the default gets us 512x384, which is right
if ((m_montype ? m_montype->read() : 2) == 1)
{
- palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
+ palette_set_color(space.machine(), m_rbv_clutoffs, rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
else
{
- palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
+ palette_set_color(space.machine(), m_rbv_clutoffs, rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
@@ -171,15 +171,15 @@ WRITE32_MEMBER( mac_state::ariel_ramdac_w ) // this is for the "Ariel" style RAM
// Color Classic has no MONTYPE so the default gets us 512x384, which is right
if ((m_montype ? m_montype->read() : 2) == 1)
{
- palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
+ palette_set_color(space.machine(), m_rbv_clutoffs, rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
else
{
- palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
+ palette_set_color(space.machine(), m_rbv_clutoffs, rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c
index 68f4533d0bd..d8bc980a50d 100644
--- a/src/mess/drivers/micronic.c
+++ b/src/mess/drivers/micronic.c
@@ -326,8 +326,8 @@ static NVRAM_HANDLER( micronic )
void micronic_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static HD61830_INTERFACE( lcdc_intf )
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index 7499c19da07..b4a13af50b8 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -1077,9 +1077,9 @@ MACHINE_RESET_MEMBER(polgar_state,academy)
PALETTE_INIT_MEMBER(polgar_state,chess_lcd)
{
- // palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148)); // some think this is closer, but slightly less readable
- palette_set_color(machine(), 0, MAKE_RGB(255, 255, 255));
- palette_set_color(machine(), 1, MAKE_RGB(0, 0, 0));
+ // palette_set_color(machine(), 0, rgb_t(138, 146, 148)); // some think this is closer, but slightly less readable
+ palette_set_color(machine(), 0, rgb_t(255, 255, 255));
+ palette_set_color(machine(), 1, rgb_t(0, 0, 0));
}
static const gfx_layout chess_charlayout =
diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c
index 2164664ed64..f6d2cf9e846 100644
--- a/src/mess/drivers/ms0515.c
+++ b/src/mess/drivers/ms0515.c
@@ -214,23 +214,23 @@ UINT32 ms0515_state::screen_update_ms0515(screen_device &screen, bitmap_ind16 &b
void ms0515_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(0, 0, 0));
- palette_set_color(machine(), 1, MAKE_RGB(0, 0, 127));
- palette_set_color(machine(), 2, MAKE_RGB(127, 0, 0));
- palette_set_color(machine(), 3, MAKE_RGB(127, 0, 127));
- palette_set_color(machine(), 4, MAKE_RGB(0, 127, 0));
- palette_set_color(machine(), 5, MAKE_RGB(0, 127, 127));
- palette_set_color(machine(), 6, MAKE_RGB(127, 127, 0));
- palette_set_color(machine(), 7, MAKE_RGB(127, 127, 127));
-
- palette_set_color(machine(), 8, MAKE_RGB(127, 127, 127));
- palette_set_color(machine(), 9, MAKE_RGB(127, 127, 255));
- palette_set_color(machine(), 10, MAKE_RGB(255, 127, 127));
- palette_set_color(machine(), 11, MAKE_RGB(255, 127, 255));
- palette_set_color(machine(), 12, MAKE_RGB(127, 255, 127));
- palette_set_color(machine(), 13, MAKE_RGB(127, 255, 255));
- palette_set_color(machine(), 14, MAKE_RGB(255, 255, 127));
- palette_set_color(machine(), 15, MAKE_RGB(255, 255, 255));
+ palette_set_color(machine(), 0, rgb_t(0, 0, 0));
+ palette_set_color(machine(), 1, rgb_t(0, 0, 127));
+ palette_set_color(machine(), 2, rgb_t(127, 0, 0));
+ palette_set_color(machine(), 3, rgb_t(127, 0, 127));
+ palette_set_color(machine(), 4, rgb_t(0, 127, 0));
+ palette_set_color(machine(), 5, rgb_t(0, 127, 127));
+ palette_set_color(machine(), 6, rgb_t(127, 127, 0));
+ palette_set_color(machine(), 7, rgb_t(127, 127, 127));
+
+ palette_set_color(machine(), 8, rgb_t(127, 127, 127));
+ palette_set_color(machine(), 9, rgb_t(127, 127, 255));
+ palette_set_color(machine(), 10, rgb_t(255, 127, 127));
+ palette_set_color(machine(), 11, rgb_t(255, 127, 255));
+ palette_set_color(machine(), 12, rgb_t(127, 255, 127));
+ palette_set_color(machine(), 13, rgb_t(127, 255, 255));
+ palette_set_color(machine(), 14, rgb_t(255, 255, 127));
+ palette_set_color(machine(), 15, rgb_t(255, 255, 255));
}
WRITE8_MEMBER(ms0515_state::ms0515_portc_w)
diff --git a/src/mess/drivers/mstation.c b/src/mess/drivers/mstation.c
index 551262e1bde..422955977e2 100644
--- a/src/mess/drivers/mstation.c
+++ b/src/mess/drivers/mstation.c
@@ -504,8 +504,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(mstation_state::mstation_kb_timer)
void mstation_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static RP5C01_INTERFACE( rtc_intf )
diff --git a/src/mess/drivers/nakajies.c b/src/mess/drivers/nakajies.c
index 2f4e65af9bb..49dec58a812 100644
--- a/src/mess/drivers/nakajies.c
+++ b/src/mess/drivers/nakajies.c
@@ -699,8 +699,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(nakajies_state::kb_timer)
void nakajies_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/p2000t.c b/src/mess/drivers/p2000t.c
index d84c5230c2a..c4b9f48fdb5 100644
--- a/src/mess/drivers/p2000t.c
+++ b/src/mess/drivers/p2000t.c
@@ -76,10 +76,10 @@ static const gfx_layout p2000m_charlayout =
PALETTE_INIT_MEMBER(p2000t_state,p2000m)
{
- palette_set_color(machine(),0,RGB_WHITE); /* white */
- palette_set_color(machine(),1,RGB_BLACK); /* black */
- palette_set_color(machine(),2,RGB_BLACK); /* black */
- palette_set_color(machine(),3,RGB_WHITE); /* white */
+ palette_set_color(machine(),0,rgb_t::white); /* white */
+ palette_set_color(machine(),1,rgb_t::black); /* black */
+ palette_set_color(machine(),2,rgb_t::black); /* black */
+ palette_set_color(machine(),3,rgb_t::white); /* white */
}
static GFXDECODE_START( p2000m )
diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c
index 4bf41223331..1cbc5c24aa5 100644
--- a/src/mess/drivers/pb1000.c
+++ b/src/mess/drivers/pb1000.c
@@ -282,8 +282,8 @@ INPUT_PORTS_END
void pb1000_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/pc1500.c b/src/mess/drivers/pc1500.c
index 0847c9fb4b7..819e8ead110 100644
--- a/src/mess/drivers/pc1500.c
+++ b/src/mess/drivers/pc1500.c
@@ -260,8 +260,8 @@ READ8_MEMBER( pc1500_state::port_a_r )
void pc1500_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static const lh5810_interface lh5810_pc1500_config =
diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c
index 5bc2861ab3b..02e0f1aa5a2 100644
--- a/src/mess/drivers/pc2000.c
+++ b/src/mess/drivers/pc2000.c
@@ -720,8 +720,8 @@ void pc1000_state::machine_reset()
void pc2000_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static const gfx_layout hd44780_charlayout =
diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c
index a360a51753c..a9d9b683701 100644
--- a/src/mess/drivers/pc4.c
+++ b/src/mess/drivers/pc4.c
@@ -163,8 +163,8 @@ INPUT_PORTS_END
void pc4_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static const gfx_layout pc4_charlayout =
diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c
index 6050ca3d5ba..c7f11aa0e03 100644
--- a/src/mess/drivers/pc6001.c
+++ b/src/mess/drivers/pc6001.c
@@ -2193,40 +2193,40 @@ MACHINE_RESET_MEMBER(pc6001_state,pc6001sr)
static const rgb_t defcolors[] =
{
- MAKE_RGB(0x07, 0xff, 0x00), /* GREEN */
- MAKE_RGB(0xff, 0xff, 0x00), /* YELLOW */
- MAKE_RGB(0x3b, 0x08, 0xff), /* BLUE */
- MAKE_RGB(0xcc, 0x00, 0x3b), /* RED */
- MAKE_RGB(0xff, 0xff, 0xff), /* BUFF */
- MAKE_RGB(0x07, 0xe3, 0x99), /* CYAN */
- MAKE_RGB(0xff, 0x1c, 0xff), /* MAGENTA */
- MAKE_RGB(0xff, 0x81, 0x00), /* ORANGE */
+ rgb_t(0x07, 0xff, 0x00), /* GREEN */
+ rgb_t(0xff, 0xff, 0x00), /* YELLOW */
+ rgb_t(0x3b, 0x08, 0xff), /* BLUE */
+ rgb_t(0xcc, 0x00, 0x3b), /* RED */
+ rgb_t(0xff, 0xff, 0xff), /* BUFF */
+ rgb_t(0x07, 0xe3, 0x99), /* CYAN */
+ rgb_t(0xff, 0x1c, 0xff), /* MAGENTA */
+ rgb_t(0xff, 0x81, 0x00), /* ORANGE */
/* MC6847 specific */
- MAKE_RGB(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */
- MAKE_RGB(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
- MAKE_RGB(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */
- MAKE_RGB(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */
+ rgb_t(0x00, 0x7c, 0x00), /* ALPHANUMERIC DARK GREEN */
+ rgb_t(0x07, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
+ rgb_t(0x91, 0x00, 0x00), /* ALPHANUMERIC DARK ORANGE */
+ rgb_t(0xff, 0x81, 0x00) /* ALPHANUMERIC BRIGHT ORANGE */
};
static const rgb_t mk2_defcolors[] =
{
- MAKE_RGB(0x00, 0x00, 0x00), /* BLACK */
- MAKE_RGB(0xff, 0xaf, 0x00), /* ORANGE */
- MAKE_RGB(0x00, 0xff, 0xaf), /* tone of GREEN */
- MAKE_RGB(0xaf, 0xff, 0x00), /* tone of GREEN */
- MAKE_RGB(0xaf, 0x00, 0xff), /* VIOLET */
- MAKE_RGB(0xff, 0x00, 0xaf), /* SCARLET */
- MAKE_RGB(0x00, 0xaf, 0xff), /* LIGHT BLUE */
- MAKE_RGB(0xaf, 0xaf, 0xaf), /* GRAY */
- MAKE_RGB(0x00, 0x00, 0x00), /* BLACK */
- MAKE_RGB(0xff, 0x00, 0x00), /* RED */
- MAKE_RGB(0x00, 0xff, 0x00), /* GREEN */
- MAKE_RGB(0xff, 0xff, 0x00), /* YELLOW */
- MAKE_RGB(0x00, 0x00, 0xff), /* BLUE */
- MAKE_RGB(0xff, 0x00, 0xff), /* PINK */
- MAKE_RGB(0x00, 0xff, 0xff), /* CYAN */
- MAKE_RGB(0xff, 0xff, 0xff) /* WHITE */
+ rgb_t(0x00, 0x00, 0x00), /* BLACK */
+ rgb_t(0xff, 0xaf, 0x00), /* ORANGE */
+ rgb_t(0x00, 0xff, 0xaf), /* tone of GREEN */
+ rgb_t(0xaf, 0xff, 0x00), /* tone of GREEN */
+ rgb_t(0xaf, 0x00, 0xff), /* VIOLET */
+ rgb_t(0xff, 0x00, 0xaf), /* SCARLET */
+ rgb_t(0x00, 0xaf, 0xff), /* LIGHT BLUE */
+ rgb_t(0xaf, 0xaf, 0xaf), /* GRAY */
+ rgb_t(0x00, 0x00, 0x00), /* BLACK */
+ rgb_t(0xff, 0x00, 0x00), /* RED */
+ rgb_t(0x00, 0xff, 0x00), /* GREEN */
+ rgb_t(0xff, 0xff, 0x00), /* YELLOW */
+ rgb_t(0x00, 0x00, 0xff), /* BLUE */
+ rgb_t(0xff, 0x00, 0xff), /* PINK */
+ rgb_t(0x00, 0xff, 0xff), /* CYAN */
+ rgb_t(0xff, 0xff, 0xff) /* WHITE */
};
void pc6001_state::palette_init()
diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c
index 7aac44c954c..eeb44ddcdcf 100644
--- a/src/mess/drivers/pc8001.c
+++ b/src/mess/drivers/pc8001.c
@@ -354,14 +354,14 @@ INPUT_PORTS_END
static const rgb_t PALETTE[] =
{
- RGB_BLACK,
- MAKE_RGB(0x00, 0x00, 0xff),
- MAKE_RGB(0xff, 0x00, 0x00),
- MAKE_RGB(0xff, 0x00, 0xff),
- MAKE_RGB(0x00, 0xff, 0x00),
- MAKE_RGB(0x00, 0xff, 0xff),
- MAKE_RGB(0xff, 0xff, 0x00),
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0x00, 0x00, 0xff),
+ rgb_t(0xff, 0x00, 0x00),
+ rgb_t(0xff, 0x00, 0xff),
+ rgb_t(0x00, 0xff, 0x00),
+ rgb_t(0x00, 0xff, 0xff),
+ rgb_t(0xff, 0xff, 0x00),
+ rgb_t::white
};
static UPD3301_DISPLAY_PIXELS( pc8001_display_pixels )
diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c
index c07fd28f66a..abbc13d3ec5 100644
--- a/src/mess/drivers/pce220.c
+++ b/src/mess/drivers/pce220.c
@@ -915,8 +915,8 @@ TIMER_DEVICE_CALLBACK_MEMBER(pce220_state::pce220_timer_callback)
PALETTE_INIT_MEMBER(pce220_state,pce220)
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/pdp1.c b/src/mess/drivers/pdp1.c
index dda6d83e061..3d16741d912 100644
--- a/src/mess/drivers/pdp1.c
+++ b/src/mess/drivers/pdp1.c
@@ -328,19 +328,19 @@ void pdp1_state::palette_init()
g = (int) ((g1*cur_level_1 + g2*cur_level_2) + .5);
b = (int) ((b1*cur_level_1 + b2*cur_level_2) + .5);
/* write color in palette */
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
/* apply decay for next iteration */
cur_level_1 *= decay_1;
cur_level_2 *= decay_2;
}
- colortable_palette_set_color(machine().colortable, 0, MAKE_RGB(0, 0, 0));
+ colortable_palette_set_color(machine().colortable, 0, rgb_t(0, 0, 0));
/* load static palette */
for ( i = 0; i < 6; i++ )
{
r = pdp1_colors[i*3]; g = pdp1_colors[i*3+1]; b = pdp1_colors[i*3+2];
- colortable_palette_set_color(machine().colortable, pen_crt_num_levels + i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, pen_crt_num_levels + i, rgb_t(r, g, b));
}
/* copy colortable to palette */
diff --git a/src/mess/drivers/pokemini.c b/src/mess/drivers/pokemini.c
index 367878dbd81..d790518e3d1 100644
--- a/src/mess/drivers/pokemini.c
+++ b/src/mess/drivers/pokemini.c
@@ -138,10 +138,10 @@ INPUT_PORTS_END
void pokemini_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(0xff, 0xfb, 0x87));
- palette_set_color(machine(), 1, MAKE_RGB(0xb1, 0xae, 0x4e));
- palette_set_color(machine(), 2, MAKE_RGB(0x84, 0x80, 0x4e));
- palette_set_color(machine(), 3, MAKE_RGB(0x4e, 0x4e, 0x4e));
+ palette_set_color(machine(), 0, rgb_t(0xff, 0xfb, 0x87));
+ palette_set_color(machine(), 1, rgb_t(0xb1, 0xae, 0x4e));
+ palette_set_color(machine(), 2, rgb_t(0x84, 0x80, 0x4e));
+ palette_set_color(machine(), 3, rgb_t(0x4e, 0x4e, 0x4e));
}
diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c
index 50bbde9679b..146171e7555 100644
--- a/src/mess/drivers/portfoli.c
+++ b/src/mess/drivers/portfoli.c
@@ -653,8 +653,8 @@ INPUT_PORTS_END
void portfolio_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/prestige.c b/src/mess/drivers/prestige.c
index f38baad8111..4d0d9282973 100644
--- a/src/mess/drivers/prestige.c
+++ b/src/mess/drivers/prestige.c
@@ -444,8 +444,8 @@ void prestige_state::machine_start()
void prestige_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(39, 108, 51));
- palette_set_color(machine(), 1, MAKE_RGB(16, 37, 84));
+ palette_set_color(machine(), 0, rgb_t(39, 108, 51));
+ palette_set_color(machine(), 1, rgb_t(16, 37, 84));
}
UINT32 prestige_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c
index feb1a1b76c9..32439dc3ae7 100644
--- a/src/mess/drivers/psion.c
+++ b/src/mess/drivers/psion.c
@@ -453,8 +453,8 @@ HD44780_PIXEL_UPDATE(psion_state::lz_pixel_update)
void psion_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static const gfx_layout psion_charlayout =
diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c
index a0a79fdef74..432d119e331 100644
--- a/src/mess/drivers/px4.c
+++ b/src/mess/drivers/px4.c
@@ -1357,14 +1357,14 @@ INPUT_PORTS_END
void px4_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
PALETTE_INIT_MEMBER(px4_state, px4p)
{
- palette_set_color(machine(), 0, MAKE_RGB(149, 157, 130));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(149, 157, 130));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/rd110.c b/src/mess/drivers/rd110.c
index 427377f7b15..1515917f0a2 100644
--- a/src/mess/drivers/rd110.c
+++ b/src/mess/drivers/rd110.c
@@ -197,8 +197,8 @@ WRITE8_MEMBER(d110_state::so_w)
void d110_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(0, 255, 0));
- palette_set_color(machine(), 1, MAKE_RGB(0, 0, 0));
+ palette_set_color(machine(), 0, rgb_t(0, 255, 0));
+ palette_set_color(machine(), 1, rgb_t(0, 0, 0));
}
static ADDRESS_MAP_START( d110_map, AS_PROGRAM, 8, d110_state )
diff --git a/src/mess/drivers/replicator.c b/src/mess/drivers/replicator.c
index a9e5f1cf16c..c51c41dbedc 100644
--- a/src/mess/drivers/replicator.c
+++ b/src/mess/drivers/replicator.c
@@ -625,8 +625,8 @@ const avr8_config atmega1280_config =
void replicator_state::palette_init()
{
//These colors were picked with the color picker in Inkscape, based on a photo of the LCD used in the Replicator 1 3d printer:
- palette_set_color(machine(), 0, MAKE_RGB(0xCA, 0xE7, 0xEB));
- palette_set_color(machine(), 1, MAKE_RGB(0x78, 0xAB, 0xA8));
+ palette_set_color(machine(), 0, rgb_t(0xCA, 0xE7, 0xEB));
+ palette_set_color(machine(), 1, rgb_t(0x78, 0xAB, 0xA8));
}
static const gfx_layout hd44780_charlayout =
diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c
index 578c25f56c2..67c4f301e9f 100644
--- a/src/mess/drivers/rex6000.c
+++ b/src/mess/drivers/rex6000.c
@@ -560,8 +560,8 @@ WRITE_LINE_MEMBER( rex6000_state::alarm_irq )
void rex6000_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
QUICKLOAD_LOAD_MEMBER( rex6000_state,rex6000)
diff --git a/src/mess/drivers/rmt32.c b/src/mess/drivers/rmt32.c
index c8da31571fe..f1ecfd3f928 100644
--- a/src/mess/drivers/rmt32.c
+++ b/src/mess/drivers/rmt32.c
@@ -323,8 +323,8 @@ WRITE8_MEMBER(mt32_state::so_w)
void mt32_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(0, 0, 0));
- palette_set_color(machine(), 1, MAKE_RGB(0, 255, 0));
+ palette_set_color(machine(), 0, rgb_t(0, 0, 0));
+ palette_set_color(machine(), 1, rgb_t(0, 255, 0));
}
static ADDRESS_MAP_START( mt32_map, AS_PROGRAM, 8, mt32_state )
diff --git a/src/mess/drivers/rt1715.c b/src/mess/drivers/rt1715.c
index 7220c1e7cb2..b2362db437f 100644
--- a/src/mess/drivers/rt1715.c
+++ b/src/mess/drivers/rt1715.c
@@ -174,9 +174,9 @@ static const i8275_interface rt1715_i8275_intf =
void rt1715_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(0x00, 0x00, 0x00)); /* black */
- palette_set_color(machine(), 1, MAKE_RGB(0x00, 0x7f, 0x00)); /* low intensity */
- palette_set_color(machine(), 2, MAKE_RGB(0x00, 0xff, 0x00)); /* high intensitiy */
+ palette_set_color(machine(), 0, rgb_t(0x00, 0x00, 0x00)); /* black */
+ palette_set_color(machine(), 1, rgb_t(0x00, 0x7f, 0x00)); /* low intensity */
+ palette_set_color(machine(), 2, rgb_t(0x00, 0xff, 0x00)); /* high intensitiy */
}
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index a586b39107e..dfac3a73f5b 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -230,7 +230,7 @@ WRITE8_MEMBER( rx78_state::vdp_reg_w )
g = (res & 0x22) == 0x22 ? 0xff : ((res & 0x22) == 0x02 ? 0x7f : 0x00);
b = (res & 0x44) == 0x44 ? 0xff : ((res & 0x44) == 0x04 ? 0x7f : 0x00);
- palette_set_color(machine(), i, MAKE_RGB(r,g,b));
+ palette_set_color(machine(), i, rgb_t(r,g,b));
}
}
@@ -242,7 +242,7 @@ WRITE8_MEMBER( rx78_state::vdp_bg_reg_w )
g = (data & 0x22) == 0x22 ? 0xff : ((data & 0x22) == 0x02 ? 0x7f : 0x00);
b = (data & 0x44) == 0x44 ? 0xff : ((data & 0x44) == 0x04 ? 0x7f : 0x00);
- palette_set_color(machine(), 0x10, MAKE_RGB(r,g,b));
+ palette_set_color(machine(), 0x10, rgb_t(r,g,b));
}
WRITE8_MEMBER( rx78_state::vdp_pri_mask_w )
diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c
index 5c94ff87d27..e0761a82c04 100644
--- a/src/mess/drivers/samcoupe.c
+++ b/src/mess/drivers/samcoupe.c
@@ -505,7 +505,7 @@ void samcoupe_state::palette_init()
g <<= 5;
b <<= 5;
- palette_set_color(machine(), i, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i, rgb_t(r, g, b));
}
machine().palette->normalize_range(0, 127);
diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c
index e6ba7dde7b0..457417017bc 100644
--- a/src/mess/drivers/sm1800.c
+++ b/src/mess/drivers/sm1800.c
@@ -145,9 +145,9 @@ I8255A_INTERFACE( sm1800_ppi8255_interface )
void sm1800_state::palette_init()
{
- palette_set_color(machine(), 0, RGB_BLACK); // black
+ palette_set_color(machine(), 0, rgb_t::black); // black
palette_set_color_rgb(machine(), 1, 0xa0, 0xa0, 0xa0); // white
- palette_set_color(machine(), 2, RGB_WHITE); // highlight
+ palette_set_color(machine(), 2, rgb_t::white); // highlight
}
diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c
index b12d27571ad..7c3b0b49dd6 100644
--- a/src/mess/drivers/socrates.c
+++ b/src/mess/drivers/socrates.c
@@ -695,7 +695,7 @@ rgb_t socrates_state::socrates_create_color(UINT8 color)
finalR = pow(finalR, 1/GAMMA)*255;
finalG = pow(finalG, 1/GAMMA)*255;
finalB = pow(finalB, 1/GAMMA)*255;
-composedcolor = MAKE_RGB((int)finalR,(int)finalG,(int)finalB);
+composedcolor = rgb_t((int)finalR,(int)finalG,(int)finalB);
return composedcolor;
}
diff --git a/src/mess/drivers/studio2.c b/src/mess/drivers/studio2.c
index 4e3854378ac..f3d51a29e4f 100644
--- a/src/mess/drivers/studio2.c
+++ b/src/mess/drivers/studio2.c
@@ -364,10 +364,10 @@ INPUT_PORTS_END
static const rgb_t VISICOM_PALETTE[] =
{
- MAKE_RGB(0x00, 0x40, 0x00),
- MAKE_RGB(0xaf, 0xdf, 0xe4),
- MAKE_RGB(0xb9, 0xc4, 0x2f),
- MAKE_RGB(0xef, 0x45, 0x4a)
+ rgb_t(0x00, 0x40, 0x00),
+ rgb_t(0xaf, 0xdf, 0xe4),
+ rgb_t(0xb9, 0xc4, 0x2f),
+ rgb_t(0xef, 0x45, 0x4a)
};
UINT32 visicom_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/drivers/svmu.c b/src/mess/drivers/svmu.c
index 0a5a41a6864..52bd6aba319 100644
--- a/src/mess/drivers/svmu.c
+++ b/src/mess/drivers/svmu.c
@@ -151,8 +151,8 @@ void svmu_state::machine_reset()
void svmu_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static LC8670_LCD_UPDATE( svmu_lcd_update )
diff --git a/src/mess/drivers/ti89.c b/src/mess/drivers/ti89.c
index 56bc58c8201..1ba43fc69c6 100644
--- a/src/mess/drivers/ti89.c
+++ b/src/mess/drivers/ti89.c
@@ -510,8 +510,8 @@ UINT32 ti68k_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
void ti68k_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
static MACHINE_CONFIG_START( ti89, ti68k_state )
diff --git a/src/mess/drivers/ti99_2.c b/src/mess/drivers/ti99_2.c
index f4a3f8a31ab..fe53cc6098a 100644
--- a/src/mess/drivers/ti99_2.c
+++ b/src/mess/drivers/ti99_2.c
@@ -162,8 +162,8 @@ INTERRUPT_GEN_MEMBER(ti99_2_state::ti99_2_vblank_interrupt)
void ti99_2_state::palette_init()
{
- palette_set_color(machine(),0,RGB_WHITE); /* white */
- palette_set_color(machine(),1,RGB_BLACK); /* black */
+ palette_set_color(machine(),0,rgb_t::white); /* white */
+ palette_set_color(machine(),1,rgb_t::black); /* black */
}
diff --git a/src/mess/drivers/tim100.c b/src/mess/drivers/tim100.c
index d100ae55215..1a535c873b5 100644
--- a/src/mess/drivers/tim100.c
+++ b/src/mess/drivers/tim100.c
@@ -49,9 +49,9 @@ static INPUT_PORTS_START( tim100 )
INPUT_PORTS_END
static const rgb_t tim100_palette[3] = {
- MAKE_RGB(0x00, 0x00, 0x00), // black
- MAKE_RGB(0xa0, 0xa0, 0xa0), // white
- MAKE_RGB(0xff, 0xff, 0xff) // highlight
+ rgb_t(0x00, 0x00, 0x00), // black
+ rgb_t(0xa0, 0xa0, 0xa0), // white
+ rgb_t(0xff, 0xff, 0xff) // highlight
};
void tim100_state::machine_reset()
diff --git a/src/mess/drivers/trs80m2.c b/src/mess/drivers/trs80m2.c
index 759ef75f40c..46f3681d87c 100644
--- a/src/mess/drivers/trs80m2.c
+++ b/src/mess/drivers/trs80m2.c
@@ -451,7 +451,7 @@ UINT32 trs80m2_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
{
if (m_blnkvid)
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
else
{
diff --git a/src/mess/drivers/tx0.c b/src/mess/drivers/tx0.c
index e4f5c89379e..9f1b71f7ecd 100644
--- a/src/mess/drivers/tx0.c
+++ b/src/mess/drivers/tx0.c
@@ -263,7 +263,7 @@ void tx0_state::palette_init()
g = (int) ((g1*cur_level_1 + g2*cur_level_2) + .5);
b = (int) ((b1*cur_level_1 + b2*cur_level_2) + .5);
/* write color in palette */
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
/* apply decay for next iteration */
cur_level_1 *= decay_1;
cur_level_2 *= decay_2;
@@ -283,13 +283,13 @@ void tx0_state::palette_init()
mame_printf_debug("File %s line %d: Please take higher value for pen_crt_num_levels or smaller value for decay\n", __FILE__, __LINE__);*/
#endif
#endif
- colortable_palette_set_color(machine().colortable, 0, MAKE_RGB(0, 0, 0));
+ colortable_palette_set_color(machine().colortable, 0, rgb_t(0, 0, 0));
/* load static palette */
for ( i = 0; i < 6; i++ )
{
r = tx0_colors[i*3]; g = tx0_colors[i*3+1]; b = tx0_colors[i*3+2];
- colortable_palette_set_color(machine().colortable, pen_crt_num_levels + i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, pen_crt_num_levels + i, rgb_t(r, g, b));
}
/* copy colortable to palette */
diff --git a/src/mess/drivers/unior.c b/src/mess/drivers/unior.c
index 1cf120dad48..d2ba7d53dda 100644
--- a/src/mess/drivers/unior.c
+++ b/src/mess/drivers/unior.c
@@ -280,9 +280,9 @@ static const i8275_interface crtc_intf =
static const rgb_t unior_palette[3] =
{
- MAKE_RGB(0x00, 0x00, 0x00), // black
- MAKE_RGB(0xa0, 0xa0, 0xa0), // white
- MAKE_RGB(0xff, 0xff, 0xff) // highlight
+ rgb_t(0x00, 0x00, 0x00), // black
+ rgb_t(0xa0, 0xa0, 0xa0), // white
+ rgb_t(0xff, 0xff, 0xff) // highlight
};
PALETTE_INIT_MEMBER(unior_state,unior)
diff --git a/src/mess/drivers/uzebox.c b/src/mess/drivers/uzebox.c
index 8ec5160f13e..81c98912926 100644
--- a/src/mess/drivers/uzebox.c
+++ b/src/mess/drivers/uzebox.c
@@ -245,7 +245,7 @@ INPUT_PORTS_END
void uzebox_state::line_update()
{
UINT32 cycles = (UINT32)(m_maincpu->get_elapsed_cycles() - m_line_start_cycles) / 2;
- rgb_t color = MAKE_RGB(pal3bit(m_port_c >> 0), pal3bit(m_port_c >> 3), pal2bit(m_port_c >> 6));
+ rgb_t color = rgb_t(pal3bit(m_port_c >> 0), pal3bit(m_port_c >> 3), pal2bit(m_port_c >> 6));
for (UINT32 x = m_line_pos_cycles; x < cycles; x++)
{
diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c
index 134982a2034..6daf247c354 100644
--- a/src/mess/drivers/vboy.c
+++ b/src/mess/drivers/vboy.c
@@ -1251,10 +1251,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(vboy_state::timer_pad_tick)
void vboy_state::palette_init()
{
- palette_set_color(machine(), 0, RGB_BLACK);
- palette_set_color(machine(), 1, RGB_BLACK);
- palette_set_color(machine(), 2, RGB_BLACK);
- palette_set_color(machine(), 3, RGB_BLACK);
+ palette_set_color(machine(), 0, rgb_t::black);
+ palette_set_color(machine(), 1, rgb_t::black);
+ palette_set_color(machine(), 2, rgb_t::black);
+ palette_set_color(machine(), 3, rgb_t::black);
}
void vboy_state::m_set_irq(UINT16 irq_vector)
diff --git a/src/mess/drivers/vc4000.c b/src/mess/drivers/vc4000.c
index a301a61b748..5e984d68545 100644
--- a/src/mess/drivers/vc4000.c
+++ b/src/mess/drivers/vc4000.c
@@ -342,14 +342,14 @@ INPUT_PORTS_END
static const rgb_t vc4000_palette[] =
{
// background colors
- MAKE_RGB(0, 0, 0), // black
- MAKE_RGB(0, 0, 175), // blue
- MAKE_RGB(0, 175, 0), // green
- MAKE_RGB(0, 255, 255), // cyan
- MAKE_RGB(255, 0, 0), // red
- MAKE_RGB(255, 0, 255), // magenta
- MAKE_RGB(200, 200, 0), // yellow
- MAKE_RGB(200, 200, 200), // white
+ rgb_t(0, 0, 0), // black
+ rgb_t(0, 0, 175), // blue
+ rgb_t(0, 175, 0), // green
+ rgb_t(0, 255, 255), // cyan
+ rgb_t(255, 0, 0), // red
+ rgb_t(255, 0, 255), // magenta
+ rgb_t(200, 200, 0), // yellow
+ rgb_t(200, 200, 200), // white
/* sprite colors
The control line simply inverts the RGB lines all at once.
We can do that in the code with ^7 */
diff --git a/src/mess/drivers/vta2000.c b/src/mess/drivers/vta2000.c
index 6d9c644fd4f..935d6e27792 100644
--- a/src/mess/drivers/vta2000.c
+++ b/src/mess/drivers/vta2000.c
@@ -152,7 +152,7 @@ GFXDECODE_END
void vta2000_state::palette_init()
{
- palette_set_color(machine(), 0, RGB_BLACK); // black
+ palette_set_color(machine(), 0, rgb_t::black); // black
palette_set_color_rgb(machine(), 1, 0x00, 0xc0, 0x00); // green
palette_set_color_rgb(machine(), 2, 0x00, 0xff, 0x00); // highlight
}
diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c
index 23d4c5c401e..764f2f915ca 100644
--- a/src/mess/drivers/vtech1.c
+++ b/src/mess/drivers/vtech1.c
@@ -862,22 +862,22 @@ INPUT_PORTS_END
static const UINT32 vtech1_palette_mono[] =
{
- MAKE_RGB(131, 131, 131),
- MAKE_RGB(211, 211, 211),
- MAKE_RGB(29, 29, 29),
- MAKE_RGB(76, 76, 76),
- MAKE_RGB(213, 213, 213),
- MAKE_RGB(167, 167, 167),
- MAKE_RGB(105, 105, 105),
- MAKE_RGB(136, 136, 136),
- MAKE_RGB(0, 0, 0),
- MAKE_RGB(131, 131, 131),
- MAKE_RGB(0, 0, 0),
- MAKE_RGB(213, 213, 213),
- MAKE_RGB(37, 37, 37),
- MAKE_RGB(133, 133, 133),
- MAKE_RGB(28, 28, 28),
- MAKE_RGB(193, 193, 193)
+ rgb_t(131, 131, 131),
+ rgb_t(211, 211, 211),
+ rgb_t(29, 29, 29),
+ rgb_t(76, 76, 76),
+ rgb_t(213, 213, 213),
+ rgb_t(167, 167, 167),
+ rgb_t(105, 105, 105),
+ rgb_t(136, 136, 136),
+ rgb_t(0, 0, 0),
+ rgb_t(131, 131, 131),
+ rgb_t(0, 0, 0),
+ rgb_t(213, 213, 213),
+ rgb_t(37, 37, 37),
+ rgb_t(133, 133, 133),
+ rgb_t(28, 28, 28),
+ rgb_t(193, 193, 193)
};
diff --git a/src/mess/drivers/vtech2.c b/src/mess/drivers/vtech2.c
index 711161d9e77..9e5485b9563 100644
--- a/src/mess/drivers/vtech2.c
+++ b/src/mess/drivers/vtech2.c
@@ -359,22 +359,22 @@ GFXDECODE_END
static const rgb_t vt_colors[] =
{
- RGB_BLACK,
- MAKE_RGB(0x00, 0x00, 0x7f), /* blue */
- MAKE_RGB(0x00, 0x7f, 0x00), /* green */
- MAKE_RGB(0x00, 0x7f, 0x7f), /* cyan */
- MAKE_RGB(0x7f, 0x00, 0x00), /* red */
- MAKE_RGB(0x7f, 0x00, 0x7f), /* magenta */
- MAKE_RGB(0x7f, 0x7f, 0x00), /* yellow */
- MAKE_RGB(0xa0, 0xa0, 0xa0), /* bright grey */
- MAKE_RGB(0x7f, 0x7f, 0x7f), /* dark grey */
- MAKE_RGB(0x00, 0x00, 0xff), /* bright blue */
- MAKE_RGB(0x00, 0xff, 0x00), /* bright green */
- MAKE_RGB(0x00, 0xff, 0xff), /* bright cyan */
- MAKE_RGB(0xff, 0x00, 0x00), /* bright red */
- MAKE_RGB(0xff, 0x00, 0xff), /* bright magenta */
- MAKE_RGB(0xff, 0xff, 0x00), /* bright yellow */
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0x00, 0x00, 0x7f), /* blue */
+ rgb_t(0x00, 0x7f, 0x00), /* green */
+ rgb_t(0x00, 0x7f, 0x7f), /* cyan */
+ rgb_t(0x7f, 0x00, 0x00), /* red */
+ rgb_t(0x7f, 0x00, 0x7f), /* magenta */
+ rgb_t(0x7f, 0x7f, 0x00), /* yellow */
+ rgb_t(0xa0, 0xa0, 0xa0), /* bright grey */
+ rgb_t(0x7f, 0x7f, 0x7f), /* dark grey */
+ rgb_t(0x00, 0x00, 0xff), /* bright blue */
+ rgb_t(0x00, 0xff, 0x00), /* bright green */
+ rgb_t(0x00, 0xff, 0xff), /* bright cyan */
+ rgb_t(0xff, 0x00, 0x00), /* bright red */
+ rgb_t(0xff, 0x00, 0xff), /* bright magenta */
+ rgb_t(0xff, 0xff, 0x00), /* bright yellow */
+ rgb_t::white
};
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index 4880bf1b5f5..7f7bfe7dd3d 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1072,8 +1072,8 @@ DEVICE_IMAGE_LOAD_MEMBER( x07_state, x07_card )
void x07_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c
index 80aa50f557f..941ba50b9b1 100644
--- a/src/mess/drivers/x1.c
+++ b/src/mess/drivers/x1.c
@@ -539,7 +539,7 @@ void x1_state::draw_gfxbitmap(running_machine &machine, bitmap_rgb32 &bitmap,con
UINT32 x1_state::screen_update_x1(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- bitmap.fill(MAKE_ARGB(0xff,0x00,0x00,0x00), cliprect);
+ bitmap.fill(rgb_t(0xff,0x00,0x00,0x00), cliprect);
/* TODO: correct calculation thru mc6845 regs */
m_xstart = ((mc6845_h_char_total - mc6845_h_sync_pos) * 8) / 2;
@@ -2534,7 +2534,7 @@ PALETTE_INIT_MEMBER(x1_state,x1)
int i;
for(i=0;i<(0x10+0x1000);i++)
- palette_set_color(machine(), i,MAKE_RGB(0x00,0x00,0x00));
+ palette_set_color(machine(), i,rgb_t(0x00,0x00,0x00));
}
static LEGACY_FLOPPY_OPTIONS_START( x1 )
diff --git a/src/mess/drivers/ymmu100.c b/src/mess/drivers/ymmu100.c
index afe923243e5..4557acff18a 100644
--- a/src/mess/drivers/ymmu100.c
+++ b/src/mess/drivers/ymmu100.c
@@ -157,8 +157,8 @@ READ8_MEMBER(mu100_state::p2_r)
void mu100_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(255, 255, 255));
- palette_set_color(machine(), 1, MAKE_RGB(0, 0, 0));
+ palette_set_color(machine(), 0, rgb_t(255, 255, 255));
+ palette_set_color(machine(), 1, rgb_t(0, 0, 0));
}
static ADDRESS_MAP_START( mu100_iomap, AS_IO, 8, mu100_state )
diff --git a/src/mess/drivers/z80ne.c b/src/mess/drivers/z80ne.c
index 2bcbc37a3ab..42ed4b570a2 100644
--- a/src/mess/drivers/z80ne.c
+++ b/src/mess/drivers/z80ne.c
@@ -383,24 +383,24 @@ INPUT_PORTS_END
static const UINT32 lx388palette[] =
{
- MAKE_RGB(0x00, 0xff, 0x00), /* GREEN */
- MAKE_RGB(0x00, 0xff, 0x00), /* YELLOW in original, here GREEN */
- MAKE_RGB(0x00, 0x00, 0xff), /* BLUE */
- MAKE_RGB(0xff, 0x00, 0x00), /* RED */
- MAKE_RGB(0xff, 0xff, 0xff), /* BUFF */
- MAKE_RGB(0x00, 0xff, 0xff), /* CYAN */
- MAKE_RGB(0xff, 0x00, 0xff), /* MAGENTA */
- MAKE_RGB(0xff, 0x80, 0x00), /* ORANGE */
-
- MAKE_RGB(0x00, 0x20, 0x00), /* BLACK in original, here DARK green */
- MAKE_RGB(0x00, 0xff, 0x00), /* GREEN */
- MAKE_RGB(0x00, 0x00, 0x00), /* BLACK */
- MAKE_RGB(0xff, 0xff, 0xff), /* BUFF */
-
- MAKE_RGB(0x00, 0x20, 0x00), /* ALPHANUMERIC DARK GREEN */
- MAKE_RGB(0x00, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
- MAKE_RGB(0x40, 0x10, 0x00), /* ALPHANUMERIC DARK ORANGE */
- MAKE_RGB(0xff, 0xc4, 0x18) /* ALPHANUMERIC BRIGHT ORANGE */
+ rgb_t(0x00, 0xff, 0x00), /* GREEN */
+ rgb_t(0x00, 0xff, 0x00), /* YELLOW in original, here GREEN */
+ rgb_t(0x00, 0x00, 0xff), /* BLUE */
+ rgb_t(0xff, 0x00, 0x00), /* RED */
+ rgb_t(0xff, 0xff, 0xff), /* BUFF */
+ rgb_t(0x00, 0xff, 0xff), /* CYAN */
+ rgb_t(0xff, 0x00, 0xff), /* MAGENTA */
+ rgb_t(0xff, 0x80, 0x00), /* ORANGE */
+
+ rgb_t(0x00, 0x20, 0x00), /* BLACK in original, here DARK green */
+ rgb_t(0x00, 0xff, 0x00), /* GREEN */
+ rgb_t(0x00, 0x00, 0x00), /* BLACK */
+ rgb_t(0xff, 0xff, 0xff), /* BUFF */
+
+ rgb_t(0x00, 0x20, 0x00), /* ALPHANUMERIC DARK GREEN */
+ rgb_t(0x00, 0xff, 0x00), /* ALPHANUMERIC BRIGHT GREEN */
+ rgb_t(0x40, 0x10, 0x00), /* ALPHANUMERIC DARK ORANGE */
+ rgb_t(0xff, 0xc4, 0x18) /* ALPHANUMERIC BRIGHT ORANGE */
};
static const ay31015_config z80ne_ay31015_config =
diff --git a/src/mess/drivers/zx.c b/src/mess/drivers/zx.c
index f8eea5664b1..bfd15612ee5 100644
--- a/src/mess/drivers/zx.c
+++ b/src/mess/drivers/zx.c
@@ -328,18 +328,18 @@ GFXDECODE_END
void zx_state::palette_init()
{
- palette_set_color(machine(),0,RGB_WHITE); /* white */
- palette_set_color(machine(),1,RGB_BLACK); /* black */
- palette_set_color(machine(),2,RGB_BLACK); /* black */
- palette_set_color(machine(),3,RGB_WHITE); /* white */
+ palette_set_color(machine(),0,rgb_t::white); /* white */
+ palette_set_color(machine(),1,rgb_t::black); /* black */
+ palette_set_color(machine(),2,rgb_t::black); /* black */
+ palette_set_color(machine(),3,rgb_t::white); /* white */
}
PALETTE_INIT_MEMBER(zx_state,ts1000)
{
- palette_set_color(machine(),0,MAKE_RGB(64, 244, 244)); /* cyan */
- palette_set_color(machine(),1,RGB_BLACK); /* black */
- palette_set_color(machine(),2,RGB_BLACK); /* black */
- palette_set_color(machine(),3,MAKE_RGB(64, 244, 244)); /* cyan */
+ palette_set_color(machine(),0,rgb_t(64, 244, 244)); /* cyan */
+ palette_set_color(machine(),1,rgb_t::black); /* black */
+ palette_set_color(machine(),2,rgb_t::black); /* black */
+ palette_set_color(machine(),3,rgb_t(64, 244, 244)); /* cyan */
}
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index 93fa5b7c8e7..bc5f37c8d14 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -120,76 +120,76 @@ The hardware allows selection of 32 colours, but these extra colours are copies
static const rgb_t amstrad_palette[32] =
{
- MAKE_RGB(0x060, 0x060, 0x060), /* white */
- MAKE_RGB(0x060, 0x060, 0x060), /* white */
- MAKE_RGB(0x000, 0x0ff, 0x060), /* sea green */
- MAKE_RGB(0x0ff, 0x0ff, 0x060), /* pastel yellow */
- MAKE_RGB(0x000, 0x000, 0x060), /* blue */
- MAKE_RGB(0x0ff, 0x000, 0x060), /* purple */
- MAKE_RGB(0x000, 0x060, 0x060), /* cyan */
- MAKE_RGB(0x0ff, 0x060, 0x060), /* pink */
- MAKE_RGB(0x0ff, 0x000, 0x060), /* purple */
- MAKE_RGB(0x0ff, 0x0ff, 0x060), /* pastel yellow */
- MAKE_RGB(0x0ff, 0x0ff, 0x000), /* bright yellow */
- MAKE_RGB(0x0ff, 0x0ff, 0x0ff), /* bright white */
- MAKE_RGB(0x0ff, 0x000, 0x000), /* bright red */
- MAKE_RGB(0x0ff, 0x000, 0x0ff), /* bright magenta */
- MAKE_RGB(0x0ff, 0x060, 0x000), /* orange */
- MAKE_RGB(0x0ff, 0x060, 0x0ff), /* pastel magenta */
- MAKE_RGB(0x000, 0x000, 0x060), /* blue */
- MAKE_RGB(0x000, 0x0ff, 0x060), /* sea green */
- MAKE_RGB(0x000, 0x0ff, 0x000), /* bright green */
- MAKE_RGB(0x000, 0x0ff, 0x0ff), /* bright cyan */
- MAKE_RGB(0x000, 0x000, 0x000), /* black */
- MAKE_RGB(0x000, 0x000, 0x0ff), /* bright blue */
- MAKE_RGB(0x000, 0x060, 0x000), /* green */
- MAKE_RGB(0x000, 0x060, 0x0ff), /* sky blue */
- MAKE_RGB(0x060, 0x000, 0x060), /* magenta */
- MAKE_RGB(0x060, 0x0ff, 0x060), /* pastel green */
- MAKE_RGB(0x060, 0x0ff, 0x060), /* lime */
- MAKE_RGB(0x060, 0x0ff, 0x0ff), /* pastel cyan */
- MAKE_RGB(0x060, 0x000, 0x000), /* Red */
- MAKE_RGB(0x060, 0x000, 0x0ff), /* mauve */
- MAKE_RGB(0x060, 0x060, 0x000), /* yellow */
- MAKE_RGB(0x060, 0x060, 0x0ff) /* pastel blue */
+ rgb_t(0x060, 0x060, 0x060), /* white */
+ rgb_t(0x060, 0x060, 0x060), /* white */
+ rgb_t(0x000, 0x0ff, 0x060), /* sea green */
+ rgb_t(0x0ff, 0x0ff, 0x060), /* pastel yellow */
+ rgb_t(0x000, 0x000, 0x060), /* blue */
+ rgb_t(0x0ff, 0x000, 0x060), /* purple */
+ rgb_t(0x000, 0x060, 0x060), /* cyan */
+ rgb_t(0x0ff, 0x060, 0x060), /* pink */
+ rgb_t(0x0ff, 0x000, 0x060), /* purple */
+ rgb_t(0x0ff, 0x0ff, 0x060), /* pastel yellow */
+ rgb_t(0x0ff, 0x0ff, 0x000), /* bright yellow */
+ rgb_t(0x0ff, 0x0ff, 0x0ff), /* bright white */
+ rgb_t(0x0ff, 0x000, 0x000), /* bright red */
+ rgb_t(0x0ff, 0x000, 0x0ff), /* bright magenta */
+ rgb_t(0x0ff, 0x060, 0x000), /* orange */
+ rgb_t(0x0ff, 0x060, 0x0ff), /* pastel magenta */
+ rgb_t(0x000, 0x000, 0x060), /* blue */
+ rgb_t(0x000, 0x0ff, 0x060), /* sea green */
+ rgb_t(0x000, 0x0ff, 0x000), /* bright green */
+ rgb_t(0x000, 0x0ff, 0x0ff), /* bright cyan */
+ rgb_t(0x000, 0x000, 0x000), /* black */
+ rgb_t(0x000, 0x000, 0x0ff), /* bright blue */
+ rgb_t(0x000, 0x060, 0x000), /* green */
+ rgb_t(0x000, 0x060, 0x0ff), /* sky blue */
+ rgb_t(0x060, 0x000, 0x060), /* magenta */
+ rgb_t(0x060, 0x0ff, 0x060), /* pastel green */
+ rgb_t(0x060, 0x0ff, 0x060), /* lime */
+ rgb_t(0x060, 0x0ff, 0x0ff), /* pastel cyan */
+ rgb_t(0x060, 0x000, 0x000), /* Red */
+ rgb_t(0x060, 0x000, 0x0ff), /* mauve */
+ rgb_t(0x060, 0x060, 0x000), /* yellow */
+ rgb_t(0x060, 0x060, 0x0ff) /* pastel blue */
};
/* the green brightness is equal to the firmware colour index */
static const rgb_t amstrad_green_palette[32] =
{
- MAKE_RGB(0x000, 0x07F, 0x000), /*13*/
- MAKE_RGB(0x000, 0x07F, 0x000), /*13*/
- MAKE_RGB(0x000, 0x0BA, 0x000), /*19*/
- MAKE_RGB(0x000, 0x0F5, 0x000), /*25*/
- MAKE_RGB(0x000, 0x009, 0x000), /*1*/
- MAKE_RGB(0x000, 0x044, 0x000), /*7*/
- MAKE_RGB(0x000, 0x062, 0x000), /*10*/
- MAKE_RGB(0x000, 0x09C, 0x000), /*16*/
- MAKE_RGB(0x000, 0x044, 0x000), /*7*/
- MAKE_RGB(0x000, 0x0F5, 0x000), /*25*/
- MAKE_RGB(0x000, 0x0EB, 0x000), /*24*/
- MAKE_RGB(0x000, 0x0FF, 0x000), /*26*/
- MAKE_RGB(0x000, 0x03A, 0x000), /*6*/
- MAKE_RGB(0x000, 0x04E, 0x000), /*8*/
- MAKE_RGB(0x000, 0x093, 0x000), /*15*/
- MAKE_RGB(0x000, 0x0A6, 0x000), /*17*/
- MAKE_RGB(0x000, 0x009, 0x000), /*1*/
- MAKE_RGB(0x000, 0x0BA, 0x000), /*19*/
- MAKE_RGB(0x000, 0x0B0, 0x000), /*18*/
- MAKE_RGB(0x000, 0x0C4, 0x000), /*20*/
- MAKE_RGB(0x000, 0x000, 0x000), /*0*/
- MAKE_RGB(0x000, 0x013, 0x000), /*2*/
- MAKE_RGB(0x000, 0x058, 0x000), /*9*/
- MAKE_RGB(0x000, 0x06B, 0x000), /*11*/
- MAKE_RGB(0x000, 0x027, 0x000), /*4*/
- MAKE_RGB(0x000, 0x0D7, 0x000), /*22*/
- MAKE_RGB(0x000, 0x0CD, 0x000), /*21*/
- MAKE_RGB(0x000, 0x0E1, 0x000), /*23*/
- MAKE_RGB(0x000, 0x01D, 0x000), /*3*/
- MAKE_RGB(0x000, 0x031, 0x000), /*5*/
- MAKE_RGB(0x000, 0x075, 0x000), /*12*/
- MAKE_RGB(0x000, 0x089, 0x000) /*14*/
+ rgb_t(0x000, 0x07F, 0x000), /*13*/
+ rgb_t(0x000, 0x07F, 0x000), /*13*/
+ rgb_t(0x000, 0x0BA, 0x000), /*19*/
+ rgb_t(0x000, 0x0F5, 0x000), /*25*/
+ rgb_t(0x000, 0x009, 0x000), /*1*/
+ rgb_t(0x000, 0x044, 0x000), /*7*/
+ rgb_t(0x000, 0x062, 0x000), /*10*/
+ rgb_t(0x000, 0x09C, 0x000), /*16*/
+ rgb_t(0x000, 0x044, 0x000), /*7*/
+ rgb_t(0x000, 0x0F5, 0x000), /*25*/
+ rgb_t(0x000, 0x0EB, 0x000), /*24*/
+ rgb_t(0x000, 0x0FF, 0x000), /*26*/
+ rgb_t(0x000, 0x03A, 0x000), /*6*/
+ rgb_t(0x000, 0x04E, 0x000), /*8*/
+ rgb_t(0x000, 0x093, 0x000), /*15*/
+ rgb_t(0x000, 0x0A6, 0x000), /*17*/
+ rgb_t(0x000, 0x009, 0x000), /*1*/
+ rgb_t(0x000, 0x0BA, 0x000), /*19*/
+ rgb_t(0x000, 0x0B0, 0x000), /*18*/
+ rgb_t(0x000, 0x0C4, 0x000), /*20*/
+ rgb_t(0x000, 0x000, 0x000), /*0*/
+ rgb_t(0x000, 0x013, 0x000), /*2*/
+ rgb_t(0x000, 0x058, 0x000), /*9*/
+ rgb_t(0x000, 0x06B, 0x000), /*11*/
+ rgb_t(0x000, 0x027, 0x000), /*4*/
+ rgb_t(0x000, 0x0D7, 0x000), /*22*/
+ rgb_t(0x000, 0x0CD, 0x000), /*21*/
+ rgb_t(0x000, 0x0E1, 0x000), /*23*/
+ rgb_t(0x000, 0x01D, 0x000), /*3*/
+ rgb_t(0x000, 0x031, 0x000), /*5*/
+ rgb_t(0x000, 0x075, 0x000), /*12*/
+ rgb_t(0x000, 0x089, 0x000) /*14*/
};
diff --git a/src/mess/machine/pk8020.c b/src/mess/machine/pk8020.c
index 8ca5c4f05c6..fbb20425edd 100644
--- a/src/mess/machine/pk8020.c
+++ b/src/mess/machine/pk8020.c
@@ -60,7 +60,7 @@ WRITE8_MEMBER(pk8020_state::sysreg_w)
UINT8 r = ((color & 0x04) ? 0xC0 : 0) + i;
UINT8 g = ((color & 0x02) ? 0xC0 : 0) + i;
UINT8 b = ((color & 0x01) ? 0xC0 : 0) + i;
- palette_set_color( machine(), number, MAKE_RGB(r,g,b) );
+ palette_set_color( machine(), number, rgb_t(r,g,b) );
}
}
diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c
index b696b5119c5..fe5767fcff3 100644
--- a/src/mess/machine/s3c44b0.c
+++ b/src/mess/machine/s3c44b0.c
@@ -309,7 +309,7 @@ rgb_t s3c44b0_device::lcd_get_color_stn_04(UINT8 data)
{
UINT8 r, g, b;
r = g = b = BITS(data, 3, 0) << 4;
- return MAKE_RGB(r, g, b);
+ return rgb_t(r, g, b);
}
UINT8 s3c44b0_device::lcd_get_color_stn_08_r(UINT8 data)
@@ -523,7 +523,7 @@ UINT32 s3c44b0_device::video_update(screen_device &screen, bitmap_rgb32 &bitmap,
UINT8 *vram = m_lcd.bitmap + y * (m_lcd.hpos_max - m_lcd.hpos_min + 1);
for (int x = 0; x < screen.width(); x++)
{
- *scanline++ = MAKE_RGB(vram[0], vram[1], vram[2]);
+ *scanline++ = rgb_t(vram[0], vram[1], vram[2]);
vram += 3;
}
}
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 8e178563ee0..be4c1bc259b 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -1076,9 +1076,9 @@ VIDEO_RESET_MEMBER(sms_state,sms1)
UINT8 sscope_binocular_hack = m_port_scope_binocular->read();
if (sscope_binocular_hack & 0x01)
- m_prevleft_bitmap.fill(RGB_BLACK);
+ m_prevleft_bitmap.fill(rgb_t::black);
if (sscope_binocular_hack & 0x02)
- m_prevright_bitmap.fill(RGB_BLACK);
+ m_prevright_bitmap.fill(rgb_t::black);
}
m_sscope_state = 0;
@@ -1187,7 +1187,7 @@ UINT32 sms_state::screen_update_sms1(screen_device &screen, bitmap_rgb32 &bitmap
}
}
}
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;
@@ -1216,7 +1216,7 @@ UINT32 sms_state::screen_update_gamegear(screen_device &screen, bitmap_rgb32 &bi
copybitmap(bitmap, vdp_bitmap, 0, 0, 0, 0, cliprect);
if (prev_bitmap_copied)
{
- m_prev_bitmap.fill(RGB_BLACK);
+ m_prev_bitmap.fill(rgb_t::black);
prev_bitmap_copied = false;
}
}
diff --git a/src/mess/machine/sms_lphaser.c b/src/mess/machine/sms_lphaser.c
index abd0674a290..9463dfa7f38 100644
--- a/src/mess/machine/sms_lphaser.c
+++ b/src/mess/machine/sms_lphaser.c
@@ -212,7 +212,7 @@ int sms_light_phaser_device::bright_aim_area( emu_timer *timer, int lgun_x, int
color = m_port->pixel_r();
/* reference: http://www.w3.org/TR/AERT#color-contrast */
- brightness = (RGB_RED(color) * 0.299) + (RGB_GREEN(color) * 0.587) + (RGB_BLUE(color) * 0.114);
+ brightness = (color.r() * 0.299) + (color.g() * 0.587) + (color.b() * 0.114);
//printf ("color brightness: %2X for x %d y %d\n", brightness, beam_x, beam_y);
result = (brightness >= sensor_min_brightness) ? 0 : 1;
diff --git a/src/mess/machine/vector06.c b/src/mess/machine/vector06.c
index f8e30b96cdb..9c2d2ea81c9 100644
--- a/src/mess/machine/vector06.c
+++ b/src/mess/machine/vector06.c
@@ -60,7 +60,7 @@ WRITE8_MEMBER( vector06_state::vector06_color_set )
UINT8 r = (data & 7) << 5;
UINT8 g = ((data >> 3) & 7) << 5;
UINT8 b = ((data >>6) & 3) << 6;
- palette_set_color( machine(), m_color_index, MAKE_RGB(r,g,b) );
+ palette_set_color( machine(), m_color_index, rgb_t(r,g,b) );
}
diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c
index 351fd952ed7..0abee5da615 100644
--- a/src/mess/video/733_asr.c
+++ b/src/mess/video/733_asr.c
@@ -96,8 +96,8 @@ GFXDECODE_END
PALETTE_INIT_MEMBER(asr733_device, asr733)
{
- palette_set_color(machine(),0,RGB_WHITE); /* white */
- palette_set_color(machine(),1,RGB_BLACK); /* black */
+ palette_set_color(machine(),0,rgb_t::white); /* white */
+ palette_set_color(machine(),1,rgb_t::black); /* black */
}
/*
diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c
index f7d226fecc2..1b435066783 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -141,7 +141,7 @@ PALETTE_INIT_MEMBER(vdt911_device, vdt911)
for ( i = 0; i < 3; i++ )
{
r = vdt911_colors[i*3]; g = vdt911_colors[i*3+1]; b = vdt911_colors[i*3+2];
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
}
for(i=0;i<8;i++)
diff --git a/src/mess/video/abc1600.c b/src/mess/video/abc1600.c
index d6ca04f9fa5..aff7cf19b85 100644
--- a/src/mess/video/abc1600.c
+++ b/src/mess/video/abc1600.c
@@ -1289,7 +1289,7 @@ UINT32 abc1600_mover_device::screen_update(screen_device &screen, bitmap_rgb32 &
}
else
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;
diff --git a/src/mess/video/abc800.c b/src/mess/video/abc800.c
index ecf486bcc89..9f6a1c4f923 100644
--- a/src/mess/video/abc800.c
+++ b/src/mess/video/abc800.c
@@ -18,14 +18,14 @@
static const rgb_t PALETTE[] =
{
- RGB_BLACK,
- MAKE_RGB(0xff, 0x00, 0x00), // red
- MAKE_RGB(0x00, 0xff, 0x00), // green
- MAKE_RGB(0xff, 0xff, 0x00), // yellow
- MAKE_RGB(0x00, 0x00, 0xff), // blue
- MAKE_RGB(0xff, 0x00, 0xff), // magenta
- MAKE_RGB(0x00, 0xff, 0xff), // cyan
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0xff, 0x00, 0x00), // red
+ rgb_t(0x00, 0xff, 0x00), // green
+ rgb_t(0xff, 0xff, 0x00), // yellow
+ rgb_t(0x00, 0x00, 0xff), // blue
+ rgb_t(0xff, 0x00, 0xff), // magenta
+ rgb_t(0x00, 0xff, 0xff), // cyan
+ rgb_t::white
};
@@ -101,7 +101,7 @@ void abc800c_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect)
if (color)
{
- bool black = bitmap.pix32(y, x) == RGB_BLACK;
+ bool black = bitmap.pix32(y, x) == rgb_t::black;
bool opaque = !BIT(fgctl, 3);
if (black || opaque)
@@ -137,7 +137,7 @@ void abc800_state::video_start()
UINT32 abc800c_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
// clear screen
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
// draw text
if (!BIT(m_fgctl, 7))
@@ -295,7 +295,7 @@ UINT32 abc800m_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
screen.set_visible_area(0, 767, 0, 311);
// clear screen
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
// draw HR graphics
hr_update(bitmap, cliprect);
diff --git a/src/mess/video/abc806.c b/src/mess/video/abc806.c
index 05093fd5b6c..3c6b88a942e 100644
--- a/src/mess/video/abc806.c
+++ b/src/mess/video/abc806.c
@@ -28,14 +28,14 @@
static const rgb_t PALETTE[] =
{
- RGB_BLACK, // black
- MAKE_RGB(0xff, 0x00, 0x00), // red
- MAKE_RGB(0x00, 0xff, 0x00), // green
- MAKE_RGB(0xff, 0xff, 0x00), // yellow
- MAKE_RGB(0x00, 0x00, 0xff), // blue
- MAKE_RGB(0xff, 0x00, 0xff), // magenta
- MAKE_RGB(0x00, 0xff, 0xff), // cyan
- RGB_WHITE // white
+ rgb_t::black, // black
+ rgb_t(0xff, 0x00, 0x00), // red
+ rgb_t(0x00, 0xff, 0x00), // green
+ rgb_t(0xff, 0xff, 0x00), // yellow
+ rgb_t(0x00, 0x00, 0xff), // blue
+ rgb_t(0xff, 0x00, 0xff), // magenta
+ rgb_t(0x00, 0xff, 0xff), // cyan
+ rgb_t::white // white
};
@@ -446,7 +446,7 @@ void abc806_state::hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
int x = HORIZONTAL_PORCH_HACK + (ABC800_CHAR_WIDTH * 4) - 16 + (sx * 4) + pixel;
- if (BIT(dot, 15) || (bitmap.pix32(y, x) == RGB_BLACK))
+ if (BIT(dot, 15) || (bitmap.pix32(y, x) == rgb_t::black))
{
bitmap.pix32(y, x) = PALETTE[(dot >> 12) & 0x07];
}
diff --git a/src/mess/video/aquarius.c b/src/mess/video/aquarius.c
index acb54b35d83..76c1d00cf35 100644
--- a/src/mess/video/aquarius.c
+++ b/src/mess/video/aquarius.c
@@ -13,22 +13,22 @@
static const rgb_t aquarius_colors[] =
{
- RGB_BLACK, /* Black */
- MAKE_RGB(0xff, 0x00, 0x00), /* Red */
- MAKE_RGB(0x00, 0xff, 0x00), /* Green */
- MAKE_RGB(0xff, 0xff, 0x00), /* Yellow */
- MAKE_RGB(0x00, 0x00, 0xff), /* Blue */
- MAKE_RGB(0x7f, 0x00, 0x7f), /* Violet */
- MAKE_RGB(0x7f, 0xff, 0xff), /* Light Blue-Green */
- RGB_WHITE, /* White */
- MAKE_RGB(0xc0, 0xc0, 0xc0), /* Light Gray */
- MAKE_RGB(0x00, 0xff, 0xff), /* Blue-Green */
- MAKE_RGB(0xff, 0x00, 0xff), /* Magenta */
- MAKE_RGB(0x00, 0x00, 0x7f), /* Dark Blue */
- MAKE_RGB(0xff, 0xff, 0x7f), /* Light Yellow */
- MAKE_RGB(0x7f, 0xff, 0x7f), /* Light Green */
- MAKE_RGB(0xff, 0x7f, 0x00), /* Orange */
- MAKE_RGB(0x7f, 0x7f, 0x7f) /* Dark Gray */
+ rgb_t::black, /* Black */
+ rgb_t(0xff, 0x00, 0x00), /* Red */
+ rgb_t(0x00, 0xff, 0x00), /* Green */
+ rgb_t(0xff, 0xff, 0x00), /* Yellow */
+ rgb_t(0x00, 0x00, 0xff), /* Blue */
+ rgb_t(0x7f, 0x00, 0x7f), /* Violet */
+ rgb_t(0x7f, 0xff, 0xff), /* Light Blue-Green */
+ rgb_t::white, /* White */
+ rgb_t(0xc0, 0xc0, 0xc0), /* Light Gray */
+ rgb_t(0x00, 0xff, 0xff), /* Blue-Green */
+ rgb_t(0xff, 0x00, 0xff), /* Magenta */
+ rgb_t(0x00, 0x00, 0x7f), /* Dark Blue */
+ rgb_t(0xff, 0xff, 0x7f), /* Light Yellow */
+ rgb_t(0x7f, 0xff, 0x7f), /* Light Green */
+ rgb_t(0xff, 0x7f, 0x00), /* Orange */
+ rgb_t(0x7f, 0x7f, 0x7f) /* Dark Gray */
};
static const unsigned short aquarius_palette[] =
diff --git a/src/mess/video/avigo.c b/src/mess/video/avigo.c
index db993d3c72e..a280d721c53 100644
--- a/src/mess/video/avigo.c
+++ b/src/mess/video/avigo.c
@@ -80,8 +80,8 @@ void avigo_state::video_start()
/* Initialise the palette */
void avigo_state::palette_init()
{
- palette_set_color(machine(),0,MAKE_RGB(0xff,0xff,0xff)); /* white */
- palette_set_color(machine(),1,MAKE_RGB(0x00,0x00,0x00)); /* black */
+ palette_set_color(machine(),0,rgb_t(0xff,0xff,0xff)); /* white */
+ palette_set_color(machine(),1,rgb_t(0x00,0x00,0x00)); /* black */
}
UINT32 avigo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/video/b2m.c b/src/mess/video/b2m.c
index 329353ed954..3bb006f9d3d 100644
--- a/src/mess/video/b2m.c
+++ b/src/mess/video/b2m.c
@@ -46,10 +46,10 @@ UINT32 b2m_state::screen_update_b2m(screen_device &screen, bitmap_ind16 &bitmap,
}
static const rgb_t b2m_palette[4] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0x00), // 1
- MAKE_RGB(0x00, 0x00, 0x00), // 2
- MAKE_RGB(0x00, 0x00, 0x00), // 3
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0x00), // 1
+ rgb_t(0x00, 0x00, 0x00), // 2
+ rgb_t(0x00, 0x00, 0x00), // 3
};
void b2m_state::palette_init()
diff --git a/src/mess/video/bbc.c b/src/mess/video/bbc.c
index 37d21946ba9..8270b84fe56 100644
--- a/src/mess/video/bbc.c
+++ b/src/mess/video/bbc.c
@@ -201,7 +201,7 @@ static MC6845_UPDATE_ROW( vid_update_row )
int g = BIT(col, 1) * 0xff;
int b = BIT(col, 2) * 0xff;
- rgb_t rgb = MAKE_RGB(r, g, b);
+ rgb_t rgb = rgb_t(r, g, b);
bitmap.pix32(y, (x_pos*state->m_pixels_per_byte)+pixelno) = rgb;
}
diff --git a/src/mess/video/busicom.c b/src/mess/video/busicom.c
index d52b508e3db..edf10d37247 100644
--- a/src/mess/video/busicom.c
+++ b/src/mess/video/busicom.c
@@ -1849,10 +1849,10 @@ void busicom_state::palette_init()
{
int i;
for(i=0;i<8;i++) {
- palette_set_color( machine(), i, MAKE_RGB(color[i],color[i],color[i]) );
+ palette_set_color( machine(), i, rgb_t(color[i],color[i],color[i]) );
}
- palette_set_color( machine(), 8, MAKE_RGB(0xff,0xff,0xff) );
+ palette_set_color( machine(), 8, rgb_t(0xff,0xff,0xff) );
for(i=0;i<7;i++) {
- palette_set_color( machine(), i+9, MAKE_RGB(color_red[i],0x00,0x00) );
+ palette_set_color( machine(), i+9, rgb_t(color_red[i],0x00,0x00) );
}
}
diff --git a/src/mess/video/cgc7900.c b/src/mess/video/cgc7900.c
index 99915438699..9b4418fef9e 100644
--- a/src/mess/video/cgc7900.c
+++ b/src/mess/video/cgc7900.c
@@ -26,14 +26,14 @@
static const rgb_t PALETTE[] =
{
- RGB_BLACK,
- MAKE_RGB(0x00, 0x00, 0xff),
- MAKE_RGB(0x00, 0xff, 0x00),
- MAKE_RGB(0x00, 0xff, 0xff),
- MAKE_RGB(0xff, 0x00, 0x00),
- MAKE_RGB(0xff, 0x00, 0xff),
- MAKE_RGB(0xff, 0xff, 0x00),
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0x00, 0x00, 0xff),
+ rgb_t(0x00, 0xff, 0x00),
+ rgb_t(0x00, 0xff, 0xff),
+ rgb_t(0xff, 0x00, 0x00),
+ rgb_t(0xff, 0x00, 0xff),
+ rgb_t(0xff, 0xff, 0x00),
+ rgb_t::white
};
/***************************************************************************
@@ -115,7 +115,7 @@ void cgc7900_state::update_clut()
UINT8 g = (data >> 8) & 0xff;
UINT8 r = (data >> 16) & 0xff;
- m_clut[i] = MAKE_RGB(r, g, b);
+ m_clut[i] = rgb_t(r, g, b);
}
}
diff --git a/src/mess/video/channelf.c b/src/mess/video/channelf.c
index 7f83190ade4..596e82b40f0 100644
--- a/src/mess/video/channelf.c
+++ b/src/mess/video/channelf.c
@@ -2,14 +2,14 @@
static const rgb_t channelf_palette[] =
{
- MAKE_RGB(0x10, 0x10, 0x10), /* black */
- MAKE_RGB(0xfd, 0xfd, 0xfd), /* white */
- MAKE_RGB(0xff, 0x31, 0x53), /* red */
- MAKE_RGB(0x02, 0xcc, 0x5d), /* green */
- MAKE_RGB(0x4b, 0x3f, 0xf3), /* blue */
- MAKE_RGB(0xe0, 0xe0, 0xe0), /* ltgray */
- MAKE_RGB(0x91, 0xff, 0xa6), /* ltgreen */
- MAKE_RGB(0xce, 0xd0, 0xff) /* ltblue */
+ rgb_t(0x10, 0x10, 0x10), /* black */
+ rgb_t(0xfd, 0xfd, 0xfd), /* white */
+ rgb_t(0xff, 0x31, 0x53), /* red */
+ rgb_t(0x02, 0xcc, 0x5d), /* green */
+ rgb_t(0x4b, 0x3f, 0xf3), /* blue */
+ rgb_t(0xe0, 0xe0, 0xe0), /* ltgray */
+ rgb_t(0x91, 0xff, 0xa6), /* ltgreen */
+ rgb_t(0xce, 0xd0, 0xff) /* ltblue */
};
#define BLACK 0
diff --git a/src/mess/video/fm7.c b/src/mess/video/fm7.c
index a120e94f01a..7fc64c39a38 100644
--- a/src/mess/video/fm7.c
+++ b/src/mess/video/fm7.c
@@ -991,7 +991,7 @@ WRITE8_MEMBER(fm7_state::fm7_palette_w)
if(data & 0x01)
b = 0xff;
- palette_set_color(machine(),offset,MAKE_RGB(r,g,b));
+ palette_set_color(machine(),offset,rgb_t(r,g,b));
m_video.fm7_pal[offset] = data & 0x07;
}
@@ -1023,21 +1023,21 @@ WRITE8_MEMBER(fm7_state::fm77av_analog_palette_w)
case 2:
m_video.fm77av_pal_b[m_video.fm77av_pal_selected] = (data & 0x0f) << 4;
palette_set_color(machine(),m_video.fm77av_pal_selected+8,
- MAKE_RGB(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
+ rgb_t(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
m_video.fm77av_pal_g[m_video.fm77av_pal_selected],
m_video.fm77av_pal_b[m_video.fm77av_pal_selected]));
break;
case 3:
m_video.fm77av_pal_r[m_video.fm77av_pal_selected] = (data & 0x0f) << 4;
palette_set_color(machine(),m_video.fm77av_pal_selected+8,
- MAKE_RGB(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
+ rgb_t(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
m_video.fm77av_pal_g[m_video.fm77av_pal_selected],
m_video.fm77av_pal_b[m_video.fm77av_pal_selected]));
break;
case 4:
m_video.fm77av_pal_g[m_video.fm77av_pal_selected] = (data & 0x0f) << 4;
palette_set_color(machine(),m_video.fm77av_pal_selected+8,
- MAKE_RGB(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
+ rgb_t(m_video.fm77av_pal_r[m_video.fm77av_pal_selected],
m_video.fm77av_pal_g[m_video.fm77av_pal_selected],
m_video.fm77av_pal_b[m_video.fm77av_pal_selected]));
break;
@@ -1583,14 +1583,14 @@ UINT32 fm7_state::screen_update_fm7(screen_device &screen, bitmap_ind16 &bitmap,
}
static const rgb_t fm7_initial_palette[8] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0xff), // 1
- MAKE_RGB(0xff, 0x00, 0x00), // 2
- MAKE_RGB(0xff, 0x00, 0xff), // 3
- MAKE_RGB(0x00, 0xff, 0x00), // 4
- MAKE_RGB(0x00, 0xff, 0xff), // 5
- MAKE_RGB(0xff, 0xff, 0x00), // 6
- MAKE_RGB(0xff, 0xff, 0xff), // 7
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0xff), // 1
+ rgb_t(0xff, 0x00, 0x00), // 2
+ rgb_t(0xff, 0x00, 0xff), // 3
+ rgb_t(0x00, 0xff, 0x00), // 4
+ rgb_t(0x00, 0xff, 0xff), // 5
+ rgb_t(0xff, 0xff, 0x00), // 6
+ rgb_t(0xff, 0xff, 0xff), // 7
};
void fm7_state::palette_init()
diff --git a/src/mess/video/gf4500.c b/src/mess/video/gf4500.c
index f148a396f34..deef2dc1455 100644
--- a/src/mess/video/gf4500.c
+++ b/src/mess/video/gf4500.c
@@ -93,7 +93,7 @@ static rgb_t gf4500_get_color_16( UINT16 data )
r = BITS(data, 15, 11) << 3;
g = BITS(data, 10, 5) << 2;
b = BITS(data, 4, 0) << 3;
- return MAKE_RGB(r, g, b);
+ return rgb_t(r, g, b);
}
UINT32 gf4500_device::screen_update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/video/hec2video.c b/src/mess/video/hec2video.c
index a296c564249..3b17528c24c 100644
--- a/src/mess/video/hec2video.c
+++ b/src/mess/video/hec2video.c
@@ -46,24 +46,24 @@ void hec2hrp_state::Init_Hector_Palette()
hector_color[3] = 3; // Ecriture de choix (jaune)
// Color initialisation : full lightning
- palette_set_color( machine(), 0,MAKE_RGB(000,000,000));//Noir
- palette_set_color( machine(), 1,MAKE_RGB(255,000,000));//Rouge
- palette_set_color( machine(), 2,MAKE_RGB(000,255,000));//Vert
- palette_set_color( machine(), 3,MAKE_RGB(255,255,000));//Jaune
- palette_set_color( machine(), 4,MAKE_RGB(000,000,255));//Bleu
- palette_set_color( machine(), 5,MAKE_RGB(255,000,255));//Magneta
- palette_set_color( machine(), 6,MAKE_RGB(000,255,255));//Cyan
- palette_set_color( machine(), 7,MAKE_RGB(255,255,255));//Blanc
+ palette_set_color( machine(), 0,rgb_t(000,000,000));//Noir
+ palette_set_color( machine(), 1,rgb_t(255,000,000));//Rouge
+ palette_set_color( machine(), 2,rgb_t(000,255,000));//Vert
+ palette_set_color( machine(), 3,rgb_t(255,255,000));//Jaune
+ palette_set_color( machine(), 4,rgb_t(000,000,255));//Bleu
+ palette_set_color( machine(), 5,rgb_t(255,000,255));//Magneta
+ palette_set_color( machine(), 6,rgb_t(000,255,255));//Cyan
+ palette_set_color( machine(), 7,rgb_t(255,255,255));//Blanc
// 1/2 lightning
- palette_set_color( machine(), 8,MAKE_RGB(000,000,000));//Noir
- palette_set_color( machine(), 9,MAKE_RGB(128,000,000));//Rouge
- palette_set_color( machine(),10,MAKE_RGB(000,128,000));//Vert
- palette_set_color( machine(),11,MAKE_RGB(128,128,000));//Jaune
- palette_set_color( machine(),12,MAKE_RGB(000,000,128));//Bleu
- palette_set_color( machine(),13,MAKE_RGB(128,000,128));//Magneta
- palette_set_color( machine(),14,MAKE_RGB(000,128,128));//Cyan
- palette_set_color( machine(),15,MAKE_RGB(128,128,128));//Blanc
+ palette_set_color( machine(), 8,rgb_t(000,000,000));//Noir
+ palette_set_color( machine(), 9,rgb_t(128,000,000));//Rouge
+ palette_set_color( machine(),10,rgb_t(000,128,000));//Vert
+ palette_set_color( machine(),11,rgb_t(128,128,000));//Jaune
+ palette_set_color( machine(),12,rgb_t(000,000,128));//Bleu
+ palette_set_color( machine(),13,rgb_t(128,000,128));//Magneta
+ palette_set_color( machine(),14,rgb_t(000,128,128));//Cyan
+ palette_set_color( machine(),15,rgb_t(128,128,128));//Blanc
}
void hec2hrp_state::hector_hr(bitmap_ind16 &bitmap, UINT8 *page, int ymax, int yram)
diff --git a/src/mess/video/hp48.c b/src/mess/video/hp48.c
index ad479e30a21..02d5d847a79 100644
--- a/src/mess/video/hp48.c
+++ b/src/mess/video/hp48.c
@@ -45,7 +45,7 @@ void hp48_state::palette_init()
for ( i = 0; i < 255; i++ )
{
float c = i/255.;
- palette_set_color( machine(), i, MAKE_ARGB( 0, mix2(0,c), mix2(1,c), mix2(2,c) ) );
+ palette_set_color( machine(), i, rgb_t( 0, mix2(0,c), mix2(1,c), mix2(2,c) ) );
}
}
diff --git a/src/mess/video/kaypro.c b/src/mess/video/kaypro.c
index 56e50c36971..44ddd0dc43d 100644
--- a/src/mess/video/kaypro.c
+++ b/src/mess/video/kaypro.c
@@ -11,9 +11,9 @@
PALETTE_INIT_MEMBER(kaypro_state,kaypro)
{
- palette_set_color(machine(), 0, RGB_BLACK); /* black */
- palette_set_color(machine(), 1, MAKE_RGB(0, 220, 0)); /* green */
- palette_set_color(machine(), 2, MAKE_RGB(0, 110, 0)); /* low intensity green */
+ palette_set_color(machine(), 0, rgb_t::black); /* black */
+ palette_set_color(machine(), 1, rgb_t(0, 220, 0)); /* green */
+ palette_set_color(machine(), 2, rgb_t(0, 110, 0)); /* low intensity green */
}
UINT32 kaypro_state::screen_update_kayproii(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/video/kyocera.c b/src/mess/video/kyocera.c
index 437eb0ca59c..b518547c79a 100644
--- a/src/mess/video/kyocera.c
+++ b/src/mess/video/kyocera.c
@@ -4,14 +4,14 @@
PALETTE_INIT_MEMBER(kc85_state,kc85)
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
PALETTE_INIT_MEMBER(tandy200_state,tandy200)
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
}
UINT32 kc85_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c
index 0ffae252cfa..9e9f34a857e 100644
--- a/src/mess/video/mac.c
+++ b/src/mess/video/mac.c
@@ -848,7 +848,7 @@ UINT32 mac_state::screen_update_macsonora(screen_device &screen, bitmap_rgb32 &b
for (x = 0; x < hres; x++)
{
pixels = vram16[(y * stride) + (x^1)];
- *scanline++ = MAKE_RGB(((pixels>>10) & 0x1f)<<3, ((pixels>>5) & 0x1f)<<3, (pixels & 0x1f)<<3);
+ *scanline++ = rgb_t(((pixels>>10) & 0x1f)<<3, ((pixels>>5) & 0x1f)<<3, (pixels & 0x1f)<<3);
}
}
}
@@ -1030,8 +1030,8 @@ WRITE32_MEMBER(mac_state::dafb_dac_w)
if (m_rbv_count == 3)
{
- palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
+ palette_set_color(space.machine(), m_rbv_clutoffs, rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
@@ -1238,7 +1238,7 @@ WRITE32_MEMBER(mac_state::macwd_w)
if (m_rbv_count == 3)
{
// printf("RAMDAC: color %d = %02x %02x %02x\n", m_rbv_clutoffs, m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
- m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
+ m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
m_rbv_clutoffs++;
m_rbv_count = 0;
}
diff --git a/src/mess/video/mbee.c b/src/mess/video/mbee.c
index 29f55d311c5..805aea44af0 100644
--- a/src/mess/video/mbee.c
+++ b/src/mess/video/mbee.c
@@ -574,7 +574,7 @@ PALETTE_INIT_MEMBER(mbee_state,mbeeic)
r = level[((i>>0)&1)|((i>>2)&2)];
g = level[((i>>1)&1)|((i>>3)&2)];
b = level[((i>>2)&1)|((i>>4)&2)];
- palette_set_color(machine(), i, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i, rgb_t(r, g, b));
}
/* set up foreground palette (64-95) by reading the prom */
@@ -584,7 +584,7 @@ PALETTE_INIT_MEMBER(mbee_state,mbeeic)
r = level[((k>>2)&1)|((k>>4)&2)];
g = level[((k>>1)&1)|((k>>3)&2)];
b = level[((k>>0)&1)|((k>>2)&2)];
- palette_set_color(machine(), i|64, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i|64, rgb_t(r, g, b));
}
}
@@ -602,7 +602,7 @@ PALETTE_INIT_MEMBER(mbee_state,mbeepc85b)
r = level[((i>>0)&1)|((i>>2)&2)];
g = level[((i>>1)&1)|((i>>3)&2)];
b = level[((i>>2)&1)|((i>>4)&2)];
- palette_set_color(machine(), i, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i, rgb_t(r, g, b));
}
level[2] = 0xff;
@@ -614,7 +614,7 @@ PALETTE_INIT_MEMBER(mbee_state,mbeepc85b)
r = level[((k>>2)&1)|((k>>4)&2)];
g = level[((k>>1)&1)|((k>>3)&2)];
b = level[((k>>0)&1)|((k>>2)&2)];
- palette_set_color(machine(), i|64, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i|64, rgb_t(r, g, b));
}
}
@@ -630,7 +630,7 @@ PALETTE_INIT_MEMBER(mbee_state,mbeeppc)
r = (i & 1) ? 0xc0 : 0;
g = (i & 2) ? 0xc0 : 0;
b = (i & 4) ? 0xc0 : 0;
- palette_set_color(machine(), i, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i, rgb_t(r, g, b));
}
/* set up 8 high intensity colours */
@@ -639,6 +639,6 @@ PALETTE_INIT_MEMBER(mbee_state,mbeeppc)
r = (i & 1) ? 0xff : 0;
g = (i & 2) ? 0xff : 0;
b = (i & 4) ? 0xff : 0;
- palette_set_color(machine(), i, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), i, rgb_t(r, g, b));
}
}
diff --git a/src/mess/video/mos6566.c b/src/mess/video/mos6566.c
index 6ee73e4774c..8fae5339f33 100644
--- a/src/mess/video/mos6566.c
+++ b/src/mess/video/mos6566.c
@@ -100,22 +100,22 @@ static int UNUSED_BITS[0x40] =
// VICE palette
static const rgb_t PALETTE[] =
{
- MAKE_RGB(0x00, 0x00, 0x00),
- MAKE_RGB(0xfd, 0xfe, 0xfc),
- MAKE_RGB(0xbe, 0x1a, 0x24),
- MAKE_RGB(0x30, 0xe6, 0xc6),
- MAKE_RGB(0xb4, 0x1a, 0xe2),
- MAKE_RGB(0x1f, 0xd2, 0x1e),
- MAKE_RGB(0x21, 0x1b, 0xae),
- MAKE_RGB(0xdf, 0xf6, 0x0a),
- MAKE_RGB(0xb8, 0x41, 0x04),
- MAKE_RGB(0x6a, 0x33, 0x04),
- MAKE_RGB(0xfe, 0x4a, 0x57),
- MAKE_RGB(0x42, 0x45, 0x40),
- MAKE_RGB(0x70, 0x74, 0x6f),
- MAKE_RGB(0x59, 0xfe, 0x59),
- MAKE_RGB(0x5f, 0x53, 0xfe),
- MAKE_RGB(0xa4, 0xa7, 0xa2)
+ rgb_t(0x00, 0x00, 0x00),
+ rgb_t(0xfd, 0xfe, 0xfc),
+ rgb_t(0xbe, 0x1a, 0x24),
+ rgb_t(0x30, 0xe6, 0xc6),
+ rgb_t(0xb4, 0x1a, 0xe2),
+ rgb_t(0x1f, 0xd2, 0x1e),
+ rgb_t(0x21, 0x1b, 0xae),
+ rgb_t(0xdf, 0xf6, 0x0a),
+ rgb_t(0xb8, 0x41, 0x04),
+ rgb_t(0x6a, 0x33, 0x04),
+ rgb_t(0xfe, 0x4a, 0x57),
+ rgb_t(0x42, 0x45, 0x40),
+ rgb_t(0x70, 0x74, 0x6f),
+ rgb_t(0x59, 0xfe, 0x59),
+ rgb_t(0x5f, 0x53, 0xfe),
+ rgb_t(0xa4, 0xa7, 0xa2)
};
diff --git a/src/mess/video/mz700.c b/src/mess/video/mz700.c
index fa87cd331c5..51c95b392d7 100644
--- a/src/mess/video/mz700.c
+++ b/src/mess/video/mz700.c
@@ -35,7 +35,7 @@ void mz_state::palette_init()
machine().colortable = colortable_alloc(machine(), 8);
for (i = 0; i < 8; i++)
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB((i & 2) ? 0xff : 0x00, (i & 4) ? 0xff : 0x00, (i & 1) ? 0xff : 0x00));
+ colortable_palette_set_color(machine().colortable, i, rgb_t((i & 2) ? 0xff : 0x00, (i & 4) ? 0xff : 0x00, (i & 1) ? 0xff : 0x00));
for (i = 0; i < 256; i++)
{
diff --git a/src/mess/video/nc.c b/src/mess/video/nc.c
index cf5bb36eba8..dfd96e87084 100644
--- a/src/mess/video/nc.c
+++ b/src/mess/video/nc.c
@@ -27,10 +27,10 @@ static const unsigned short nc_colour_table[NC_NUM_COLOURS] =
/* black/white */
static const rgb_t nc_palette[NC_NUM_COLOURS] =
{
- MAKE_RGB(0x060, 0x060, 0x060),
- MAKE_RGB(0x000, 0x000, 0x000),
- MAKE_RGB(0x080, 0x0a0, 0x060),
- MAKE_RGB(0x000, 0x000, 0x000)
+ rgb_t(0x060, 0x060, 0x060),
+ rgb_t(0x000, 0x000, 0x000),
+ rgb_t(0x080, 0x0a0, 0x060),
+ rgb_t(0x000, 0x000, 0x000)
};
diff --git a/src/mess/video/newbrain.c b/src/mess/video/newbrain.c
index fbbe94949bb..f3160628587 100644
--- a/src/mess/video/newbrain.c
+++ b/src/mess/video/newbrain.c
@@ -108,7 +108,7 @@ UINT32 newbrain_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
}
else
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;
diff --git a/src/mess/video/nick.c b/src/mess/video/nick.c
index 90a38a2fc22..994246388e1 100644
--- a/src/mess/video/nick.c
+++ b/src/mess/video/nick.c
@@ -334,7 +334,7 @@ void nick_device::initialize_palette()
UINT8 g = combine_3_weights(color_weights_rg, gc, gb, ga);
UINT8 b = combine_2_weights(color_weights_b, bb, ba);
- m_palette[i] = MAKE_RGB(r, g, b);
+ m_palette[i] = rgb_t(r, g, b);
}
for (int i = 0; i < 256; i++)
diff --git a/src/mess/video/orion.c b/src/mess/video/orion.c
index c254232142b..b9ba0e475c9 100644
--- a/src/mess/video/orion.c
+++ b/src/mess/video/orion.c
@@ -86,24 +86,24 @@ UINT32 orion_state::screen_update_orion128(screen_device &screen, bitmap_ind16 &
}
static const rgb_t orion128_palette[18] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0xc0), // 1
- MAKE_RGB(0x00, 0xc0, 0x00), // 2
- MAKE_RGB(0x00, 0xc0, 0xc0), // 3
- MAKE_RGB(0xc0, 0x00, 0x00), // 4
- MAKE_RGB(0xc0, 0x00, 0xc0), // 5
- MAKE_RGB(0xc0, 0xc0, 0x00), // 6
- MAKE_RGB(0xc0, 0xc0, 0xc0), // 7
- MAKE_RGB(0x80, 0x80, 0x80), // 8
- MAKE_RGB(0x00, 0x00, 0xff), // 9
- MAKE_RGB(0x00, 0xff, 0x00), // A
- MAKE_RGB(0x00, 0xff, 0xff), // B
- MAKE_RGB(0xff, 0x00, 0x00), // C
- MAKE_RGB(0xff, 0x00, 0xff), // D
- MAKE_RGB(0xff, 0xff, 0x00), // E
- MAKE_RGB(0xff, 0xff, 0xff), // F
- MAKE_RGB(0xc8, 0xb4, 0x28), // 10
- MAKE_RGB(0x32, 0xfa, 0xfa) // 11
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0xc0), // 1
+ rgb_t(0x00, 0xc0, 0x00), // 2
+ rgb_t(0x00, 0xc0, 0xc0), // 3
+ rgb_t(0xc0, 0x00, 0x00), // 4
+ rgb_t(0xc0, 0x00, 0xc0), // 5
+ rgb_t(0xc0, 0xc0, 0x00), // 6
+ rgb_t(0xc0, 0xc0, 0xc0), // 7
+ rgb_t(0x80, 0x80, 0x80), // 8
+ rgb_t(0x00, 0x00, 0xff), // 9
+ rgb_t(0x00, 0xff, 0x00), // A
+ rgb_t(0x00, 0xff, 0xff), // B
+ rgb_t(0xff, 0x00, 0x00), // C
+ rgb_t(0xff, 0x00, 0xff), // D
+ rgb_t(0xff, 0xff, 0x00), // E
+ rgb_t(0xff, 0xff, 0xff), // F
+ rgb_t(0xc8, 0xb4, 0x28), // 10
+ rgb_t(0x32, 0xfa, 0xfa) // 11
};
PALETTE_INIT_MEMBER(orion_state,orion128 )
diff --git a/src/mess/video/pc1512.c b/src/mess/video/pc1512.c
index 1c53e1d8760..168e25dd2ee 100644
--- a/src/mess/video/pc1512.c
+++ b/src/mess/video/pc1512.c
@@ -13,22 +13,22 @@
static const rgb_t PALETTE[] =
{
- RGB_BLACK,
- MAKE_RGB(0x00, 0x00, 0xaa),
- MAKE_RGB(0x00, 0xaa, 0x00),
- MAKE_RGB(0x00, 0xaa, 0xaa),
- MAKE_RGB(0xaa, 0x00, 0x00),
- MAKE_RGB(0xaa, 0x00, 0xaa),
- MAKE_RGB(0xaa, 0x55, 0x00),
- MAKE_RGB(0xaa, 0xaa, 0xaa),
- MAKE_RGB(0x55, 0x55, 0x55),
- MAKE_RGB(0x55, 0x55, 0xff),
- MAKE_RGB(0x55, 0xff, 0x55),
- MAKE_RGB(0x55, 0xff, 0xff),
- MAKE_RGB(0xff, 0x55, 0x55),
- MAKE_RGB(0xff, 0x55, 0xff),
- MAKE_RGB(0xff, 0xff, 0x55),
- RGB_WHITE
+ rgb_t::black,
+ rgb_t(0x00, 0x00, 0xaa),
+ rgb_t(0x00, 0xaa, 0x00),
+ rgb_t(0x00, 0xaa, 0xaa),
+ rgb_t(0xaa, 0x00, 0x00),
+ rgb_t(0xaa, 0x00, 0xaa),
+ rgb_t(0xaa, 0x55, 0x00),
+ rgb_t(0xaa, 0xaa, 0xaa),
+ rgb_t(0x55, 0x55, 0x55),
+ rgb_t(0x55, 0x55, 0xff),
+ rgb_t(0x55, 0xff, 0x55),
+ rgb_t(0x55, 0xff, 0xff),
+ rgb_t(0xff, 0x55, 0x55),
+ rgb_t(0xff, 0x55, 0xff),
+ rgb_t(0xff, 0xff, 0x55),
+ rgb_t::white
};
static const int PALETTE_0[] = { 0, 3, 5, 7 };
@@ -598,7 +598,7 @@ UINT32 pc1512_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
}
else
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;
diff --git a/src/mess/video/pc8401a.c b/src/mess/video/pc8401a.c
index 919032a46e1..f5166eb1043 100644
--- a/src/mess/video/pc8401a.c
+++ b/src/mess/video/pc8401a.c
@@ -5,8 +5,8 @@
PALETTE_INIT_MEMBER(pc8401a_state,pc8401a)
{
- palette_set_color(machine(), 0, MAKE_RGB(39, 108, 51));
- palette_set_color(machine(), 1, MAKE_RGB(16, 37, 84));
+ palette_set_color(machine(), 0, rgb_t(39, 108, 51));
+ palette_set_color(machine(), 1, rgb_t(16, 37, 84));
}
void pc8401a_state::video_start()
diff --git a/src/mess/video/pcw.c b/src/mess/video/pcw.c
index 834449e3999..500fe8a1706 100644
--- a/src/mess/video/pcw.c
+++ b/src/mess/video/pcw.c
@@ -36,8 +36,8 @@ static const unsigned short pcw_colour_table[PCW_NUM_COLOURS] =
/* black/white */
static const rgb_t pcw_palette[PCW_NUM_COLOURS] =
{
- MAKE_RGB(0x000, 0x000, 0x000),
- MAKE_RGB(0x0ff, 0x0ff, 0x0ff)
+ rgb_t(0x000, 0x000, 0x000),
+ rgb_t(0x0ff, 0x0ff, 0x0ff)
};
diff --git a/src/mess/video/pcw16.c b/src/mess/video/pcw16.c
index e7bba7267c5..b8c579bc0c3 100644
--- a/src/mess/video/pcw16.c
+++ b/src/mess/video/pcw16.c
@@ -13,38 +13,38 @@ static const unsigned short pcw16_colour_table[PCW16_NUM_COLOURS] =
static const rgb_t pcw16_palette[PCW16_NUM_COLOURS] =
{
- MAKE_RGB(0x080, 0x080, 0x080), /* light grey */
- MAKE_RGB(0x080, 0x080, 0x080), /* light grey */
- MAKE_RGB(0x000, 0x080, 0x080), /* magenta */
- MAKE_RGB(0x000, 0x080, 0x080), /* magenta */
- MAKE_RGB(0x080, 0x080, 0x080), /* light grey */
- MAKE_RGB(0x080, 0x080, 0x080), /* light grey */
- MAKE_RGB(0x0ff, 0x080, 0x080), /* pastel green */
- MAKE_RGB(0x0ff, 0x080, 0x080), /* pastel green */
- MAKE_RGB(0x000, 0x000, 0x080), /* blue */
- MAKE_RGB(0x000, 0x000, 0x000), /* black */
- MAKE_RGB(0x000, 0x080, 0x0ff), /* mauve */
- MAKE_RGB(0x000, 0x000, 0x0ff), /* bright blue */
- MAKE_RGB(0x000, 0x080, 0x000), /* red */
- MAKE_RGB(0x000, 0x0ff, 0x000), /* bright red */
- MAKE_RGB(0x000, 0x0ff, 0x080), /* purple */
- MAKE_RGB(0x000, 0x0ff, 0x0ff), /* bright magenta */
- MAKE_RGB(0x0ff, 0x000, 0x080), /* sea green */
- MAKE_RGB(0x0ff, 0x000, 0x0ff), /* bright green */
- MAKE_RGB(0x0ff, 0x080, 0x0ff), /* pastel cyan */
- MAKE_RGB(0x0ff, 0x000, 0x0ff), /* bright cyan */
- MAKE_RGB(0x0ff, 0x080, 0x000), /* lime green */
- MAKE_RGB(0x0ff, 0x0ff, 0x000), /* bright yellow */
- MAKE_RGB(0x0ff, 0x0ff, 0x080), /* pastel yellow */
- MAKE_RGB(0x0ff, 0x0ff, 0x0ff), /* bright white */
- MAKE_RGB(0x080, 0x000, 0x080), /* cyan */
- MAKE_RGB(0x080, 0x000, 0x000), /* green */
- MAKE_RGB(0x080, 0x080, 0x0ff), /* pastel blue */
- MAKE_RGB(0x080, 0x000, 0x0ff), /* sky blue */
- MAKE_RGB(0x080, 0x080, 0x000), /* yellow */
- MAKE_RGB(0x080, 0x0ff, 0x000), /* orange */
- MAKE_RGB(0x080, 0x0ff, 0x080), /* pink */
- MAKE_RGB(0x080, 0x0ff, 0x0ff), /* pastel magenta */
+ rgb_t(0x080, 0x080, 0x080), /* light grey */
+ rgb_t(0x080, 0x080, 0x080), /* light grey */
+ rgb_t(0x000, 0x080, 0x080), /* magenta */
+ rgb_t(0x000, 0x080, 0x080), /* magenta */
+ rgb_t(0x080, 0x080, 0x080), /* light grey */
+ rgb_t(0x080, 0x080, 0x080), /* light grey */
+ rgb_t(0x0ff, 0x080, 0x080), /* pastel green */
+ rgb_t(0x0ff, 0x080, 0x080), /* pastel green */
+ rgb_t(0x000, 0x000, 0x080), /* blue */
+ rgb_t(0x000, 0x000, 0x000), /* black */
+ rgb_t(0x000, 0x080, 0x0ff), /* mauve */
+ rgb_t(0x000, 0x000, 0x0ff), /* bright blue */
+ rgb_t(0x000, 0x080, 0x000), /* red */
+ rgb_t(0x000, 0x0ff, 0x000), /* bright red */
+ rgb_t(0x000, 0x0ff, 0x080), /* purple */
+ rgb_t(0x000, 0x0ff, 0x0ff), /* bright magenta */
+ rgb_t(0x0ff, 0x000, 0x080), /* sea green */
+ rgb_t(0x0ff, 0x000, 0x0ff), /* bright green */
+ rgb_t(0x0ff, 0x080, 0x0ff), /* pastel cyan */
+ rgb_t(0x0ff, 0x000, 0x0ff), /* bright cyan */
+ rgb_t(0x0ff, 0x080, 0x000), /* lime green */
+ rgb_t(0x0ff, 0x0ff, 0x000), /* bright yellow */
+ rgb_t(0x0ff, 0x0ff, 0x080), /* pastel yellow */
+ rgb_t(0x0ff, 0x0ff, 0x0ff), /* bright white */
+ rgb_t(0x080, 0x000, 0x080), /* cyan */
+ rgb_t(0x080, 0x000, 0x000), /* green */
+ rgb_t(0x080, 0x080, 0x0ff), /* pastel blue */
+ rgb_t(0x080, 0x000, 0x0ff), /* sky blue */
+ rgb_t(0x080, 0x080, 0x000), /* yellow */
+ rgb_t(0x080, 0x0ff, 0x000), /* orange */
+ rgb_t(0x080, 0x0ff, 0x080), /* pink */
+ rgb_t(0x080, 0x0ff, 0x0ff), /* pastel magenta */
};
diff --git a/src/mess/video/pds_tpdfpd.c b/src/mess/video/pds_tpdfpd.c
index 50116fa637e..74e62760d61 100644
--- a/src/mess/video/pds_tpdfpd.c
+++ b/src/mess/video/pds_tpdfpd.c
@@ -136,8 +136,8 @@ void macpds_sedisplay_device::device_reset()
memset(m_vram, 0, VRAM_SIZE);
memset(m_palette, 0, sizeof(m_palette));
- m_palette[0] = MAKE_RGB(0, 0, 0);
- m_palette[1] = MAKE_RGB(255, 255, 255);
+ m_palette[0] = rgb_t(0, 0, 0);
+ m_palette[1] = rgb_t(255, 255, 255);
}
@@ -217,7 +217,7 @@ WRITE16_MEMBER( macpds_sedisplay_device::ramdac_w )
if (m_count == 3)
{ // only the green channel drives the output
- m_palette[m_clutoffs] = MAKE_RGB(m_colors[1], m_colors[1], m_colors[1]);
+ m_palette[m_clutoffs] = rgb_t(m_colors[1], m_colors[1], m_colors[1]);
m_clutoffs++;
m_count = 0;
}
diff --git a/src/mess/video/pk8020.c b/src/mess/video/pk8020.c
index 6e4cfcbf6f3..f60b907333e 100644
--- a/src/mess/video/pk8020.c
+++ b/src/mess/video/pk8020.c
@@ -52,6 +52,6 @@ void pk8020_state::palette_init()
{
int i;
for(i=0;i<16;i++) {
- palette_set_color( machine(), i, MAKE_RGB(i*0x10,i*0x10,i*0x10) );
+ palette_set_color( machine(), i, rgb_t(i*0x10,i*0x10,i*0x10) );
}
}
diff --git a/src/mess/video/pocketc.c b/src/mess/video/pocketc.c
index 6df0893f631..539bacc5d8d 100644
--- a/src/mess/video/pocketc.c
+++ b/src/mess/video/pocketc.c
@@ -38,7 +38,7 @@ PALETTE_INIT( pocketc )
while (color_count--)
{
r = pocketc_palette[i++]; g = pocketc_palette[i++]; b = pocketc_palette[i++];
- colortable_palette_set_color(machine.colortable, 5 - color_count, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine.colortable, 5 - color_count, rgb_t(r, g, b));
}
for( i = 0; i < 8; i++ )
diff --git a/src/mess/video/pp01.c b/src/mess/video/pp01.c
index d61fdd5020a..892f51a9aee 100644
--- a/src/mess/video/pp01.c
+++ b/src/mess/video/pp01.c
@@ -38,14 +38,14 @@ UINT32 pp01_state::screen_update_pp01(screen_device &screen, bitmap_ind16 &bitma
}
static const rgb_t pp01_palette[8] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0x80), // 1
- MAKE_RGB(0x00, 0x80, 0x00), // 2
- MAKE_RGB(0x00, 0x80, 0x80), // 3
- MAKE_RGB(0x80, 0x00, 0x00), // 4
- MAKE_RGB(0x80, 0x00, 0x80), // 5
- MAKE_RGB(0x80, 0x80, 0x00), // 6
- MAKE_RGB(0x80, 0x80, 0x80), // 7
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0x80), // 1
+ rgb_t(0x00, 0x80, 0x00), // 2
+ rgb_t(0x00, 0x80, 0x80), // 3
+ rgb_t(0x80, 0x00, 0x00), // 4
+ rgb_t(0x80, 0x00, 0x80), // 5
+ rgb_t(0x80, 0x80, 0x00), // 6
+ rgb_t(0x80, 0x80, 0x80), // 7
};
void pp01_state::palette_init()
diff --git a/src/mess/video/radio86.c b/src/mess/video/radio86.c
index 26fc4e1d092..5e448f97a5c 100644
--- a/src/mess/video/radio86.c
+++ b/src/mess/video/radio86.c
@@ -97,9 +97,9 @@ I8275_DISPLAY_PIXELS(partner_display_pixels)
}
static const rgb_t radio86_palette[3] = {
- MAKE_RGB(0x00, 0x00, 0x00), // black
- MAKE_RGB(0xa0, 0xa0, 0xa0), // white
- MAKE_RGB(0xff, 0xff, 0xff) // highlight
+ rgb_t(0x00, 0x00, 0x00), // black
+ rgb_t(0xa0, 0xa0, 0xa0), // white
+ rgb_t(0xff, 0xff, 0xff) // highlight
};
PALETTE_INIT_MEMBER(radio86_state,radio86)
diff --git a/src/mess/video/special.c b/src/mess/video/special.c
index e14f804343d..873f8bf40a2 100644
--- a/src/mess/video/special.c
+++ b/src/mess/video/special.c
@@ -12,8 +12,8 @@
VIDEO_START_MEMBER(special_state,special)
{
- palette_set_color(machine(),0,RGB_BLACK); /* black */
- palette_set_color(machine(),1,RGB_WHITE); /* white */
+ palette_set_color(machine(),0,rgb_t::black); /* black */
+ palette_set_color(machine(),1,rgb_t::white); /* white */
}
UINT32 special_state::screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -55,22 +55,22 @@ UINT32 special_state::screen_update_specialp(screen_device &screen, bitmap_ind16
const rgb_t specimx_palette[16] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0xaa), // 1
- MAKE_RGB(0x00, 0xaa, 0x00), // 2
- MAKE_RGB(0x00, 0xaa, 0xaa), // 3
- MAKE_RGB(0xaa, 0x00, 0x00), // 4
- MAKE_RGB(0xaa, 0x00, 0xaa), // 5
- MAKE_RGB(0xaa, 0x55, 0x00), // 6
- MAKE_RGB(0xaa, 0xaa, 0xaa), // 7
- MAKE_RGB(0x55, 0x55, 0x55), // 8
- MAKE_RGB(0x55, 0x55, 0xff), // 9
- MAKE_RGB(0x55, 0xff, 0x55), // A
- MAKE_RGB(0x55, 0xff, 0xff), // B
- MAKE_RGB(0xff, 0x55, 0x55), // C
- MAKE_RGB(0xff, 0x55, 0xff), // D
- MAKE_RGB(0xff, 0xff, 0x55), // E
- MAKE_RGB(0xff, 0xff, 0xff) // F
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0xaa), // 1
+ rgb_t(0x00, 0xaa, 0x00), // 2
+ rgb_t(0x00, 0xaa, 0xaa), // 3
+ rgb_t(0xaa, 0x00, 0x00), // 4
+ rgb_t(0xaa, 0x00, 0xaa), // 5
+ rgb_t(0xaa, 0x55, 0x00), // 6
+ rgb_t(0xaa, 0xaa, 0xaa), // 7
+ rgb_t(0x55, 0x55, 0x55), // 8
+ rgb_t(0x55, 0x55, 0xff), // 9
+ rgb_t(0x55, 0xff, 0x55), // A
+ rgb_t(0x55, 0xff, 0xff), // B
+ rgb_t(0xff, 0x55, 0x55), // C
+ rgb_t(0xff, 0x55, 0xff), // D
+ rgb_t(0xff, 0xff, 0x55), // E
+ rgb_t(0xff, 0xff, 0xff) // F
};
PALETTE_INIT_MEMBER(special_state,specimx)
@@ -103,14 +103,14 @@ UINT32 special_state::screen_update_specimx(screen_device &screen, bitmap_ind16
}
static const rgb_t erik_palette[8] = {
- MAKE_RGB(0x00, 0x00, 0x00), // 0
- MAKE_RGB(0x00, 0x00, 0xff), // 1
- MAKE_RGB(0xff, 0x00, 0x00), // 2
- MAKE_RGB(0xff, 0x00, 0xff), // 3
- MAKE_RGB(0x00, 0xff, 0x00), // 4
- MAKE_RGB(0x00, 0xff, 0xff), // 5
- MAKE_RGB(0xff, 0xff, 0x00), // 6
- MAKE_RGB(0xff, 0xff, 0xff) // 7
+ rgb_t(0x00, 0x00, 0x00), // 0
+ rgb_t(0x00, 0x00, 0xff), // 1
+ rgb_t(0xff, 0x00, 0x00), // 2
+ rgb_t(0xff, 0x00, 0xff), // 3
+ rgb_t(0x00, 0xff, 0x00), // 4
+ rgb_t(0x00, 0xff, 0xff), // 5
+ rgb_t(0xff, 0xff, 0x00), // 6
+ rgb_t(0xff, 0xff, 0xff) // 7
};
PALETTE_INIT_MEMBER(special_state,erik)
diff --git a/src/mess/video/spectrum.c b/src/mess/video/spectrum.c
index 8524e3a2c7c..6a95e2b7acb 100644
--- a/src/mess/video/spectrum.c
+++ b/src/mess/video/spectrum.c
@@ -155,22 +155,22 @@ UINT32 spectrum_state::screen_update_spectrum(screen_device &screen, bitmap_ind1
static const rgb_t spectrum_palette[16] = {
- MAKE_RGB(0x00, 0x00, 0x00),
- MAKE_RGB(0x00, 0x00, 0xbf),
- MAKE_RGB(0xbf, 0x00, 0x00),
- MAKE_RGB(0xbf, 0x00, 0xbf),
- MAKE_RGB(0x00, 0xbf, 0x00),
- MAKE_RGB(0x00, 0xbf, 0xbf),
- MAKE_RGB(0xbf, 0xbf, 0x00),
- MAKE_RGB(0xbf, 0xbf, 0xbf),
- MAKE_RGB(0x00, 0x00, 0x00),
- MAKE_RGB(0x00, 0x00, 0xff),
- MAKE_RGB(0xff, 0x00, 0x00),
- MAKE_RGB(0xff, 0x00, 0xff),
- MAKE_RGB(0x00, 0xff, 0x00),
- MAKE_RGB(0x00, 0xff, 0xff),
- MAKE_RGB(0xff, 0xff, 0x00),
- MAKE_RGB(0xff, 0xff, 0xff)
+ rgb_t(0x00, 0x00, 0x00),
+ rgb_t(0x00, 0x00, 0xbf),
+ rgb_t(0xbf, 0x00, 0x00),
+ rgb_t(0xbf, 0x00, 0xbf),
+ rgb_t(0x00, 0xbf, 0x00),
+ rgb_t(0x00, 0xbf, 0xbf),
+ rgb_t(0xbf, 0xbf, 0x00),
+ rgb_t(0xbf, 0xbf, 0xbf),
+ rgb_t(0x00, 0x00, 0x00),
+ rgb_t(0x00, 0x00, 0xff),
+ rgb_t(0xff, 0x00, 0x00),
+ rgb_t(0xff, 0x00, 0xff),
+ rgb_t(0x00, 0xff, 0x00),
+ rgb_t(0x00, 0xff, 0xff),
+ rgb_t(0xff, 0xff, 0x00),
+ rgb_t(0xff, 0xff, 0xff)
};
/* Initialise the palette */
PALETTE_INIT_MEMBER(spectrum_state,spectrum)
diff --git a/src/mess/video/super80.c b/src/mess/video/super80.c
index 7c530455546..b5b006f7e4f 100644
--- a/src/mess/video/super80.c
+++ b/src/mess/video/super80.c
@@ -58,7 +58,7 @@ void super80_state::palette_set_colors_rgb(const UINT8 *colors)
while (color_count--)
{
r = *colors++; g = *colors++; b = *colors++;
- palette_set_color(machine(), 15-color_count, MAKE_RGB(r, g, b));
+ palette_set_color(machine(), 15-color_count, rgb_t(r, g, b));
}
}
diff --git a/src/mess/video/ti85.c b/src/mess/video/ti85.c
index 902598f2e9a..5394a24db1f 100644
--- a/src/mess/video/ti85.c
+++ b/src/mess/video/ti85.c
@@ -106,7 +106,7 @@ void ti85_state::palette_init()
for ( i = 0; i < 224; i++ )
{
r = ti85_colors[i][0]; g = ti85_colors[i][1]; b = ti85_colors[i][2];
- colortable_palette_set_color(machine().colortable, i, MAKE_RGB(r, g, b));
+ colortable_palette_set_color(machine().colortable, i, rgb_t(r, g, b));
}
for (i=0; i < 32; i++)
@@ -189,6 +189,6 @@ UINT32 ti85_state::screen_update_ti85(screen_device &screen, bitmap_ind16 &bitma
PALETTE_INIT_MEMBER(ti85_state,ti82)
{
- palette_set_color(machine(), 0, MAKE_RGB(160, 190, 170));
- palette_set_color(machine(), 1, MAKE_RGB(83, 111, 138));
+ palette_set_color(machine(), 0, rgb_t(160, 190, 170));
+ palette_set_color(machine(), 1, rgb_t(83, 111, 138));
}
diff --git a/src/mess/video/trs80.c b/src/mess/video/trs80.c
index 5b90efafa09..afec68b2813 100644
--- a/src/mess/video/trs80.c
+++ b/src/mess/video/trs80.c
@@ -570,14 +570,14 @@ WRITE8_MEMBER( trs80_state::trs80_gfxram_w )
/* Levels are unknown - guessing */
static const rgb_t lnw80_palette[] =
{
- MAKE_RGB(220, 220, 220), // white
- MAKE_RGB(0, 175, 0), // green
- MAKE_RGB(200, 200, 0), // yellow
- MAKE_RGB(255, 0, 0), // red
- MAKE_RGB(255, 0, 255), // magenta
- MAKE_RGB(0, 0, 175), // blue
- MAKE_RGB(0, 255, 255), // cyan
- MAKE_RGB(0, 0, 0), // black
+ rgb_t(220, 220, 220), // white
+ rgb_t(0, 175, 0), // green
+ rgb_t(200, 200, 0), // yellow
+ rgb_t(255, 0, 0), // red
+ rgb_t(255, 0, 255), // magenta
+ rgb_t(0, 0, 175), // blue
+ rgb_t(0, 255, 255), // cyan
+ rgb_t(0, 0, 0), // black
};
PALETTE_INIT_MEMBER(trs80_state,lnw80)
diff --git a/src/mess/video/uv201.c b/src/mess/video/uv201.c
index 27de4731d0b..41ee033d00f 100644
--- a/src/mess/video/uv201.c
+++ b/src/mess/video/uv201.c
@@ -248,14 +248,14 @@ void uv201_device::initialize_palette()
onvalue = onhiintensity;
}
- m_palette[offset + 0] = MAKE_RGB(offvalue, offvalue, offvalue); // black
- m_palette[offset + 1] = MAKE_RGB(onvalue, offvalue, offvalue); // red
- m_palette[offset + 2] = MAKE_RGB(offvalue, onvalue, offvalue); // green
- m_palette[offset + 3] = MAKE_RGB(onvalue, onvalue, offvalue); // red-green
- m_palette[offset + 4] = MAKE_RGB(offvalue, offvalue, onvalue); // blue
- m_palette[offset + 5] = MAKE_RGB(onvalue, offvalue, onvalue); // red-blue
- m_palette[offset + 6] = MAKE_RGB(offvalue, onvalue, onvalue); // green-blue
- m_palette[offset + 7] = MAKE_RGB(onvalue, onvalue, onvalue); // white
+ m_palette[offset + 0] = rgb_t(offvalue, offvalue, offvalue); // black
+ m_palette[offset + 1] = rgb_t(onvalue, offvalue, offvalue); // red
+ m_palette[offset + 2] = rgb_t(offvalue, onvalue, offvalue); // green
+ m_palette[offset + 3] = rgb_t(onvalue, onvalue, offvalue); // red-green
+ m_palette[offset + 4] = rgb_t(offvalue, offvalue, onvalue); // blue
+ m_palette[offset + 5] = rgb_t(onvalue, offvalue, onvalue); // red-blue
+ m_palette[offset + 6] = rgb_t(offvalue, onvalue, onvalue); // green-blue
+ m_palette[offset + 7] = rgb_t(onvalue, onvalue, onvalue); // white
}
}
diff --git a/src/mess/video/vector06.c b/src/mess/video/vector06.c
index c0f8f27a50f..3b016518aa7 100644
--- a/src/mess/video/vector06.c
+++ b/src/mess/video/vector06.c
@@ -55,5 +55,5 @@ UINT32 vector06_state::screen_update_vector06(screen_device &screen, bitmap_ind1
void vector06_state::palette_init()
{
for (UINT8 i=0; i<16; i++)
- palette_set_color( machine(), i, RGB_BLACK );
+ palette_set_color( machine(), i, rgb_t::black );
}
diff --git a/src/mess/video/z88.c b/src/mess/video/z88.c
index 0cd28565e78..ff1dbecfe30 100644
--- a/src/mess/video/z88.c
+++ b/src/mess/video/z88.c
@@ -30,9 +30,9 @@ inline UINT8* z88_state::convert_address(UINT32 offset)
// Initialise the palette
void z88_state::palette_init()
{
- palette_set_color(machine(), 0, MAKE_RGB(138, 146, 148));
- palette_set_color(machine(), 1, MAKE_RGB(92, 83, 88));
- palette_set_color(machine(), 2, MAKE_RGB(122, 126, 129));
+ palette_set_color(machine(), 0, rgb_t(138, 146, 148));
+ palette_set_color(machine(), 1, rgb_t(92, 83, 88));
+ palette_set_color(machine(), 2, rgb_t(122, 126, 129));
}
/* temp - change to gfxelement structure */
diff --git a/src/mess/video/zx8301.c b/src/mess/video/zx8301.c
index 9c4b3e18ce2..57bb24989d7 100644
--- a/src/mess/video/zx8301.c
+++ b/src/mess/video/zx8301.c
@@ -37,14 +37,14 @@ static const int ZX8301_COLOR_MODE4[] = { 0, 2, 4, 7 };
static const rgb_t PALETTE[] =
{
- MAKE_RGB(0x00, 0x00, 0x00), // black
- MAKE_RGB(0x00, 0x00, 0xff), // blue
- MAKE_RGB(0xff, 0x00, 0x00), // red
- MAKE_RGB(0xff, 0x00, 0xff), // magenta
- MAKE_RGB(0x00, 0xff, 0x00), // green
- MAKE_RGB(0x00, 0xff, 0xff), // cyan
- MAKE_RGB(0xff, 0xff, 0x00), // yellow
- MAKE_RGB(0xff, 0xff, 0xff) // white
+ rgb_t(0x00, 0x00, 0x00), // black
+ rgb_t(0x00, 0x00, 0xff), // blue
+ rgb_t(0xff, 0x00, 0x00), // red
+ rgb_t(0xff, 0x00, 0xff), // magenta
+ rgb_t(0x00, 0xff, 0x00), // green
+ rgb_t(0x00, 0xff, 0xff), // cyan
+ rgb_t(0xff, 0xff, 0x00), // yellow
+ rgb_t(0xff, 0xff, 0xff) // white
};
@@ -353,7 +353,7 @@ UINT32 zx8301_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
}
else
{
- bitmap.fill(RGB_BLACK, cliprect);
+ bitmap.fill(rgb_t::black, cliprect);
}
return 0;