(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.

10 files changed, 1397 insertions, 1397 deletions

diff --git a/table/ai_rail.h b/table/ai_rail.h
index 4226f3945..8e6a49c50 100644
--- a/table/ai_rail.h
+++ b/table/ai_rail.h
@@ -29,296 +29,296 @@ typedef struct {
 #define MKEND              {4, 0, {0, 0}}}
 
 static const AiDefaultRailBlock _raildata_ai_0 = {
-	MKHDR(1,2,1,0,1)
-	MKDEPOT(2, -1,1),
-	MKSTATION(0x15, 0,-1),
-	MKRAIL(0x26, 0,1),
-	MKCLRRAIL(1, 0,2),
+	MKHDR(1, 2, 1, 0, 1)
+	MKDEPOT(2, -1, 1),
+	MKSTATION(0x15, 0, -1),
+	MKRAIL(0x26, 0, 1),
+	MKCLRRAIL(1, 0, 2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_1 = {
-	MKHDR(1,2,1,0,3)
-	MKDEPOT(2, -1,-1),
-	MKRAIL(0x26, 0,-1),
-	MKSTATION(0x15, 0,0),
-	MKCLRRAIL(3, 0,-2),
+	MKHDR(1, 2, 1, 0, 3)
+	MKDEPOT(2, -1, -1),
+	MKRAIL(0x26, 0, -1),
+	MKSTATION(0x15, 0, 0),
+	MKCLRRAIL(3, 0, -2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_2 = {
-	MKHDR(1,2,1,0,0)
-	MKDEPOT(1, -1,-1),
-	MKRAIL(0x15, -1,0),
-	MKSTATION(0x14, 0,0),
-	MKCLRRAIL(0, -2,0),
+	MKHDR(1, 2, 1, 0, 0)
+	MKDEPOT(1, -1, -1),
+	MKRAIL(0x15, -1, 0),
+	MKSTATION(0x14, 0, 0),
+	MKCLRRAIL(0, -2, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_3 = {
-	MKHDR(1,2,1,0,2)
-	MKDEPOT(1, 1,-1),
-	MKRAIL(0x15, 1,0),
-	MKSTATION(0x14, -1,0),
-	MKCLRRAIL(2, 2,0),
+	MKHDR(1, 2, 1, 0, 2)
+	MKDEPOT(1, 1, -1),
+	MKRAIL(0x15, 1, 0),
+	MKSTATION(0x14, -1, 0),
+	MKCLRRAIL(2, 2, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_4 = {
-	MKHDR(1,2,2,0,255)
-	MKSTATION(0x15, 0,0),
-	MKCLRRAIL(3, 0,-1),
-	MKCLRRAIL(1, 0,2),
+	MKHDR(1, 2, 2, 0, 255)
+	MKSTATION(0x15, 0, 0),
+	MKCLRRAIL(3, 0, -1),
+	MKCLRRAIL(1, 0, 2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_5 = {
-	MKHDR(1,2,2,0,255)
-	MKSTATION(0x14, 0,0),
-	MKCLRRAIL(0, -1,0),
-	MKCLRRAIL(2, 2,0),
+	MKHDR(1, 2, 2, 0, 255)
+	MKSTATION(0x14, 0, 0),
+	MKCLRRAIL(0, -1, 0),
+	MKCLRRAIL(2, 2, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_6 = {
-	MKHDR(2,3,1,0,1)
-	MKSTATION(0x27, 0,-2),
-	MKRAIL(0xC2, 0,1),
-	MKRAIL(0xC2, 1,1),
-	MKRAIL(0x1A, 0,2),
-	MKRAIL(0x26, 1,2),
-	MKDEPOT(3, 1,3),
-	MKCLRRAIL(1, 0,3),
+	MKHDR(2, 3, 1, 0, 1)
+	MKSTATION(0x27, 0, -2),
+	MKRAIL(0xC2, 0, 1),
+	MKRAIL(0xC2, 1, 1),
+	MKRAIL(0x1A, 0, 2),
+	MKRAIL(0x26, 1, 2),
+	MKDEPOT(3, 1, 3),
+	MKCLRRAIL(1, 0, 3),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_7 = {
-	MKHDR(2,3,1,0,3)
-	MKDEPOT(1, 0,-3),
-	MKRAIL(0x1A, 0,-2),
-	MKRAIL(0x26, 1,-2),
-	MKRAIL(0xC2, 0,-1),
-	MKRAIL(0xC2, 1,-1),
-	MKSTATION(0x27, 0,0),
-	MKCLRRAIL(3, 1,-3),
+	MKHDR(2, 3, 1, 0, 3)
+	MKDEPOT(1, 0, -3),
+	MKRAIL(0x1A, 0, -2),
+	MKRAIL(0x26, 1, -2),
+	MKRAIL(0xC2, 0, -1),
+	MKRAIL(0xC2, 1, -1),
+	MKSTATION(0x27, 0, 0),
+	MKCLRRAIL(3, 1, -3),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_8 = {
-	MKHDR(2,3,1,0,2)
-	MKSTATION(0x26, -2,0),
-	MKRAIL(0xC1, 1,0),
-	MKRAIL(0xC1, 1,1),
-	MKRAIL(0x29, 2,0),
-	MKRAIL(0x15, 2,1),
-	MKDEPOT(0, 3,0),
-	MKCLRRAIL(2, 3,1),
+	MKHDR(2, 3, 1, 0, 2)
+	MKSTATION(0x26, -2, 0),
+	MKRAIL(0xC1, 1, 0),
+	MKRAIL(0xC1, 1, 1),
+	MKRAIL(0x29, 2, 0),
+	MKRAIL(0x15, 2, 1),
+	MKDEPOT(0, 3, 0),
+	MKCLRRAIL(2, 3, 1),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_9 = {
-	MKHDR(2,3,1,0,0)
-	MKDEPOT(2, -3,-1),
-	MKRAIL(0x29, -2,-1),
-	MKRAIL(0x15, -2,0),
-	MKRAIL(0xC1, -1,-1),
-	MKRAIL(0xC1, -1,0),
-	MKSTATION(0x26, 0,-1),
-	MKCLRRAIL(0, -3,0),
+	MKHDR(2, 3, 1, 0, 0)
+	MKDEPOT(2, -3, -1),
+	MKRAIL(0x29, -2, -1),
+	MKRAIL(0x15, -2, 0),
+	MKRAIL(0xC1, -1, -1),
+	MKRAIL(0xC1, -1, 0),
+	MKSTATION(0x26, 0, -1),
+	MKCLRRAIL(0, -3, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_10 = {
-	MKHDR(2,3,2,0,255)
-	MKRAIL(0x1A, 0,-3),
-	MKRAIL(0x20, 1,-3),
-	MKRAIL(0xC2, 0,-2),
-	MKRAIL(0xC2, 1,-2),
-	MKSTATION(0x27, 0,-1),
-	MKRAIL(0xC2, 0,2),
-	MKRAIL(0xC2, 1,2),
-	MKRAIL(0x1A, 0,3),
-	MKRAIL(0x4, 1,3),
-	MKCLRRAIL(3, 0,-4),
-	MKCLRRAIL(1, 0,4),
+	MKHDR(2, 3, 2, 0, 255)
+	MKRAIL(0x1A, 0, -3),
+	MKRAIL(0x20, 1, -3),
+	MKRAIL(0xC2, 0, -2),
+	MKRAIL(0xC2, 1, -2),
+	MKSTATION(0x27, 0, -1),
+	MKRAIL(0xC2, 0, 2),
+	MKRAIL(0xC2, 1, 2),
+	MKRAIL(0x1A, 0, 3),
+	MKRAIL(0x4, 1, 3),
+	MKCLRRAIL(3, 0, -4),
+	MKCLRRAIL(1, 0, 4),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_11 = {
-	MKHDR(2,3,2,0,255)
-	MKRAIL(0x29, -3,0),
-	MKRAIL(0x10, -3,1),
-	MKRAIL(0xC1, -2,0),
-	MKRAIL(0xC1, -2,1),
-	MKSTATION(0x26, -1,0),
-	MKRAIL(0xC1, 2,0),
-	MKRAIL(0xC1, 2,1),
-	MKRAIL(0x29, 3,0),
-	MKRAIL(0x4, 3,1),
-	MKCLRRAIL(0, -4,0),
-	MKCLRRAIL(2, 4,0),
+	MKHDR(2, 3, 2, 0, 255)
+	MKRAIL(0x29, -3, 0),
+	MKRAIL(0x10, -3, 1),
+	MKRAIL(0xC1, -2, 0),
+	MKRAIL(0xC1, -2, 1),
+	MKSTATION(0x26, -1, 0),
+	MKRAIL(0xC1, 2, 0),
+	MKRAIL(0xC1, 2, 1),
+	MKRAIL(0x29, 3, 0),
+	MKRAIL(0x4, 3, 1),
+	MKCLRRAIL(0, -4, 0),
+	MKCLRRAIL(2, 4, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_12 = {
-	MKHDR(2,3,2,1,3)
-	MKRAIL(0x88, -1,-3),
-	MKRAIL(0x6, 0,-3),
-	MKRAIL(0x2, -1,-2),
-	MKRAIL(0x42, 0,-2),
-	MKRAIL(0x2, -1,-1),
-	MKRAIL(0x2, 0,-1),
-	MKRAIL(0x2, -1,0),
-	MKRAIL(0x2, 0,0),
-	MKRAIL(0x82, -1,1),
-	MKRAIL(0x2, 0,1),
-	MKRAIL(0xA, -1,2),
-	MKRAIL(0x44, 0,2),
-	MKCLRRAIL(3, 0,-4),
-	MKCLRRAIL(1, -1,3),
+	MKHDR(2, 3, 2, 1, 3)
+	MKRAIL(0x88, -1, -3),
+	MKRAIL(0x6, 0, -3),
+	MKRAIL(0x2, -1, -2),
+	MKRAIL(0x42, 0, -2),
+	MKRAIL(0x2, -1, -1),
+	MKRAIL(0x2, 0, -1),
+	MKRAIL(0x2, -1, 0),
+	MKRAIL(0x2, 0, 0),
+	MKRAIL(0x82, -1, 1),
+	MKRAIL(0x2, 0, 1),
+	MKRAIL(0xA, -1, 2),
+	MKRAIL(0x44, 0, 2),
+	MKCLRRAIL(3, 0, -4),
+	MKCLRRAIL(1, -1, 3),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_13 = {
-	MKHDR(2,3,2,1,0)
-	MKRAIL(0x21, -3,0),
-	MKRAIL(0x50, -3,1),
-	MKRAIL(0x81, -2,0),
-	MKRAIL(0x1, -2,1),
-	MKRAIL(0x1, -1,0),
-	MKRAIL(0x1, -1,1),
-	MKRAIL(0x1, 0,0),
-	MKRAIL(0x1, 0,1),
-	MKRAIL(0x1, 1,0),
-	MKRAIL(0x41, 1,1),
-	MKRAIL(0xA0, 2,0),
-	MKRAIL(0x11, 2,1),
-	MKCLRRAIL(0, -4,0),
-	MKCLRRAIL(2, 3,1),
+	MKHDR(2, 3, 2, 1, 0)
+	MKRAIL(0x21, -3, 0),
+	MKRAIL(0x50, -3, 1),
+	MKRAIL(0x81, -2, 0),
+	MKRAIL(0x1, -2, 1),
+	MKRAIL(0x1, -1, 0),
+	MKRAIL(0x1, -1, 1),
+	MKRAIL(0x1, 0, 0),
+	MKRAIL(0x1, 0, 1),
+	MKRAIL(0x1, 1, 0),
+	MKRAIL(0x41, 1, 1),
+	MKRAIL(0xA0, 2, 0),
+	MKRAIL(0x11, 2, 1),
+	MKCLRRAIL(0, -4, 0),
+	MKCLRRAIL(2, 3, 1),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_14 = {
-	MKHDR(2,3,2,1,1)
-	MKRAIL(0x88, -1,-3),
-	MKRAIL(0x6, 0,-3),
-	MKRAIL(0x2, -1,-2),
-	MKRAIL(0x42, 0,-2),
-	MKRAIL(0x2, -1,-1),
-	MKRAIL(0x2, 0,-1),
-	MKRAIL(0x2, -1,0),
-	MKRAIL(0x2, 0,0),
-	MKRAIL(0x82, -1,1),
-	MKRAIL(0x2, 0,1),
-	MKRAIL(0xA, -1,2),
-	MKRAIL(0x44, 0,2),
-	MKCLRRAIL(1, -1,3),
-	MKCLRRAIL(3, 0,-4),
+	MKHDR(2, 3, 2, 1, 1)
+	MKRAIL(0x88, -1, -3),
+	MKRAIL(0x6, 0, -3),
+	MKRAIL(0x2, -1, -2),
+	MKRAIL(0x42, 0, -2),
+	MKRAIL(0x2, -1, -1),
+	MKRAIL(0x2, 0, -1),
+	MKRAIL(0x2, -1, 0),
+	MKRAIL(0x2, 0, 0),
+	MKRAIL(0x82, -1, 1),
+	MKRAIL(0x2, 0, 1),
+	MKRAIL(0xA, -1, 2),
+	MKRAIL(0x44, 0, 2),
+	MKCLRRAIL(1, -1, 3),
+	MKCLRRAIL(3, 0, -4),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_15 = {
-	MKHDR(2,3,2,1,2)
-	MKRAIL(0x21, -3,0),
-	MKRAIL(0x50, -3,1),
-	MKRAIL(0x81, -2,0),
-	MKRAIL(0x1, -2,1),
-	MKRAIL(0x1, -1,0),
-	MKRAIL(0x1, -1,1),
-	MKRAIL(0x1, 0,0),
-	MKRAIL(0x1, 0,1),
-	MKRAIL(0x1, 1,0),
-	MKRAIL(0x41, 1,1),
-	MKRAIL(0xA0, 2,0),
-	MKRAIL(0x11, 2,1),
-	MKCLRRAIL(2, 3,1),
-	MKCLRRAIL(0, -4,0),
+	MKHDR(2, 3, 2, 1, 2)
+	MKRAIL(0x21, -3, 0),
+	MKRAIL(0x50, -3, 1),
+	MKRAIL(0x81, -2, 0),
+	MKRAIL(0x1, -2, 1),
+	MKRAIL(0x1, -1, 0),
+	MKRAIL(0x1, -1, 1),
+	MKRAIL(0x1, 0, 0),
+	MKRAIL(0x1, 0, 1),
+	MKRAIL(0x1, 1, 0),
+	MKRAIL(0x41, 1, 1),
+	MKRAIL(0xA0, 2, 0),
+	MKRAIL(0x11, 2, 1),
+	MKCLRRAIL(2, 3, 1),
+	MKCLRRAIL(0, -4, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_16 = {
-	MKHDR(1,3,1,0,1)
-	MKSTATION(0x17, 0,-2),
-	MKRAIL(0x1A, 0,1),
-	MKCLRRAIL(1, 0,2),
-	MKDEPOT(0, 1,1),
+	MKHDR(1, 3, 1, 0, 1)
+	MKSTATION(0x17, 0, -2),
+	MKRAIL(0x1A, 0, 1),
+	MKCLRRAIL(1, 0, 2),
+	MKDEPOT(0, 1, 1),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_17 = {
-	MKHDR(1,3,1,0,3)
-	MKCLRRAIL(3, 0,-2),
-	MKRAIL(0x26, 0,-1),
-	MKDEPOT(2, -1,-1),
-	MKSTATION(0x17, 0,0),
+	MKHDR(1, 3, 1, 0, 3)
+	MKCLRRAIL(3, 0, -2),
+	MKRAIL(0x26, 0, -1),
+	MKDEPOT(2, -1, -1),
+	MKSTATION(0x17, 0, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_18 = {
-	MKHDR(1,3,1,0,0)
-	MKCLRRAIL(0, -2,0),
-	MKRAIL(0x29, -1,0),
-	MKDEPOT(3, -1,1),
-	MKSTATION(0x16, 0,0),
+	MKHDR(1, 3, 1, 0, 0)
+	MKCLRRAIL(0, -2, 0),
+	MKRAIL(0x29, -1, 0),
+	MKDEPOT(3, -1, 1),
+	MKSTATION(0x16, 0, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_19 = {
-	MKHDR(1,3,1,0,2)
-	MKSTATION(0x16, -2,0),
-	MKDEPOT(2, 0,-1),
-	MKRAIL(0x20, 1,-1),
-	MKRAIL(0x15, 1,0),
-	MKCLRRAIL(2, 2,0),
+	MKHDR(1, 3, 1, 0, 2)
+	MKSTATION(0x16, -2, 0),
+	MKDEPOT(2, 0, -1),
+	MKRAIL(0x20, 1, -1),
+	MKRAIL(0x15, 1, 0),
+	MKCLRRAIL(2, 2, 0),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_20 = {
-	MKHDR(2,3,1,0,1)
-	MKSTATION(0x26, -2,0),
-	MKRAIL(0xC1, 1,0),
-	MKRAIL(0xC1, 1,1),
-	MKRAIL(0x26, 2,0),
-	MKRAIL(0x26, 2,1),
-	MKDEPOT(1, 2,-1),
-	MKCLRRAIL(1, 2,2),
+	MKHDR(2, 3, 1, 0, 1)
+	MKSTATION(0x26, -2, 0),
+	MKRAIL(0xC1, 1, 0),
+	MKRAIL(0xC1, 1, 1),
+	MKRAIL(0x26, 2, 0),
+	MKRAIL(0x26, 2, 1),
+	MKDEPOT(1, 2, -1),
+	MKCLRRAIL(1, 2, 2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_21 = {
-	MKHDR(2,3,1,0,3)
-	MKDEPOT(2, -3,-1),
-	MKRAIL(0x3F, -2,-1),
-	MKRAIL(0x10, -2,0),
-	MKRAIL(0xC1, -1,-1),
-	MKRAIL(0xC1, -1,0),
-	MKSTATION(0x26, 0,-1),
-	MKCLRRAIL(3, -2,-2),
+	MKHDR(2, 3, 1, 0, 3)
+	MKDEPOT(2, -3, -1),
+	MKRAIL(0x3F, -2, -1),
+	MKRAIL(0x10, -2, 0),
+	MKRAIL(0xC1, -1, -1),
+	MKRAIL(0xC1, -1, 0),
+	MKSTATION(0x26, 0, -1),
+	MKCLRRAIL(3, -2, -2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_22 = {
-	MKHDR(2,3,1,0,0)
-	MKSTATION(0x27, 0,-2),
-	MKRAIL(0xC2, 0,1),
-	MKRAIL(0xC2, 1,1),
-	MKRAIL(0x15, 0,2),
-	MKRAIL(0x4, 1,2),
-	MKRAIL(0x15, -1,2),
-	MKDEPOT(1, -1,1),
-	MKCLRRAIL(0, -2,2),
+	MKHDR(2, 3, 1, 0, 0)
+	MKSTATION(0x27, 0, -2),
+	MKRAIL(0xC2, 0, 1),
+	MKRAIL(0xC2, 1, 1),
+	MKRAIL(0x15, 0, 2),
+	MKRAIL(0x4, 1, 2),
+	MKRAIL(0x15, -1, 2),
+	MKDEPOT(1, -1, 1),
+	MKCLRRAIL(0, -2, 2),
 	MKEND
 };
 
 static const AiDefaultRailBlock _raildata_ai_23 = {
-	MKHDR(2,3,1,0,2)
-	MKDEPOT(1, 0,-3),
-	MKRAIL(0x1A, 0,-2),
-	MKRAIL(0x29, 1,-2),
-	MKRAIL(0xC2, 0,-1),
-	MKRAIL(0xC2, 1,-1),
-	MKSTATION(0x27, 0,0),
-	MKCLRRAIL(2, 2,-2),
+	MKHDR(2, 3, 1, 0, 2)
+	MKDEPOT(1, 0, -3),
+	MKRAIL(0x1A, 0, -2),
+	MKRAIL(0x29, 1, -2),
+	MKRAIL(0xC2, 0, -1),
+	MKRAIL(0xC2, 1, -1),
+	MKSTATION(0x27, 0, 0),
+	MKCLRRAIL(2, 2, -2),
 	MKEND
 };
 
diff --git a/table/clear_land.h b/table/clear_land.h
index e2d167faa..581c86855 100644
--- a/table/clear_land.h
+++ b/table/clear_land.h
@@ -12,17 +12,17 @@ static const SpriteID _landscape_clear_sprites[8] = {
 };
 
 static const byte _fence_mod_by_tileh[32] = {
-	0,2,4,0,0,2,4,0,
-	0,2,4,0,0,2,4,0,
-	0,2,4,0,0,2,4,4,
-	0,2,4,2,0,2,4,0,
+	0, 2, 4, 0, 0, 2, 4, 0,
+	0, 2, 4, 0, 0, 2, 4, 0,
+	0, 2, 4, 0, 0, 2, 4, 4,
+	0, 2, 4, 2, 0, 2, 4, 0,
 };
 
 static const byte _fence_mod_by_tileh_2[32] = {
-	1,1,5,5,3,3,1,1,
-	1,1,5,5,3,3,1,1,
-	1,1,5,5,3,3,1,5,
-	1,1,5,5,3,3,3,1,
+	1, 1, 5, 5, 3, 3, 1, 1,
+	1, 1, 5, 5, 3, 3, 1, 1,
+	1, 1, 5, 5, 3, 3, 1, 5,
+	1, 1, 5, 5, 3, 3, 3, 1,
 };
 
 
diff --git a/table/elrail_data.h b/table/elrail_data.h
index 9fed4f69a..cd0fb383b 100644
--- a/table/elrail_data.h
+++ b/table/elrail_data.h
@@ -409,14 +409,14 @@ typedef enum {
    PCP exists.*/
 static const CatenarySprite Wires[5][TRACK_END][4] = {
 	{ /* Tileh == 0 */
-		{INVALID_CATENARY, WIRE_X_FLAT_NE, WIRE_X_FLAT_SW, WIRE_X_FLAT_BOTH},
-		{INVALID_CATENARY, WIRE_Y_FLAT_SE, WIRE_Y_FLAT_NW, WIRE_Y_FLAT_BOTH},
-		{INVALID_CATENARY, WIRE_EW_N_W, WIRE_EW_N_E, WIRE_EW_N_BOTH},
-		{INVALID_CATENARY, WIRE_EW_S_E, WIRE_EW_S_W, WIRE_EW_S_BOTH},
-		{INVALID_CATENARY, WIRE_NS_W_S, WIRE_NS_W_N, WIRE_NS_W_BOTH},
-		{INVALID_CATENARY, WIRE_NS_E_N, WIRE_NS_E_S, WIRE_NS_E_BOTH},
+		{INVALID_CATENARY, WIRE_X_FLAT_NE,   WIRE_X_FLAT_SW,   WIRE_X_FLAT_BOTH},
+		{INVALID_CATENARY, WIRE_Y_FLAT_SE,   WIRE_Y_FLAT_NW,   WIRE_Y_FLAT_BOTH},
+		{INVALID_CATENARY, WIRE_EW_N_W,      WIRE_EW_N_E,      WIRE_EW_N_BOTH},
+		{INVALID_CATENARY, WIRE_EW_S_E,      WIRE_EW_S_W,      WIRE_EW_S_BOTH},
+		{INVALID_CATENARY, WIRE_NS_W_S,      WIRE_NS_W_N,      WIRE_NS_W_BOTH},
+		{INVALID_CATENARY, WIRE_NS_E_N,      WIRE_NS_E_S,      WIRE_NS_E_BOTH},
 	}, { /* Tileh == 3 */
-		{INVALID_CATENARY, WIRE_X_UP_NE, WIRE_X_UP_SW, WIRE_X_UP_BOTH},
+		{INVALID_CATENARY, WIRE_X_UP_NE,     WIRE_X_UP_SW,     WIRE_X_UP_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
@@ -424,20 +424,20 @@ static const CatenarySprite Wires[5][TRACK_END][4] = {
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 	}, { /* Tileh == 6 */
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
-		{INVALID_CATENARY, WIRE_Y_UP_SE, WIRE_Y_UP_NW, WIRE_Y_UP_BOTH},
+		{INVALID_CATENARY, WIRE_Y_UP_SE,     WIRE_Y_UP_NW,     WIRE_Y_UP_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 	}, { /* Tileh == 9 */
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
-		{INVALID_CATENARY, WIRE_Y_DOWN_SE, WIRE_Y_DOWN_NW, WIRE_Y_DOWN_BOTH},
+		{INVALID_CATENARY, WIRE_Y_DOWN_SE,   WIRE_Y_DOWN_NW,   WIRE_Y_DOWN_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 	}, { /* Tileh == 12 */
-		{INVALID_CATENARY, WIRE_X_DOWN_NE, WIRE_X_DOWN_SW, WIRE_X_DOWN_BOTH},
+		{INVALID_CATENARY, WIRE_X_DOWN_NE,   WIRE_X_DOWN_SW,   WIRE_X_DOWN_BOTH},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
 		{INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY, INVALID_CATENARY},
diff --git a/table/files.h b/table/files.h
index 74b20ed13..5015fe82a 100644
--- a/table/files.h
+++ b/table/files.h
@@ -25,31 +25,31 @@
 
 static FileList files_dos = {
 	{
-		{ "TRG1.GRF", {0x93,0x11,0x67,0x62,0x80,0xe5,0xb1,0x40,0x77,0xa8,0xee,0x41,0xc1,0xb4,0x21,0x92} },     //    0 - 4792 inclusive
-		{ "TRGI.GRF", {0xda,0x6a,0x6c,0x9d,0xcc,0x45,0x1e,0xec,0x88,0xd7,0x92,0x11,0x43,0x7b,0x76,0xa8} },     // 4793 - 4889 inclusive
-		{ "dosdummy.grf", {0x07,0x01,0xe6,0xc4,0x07,0x6a,0x5b,0xc3,0xf4,0x9f,0x01,0xad,0x21,0x6c,0xa0,0xc2} }, // 4890 - 4895 inclusive
-		{ "nsignalsw.grf", {0x65,0xb9,0xd7,0x30,0x56,0x06,0xcc,0x9e,0x27,0x57,0xc8,0xe4,0x9b,0xb3,0x66,0x81} }, // 4896 - 5381 inclusive
+		{ "TRG1.GRF",      {0x93, 0x11, 0x67, 0x62, 0x80, 0xe5, 0xb1, 0x40, 0x77, 0xa8, 0xee, 0x41, 0xc1, 0xb4, 0x21, 0x92} }, //    0 - 4792 inclusive
+		{ "TRGI.GRF",      {0xda, 0x6a, 0x6c, 0x9d, 0xcc, 0x45, 0x1e, 0xec, 0x88, 0xd7, 0x92, 0x11, 0x43, 0x7b, 0x76, 0xa8} }, // 4793 - 4889 inclusive
+		{ "dosdummy.grf",  {0x07, 0x01, 0xe6, 0xc4, 0x07, 0x6a, 0x5b, 0xc3, 0xf4, 0x9f, 0x01, 0xad, 0x21, 0x6c, 0xa0, 0xc2} }, // 4890 - 4895 inclusive
+		{ "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
 		{ NULL, { 0 } }
 	},
-	{	{ "TRGC.GRF", {0xed,0x44,0x66,0x37,0xe0,0x34,0x10,0x4c,0x55,0x59,0xb3,0x2c,0x18,0xaf,0xe7,0x8d} },
-		{ "TRGH.GRF", {0xee,0x66,0x16,0xfb,0x0e,0x6e,0xf6,0xb2,0x48,0x92,0xc5,0x8c,0x93,0xd8,0x6f,0xc9} },
-		{ "TRGT.GRF", {0xfc,0xde,0x1d,0x7e,0x8a,0x74,0x19,0x7d,0x72,0xa6,0x26,0x95,0x88,0x4b,0x90,0x9e} }
+	{	{ "TRGC.GRF",      {0xed, 0x44, 0x66, 0x37, 0xe0, 0x34, 0x10, 0x4c, 0x55, 0x59, 0xb3, 0x2c, 0x18, 0xaf, 0xe7, 0x8d} },
+		{ "TRGH.GRF",      {0xee, 0x66, 0x16, 0xfb, 0x0e, 0x6e, 0xf6, 0xb2, 0x48, 0x92, 0xc5, 0x8c, 0x93, 0xd8, 0x6f, 0xc9} },
+		{ "TRGT.GRF",      {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} }
 	}
 };
 
 static FileList files_win = {
 	{
-		{ "TRG1R.GRF", {0xb0,0x4c,0xe5,0x93,0xd8,0xc5,0x01,0x6e,0x07,0x47,0x3a,0x74,0x3d,0x7d,0x33,0x58} },    //    0 - 4792 inclusive
-		{ "TRGIR.GRF", {0x0c,0x24,0x84,0xff,0x6b,0xe4,0x9f,0xc6,0x3a,0x83,0xbe,0x6a,0xb5,0xc3,0x8f,0x32} },    // 4793 - 4895 inclusive
-		{ "nsignalsw.grf", {0x65,0xb9,0xd7,0x30,0x56,0x06,0xcc,0x9e,0x27,0x57,0xc8,0xe4,0x9b,0xb3,0x66,0x81} }, // 4896 - 5381 inclusive
+		{ "TRG1R.GRF",     {0xb0, 0x4c, 0xe5, 0x93, 0xd8, 0xc5, 0x01, 0x6e, 0x07, 0x47, 0x3a, 0x74, 0x3d, 0x7d, 0x33, 0x58} }, //    0 - 4792 inclusive
+		{ "TRGIR.GRF",     {0x0c, 0x24, 0x84, 0xff, 0x6b, 0xe4, 0x9f, 0xc6, 0x3a, 0x83, 0xbe, 0x6a, 0xb5, 0xc3, 0x8f, 0x32} }, // 4793 - 4895 inclusive
+		{ "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
 		{ NULL, { 0 } },
 		{ NULL, { 0 } }
 	},
-	{	{ "TRGCR.GRF", {0x36,0x68,0xf4,0x10,0xc7,0x61,0xa0,0x50,0xb5,0xe7,0x09,0x5a,0x2b,0x14,0x87,0x9b} },
-		{ "TRGHR.GRF", {0x06,0xbf,0x2b,0x7a,0x31,0x76,0x6f,0x04,0x8b,0xaa,0xc2,0xeb,0xe4,0x34,0x57,0xb1} },
-		{ "TRGTR.GRF", {0xde,0x53,0x65,0x05,0x17,0xfe,0x66,0x1c,0xea,0xa3,0x13,0x8c,0x6e,0xdb,0x0e,0xb8} }
+	{	{ "TRGCR.GRF",     {0x36, 0x68, 0xf4, 0x10, 0xc7, 0x61, 0xa0, 0x50, 0xb5, 0xe7, 0x09, 0x5a, 0x2b, 0x14, 0x87, 0x9b} },
+		{ "TRGHR.GRF",     {0x06, 0xbf, 0x2b, 0x7a, 0x31, 0x76, 0x6f, 0x04, 0x8b, 0xaa, 0xc2, 0xeb, 0xe4, 0x34, 0x57, 0xb1} },
+		{ "TRGTR.GRF",     {0xde, 0x53, 0x65, 0x05, 0x17, 0xfe, 0x66, 0x1c, 0xea, 0xa3, 0x13, 0x8c, 0x6e, 0xdb, 0x0e, 0xb8} }
 	}
 };
 
-static MD5File sample_cat_win = { "SAMPLE.CAT", {0x92,0x12,0xe8,0x1e,0x72,0xba,0xdd,0x4b,0xbe,0x1e,0xae,0xae,0x66,0x45,0x8e,0x10} };
-static MD5File sample_cat_dos = { "SAMPLE.CAT", {0x42,0x2e,0xa3,0xdd,0x07,0x4d,0x28,0x59,0xbb,0x51,0x63,0x9a,0x6e,0x0e,0x85,0xda} };
+static MD5File sample_cat_win = { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0xba, 0xdd, 0x4b, 0xbe, 0x1e, 0xae, 0xae, 0x66, 0x45, 0x8e, 0x10} };
+static MD5File sample_cat_dos = { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} };
diff --git a/table/genland.h b/table/genland.h
index 67062cd82..4007f8db3 100644
--- a/table/genland.h
+++ b/table/genland.h
@@ -1,157 +1,157 @@
 /* $Id$ */
 
-#define M(x,y) {x, y}
+#define M(x, y) {x,  y}
 
 static const TileIndexDiffC _make_desert_or_rainforest_data[] = {
-	M(-5,-6),
-	M(-4,-6),
-	M(-3,-6),
-	M(-2,-6),
-	M(-1,-6),
-	M(0,-5),
-	M(1,-5),
-	M(2,-5),
-	M(3,-5),
-	M(4,-5),
-	M(5,-5),
-	M(-5,-5),
-	M(-4,-5),
-	M(-3,-5),
-	M(-2,-5),
-	M(-1,-5),
-	M(0,-4),
-	M(1,-4),
-	M(2,-4),
-	M(3,-4),
-	M(4,-4),
-	M(5,-4),
-	M(-5,-4),
-	M(-4,-4),
-	M(-3,-4),
-	M(-2,-4),
-	M(-1,-4),
-	M(0,-3),
-	M(1,-3),
-	M(2,-3),
-	M(3,-3),
-	M(4,-3),
-	M(5,-3),
-	M(-5,-3),
-	M(-4,-3),
-	M(-3,-3),
-	M(-2,-3),
-	M(-1,-3),
-	M(0,-2),
-	M(1,-2),
-	M(2,-2),
-	M(3,-2),
-	M(4,-2),
-	M(5,-2),
-	M(-5,-2),
-	M(-4,-2),
-	M(-3,-2),
-	M(-2,-2),
-	M(-1,-2),
-	M(0,-1),
-	M(1,-1),
-	M(2,-1),
-	M(3,-1),
-	M(4,-1),
-	M(5,-1),
-	M(-5,-1),
-	M(-4,-1),
-	M(-3,-1),
-	M(-2,-1),
-	M(-1,-1),
-	M(0,0),
-	M(1,0),
-	M(2,0),
-	M(3,0),
-	M(4,0),
-	M(5,0),
-	M(-5,0),
-	M(-4,0),
-	M(-3,0),
-	M(-2,0),
-	M(-1,0),
-	M(0,1),
-	M(1,1),
-	M(2,1),
-	M(3,1),
-	M(4,1),
-	M(5,1),
-	M(-5,1),
-	M(-4,1),
-	M(-3,1),
-	M(-2,1),
-	M(-1,1),
-	M(0,2),
-	M(1,2),
-	M(2,2),
-	M(3,2),
-	M(4,2),
-	M(5,2),
-	M(-5,2),
-	M(-4,2),
-	M(-3,2),
-	M(-2,2),
-	M(-1,2),
-	M(0,3),
-	M(1,3),
-	M(2,3),
-	M(3,3),
-	M(4,3),
-	M(5,3),
-	M(-5,3),
-	M(-4,3),
-	M(-3,3),
-	M(-2,3),
-	M(-1,3),
-	M(0,4),
-	M(1,4),
-	M(2,4),
-	M(3,4),
-	M(4,4),
-	M(5,4),
-	M(-5,4),
-	M(-4,4),
-	M(-3,4),
-	M(-2,4),
-	M(-1,4),
-	M(0,5),
-	M(1,5),
-	M(2,5),
-	M(3,5),
-	M(4,5),
-	M(5,5),
-	M(6,-3),
-	M(-6,-4),
-	M(-3,5),
-	M(-3,-7),
-	M(6,-2),
-	M(-6,-3),
-	M(-2,5),
-	M(-2,-7),
-	M(6,-1),
-	M(-6,-2),
-	M(-1,5),
-	M(-1,-7),
-	M(6,0),
-	M(-6,-1),
-	M(0,6),
-	M(0,-6),
-	M(6,1),
-	M(-6,0),
-	M(1,6),
-	M(1,-6),
-	M(6,2),
-	M(-6,1),
-	M(2,6),
-	M(2,-6),
-	M(6,3),
-	M(-6,2),
-	M(3,6),
-	M(3,-6)
+	M(-5, -6),
+	M(-4, -6),
+	M(-3, -6),
+	M(-2, -6),
+	M(-1, -6),
+	M( 0, -5),
+	M( 1, -5),
+	M( 2, -5),
+	M( 3, -5),
+	M( 4, -5),
+	M( 5, -5),
+	M(-5, -5),
+	M(-4, -5),
+	M(-3, -5),
+	M(-2, -5),
+	M(-1, -5),
+	M( 0, -4),
+	M( 1, -4),
+	M( 2, -4),
+	M( 3, -4),
+	M( 4, -4),
+	M( 5, -4),
+	M(-5, -4),
+	M(-4, -4),
+	M(-3, -4),
+	M(-2, -4),
+	M(-1, -4),
+	M( 0, -3),
+	M( 1, -3),
+	M( 2, -3),
+	M( 3, -3),
+	M( 4, -3),
+	M( 5, -3),
+	M(-5, -3),
+	M(-4, -3),
+	M(-3, -3),
+	M(-2, -3),
+	M(-1, -3),
+	M( 0, -2),
+	M( 1, -2),
+	M( 2, -2),
+	M( 3, -2),
+	M( 4, -2),
+	M( 5, -2),
+	M(-5, -2),
+	M(-4, -2),
+	M(-3, -2),
+	M(-2, -2),
+	M(-1, -2),
+	M( 0, -1),
+	M( 1, -1),
+	M( 2, -1),
+	M( 3, -1),
+	M( 4, -1),
+	M( 5, -1),
+	M(-5, -1),
+	M(-4, -1),
+	M(-3, -1),
+	M(-2, -1),
+	M(-1, -1),
+	M( 0,  0),
+	M( 1,  0),
+	M( 2,  0),
+	M( 3,  0),
+	M( 4,  0),
+	M( 5,  0),
+	M(-5,  0),
+	M(-4,  0),
+	M(-3,  0),
+	M(-2,  0),
+	M(-1,  0),
+	M( 0,  1),
+	M( 1,  1),
+	M( 2,  1),
+	M( 3,  1),
+	M( 4,  1),
+	M( 5,  1),
+	M(-5,  1),
+	M(-4,  1),
+	M(-3,  1),
+	M(-2,  1),
+	M(-1,  1),
+	M( 0,  2),
+	M( 1,  2),
+	M( 2,  2),
+	M( 3,  2),
+	M( 4,  2),
+	M( 5,  2),
+	M(-5,  2),
+	M(-4,  2),
+	M(-3,  2),
+	M(-2,  2),
+	M(-1,  2),
+	M( 0,  3),
+	M( 1,  3),
+	M( 2,  3),
+	M( 3,  3),
+	M( 4,  3),
+	M( 5,  3),
+	M(-5,  3),
+	M(-4,  3),
+	M(-3,  3),
+	M(-2,  3),
+	M(-1,  3),
+	M( 0,  4),
+	M( 1,  4),
+	M( 2,  4),
+	M( 3,  4),
+	M( 4,  4),
+	M( 5,  4),
+	M(-5,  4),
+	M(-4,  4),
+	M(-3,  4),
+	M(-2,  4),
+	M(-1,  4),
+	M( 0,  5),
+	M( 1,  5),
+	M( 2,  5),
+	M( 3,  5),
+	M( 4,  5),
+	M( 5,  5),
+	M( 6, -3),
+	M(-6, -4),
+	M(-3,  5),
+	M(-3, -7),
+	M( 6, -2),
+	M(-6, -3),
+	M(-2,  5),
+	M(-2, -7),
+	M( 6, -1),
+	M(-6, -2),
+	M(-1,  5),
+	M(-1, -7),
+	M( 6,  0),
+	M(-6, -1),
+	M( 0,  6),
+	M( 0, -6),
+	M( 6,  1),
+	M(-6,  0),
+	M( 1,  6),
+	M( 1, -6),
+	M( 6,  2),
+	M(-6,  1),
+	M( 2,  6),
+	M( 2, -6),
+	M( 6,  3),
+	M(-6,  2),
+	M( 3,  6),
+	M( 3, -6)
 };
 
 
diff --git a/table/industry_land.h b/table/industry_land.h
index 9844d66df..5ceec7c4f 100644
--- a/table/industry_land.h
+++ b/table/industry_land.h
@@ -879,13 +879,13 @@ static const DrawIndustrySpec4Struct _industry_anim_offs_3[] = {
 };
 
 static const byte _industry_anim_offs[] = {
-	255, 0, 0, 0, 2, 4, 6, 8, 10, 9,
-	7, 5, 3, 1, 255, 0, 0, 0, 2, 4,
-	6, 8, 10, 9, 7, 5, 3, 1, 255, 0,
-	0, 0, 2, 4, 6, 8, 10, 9, 7, 5,
-	3, 1, 255, 0, 0, 0, 2, 4, 6, 8,
-	10, 9, 7, 5, 3, 1, 255, 0, 0, 0,
-	2, 4, 6, 8, 10, 9, 7, 5, 3, 1
+	255,   0,   0,   0,   2,   4,   6,   8,  10,   9,
+	  7,   5,   3,   1, 255,   0,   0,   0,   2,   4,
+	  6,   8,  10,   9,   7,   5,   3,   1, 255,   0,
+	  0,   0,   2,   4,   6,   8,  10,   9,   7,   5,
+	  3,   1, 255,   0,   0,   0,   2,   4,   6,   8,
+	 10,   9,   7,   5,   3,   1, 255,   0,   0,   0,
+	  2,   4,   6,   8,  10,   9,   7,   5,   3,   1
 };
 
 static const byte _industry_anim_offs_2[] = {
@@ -896,59 +896,59 @@ static const byte _industry_anim_offs_2[] = {
 };
 
 static const byte _coal_plant_sparks_x[] = {11, 11, 14, 13, 18, 15};
-static const byte _coal_plant_sparks_y[] = {23, 11, 6, 3, 1, 0};
+static const byte _coal_plant_sparks_y[] = {23, 11,  6,  3,  1,  0};
 
 /* next frame in an animation */
 #define N 255
 static const byte _industry_section_animation_next[] = {
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, 16, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, 129, N, N, N, N, N,
-135, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   16,  N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   129, N,   N,   N,   N,   N,
+135, N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,
 };
 
 /* animation to start when goods is produced */
 static const byte _industry_produce_section[] = {
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-17, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, 130, N, N, N, N, N, 136,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N, N,
-N, N, N, N, N, N, N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+17,  N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   130, N,   N,   N,   N,   N,   136,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,   N,
+N,   N,   N,   N,   N,   N,   N,
 };
 
 #undef N
diff --git a/table/road_land.h b/table/road_land.h
index d09174323..52e013bd9 100644
--- a/table/road_land.h
+++ b/table/road_land.h
@@ -38,7 +38,7 @@ static const DrawTileSprites _road_depot[] = {
 
 
 static const SpriteID _road_tile_sprites_1[16] = {
-	0, 0x546, 0x545, 0x53B, 0x544, 0x534, 0x53E, 0x539,
+	0,     0x546, 0x545, 0x53B, 0x544, 0x534, 0x53E, 0x539,
   0x543, 0x53C, 0x535, 0x538, 0x53D, 0x537, 0x53A, 0x536
 };
 
@@ -59,7 +59,7 @@ static const DrawRoadTileStruct _road_display_datas2_2[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_3[] = {
-	MAKELINE(0x57f,1,8)
+	MAKELINE(0x57f,  1,  8)
 	ENDLINE
 };
 
@@ -68,18 +68,18 @@ static const DrawRoadTileStruct _road_display_datas2_4[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_5[] = {
-	MAKELINE(0x57f,1,8)
-	MAKELINE(0x57e,14,8)
+	MAKELINE(0x57f,  1,  8)
+	MAKELINE(0x57e, 14,  8)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_6[] = {
-	MAKELINE(0x57e,8,1)
+	MAKELINE(0x57e,  8,  1)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_7[] = {
-	MAKELINE(0x57f,1,8)
+	MAKELINE(0x57f,  1,  8)
 	ENDLINE
 };
 
@@ -88,33 +88,33 @@ static const DrawRoadTileStruct _road_display_datas2_8[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_9[] = {
-	MAKELINE(0x57f,8,14)
+	MAKELINE(0x57f,  8, 14)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_10[] = {
-	MAKELINE(0x57f,8,14)
-	MAKELINE(0x57e,8,1)
+	MAKELINE(0x57f,  8, 14)
+	MAKELINE(0x57e,  8,  1)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_11[] = {
-	MAKELINE(0x57f,8,14)
+	MAKELINE(0x57f,  8, 14)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_12[] = {
-	MAKELINE(0x57e,8,1)
+	MAKELINE(0x57e,  8,  1)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_13[] = {
-	MAKELINE(0x57e,14,8)
+	MAKELINE(0x57e, 14,  8)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_14[] = {
-	MAKELINE(0x57e,8,1)
+	MAKELINE(0x57e,  8,  1)
 	ENDLINE
 };
 
@@ -135,9 +135,9 @@ static const DrawRoadTileStruct _road_display_datas2_18[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_19[] = {
-	MAKELINE(0x1212,0,2)
-	MAKELINE(0x1212,3,9)
-	MAKELINE(0x1212,10,12)
+	MAKELINE(0x1212,  0,  2)
+	MAKELINE(0x1212,  3,  9)
+	MAKELINE(0x1212, 10, 12)
 	ENDLINE
 };
 
@@ -146,23 +146,23 @@ static const DrawRoadTileStruct _road_display_datas2_20[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_21[] = {
-	MAKELINE(0x1212,0,2)
-	MAKELINE(0x1212,0,10)
-	MAKELINE(0x1212,12,2)
-	MAKELINE(0x1212,12,10)
+	MAKELINE(0x1212,  0,  2)
+	MAKELINE(0x1212,  0, 10)
+	MAKELINE(0x1212, 12,  2)
+	MAKELINE(0x1212, 12, 10)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_22[] = {
-	MAKELINE(0x1212,10,0)
-	MAKELINE(0x1212,3,3)
-	MAKELINE(0x1212,0,10)
+	MAKELINE(0x1212, 10,  0)
+	MAKELINE(0x1212,  3,  3)
+	MAKELINE(0x1212,  0, 10)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_23[] = {
-	MAKELINE(0x1212,0,2)
-	MAKELINE(0x1212,0,10)
+	MAKELINE(0x1212,  0,  2)
+	MAKELINE(0x1212,  0, 10)
 	ENDLINE
 };
 
@@ -171,42 +171,42 @@ static const DrawRoadTileStruct _road_display_datas2_24[] = {
 };
 
 static const DrawRoadTileStruct _road_display_datas2_25[] = {
-	MAKELINE(0x1212,12,2)
-	MAKELINE(0x1212,9,9)
-	MAKELINE(0x1212,2,12)
+	MAKELINE(0x1212, 12,  2)
+	MAKELINE(0x1212,  9,  9)
+	MAKELINE(0x1212,  2, 12)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_26[] = {
-	MAKELINE(0x1212,2,0)
-	MAKELINE(0x1212,10,0)
-	MAKELINE(0x1212,2,12)
-	MAKELINE(0x1212,10,12)
+	MAKELINE(0x1212,  2,  0)
+	MAKELINE(0x1212, 10,  0)
+	MAKELINE(0x1212,  2, 12)
+	MAKELINE(0x1212, 10, 12)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_27[] = {
-	MAKELINE(0x1212,2,12)
-	MAKELINE(0x1212,10,12)
+	MAKELINE(0x1212,  2, 12)
+	MAKELINE(0x1212, 10, 12)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_28[] = {
-	MAKELINE(0x1212,2,0)
-	MAKELINE(0x1212,9,3)
-	MAKELINE(0x1212,12,10)
+	MAKELINE(0x1212,  2,  0)
+	MAKELINE(0x1212,  9,  3)
+	MAKELINE(0x1212, 12, 10)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_29[] = {
-	MAKELINE(0x1212,12,2)
-	MAKELINE(0x1212,12,10)
+	MAKELINE(0x1212, 12,  2)
+	MAKELINE(0x1212, 12, 10)
 	ENDLINE
 };
 
 static const DrawRoadTileStruct _road_display_datas2_30[] = {
-	MAKELINE(0x1212,2,0)
-	MAKELINE(0x1212,10,0)
+	MAKELINE(0x1212,  2, 0)
+	MAKELINE(0x1212, 10, 0)
 	ENDLINE
 };
 
diff --git a/table/roadveh.h b/table/roadveh.h
index 63c1903d7..fa8f18e1f 100644
--- a/table/roadveh.h
+++ b/table/roadveh.h
@@ -1,1012 +1,1012 @@
 /* $Id$ */
 
 static const RoadDriveEntry _roadveh_drive_data_0[] = {
-	{15,5},
-	{14,5},
-	{13,5},
-	{12,5},
-	{11,5},
-	{10,5},
-	{9,5},
-	{8,5},
-	{7,5},
-	{6,5},
-	{5,5},
-	{4,5},
-	{3,5},
-	{2,5},
-	{1,5},
-	{0,5},
-	{0x80,0}
+	{15, 5},
+	{14, 5},
+	{13, 5},
+	{12, 5},
+	{11, 5},
+	{10, 5},
+	{ 9, 5},
+	{ 8, 5},
+	{ 7, 5},
+	{ 6, 5},
+	{ 5, 5},
+	{ 4, 5},
+	{ 3, 5},
+	{ 2, 5},
+	{ 1, 5},
+	{ 0, 5},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_1[] = {
-	{5,0},
-	{5,1},
-	{5,2},
-	{5,3},
-	{5,4},
-	{5,5},
-	{5,6},
-	{5,7},
-	{5,8},
-	{5,9},
-	{5,10},
-	{5,11},
-	{5,12},
-	{5,13},
-	{5,14},
-	{5,15},
-	{0x81,0}
+	{5,  0},
+	{5,  1},
+	{5,  2},
+	{5,  3},
+	{5,  4},
+	{5,  5},
+	{5,  6},
+	{5,  7},
+	{5,  8},
+	{5,  9},
+	{5, 10},
+	{5, 11},
+	{5, 12},
+	{5, 13},
+	{5, 14},
+	{5, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_2[] = {
-	{5,0},
-	{5,1},
-	{5,2},
-	{4,3},
-	{3,4},
-	{2,5},
-	{1,5},
-	{0,5},
-	{0x80,0}
+	{5, 0},
+	{5, 1},
+	{5, 2},
+	{4, 3},
+	{3, 4},
+	{2, 5},
+	{1, 5},
+	{0, 5},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_3[] = {
-	{15,5},
-	{14,5},
-	{13,5},
-	{12,5},
-	{11,5},
-	{10,5},
-	{9,6},
-	{8,7},
-	{7,8},
-	{6,9},
-	{5,10},
-	{5,11},
-	{5,12},
-	{5,13},
-	{5,14},
-	{5,15},
-	{0x81,0}
+	{15,  5},
+	{14,  5},
+	{13,  5},
+	{12,  5},
+	{11,  5},
+	{10,  5},
+	{ 9,  6},
+	{ 8,  7},
+	{ 7,  8},
+	{ 6,  9},
+	{ 5, 10},
+	{ 5, 11},
+	{ 5, 12},
+	{ 5, 13},
+	{ 5, 14},
+	{ 5, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_4[] = {
-	{5,0},
-	{5,1},
-	{5,2},
-	{5,3},
-	{5,4},
-	{5,5},
-	{6,6},
-	{7,7},
-	{8,8},
-	{9,9},
-	{10,9},
-	{11,9},
-	{12,9},
-	{13,9},
-	{14,9},
-	{15,9},
-	{0x82,0}
+	{ 5, 0},
+	{ 5, 1},
+	{ 5, 2},
+	{ 5, 3},
+	{ 5, 4},
+	{ 5, 5},
+	{ 6, 6},
+	{ 7, 7},
+	{ 8, 8},
+	{ 9, 9},
+	{10, 9},
+	{11, 9},
+	{12, 9},
+	{13, 9},
+	{14, 9},
+	{15, 9},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_5[] = {
-	{0,9},
-	{1,9},
-	{2,9},
-	{3,10},
-	{4,11},
-	{5,12},
-	{5,13},
-	{5,14},
-	{5,15},
-	{0x81,0}
+	{0,  9},
+	{1,  9},
+	{2,  9},
+	{3, 10},
+	{4, 11},
+	{5, 12},
+	{5, 13},
+	{5, 14},
+	{5, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_6[] = {
-	{0,6},
-	{0,7},
-	{0,8},
-	{0,9},
-	{0x42,0}
+	{0, 6},
+	{0, 7},
+	{0, 8},
+	{0, 9},
+	{0x42, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_7[] = {
-	{6,15},
-	{7,15},
-	{8,15},
-	{9,15},
-	{0x43,0}
+	{6, 15},
+	{7, 15},
+	{8, 15},
+	{9, 15},
+	{0x43, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_8[] = {
-	{0,9},
-	{1,9},
-	{2,9},
-	{3,9},
-	{4,9},
-	{5,9},
-	{6,9},
-	{7,9},
-	{8,9},
-	{9,9},
-	{10,9},
-	{11,9},
-	{12,9},
-	{13,9},
-	{14,9},
-	{15,9},
-	{0x82,0}
+	{ 0, 9},
+	{ 1, 9},
+	{ 2, 9},
+	{ 3, 9},
+	{ 4, 9},
+	{ 5, 9},
+	{ 6, 9},
+	{ 7, 9},
+	{ 8, 9},
+	{ 9, 9},
+	{10, 9},
+	{11, 9},
+	{12, 9},
+	{13, 9},
+	{14, 9},
+	{15, 9},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_9[] = {
-	{9,15},
-	{9,14},
-	{9,13},
-	{9,12},
-	{9,11},
-	{9,10},
-	{9,9},
-	{9,8},
-	{9,7},
-	{9,6},
-	{9,5},
-	{9,4},
-	{9,3},
-	{9,2},
-	{9,1},
-	{9,0},
-	{0x83,0}
+	{9, 15},
+	{9, 14},
+	{9, 13},
+	{9, 12},
+	{9, 11},
+	{9, 10},
+	{9,  9},
+	{9,  8},
+	{9,  7},
+	{9,  6},
+	{9,  5},
+	{9,  4},
+	{9,  3},
+	{9,  2},
+	{9,  1},
+	{9,  0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_10[] = {
-	{0,9},
-	{1,9},
-	{2,9},
-	{3,9},
-	{4,9},
-	{5,9},
-	{6,8},
-	{7,7},
-	{8,6},
-	{9,5},
-	{9,4},
-	{9,3},
-	{9,2},
-	{9,1},
-	{9,0},
-	{0x83,0}
+	{0, 9},
+	{1, 9},
+	{2, 9},
+	{3, 9},
+	{4, 9},
+	{5, 9},
+	{6, 8},
+	{7, 7},
+	{8, 6},
+	{9, 5},
+	{9, 4},
+	{9, 3},
+	{9, 2},
+	{9, 1},
+	{9, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_11[] = {
-	{9,15},
-	{9,14},
-	{9,13},
-	{10,12},
-	{11,11},
-	{12,10},
-	{13,9},
-	{14,9},
-	{15,9},
-	{0x82,0}
+	{ 9, 15},
+	{ 9, 14},
+	{ 9, 13},
+	{10, 12},
+	{11, 11},
+	{12, 10},
+	{13,  9},
+	{14,  9},
+	{15,  9},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_12[] = {
-	{15,5},
-	{14,5},
-	{13,5},
-	{12,4},
-	{11,3},
-	{10,2},
-	{9,1},
-	{9,0},
-	{0x83,0}
+	{15, 5},
+	{14, 5},
+	{13, 5},
+	{12, 4},
+	{11, 3},
+	{10, 2},
+	{ 9, 1},
+	{ 9, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_13[] = {
-	{9,15},
-	{9,14},
-	{9,13},
-	{9,12},
-	{9,11},
-	{9,10},
-	{8,9},
-	{7,8},
-	{6,7},
-	{5,6},
-	{4,5},
-	{3,5},
-	{2,5},
-	{1,5},
-	{0,5},
-	{0x80,0}
+	{9, 15},
+	{9, 14},
+	{9, 13},
+	{9, 12},
+	{9, 11},
+	{9, 10},
+	{8,  9},
+	{7,  8},
+	{6,  7},
+	{5,  6},
+	{4,  5},
+	{3,  5},
+	{2,  5},
+	{1,  5},
+	{0,  5},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_14[] = {
-	{15,8},
-	{15,7},
-	{15,6},
-	{15,5},
-	{0x40,0}
+	{15, 8},
+	{15, 7},
+	{15, 6},
+	{15, 5},
+	{0x40, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_15[] = {
-	{8,0},
-	{7,0},
-	{6,0},
-	{5,0},
-	{0x41,0}
+	{8, 0},
+	{7, 0},
+	{6, 0},
+	{5, 0},
+	{0x41, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_16[] = {
-	{15,9},
-	{14,9},
-	{13,9},
-	{12,9},
-	{11,9},
-	{10,9},
-	{9,9},
-	{8,9},
-	{7,9},
-	{6,9},
-	{5,9},
-	{4,9},
-	{3,9},
-	{2,9},
-	{1,9},
-	{0,9},
-	{0x80,0}
+	{15, 9},
+	{14, 9},
+	{13, 9},
+	{12, 9},
+	{11, 9},
+	{10, 9},
+	{ 9, 9},
+	{ 8, 9},
+	{ 7, 9},
+	{ 6, 9},
+	{ 5, 9},
+	{ 4, 9},
+	{ 3, 9},
+	{ 2, 9},
+	{ 1, 9},
+	{ 0, 9},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_17[] = {
-	{9,0},
-	{9,1},
-	{9,2},
-	{9,3},
-	{9,4},
-	{9,5},
-	{9,6},
-	{9,7},
-	{9,8},
-	{9,9},
-	{9,10},
-	{9,11},
-	{9,12},
-	{9,13},
-	{9,14},
-	{9,15},
-	{0x81,0}
+	{9,  0},
+	{9,  1},
+	{9,  2},
+	{9,  3},
+	{9,  4},
+	{9,  5},
+	{9,  6},
+	{9,  7},
+	{9,  8},
+	{9,  9},
+	{9, 10},
+	{9, 11},
+	{9, 12},
+	{9, 13},
+	{9, 14},
+	{9, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_18[] = {
-	{9,0},
-	{9,1},
-	{9,2},
-	{9,3},
-	{9,4},
-	{9,5},
-	{8,6},
-	{7,7},
-	{6,8},
-	{5,9},
-	{4,9},
-	{3,9},
-	{2,9},
-	{1,9},
-	{0,9},
-	{0x80,0}
+	{9, 0},
+	{9, 1},
+	{9, 2},
+	{9, 3},
+	{9, 4},
+	{9, 5},
+	{8, 6},
+	{7, 7},
+	{6, 8},
+	{5, 9},
+	{4, 9},
+	{3, 9},
+	{2, 9},
+	{1, 9},
+	{0, 9},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_19[] = {
-	{15,9},
-	{14,9},
-	{13,9},
-	{12,10},
-	{11,11},
-	{10,12},
-	{9,13},
-	{9,14},
-	{9,15},
-	{0x81,0}
+	{15,  9},
+	{14,  9},
+	{13,  9},
+	{12, 10},
+	{11, 11},
+	{10, 12},
+	{ 9, 13},
+	{ 9, 14},
+	{ 9, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_20[] = {
-	{9,0},
-	{9,1},
-	{10,2},
-	{11,3},
-	{12,4},
-	{13,5},
-	{14,5},
-	{15,5},
-	{0x82,0}
+	{ 9, 0},
+	{ 9, 1},
+	{10, 2},
+	{11, 3},
+	{12, 4},
+	{13, 5},
+	{14, 5},
+	{15, 5},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_21[] = {
-	{0,5},
-	{1,5},
-	{2,5},
-	{3,5},
-	{4,5},
-	{5,6},
-	{6,7},
-	{7,8},
-	{8,9},
-	{9,10},
-	{9,11},
-	{9,12},
-	{9,13},
-	{9,14},
-	{9,15},
-	{0x81,0}
+	{0,  5},
+	{1,  5},
+	{2,  5},
+	{3,  5},
+	{4,  5},
+	{5,  6},
+	{6,  7},
+	{7,  8},
+	{8,  9},
+	{9, 10},
+	{9, 11},
+	{9, 12},
+	{9, 13},
+	{9, 14},
+	{9, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_22[] = {
-	{0,8},
-	{0,7},
-	{0,6},
-	{0,5},
-	{0x42,0}
+	{0, 8},
+	{0, 7},
+	{0, 6},
+	{0, 5},
+	{0x42, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_23[] = {
-	{8,15},
-	{7,15},
-	{6,15},
-	{5,15},
-	{0x43,0}
+	{8, 15},
+	{7, 15},
+	{6, 15},
+	{5, 15},
+	{0x43, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_24[] = {
-	{0,5},
-	{1,5},
-	{2,5},
-	{3,5},
-	{4,5},
-	{5,5},
-	{6,5},
-	{7,5},
-	{8,5},
-	{9,5},
-	{10,5},
-	{11,5},
-	{12,5},
-	{13,5},
-	{14,5},
-	{15,5},
-	{0x82,0}
+	{ 0, 5},
+	{ 1, 5},
+	{ 2, 5},
+	{ 3, 5},
+	{ 4, 5},
+	{ 5, 5},
+	{ 6, 5},
+	{ 7, 5},
+	{ 8, 5},
+	{ 9, 5},
+	{10, 5},
+	{11, 5},
+	{12, 5},
+	{13, 5},
+	{14, 5},
+	{15, 5},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_25[] = {
-	{5,15},
-	{5,14},
-	{5,13},
-	{5,12},
-	{5,11},
-	{5,10},
-	{5,9},
-	{5,8},
-	{5,7},
-	{5,6},
-	{5,5},
-	{5,4},
-	{5,3},
-	{5,2},
-	{5,1},
-	{5,0},
-	{0x83,0}
+	{5, 15},
+	{5, 14},
+	{5, 13},
+	{5, 12},
+	{5, 11},
+	{5, 10},
+	{5,  9},
+	{5,  8},
+	{5,  7},
+	{5,  6},
+	{5,  5},
+	{5,  4},
+	{5,  3},
+	{5,  2},
+	{5,  1},
+	{5,  0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_26[] = {
-	{0,5},
-	{1,5},
-	{2,5},
-	{3,4},
-	{4,3},
-	{5,2},
-	{5,1},
-	{5,0},
-	{0x83,0}
+	{0, 5},
+	{1, 5},
+	{2, 5},
+	{3, 4},
+	{4, 3},
+	{5, 2},
+	{5, 1},
+	{5, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_27[] = {
-	{5,15},
-	{5,14},
-	{5,13},
-	{5,12},
-	{5,11},
-	{5,10},
-	{6,9},
-	{7,8},
-	{8,7},
-	{9,6},
-	{10,5},
-	{11,5},
-	{12,5},
-	{13,5},
-	{14,5},
-	{15,5},
-	{0x82,0}
+	{ 5, 15},
+	{ 5, 14},
+	{ 5, 13},
+	{ 5, 12},
+	{ 5, 11},
+	{ 5, 10},
+	{ 6,  9},
+	{ 7,  8},
+	{ 8,  7},
+	{ 9,  6},
+	{10,  5},
+	{11,  5},
+	{12,  5},
+	{13,  5},
+	{14,  5},
+	{15,  5},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_28[] = {
-	{15,9},
-	{14,9},
-	{13,9},
-	{12,9},
-	{11,9},
-	{10,9},
-	{9,9},
-	{8,8},
-	{7,7},
-	{6,6},
-	{5,5},
-	{5,4},
-	{5,3},
-	{5,2},
-	{5,1},
-	{5,0},
-	{0x83,0}
+	{15, 9},
+	{14, 9},
+	{13, 9},
+	{12, 9},
+	{11, 9},
+	{10, 9},
+	{ 9, 9},
+	{ 8, 8},
+	{ 7, 7},
+	{ 6, 6},
+	{ 5, 5},
+	{ 5, 4},
+	{ 5, 3},
+	{ 5, 2},
+	{ 5, 1},
+	{ 5, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_29[] = {
-	{5,15},
-	{5,14},
-	{5,13},
-	{5,12},
-	{4,11},
-	{3,10},
-	{2,9},
-	{1,9},
-	{0,9},
-	{0x80,0}
+	{5, 15},
+	{5, 14},
+	{5, 13},
+	{5, 12},
+	{4, 11},
+	{3, 10},
+	{2,  9},
+	{1,  9},
+	{0,  9},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_30[] = {
-	{15,6},
-	{15,7},
-	{15,8},
-	{15,9},
-	{0x40,0}
+	{15, 6},
+	{15, 7},
+	{15, 8},
+	{15, 9},
+	{0x40, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_31[] = {
-	{6,0},
-	{7,0},
-	{8,0},
-	{9,0},
-	{0x41,0}
+	{6, 0},
+	{7, 0},
+	{8, 0},
+	{9, 0},
+	{0x41, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_32[] = {
-	{15,5},
-	{14,5},
-	{13,6},
-	{13,7},
-	{13,8},
-	{13,9},
-	{13,10},
-	{13,11},
-	{12,12},
-	{11,12},
-	{10,12},
-	{9,12},
-	{8,12},
-	{7,12},
-	{6,12},
-	{5,11},
-	{5,10},
-	{5,9},
-	{5,8},
-	{5,7},
-	{5,6},
-	{5,7},
-	{5,8},
-	{5,9},
-	{5,10},
-	{5,11},
-	{6,12},
-	{7,12},
-	{8,12},
-	{9,12},
-	{10,12},
-	{11,12},
-	{12,12},
-	{13,11},
-	{13,10},
-	{14,9},
-	{15,9},
-	{0x82,0}
+	{15,  5},
+	{14,  5},
+	{13,  6},
+	{13,  7},
+	{13,  8},
+	{13,  9},
+	{13, 10},
+	{13, 11},
+	{12, 12},
+	{11, 12},
+	{10, 12},
+	{ 9, 12},
+	{ 8, 12},
+	{ 7, 12},
+	{ 6, 12},
+	{ 5, 11},
+	{ 5, 10},
+	{ 5,  9},
+	{ 5,  8},
+	{ 5,  7},
+	{ 5,  6},
+	{ 5,  7},
+	{ 5,  8},
+	{ 5,  9},
+	{ 5, 10},
+	{ 5, 11},
+	{ 6, 12},
+	{ 7, 12},
+	{ 8, 12},
+	{ 9, 12},
+	{10, 12},
+	{11, 12},
+	{12, 12},
+	{13, 11},
+	{13, 10},
+	{14,  9},
+	{15,  9},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_33[] = {
-	{5,0},
-	{5,1},
-	{6,2},
-	{7,2},
-	{8,2},
-	{9,2},
-	{10,2},
-	{11,2},
-	{12,3},
-	{12,4},
-	{12,5},
-	{12,6},
-	{12,7},
-	{12,8},
-	{12,9},
-	{11,10},
-	{10,10},
-	{9,10},
-	{8,10},
-	{7,10},
-	{6,10},
-	{7,10},
-	{8,10},
-	{9,10},
-	{10,10},
-	{11,10},
-	{12,9},
-	{12,8},
-	{12,7},
-	{12,6},
-	{12,5},
-	{12,4},
-	{12,3},
-	{11,2},
-	{10,2},
-	{9,1},
-	{9,0},
-	{0x83,0}
+	{ 5,  0},
+	{ 5,  1},
+	{ 6,  2},
+	{ 7,  2},
+	{ 8,  2},
+	{ 9,  2},
+	{10,  2},
+	{11,  2},
+	{12,  3},
+	{12,  4},
+	{12,  5},
+	{12,  6},
+	{12,  7},
+	{12,  8},
+	{12,  9},
+	{11, 10},
+	{10, 10},
+	{ 9, 10},
+	{ 8, 10},
+	{ 7, 10},
+	{ 6, 10},
+	{ 7, 10},
+	{ 8, 10},
+	{ 9, 10},
+	{10, 10},
+	{11, 10},
+	{12,  9},
+	{12,  8},
+	{12,  7},
+	{12,  6},
+	{12,  5},
+	{12,  4},
+	{12,  3},
+	{11,  2},
+	{10,  2},
+	{ 9,  1},
+	{ 9,  0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_34[] = {
-	{15,5},
-	{14,5},
-	{13,6},
-	{13,7},
-	{13,8},
-	{13,9},
-	{13,10},
-	{13,11},
-	{12,12},
-	{11,12},
-	{10,12},
-	{9,11},
-	{9,10},
-	{9,9},
-	{9,8},
-	{9,7},
-	{9,6},
-	{9,7},
-	{9,8},
-	{9,9},
-	{9,10},
-	{9,11},
-	{10,12},
-	{11,12},
-	{12,12},
-	{13,11},
-	{13,10},
-	{14,9},
-	{15,9},
-	{0x82,0}
+	{15,  5},
+	{14,  5},
+	{13,  6},
+	{13,  7},
+	{13,  8},
+	{13,  9},
+	{13, 10},
+	{13, 11},
+	{12, 12},
+	{11, 12},
+	{10, 12},
+	{ 9, 11},
+	{ 9, 10},
+	{ 9,  9},
+	{ 9,  8},
+	{ 9,  7},
+	{ 9,  6},
+	{ 9,  7},
+	{ 9,  8},
+	{ 9,  9},
+	{ 9, 10},
+	{ 9, 11},
+	{10, 12},
+	{11, 12},
+	{12, 12},
+	{13, 11},
+	{13, 10},
+	{14,  9},
+	{15,  9},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_35[] = {
-	{5,0},
-	{5,1},
-	{6,2},
-	{7,2},
-	{8,2},
-	{9,2},
-	{10,2},
-	{11,2},
-	{12,3},
-	{12,4},
-	{12,5},
-	{11,6},
-	{10,6},
-	{9,6},
-	{8,6},
-	{7,6},
-	{6,6},
-	{7,6},
-	{8,6},
-	{9,6},
-	{10,6},
-	{11,6},
-	{12,5},
-	{12,4},
-	{12,3},
-	{11,2},
-	{10,2},
-	{9,1},
-	{9,0},
-	{0x83,0}
+	{ 5, 0},
+	{ 5, 1},
+	{ 6, 2},
+	{ 7, 2},
+	{ 8, 2},
+	{ 9, 2},
+	{10, 2},
+	{11, 2},
+	{12, 3},
+	{12, 4},
+	{12, 5},
+	{11, 6},
+	{10, 6},
+	{ 9, 6},
+	{ 8, 6},
+	{ 7, 6},
+	{ 6, 6},
+	{ 7, 6},
+	{ 8, 6},
+	{ 9, 6},
+	{10, 6},
+	{11, 6},
+	{12, 5},
+	{12, 4},
+	{12, 3},
+	{11, 2},
+	{10, 2},
+	{ 9, 1},
+	{ 9, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_40[] = {
-	{0,9},
-	{1,9},
-	{2,8},
-	{2,7},
-	{2,6},
-	{2,5},
-	{2,4},
-	{3,3},
-	{4,3},
-	{5,3},
-	{6,3},
-	{7,3},
-	{8,3},
-	{9,3},
-	{10,4},
-	{10,5},
-	{10,6},
-	{10,7},
-	{10,8},
-	{10,9},
-	{10,8},
-	{10,7},
-	{10,6},
-	{10,5},
-	{10,4},
-	{9,3},
-	{8,3},
-	{7,3},
-	{6,3},
-	{5,3},
-	{4,3},
-	{3,3},
-	{2,4},
-	{1,5},
-	{0,5},
-	{0x80,0}
+	{ 0, 9},
+	{ 1, 9},
+	{ 2, 8},
+	{ 2, 7},
+	{ 2, 6},
+	{ 2, 5},
+	{ 2, 4},
+	{ 3, 3},
+	{ 4, 3},
+	{ 5, 3},
+	{ 6, 3},
+	{ 7, 3},
+	{ 8, 3},
+	{ 9, 3},
+	{10, 4},
+	{10, 5},
+	{10, 6},
+	{10, 7},
+	{10, 8},
+	{10, 9},
+	{10, 8},
+	{10, 7},
+	{10, 6},
+	{10, 5},
+	{10, 4},
+	{ 9, 3},
+	{ 8, 3},
+	{ 7, 3},
+	{ 6, 3},
+	{ 5, 3},
+	{ 4, 3},
+	{ 3, 3},
+	{ 2, 4},
+	{ 1, 5},
+	{ 0, 5},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_41[] = {
-	{9,15},
-	{9,14},
-	{8,13},
-	{7,13},
-	{6,13},
-	{5,13},
-	{4,13},
-	{3,12},
-	{3,11},
-	{3,10},
-	{3,9},
-	{3,8},
-	{3,7},
-	{3,6},
-	{4,5},
-	{5,5},
-	{6,5},
-	{7,5},
-	{8,5},
-	{9,5},
-	{8,5},
-	{7,5},
-	{6,5},
-	{5,5},
-	{4,5},
-	{3,6},
-	{3,7},
-	{3,8},
-	{3,9},
-	{3,10},
-	{3,11},
-	{3,12},
-	{4,13},
-	{5,14},
-	{5,15},
-	{0x81,0}
+	{9, 15},
+	{9, 14},
+	{8, 13},
+	{7, 13},
+	{6, 13},
+	{5, 13},
+	{4, 13},
+	{3, 12},
+	{3, 11},
+	{3, 10},
+	{3,  9},
+	{3,  8},
+	{3,  7},
+	{3,  6},
+	{4,  5},
+	{5,  5},
+	{6,  5},
+	{7,  5},
+	{8,  5},
+	{9,  5},
+	{8,  5},
+	{7,  5},
+	{6,  5},
+	{5,  5},
+	{4,  5},
+	{3,  6},
+	{3,  7},
+	{3,  8},
+	{3,  9},
+	{3, 10},
+	{3, 11},
+	{3, 12},
+	{4, 13},
+	{5, 14},
+	{5, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_42[] = {
-	{0,9},
-	{1,9},
-	{2,8},
-	{2,7},
-	{2,6},
-	{2,5},
-	{2,4},
-	{3,3},
-	{4,3},
-	{5,3},
-	{6,4},
-	{6,5},
-	{6,6},
-	{6,7},
-	{6,8},
-	{6,9},
-	{6,8},
-	{6,7},
-	{6,6},
-	{6,5},
-	{6,4},
-	{5,3},
-	{4,3},
-	{3,3},
-	{2,4},
-	{1,5},
-	{0,5},
-	{0x80,0}
+	{0, 9},
+	{1, 9},
+	{2, 8},
+	{2, 7},
+	{2, 6},
+	{2, 5},
+	{2, 4},
+	{3, 3},
+	{4, 3},
+	{5, 3},
+	{6, 4},
+	{6, 5},
+	{6, 6},
+	{6, 7},
+	{6, 8},
+	{6, 9},
+	{6, 8},
+	{6, 7},
+	{6, 6},
+	{6, 5},
+	{6, 4},
+	{5, 3},
+	{4, 3},
+	{3, 3},
+	{2, 4},
+	{1, 5},
+	{0, 5},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_43[] = {
-	{9,15},
-	{9,14},
-	{8,13},
-	{7,13},
-	{6,13},
-	{5,13},
-	{4,13},
-	{3,12},
-	{3,11},
-	{3,10},
-	{4,9},
-	{5,9},
-	{6,9},
-	{7,9},
-	{8,9},
-	{9,9},
-	{8,9},
-	{7,9},
-	{6,9},
-	{5,9},
-	{4,9},
-	{3,10},
-	{3,11},
-	{3,12},
-	{4,13},
-	{5,14},
-	{5,15},
-	{0x81,0}
+	{9, 15},
+	{9, 14},
+	{8, 13},
+	{7, 13},
+	{6, 13},
+	{5, 13},
+	{4, 13},
+	{3, 12},
+	{3, 11},
+	{3, 10},
+	{4,  9},
+	{5,  9},
+	{6,  9},
+	{7,  9},
+	{8,  9},
+	{9,  9},
+	{8,  9},
+	{7,  9},
+	{6,  9},
+	{5,  9},
+	{4,  9},
+	{3, 10},
+	{3, 11},
+	{3, 12},
+	{4, 13},
+	{5, 14},
+	{5, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_48[] = {
-	{15,9},
-	{14,9},
-	{13,10},
-	{13,11},
-	{12,12},
-	{11,12},
-	{10,12},
-	{9,12},
-	{8,12},
-	{7,12},
-	{6,12},
-	{5,11},
-	{5,10},
-	{5,9},
-	{5,8},
-	{5,7},
-	{5,6},
-	{5,7},
-	{5,8},
-	{5,9},
-	{5,10},
-	{5,11},
-	{6,12},
-	{7,12},
-	{8,12},
-	{9,12},
-	{10,12},
-	{11,12},
-	{12,12},
-	{13,11},
-	{13,10},
-	{13,9},
-	{13,8},
-	{13,7},
-	{13,6},
-	{14,5},
-	{15,5},
-	{0x82,0}
+	{15,  9},
+	{14,  9},
+	{13, 10},
+	{13, 11},
+	{12, 12},
+	{11, 12},
+	{10, 12},
+	{ 9, 12},
+	{ 8, 12},
+	{ 7, 12},
+	{ 6, 12},
+	{ 5, 11},
+	{ 5, 10},
+	{ 5,  9},
+	{ 5,  8},
+	{ 5,  7},
+	{ 5,  6},
+	{ 5,  7},
+	{ 5,  8},
+	{ 5,  9},
+	{ 5, 10},
+	{ 5, 11},
+	{ 6, 12},
+	{ 7, 12},
+	{ 8, 12},
+	{ 9, 12},
+	{10, 12},
+	{11, 12},
+	{12, 12},
+	{13, 11},
+	{13, 10},
+	{13,  9},
+	{13,  8},
+	{13,  7},
+	{13,  6},
+	{14,  5},
+	{15,  5},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_49[] = {
-	{9,0},
-	{9,1},
-	{10,2},
-	{11,2},
-	{12,3},
-	{12,4},
-	{12,5},
-	{12,6},
-	{12,7},
-	{12,8},
-	{12,9},
-	{11,10},
-	{10,10},
-	{9,10},
-	{8,10},
-	{7,10},
-	{6,10},
-	{7,10},
-	{8,10},
-	{9,10},
-	{10,10},
-	{11,10},
-	{12,9},
-	{12,8},
-	{12,7},
-	{12,6},
-	{12,5},
-	{12,4},
-	{12,3},
-	{11,2},
-	{10,2},
-	{9,2},
-	{8,2},
-	{7,2},
-	{6,2},
-	{5,1},
-	{5,0},
-	{0x83,0}
+	{ 9,  0},
+	{ 9,  1},
+	{10,  2},
+	{11,  2},
+	{12,  3},
+	{12,  4},
+	{12,  5},
+	{12,  6},
+	{12,  7},
+	{12,  8},
+	{12,  9},
+	{11, 10},
+	{10, 10},
+	{ 9, 10},
+	{ 8, 10},
+	{ 7, 10},
+	{ 6, 10},
+	{ 7, 10},
+	{ 8, 10},
+	{ 9, 10},
+	{10, 10},
+	{11, 10},
+	{12,  9},
+	{12,  8},
+	{12,  7},
+	{12,  6},
+	{12,  5},
+	{12,  4},
+	{12,  3},
+	{11,  2},
+	{10,  2},
+	{ 9,  2},
+	{ 8,  2},
+	{ 7,  2},
+	{ 6,  2},
+	{ 5,  1},
+	{ 5,  0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_50[] = {
-	{15,9},
-	{14,9},
-	{13,10},
-	{13,11},
-	{12,12},
-	{11,12},
-	{10,12},
-	{9,11},
-	{9,10},
-	{9,9},
-	{9,8},
-	{9,7},
-	{9,6},
-	{9,7},
-	{9,8},
-	{9,9},
-	{9,10},
-	{9,11},
-	{10,12},
-	{11,12},
-	{12,12},
-	{13,11},
-	{13,10},
-	{13,9},
-	{13,8},
-	{13,7},
-	{13,6},
-	{14,5},
-	{15,5},
-	{0x82,0}
+	{15,  9},
+	{14,  9},
+	{13, 10},
+	{13, 11},
+	{12, 12},
+	{11, 12},
+	{10, 12},
+	{ 9, 11},
+	{ 9, 10},
+	{ 9,  9},
+	{ 9,  8},
+	{ 9,  7},
+	{ 9,  6},
+	{ 9,  7},
+	{ 9,  8},
+	{ 9,  9},
+	{ 9, 10},
+	{ 9, 11},
+	{10, 12},
+	{11, 12},
+	{12, 12},
+	{13, 11},
+	{13, 10},
+	{13,  9},
+	{13,  8},
+	{13,  7},
+	{13,  6},
+	{14,  5},
+	{15,  5},
+	{0x82, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_51[] = {
-	{9,0},
-	{9,1},
-	{10,2},
-	{11,2},
-	{12,3},
-	{12,4},
-	{12,5},
-	{11,6},
-	{10,6},
-	{9,6},
-	{8,6},
-	{7,6},
-	{6,6},
-	{7,6},
-	{8,6},
-	{9,6},
-	{10,6},
-	{11,6},
-	{12,5},
-	{12,4},
-	{12,3},
-	{11,2},
-	{10,2},
-	{9,2},
-	{8,2},
-	{7,2},
-	{6,2},
-	{5,1},
-	{5,0},
-	{0x83,0}
+	{ 9, 0},
+	{ 9, 1},
+	{10, 2},
+	{11, 2},
+	{12, 3},
+	{12, 4},
+	{12, 5},
+	{11, 6},
+	{10, 6},
+	{ 9, 6},
+	{ 8, 6},
+	{ 7, 6},
+	{ 6, 6},
+	{ 7, 6},
+	{ 8, 6},
+	{ 9, 6},
+	{10, 6},
+	{11, 6},
+	{12, 5},
+	{12, 4},
+	{12, 3},
+	{11, 2},
+	{10, 2},
+	{ 9, 2},
+	{ 8, 2},
+	{ 7, 2},
+	{ 6, 2},
+	{ 5, 1},
+	{ 5, 0},
+	{0x83, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_56[] = {
-	{0,5},
-	{1,5},
-	{2,4},
-	{3,3},
-	{4,3},
-	{5,3},
-	{6,3},
-	{7,3},
-	{8,3},
-	{9,3},
-	{10,4},
-	{10,5},
-	{10,6},
-	{10,7},
-	{10,8},
-	{10,9},
-	{10,8},
-	{10,7},
-	{10,6},
-	{10,5},
-	{10,4},
-	{9,3},
-	{8,3},
-	{7,3},
-	{6,3},
-	{5,3},
-	{4,3},
-	{3,3},
-	{2,4},
-	{2,5},
-	{2,6},
-	{2,7},
-	{2,8},
-	{1,9},
-	{0,9},
-	{0x80,0}
+	{ 0, 5},
+	{ 1, 5},
+	{ 2, 4},
+	{ 3, 3},
+	{ 4, 3},
+	{ 5, 3},
+	{ 6, 3},
+	{ 7, 3},
+	{ 8, 3},
+	{ 9, 3},
+	{10, 4},
+	{10, 5},
+	{10, 6},
+	{10, 7},
+	{10, 8},
+	{10, 9},
+	{10, 8},
+	{10, 7},
+	{10, 6},
+	{10, 5},
+	{10, 4},
+	{ 9, 3},
+	{ 8, 3},
+	{ 7, 3},
+	{ 6, 3},
+	{ 5, 3},
+	{ 4, 3},
+	{ 3, 3},
+	{ 2, 4},
+	{ 2, 5},
+	{ 2, 6},
+	{ 2, 7},
+	{ 2, 8},
+	{ 1, 9},
+	{ 0, 9},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_57[] = {
-	{5,15},
-	{5,14},
-	{4,13},
-	{3,12},
-	{3,11},
-	{3,10},
-	{3,9},
-	{3,8},
-	{3,7},
-	{3,6},
-	{4,5},
-	{5,5},
-	{6,5},
-	{7,5},
-	{8,5},
-	{9,5},
-	{8,5},
-	{7,5},
-	{6,5},
-	{5,5},
-	{4,5},
-	{3,6},
-	{3,7},
-	{3,8},
-	{3,9},
-	{3,10},
-	{3,11},
-	{3,12},
-	{4,13},
-	{5,13},
-	{6,13},
-	{7,13},
-	{8,13},
-	{9,14},
-	{9,15},
-	{0x81,0}
+	{5, 15},
+	{5, 14},
+	{4, 13},
+	{3, 12},
+	{3, 11},
+	{3, 10},
+	{3,  9},
+	{3,  8},
+	{3,  7},
+	{3,  6},
+	{4,  5},
+	{5,  5},
+	{6,  5},
+	{7,  5},
+	{8,  5},
+	{9,  5},
+	{8,  5},
+	{7,  5},
+	{6,  5},
+	{5,  5},
+	{4,  5},
+	{3,  6},
+	{3,  7},
+	{3,  8},
+	{3,  9},
+	{3, 10},
+	{3, 11},
+	{3, 12},
+	{4, 13},
+	{5, 13},
+	{6, 13},
+	{7, 13},
+	{8, 13},
+	{9, 14},
+	{9, 15},
+	{0x81, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_58[] = {
-	{0,5},
-	{1,5},
-	{2,4},
-	{3,3},
-	{4,3},
-	{5,3},
-	{6,4},
-	{6,5},
-	{6,6},
-	{6,7},
-	{6,8},
-	{6,9},
-	{6,8},
-	{6,7},
-	{6,6},
-	{6,5},
-	{6,4},
-	{5,3},
-	{4,3},
-	{3,3},
-	{2,4},
-	{2,5},
-	{2,6},
-	{2,7},
-	{2,8},
-	{1,9},
-	{0,9},
-	{0x80,0}
+	{0, 5},
+	{1, 5},
+	{2, 4},
+	{3, 3},
+	{4, 3},
+	{5, 3},
+	{6, 4},
+	{6, 5},
+	{6, 6},
+	{6, 7},
+	{6, 8},
+	{6, 9},
+	{6, 8},
+	{6, 7},
+	{6, 6},
+	{6, 5},
+	{6, 4},
+	{5, 3},
+	{4, 3},
+	{3, 3},
+	{2, 4},
+	{2, 5},
+	{2, 6},
+	{2, 7},
+	{2, 8},
+	{1, 9},
+	{0, 9},
+	{0x80, 0}
 };
 static const RoadDriveEntry _roadveh_drive_data_59[] = {
-	{5,15},
-	{5,14},
-	{4,13},
-	{3,12},
-	{3,11},
-	{3,10},
-	{4,9},
-	{5,9},
-	{6,9},
-	{7,9},
-	{8,9},
-	{9,9},
-	{8,9},
-	{7,9},
-	{6,9},
-	{5,9},
-	{4,9},
-	{3,10},
-	{3,11},
-	{3,12},
-	{4,13},
-	{5,13},
-	{6,13},
-	{7,13},
-	{8,13},
-	{9,14},
-	{9,15},
-	{0x81,0}
+	{5, 15},
+	{5, 14},
+	{4, 13},
+	{3, 12},
+	{3, 11},
+	{3, 10},
+	{4,  9},
+	{5,  9},
+	{6,  9},
+	{7,  9},
+	{8,  9},
+	{9,  9},
+	{8,  9},
+	{7,  9},
+	{6,  9},
+	{5,  9},
+	{4,  9},
+	{3, 10},
+	{3, 11},
+	{3, 12},
+	{4, 13},
+	{5, 13},
+	{6, 13},
+	{7, 13},
+	{8, 13},
+	{9, 14},
+	{9, 15},
+	{0x81, 0}
 };
 
 static const RoadDriveEntry * const _road_drive_data[] = {
diff --git a/table/train_cmd.h b/table/train_cmd.h
index da4b7ebfe..1bf8e70c8 100644
--- a/table/train_cmd.h
+++ b/table/train_cmd.h
@@ -44,14 +44,14 @@ static const byte _engine_sprite_add[] = {
 
 
 static const byte _wagon_full_adder[] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 44, 0, 0, 0, 0, 24,
-	24, 24, 24, 0, 0, 32, 32, 0,
-	4, 4, 4, 4, 4, 4, 4, 0,
-	0, 4, 4, 4, 0, 44, 0, 0,
-	0, 0, 24, 24, 24, 24, 0, 0,
+	 0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0,  0,  0,  0,  0,  0,  0,
+	 0,  0, 44,  0,  0,  0,  0, 24,
+	24, 24, 24,  0,  0, 32, 32,  0,
+	 4,  4,  4,  4,  4,  4,  4,  0,
+	 0,  4,  4,  4,  0, 44,  0,  0,
+	 0,  0, 24, 24, 24, 24,  0,  0,
 	32, 32
 };
diff --git a/table/unmovable_land.h b/table/unmovable_land.h
index 490c4564b..9b9e7d6cd 100644
--- a/table/unmovable_land.h
+++ b/table/unmovable_land.h
@@ -13,8 +13,8 @@ typedef struct DrawTileUnmovableStruct {
 #define TILE_SEQ_END() { 0x80, 0, 0, 0, 0, 0, 0 }
 
 static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
-	{0xA29, 7,7, 2,2, 70, 0},
-	{0xA2A, 4,4, 7,7, 61, 0},
+	{0xA29, 7, 7, 2, 2, 70, 0},
+	{0xA2A, 4, 4, 7, 7, 61, 0},
 };