(svn r2702) -Codechange: Cleaned up the sprite code and replaced many magic numbers

by enums. There remains work in gfx.c to move the "transparency" and
"recolor" bits around to make space for more sprites. However, 2800
additional sprites can now be loaded. There also remains cleanup and
Doxygen work on many of the header files.

1 files changed, 146 insertions, 146 deletions

diff --git a/table/industry_land.h b/table/industry_land.h
index 38b4e0308..19629f4f0 100644
--- a/table/industry_land.h
+++ b/table/industry_land.h
@@ -75,26 +75,26 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x81d,      0x81c,  0,  0, 16, 16,   7, 0),
 	M(     0x81d,      0x81c,  0,  0, 16, 16,   7, 0),
 	M(     0x81d,      0x81c,  0,  0, 16, 16,   7, 0),
-	M(     0xf54,     0x881e,  1,  1, 14, 14,   4, 0),
-	M(     0xf54,     0x881f,  1,  1, 14, 14,  24, 0),
-	M(     0xf54,     0x8820,  1,  1, 14, 14,  27, 0),
-	M(     0x58c,     0x8820,  1,  1, 14, 14,  27, 0),
-	M(     0xf54,     0x8821,  3,  3, 10,  9,   3, 0),
-	M(     0xf54,     0x8822,  3,  3, 10,  9,  63, 0),
-	M(     0xf54,     0x8823,  3,  3, 10,  9,  62, 0),
-	M(     0x58c,     0x8823,  3,  3, 10,  9,  62, 0),
-	M(     0xf54,     0x8824,  4,  4,  7,  7,   3, 0),
-	M(     0xf54,     0x8825,  4,  4,  7,  7,  72, 0),
-	M(     0xf54,     0x8825,  4,  4,  7,  7,  72, 0),
-	M(     0x58c,     0x8826,  4,  4,  7,  7,  80, 0),
-	M(     0xf54,     0x8827,  2,  0, 12, 16,  51, 0),
-	M(     0xf54,     0x8828,  2,  0, 12, 16,  51, 0),
-	M(     0xf54,     0x8829,  2,  0, 12, 16,  51, 0),
-	M(     0x58c,     0x8829,  2,  0, 12, 16,  51, 0),
-	M(     0xf54,     0x882a,  0,  0, 16, 16,  26, 0),
-	M(     0xf54,     0x882b,  0,  0, 16, 16,  44, 0),
-	M(     0xf54,     0x882c,  0,  0, 16, 16,  46, 0),
-	M(     0x58c,     0x882c,  0,  0, 16, 16,  46, 0),
+	M(     0xf54,     0x81e | PALETTE_MODIFIER_COLOR,  1,  1, 14, 14,   4, 0),
+	M(     0xf54,     0x81f | PALETTE_MODIFIER_COLOR,  1,  1, 14, 14,  24, 0),
+	M(     0xf54,     0x820 | PALETTE_MODIFIER_COLOR,  1,  1, 14, 14,  27, 0),
+	M(     0x58c,     0x820 | PALETTE_MODIFIER_COLOR,  1,  1, 14, 14,  27, 0),
+	M(     0xf54,     0x821 | PALETTE_MODIFIER_COLOR,  3,  3, 10,  9,   3, 0),
+	M(     0xf54,     0x822 | PALETTE_MODIFIER_COLOR,  3,  3, 10,  9,  63, 0),
+	M(     0xf54,     0x823 | PALETTE_MODIFIER_COLOR,  3,  3, 10,  9,  62, 0),
+	M(     0x58c,     0x823 | PALETTE_MODIFIER_COLOR,  3,  3, 10,  9,  62, 0),
+	M(     0xf54,     0x824 | PALETTE_MODIFIER_COLOR,  4,  4,  7,  7,   3, 0),
+	M(     0xf54,     0x825 | PALETTE_MODIFIER_COLOR,  4,  4,  7,  7,  72, 0),
+	M(     0xf54,     0x825 | PALETTE_MODIFIER_COLOR,  4,  4,  7,  7,  72, 0),
+	M(     0x58c,     0x826 | PALETTE_MODIFIER_COLOR,  4,  4,  7,  7,  80, 0),
+	M(     0xf54,     0x827 | PALETTE_MODIFIER_COLOR,  2,  0, 12, 16,  51, 0),
+	M(     0xf54,     0x828 | PALETTE_MODIFIER_COLOR,  2,  0, 12, 16,  51, 0),
+	M(     0xf54,     0x829 | PALETTE_MODIFIER_COLOR,  2,  0, 12, 16,  51, 0),
+	M(     0x58c,     0x829 | PALETTE_MODIFIER_COLOR,  2,  0, 12, 16,  51, 0),
+	M(     0xf54,     0x82a | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  26, 0),
+	M(     0xf54,     0x82b | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  44, 0),
+	M(     0xf54,     0x82c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  46, 0),
+	M(     0x58c,     0x82c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  46, 0),
 	M(     0xf54,      0x82d,  3,  1, 10, 13,   2, 0),
 	M(     0xf54,      0x82e,  3,  1, 10, 13,  11, 0),
 	M(     0xf54,      0x82f,  3,  1, 10, 13,  11, 0),
@@ -135,18 +135,18 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x87d,      0x880,  0,  0, 16, 16,  20, 0),
 	M(     0x87d,      0x87f,  0,  0, 16, 16,  20, 0),
 	M(     0x87d,      0x87e,  0,  0, 16, 16,  20, 0),
-	M(     0x83a,     0x883c,  0,  0, 16, 16,  18, 0),
-	M(     0x83a,     0x883c,  0,  0, 16, 16,  18, 0),
-	M(     0x83a,     0x883c,  0,  0, 16, 16,  18, 0),
-	M(     0x83a,     0x883c,  0,  0, 16, 16,  18, 0),
-	M(     0x83b,     0x883d,  0,  0, 16, 16,  18, 0),
-	M(     0x83b,     0x883d,  0,  0, 16, 16,  18, 0),
-	M(     0x83b,     0x883d,  0,  0, 16, 16,  18, 0),
-	M(     0x83b,     0x883d,  0,  0, 16, 16,  18, 0),
+	M(     0x83a,     0x83c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83a,     0x83c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83a,     0x83c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83a,     0x83c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83b,     0x83d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83b,     0x83d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83b,     0x83d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83b,     0x83d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
 	M(     0x7e6,        0x0,  0,  0,  1,  1,   0, 0),
-	M(     0x83e,     0x883f,  0,  0, 16, 16,  18, 0),
-	M(     0x83e,     0x883f,  0,  0, 16, 16,  18, 0),
-	M(     0x83e,     0x883f,  0,  0, 16, 16,  18, 0),
+	M(     0x83e,     0x83f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83e,     0x83f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
+	M(     0x83e,     0x83f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  18, 0),
 	M(     0x7e6,        0x0,  0,  0,  1,  1,   0, 0),
 	M(     0x840,      0x841,  0,  0, 16, 16,  18, 0),
 	M(     0x840,      0x841,  0,  0, 16, 16,  18, 0),
@@ -162,35 +162,35 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x7e6,      0x869,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86d,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86d,  0,  0, 16, 16,  50, 0),
-	M(    0x8862,     0x8866,  0,  0, 16, 16,  50, 0),
+	M(    0x862 | PALETTE_MODIFIER_COLOR,     0x866 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86a,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86e,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86e,  0,  0, 16, 16,  50, 0),
-	M(    0x8863,     0x8867,  0,  0, 16, 16,  50, 0),
+	M(    0x863 | PALETTE_MODIFIER_COLOR,     0x867 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86b,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86f,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86f,  0,  0, 16, 16,  50, 0),
-	M(    0x8864,     0x8868,  0,  0, 16, 16,  50, 0),
+	M(    0x864 | PALETTE_MODIFIER_COLOR,     0x868 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86c,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x870,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x870,  0,  0, 16, 16,  50, 0),
-	M(    0x8865,        0x0,  0,  0,  1,  1,   0, 0),
-	M(     0xf54,     0x8871,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8875,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8875,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8879,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8872,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8876,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8876,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x887a,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8873,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8877,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8877,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x887b,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8874,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8878,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x8878,  0,  0, 16, 16,  50, 0),
-	M(     0xf54,     0x887c,  0,  0, 16, 16,  50, 0),
+	M(    0x865 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0,  1,  1,   0, 0),
+	M(     0xf54,     0x871 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x875 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x875 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x879 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x872 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x876 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x876 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x87a | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x873 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x877 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x877 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x87b | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x874 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x878 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x878 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf54,     0x87c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0xf54,      0x7ea,  3,  2,  8,  8,  18, 0),
 	M(     0xf54,      0x7eb,  3,  2,  8,  8,  37, 0),
 	M(     0xf54,      0x7ec,  3,  2,  8,  8,  49, 0),
@@ -214,27 +214,27 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x7e6,      0x85c,  0,  0,  1,  1,   1, 0),
 	M(     0x851,      0x852,  0,  0, 16, 16,  20, 0),
 	M(     0x851,      0x852,  0,  0, 16, 16,  20, 0),
