gen_adldata: Fixed an incorrect detune parsing from WOPL files

1 files changed, 141 insertions, 138 deletions

diff --git a/src/adldata.cpp b/src/adldata.cpp
index 6abbc2d..05e739c 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -4614,7 +4614,7 @@ const adldata adl[4597] =
     { 0x07BF003,0x07BF502, 0x8A,0x80, 0x8, +0 },
     { 0x07BF003,0x07BF402, 0x8A,0x80, 0x8, +0 },
 };
-const struct adlinsdata adlins[4770] =
+const struct adlinsdata adlins[4773] =
 {
     {   0,   0,  0, 0,   9006,   133,      0, 0 },
     {   1,   1,  0, 0,   9206,   146,      0, 0 },
@@ -8870,7 +8870,7 @@ const struct adlinsdata adlins[4770] =
     {3998,3999,  0, 4,   9320,   133,      0, 0 },
     {   9,4000,  0, 4,   1606,   426,      0, 0 },
     {4001,4002,  0, 4,  18373,   240,      0, 0 },
-    {4003,4004,  0, 1,   7440,  1100,      0, -1.9375 },
+    {4003,4004,  0, 1,   7440,  1100,      0, 0.0625 },
     {  15,4005,  0, 4,   5640,  1986,      0, 0 },
     {4006,4007,  0, 4,  40000,   100,      0, 0 },
     {4008,4009,  0, 4,  40000,    73,      0, 0 },
@@ -8898,7 +8898,7 @@ const struct adlinsdata adlins[4770] =
     {4046,4047,  0, 4,  40000,   126,      0, 0 },
     {4048,4049,  0, 4,  40000,    80,      0, 0 },
     {4050,4051,  0, 4,  40000,    73,      0, 0 },
-    {4052,4053,  0, 1,  40000,    86,      0, -1.96875 },
+    {4052,4053,  0, 1,  40000,    86,      0, 0.03125 },
     {4054,4055,  0, 4,  40000,    86,      0, 0 },
     {1503,4056,  0, 4,  40000,    93,      0, 0 },
     {  88,4057,  0, 4,  40000,  1220,      0, 0 },
@@ -8910,13 +8910,13 @@ const struct adlinsdata adlins[4770] =
     {4063,4064,  0, 4,  40000,   420,      0, 0 },
     { 103,4065,  0, 4,   3673,  1240,      0, 0 },
     {4066,4067,  0, 1,   6286,   380,      0, 0 },
-    {4068,4069,  0, 1,   2220,   426,      0, -1.96875 },
+    {4068,4069,  0, 1,   2220,   426,      0, 0.03125 },
     { 107,4070,  0, 4,   2086,   760,      0, 0 },
-    {4071,4072,  0, 1,  40000,   100,      0, -1.9375 },
+    {4071,4072,  0, 1,  40000,   100,      0, 0.0625 },
     { 110,4073,  0, 4,  40000,   100,      0, 0 },
     { 111,4074,  0, 4,   2300,   820,      0, 0 },
     {4075,4076,  0, 4,   1013,   326,      0, 0 },
-    {4077,4078,  0, 1,   1220,   393,      0, -1.96875 },
+    {4077,4078,  0, 1,   1220,   393,      0, 0.03125 },
     { 115,4079,  0, 4,   1813,   646,      0, 0 },
     {4080,4081,  0, 1,    566,   146,      0, 0 },
     { 118,4082,  0, 4,   1553,    53,      0, 0 },
@@ -8933,19 +8933,19 @@ const struct adlinsdata adlins[4770] =
     {4094,4095, 63, 4,    166,    93,      0, 0 },
     {4096,4096, 15, 0,    113,    66,      0, 0 },
     {4097,4097, 36, 0,    106,    53,      0, 0 },
-    {4097,4098, 36, 1,    480,   173,      0, -1.59375 },
+    {4097,4098, 36, 1,    480,   173,      0, 0.40625 },
     {4099,4099, 35, 0,    706,   266,      0, 0 },
     {4100,4101, 38, 1,    273,   106,      0, 0 },
     {4102,4103, 38, 1,    366,   133,      0, 0 },
-    {4104,4105, 48, 1,    280,   133,      0, 0.09375 },
+    {4104,4105, 48, 1,    280,   133,      0, -1.90625 },
     {4106,4106, 48, 0,    180,    86,      0, 0 },
-    {4107,4108, 48, 1,    953,   346,      0, 0.09375 },
-    {4109,4109, 61, 1,   3200,   540,      0, -1.90625 },
+    {4107,4108, 48, 1,    953,   346,      0, -1.90625 },
+    {4109,4109, 61, 1,   3200,   540,      0, 0.09375 },
     {3369,1557, 70, 4,    766,   306,      0, 0 },
-    {4110,4111, 79, 1,   1306,   513,      0, -1.9375 },
+    {4110,4111, 79, 1,   1306,   513,      0, 0.0625 },
     {4112,4112, 62, 0,   5200,   466,      0, 0 },
-    {4113,4114, 67, 1,   2153,  1080,      0, -1.9375 },
-    {4115,4115, 62, 1,   3226,   573,      0, -1.90625 },
+    {4113,4114, 67, 1,   2153,  1080,      0, 0.0625 },
+    {4115,4115, 62, 1,   3226,   573,      0, 0.09375 },
     {4116,4117, 54, 1,    286,   133,      0, 0 },
     {4116,4118, 48, 1,    286,   126,      0, 0 },
     {1589,1589, 71, 0,    106,    46,      0, 0 },
@@ -8957,7 +8957,7 @@ const struct adlinsdata adlins[4770] =
     {4125,4126, 18, 1,    200,    80,      0, 0 },
     {4127,4128, 18, 1,    253,    73,      0, 0 },
     {4129,4130, 64, 4,   1346,    33,      0, 0 },
-    {4131,4132, 64, 1,    373,    73,      0, -1.96875 },
+    {4131,4132, 64, 1,    373,    73,      0, 0.03125 },
     {4133,4133, 67, 0,    106,    26,      0, 0 },
     { 844, 844,244, 2,      6,     0,      0, 0 },
     { 855, 855,244, 2,      6,     0,      0, 0 },
@@ -9062,69 +9062,69 @@ const struct adlinsdata adlins[4770] =
     {3547,3547,109, 0,   5300,  1786,      0, 0 },
     {4179,4179, 79, 0,    560,   313,      0, 0 },
     {4180,4180,  0, 0,  10646,    73,      0, 0 },
-    {4181,4182,  0, 1,  14166,   586,      0, -1.96875 },
-    {4183,4184,  0, 1,  15553,   546,      0, -1.96875 },
-    {4185,4186,  0, 1,  11746,   320,      0, -1.96875 },
-    {4187,4188,  0, 1,  14706,   646,      0, -1.84375 },
-    {4189,4190,  0, 1,   7320,   100,      0, -1.96875 },
-    {4191,4192,  0, 1,  40000,     0,      0, -1.9375 },
+    {4181,4182,  0, 1,  14166,   586,      0, 0.03125 },
+    {4183,4184,  0, 1,  15553,   546,      0, 0.03125 },
+    {4185,4186,  0, 1,  11746,   320,      0, 0.03125 },
+    {4187,4188,  0, 1,  14706,   646,      0, 0.15625 },
+    {4189,4190,  0, 1,   7320,   100,      0, 0.03125 },
+    {4191,4192,  0, 1,  40000,     0,      0, 0.0625 },
     {4193,4194,  0, 1,  13660,   260,      0, 0 },
     {4195,4196,  0, 1,  15026,   133,      0, 0 },
-    {4197,4198,  0, 1,  40000,     0,      0, -2 },
+    {4197,4198,  0, 1,  40000,     0,      0, 0 },
     {4199,4200,  0, 1,   4980,  3400,      0, 0 },
-    {4201,4202,  0, 1,   7840,  2660,      0, -1.96875 },
+    {4201,4202,  0, 1,   7840,  2660,      0, 0.03125 },
     {4203,4204,  0, 1,   8326,   180,      0, 0 },
     {4205,4206,  0, 1,   1093,   140,      0, 0 },
     {4207,4208,  0, 1,   2280,   400,      0, 0 },
-    {4209,4210,  0, 1,   4553,  1486,      0, -1.96875 },
-    {4211,4211,  0, 1,  40000,     0,      0, -1.96875 },
-    {4212,4213,  0, 1,  40000,    60,      0, -1.84375 },
-    {4214,4215,  0, 1,  40000,    93,      0, -1.9375 },
-    {4216,4217,  0, 1,  40000,    86,      0, -1.84375 },
-    {4218,4219,  0, 1,  40000,   520,      0, -1.96875 },
-    {4220,4221,  0, 1,  40000,   140,      0, -1.9375 },
-    {4222,4223,  0, 1,  40000,   133,      0, -1.875 },
+    {4209,4210,  0, 1,   4553,  1486,      0, 0.03125 },
+    {4211,4211,  0, 1,  40000,     0,      0, 0.03125 },
+    {4212,4213,  0, 1,  40000,    60,      0, 0.15625 },
+    {4214,4215,  0, 1,  40000,    93,      0, 0.0625 },
+    {4216,4217,  0, 1,  40000,    86,      0, 0.15625 },
+    {4218,4219,  0, 1,  40000,   520,      0, 0.03125 },
+    {4220,4221,  0, 1,  40000,   140,      0, 0.0625 },
+    {4222,4223,  0, 1,  40000,   133,      0, 0.125 },
     {4224,4225,  0, 1,  40000,    73,      0, 0 },
-    {4226,4227,  0, 1,  40000,   346,      0, -1.90625 },
+    {4226,4227,  0, 1,  40000,   346,      0, 0.09375 },
     {4228,4229,  0, 1,   3693,    86,      0, 0 },
-    {4230,4231,  0, 1,   6586,   460,      0, -2 },
+    {4230,4231,  0, 1,   6586,   460,      0, 0 },
     {4232,4233,  0, 1,   4320,    93,      0, 0 },
-    {4234,4235,  0, 1,   7346,   126,      0, -1.96875 },
+    {4234,4235,  0, 1,   7346,   126,      0, 0.03125 },
     {4236,4237,  0, 1,   3633,   260,      0, 0 },
-    {4238,4239,  0, 1,  40000,   126,      0, 0.03125 },
-    {4240,4241,  0, 1,  40000,   126,      0, 0.0625 },
-    {4242,4243,  0, 1,  40000,    46,      0, -1.78125 },
-    {4244,4245,  0, 1,  40000,     0,      0, -1.96875 },
+    {4238,4239,  0, 1,  40000,   126,      0, -1.96875 },
+    {4240,4241,  0, 1,  40000,   126,      0, -1.9375 },
+    {4242,4243,  0, 1,  40000,    46,      0, 0.21875 },
+    {4244,4245,  0, 1,  40000,     0,      0, 0.03125 },
     {4246,4247,  0, 1,  10320,    86,      0, 0 },
     {4248,4249,  0, 1,  12933,   133,      0, 0 },
-    {4250,4251,  0, 1,  11820,   240,      0, -1.96875 },
+    {4250,4251,  0, 1,  11820,   240,      0, 0.03125 },
     {4252,4253,  0, 1,   3966,   166,      0, 0 },
     {4254,4255,  0, 1,  40000,     0,      0, 0 },
     {4256,4256,  0, 0,   2666,   160,      0, 0 },
-    {4257,4258,  0, 1,  15046,    93,      0, -1.9375 },
+    {4257,4258,  0, 1,  15046,    93,      0, 0.0625 },
     {4259,4260,  0, 1,  40000,   100,      0, 0 },
     {4261,4261,  0, 0,  40000,   260,      0, 0 },
-    {4262,4263,  0, 1,  40000,   126,      0, -2 },
+    {4262,4263,  0, 1,  40000,   126,      0, 0 },
     {4264,4264,  0, 0,  40000,   233,      0, 0 },
-    {4265,4266,  0, 1,  40000,   440,      0, -1.9375 },
-    {4267,4268,  0, 1,   2160,   606,      0, -1.90625 },
-    {4269,4270,  0, 1,  14753,  2400,      0, -1.96875 },
-    {4271,4272,  0, 1,   7680,   646,      0, -1.96875 },
-    {4273,4274,  0, 1,  40000,   446,      0, -1.9375 },
-    {4275,4276,  0, 1,  40000,   866,      0, 1.9375 },
-    {4277,4277,  0, 1,  40000,  1220,      0, -1.9375 },
-    {4278,4278,  0, 1,  40000,  1960,      0, -1.9375 },
-    {4279,4280,  0, 1,  40000,   433,      0, -1.875 },
-    {4281,4282,  0, 1,  40000,   140,      0, -1.875 },
-    {4283,4284,  0, 1,  40000,   806,      0, -1.90625 },
-    {4285,4286,  0, 1,   2040,   486,      0, -1.875 },
+    {4265,4266,  0, 1,  40000,   440,      0, 0.0625 },
+    {4267,4268,  0, 1,   2160,   606,      0, 0.09375 },
+    {4269,4270,  0, 1,  14753,  2400,      0, 0.03125 },
+    {4271,4272,  0, 1,   7680,   646,      0, 0.03125 },
+    {4273,4274,  0, 1,  40000,   446,      0, 0.0625 },
+    {4275,4276,  0, 1,  40000,   866,      0, -0.0625 },
+    {4277,4277,  0, 1,  40000,  1220,      0, 0.0625 },
+    {4278,4278,  0, 1,  40000,  1960,      0, 0.0625 },
+    {4279,4280,  0, 1,  40000,   433,      0, 0.125 },
+    {4281,4282,  0, 1,  40000,   140,      0, 0.125 },
+    {4283,4284,  0, 1,  40000,   806,      0, 0.09375 },
+    {4285,4286,  0, 1,   2040,   486,      0, 0.125 },
     {4287,4288,  0, 1,  40000,    86,      0, 0 },
-    {4289,4290,  0, 1,  40000,    80,      0, -1.96875 },
+    {4289,4290,  0, 1,  40000,    80,      0, 0.03125 },
     {4291,4291,  0, 0,  40000,    73,      0, 0 },
-    {4292,4293,  0, 1,  40000,   400,      0, -1.9375 },
-    {4294,4295,  0, 1,  40000,   120,      0, -1.9375 },
-    {4296,4297,  0, 1,  40000,     0,      0, -1.90625 },
-    {4298,4298,  0, 1,  40000,     0,      0, -1.875 },
+    {4292,4293,  0, 1,  40000,   400,      0, 0.0625 },
+    {4294,4295,  0, 1,  40000,   120,      0, 0.0625 },
+    {4296,4297,  0, 1,  40000,     0,      0, 0.09375 },
+    {4298,4298,  0, 1,  40000,     0,      0, 0.125 },
     {4299,4300,  0, 1,  40000,   186,      0, 0 },
     {4301,4301,  0, 0,  40000,   166,      0, 0 },
     {4302,4302,  0, 0,  40000,    73,      0, 0 },
@@ -9136,35 +9136,35 @@ const struct adlinsdata adlins[4770] =
     {4310,4310,  0, 0,  40000,    86,      0, 0 },
     {4311,4311,  0, 0,  40000,    73,      0, 0 },
     {4312,4312,  0, 0,  40000,   106,      0, 0 },
-    {4313,4314,  0, 1,  40000,   186,      0, -1.96875 },
-    {4315,4316,  0, 1,  40000,     0,      0, -1.96875 },
+    {4313,4314,  0, 1,  40000,   186,      0, 0.03125 },
+    {4315,4316,  0, 1,  40000,     0,      0, 0.03125 },
     {4317,4317,  0, 0,  40000,   300,      0, 0 },
     {4318,4318,  0, 0,  40000,    66,      0, 0 },
-    {4319,4320,  0, 1,  40000,    73,      0, -1.875 },
-    {4321,4322,  0, 1,  40000,    86,      0, -1.90625 },
-    {4323,4324,  0, 1,  40000,   146,      0, -1.90625 },
-    {4325,4326,  0, 1,  40000,    66,      0, 1.96875 },
+    {4319,4320,  0, 1,  40000,    73,      0, 0.125 },
+    {4321,4322,  0, 1,  40000,    86,      0, 0.09375 },
+    {4323,4324,  0, 1,  40000,   146,      0, 0.09375 },
+    {4325,4326,  0, 1,  40000,    66,      0, -0.03125 },
     {4327,4327,  0, 0,  40000,    60,      0, 0 },
-    {4328,4329,  0, 1,  40000,   213,      0, -1.84375 },
-    {4330,4331,  0, 1,  40000,    66,      0, -1.875 },
-    {4332,4333,  0, 1,  40000,   100,      0, -1.96875 },
-    {4334,4335,  0, 1,  40000,  1513,      0, -1.9375 },
-    {4336,4337,  0, 1,  40000,   353,      0, -1.90625 },
-    {4338,4339,  0, 1,  40000,   133,      0, -1.9375 },
-    {4340,4341,  0, 1,  40000,   746,      0, -1.875 },
-    {4342,4343,  0, 1,  40000,     0,      0, -1.90625 },
-    {4344,4345,  0, 1,   5033,  1606,      0, -1.9375 },
-    {4346,4347,  0, 1,  40000,  1146,      0, -1.90625 },
-    {4348,4349,  0, 1,  40000,  1586,      0, -1.90625 },
-    {4350,4351,  0, 1,  40000,     0,      0, -1.90625 },
-    {4352,4353,  0, 1,  40000,  1006,      0, -1.875 },
-    {4354,4354,  0, 1,   2680,   793,      0, -1.90625 },
-    {4355,4356,  0, 1,  40000,     0,      0, 1.9375 },
-    {4357,4358,  0, 1,   9000,  3186,      0, -1.875 },
-    {4359,4360,  0, 1,  40000,  1073,      0, 1.90625 },
-    {4361,4362,  0, 1,  40000,  2093,      0, -1.875 },
-    {4363,4364,  0, 1,  40000,     0,      0, -1.9375 },
-    {4365,4366,  0, 1,   9580,   713,      0, -1.96875 },
+    {4328,4329,  0, 1,  40000,   213,      0, 0.15625 },
+    {4330,4331,  0, 1,  40000,    66,      0, 0.125 },
+    {4332,4333,  0, 1,  40000,   100,      0, 0.03125 },
+    {4334,4335,  0, 1,  40000,  1513,      0, 0.0625 },
+    {4336,4337,  0, 1,  40000,   353,      0, 0.09375 },
+    {4338,4339,  0, 1,  40000,   133,      0, 0.0625 },
+    {4340,4341,  0, 1,  40000,   746,      0, 0.125 },
+    {4342,4343,  0, 1,  40000,     0,      0, 0.09375 },
+    {4344,4345,  0, 1,   5033,  1606,      0, 0.0625 },
+    {4346,4347,  0, 1,  40000,  1146,      0, 0.09375 },
+    {4348,4349,  0, 1,  40000,  1586,      0, 0.09375 },
+    {4350,4351,  0, 1,  40000,     0,      0, 0.09375 },
+    {4352,4353,  0, 1,  40000,  1006,      0, 0.125 },
+    {4354,4354,  0, 1,   2680,   793,      0, 0.09375 },
+    {4355,4356,  0, 1,  40000,     0,      0, -0.0625 },
+    {4357,4358,  0, 1,   9000,  3186,      0, 0.125 },
+    {4359,4360,  0, 1,  40000,  1073,      0, -0.09375 },
+    {4361,4362,  0, 1,  40000,  2093,      0, 0.125 },
+    {4363,4364,  0, 1,  40000,     0,      0, 0.0625 },
+    {4365,4366,  0, 1,   9580,   713,      0, 0.03125 },
     {4367,4367,  0, 0,   1166,   760,      0, 0 },
     {4368,4369,  0, 1,   1186,   240,      0, 0 },
     {4370,4370,  0, 0,  40000,   160,      0, 0 },
@@ -9174,7 +9174,7 @@ const struct adlinsdata adlins[4770] =
     {4374,4374,  0, 0,    246,    93,      0, 0 },
     {4375,4376,  0, 1,   1953,   393,      0, 0 },
     {4377,4378,  0, 1,   4220,   133,      0, 0 },
-    {4379,4380,  0, 1,   2873,    73,      0, -1.90625 },
+    {4379,4380,  0, 1,   2873,    73,      0, 0.09375 },
     {4381,4382,  0, 1,  40000,   186,      0, 0 },
     {4383,4383,  0, 0,   1573,    86,      0, 0 },
     {4384,4385,  0, 1,  40000,   793,      0, 0 },
@@ -9188,20 +9188,20 @@ const struct adlinsdata adlins[4770] =
     {4397,4398, 38, 1,    340,   133,      0, 0 },
     {4399,4400, 37, 1,    206,    93,      0, 0 },
     {4401,4402, 15, 1,    346,   153,     10, 0 },
-    {4403,4404,100, 1,    146,    80,      0, -1.875 },
+    {4403,4404,100, 1,    146,    80,      0, 0.125 },
     {4405,4406, 19, 1,    553,   200,     10, 0 },
     {4407,4408, 15, 1,    333,   153,     20, 0 },
     {4409,4410, 12, 1,    340,   146,     20, 0 },
     {4411,4412, 11, 1,    346,   146,     20, 0 },
-    {4413,4414, 61, 1,   2706,  1033,      0, -1.90625 },
+    {4413,4414, 61, 1,   2706,  1033,      0, 0.09375 },
     {4415,4412,  8, 1,    340,   146,     20, 0 },
-    {4416,4417, 91, 1,   1166,   366,      0, 1.9375 },
+    {4416,4417, 91, 1,   1166,   366,      0, -0.0625 },
     {4418,4418, 70, 0,    966,   346,      0, 0 },
-    {4419,4420, 80, 1,    300,    93,      0, -1.875 },
+    {4419,4420, 80, 1,    300,    93,      0, 0.125 },
     {4421,4421, 58, 0,    206,    53,      0, 0 },
-    {4422,4414, 62, 1,   2333,   820,      0, -1.90625 },
+    {4422,4414, 62, 1,   2333,   820,      0, 0.09375 },
     {4423,4424, 31, 1,    773,   200,      0, 0 },
-    {4425,4417, 91, 1,   1160,   360,      0, 1.96875 },
+    {4425,4417, 91, 1,   1160,   360,      0, -0.03125 },
     {4426,4427, 41, 1,    373,   113,      0, 0 },
     {4428,4429, 35, 1,    406,   126,      0, 0 },
     {4430,4431, 29, 1,    146,   106,      0, 0 },
@@ -9214,7 +9214,7 @@ const struct adlinsdata adlins[4770] =
     {4440,4440, 36, 0,    620,    20,      0, 0 },
     {4441,4441, 90, 0,    193,    20,      0, 0 },
     {4442,4442, 90, 0,    793,    40,      0, 0 },
-    {4443,4444, 80, 1,    406,   153,      0, -1.96875 },
+    {4443,4444, 80, 1,    406,   153,      0, 0.03125 },
     {4445,4446, 64, 1,   1866,   606,      0, 0 },
     {4447,4448, 50, 1,    173,   126,      0, 0 },
     {4449,4449, 36, 0,   4646,  1606,      0, 0 },
@@ -9256,8 +9256,8 @@ const struct adlinsdata adlins[4770] =
     {4481,4481,  0, 0,   2360,   146,      0, 0 },
     {4482,4482,  0, 0,   4640,   633,      0, 0 },
     {4483,4483,  0, 0,   4566,  1253,      0, 0 },
-    {4484,4484,  0, 0,  18440,  6140,      0, 0 },
-    {4485,4485,  0, 0,   1206,   433,      0, 0 },
+    {4484,4484,  0, 0,  18440,  6140,      0, -2 },
+    {4485,4485,  0, 0,   1206,   433,      0, -2 },
     {4486,4486,  0, 0,   4626,   240,      0, 0 },
     {4487,4487,  0, 0,    726,   400,      0, 0 },
     {4488,4488,  0, 0,   5866,    73,      0, 0 },
@@ -9271,31 +9271,33 @@ const struct adlinsdata adlins[4770] =
     {4496,4496,  0, 0,   7660,   180,      0, 0 },
     {4497,4497,  0, 0,   6500,   346,      0, 0 },
     {4498,4498,  0, 0,   6506,   346,      0, 0 },
-    {4499,4499,  0, 0,  40000,    66,      0, 0 },
-    {4500,4500,  0, 0,  40000,    66,      0, 0 },
+    {4499,4499,  0, 0,  40000,    66,      0, -2 },
+    {4500,4500,  0, 0,  40000,    66,      0, -2 },
     {4501,4501,  0, 0,  40000,     0,      0, 0 },
     {4502,4502,  0, 0,  40000,    46,      0, 0 },
     {4503,4503,  0, 0,  40000,     0,      0, 0 },
+    {4503,4503,  0, 0,  40000,     0,      0, -2 },
     {4504,4504,  0, 0,   2386,    26,      0, 0 },
-    {4505,4505,  0, 0,  40000,    73,      0, 0 },
-    {4506,4506,  0, 0,   5866,    26,      0, 0 },
+    {4505,4505,  0, 0,  40000,    73,      0, -2 },
+    {4506,4506,  0, 0,   5866,    26,      0, -2 },
     {4507,4507,  0, 0,  40000,   133,      0, 0 },
     {4508,4508,  0, 0,  40000,   133,      0, 0 },
     {4509,4509,  0, 0,  40000,   126,      0, 0 },
     {4510,4510,  0, 0,    253,    20,      0, 0 },
     {4511,4511,  0, 0,   8866,  1366,      0, 0 },
     {4512,4512,  0, 0,   1046,   766,      0, 0 },
-    {4513,4513,  0, 0,  40000,   146,      0, 0 },
-    {4514,4514,  0, 0,  40000,   153,      0, 0 },
-    {4515,4515,  0, 0,  40000,   466,      0, 0 },
+    {4513,4513,  0, 0,  40000,   146,      0, -2 },
+    {4514,4514,  0, 0,  40000,   153,      0, -2 },
+    {4515,4515,  0, 0,  40000,   466,      0, -2 },
     {4516,4516,  0, 0,  40000,    66,      0, 0 },
     {4517,4517,  0, 0,   2333,   566,      0, 0 },
-    {4518,4518,  0, 0,  40000,   140,      0, 0 },
+    {4518,4518,  0, 0,  40000,   140,      0, -2 },
     {4519,4519,  0, 0,  40000,   220,      0, 0 },
-    {4520,4520,  0, 0,  40000,   226,      0, 0 },
+    {4520,4520,  0, 0,  40000,   226,      0, -2 },
     {4521,4521,  0, 0,  40000,     0,      0, 0 },
+    {3712,3712,  0, 0,  40000,   226,      0, -2 },
     {4522,4522,  0, 0,  40000,     0,      0, 0 },
-    {4523,4523,  0, 0,  40000,   140,      0, 0 },
+    {4523,4523,  0, 0,  40000,   140,      0, -2 },
     {4524,4524,  0, 0,  40000,    73,      0, 0 },
     {4525,4525,  0, 0,  40000,    73,      0, 0 },
     {4526,4526,  0, 0,  40000,    73,      0, 0 },
@@ -9303,11 +9305,11 @@ const struct adlinsdata adlins[4770] =
     {4528,4528,  0, 0,  40000,    66,      0, 0 },
     {4529,4529,  0, 0,  40000,    73,      0, 0 },
     {4530,4530,  0, 0,  40000,    73,      0, 0 },
-    {4531,4531,  0, 0,  40000,    86,      0, 0 },
+    {4531,4531,  0, 0,  40000,    86,      0, -2 },
     {4532,4532,  0, 0,  40000,    80,      0, 0 },
-    {4533,4533,  0, 0,  40000,    73,      0, 0 },
-    {4534,4534,  0, 0,  40000,    80,      0, 0 },
-    {4535,4535,  0, 0,  40000,    73,      0, 0 },
+    {4533,4533,  0, 0,  40000,    73,      0, -2 },
+    {4534,4534,  0, 0,  40000,    80,      0, -2 },
+    {4535,4535,  0, 0,  40000,    73,      0, -2 },
     {4536,4536,  0, 0,    520,   120,      0, 0 },
     {4537,4537,  0, 0,  40000,   433,      0, 0 },
     {4538,4538,  0, 0,  40000,    73,      0, 0 },
@@ -9316,6 +9318,7 @@ const struct adlinsdata adlins[4770] =
     {4541,4541,  0, 0,  40000,    73,      0, 0 },
     {4542,4542,  0, 0,  11946,    13,      0, 0 },
     {4543,4543,  0, 0,  40000,    73,      0, 0 },
+    {4506,4506,  0, 0,   5866,    26,      0, 0 },
     {4544,4544,  0, 0,  40000,   426,      0, 0 },
     {4545,4545,  0, 0,  40000,  1026,      0, 0 },
     {4546,4546,  0, 0,  40000,   313,      0, 0 },
@@ -9337,24 +9340,24 @@ const struct adlinsdata adlins[4770] =
     {4562,4562,  0, 0,  40000,    66,      0, 0 },
     {4563,4563,  0, 0,  40000,   813,      0, 0 },
     {4564,4564,  0, 0,   2420,   413,      0, 0 },
-    {4565,4565,  0, 0,    406,    73,      0, 0 },
+    {4565,4565,  0, 0,    406,    73,      0, -2 },
     {4566,4566,  0, 0,   1166,   400,      0, 0 },
     {4567,4567,  0, 0,   1213,   106,      0, 0 },
-    {4568,4568,  0, 0,    273,    60,      0, 0 },
+    {4568,4568,  0, 0,    273,    60,      0, -2 },
     {4569,4569,  0, 0,  40000,   433,      0, 0 },
     {4570,4570,  0, 0,   5180,   240,      0, 0 },
     {4571,4571,  0, 0,    273,    60,      0, 0 },
     {4572,4572,  0, 0,  40000,  2380,      0, 0 },
     {4573,4573,  0, 0,   3793,   233,      0, 0 },
     {4574,4574,  0, 0,    626,   240,      0, 0 },
-    {4575,4575, 37, 0,    973,    73,      0, 0 },
-    {4576,4576, 48, 0,    106,    26,      0, 0 },
-    {4577,4577, 48, 0,    286,   133,      0, 0 },
+    {4575,4575, 37, 0,    973,    73,      0, -2 },
+    {4576,4576, 48, 0,    106,    26,      0, -2 },
+    {4577,4577, 48, 0,    286,   133,      0, -2 },
     {4578,4578, 62, 0,    166,    60,      0, 0 },
     {4579,4579, 44, 0,    980,   360,      0, 0 },
     {4580,4580, 80, 0,    100,    33,      0, 0 },
     {4579,4579, 50, 0,    980,   346,      0, 0 },
-    {4581,4581, 48, 0,    106,    46,      0, 0 },
+    {4581,4581, 48, 0,    106,    46,      0, -2 },
     {4579,4579, 55, 0,    973,   360,      0, 0 },
     {4582,4582, 61, 0,    513,    20,      0, 0 },
     {4579,4579, 58, 0,    966,   353,      0, 0 },
@@ -9369,21 +9372,21 @@ const struct adlinsdata adlins[4770] =
     {4587,4587, 72, 0,    153,    53,      0, 0 },
     {4588,4588, 28, 0,   1193,   413,      0, 0 },
     {4584,4584, 81, 0,   1353,   480,      0, 0 },
-    {4589,4589, 58, 0,    246,   120,      0, 0 },
-    {4589,4589, 55, 0,    246,   120,      0, 0 },
-    {4589,4589, 44, 0,    246,   120,      0, 0 },
-    {4589,4589, 49, 0,    246,   120,      0, 0 },
-    {4589,4589, 40, 0,    286,   133,      0, 0 },
-    {4590,4590, 55, 0,    740,   560,      0, 0 },
-    {4590,4590, 48, 0,    893,   693,      0, 0 },
+    {4589,4589, 58, 0,    246,   120,      0, -2 },
+    {4589,4589, 55, 0,    246,   120,      0, -2 },
+    {4589,4589, 44, 0,    246,   120,      0, -2 },
+    {4589,4589, 49, 0,    246,   120,      0, -2 },
+    {4589,4589, 40, 0,    286,   133,      0, -2 },
+    {4590,4590, 55, 0,    740,   560,      0, -2 },
+    {4590,4590, 48, 0,    893,   693,      0, -2 },
     {4591,4591, 52, 0,    513,   206,      0, 0 },
     {4591,4591, 45, 0,    513,   206,      0, 0 },
-    {4592,4592, 48, 0,    173,   100,      0, 0 },
-    {4593,4593, 48, 0,    120,   266,      0, 0 },
-    {4594,4594, 48, 0,    253,    60,      0, 0 },
-    {4565,4565, 73, 0,    160,    20,      0, 0 },
-    {4565,4565, 68, 0,    160,    20,      0, 0 },
-    {4565,4565, 63, 0,    193,    20,      0, 0 },
+    {4592,4592, 48, 0,    173,   100,      0, -2 },
+    {4593,4593, 48, 0,    120,   266,      0, -2 },
+    {4594,4594, 48, 0,    253,    60,      0, -2 },
+    {4565,4565, 73, 0,    160,    20,      0, -2 },
+    {4565,4565, 68, 0,    160,    20,      0, -2 },
+    {4565,4565, 63, 0,    193,    20,      0, -2 },
     {4595,4595,108, 0,    406,    26,      0, 0 },
     {4596,4596,108, 0,    740,    26,      0, 0 },
 };
