From efa220b99689236a5ed7a35795d4cfab1dfd71b8 Mon Sep 17 00:00:00 2001 From: bwmott Date: Sun, 13 Jan 2002 05:17:33 +0000 Subject: [PATCH] Incorporated a modified NTSC palette, provide by Thomas Jentzsch, which is more like the real 2600 colors. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@27 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/TIA.cxx | 132 ++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/stella/src/emucore/TIA.cxx b/stella/src/emucore/TIA.cxx index 91a3c0c03..6482be8b9 100644 --- a/stella/src/emucore/TIA.cxx +++ b/stella/src/emucore/TIA.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: TIA.cxx,v 1.3 2002-01-13 04:26:42 bwmott Exp $ +// $Id: TIA.cxx,v 1.4 2002-01-13 05:17:33 bwmott Exp $ //============================================================================ #include @@ -2543,71 +2543,71 @@ uInt8 TIA::ourPlayerReflectTable[256]; uInt32 TIA::ourPlayfieldTable[2][160]; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -const uInt32 TIA::ourNTSCPalette[256] = { - 0x000000, 0x1c1c1c, 0x393939, 0x595959, - 0x797979, 0x929292, 0xababab, 0xbcbcbc, - 0xcdcdcd, 0xd9d9d9, 0xe6e6e6, 0xececec, - 0xf2f2f2, 0xf8f8f8, 0xffffff, 0xffffff, - 0x391701, 0x5e2304, 0x833008, 0xa54716, - 0xc85f24, 0xe37820, 0xff911d, 0xffab1d, - 0xffc51d, 0xffce34, 0xffd84c, 0xffe651, - 0xfff456, 0xfff977, 0xffff98, 0xffff98, - 0x451904, 0x721e11, 0x9f241e, 0xb33a20, - 0xc85122, 0xe36920, 0xff811e, 0xff8c25, - 0xff982c, 0xffae38, 0xffc545, 0xffc559, - 0xffc66d, 0xffd587, 0xffe4a1, 0xffe4a1, - 0x4a1704, 0x7e1a0d, 0xb21d17, 0xc82119, - 0xdf251c, 0xec3b38, 0xfa5255, 0xfc6161, - 0xff706e, 0xff7f7e, 0xff8f8f, 0xff9d9e, - 0xffabad, 0xffb9bd, 0xffc7ce, 0xffc7ce, - 0x050568, 0x3b136d, 0x712272, 0x8b2a8c, - 0xa532a6, 0xb938ba, 0xcd3ecf, 0xdb47dd, - 0xea51eb, 0xf45ff5, 0xfe6dff, 0xfe7afd, - 0xff87fb, 0xff95fd, 0xffa4ff, 0xffa4ff, - 0x280479, 0x400984, 0x590f90, 0x70249d, - 0x8839aa, 0xa441c3, 0xc04adc, 0xd054ed, - 0xe05eff, 0xe96dff, 0xf27cff, 0xf88aff, - 0xff98ff, 0xfea1ff, 0xfeabff, 0xfeabff, - 0x35088a, 0x420aad, 0x500cd0, 0x6428d0, - 0x7945d0, 0x8d4bd4, 0xa251d9, 0xb058ec, - 0xbe60ff, 0xc56bff, 0xcc77ff, 0xd183ff, - 0xd790ff, 0xdb9dff, 0xdfaaff, 0xdfaaff, - 0x051e81, 0x0626a5, 0x082fca, 0x263dd4, - 0x444cde, 0x4f5aee, 0x5a68ff, 0x6575ff, - 0x7183ff, 0x8091ff, 0x90a0ff, 0x97a9ff, - 0x9fb2ff, 0xafbeff, 0xc0cbff, 0xc0cbff, - 0x0c048b, 0x2218a0, 0x382db5, 0x483ec7, - 0x584fda, 0x6159ec, 0x6b64ff, 0x7a74ff, - 0x8a84ff, 0x918eff, 0x9998ff, 0xa5a3ff, - 0xb1aeff, 0xb8b8ff, 0xc0c2ff, 0xc0c2ff, - 0x1d295a, 0x1d3876, 0x1d4892, 0x1c5cac, - 0x1c71c6, 0x3286cf, 0x489bd9, 0x4ea8ec, - 0x55b6ff, 0x70c7ff, 0x8cd8ff, 0x93dbff, - 0x9bdfff, 0xafe4ff, 0xc3e9ff, 0xc3e9ff, - 0x2f4302, 0x395202, 0x446103, 0x417a12, - 0x3e9421, 0x4a9f2e, 0x57ab3b, 0x5cbd55, - 0x61d070, 0x69e27a, 0x72f584, 0x7cfa8d, - 0x87ff97, 0x9affa6, 0xadffb6, 0xadffb6, - 0x0a4108, 0x0d540a, 0x10680d, 0x137d0f, - 0x169212, 0x19a514, 0x1cb917, 0x1ec919, - 0x21d91b, 0x47e42d, 0x6ef040, 0x78f74d, - 0x83ff5b, 0x9aff7a, 0xb2ff9a, 0xb2ff9a, - 0x04410b, 0x05530e, 0x066611, 0x077714, - 0x088817, 0x099b1a, 0x0baf1d, 0x48c41f, - 0x86d922, 0x8fe924, 0x99f927, 0xa8fc41, - 0xb7ff5b, 0xc9ff6e, 0xdcff81, 0xdcff81, - 0x02350f, 0x073f15, 0x0c4a1c, 0x2d5f1e, - 0x4f7420, 0x598324, 0x649228, 0x82a12e, - 0xa1b034, 0xa9c13a, 0xb2d241, 0xc4d945, - 0xd6e149, 0xe4f04e, 0xf2ff53, 0xf2ff53, - 0x263001, 0x243803, 0x234005, 0x51541b, - 0x806931, 0x978135, 0xaf993a, 0xc2a73e, - 0xd5b543, 0xdbc03d, 0xe1cb38, 0xe2d836, - 0xe3e534, 0xeff258, 0xfbff7d, 0xfbff7d, - 0x401a02, 0x581f05, 0x702408, 0x8d3a13, - 0xab511f, 0xb56427, 0xbf7730, 0xd0853a, - 0xe19344, 0xeda04e, 0xf9ad58, 0xfcb75c, - 0xffc160, 0xffc671, 0xffcb83, 0xffcb83 +const uInt32 TIA::ourNTSCPalette[256] = { + 0x000000, 0x000000, 0x2b2b2b, 0x2b2b2b, // 0x0? + 0x525252, 0x525252, 0x767676, 0x767676, + 0x979797, 0x979797, 0xb6b6b6, 0xb6b6b6, + 0xd2d2d2, 0xd2d2d2, 0xececec, 0xececec, + 0x444400, 0x444400, 0x666613, 0x666613, // 0x1? + 0x848424, 0x848424, 0xa0a034, 0xa0a034, + 0xbaba42, 0xbaba42, 0xd2d250, 0xd2d250, + 0xe8e85c, 0xe8e85c, 0xfcfc68, 0xfcfc68, + 0x702800, 0x702800, 0x864516, 0x864516, // 0x2? + 0x9b5f29, 0x9b5f29, 0xae783c, 0xae783c, + 0xbf8e4c, 0xbf8e4c, 0xcfa35c, 0xcfa35c, + 0xdeb66a, 0xdeb66a, 0xecc878, 0xecc878, + 0x841800, 0x841800, 0x9a361b, 0x9a361b, // 0x3? + 0xad5133, 0xad5133, 0xc06a4a, 0xc06a4a, + 0xd0815e, 0xd0815e, 0xe09672, 0xe09672, + 0xeeaa83, 0xeeaa83, 0xfcbc94, 0xfcbc94, + 0x880000, 0x880000, 0x9d2121, 0x9d2121, // 0x4? + 0xb03e3e, 0xb03e3e, 0xc25a5a, 0xc25a5a, + 0xd27373, 0xd27373, 0xe18a8a, 0xe18a8a, + 0xefa0a0, 0xefa0a0, 0xfcb4b4, 0xfcb4b4, + 0x78005c, 0x78005c, 0x8d2074, 0x8d2074, // 0x5? + 0xa03d89, 0xa03d89, 0xb2589e, 0xb2589e, + 0xc270b0, 0xc270b0, 0xd187c1, 0xd187c1, + 0xdf9cd1, 0xdf9cd1, 0xecb0e0, 0xecb0e0, + 0x480078, 0x480078, 0x612090, 0x612090, // 0x6? + 0x783da5, 0x783da5, 0x8e58ba, 0x8e58ba, + 0xa170cc, 0xa170cc, 0xb487dd, 0xb487dd, + 0xc49ced, 0xc49ced, 0xd4b0fc, 0xd4b0fc, + 0x140084, 0x140084, 0x33219a, 0x33219a, // 0x7? + 0x4e3ead, 0x4e3ead, 0x685ac0, 0x685ac0, + 0x7f73d0, 0x7f73d0, 0x958ae0, 0x958ae0, + 0xa9a0ee, 0xa9a0ee, 0xbcb4fc, 0xbcb4fc, + 0x000088, 0x000088, 0x1e229d, 0x1e229d, // 0x8? + 0x3940b0, 0x3940b0, 0x525cc2, 0x525cc2, + 0x6976d2, 0x6976d2, 0x7e8ee1, 0x7e8ee1, + 0x92a4ef, 0x92a4ef, 0xa4b8fc, 0xa4b8fc, + 0x00187c, 0x00187c, 0x1e3893, 0x1e3893, // 0x9? + 0x3955a8, 0x3955a8, 0x5270bc, 0x5270bc, + 0x6988ce, 0x6988ce, 0x7e9fde, 0x7e9fde, + 0x92b4ee, 0x92b4ee, 0xa4c8fc, 0xa4c8fc, + 0x002c5c, 0x002c5c, 0x1e4d79, 0x1e4d79, // 0xa? + 0x396a93, 0x396a93, 0x5286ac, 0x5286ac, + 0x699fc2, 0x699fc2, 0x7eb6d7, 0x7eb6d7, + 0x92ccea, 0x92ccea, 0xa4e0fc, 0xa4e0fc, + 0x003c2c, 0x003c2c, 0x1e5f4b, 0x1e5f4b, // 0xb? + 0x397e66, 0x397e66, 0x529c80, 0x529c80, + 0x69b797, 0x69b797, 0x7ed0ad, 0x7ed0ad, + 0x92e7c1, 0x92e7c1, 0xa4fcd4, 0xa4fcd4, + 0x003c00, 0x003c00, 0x225f22, 0x225f22, // 0xc? + 0x407e40, 0x407e40, 0x5c9c5c, 0x5c9c5c, + 0x76b776, 0x76b776, 0x8ed08e, 0x8ed08e, + 0xa4e7a4, 0xa4e7a4, 0xb8fcb8, 0xb8fcb8, + 0x143800, 0x143800, 0x355c1e, 0x355c1e, // 0xd? + 0x527c39, 0x527c39, 0x6e9a52, 0x6e9a52, + 0x87b569, 0x87b569, 0x9ecf7e, 0x9ecf7e, + 0xb4e692, 0xb4e692, 0xc8fca4, 0xc8fca4, + 0x2c3000, 0x2c3000, 0x4d521c, 0x4d521c, // 0xe? + 0x6a7136, 0x6a7136, 0x868e4e, 0x868e4e, + 0x9fa864, 0x9fa864, 0xb6c178, 0xb6c178, + 0xccd78b, 0xccd78b, 0xe0ec9c, 0xe0ec9c, + 0x442800, 0x442800, 0x664a19, 0x664a19, // 0xf? + 0x846830, 0x846830, 0xa08446, 0xa08446, + 0xba9e59, 0xba9e59, 0xd2b66c, 0xd2b66c, + 0xe8cc7c, 0xe8cc7c, 0xfce08c, 0xfce08c }; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -