(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, 132 insertions, 132 deletions

diff --git a/table/station_land.h b/table/station_land.h
index 5d4c6dbfa..e8ca47e27 100644
--- a/table/station_land.h
+++ b/table/station_land.h
@@ -3,58 +3,58 @@
 #define TILE_SEQ_END()	{ 0x80, 0, 0, 0, 0, 0, 0 }
 
 static const DrawTileSeqStruct _station_display_datas_0[] = {
-	{ 0,  0,  0, 16,  5,  2, 0x842E },
-	{ 0, 11,  0, 16,  5,  2, 0x8430 },
+	{ 0,  0,  0, 16,  5,  2, 0x42E | PALETTE_MODIFIER_COLOR },
+	{ 0, 11,  0, 16,  5,  2, 0x430 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_1[] = {
-	{ 0,  0,  0,  5, 16,  2, 0x842F },
-	{ 11,  0,  0,  5, 16,  2, 0x842D },
+	{ 0,  0,  0,  5, 16,  2, 0x42F | PALETTE_MODIFIER_COLOR },
+	{ 11,  0,  0,  5, 16,  2, 0x42D | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_2[] = {
-	{ 0,  0,  0, 16,  5,  2, 0x8431 },
-	{ 0, 11,  0, 16,  5,  2, 0x8430 },
+	{ 0,  0,  0, 16,  5,  2, 0x431 | PALETTE_MODIFIER_COLOR },
+	{ 0, 11,  0, 16,  5,  2, 0x430 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_3[] = {
-	{ 0,  0,  0,  5, 16,  2, 0x8432 },
-	{ 11,  0,  0,  5, 16,  2, 0x842D },
+	{ 0,  0,  0,  5, 16,  2, 0x432 | PALETTE_MODIFIER_COLOR },
+	{ 11,  0,  0,  5, 16,  2, 0x42D | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_4[] = {
-	{ 0,  0,  0, 16,  5,  7, 0x8434 },
-	{ 0, 11,  0, 16,  5,  2, 0x8430 },
-	{ 0,  0, 16, 16, 16, 10, 0x8437 },
-	{ 0,  0,0x80, 0,  0,  0, 0x322443B },
+	{ 0,  0,  0, 16,  5,  7, 0x434 | PALETTE_MODIFIER_COLOR },
+	{ 0, 11,  0, 16,  5,  2, 0x430 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0, 16, 16, 16, 10, 0x437 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,0x80, 0,  0,  0, 0x43B | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_5[] = {
-	{ 0,  0,  0,  5, 16,  2, 0x8435 },
-	{ 11,  0,  0,  5, 16,  2, 0x842D },
-	{ 0,  0, 16, 16, 16, 10, 0x8438 },
-	{ 0,  0,0x80, 0,  0,  0, 0x322443C },
+	{ 0,  0,  0,  5, 16,  2, 0x435 | PALETTE_MODIFIER_COLOR },
+	{ 11,  0,  0,  5, 16,  2, 0x42D | PALETTE_MODIFIER_COLOR },
+	{ 0,  0, 16, 16, 16, 10, 0x438 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,0x80, 0,  0,  0, 0x43C | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_6[] = {
-	{ 0,  0,  0, 16,  5,  2, 0x842E },
-	{ 0, 11,  0, 16,  5,  2, 0x8436 },
-	{ 0,  0, 16, 16, 16, 10, 0x8439 },
-	{ 0,  0,0x80, 0,  0,  0, 0x322443D },
+	{ 0,  0,  0, 16,  5,  2, 0x42E | PALETTE_MODIFIER_COLOR },
+	{ 0, 11,  0, 16,  5,  2, 0x436 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0, 16, 16, 16, 10, 0x439 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,0x80, 0,  0,  0, 0x43D | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_7[] = {
-	{ 0,  0,  0,  5, 16,  2, 0x842F },
-	{ 11,  0,  0,  5, 16,  2, 0x8433 },
-	{ 0,  0, 16, 16, 16, 10, 0x843A },
-	{ 0,  0,0x80, 0,  0,  0, 0x322443E },
+	{ 0,  0,  0,  5, 16,  2, 0x42F | PALETTE_MODIFIER_COLOR },
+	{ 11,  0,  0,  5, 16,  2, 0x433 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0, 16, 16, 16, 10, 0x43A | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,0x80, 0,  0,  0, 0x43E | PALETTE_TO_TRANSPARENT },
 	TILE_SEQ_END()
 };
 
@@ -63,12 +63,12 @@ static const DrawTileSeqStruct _station_display_datas_8[] = {
 };
 
 static const DrawTileSeqStruct _station_display_datas_9[] = {
-	{ 0,  0,  0, 16,  1,  6, 0x8A68 },
+	{ 0,  0,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_10[] = {
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
@@ -113,70 +113,70 @@ static const DrawTileSeqStruct _station_display_datas_20[] = {
 };
 
 static const DrawTileSeqStruct _station_display_datas_21[] = {
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_22[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_23[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_24[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_25[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_26[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_27[] = {
-	{ 2,  0,  0, 11, 16, 40, 0x8A5A },
+	{ 2,  0,  0, 11, 16, 40, 0xA5A | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_28[] = {
-	{ 3,  3,  0, 10, 10, 60, 0x8A5B },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 3,  3,  0, 10, 10, 60, 0xA5B | PALETTE_MODIFIER_COLOR },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_29[] = {
-	{ 0,  1,  0, 14, 14, 30, 0x8A5C },
+	{ 0,  1,  0, 14, 14, 30, 0xA5C | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_30[] = {
-	{ 3,  3,  0, 10, 11, 35, 0x8A5D },
+	{ 3,  3,  0, 10, 11, 35, 0xA5D | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_31[] = {
-	{ 0,  3,  0, 16, 11, 40, 0x8A5E },
+	{ 0,  3,  0, 16, 11, 40, 0xA5E | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_32[] = {
-	{ 14,  0,  0,  2, 16, 28, 0x8A5F },
+	{ 14,  0,  0,  2, 16, 28, 0xA5F | PALETTE_MODIFIER_COLOR },
 	{ 0,  0,  0,  2, 16, 28, 0xA60 },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_33[] = {
 	{ 7, 11,  0,  3,  3, 14, 0xA63 },
-	{ 0,  0,  0, 16,  1,  6, 0x8A68 },
+	{ 0,  0,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
@@ -200,85 +200,85 @@ static const DrawTileSeqStruct _station_display_datas_37[] = {
 };
 
 static const DrawTileSeqStruct _station_display_datas_38[] = {
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_39[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA78 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_40[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA79 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_41[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7A },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_42[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7B },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_43[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7C },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_44[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7D },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_45[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7E },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_46[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7F },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_47[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA80 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_48[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA81 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_49[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA82 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_50[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA83 },
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_51[] = {
 	{ 7,  7,  0,  2,  2, 70, 0xA29 },
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
@@ -291,12 +291,12 @@ static const DrawTileSeqStruct _station_display_datas_53[] = {
 };
 
 static const DrawTileSeqStruct _station_display_datas_54[] = {
-	{ 0,  0,  0, 15, 15, 30, 0x8A6C },
+	{ 0,  0,  0, 15, 15, 30, 0xA6C | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_55[] = {
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
@@ -309,108 +309,108 @@ static const DrawTileSeqStruct _station_display_datas_57[] = {
 };
 
 static const DrawTileSeqStruct _station_display_datas_58[] = {
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
-	{ 4, 11,  0,  1,  1, 20, 0x8A74 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
+	{ 4, 11,  0,  1,  1, 20, 0xA74 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_59[] = {
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
-	{ 4, 11,  0,  1,  1, 20, 0x8A75 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
+	{ 4, 11,  0,  1,  1, 20, 0xA75 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_60[] = {
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
-	{ 4, 11,  0,  1,  1, 20, 0x8A76 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
+	{ 4, 11,  0,  1,  1, 20, 0xA76 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_61[] = {
-	{ 0,  0,  0,  1, 16,  6, 0x8A67 },
-	{ 4, 11,  0,  1,  1, 20, 0x8A77 },
+	{ 0,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
+	{ 4, 11,  0,  1,  1, 20, 0xA77 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_62[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_63[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_64[] = {
-	{ 0, 15,  0, 16,  1,  6, 0x8A68 },
+	{ 0, 15,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_65[] = {
-	{ 14,  0,  0,  2, 16, 28, 0x8A61 },
+	{ 14,  0,  0,  2, 16, 28, 0xA61 | PALETTE_MODIFIER_COLOR },
 	{ 0,  0,  0,  2, 16, 28, 0xA62 },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_66[] = {
-	{ 0,  0,  0, 16, 16, 60, 0x8A49 },
+	{ 0,  0,  0, 16, 16, 60, 0xA49 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_67[] = {
-	{ 0, 15,  0, 13,  1, 10, 0x8A98 },
-	{ 13,  0,  0,  3, 16, 10, 0x8A9C },
-	{ 2,  0,  0, 11,  1, 10, 0x8AA0 },
+	{ 0, 15,  0, 13,  1, 10, 0xA98 | PALETTE_MODIFIER_COLOR },
+	{ 13,  0,  0,  3, 16, 10, 0xA9C | PALETTE_MODIFIER_COLOR },
+	{ 2,  0,  0, 11,  1, 10, 0xAA0 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_68[] = {
-	{ 15,  3,  0,  1, 13, 10, 0x8A99 },
-	{ 0,  0,  0, 16,  3, 10, 0x8A9D },
-	{ 0,  3,  0,  1, 11, 10, 0x8AA1 },
+	{ 15,  3,  0,  1, 13, 10, 0xA99 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,  0, 16,  3, 10, 0xA9D | PALETTE_MODIFIER_COLOR },
+	{ 0,  3,  0,  1, 11, 10, 0xAA1 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_69[] = {
-	{ 3,  0,  0, 13,  1, 10, 0x8A9A },
-	{ 0,  0,  0,  3, 16, 10, 0x8A9E },
-	{ 3, 15,  0, 11,  1, 10, 0x8AA2 },
+	{ 3,  0,  0, 13,  1, 10, 0xA9A | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,  0,  3, 16, 10, 0xA9E | PALETTE_MODIFIER_COLOR },
+	{ 3, 15,  0, 11,  1, 10, 0xAA2 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_70[] = {
-	{ 0,  0,  0,  1, 13, 10, 0x8A9B },
-	{ 0, 13,  0, 16,  3, 10, 0x8A9F },
-	{ 15,  2,  0,  1, 11, 10, 0x8AA3 },
+	{ 0,  0,  0,  1, 13, 10, 0xA9B | PALETTE_MODIFIER_COLOR },
+	{ 0, 13,  0, 16,  3, 10, 0xA9F | PALETTE_MODIFIER_COLOR },
+	{ 15,  2,  0,  1, 11, 10, 0xAA3 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_71[] = {
-	{ 2,  0,  0, 11,  1, 10, 0x8A88 },
-	{ 13,  0,  0,  3, 16, 10, 0x8A8C },
-	{ 0, 13,  0, 13,  3, 10, 0x8A90 },
+	{ 2,  0,  0, 11,  1, 10, 0xA88 | PALETTE_MODIFIER_COLOR },
+	{ 13,  0,  0,  3, 16, 10, 0xA8C | PALETTE_MODIFIER_COLOR },
+	{ 0, 13,  0, 13,  3, 10, 0xA90 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_72[] = {
-	{ 0,  3,  0,  1, 11, 10, 0x8A89 },
-	{ 0,  0,  0, 16,  3, 10, 0x8A8D },
-	{ 13,  3,  0,  3, 13, 10, 0x8A91 },
+	{ 0,  3,  0,  1, 11, 10, 0xA89 | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,  0, 16,  3, 10, 0xA8D | PALETTE_MODIFIER_COLOR },
+	{ 13,  3,  0,  3, 13, 10, 0xA91 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_73[] = {
-	{ 3, 15,  0, 11,  1, 10, 0x8A8A },
-	{ 0,  0,  0,  3, 16, 10, 0x8A8E },
-	{ 3,  0,  0, 13,  3, 10, 0x8A92 },
+	{ 3, 15,  0, 11,  1, 10, 0xA8A | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,  0,  3, 16, 10, 0xA8E | PALETTE_MODIFIER_COLOR },
+	{ 3,  0,  0, 13,  3, 10, 0xA92 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 static const DrawTileSeqStruct _station_display_datas_74[] = {
-	{ 15,  2,  0,  1, 11, 10, 0x8A8B },
-	{ 0, 13,  0, 16,  3, 10, 0x8A8F },
-	{ 0,  0,  0,  3, 13, 10, 0x8A93 },
+	{ 15,  2,  0,  1, 11, 10, 0xA8B | PALETTE_MODIFIER_COLOR },
+	{ 0, 13,  0, 16,  3, 10, 0xA8F | PALETTE_MODIFIER_COLOR },
+	{ 0,  0,  0,  3, 13, 10, 0xA93 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
@@ -465,14 +465,14 @@ const DrawTileSeqStruct _station_display_datas_084[] = {
 // control tower with concrete underground and no fence
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_085[] = {
-	{ 3,  3,  0, 10, 10, 60, 0x8A5B },  // control tower
+	{ 3,  3,  0, 10, 10, 60, 0xA5B | PALETTE_MODIFIER_COLOR },  // control tower
 	TILE_SEQ_END()
 };
 
 // new airportdepot, facing west
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_086[] = {
-	{ 14, 0,  0,  2, 16, 28, 0x8A61 },
+	{ 14, 0,  0,  2, 16, 28, 0xA61 | PALETTE_MODIFIER_COLOR },
 	{ 0, 0,  0,  2, 16, 28, 0xA62 },
 	TILE_SEQ_END()
 };
@@ -480,19 +480,19 @@ const DrawTileSeqStruct _station_display_datas_086[] = {
 // asphalt tile with fences in north
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_087[] = {
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // end of runway
 const DrawTileSeqStruct _station_display_datas_088[] = {
-	{ 0,  0,  0, 16,  1,  6, 0x8A68 }, // fences
+	{ 0,  0,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR }, // fences
 	TILE_SEQ_END()
 };
 
 // runway tiles
 const DrawTileSeqStruct _station_display_datas_089[] = {
-	{ 0,  0,  0, 16,  1,  6, 0x8A68 }, // fences
+	{ 0,  0,  0, 16,  1,  6, 0xA68 | PALETTE_MODIFIER_COLOR }, // fences
 	TILE_SEQ_END()
 };
 
@@ -501,84 +501,84 @@ const DrawTileSeqStruct _station_display_datas_089[] = {
 //BEGIN
 const DrawTileSeqStruct _station_display_datas_090[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA78 },   // turning radar
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },  //fences
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },  //fences
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_091[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA79 },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_092[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7A },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_093[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7B },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_094[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7C },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_095[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7D },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_096[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7E },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_097[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7F },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_098[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA80 },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_099[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA81 },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0100[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA82 },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0101[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA83 },
-	{ 15,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 15,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 //END
@@ -588,84 +588,84 @@ const DrawTileSeqStruct _station_display_datas_0101[] = {
 //BEGIN
 const DrawTileSeqStruct _station_display_datas_0102[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA78 },   // turning radar
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0103[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA79 },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0104[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7A },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0105[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7B },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0106[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7C },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0107[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7D },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0108[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7E },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0109[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA7F },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0110[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA80 },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0111[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA81 },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0112[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA82 },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0113[] = {
 	{ 7,  7,  0,  2,  2,  8, 0xA83 },
-	{ 0,  0, 0,  1, 16,  6, 0x8A67 },
+	{ 0,  0, 0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },
 	TILE_SEQ_END()
 };
 //END
@@ -674,7 +674,7 @@ const DrawTileSeqStruct _station_display_datas_0113[] = {
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0114[] = {
 	{ 10,  6, 0,  0, 0,  0, SPR_OPENTTD_BASE + 31 },	// helipad
-	{ 15,  0,  0,  1, 16,  6, 0x8A67 },	// fences bottom
+	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },	// fences bottom
 	TILE_SEQ_END()
 };
 
@@ -733,7 +733,7 @@ static const DrawTileSprites _station_display_datas[] = {
 	{ 0xF8D, _station_display_datas_51 },
 	{ 0xA69, _station_display_datas_52 },
 	{ 0xA6A, _station_display_datas_53 },
-	{ 0x8A6B, _station_display_datas_54 },
+	{ 0xA6B | PALETTE_MODIFIER_COLOR, _station_display_datas_54 },
 	{ 0xA6D, _station_display_datas_55 },
 	{ 0xA6E, _station_display_datas_56 },
 	{ 0xA6F, _station_display_datas_57 },
@@ -746,14 +746,14 @@ static const DrawTileSprites _station_display_datas[] = {
 	{ 0xA73, _station_display_datas_64 },
 	{ 0xA4A, _station_display_datas_65 },
 	{ 0xF8D, _station_display_datas_66 },
-	{ 0x8A94, _station_display_datas_67 },
-	{ 0x8A95, _station_display_datas_68 },
-	{ 0x8A96, _station_display_datas_69 },
-	{ 0x8A97, _station_display_datas_70 },
-	{ 0x8A84, _station_display_datas_71 },
-	{ 0x8A85, _station_display_datas_72 },
-	{ 0x8A86, _station_display_datas_73 },
-	{ 0x8A87, _station_display_datas_74 },
+	{ 0xA94 | PALETTE_MODIFIER_COLOR, _station_display_datas_67 },
+	{ 0xA95 | PALETTE_MODIFIER_COLOR, _station_display_datas_68 },
+	{ 0xA96 | PALETTE_MODIFIER_COLOR, _station_display_datas_69 },
+	{ 0xA97 | PALETTE_MODIFIER_COLOR, _station_display_datas_70 },
+	{ 0xA84 | PALETTE_MODIFIER_COLOR, _station_display_datas_71 },
+	{ 0xA85 | PALETTE_MODIFIER_COLOR, _station_display_datas_72 },
+	{ 0xA86 | PALETTE_MODIFIER_COLOR, _station_display_datas_73 },
+	{ 0xA87 | PALETTE_MODIFIER_COLOR, _station_display_datas_74 },
 	{ 0xFDD, _station_display_datas_75 },
 	{ 0xFE4, _station_display_datas_76 },
 	{ 0xFE5, _station_display_datas_77 },