-	M(    0x8846,     0x8847,  0,  0, 16, 16,  20, 0),
+	M(    0x846 | PALETTE_MODIFIER_COLOR,     0x847 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  20, 0),
 	M(     0x7e6,      0x85d,  0,  0,  1,  1,   1, 0),
 	M(     0x853,      0x854,  0,  0, 16, 16,  20, 0),
 	M(     0x853,      0x854,  0,  0, 16, 16,  20, 0),
-	M(    0x8848,     0x8849,  0,  0, 16, 16,  20, 0),
+	M(    0x848 | PALETTE_MODIFIER_COLOR,     0x849 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  20, 0),
 	M(     0x7e6,      0x85e,  0,  0,  1,  1,   1, 0),
 	M(     0x855,      0x856,  0,  0, 16, 16,  20, 0),
 	M(     0x855,      0x856,  0,  0, 16, 16,  20, 0),
-	M(    0x884a,     0x884b,  0,  0, 16, 16,  20, 0),
+	M(    0x84a | PALETTE_MODIFIER_COLOR,     0x84b | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  20, 0),
 	M(     0x7e6,      0x85f,  0,  0,  1,  1,   1, 0),
 	M(     0x857,        0x0,  0,  0,  1,  1,   0, 0),
 	M(     0x857,        0x0,  0,  0,  1,  1,   0, 0),
-	M(    0x884c,        0x0,  0,  0,  1,  1,   0, 0),
+	M(    0x84c | PALETTE_MODIFIER_COLOR,        0x0,  0,  0,  1,  1,   0, 0),
 	M(     0x7e6,      0x860,  0,  0,  1,  1,   1, 0),
 	M(     0x858,      0x859,  0,  0, 16, 16,  20, 0),
 	M(     0x858,      0x859,  0,  0, 16, 16,  20, 0),
-	M(    0x884d,     0x884e,  0,  0, 16, 16,  20, 0),
+	M(    0x84d | PALETTE_MODIFIER_COLOR,     0x84e | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  20, 0),
 	M(     0x7e6,      0x861,  0,  0,  1,  1,   1, 0),
 	M(     0x85a,      0x85b,  0,  0, 16, 16,  20, 0),
 	M(     0x85a,      0x85b,  0,  0, 16, 16,  20, 0),
-	M(    0x884f,     0x8850,  0,  0, 16, 16,  20, 0),
+	M(    0x84f | PALETTE_MODIFIER_COLOR,     0x850 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  20, 0),
 	M(     0x7e6,      0x884,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x884,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x884,  0,  0, 16, 16,  25, 0),
@@ -243,22 +243,22 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x7e6,      0x885,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x885,  0,  0, 16, 16,  25, 0),
 	M(     0x887,      0x885,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x888c,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x888d,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x888d,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x888e,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x888f,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8890,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8890,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8891,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8892,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8893,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8893,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8894,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8895,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8896,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8896,  0,  0, 16, 16,  25, 0),
-	M(     0x7e6,     0x8897,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x88c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x88d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x88d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x88e | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x88f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x890 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x890 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x891 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x892 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x893 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x893 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x894 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x895 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x896 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x896 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(     0x7e6,     0x897 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x898,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x899,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x899,  0,  0, 16, 16,  25, 0),
@@ -475,34 +475,34 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x925,        0x0,  0,  0, 16, 16,  25, 0),
 	M(     0x925,      0x927,  0,  0, 16, 16,  30, 0),
 	M(     0x925,      0x927,  0,  0, 16, 16,  30, 0),