@@ -10812,18 +10815,18 @@ const unsigned short banks[75][256] =
     {
 4632,4633,4634,4635,4636,4637,4638,3395,4639,4640,4641,4642,4643,3297,4640,4644,
 3300,4645,4646,3300,4647,4648,4649,4650,4651,4652, 870,4653,4654,4655,4656,4657,
-4658,4659,4659,4659,4660,4658,4661,4662,3844,4663,4664,4664,4665,4666,4667,4668,
-4669,4670,4671,4671,4672,4152,3324,4673,4674,4675,4676,4677,3861,4674,4678,4679,
-4680,4681,4682,4683,4684,4685,4686,4687,4688,4689,4690,4691,4692, 666,4693,4694,
-4695,4696,4697,4647,4698,4674,4699,4662,4700,4701,4702,4703,4704,3409,4705,4706,
-4707,4708,4709,4710,4711,4712,4713,4714,1919,4715,3490,4716,3297,4717,3844,4718,
-4719,1334,4720,4721,4722,4723, 792,4724,1341,4725,4726,4727,4728,4726,4729,4730,
- 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
- 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
- 295, 295, 295,4731,4731,4732,4733,4732,4734,4735,4736,4737,4738,4739,4740,4741,
-4742,4743,4744,4745,4746,4747,4748,4749,4750,4743,4751,4752,4753,4754,4755,4756,
-4757,4758,4759,4760,4761,4762,4763,4760,4761,4762,4764,4765,4766,4767,1375, 295,
-4768,4769, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+4658,4659,4660,4660,4661,4658,4662,4663,3844,4664,4665,4665,4666,4667,4668,4669,
+4670,4671,4672,4672,4673,4152,3324,4674,4675,4676,4677,4678,4679,4675,4680,4681,
+4682,4683,4684,4685,4686,4687,4688,4689,4690,4691,4692,4693,4694, 666,4695,4696,
+4697,4698,4699,4647,4700,4675,4701,4702,4703,4704,4705,4706,4707,3409,4708,4709,
+4710,4711,4712,4713,4714,4715,4716,4717,1919,4718,3490,4719,3297,4720,3844,4721,
+4722,1334,4723,4724,4725,4726, 792,4727,1341,4728,4729,4730,4731,4729,4732,4733,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,4734,4734,4735,4736,4735,4737,4738,4739,4740,4741,4742,4743,4744,
+4745,4746,4747,4748,4749,4750,4751,4752,4753,4746,4754,4755,4756,4757,4758,4759,
+4760,4761,4762,4763,4764,4765,4766,4763,4764,4765,4767,4768,4769,4770,1375, 295,
+4771,4772, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
  295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
  295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
     },