(svn r16568) -Codechange: rename all arrays with airport-tile sprites

1 files changed, 249 insertions, 525 deletions

diff --git a/src/table/station_land.h b/src/table/station_land.h
index 47e0bf512..15790ac3c 100644
--- a/src/table/station_land.h
+++ b/src/table/station_land.h
@@ -88,238 +88,193 @@ static const DrawTileSeqStruct _station_display_datas_7[] = {
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_9[] = {
+static const DrawTileSeqStruct _station_display_fence_nw[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_10[] = {
+static const DrawTileSeqStruct _station_display_fence_sw[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_21[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_22[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_23[] = {
+static const DrawTileSeqStruct _station_display_fence_se[] = {
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_24[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_25[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_26[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_27[] = {
+static const DrawTileSeqStruct _station_display_terminal_a[] = {
 	TILE_SEQ_LINE( 2,  0,  0, 11, 16, 40, SPR_AIRPORT_TERMINAL_A | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_28[] = {
+static const DrawTileSeqStruct _station_display_tower_fence_sw[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_TOWER | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_29[] = {
+static const DrawTileSeqStruct _station_display_concourse[] = {
 	TILE_SEQ_LINE( 0,  1,  0, 14, 14, 30, SPR_AIRPORT_CONCOURSE | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_30[] = {
+static const DrawTileSeqStruct _station_display_datas_terminal_b[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 11, 35, SPR_AIRPORT_TERMINAL_B | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_31[] = {
+static const DrawTileSeqStruct _station_display_datas_terminal_c[] = {
 	TILE_SEQ_LINE( 0,  3,  0, 16, 11, 40, SPR_AIRPORT_TERMINAL_C | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_32[] = {
+static const DrawTileSeqStruct _station_display_hangar_se[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_AIRPORT_HANGAR_FRONT | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  2, 16, 28, SPR_AIRPORT_HANGAR_REAR | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_33[] = {
+static const DrawTileSeqStruct _station_display_jetway_1[] = {
 	TILE_SEQ_LINE( 7, 11,  0,  3,  3, 14, SPR_AIRPORT_JETWAY_1)
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_34[] = {
+static const DrawTileSeqStruct _station_display_jetway_2[] = {
 	TILE_SEQ_LINE( 2,  7,  0,  3,  3, 14, SPR_AIRPORT_JETWAY_2)
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_35[] = {
+static const DrawTileSeqStruct _station_display_jetway_3[] = {
 	TILE_SEQ_LINE( 3,  2,  0,  3,  3, 14, SPR_AIRPORT_JETWAY_3)
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_36[] = {
+static const DrawTileSeqStruct _station_display_passenger_tunnel[] = {
 	TILE_SEQ_LINE( 0,  8,  0, 14,  3, 14, SPR_AIRPORT_PASSENGER_TUNNEL)
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_38[] = {
+static const DrawTileSeqStruct _station_display_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_39[] = {
+static const DrawTileSeqStruct _station_display_radar_1_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_40[] = {
+static const DrawTileSeqStruct _station_display_radar_2_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_41[] = {
+static const DrawTileSeqStruct _station_display_radar_3_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_42[] = {
+static const DrawTileSeqStruct _station_display_radar_4_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_43[] = {
+static const DrawTileSeqStruct _station_display_radar_5_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_44[] = {
+static const DrawTileSeqStruct _station_display_radar_6_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_45[] = {
+static const DrawTileSeqStruct _station_display_radar_7_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_46[] = {
+static const DrawTileSeqStruct _station_display_radar_8_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_47[] = {
+static const DrawTileSeqStruct _station_display_radar_9_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_48[] = {
+static const DrawTileSeqStruct _station_display_radar_10_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_49[] = {
+static const DrawTileSeqStruct _station_display_radar_11_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_50[] = {
+static const DrawTileSeqStruct _station_display_radar_12_fence_sw[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_51[] = {
+static const DrawTileSeqStruct _station_display_transmitter_fence_ne[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2, 70, SPR_UNMOVABLE_TRANSMITTER)
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_54[] = {
+static const DrawTileSeqStruct _station_display_datas_terminal_c_2[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 15, 15, 30, SPR_AIRFIELD_TERM_C_BUILD | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_55[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_58[] = {
+static const DrawTileSeqStruct _station_display_flag_1_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 4, 11,  0,  1,  1, 20, SPR_AIRFIELD_WIND_1 | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_59[] = {
+static const DrawTileSeqStruct _station_display_flag_2_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 4, 11,  0,  1,  1, 20, SPR_AIRFIELD_WIND_2 | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_60[] = {
+static const DrawTileSeqStruct _station_display_flag_3_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 4, 11,  0,  1,  1, 20, SPR_AIRFIELD_WIND_3 | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_61[] = {
+static const DrawTileSeqStruct _station_display_flag_4_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 4, 11,  0,  1,  1, 20, SPR_AIRFIELD_WIND_4 | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_62[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_63[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_64[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-static const DrawTileSeqStruct _station_display_datas_65[] = {
+static const DrawTileSeqStruct _station_display_small_depot_se[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_FRONT | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_REAR | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-static const DrawTileSeqStruct _station_display_datas_66[] = {
+static const DrawTileSeqStruct _station_display_heliport[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16, 16, 60, SPR_HELIPORT | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
@@ -416,571 +371,340 @@ static const DrawTileSeqStruct _station_display_datas_82[] = {
 	TILE_SEQ_END()
 };
 
-/* control tower with concrete underground and no fence
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_085[] = {
+/* control tower without fence */
+static const DrawTileSeqStruct _station_display_tower[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_TOWER | (1 << PALETTE_MODIFIER_COLOUR))  // control tower
 	TILE_SEQ_END()
 };
 
-/* new airportdepot, facing west
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_086[] = {
-	TILE_SEQ_LINE(14, 0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_FRONT | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_LINE( 0, 0,  0,  2, 16, 28, SPR_AIRFIELD_HANGAR_REAR | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* asphalt tile with fences in north
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_087[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* end of runway */
-static const DrawTileSeqStruct _station_display_datas_088[] = {
-	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences
-	TILE_SEQ_END()
-};
-
-/* runway tiles */
-static const DrawTileSeqStruct _station_display_datas_089[] = {
-	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences
-	TILE_SEQ_END()
-};
-
-/* turning radar with concrete underground fences on south -- needs 12 tiles
- * concrete underground
+/* turning radar with fences on north -- needs 12 tiles
  *BEGIN */
-static const DrawTileSeqStruct _station_display_datas_090[] = {
-	TILE_SEQ_LINE( 7, 7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))  // fences
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_091[] = {
-	TILE_SEQ_LINE( 7, 7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_092[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_093[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_094[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_095[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_096[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_097[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_098[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_099[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0100[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0101[] = {
-	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
-	TILE_SEQ_LINE(15, 0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
-	TILE_SEQ_END()
-};
-/* END */
-
-/* turning radar with concrete underground fences on north -- needs 12 tiles
- * concrete underground
- *BEGIN */
-static const DrawTileSeqStruct _station_display_datas_0102[] = {
+static const DrawTileSeqStruct _station_display_radar_1_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0103[] = {
+static const DrawTileSeqStruct _station_display_radar_2_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0104[] = {
+static const DrawTileSeqStruct _station_display_radar_3_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0105[] = {
+static const DrawTileSeqStruct _station_display_radar_4_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0106[] = {
+static const DrawTileSeqStruct _station_display_radar_5_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0107[] = {
+static const DrawTileSeqStruct _station_display_radar_6_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0108[] = {
+static const DrawTileSeqStruct _station_display_radar_7_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0109[] = {
+static const DrawTileSeqStruct _station_display_radar_8_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0110[] = {
+static const DrawTileSeqStruct _station_display_radar_9_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0111[] = {
+static const DrawTileSeqStruct _station_display_radar_10_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0112[] = {
+static const DrawTileSeqStruct _station_display_radar_11_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0113[] = {
+static const DrawTileSeqStruct _station_display_radar_12_fence_ne[] = {
 	TILE_SEQ_LINE(7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE(0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 /* END */
 
-/* helipad for international airport
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0114[] = {
+/* helipad for international airport */
+static const DrawTileSeqStruct _station_display_helipad_fence_sw[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
 	TILE_SEQ_END()
 };
 
-/* helipad for commuter airport
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0115[] = {
+/* helipad for commuter airport */
+static const DrawTileSeqStruct _station_display_helipad_fence_nw[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences left
 	TILE_SEQ_END()
 };
 
-/* helipad for continental airport
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0116[] = {
+/* helipad for continental airport */
+static const DrawTileSeqStruct _station_display_helipad[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_END()
 };
 
-/* asphalt tile with fences in north and south
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0117[] = {
+/* asphalt tile with fences in north and south */
+static const DrawTileSeqStruct _station_display_fence_ne_sw[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
 /* runway tiles with 2 corner fences */
-static const DrawTileSeqStruct _station_display_datas_0118[] = {
+static const DrawTileSeqStruct _station_display_fence_nw_sw[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
 
 /* runway tiles with 2 corner fences */
-static const DrawTileSeqStruct _station_display_datas_0119[] = {
+static const DrawTileSeqStruct _station_display_fence_se_sw[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
 /* runway tiles with 2 corner fences */
-static const DrawTileSeqStruct _station_display_datas_0120[] = {
+static const DrawTileSeqStruct _station_display_fence_ne_nw[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_END()
 };
 
 /* runway tiles with 2 corner fences */
-static const DrawTileSeqStruct _station_display_datas_0121[] = {
+static const DrawTileSeqStruct _station_display_fence_ne_se[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* ======== new 2x2 helidepot ========
- * helipad tiles with 2 corner fences top+right */
-static const DrawTileSeqStruct _station_display_datas_0122[] = {
+/* helipad tiles with 2 corner fences top+right */
+static const DrawTileSeqStruct _station_display_helipad_fence_NE_SE[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* tarmac tiles with 2 corner fences bottom+right */
-static const DrawTileSeqStruct _station_display_datas_0123[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
-	TILE_SEQ_END()
-};
-
-/* helidepot office with concrete underground and no fence
- * concrete underground, fences top + left */
-static const DrawTileSeqStruct _station_display_datas_0124[] = {
+/* helidepot office with fences top + left */
+static const DrawTileSeqStruct _station_display_low_building_fence_ne_nw[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences left
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* N/S runway plain */
-static const DrawTileSeqStruct _station_display_datas_0125[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
-	TILE_SEQ_END()
-};
-
-/* N/S runway end */
-static const DrawTileSeqStruct _station_display_datas_0126[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
-	TILE_SEQ_END()
-};
-
-/* N/S runway plain */
-static const DrawTileSeqStruct _station_display_datas_0127[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
-	TILE_SEQ_END()
-};
-
-/* N/S runway end */
-static const DrawTileSeqStruct _station_display_datas_0128[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
-	TILE_SEQ_END()
-};
-
 /* West facing hangar */
-static const DrawTileSeqStruct _station_display_datas_0129[] = {
+static const DrawTileSeqStruct _station_display_hangar_sw[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_W | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_LINE( 0,  0,  0,  2, 16, 28, SPR_NEWHANGAR_W_WALL | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
 /* North facing hangar */
-static const DrawTileSeqStruct _station_display_datas_0130[] = {
+static const DrawTileSeqStruct _station_display_hangar_nw[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_N | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
 /* East facing hangar */
-static const DrawTileSeqStruct _station_display_datas_0131[] = {
+static const DrawTileSeqStruct _station_display_hangar_ne[] = {
 	TILE_SEQ_LINE(14,  0,  0,  2, 16, 28, SPR_NEWHANGAR_E | (1 << PALETTE_MODIFIER_COLOUR))
 	TILE_SEQ_END()
 };
 
-/* helipad for district airport NS
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0132[] = {
+/* helipad for district airport NS */
+static const DrawTileSeqStruct _station_display_helipad_fence_se_sw[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences bottom
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences right
 	TILE_SEQ_END()
 };
 
-/* helipad for district airport NS
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0133[] = {
+/* helipad for district airport NS */
+static const DrawTileSeqStruct _station_display_helipad_fence_se[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* helidepot office with concrete underground and fence north
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0134[] = {
+/* helidepot office with fence north */
+static const DrawTileSeqStruct _station_display_low_building_fence_nw[] = {
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* helidepot office with concrete underground and fence east
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0135[] = {
+/* helidepot office with fence east */
+static const DrawTileSeqStruct _station_display_low_building_fence_ne[] = {
 	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* helidepot office with concrete underground and fence west
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0136[] = {
+/* helidepot office with fence west */
+static const DrawTileSeqStruct _station_display_low_building_fence_sw[] = {
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* helidepot office with concrete underground and fence south
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0137[] = {
+/* helidepot office with fence south */
+static const DrawTileSeqStruct _station_display_low_building_fence_se[] = {
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* terminal with fence to east */
-static const DrawTileSeqStruct _station_display_datas_0138[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
-	TILE_SEQ_END()
-};
-
-/* terminal with fence to south */
-static const DrawTileSeqStruct _station_display_datas_0139[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
-	TILE_SEQ_END()
-};
-
-/* terminal with fence to north */
-static const DrawTileSeqStruct _station_display_datas_0140[] = {
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
-	TILE_SEQ_END()
-};
-
-/* concrete with fence to east */
-static const DrawTileSeqStruct _station_display_datas_0141[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
-	TILE_SEQ_END()
-};
-
-/* concrete with fence to south */
-static const DrawTileSeqStruct _station_display_datas_0142[] = {
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
-	TILE_SEQ_END()
-};
-
-/* helipad for district airport EW
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0143[] = {
+/* helipad for district airport EW*/
+static const DrawTileSeqStruct _station_display_helipad_fence_nw_sw[] = {
 	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
 
-/* helipad for district airport EW
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0144[] = {
-	TILE_SEQ_LINE(10,  6,  0,  0,  0,  0, SPR_AIRPORT_HELIPAD)
-	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
-	TILE_SEQ_END()
-};
-
-/* turning radar with concrete underground fences on south -- needs 12 tiles
- * concrete underground
+/* turning radar with fences on south -- needs 12 tiles
  *BEGIN */
-static const DrawTileSeqStruct _station_display_datas_0145[] = {
+static const DrawTileSeqStruct _station_display_radar_1_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_1)   // turning radar
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0146[] = {
+static const DrawTileSeqStruct _station_display_radar_2_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_2)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0147[] = {
+static const DrawTileSeqStruct _station_display_radar_3_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_3)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0148[] = {
+static const DrawTileSeqStruct _station_display_radar_4_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_4)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0149[] = {
+static const DrawTileSeqStruct _station_display_radar_5_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_5)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0150[] = {
+static const DrawTileSeqStruct _station_display_radar_6_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_6)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0151[] = {
+static const DrawTileSeqStruct _station_display_radar_7_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_7)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0152[] = {
+static const DrawTileSeqStruct _station_display_radar_8_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_8)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0153[] = {
+static const DrawTileSeqStruct _station_display_radar_9_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_9)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0154[] = {
+static const DrawTileSeqStruct _station_display_radar_10_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_A)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0155[] = {
+static const DrawTileSeqStruct _station_display_radar_11_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_B)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0156[] = {
+static const DrawTileSeqStruct _station_display_radar_12_fence_se[] = {
 	TILE_SEQ_LINE( 7,  7,  0,  2,  2,  8, SPR_AIRPORT_RADAR_C)
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 /* END */
 
-/* helipad for helistation
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0157[] = {
+/* helipad for helistation */
+static const DrawTileSeqStruct _station_display_newhelipad_fence_se_sw[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
 	TILE_SEQ_END()
 };
 
-/* helipad for helistation
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0158[] = {
+/* helipad for helistation */
+static const DrawTileSeqStruct _station_display_newhelipad_fence_nw_sw[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE(15,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences west
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
 
-/* helipad for helistation
- * concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0159[] = {
+/* helipad for helistation */
+static const DrawTileSeqStruct _station_display_newhelipad_fence_nw[] = {
 	TILE_SEQ_LINE( 0,  1,  2,  0,  0,  0, SPR_NEWHELIPAD)
 	TILE_SEQ_LINE( 0,  0,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences north
 	TILE_SEQ_END()
 };
 
-/* helidepot office with concrete underground - no fence */
-static const DrawTileSeqStruct _station_display_datas_0160[] = {
+/* helidepot office without fence */
+static const DrawTileSeqStruct _station_display_low_building[] = {
 	TILE_SEQ_LINE( 3,  3,  0, 10, 10, 60, SPR_AIRPORT_HELIDEPOT_OFFICE | (1 << PALETTE_MODIFIER_COLOUR))  // helidepot office
 	TILE_SEQ_END()
 };
 
-/* concrete underground */
-static const DrawTileSeqStruct _station_display_datas_0161[] = {
-	TILE_SEQ_LINE( 0,  0,  0,  1, 16,  6, SPR_AIRPORT_FENCE_Y | (1 << PALETTE_MODIFIER_COLOUR)) // fences east
-	TILE_SEQ_LINE( 0, 15,  0, 16,  1,  6, SPR_AIRPORT_FENCE_X | (1 << PALETTE_MODIFIER_COLOUR)) // fences south
-	TILE_SEQ_END()
-};
-
 /* half grass half SPR_AIRPORT_APRON */
-static const DrawTileSeqStruct _station_display_datas_0162[] = {
+static const DrawTileSeqStruct _station_display_grass_west[] = {
 	TILE_SEQ_LINE(0,  0,  0,  0,  0,  0, SPR_GRASS_LEFT)
 	TILE_SEQ_END()
 };
 
 /* half grass half SPR_AIRPORT_APRON */
-static const DrawTileSeqStruct _station_display_datas_0163[] = {
+static const DrawTileSeqStruct _station_display_grass_east[] = {
 	TILE_SEQ_LINE(0,  0,  0,  0,  0,  0, SPR_GRASS_RIGHT)
 	TILE_SEQ_END()
 };
@@ -1036,150 +760,150 @@ static const DrawTileSprites _station_display_datas_rail[] = {
 };
 
 static const DrawTileSprites _station_display_datas_airport[] = {
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_9)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_10)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_WEST,    _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_SOUTH,   _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_SOUTH, _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_WEST,  _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_CTR,     _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_EAST,  _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_EAST,    _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_NORTH,   _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_CTR,     _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_NORTH,   _station_display_datas_21)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_A,      _station_display_datas_22)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_datas_23)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_C,      _station_display_datas_24)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_D,      _station_display_datas_25)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_26)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_27)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_28)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_29)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_30)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_31)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_32)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_datas_33)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_datas_34)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_35)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_36)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_38)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_39)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_40)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_41)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_42)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_43)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_44)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_45)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_46)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_47)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_48)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_49)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_50)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_51)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_A,            _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_B,            _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_C_GROUND | (1 << PALETTE_MODIFIER_COLOUR), _station_display_datas_54)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_A,           _station_display_datas_55)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_B,           _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_C,           _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_datas_58)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_datas_59)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_datas_60)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_datas_61)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_NEAR_END,   _station_display_datas_62)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_MIDDLE,     _station_display_datas_63)
-	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_FAR_END,    _station_display_datas_64)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_65)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_66)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_nothing)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_085)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_086)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_087)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_088)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_datas_089)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_090)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_091)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_092)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_093)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_094)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_095)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_096)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_097)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_098)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_099)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0100)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0101)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0102)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0103)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0104)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0105)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0106)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0107)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0108)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0109)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0110)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0111)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0112)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0113)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0114)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0115)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0116)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0117)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_0118)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_0119)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_0120)
-	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_datas_0121)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0122)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0123)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0124)
-	TILE_SPRITE_LINE(SPR_NSRUNWAY1,                  _station_display_datas_0125)
-	TILE_SPRITE_LINE(SPR_NSRUNWAY_END,               _station_display_datas_0126)
-	TILE_SPRITE_LINE(SPR_NSRUNWAY1,                  _station_display_datas_0127)
-	TILE_SPRITE_LINE(SPR_NSRUNWAY_END,               _station_display_datas_0128)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0129)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0130)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0131)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0132)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0133)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0134)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0135)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0136)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0137)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_datas_0138)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_datas_0139)
-	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_datas_0140)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0141)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0142)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0143)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0144)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0145)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0146)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0147)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0148)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0149)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0150)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0151)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0152)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0153)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0154)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0155)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0156)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0157)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0158)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0159)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0160)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0161)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0162)
-	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_0163)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_58)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_59)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_60)
-	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_datas_61)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_nothing)  // APT_APRON
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_nw) // APT_APRON_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_sw) // APT_APRON_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_nothing)  // APT_STAND
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_WEST,    _station_display_nothing)  // APT_APRON_W
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_SOUTH,   _station_display_nothing)  // APT_APRON_S
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_SOUTH, _station_display_nothing)  // APT_APRON_VER_CROSSING_S
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_WEST,  _station_display_nothing)  // APT_APRON_HOR_CROSSING_W
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_CTR,     _station_display_nothing)  // APT_APRON_VER_CROSSING_N
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_XING_EAST,  _station_display_nothing)  // APT_APRON_HOR_CROSSING_E
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_NS_EAST,    _station_display_nothing)  // APT_APRON_E
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_NORTH,   _station_display_nothing)  // APT_ARPON_N
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_CTR,     _station_display_nothing)  // APT_APRON_HOR
+	TILE_SPRITE_LINE(SPR_AIRPORT_TAXIWAY_EW_NORTH,   _station_display_fence_sw) // APT_APRON_N_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_A,      _station_display_fence_se) // APT_RUNWAY_1
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_fence_se) // APT_RUNWAY_2
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_C,      _station_display_fence_se) // APT_RUNWAY_3
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_D,      _station_display_fence_se) // APT_RUNWAY_4
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_se) // APT_RUNWAY_END_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_terminal_a) // APT_BUILDING_2
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_tower_fence_sw) // APT_TOWER_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_concourse) // APT_ROUND_TERMINAL
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_terminal_b) // APT_BUILDING_3
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_datas_terminal_c) // APT_BUILDING_1
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_hangar_se) // APT_DEPOT_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_jetway_1)  // APT_STAND_1
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_jetway_2)  // APT_STAND_PIER_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_jetway_3)  // APT_PIER_NW_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_passenger_tunnel) // APT_PIER
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_nothing)   // APT_EMPTY
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_fence_ne)  // APT_EMPTY_FENCE_NE
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_1_fence_sw) // APT_RADAR_GRASS_FENCE_SW
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_2_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_3_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_4_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_5_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_6_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_7_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_8_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_9_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_10_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_11_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_radar_12_fence_sw)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_transmitter_fence_ne) // APT_RADIO_TOWER_FENCE_NE
+	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_A,            _station_display_nothing)   // APT_SMALL_BUILDING_3
+	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_B,            _station_display_nothing)   // APT_SMALL_BUILDING_2
+	TILE_SPRITE_LINE(SPR_AIRFIELD_TERM_C_GROUND | (1 << PALETTE_MODIFIER_COLOUR), _station_display_datas_terminal_c_2) // APT_SMALL_BUILDING_1
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_A,           _station_display_fence_sw)  // APT_GRASS_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_B,           _station_display_nothing)   // APT_GRASS_2
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_C,           _station_display_nothing)   // APT_GRASS_1
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_flag_1_fence_ne) // APT_GRASS_FENCE_NE_FLAG
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_flag_2_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_flag_3_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRFIELD_APRON_D,           _station_display_flag_4_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_NEAR_END,   _station_display_fence_se)  // APT_RUNWAY_SMALL_NEAR_END
+	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_MIDDLE,     _station_display_fence_se)  // APT_RUNWAY_SMALL_MIDDLE
+	TILE_SPRITE_LINE(SPR_AIRFIELD_RUNWAY_FAR_END,    _station_display_fence_se)  // APT_RUNWAY_SMALL_FAR_END
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_small_depot_se) // APT_SMALL_DEPOT_SE
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_heliport)  // APT_HELIPORT
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_nothing)   // APT_RUNWAY_END
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_nothing)   // APT_RUNWAY_5
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_tower)     // APT_TOWER
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_small_depot_se) // APT_SMALL_DEPOT_SE_2
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_ne)  // APT_APRON_FENCE_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_nw)  // APT_RUNWAY_END_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_EXIT_B,      _station_display_fence_nw)  // APT_RUNWAY_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_1_fence_sw) // APT_RADAR_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_2_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_3_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_4_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_5_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_6_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_7_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_8_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_9_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_10_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_11_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_12_fence_sw)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_1_fence_ne) // APT_RADAR_FENCE_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_2_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_3_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_4_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_5_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_6_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_7_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_8_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_9_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_10_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_11_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_12_fence_ne)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_sw) // APT_HELIPAD_1
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_nw) // APT_HELIPAD_2_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad)     // APT_HELIPAD_2
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_ne_sw) // APT_APRON_FENCE_NE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_nw_sw) // APT_RUNWAY_END_FENCE_NW_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_se_sw) // APT_RUNWAY_END_FENCE_SE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_ne_nw) // APT_RUNWAY_END_FENCE_NE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_RUNWAY_END,         _station_display_fence_ne_se) // APT_RUNWAY_END_FENCE_NE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_NE_SE) // APT_HELIPAD_2_FENCE_NE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_se_sw) // APT_APRON_FENCE_SE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building_fence_ne_nw) // APT_LOW_BUILDING_FENCE_N
+	TILE_SPRITE_LINE(SPR_NSRUNWAY1,                  _station_display_fence_ne) // APT_ROT_RUNWAY_FENCE_NE
+	TILE_SPRITE_LINE(SPR_NSRUNWAY_END,               _station_display_fence_ne) // APT_ROT_RUNWAY_END_FENCE_NE
+	TILE_SPRITE_LINE(SPR_NSRUNWAY1,                  _station_display_fence_sw) // APT_ROT_RUNWAY_FENCE_SW
+	TILE_SPRITE_LINE(SPR_NSRUNWAY_END,               _station_display_fence_sw) // APT_ROT_RUNWAY_END_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_hangar_sw) // APT_DEPOT_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_hangar_nw) // APT_DEPOT_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_hangar_ne) // APT_DEPOT_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_se_sw) // APT_HELIPAD_2_FENCE_SE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_se) // APT_HELIPAD_2_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building_fence_nw) // APT_LOW_BUILDING_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building_fence_ne) // APT_LOW_BUILDING_FENCE_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building_fence_sw) // APT_LOW_BUILDING_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building_fence_se) // APT_LOW_BUILDING_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_fence_ne) // APT_STAND_FENCE_NE
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_fence_se) // APT_STAND_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_AIRCRAFT_STAND,     _station_display_fence_sw) // APT_STAND_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_ne) // APT_APRON_FENCE_NE_2
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_se) // APT_APRON_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_nw_sw) // APT_HELIPAD_2_FENCE_NW_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_helipad_fence_sw) // APT_HELIPAD_2_FENCE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_1_fence_se) // APT_RADAR_FENCE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_2_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_3_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_4_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_5_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_6_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_7_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_8_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_9_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_10_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_11_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_radar_12_fence_se)
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_newhelipad_fence_se_sw) // APT_HELIPAD_3_FENCE_SE_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_newhelipad_fence_nw_sw) // APT_HELIPAD_3_FENCE_NW_SW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_newhelipad_fence_nw) // APT_HELIPAD_3_FENCE_NW
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_low_building) // APT_LOW_BUILDING
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_fence_ne_se) // APT_APRON_FENCE_NE_SE
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_grass_west) // APT_APRON_HALF_EAST
+	TILE_SPRITE_LINE(SPR_AIRPORT_APRON,              _station_display_grass_east) // APT_APRON_HALF_WEST
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_flag_1_fence_ne) // APT_GRASS_FENCE_NE_FLAG_2
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_flag_2_fence_ne)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_flag_3_fence_ne)
+	TILE_SPRITE_LINE(SPR_FLAT_GRASS_TILE,            _station_display_flag_4_fence_ne)
 };
 
 static const DrawTileSprites _station_display_datas_truck[] = {