-	M(    0x11c6,     0x892b,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892c,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892c,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892d,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892e,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892f,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892f,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x8930,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x8928,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x8929,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x8929,  0,  0, 16, 16,  25, 0),
-	M(    0x11c6,     0x892a,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92b | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92e | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92f | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x930 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x928 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x929 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x929 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
+	M(    0x11c6,     0x92a | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  25, 0),
 	M(     0x7e6,      0x869,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86d,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86d,  0,  0, 16, 16,  50, 0),
-	M(    0x8862,     0x8866,  0,  0, 16, 16,  50, 0),
+	M(    0x862 | PALETTE_MODIFIER_COLOR,     0x866 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86a,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86e,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86e,  0,  0, 16, 16,  50, 0),
-	M(    0x8863,     0x8867,  0,  0, 16, 16,  50, 0),
+	M(    0x863 | PALETTE_MODIFIER_COLOR,     0x867 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86b,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86f,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86f,  0,  0, 16, 16,  50, 0),
-	M(    0x8864,     0x8868,  0,  0, 16, 16,  50, 0),
+	M(    0x864 | PALETTE_MODIFIER_COLOR,     0x868 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x86c,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x870,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x870,  0,  0, 16, 16,  50, 0),
-	M(    0x8865,        0x0,  0,  0,  1,  1,   0, 0),
+	M(    0x865 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0,  1,  1,   0, 0),
 	M(     0x7e6,      0x931,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x935,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,      0x935,  0,  0, 16, 16,  50, 0),
@@ -531,18 +531,18 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0x7e6,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0x7e6,        0x0,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9245,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9248,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9248,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x924b,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9247,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x924a,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x924a,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x924d,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9246,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9249,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x9249,  0,  0, 16, 16,  50, 0),
-	M(     0x7e6,     0x924c,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1245 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1248 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1248 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x124b | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1247 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x124a | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x124a | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x124d | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1246 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1249 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x1249 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0x7e6,     0x124c | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(     0x81d,     0x124e,  0,  0, 16, 16,  10, 0),
 	M(     0x81d,     0x124f,  0,  0, 16, 16,  10, 0),
 	M(     0x81d,     0x1250,  0,  0, 16, 16,  10, 0),
@@ -634,27 +634,27 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9284,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1284 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9283,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9283,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9286,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9281,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9282,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9282,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,     0x9285,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1283 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1283 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1286 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1281 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1282 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1282 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,     0x1285 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
 	M(    0x1243,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x1243,  0x30b9287,  0,  0, 16, 16,  50, 0),
-	M(    0x1243,  0x30b9287,  0,  0, 16, 16,  50, 0),
-	M(    0x1243,  0x30b9287,  0,  0, 16, 16,  50, 0),
+	M(    0x1243,  0x1287 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
+	M(    0x1243,  0x1287 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
+	M(    0x1243,  0x1287 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,  0x30b9288,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,  0x30b9288,  0,  0, 16, 16,  50, 0),
-	M(    0x1244,  0x30b9288,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,  0x1288 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,  0x1288 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
+	M(    0x1244,  0x1288 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 0),
 	M(    0x1243,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x1243,  0x30b9289,  0,  0, 16, 16,  50, 3),
-	M(    0x1243,  0x30b9289,  0,  0, 16, 16,  50, 3),
-	M(    0x1243,  0x30b9289,  0,  0, 16, 16,  50, 3),
+	M(    0x1243,  0x1289 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 3),
+	M(    0x1243,  0x1289 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 3),
+	M(    0x1243,  0x1289 | PALETTE_TO_RED,  0,  0, 16, 16,  50, 3),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
 	M(    0x1244,        0x0,  0,  0, 16, 16,  50, 0),
@@ -671,38 +671,38 @@ static const DrawIndustryTileStruct _industry_draw_tile_data[700] = {
 	M(     0xf8d,     0x129d,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,     0x129d,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,     0x129d,  0,  0, 16, 16,  50, 0),
-	M(    0x92a0,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a0,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a0,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a0,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a1,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a1,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a1,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a1,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a2,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a2,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a2,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a2,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a3,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a3,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a3,        0x0,  0,  0, 16, 16,  50, 0),
-	M(    0x92a3,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a0 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a0 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a0 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a0 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a1 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a1 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a1 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a1 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a2 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a2 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a2 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a2 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a3 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a3 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a3 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
+	M(    0x12a3 | PALETTE_MODIFIER_COLOR,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,        0x0,  0,  0, 16, 16,  50, 0),
 	M(     0xf8d,        0x0,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a4,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a4,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a4,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a4,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a6,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a6,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a6,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a6,  0,  0, 16, 16,  50, 0),
-	M(     0xf8d,     0x92a5,  0,  0, 16, 16,  50, 1),
-	M(     0xf8d,     0x92a5,  0,  0, 16, 16,  50, 1),
-	M(     0xf8d,     0x92a5,  0,  0, 16, 16,  50, 1),
-	M(     0xf8d,     0x92a5,  0,  0, 16, 16,  50, 1),
+	M(     0xf8d,     0x12a4 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a4 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a4 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a4 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a6 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a6 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a6 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a6 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 0),
+	M(     0xf8d,     0x12a5 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 1),
+	M(     0xf8d,     0x12a5 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 1),
+	M(     0xf8d,     0x12a5 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 1),
+	M(     0xf8d,     0x12a5 | PALETTE_MODIFIER_COLOR,  0,  0, 16, 16,  50, 1),
 };
 
 static const DrawIndustrySpec1Struct _draw_industry_spec1[96] = {