aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/adldata.cpp1938
-rw-r--r--src/adldata.hh1
-rw-r--r--src/adlmidi.cpp16
-rw-r--r--src/adlmidi_load.cpp1
-rw-r--r--src/adlmidi_midiplay.cpp53
-rw-r--r--src/adlmidi_opl3.cpp43
-rw-r--r--src/adlmidi_private.cpp13
7 files changed, 1103 insertions, 962 deletions
diff --git a/src/adldata.cpp b/src/adldata.cpp
index 5585089..8b63b8b 100644
--- a/src/adldata.cpp
+++ b/src/adldata.cpp
@@ -4,7 +4,7 @@
* FROM A NUMBER OF SOURCES, MOSTLY PC GAMES.
* PREPROCESSED, CONVERTED, AND POSTPROCESSED OFF-SCREEN.
*/
-const adldata adl[4528] =
+const adldata adl[4578] =
{ // ,---------+-------- Wave select settings
// | ,-------ч-+------ Sustain/release rates
// | | ,-----ч-ч-+---- Attack/decay rates
@@ -3850,114 +3850,164 @@ const adldata adl[4528] =
{ 0x117F7CE,0x04CF9C0, 0x21,0x00, 0xF, +12 },
{ 0x075FC01,0x037F800, 0x21,0x00, 0x1, +12 },
{ 0x25E980C,0x306FB0F, 0x80,0x80, 0xF, +12 },
- { 0x0F5F201,0x0F6F201, 0x8F,0x06, 0x8, +0 },
- { 0x0F5F201,0x0F6F201, 0x4B,0x00, 0x8, +0 },
+ { 0x0F5F201,0x0F5F201, 0x8F,0x06, 0x8, +0 },
+ { 0x0F5F201,0x0F5F201, 0x4B,0x00, 0x8, +0 },
{ 0x0F5F201,0x0F5F201, 0x49,0x00, 0x8, +0 },
- { 0x0F6F2C1,0x0F6F241, 0x12,0x00, 0x6, +0 },
- { 0x0F8F181,0x0F7F201, 0x57,0x00, 0x0, +0 },
- { 0x0F7F101,0x0F6F201, 0x93,0x00, 0x0, +0 },
+ { 0x0F7F2C1,0x0F6F241, 0x12,0x00, 0x6, +0 },
+ { 0x0F9F181,0x0F7F201, 0x57,0x00, 0x0, +0 },
+ { 0x0F8F101,0x0F6F201, 0x93,0x00, 0x0, +0 },
+ { 0x0F3A101,0x0F5F216, 0x80,0x0E, 0x8, +0 },
{ 0x0F5F60C,0x0F5F381, 0x5C,0x00, 0x0, +0 },
{ 0x0F5F3D8,0x0F5F281, 0x62,0x00, 0x0, +0 },
- { 0x014F6B1,0x004F1F1, 0x92,0x00, 0x2, +0 },
- { 0x05FC772,0x004C730, 0x14,0x00, 0x2, +0 },
- { 0x016AA70,0x0048AB1, 0x44,0x00, 0x4, +0 },
+ { 0x0F6F618,0x0F7E701, 0x23,0x00, 0x30, +0 },
+ { 0x0F6F615,0x0F6F601, 0x91,0x00, 0x34, +0 },
+ { 0x01BF6F1,0x006F171, 0x92,0x00, 0x2, +0 },
+ { 0x05FC772,0x006C730, 0x14,0x00, 0x2, +0 },
+ { 0x01BAA70,0x0058AB1, 0x44,0x00, 0x4, +0 },
{ 0x1259723,0x01355B1, 0x93,0x00, 0x4, +0 },
- { 0x1299824,0x01646B1, 0x48,0x00, 0xC, +0 },
- { 0x1069121,0x0066161, 0x13,0x00, 0xA, +0 },
- { 0x0067121,0x00661E1, 0x13,0x89, 0x6, +0 },
- { 0x197F302,0x0C6F341, 0x9C,0x80, 0xC, +0 },
- { 0x198F303,0x0E5F111, 0x54,0x00, 0xC, +0 },
- { 0x03EF123,0x0F7F221, 0x5F,0x00, 0x0, +0 },
+ { 0x12998A4,0x01646B1, 0x48,0x00, 0xC, +0 },
+ { 0x10691A1,0x0066161, 0x13,0x00, 0xA, +0 },
+ { 0x0077121,0x00661E1, 0x13,0x89, 0x6, +0 },
+ { 0x19BF302,0x0C9F341, 0x9C,0x80, 0xC, +0 },
+ { 0x19EF303,0x0E6F151, 0x54,0x00, 0xC, +0 },
+ { 0x03EF123,0x0F8F221, 0x5F,0x00, 0x0, +0 },
{ 0x127F623,0x0F7F321, 0x87,0x80, 0x6, +0 },
{ 0x054F903,0x03FF621, 0x47,0x00, 0x0, +0 },
- { 0x1479163,0x0178421, 0x4A,0x05, 0x8, +0 },
+ { 0x1479163,0x01A8421, 0x4A,0x05, 0x8, +0 },
{ 0x1189563,0x0179461, 0x4A,0x00, 0x8, +0 },
{ 0x0482029,0x0F7D1A4, 0xA1,0x80, 0x8, +0 },
- { 0x077F131,0x005F771, 0x13,0x00, 0xA, +0 },
- { 0x0E7F171,0x075F171, 0x8D,0x00, 0xA, +0 },
- { 0x0276131,0x0157172, 0x5B,0x00, 0xC, +0 },
- { 0x096A101,0x0D6F261, 0x8B,0x40, 0x8, +0 },
- { 0x016A261,0x0D6A121, 0x8A,0x08, 0x8, +0 },
+ { 0x00694A1,0x0A6C3A2, 0x1E,0x00, 0x2, +0 },
+ { 0x078F171,0x006F771, 0x13,0x00, 0xA, +0 },
+ { 0x0E8F171,0x076F171, 0x8E,0x00, 0xA, +0 },
+ { 0x02F6131,0x01B7132, 0x5B,0x00, 0xC, +0 },
+ { 0x097A101,0x0D7F221, 0x8B,0x40, 0x8, +0 },
+ { 0x017A261,0x0D7A121, 0x8A,0x08, 0x8, +0 },
{ 0x0E5F431,0x075F131, 0x8B,0x00, 0xA, +0 },
- { 0x057F271,0x007E122, 0x0F,0x00, 0x6, +0 },
- { 0x114DD31,0x0265621, 0x15,0x00, 0x8, +0 },
- { 0x113DD31,0x00666E1, 0x16,0x00, 0x8, +0 },
+ { 0x05AF2E1,0x007F121, 0x0E,0x00, 0x6, +0 },
+ { 0x114DD31,0x02556A1, 0x15,0x00, 0x8, +0 },
+ { 0x113DDB1,0x00666E1, 0x16,0x00, 0x8, +0 },
{ 0x116D171,0x0066131, 0x49,0x00, 0x8, +0 },
{ 0x11471A1,0x0057263, 0x4D,0x80, 0x2, +0 },
{ 0x124F1F1,0x0156FE1, 0x40,0x00, 0x2, +0 },
{ 0x176F502,0x0358501, 0x1A,0x80, 0x0, +0 },
{ 0x175F422,0x0F3F301, 0x1D,0x80, 0x0, +0 },
- { 0x126B121,0x00572A2, 0x9B,0x01, 0xE, +0 },
- { 0x1037FA1,0x1053F21, 0x98,0x00, 0x0, +0 },
+ { 0x105F510,0x0C3F211, 0x41,0x00, 0x32, +0 },
+ { 0x126B1E1,0x0087262, 0x9B,0x01, 0xE, +0 },
+ { 0x1057FA1,0x0043F22, 0x98,0x07, 0x0, +0 },
{ 0x03441A1,0x0035161, 0x93,0x00, 0xA, +0 },
{ 0x025C121,0x0054F61, 0x18,0x00, 0xC, +0 },
{ 0x013F431,0x0038A72, 0x5B,0x83, 0x0, +0 },
{ 0x03974A1,0x0667161, 0x90,0x00, 0x0, +0 },
{ 0x08662E1,0x0057A72, 0x57,0x00, 0xC, +0 },
- { 0x0188561,0x0088F61, 0x92,0x01, 0xC, +0 },
+ { 0x0198521,0x00F8F21, 0x92,0x01, 0xC, +0 },
{ 0x01775A1,0x0078F21, 0x94,0x05, 0xC, +0 },
{ 0x0157621,0x0368261, 0x94,0x00, 0xC, +0 },
- { 0x1189E31,0x1286221, 0x43,0x00, 0x2, +0 },
+ { 0x1179E31,0x1276261, 0x43,0x00, 0x2, +0 },
{ 0x0676121,0x0067F21, 0x9B,0x00, 0x2, +0 },
- { 0x0187561,0x00874A2, 0x8A,0x06, 0x8, +0 },
+ { 0x0177561,0x00774A2, 0x8A,0x06, 0x8, +0 },
{ 0x15772A1,0x0177161, 0x86,0x83, 0x0, +0 },
- { 0x0375421,0x016A621, 0x4D,0x00, 0x8, +0 },
+ { 0x03F5461,0x018A661, 0x4D,0x00, 0x8, +0 },
{ 0x1079331,0x0077261, 0x8F,0x00, 0x8, +0 },
{ 0x1079331,0x0077261, 0x8E,0x00, 0x8, +0 },
{ 0x1079331,0x0078261, 0x91,0x00, 0xA, +0 },
- { 0x118AA61,0x0088F21, 0x4B,0x00, 0x8, +0 },
- { 0x1167E31,0x1078B21, 0x90,0x00, 0x6, +0 },
- { 0x0289B32,0x0187221, 0x90,0x00, 0x4, +0 },
+ { 0x117AA61,0x0078F21, 0x4B,0x00, 0x8, +0 },
+ { 0x1167E31,0x1098B21, 0x90,0x00, 0x6, +0 },
+ { 0x02A9B32,0x0187221, 0x90,0x00, 0x4, +0 },
{ 0x05C85E1,0x01765E1, 0x1F,0x00, 0x0, +0 },
{ 0x05C88E1,0x01765E1, 0x46,0x00, 0x0, +0 },
{ 0x01F75A1,0x0077521, 0x9C,0x00, 0x2, +0 },
- { 0x2FCF122,0x006FF61, 0x51,0x00, 0x0, +0 },
- { 0x1FCF121,0x207FF21, 0x0E,0x00, 0x0, +0 },
- { 0x0588622,0x01664E1, 0x46,0x80, 0x0, +0 },
+ { 0x2FFF122,0x007FF21, 0x51,0x00, 0x0, +0 },
+ { 0x1FCF121,0x208FF21, 0x0E,0x00, 0x0, +0 },
+ { 0x05A8622,0x01964E1, 0x46,0x80, 0x0, +0 },
{ 0x17A9221,0x02A9122, 0x8B,0x00, 0x0, +0 },
{ 0x005DFA2,0x0056F61, 0x9E,0x40, 0x2, +0 },
- { 0x0A8F121,0x007F461, 0x8F,0x80, 0xA, +0 },
- { 0x0935337,0x005A0E1, 0xA5,0x00, 0x2, +0 },
+ { 0x0AFF121,0x009F461, 0x8F,0x80, 0xA, +0 },
+ { 0x0945337,0x005A0E1, 0xA5,0x00, 0x2, +0 },
{ 0x0759121,0x0155561, 0x17,0x00, 0xC, +0 },
- { 0x0025471,0x0036A72, 0x5D,0x00, 0x0, +0 },
+ { 0x0035471,0x0036A72, 0x5D,0x00, 0x0, +0 },
{ 0x0432161,0x03542A2, 0x97,0x00, 0x8, +0 },
{ 0x173A161,0x1433161, 0x1C,0x00, 0x0, +0 },
- { 0x0341121,0x0244261, 0x89,0x03, 0xA, +0 },
{ 0x14711A1,0x007CF61, 0x15,0x00, 0x0, +0 },
{ 0x085B122,0x025F261, 0x92,0x83, 0xC, +0 },
- { 0x155F101,0x0F4F242, 0x4D,0x00, 0x0, +0 },
- { 0x1511161,0x01321A3, 0x94,0x80, 0x6, +0 },
- { 0x0311161,0x0035DA1, 0x8C,0x80, 0x6, +0 },
- { 0x1F1A131,0x0F4A233, 0x0C,0x80, 0x0, +0 },
+ { 0x153F141,0x0F5F202, 0x4D,0x00, 0x0, +0 },
+ { 0x173C3A4,0x02381E1, 0x4C,0x00, 0x4, +0 },
+ { 0x1F3A131,0x0F4A233, 0x0C,0x80, 0x0, +0 },
{ 0x0277C21,0x1076F22, 0x49,0x00, 0x6, +0 },
- { 0x134DD31,0x0165621, 0x85,0x00, 0xA, +0 },
+ { 0x134DD31,0x0165661, 0x85,0x00, 0xA, +0 },
{ 0x207DA20,0x0078F21, 0x04,0x81, 0x6, +0 },
{ 0x0E5F105,0x0E3C303, 0x6A,0x80, 0x6, +0 },
{ 0x0A337D5,0x03756FA, 0x95,0x40, 0x0, +0 },
{ 0x261B2B5,0x0A5F4B4, 0x5C,0x08, 0xA, +0 },
{ 0x001F6EE,0x3A54FF0, 0x00,0x00, 0xE, +0 },
{ 0x0F0F300,0x2C6F600, 0x00,0x00, 0xE, +0 },
+ { 0x277F810,0x006FC11, 0x86,0x00, 0x8, +0 },
+ { 0x2E5F60F,0x217FA0F, 0x00,0x00, 0xE, +0 },
+ { 0x037EC12,0x2D68800, 0x18,0x0F, 0xA, +0 },
+ { 0x0FAAA06,0x217F800, 0x00,0x00, 0xE, +0 },
+ { 0x0F6F600,0x097F700, 0x00,0x03, 0x0, +0 },
+ { 0x077ED43,0x205FD02, 0x06,0x03, 0x8, +0 },
+ { 0x0F6F600,0x0C7F700, 0x00,0x03, 0x0, +0 },
+ { 0x087AD43,0x205FD02, 0x07,0x03, 0x8, +0 },
+ { 0x0F6F600,0x0C6F600, 0x00,0x03, 0x0, +0 },
+ { 0x164DD43,0x205FD02, 0x0E,0x03, 0x8, +0 },
+ { 0x0F6F500,0x0C5F500, 0x00,0x03, 0x0, +0 },
+ { 0x314EE9F,0x2F4F4A0, 0x00,0xCD, 0xE, +0 },
+ { 0x064DD03,0x205FD02, 0x1D,0x03, 0x8, +0 },
+ { 0x314FE9F,0x2F4F4A0, 0x00,0xCD, 0xE, +0 },
+ { 0x320F413,0x244F800, 0x8B,0x47, 0xE, +0 },
+ { 0x5777602,0x2679801, 0x80,0x08, 0xE, +0 },
+ { 0x314FE9F,0x2F4F4A0, 0xC0,0xCD, 0xE, +0 },
+ { 0x159FE01,0x085F510, 0x41,0x89, 0xE, +0 },
+ { 0x60070E0,0x6F4A4E3, 0xC0,0xA0, 0xE, +0 },
+ { 0x0F77720,0x2F87811, 0x11,0x13, 0xD, +0 },
+ { 0x2F97869,0x0F9D721, 0xC0,0x00, 0xE, +0 },
+ { 0x2F76769,0x0F9D721, 0xC0,0x00, 0xE, +0 },
+ { 0x060F285,0x0B2F294, 0x51,0x80, 0xA, +0 },
{ 0x060F213,0x072F201, 0x4F,0x10, 0x8, +0 },
{ 0x0FFF001,0x00F9031, 0x4F,0x04, 0x6, +0 },
- { 0x021FF13,0x0F6F311, 0x96,0x80, 0xA, +0 },
- { 0x001FF11,0x0F5F311, 0x8D,0x80, 0x0, +0 },
- { 0x171F503,0x0F6F211, 0x5E,0x00, 0xE, +0 },
- { 0x031F121,0x0F8F406, 0x40,0x85, 0x0, +0 },
{ 0x09F8331,0x078F422, 0x10,0x04, 0xA, +0 },
- { 0x024D501,0x0258531, 0x0F,0x00, 0xA, +0 },
{ 0x0A7F131,0x0C6F731, 0x5A,0x80, 0xE, +0 },
{ 0x08B7261,0x01950E1, 0xA7,0x81, 0x2, +0 },
{ 0x0089782,0x00897F1, 0x0D,0x00, 0x0, +0 },
{ 0x0E1A311,0x0E4A103, 0x80,0x80, 0x6, +0 },
- { 0x003FF41,0x0F4F123, 0x23,0x00, 0x8, +0 },
+ { 0x003FF40,0x001FF08, 0x0D,0x00, 0x8, +0 },
{ 0x007FF01,0x007FF01, 0x00,0x00, 0x7, +0 },
{ 0x096D801,0x096D801, 0x00,0x00, 0xA, +0 },
- { 0x277C005,0x0EDB900, 0x00,0x00, 0xC, +0 },
- { 0x204FD36,0x0F8F809, 0x00,0x00, 0xC, +0 },
- { 0x0530900,0x094F700, 0x40,0x00, 0x0, +0 },
- { 0x077F005,0x0EBFA00, 0x00,0x00, 0xE, +0 },
- { 0x077F005,0x0E58A00, 0x00,0x00, 0xE, +0 },
- { 0x073F005,0x0A3FA00, 0x00,0x00, 0xE, +0 },
+ { 0x0C8AA00,0x0B7D200, 0x0B,0x00, 0x0, +0 },
+ { 0x3F0F026,0x3B7FA00, 0x00,0x00, 0xE, +0 },
+ { 0x2F5F710,0x2F5F710, 0x07,0x07, 0x2, +0 },
+ { 0x2F488F2,0x2F488F2, 0x0A,0x0A, 0x2, +0 },
+ { 0x2F6A6D0,0x2F6A6D0, 0x81,0x81, 0x1, +0 },
+ { 0x1B5B801,0x1B5B801, 0x03,0x03, 0xD, +0 },
+ { 0x1A58801,0x1A58801, 0x08,0x08, 0x3, +0 },
+ { 0x1A58601,0x1A58601, 0x09,0x09, 0x3, +0 },
+ { 0x0F6C504,0x0F6C504, 0x0C,0x0C, 0x5, +0 },
+ { 0x1D5F601,0x1D5F601, 0x82,0x82, 0x3, +0 },
+ { 0x078950A,0x078950A, 0xC7,0xC7, 0xC, +0 },
+ { 0x115B50E,0x115B50E, 0x07,0x07, 0xB, +0 },
+ { 0x1737701,0x1737701, 0x07,0x07, 0xB, +0 },
+ { 0x078950E,0x078950E, 0xC7,0xC7, 0x2, +0 },
+ { 0x0679610,0x0679610, 0x00,0x00, 0xA, +0 },
+ { 0x0B5F901,0x0B5F901, 0x07,0x07, 0xB, +0 },
+ { 0x165E7D1,0x165E7D1, 0x05,0x05, 0xD, +0 },
+ { 0x094E701,0x094E701, 0x00,0x00, 0x3, +0 },
+ { 0x094E701,0x094E701, 0x00,0x00, 0xB, +0 },
+ { 0x0679601,0x0679601, 0x00,0x00, 0xA, +0 },
+ { 0x026B401,0x026B401, 0x00,0x00, 0xA, +0 },
+ { 0x0679611,0x0679611, 0x00,0x00, 0xA, +0 },
+ { 0x2DC5800,0x2DC5800, 0x0E,0x0E, 0xA, +0 },
+ { 0x2D65A00,0x2D65A00, 0x0E,0x0E, 0xA, +0 },
+ { 0x3044952,0x3044952, 0x07,0x07, 0xB, +0 },
+ { 0x3024152,0x3024152, 0x07,0x07, 0xB, +0 },
+ { 0x1D65A00,0x1D65A00, 0x0E,0x0E, 0xA, +0 },
+ { 0x19F5310,0x19F5310, 0x0E,0x0E, 0xA, +0 },
+ { 0x075F511,0x075F511, 0x00,0x00, 0x2, +0 },
+ { 0x1B6F804,0x1B6F804, 0x00,0x00, 0x3, +0 },
+ { 0x1B7F804,0x1B7F804, 0x00,0x00, 0x3, +0 },
+ { 0x1DC5E01,0x1DC5E01, 0x0B,0x0B, 0xA, +0 },
+ { 0x1DC5C00,0x1DC5C00, 0x07,0x07, 0xA, +0 },
+ { 0x060F2C5,0x07AF4D5, 0x4F,0x10, 0x8, +0 },
+ { 0x060F2C5,0x072F2D5, 0x4F,0x10, 0x8, +0 },
{ 0x042F80E,0x3E4F407, 0x08,0x51, 0xE, +0 },
{ 0x37CFD23,0x0F58401, 0x15,0x08, 0x0, +0 },
{ 0x035F203,0x4F5F401, 0x5D,0x08, 0x1, +0 },
@@ -4545,7 +4595,7 @@ const adldata adl[4528] =
{ 0x07BF003,0x07BF502, 0x8A,0x80, 0x8, +0 },
{ 0x07BF003,0x07BF402, 0x8A,0x80, 0x8, +0 },
};
-const struct adlinsdata adlins[4678] =
+const struct adlinsdata adlins[4756] =
{
{ 0, 0, 0, 0, 9006, 133, 0, 0 },
{ 1, 1, 0, 0, 9206, 146, 0, 0 },
@@ -7813,27 +7863,29 @@ const struct adlinsdata adlins[4678] =
{3128,3128, 0, 0, 340, 146, 0, 0 },
{3129,3129, 0, 0, 19980, 6280, 0, 0 },
{3130,3130, 0, 0, 353, 73, 0, 0 },
- {3131,3131, 35, 0, 566, 233, 0, 0 },
- {3132,3132, 35, 0, 226, 46, 0, 0 },
- {3133,3133, 35, 0, 40000, 100, 0, 0 },
- {3134,3134, 35, 0, 40000, 100, 0, 0 },
- {3135,3135, 35, 0, 360, 146, 0, 0 },
- {3061,3061, 35, 0, 40000, 0, 0, 0 },
- {3136,3136, 35, 0, 366, 20, 0, 0 },
- { 739, 739, 35, 0, 246, 20, 0, 0 },
- {3137,3137, 35, 0, 333, 33, 0, 0 },
- {3138,3138, 35, 0, 420, 166, 0, 0 },
- {3139,3139, 35, 0, 626, 240, 0, 0 },
- {3140,3140, 35, 0, 233, 100, 0, 0 },
- {3141,3141, 35, 0, 1166, 440, 0, 0 },
- {3142,3142, 35, 0, 166, 66, 0, 0 },
- {3143,3143, 35, 0, 1166, 440, 0, 0 },
- {3144,3144, 35, 0, 813, 100, 0, 0 },
- {3145,3145, 35, 0, 1040, 440, 0, 0 },
- {3146,3146, 35, 0, 40000, 0, 0, 0 },
- {3147,3147, 35, 0, 40000, 0, 0, 0 },
- {3148,3148, 35, 0, 180, 40, 0, 0 },
- {3149,3149, 35, 0, 40000, 0, 0, 0 },
+ {3131,3131, 0, 0, 560, 226, 0, 0 },
+ {3132,3132, 0, 0, 226, 80, 0, 0 },
+ { 342, 342, 0, 0, 40000, 0, 0, 0 },
+ {3133,3133, 0, 0, 40000, 100, 0, 0 },
+ {3134,3134, 0, 0, 40000, 100, 0, 0 },
+ { 344, 344, 0, 0, 313, 113, 0, 0 },
+ { 345, 345, 0, 0, 213, 73, 0, 0 },
+ {3135,3135, 0, 0, 360, 146, 0, 0 },
+ {3136,3136, 0, 0, 366, 66, 0, 0 },
+ { 739, 739, 0, 0, 253, 20, 0, 0 },
+ {3137,3137, 0, 0, 333, 33, 0, 0 },
+ {3138,3138, 0, 0, 580, 193, 0, 0 },
+ {3139,3139, 0, 0, 626, 240, 0, 0 },
+ {3140,3140, 0, 0, 233, 100, 0, 0 },
+ {3141,3141, 0, 0, 1166, 440, 0, 0 },
+ {3142,3142, 0, 0, 166, 73, 0, 0 },
+ {3143,3143, 0, 0, 1166, 440, 0, 0 },
+ {3144,3144, 0, 0, 813, 100, 0, 0 },
+ {3145,3145, 0, 0, 1093, 486, 0, 0 },
+ {3146,3146, 0, 0, 40000, 0, 0, 0 },
+ {3147,3147, 0, 0, 40000, 0, 0, 0 },
+ {3148,3148, 0, 0, 180, 46, 0, 0 },
+ {3149,3149, 0, 0, 40000, 0, 0, 0 },
{3150,3150, 0, 0, 40000, 0, 0, 0 },
{3151,3151, 0, 0, 4900, 240, 0, 0 },
{3152,3152, 0, 0, 3480, 80, 0, 0 },
@@ -8558,120 +8610,196 @@ const struct adlinsdata adlins[4678] =
{3831,3831, 32, 0, 146, 33, 0, 0 },
{3832,3832, 36, 0, 273, 140, 0, 0 },
{3833,3833, 88, 0, 340, 120, 0, 0 },
- {3834,3834, 0, 0, 9006, 240, 0, 0 },
- {3835,3835, 0, 0, 9206, 246, 0, 0 },
+ {3834,3834, 0, 0, 9006, 340, 0, 0 },
+ {3835,3835, 0, 0, 9206, 393, 0, 0 },
{3836,3836, 0, 0, 9246, 386, 0, 0 },
- {3837,3837, 0, 0, 9440, 220, 0, 0 },
- {3838,3838, 0, 0, 8900, 133, 0, 0 },
+ {3837,3837, 0, 0, 9440, 253, 0, 0 },
+ {3838,3838, 0, 0, 8900, 140, 0, 0 },
{3839,3839, 0, 0, 9400, 253, 0, 0 },
- {3840,3840, 0, 0, 4613, 420, 0, 0 },
- {3841,3841, 0, 0, 9233, 426, 0, 0 },
- {3842,3842, 0, 0, 40000, 526, 0, 0 },
- {3843,3843, 0, 0, 40000, 640, 0, 0 },
- {3844,3844, 0, 0, 40000, 666, 0, 0 },
- {3845,3845, 0, 0, 40000, 1053, 0, 0 },
- {3846,3846, 0, 0, 40000, 173, 0, 0 },
- {3847,3847, 0, 0, 40000, 246, 0, 0 },
- {3848,3848, 0, 0, 40000, 226, 0, 0 },
- {3849,3849, 0, 0, 4073, 233, 0, 0 },
- {3850,3850, 0, 0, 14286, 326, 0, 0 },
- {3851,3851, 0, 0, 9233, 146, 0, 0 },
- {3852,3852, 0, 0, 4480, 133, 0, 0 },
- {3853,3853, 0, 0, 40000, 53, 0, 0 },
- {3854,3854, 0, 0, 40000, 126, 0, 0 },
- {3855,3855, 0, 0, 40000, 126, 0, 0 },
- {3856,3856, 0, 0, 18226, 146, 0, 0 },
- {3857,3857, 0, 0, 40000, 326, 0, 0 },
- {3858,3858, 0, 0, 40000, 0, 0, 0 },
- {3859,3859, 0, 0, 40000, 300, 0, 0 },
+ {3840,3840, 0, 0, 7460, 333, 0, 0 },
+ {3841,3841, 0, 0, 4613, 420, 0, 0 },
+ {3842,3842, 0, 0, 9233, 426, 0, 0 },
+ {3843,3843, 0, 0, 346, 153, 0, 0 },
+ {3844,3844, 0, 0, 633, 233, 0, 0 },
+ {3845,3845, 0, 0, 40000, 193, 0, 0 },
+ {3846,3846, 0, 0, 40000, 193, 0, 0 },
+ {3847,3847, 0, 0, 40000, 360, 0, 0 },
+ {3848,3848, 0, 0, 40000, 1053, 0, 0 },
+ {3849,3849, 0, 0, 40000, 173, 0, 0 },
+ {3850,3850, 0, 0, 40000, 246, 0, 0 },
+ {3851,3851, 0, 0, 40000, 253, 0, 0 },
+ {3852,3852, 0, 0, 4020, 66, 0, 0 },
+ {3853,3853, 0, 0, 14286, 186, 0, 0 },
+ {3854,3854, 0, 0, 9233, 106, 0, 0 },
+ {3855,3855, 0, 0, 4480, 133, 0, 0 },
+ {3856,3856, 0, 0, 40000, 53, 0, 0 },
+ {3857,3857, 0, 0, 40000, 73, 0, 0 },
+ {3858,3858, 0, 0, 40000, 126, 0, 0 },
+ {3859,3859, 0, 0, 18226, 146, 0, 0 },
{3860,3860, 0, 0, 40000, 0, 0, 0 },
- {3861,3861, 0, 0, 40000, 0, 0, 0 },
+ {3861,3861, 0, 0, 40000, 186, 0, 0 },
{3862,3862, 0, 0, 40000, 0, 0, 0 },
- {3863,3863, 0, 0, 40000, 140, 0, 0 },
- {3864,3864, 0, 0, 40000, 153, 0, 0 },
- {3865,3865, 0, 0, 40000, 233, 0, 0 },
- {3866,3866, 0, 0, 40000, 186, 0, 0 },
- {3867,3867, 0, 0, 40000, 413, 0, 0 },
- {3868,3868, 0, 0, 40000, 373, 0, 0 },
- {3869,3869, 0, 0, 1246, 440, 0, 0 },
- {3870,3870, 0, 0, 4620, 1513, 0, 0 },
- {3871,3871, 0, 0, 40000, 433, 0, 0 },
- {3872,3872, 0, 0, 40000, 453, 0, 0 },
- {3873,3873, 0, 0, 40000, 1440, 0, 0 },
- {3874,3874, 0, 0, 40000, 480, 0, 0 },
- {3875,3875, 0, 0, 40000, 1360, 0, 0 },
- {3876,3876, 0, 0, 40000, 0, 0, 0 },
- {3877,3877, 0, 0, 40000, 353, 0, 0 },
- {3878,3878, 0, 0, 40000, 86, 0, 0 },
- {3879,3879, 0, 0, 40000, 126, 0, 0 },
- {3880,3880, 0, 0, 40000, 73, 0, 0 },
- {3881,3881, 0, 0, 40000, 80, 0, 0 },
- {3882,3882, 0, 0, 40000, 246, 0, 0 },
- {3883,3883, 0, 0, 40000, 93, 0, 0 },
- {3884,3884, 0, 0, 40000, 120, 0, 0 },
- {3885,3885, 0, 0, 40000, 180, 0, 0 },
- {3886,3886, 0, 0, 40000, 133, 0, 0 },
- {3887,3887, 0, 0, 40000, 133, 0, 0 },
- {3888,3888, 0, 0, 40000, 153, 0, 0 },
- {3889,3889, 0, 0, 40000, 93, 0, 0 },
- {3890,3890, 0, 0, 40000, 140, 0, 0 },
- {3891,3891, 0, 0, 40000, 100, 0, 0 },
- {3892,3892, 0, 0, 40000, 146, 0, 0 },
- {3893,3893, 0, 0, 40000, 126, 0, 0 },
- {3894,3894, 0, 0, 40000, 160, 0, 0 },
- {3895,3895, 0, 0, 40000, 226, 0, 0 },
- {3896,3896, 0, 0, 40000, 140, 0, 0 },
- {3897,3897, 0, 0, 40000, 200, 0, 0 },
- {3898,3898, 0, 0, 40000, 66, 0, 0 },
- {3899,3899, 0, 0, 40000, 446, 0, 0 },
+ {3863,3863, 0, 0, 40000, 66, 0, 0 },
+ {3864,3864, 0, 0, 40000, 0, 0, 0 },
+ {3865,3865, 0, 0, 40000, 0, 0, 0 },
+ {3866,3866, 0, 0, 40000, 0, 0, 0 },
+ {3867,3867, 0, 0, 40000, 140, 0, 0 },
+ {3868,3868, 0, 0, 40000, 253, 0, 0 },
+ {3869,3869, 0, 0, 40000, 233, 0, 0 },
+ {3870,3870, 0, 0, 40000, 186, 0, 0 },
+ {3871,3871, 0, 0, 40000, 413, 0, 0 },
+ {3872,3872, 0, 0, 40000, 373, 0, 0 },
+ {3873,3873, 0, 0, 1246, 440, 0, 0 },
+ {3874,3874, 0, 0, 4620, 1513, 0, 0 },
+ {3875,3875, 0, 0, 6873, 1246, 0, 0 },
+ {3876,3876, 0, 0, 40000, 100, 0, 0 },
+ {3877,3877, 0, 0, 40000, 840, 0, 0 },
+ {3878,3878, 0, 0, 40000, 1440, 0, 0 },
+ {3879,3879, 0, 0, 40000, 480, 0, 0 },
+ {3880,3880, 0, 0, 40000, 1360, 0, 0 },
+ {3881,3881, 0, 0, 40000, 0, 0, 0 },
+ {3882,3882, 0, 0, 40000, 353, 0, 0 },
+ {3883,3883, 0, 0, 40000, 66, 0, 0 },
+ {3884,3884, 0, 0, 40000, 126, 0, 0 },
+ {3885,3885, 0, 0, 40000, 73, 0, 0 },
+ {3886,3886, 0, 0, 40000, 80, 0, 0 },
+ {3887,3887, 0, 0, 40000, 246, 0, 0 },
+ {3888,3888, 0, 0, 40000, 133, 0, 0 },
+ {3889,3889, 0, 0, 40000, 120, 0, 0 },
+ {3890,3890, 0, 0, 40000, 86, 0, 0 },
+ {3891,3891, 0, 0, 40000, 133, 0, 0 },
+ {3892,3892, 0, 0, 40000, 133, 0, 0 },
+ {3893,3893, 0, 0, 40000, 153, 0, 0 },
+ {3894,3894, 0, 0, 40000, 133, 0, 0 },
+ {3895,3895, 0, 0, 40000, 73, 0, 0 },
+ {3896,3896, 0, 0, 40000, 93, 0, 0 },
+ {3897,3897, 0, 0, 40000, 146, 0, 0 },
+ {3898,3898, 0, 0, 40000, 126, 0, 0 },
+ {3899,3899, 0, 0, 40000, 160, 0, 0 },
{3900,3900, 0, 0, 40000, 140, 0, 0 },
- {3901,3901, 0, 0, 40000, 400, 0, 0 },
- {3902,3902, 0, 0, 40000, 373, 0, 0 },
- {3903,3903, 0, 0, 40000, 1306, 0, 0 },
- {3904,3904, 0, 0, 40000, 186, 0, 0 },
- {3905,3905, 0, 0, 40000, 640, 0, 0 },
- {3906,3906, 0, 0, 40000, 346, 0, 0 },
- {3907,3907, 0, 0, 40000, 140, 0, 0 },
- {3908,3908, 0, 0, 40000, 253, 0, 0 },
- {3909,3909, 0, 0, 8980, 746, 0, 0 },
- {3910,3910, 0, 0, 40000, 1266, 0, 0 },
- {3911,3911, 0, 0, 40000, 1306, 0, 0 },
- {3912,3912, 0, 0, 7226, 593, 0, 0 },
- {3913,3913, 0, 0, 40000, 140, 0, 0 },
- {3914,3914, 0, 0, 40000, 220, 0, 0 },
- {3915,3915, 0, 0, 40000, 146, 0, 0 },
- {3916,3916, 0, 0, 4606, 1506, 0, 0 },
- {3917,3917, 0, 0, 40000, 80, 0, 0 },
- {3918,3918, 0, 0, 40000, 0, 0, 0 },
- {3919,3919, 0, 0, 40000, 0, 0, 0 },
- {3920,3920, 0, 0, 613, 226, 0, 0 },
- {3921,3921, 0, 0, 9073, 2946, 0, 0 },
- {3922,3922, 0, 0, 40000, 73, 0, 0 },
- {3923,3923, 0, 0, 3726, 200, 0, 0 },
- {3924,3924, 0, 0, 3680, 373, 0, 0 },
- {3925,3925, 0, 0, 7113, 186, 0, 0 },
- {3926,3926, 0, 0, 2406, 106, 0, 0 },
- {3927,3927, 0, 0, 40000, 0, 0, 0 },
- {3928,3928, 0, 0, 40000, 253, 0, 0 },
- {3929,3929, 0, 0, 40000, 0, 0, 0 },
- {3930,3930, 0, 0, 40000, 80, 0, 0 },
- {3931,3931, 0, 0, 40000, 86, 0, 0 },
- {3932,3932, 0, 0, 18186, 740, 0, 0 },
- {3933,3933, 0, 0, 18426, 813, 0, 0 },
+ {3901,3901, 0, 0, 40000, 100, 0, 0 },
+ {3902,3902, 0, 0, 40000, 80, 0, 0 },
+ {3903,3903, 0, 0, 40000, 66, 0, 0 },
+ {3904,3904, 0, 0, 40000, 446, 0, 0 },
+ {3905,3905, 0, 0, 40000, 80, 0, 0 },
+ {3906,3906, 0, 0, 40000, 400, 0, 0 },
+ {3907,3907, 0, 0, 40000, 373, 0, 0 },
+ {3908,3908, 0, 0, 40000, 1313, 0, 0 },
+ {3909,3909, 0, 0, 40000, 186, 0, 0 },
+ {3910,3910, 0, 0, 40000, 640, 0, 0 },
+ {3911,3911, 0, 0, 40000, 140, 0, 0 },
+ {3912,3912, 0, 0, 40000, 253, 0, 0 },
+ {3913,3913, 0, 0, 8980, 393, 0, 0 },
+ {3914,3914, 0, 0, 40000, 933, 0, 0 },
+ {3915,3915, 0, 0, 7226, 593, 0, 0 },
+ {3916,3916, 0, 0, 40000, 140, 0, 0 },
+ {3917,3917, 0, 0, 40000, 220, 0, 0 },
+ {3918,3918, 0, 0, 40000, 146, 0, 0 },
+ {3919,3919, 0, 0, 4606, 1506, 0, 0 },
+ {3920,3920, 0, 0, 40000, 80, 0, 0 },
+ {3921,3921, 0, 0, 40000, 0, 0, 0 },
+ {3922,3922, 0, 0, 40000, 0, 0, 0 },
+ {3923,3923, 0, 0, 613, 226, 0, 0 },
+ { 352, 352, 44, 2, 6, 0, 0, 0 },
+ {3924,3924, 34, 8, 386, 160, 0, 0 },
+ {3502,3502, 64, 8, 126, 66, 0, 0 },
+ {3925,3925, 19, 16, 300, 146, 0, 0 },
+ {3926,3926, 74, 16, 186, 173, 0, 0 },
+ {3927,3927, 29, 16, 340, 153, 0, 0 },
+ {3928,3928, 46, 24, 280, 126, 0, 0 },
+ {3929,3929, 48, 40, 946, 333, 0, 0 },
+ {3930,3930, 49, 24, 280, 126, 0, 0 },
+ {3931,3931, 48, 40, 946, 333, 0, 0 },
+ {3932,3932, 52, 24, 506, 200, 0, 0 },
+ {3933,3933, 48, 40, 953, 346, 0, 0 },
+ {3932,3932, 54, 24, 513, 200, 0, 0 },
+ {3934,3934, 57, 24, 973, 306, 0, 0 },
+ {3935,3935, 13, 40, 2186, 640, 0, 0 },
+ {3932,3932, 60, 24, 513, 200, 0, 0 },
+ {3936,3936, 56, 40, 960, 346, 0, 0 },
+ {3937,3937, 13, 40, 2186, 640, 0, 0 },
+ {3938,3938,113, 8, 1046, 513, 0, 0 },
+ {3939,3939, 91, 16, 186, 100, 0, 0 },
+ {3940,3940, 13, 40, 2186, 640, 0, 0 },
+ {3941,3941, 83, 8, 220, 106, 0, 0 },
+ {3942,3942, 19, 8, 2286, 813, 0, 0 },
+ {3936,3936, 54, 40, 966, 353, 0, 0 },
+ {3520,3520, 72, 8, 260, 93, 0, 0 },
+ {3521,3521, 77, 8, 253, 93, 0, 0 },
+ {3522,3522, 70, 8, 206, 93, 0, 0 },
+ {3523,3523, 75, 8, 173, 93, 0, 0 },
+ {3524,3524, 69, 8, 406, 113, 0, 0 },
+ {3525,3525, 59, 8, 380, 160, 0, 0 },
+ {3526,3526, 48, 8, 373, 40, 0, 0 },
+ {3527,3527, 89, 8, 433, 180, 0, 0 },
+ {3528,3528, 84, 8, 813, 180, 0, 0 },
+ {3529,3529, 33, 8, 240, 53, 0, 0 },
+ {3943,3943, 78, 16, 280, 113, 0, 0 },
+ {3531,3531, 58, 8, 526, 200, 0, 0 },
+ {3532,3532, 52, 8, 526, 193, 0, 0 },
+ {3944,3944, 49, 40, 286, 60, 0, 0 },
+ {3945,3945, 49, 40, 286, 60, 0, 0 },
+ {3535,3535, 85, 8, 220, 113, 0, 0 },
+ {3536,3536, 68, 8, 173, 93, 0, 0 },
+ {3536,3536, 61, 8, 220, 113, 0, 0 },
+ { 352, 352, 60, 2, 6, 0, 0, 0 },
+ {3539,3539,100, 8, 193, 20, 0, 0 },
+ {3946,3946,100, 8, 973, 353, 0, 0 },
+ {3947,3947, 0, 0, 9073, 2946, 0, 0 },
+ {3948,3948, 0, 0, 40000, 73, 0, 0 },
+ {3949,3949, 0, 0, 40000, 0, 0, 0 },
+ {3950,3950, 0, 0, 40000, 0, 0, 0 },
+ {3951,3951, 0, 0, 40000, 80, 0, 0 },
+ {3952,3952, 0, 0, 40000, 86, 0, 0 },
+ {3953,3953, 0, 0, 18186, 740, 0, 0 },
+ {3954,3954, 0, 0, 18446, 6146, 0, 0 },
{ 523, 523, 0, 0, 200, 260, 0, 0 },
- {3934,3934, 0, 0, 340, 146, 0, 0 },
- {3935,3935, 0, 0, 366, 260, 0, 0 },
- {3936,3936, 48, 0, 126, 26, 0, 0 },
- {3937,3937, 27, 0, 200, 106, 0, 0 },
- {3938,3938, 40, 0, 1073, 800, 0, 0 },
- {3939,3939, 48, 0, 100, 33, 0, 0 },
- {3938,3938, 45, 0, 933, 666, 0, 0 },
- {3940,3940, 48, 0, 140, 333, 0, 0 },
- {3938,3938, 47, 0, 933, 666, 0, 0 },
- {3941,3941, 48, 0, 1840, 1373, 0, 0 },
- {3938,3938, 49, 0, 953, 686, 0, 0 },
- {3938,3938, 53, 0, 906, 686, 0, 0 },
- {3938,3938, 56, 0, 913, 693, 0, 0 },
+ {3955,3955, 0, 0, 340, 146, 0, 0 },
+ {3956,3956, 0, 0, 366, 260, 0, 0 },
+ { 738, 738, 47, 8, 846, 353, 0, 0 },
+ {3957,3957, 36, 8, 7373, 146, 0, 0 },
+ {3958,3958, 67, 8, 153, 120, 0, 0 },
+ {3959,3959, 60, 16, 146, 160, 0, 0 },
+ {3960,3960, 60, 16, 113, 240, 0, 0 },
+ {3961,3961, 60, 16, 220, 106, 0, 0 },
+ {3784,3784, 48, 24, 393, 93, 0, 0 },
+ {3962,3962, 60, 40, 413, 413, 0, 0 },
+ {3785,3785, 52, 24, 393, 93, 0, 0 },
+ {3963,3963, 60, 40, 433, 326, 0, 0 },
+ {3784,3784, 55, 24, 393, 93, 0, 0 },
+ {3964,3964, 60, 40, 666, 346, 0, 0 },
+ {3784,3784, 60, 24, 393, 93, 0, 0 },
+ {3784,3784, 64, 24, 393, 93, 0, 0 },
+ {3965,3965, 60, 32, 973, 206, 0, 0 },
+ {3784,3784, 67, 24, 340, 86, 0, 0 },
+ {3966,3966, 60, 40, 553, 366, 0, 0 },
+ {3967,3967, 60, 32, 593, 100, 0, 0 },
+ {3968,3968, 60, 40, 993, 380, 0, 0 },
+ {3969,3969, 60, 40, 2226, 1160, 0, 0 },
+ {3970,3970, 60, 32, 586, 93, 0, 0 },
+ {3971,3971, 48, 32, 220, 93, 0, 0 },
+ {3972,3972, 60, 32, 413, 400, 0, 0 },
+ {3973,3973, 60, 32, 306, 173, 0, 0 },
+ {3974,3974, 67, 24, 766, 573, 0, 0 },
+ {3975,3975, 62, 24, 980, 753, 0, 0 },
+ {3976,3976, 67, 24, 333, 113, 0, 0 },
+ {3977,3977, 67, 24, 600, 173, 0, 0 },
+ {3977,3977, 60, 24, 713, 206, 0, 0 },
+ {3971,3971, 53, 32, 220, 93, 0, 0 },
+ {3978,3978, 48, 32, 226, 93, 0, 0 },
+ {3979,3979, 60, 16, 313, 60, 0, 0 },
+ {3980,3980, 60, 16, 253, 53, 0, 0 },
+ {3981,3981, 79, 24, 453, 133, 0, 0 },
+ {3982,3982, 79, 24, 1473, 500, 0, 0 },
+ {3983,3983, 60, 16, 286, 53, 0, 0 },
+ {3984,3984, 60, 16, 980, 66, 0, 0 },
+ {3985,3985, 91, 24, 173, 100, 0, 0 },
+ {3986,3986, 60, 24, 266, 213, 0, 0 },
+ {3987,3987, 53, 24, 206, 133, 0, 0 },
+ {3988,3988, 60, 16, 233, 60, 0, 0 },
+ {3989,3989, 60, 16, 240, 60, 0, 0 },
+ {3990,3990, 79, 8, 246, 26, 0, 0 },
+ {3991,3991, 79, 8, 1413, 480, 0, 0 },
{ 129, 129, 52, 0, 293, 126, 0, 0 },
{ 130, 130, 48, 0, 173, 93, 0, 0 },
{ 129, 129, 58, 0, 286, 126, 0, 0 },
@@ -8689,7 +8817,7 @@ const struct adlinsdata adlins[4678] =
{ 141, 141, 84, 0, 220, 113, 0, 0 },
{ 135, 135, 83, 0, 1353, 480, 0, 0 },
{ 142, 142, 84, 0, 386, 160, 0, 0 },
- {3942,3942, 24, 0, 2313, 780, 0, 0 },
+ {3992,3992, 24, 0, 2313, 780, 0, 0 },
{ 137, 137, 77, 0, 1893, 660, 0, 0 },
{ 144, 144, 60, 0, 213, 126, 0, 0 },
{ 145, 145, 65, 0, 180, 146, 0, 0 },
@@ -8717,101 +8845,101 @@ const struct adlinsdata adlins[4678] =
{ 169, 169, 68, 0, 340, 320, 0, 0 },
{ 131, 131, 48, 0, 520, 200, 0, 0 },
{3061,3061, 53, 0, 40000, 0, 0, 0 },
- {3943,3944, 0, 4, 2133, 333, 0, 0 },
- {3945,3946, 0, 4, 8966, 393, 0, 0 },
- { 174,3947, 0, 4, 6946, 320, 0, 0 },
- {3948,3949, 0, 4, 9320, 133, 0, 0 },
- { 9,3950, 0, 4, 1606, 426, 0, 0 },
- {3951,3952, 0, 4, 18373, 240, 0, 0 },
- {3953,3954, 0, 1, 7440, 1100, 0, 0.0625 },
- { 15,3955, 0, 4, 5640, 1986, 0, 0 },
- {3956,3957, 0, 4, 40000, 100, 0, 0 },
- {3958,3959, 0, 4, 40000, 73, 0, 0 },
- {3960,3961, 0, 4, 40000, 73, 0, 0 },
- {3962,3963, 0, 4, 40000, 73, 0, 0 },
- {3964,3965, 0, 4, 18186, 153, 0, 0 },
- {3966,3967, 0, 4, 18453, 153, 0, 0 },
- { 31,3968, 0, 4, 40000, 0, 0, 0 },
- {3969,3970, 0, 4, 17886, 100, 0, 0 },
- {3971,3972, 0, 4, 40000, 66, 0, 0 },
- {3973,3972, 0, 4, 40000, 66, 0, 0 },
- {3974,3975, 0, 4, 40000, 46, 0, 0 },
- {3976,3977, 0, 4, 18553, 106, 0, 0 },
- {3978,3977, 0, 4, 18460, 106, 0, 0 },
- {3979,3980, 0, 4, 9366, 106, 0, 0 },
- {3981,3982, 0, 4, 9073, 226, 0, 0 },
- {3983,3984, 0, 4, 40000, 140, 0, 0 },
- {3985,3986, 0, 4, 40000, 800, 0, 0 },
- { 54,3987, 0, 4, 2513, 706, 0, 0 },
- {3988,3989, 0, 4, 40000, 86, 0, 0 },
- {3990,3990, 0, 0, 40000, 126, 0, 0 },
- {3991,3992, 0, 4, 40000, 233, 0, 0 },
- {3993, 253, 0, 4, 40000, 66, 0, 0 },
- {3994,3995, 0, 4, 40000, 0, 0, 0 },
- {3996,3997, 0, 4, 40000, 126, 0, 0 },
- {3998,3999, 0, 4, 40000, 80, 0, 0 },
- {4000,4001, 0, 4, 40000, 73, 0, 0 },
- {4002,4003, 0, 1, 40000, 86, 0, 0.046875 },
- {4004,4005, 0, 4, 40000, 86, 0, 0 },
- {1503,4006, 0, 4, 40000, 93, 0, 0 },
- { 88,4007, 0, 4, 40000, 1220, 0, 0 },
- {3743,4008, 0, 4, 7646, 1260, 0, 0 },
- { 92,4009, 0, 4, 40000, 186, 0, 0 },
- { 93,4010, 0, 4, 40000, 813, 0, 0 },
- { 94,4011, 0, 4, 7660, 1260, 0, 0 },
- { 96,4012, 0, 4, 40000, 2460, 0, 0 },
- {4013,4014, 0, 4, 40000, 420, 0, 0 },
- { 103,4015, 0, 4, 3673, 1240, 0, 0 },
- {4016,4017, 0, 1, 6286, 380, 0, 0 },
- {4018,4019, 0, 1, 2220, 426, 0, 0.03125 },
- { 107,4020, 0, 4, 2086, 760, 0, 0 },
- {4021,4022, 0, 1, 40000, 100, 0, 0.0625 },
- { 110,4023, 0, 4, 40000, 100, 0, 0 },
- { 111,4024, 0, 4, 2300, 820, 0, 0 },
- {4025,4026, 0, 4, 1013, 326, 0, 0 },
- {4027,4028, 0, 1, 1220, 393, 0, 0.03125 },
- { 115,4029, 0, 4, 1813, 646, 0, 0 },
- {4030,4031, 0, 1, 566, 146, 0, 0 },
- { 118,4032, 0, 4, 1553, 53, 0, 0 },
- {4033,4033, 0, 0, 613, 60, 0, 0 },
- { 120,4034, 0, 4, 2126, 1166, 0, 0 },
- {4035,4036, 0, 1, 11880, 2993, 0, 0 },
- { 123,4037, 0, 4, 7080, 2473, 0, 0 },
- { 124,4038, 0, 4, 40000, 1126, 0, 0 },
- { 125,4039, 0, 4, 40000, 1546, 0, 0 },
- {4040,4040, 34, 0, 133, 40, 0, 0 },
- {4041,4041, 28, 0, 193, 46, 0, 0 },
- {4042,4043, 39, 1, 553, 126, 0, 0 },
- {4042,4043, 33, 1, 553, 126, 0, 0 },
- {4044,4045, 63, 4, 166, 93, 0, 0 },
- {4046,4046, 15, 0, 113, 66, 0, 0 },
- {4047,4047, 36, 0, 106, 53, 0, 0 },
- {4047,4048, 36, 1, 480, 173, 0, 0.40625 },
- {4049,4049, 35, 0, 706, 266, 0, 0 },
- {4050,4051, 38, 1, 273, 106, 0, 0 },
- {4052,4053, 38, 1, 366, 133, 0, 0 },
- {4054,4055, 48, 1, 280, 133, 0, -1.90625 },
- {4056,4056, 48, 0, 180, 86, 0, 0 },
- {4057,4058, 48, 1, 953, 346, 0, -1.90625 },
- {4059,4059, 61, 1, 3200, 540, 0, 0.09375 },
+ {3993,3994, 0, 4, 2133, 333, 0, 0 },
+ {3995,3996, 0, 4, 8966, 393, 0, 0 },
+ { 174,3997, 0, 4, 6946, 320, 0, 0 },
+ {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, 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 },
+ {4010,4011, 0, 4, 40000, 73, 0, 0 },
+ {4012,4013, 0, 4, 40000, 73, 0, 0 },
+ {4014,4015, 0, 4, 18186, 153, 0, 0 },
+ {4016,4017, 0, 4, 18453, 153, 0, 0 },
+ { 31,4018, 0, 4, 40000, 0, 0, 0 },
+ {4019,4020, 0, 4, 17886, 100, 0, 0 },
+ {4021,4022, 0, 4, 40000, 66, 0, 0 },
+ {4023,4022, 0, 4, 40000, 66, 0, 0 },
+ {4024,4025, 0, 4, 40000, 46, 0, 0 },
+ {4026,4027, 0, 4, 18553, 106, 0, 0 },
+ {4028,4027, 0, 4, 18460, 106, 0, 0 },
+ {4029,4030, 0, 4, 9366, 106, 0, 0 },
+ {4031,4032, 0, 4, 9073, 226, 0, 0 },
+ {4033,4034, 0, 4, 40000, 140, 0, 0 },
+ {4035,4036, 0, 4, 40000, 800, 0, 0 },
+ { 54,4037, 0, 4, 2513, 706, 0, 0 },
+ {4038,4039, 0, 4, 40000, 86, 0, 0 },
+ {4040,4040, 0, 0, 40000, 126, 0, 0 },
+ {4041,4042, 0, 4, 40000, 233, 0, 0 },
+ {4043, 253, 0, 4, 40000, 66, 0, 0 },
+ {4044,4045, 0, 4, 40000, 0, 0, 0 },
+ {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, 0.046875 },
+ {4054,4055, 0, 4, 40000, 86, 0, 0 },
+ {1503,4056, 0, 4, 40000, 93, 0, 0 },
+ { 88,4057, 0, 4, 40000, 1220, 0, 0 },
+ {3743,4058, 0, 4, 7646, 1260, 0, 0 },
+ { 92,4059, 0, 4, 40000, 186, 0, 0 },
+ { 93,4060, 0, 4, 40000, 813, 0, 0 },
+ { 94,4061, 0, 4, 7660, 1260, 0, 0 },
+ { 96,4062, 0, 4, 40000, 2460, 0, 0 },
+ {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, 0.03125 },
+ { 107,4070, 0, 4, 2086, 760, 0, 0 },
+ {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, 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 },
+ {4083,4083, 0, 0, 613, 60, 0, 0 },
+ { 120,4084, 0, 4, 2126, 1166, 0, 0 },
+ {4085,4086, 0, 1, 11880, 2993, 0, 0 },
+ { 123,4087, 0, 4, 7080, 2473, 0, 0 },
+ { 124,4088, 0, 4, 40000, 1126, 0, 0 },
+ { 125,4089, 0, 4, 40000, 1546, 0, 0 },
+ {4090,4090, 34, 0, 133, 40, 0, 0 },
+ {4091,4091, 28, 0, 193, 46, 0, 0 },
+ {4092,4093, 39, 1, 553, 126, 0, 0 },
+ {4092,4093, 33, 1, 553, 126, 0, 0 },
+ {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, 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, -1.90625 },
+ {4106,4106, 48, 0, 180, 86, 0, 0 },
+ {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 },
- {4060,4061, 79, 1, 1306, 513, 0, 0.078125 },
- {4062,4062, 62, 0, 5200, 466, 0, 0 },
- {4063,4064, 67, 1, 2153, 1080, 0, 0.078125 },
- {4065,4065, 62, 1, 3226, 573, 0, 0.09375 },
- {4066,4067, 54, 1, 286, 133, 0, 0 },
- {4066,4068, 48, 1, 286, 126, 0, 0 },
+ {4110,4111, 79, 1, 1306, 513, 0, 0.078125 },
+ {4112,4112, 62, 0, 5200, 466, 0, 0 },
+ {4113,4114, 67, 1, 2153, 1080, 0, 0.078125 },
+ {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 },
{ 389, 389, 42, 0, 266, 73, 0, 0 },
- {4069,4070, 60, 1, 120, 80, 0, 0 },
- {4070,4071, 60, 1, 380, 80, 0, 0 },
- {4072,4072, 73, 0, 166, 33, 0, 0 },
- {4073,4074, 68, 1, 153, 40, 0, 0 },
- {4075,4076, 18, 1, 200, 80, 0, 0 },
- {4077,4078, 18, 1, 253, 73, 0, 0 },
- {4079,4080, 64, 4, 1346, 33, 0, 0 },
- {4081,4082, 64, 1, 373, 73, 0, 0.03125 },
- {4083,4083, 67, 0, 106, 26, 0, 0 },
+ {4119,4120, 60, 1, 120, 80, 0, 0 },
+ {4120,4121, 60, 1, 380, 80, 0, 0 },
+ {4122,4122, 73, 0, 166, 33, 0, 0 },
+ {4123,4124, 68, 1, 153, 40, 0, 0 },
+ {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, 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 },
{ 880, 880,232, 0, 253, 80, 0, 0 },
@@ -8843,388 +8971,388 @@ const struct adlinsdata adlins[4678] =
{ 902, 902, 35, 0, 1093, 73, 0, 0 },
{ 903, 903, 35, 0, 126, 73, 0, 0 },
{3500,3500, 35, 2, 6, 0, 0, 0 },
- {4084,4084, 0, 0, 14166, 320, 0, 0 },
- {4085,4085, 0, 0, 7413, 653, 0, 0 },
- {4086,4086, 0, 0, 40000, 146, 0, 0 },
- {4087,4087, 0, 0, 40000, 113, 0, 0 },
- {4088,4088, 0, 0, 16773, 193, 0, 0 },
- {4089,4089, 0, 0, 40000, 73, 0, 0 },
- {4090,4090, 0, 0, 40000, 0, 0, 0 },
- {4091,4091, 0, 0, 966, 373, 0, 0 },
- {4092,4092, 0, 0, 40000, 80, 0, 0 },
- {4093,4093, 0, 0, 40000, 80, 0, 0 },
- {4094,4094, 0, 0, 18473, 93, 0, 0 },
- {4095,4095, 0, 0, 40000, 60, 0, 0 },
- {4096,4096, 0, 0, 40000, 73, 0, 0 },
- {4097,4097, 0, 0, 40000, 0, 0, 0 },
- {4098,4098, 0, 0, 40000, 213, 0, 0 },
- {4099,4099, 0, 0, 40000, 66, 0, 0 },
- {4100,4100, 0, 0, 1413, 1026, 0, 0 },
- {4101,4101, 0, 0, 506, 200, 0, 0 },
- {4102,4102, 0, 0, 3793, 1106, 0, 0 },
- {4103,4103, 0, 0, 40000, 220, 0, 0 },
- {4104,4104, 0, 0, 40000, 46, 0, 0 },
- {4105,4105, 0, 0, 40000, 0, 0, 0 },
- {4106,4106, 0, 0, 40000, 60, 0, 0 },
- {4107,4107, 0, 0, 40000, 0, 0, 0 },
- {4108,4108, 0, 0, 40000, 33, 0, 0 },
- {4109,4109, 0, 0, 40000, 0, 0, 0 },
- {4110,4110, 0, 0, 40000, 146, 0, 0 },
- {4111,4111, 0, 0, 40000, 66, 0, 0 },
- {4112,4112, 0, 0, 40000, 353, 0, 0 },
- {4113,4113, 0, 0, 40000, 66, 0, 0 },
- {4114,4114, 0, 0, 40000, 53, 0, 0 },
- {4115,4115, 0, 0, 40000, 73, 0, 0 },
- {4116,4116, 0, 0, 40000, 66, 0, 0 },
- {4117,4117, 0, 0, 40000, 926, 0, 0 },
- {4118,4118, 0, 0, 2833, 200, 0, 0 },
+ {4134,4134, 0, 0, 14166, 320, 0, 0 },
+ {4135,4135, 0, 0, 7413, 653, 0, 0 },
+ {4136,4136, 0, 0, 40000, 146, 0, 0 },
+ {4137,4137, 0, 0, 40000, 113, 0, 0 },
+ {4138,4138, 0, 0, 16773, 193, 0, 0 },
+ {4139,4139, 0, 0, 40000, 73, 0, 0 },
+ {4140,4140, 0, 0, 40000, 0, 0, 0 },
+ {4141,4141, 0, 0, 966, 373, 0, 0 },
+ {4142,4142, 0, 0, 40000, 80, 0, 0 },
+ {4143,4143, 0, 0, 40000, 80, 0, 0 },
+ {4144,4144, 0, 0, 18473, 93, 0, 0 },
+ {4145,4145, 0, 0, 40000, 60, 0, 0 },
+ {4146,4146, 0, 0, 40000, 73, 0, 0 },
+ {4147,4147, 0, 0, 40000, 0, 0, 0 },
+ {4148,4148, 0, 0, 40000, 213, 0, 0 },
+ {4149,4149, 0, 0, 40000, 66, 0, 0 },
+ {4150,4150, 0, 0, 1413, 1026, 0, 0 },
+ {4151,4151, 0, 0, 506, 200, 0, 0 },
+ {4152,4152, 0, 0, 3793, 1106, 0, 0 },
+ {4153,4153, 0, 0, 40000, 220, 0, 0 },
+ {4154,4154, 0, 0, 40000, 46, 0, 0 },
+ {4155,4155, 0, 0, 40000, 0, 0, 0 },
+ {4156,4156, 0, 0, 40000, 60, 0, 0 },
+ {4157,4157, 0, 0, 40000, 0, 0, 0 },
+ {4158,4158, 0, 0, 40000, 33, 0, 0 },
+ {4159,4159, 0, 0, 40000, 0, 0, 0 },
+ {4160,4160, 0, 0, 40000, 146, 0, 0 },
+ {4161,4161, 0, 0, 40000, 66, 0, 0 },
+ {4162,4162, 0, 0, 40000, 353, 0, 0 },
+ {4163,4163, 0, 0, 40000, 66, 0, 0 },
+ {4164,4164, 0, 0, 40000, 53, 0, 0 },
+ {4165,4165, 0, 0, 40000, 73, 0, 0 },
+ {4166,4166, 0, 0, 40000, 66, 0, 0 },
+ {4167,4167, 0, 0, 40000, 926, 0, 0 },
+ {4168,4168, 0, 0, 2833, 200, 0, 0 },
{ 127, 127, 36, 0, 386, 166, 0, 0 },
- {4119,4119, 36, 0, 100, 33, 0, 0 },
+ {4169,4169, 36, 0, 100, 33, 0, 0 },
{2030,2030, 36, 0, 346, 140, 0, 0 },
{3782,3782, 48, 0, 93, 0, 0, 0 },
{3783,3783, 36, 0, 146, 86, 0, 0 },
- {4120,4120, 48, 0, 1886, 653, 0, 0 },
+ {4170,4170, 48, 0, 1886, 653, 0, 0 },
{ 132, 132, 69, 0, 126, 66, 0, 0 },
- {4120,4120, 52, 0, 1853, 626, 0, 0 },
+ {4170,4170, 52, 0, 1853, 626, 0, 0 },
{ 152, 152, 48, 0, 220, 86, 0, 0 },
- {4120,4120, 55, 0, 1886, 640, 0, 0 },
+ {4170,4170, 55, 0, 1886, 640, 0, 0 },
{ 139, 139, 57, 0, 293, 133, 0, 0 },
- {4120,4120, 58, 0, 1860, 633, 0, 0 },
- {4120,4120, 60, 0, 1886, 633, 0, 0 },
- {4121,4121, 62, 0, 2660, 900, 0, 0 },
- {4120,4120, 63, 0, 1880, 646, 0, 0 },
+ {4170,4170, 58, 0, 1860, 633, 0, 0 },
+ {4170,4170, 60, 0, 1886, 633, 0, 0 },
+ {4171,4171, 62, 0, 2660, 900, 0, 0 },
+ {4170,4170, 63, 0, 1880, 646, 0, 0 },
{ 134, 134, 70, 0, 966, 360, 0, 0 },
- {4122,4122, 70, 0, 973, 346, 0, 0 },
- {4123,4123, 53, 0, 1866, 640, 0, 0 },
+ {4172,4172, 70, 0, 973, 346, 0, 0 },
+ {4173,4173, 53, 0, 1866, 640, 0, 0 },
{3516,3516, 48, 0, 180, 93, 0, 0 },
- {4124,4124, 84, 0, 1360, 473, 0, 0 },
- {4125,4125, 43, 0, 513, 206, 0, 0 },
- {4126,4126, 56, 0, 1353, 480, 0, 0 },
+ {4174,4174, 84, 0, 1360, 473, 0, 0 },
+ {4175,4175, 43, 0, 513, 206, 0, 0 },
+ {4176,4176, 56, 0, 1353, 480, 0, 0 },
{3791,3791, 24, 0, 1866, 613, 0, 0 },
{ 134, 134, 65, 0, 1346, 486, 0, 0 },
{ 146, 146, 48, 0, 173, 93, 0, 0 },
{ 146, 146, 54, 0, 173, 93, 0, 0 },
- {4127,4127, 42, 0, 246, 140, 0, 0 },
- {4127,4127, 39, 0, 240, 133, 0, 0 },
+ {4177,4177, 42, 0, 246, 140, 0, 0 },
+ {4177,4177, 39, 0, 240, 133, 0, 0 },
{3816,3816, 52, 0, 306, 113, 0, 0 },
- {4128,4128, 52, 0, 413, 86, 0, 0 },
+ {4178,4178, 52, 0, 413, 86, 0, 0 },
{ 158, 158, 60, 0, 146, 166, 0, 0 },
{ 158, 158, 66, 0, 146, 166, 0, 0 },
{ 158, 158, 59, 0, 146, 166, 0, 0 },
{3538,3538, 91, 0, 773, 233, 0, 0 },
{3547,3547,109, 0, 5300, 1786, 0, 0 },
- {4129,4129, 79, 0, 560, 313, 0, 0 },
- {4130,4130, 0, 0, 10646, 73, 0, 0 },
- {4131,4132, 0, 1, 14166, 586, 0, 0.03125 },
- {4133,4134, 0, 1, 15553, 546, 0, 0.03125 },
- {4135,4136, 0, 1, 11746, 320, 0, 0.046875 },
- {4137,4138, 0, 1, 14706, 646, 0, 0.15625 },
- {4139,4140, 0, 1, 7320, 100, 0, 0.046875 },
- {4141,4142, 0, 1, 40000, 0, 0, 0.0625 },
- {4143,4144, 0, 1, 13660, 260, 0, 0 },
- {4145,4146, 0, 1, 15026, 133, 0, 0 },
- {4147,4148, 0, 1, 40000, 0, 0, 2.5e-05 },
- {4149,4150, 0, 1, 4980, 3400, 0, 0 },
- {4151,4152, 0, 1, 7840, 2660, 0, 0.046875 },
- {4153,4154, 0, 1, 8326, 180, 0, 0 },
- {4155,4156, 0, 1, 1093, 140, 0, 0 },
- {4157,4158, 0, 1, 2280, 400, 0, 0 },
- {4159,4160, 0, 1, 4553, 1486, 0, 0.03125 },
- {4161,4161, 0, 1, 40000, 0, 0, 0.03125 },
- {4162,4163, 0, 1, 40000, 60, 0, 0.15625 },
- {4164,4165, 0, 1, 40000, 93, 0, 0.078125 },
- {4166,4167, 0, 1, 40000, 86, 0, 0.15625 },
- {4168,4169, 0, 1, 40000, 520, 0, 0.03125 },
- {4170,4171, 0, 1, 40000, 140, 0, 0.0625 },
- {4172,4173, 0, 1, 40000, 133, 0, 0.140625 },
- {4174,4175, 0, 1, 40000, 73, 0, 0 },
- {4176,4177, 0, 1, 40000, 346, 0, 0.109375 },
- {4178,4179, 0, 1, 3693, 86, 0, 0 },
- {4180,4181, 0, 1, 6586, 460, 0, 2.5e-05 },
- {4182,4183, 0, 1, 4320, 93, 0, 0 },
- {4184,4185, 0, 1, 7346, 126, 0, 0.046875 },
- {4186,4187, 0, 1, 3633, 260, 0, 0 },
- {4188,4189, 0, 1, 40000, 126, 0, -1.95312 },
- {4190,4191, 0, 1, 40000, 126, 0, -1.9375 },
- {4192,4193, 0, 1, 40000, 46, 0, 0.234375 },
- {4194,4195, 0, 1, 40000, 0, 0, 0.03125 },
- {4196,4197, 0, 1, 10320, 86, 0, 0 },
- {4198,4199, 0, 1, 12933, 133, 0, 0 },
- {4200,4201, 0, 1, 11820, 240, 0, 0.046875 },
- {4202,4203, 0, 1, 3966, 166, 0, 0 },
- {4204,4205, 0, 1, 40000, 0, 0, 0 },
- {4206,4206, 0, 0, 2666, 160, 0, 0 },
- {4207,4208, 0, 1, 15046, 93, 0, 0.078125 },
- {4209,4210, 0, 1, 40000, 100, 0, 0 },
- {4211,4211, 0, 0, 40000, 260, 0, 0 },
- {4212,4213, 0, 1, 40000, 126, 0, 2.5e-05 },
- {4214,4214, 0, 0, 40000, 233, 0, 0 },
- {4215,4216, 0, 1, 40000, 440, 0, 0.078125 },
- {4217,4218, 0, 1, 2160, 606, 0, 0.109375 },
- {4219,4220, 0, 1, 14753, 2400, 0, 0.03125 },
- {4221,4222, 0, 1, 7680, 646, 0, 0.03125 },
- {4223,4224, 0, 1, 40000, 446, 0, 0.0625 },
- {4225,4226, 0, 1, 40000, 866, 0, -0.0625 },
- {4227,4227, 0, 1, 40000, 1220, 0, 0.078125 },
- {4228,4228, 0, 1, 40000, 1960, 0, 0.0625 },
- {4229,4230, 0, 1, 40000, 433, 0, 0.125 },
- {4231,4232, 0, 1, 40000, 140, 0, 0.140625 },
- {4233,4234, 0, 1, 40000, 806, 0, 0.109375 },
- {4235,4236, 0, 1, 2040, 486, 0, 0.125 },
- {4237,4238, 0, 1, 40000, 86, 0, 0 },
- {4239,4240, 0, 1, 40000, 80, 0, 0.03125 },
- {4241,4241, 0, 0, 40000, 73, 0, 0 },
- {4242,4243, 0, 1, 40000, 400, 0, 0.0625 },
- {4244,4245, 0, 1, 40000, 120, 0, 0.0625 },
- {4246,4247, 0, 1, 40000, 0, 0, 0.09375 },
- {4248,4248, 0, 1, 40000, 0, 0, 0.125 },
- {4249,4250, 0, 1, 40000, 186, 0, 0 },
- {4251,4251, 0, 0, 40000, 166, 0, 0 },
- {4252,4252, 0, 0, 40000, 73, 0, 0 },
- {4253,4253, 0, 0, 40000, 60, 0, 0 },
- {4254,4255, 0, 1, 40000, 140, 0, 0 },
- {4256,4256, 0, 0, 40000, 140, 0, 0 },
- {4257,4257, 0, 0, 40000, 66, 0, 0 },
- {4258,4259, 0, 1, 40000, 133, 0, 0 },
- {4260,4260, 0, 0, 40000, 86, 0, 0 },
- {4261,4261, 0, 0, 40000, 73, 0, 0 },
- {4262,4262, 0, 0, 40000, 106, 0, 0 },
- {4263,4264, 0, 1, 40000, 186, 0, 0.03125 },
- {4265,4266, 0, 1, 40000, 0, 0, 0.03125 },
- {4267,4267, 0, 0, 40000, 300, 0, 0 },
- {4268,4268, 0, 0, 40000, 66, 0, 0 },
- {4269,4270, 0, 1, 40000, 73, 0, 0.125 },
- {4271,4272, 0, 1, 40000, 86, 0, 0.109375 },
- {4273,4274, 0, 1, 40000, 146, 0, 0.109375 },
- {4275,4276, 0, 1, 40000, 66, 0, -0.03125 },
- {4277,4277, 0, 0, 40000, 60, 0, 0 },
- {4278,4279, 0, 1, 40000, 213, 0, 0.15625 },
- {4280,4281, 0, 1, 40000, 66, 0, 0.125 },
- {4282,4283, 0, 1, 40000, 100, 0, 0.03125 },
- {4284,4285, 0, 1, 40000, 1513, 0, 0.078125 },
- {4286,4287, 0, 1, 40000, 353, 0, 0.109375 },
- {4288,4289, 0, 1, 40000, 133, 0, 0.078125 },
- {4290,4291, 0, 1, 40000, 746, 0, 0.140625 },
- {4292,4293, 0, 1, 40000, 0, 0, 0.109375 },
- {4294,4295, 0, 1, 5033, 1606, 0, 0.0625 },
- {4296,4297, 0, 1, 40000, 1146, 0, 0.09375 },
- {4298,4299, 0, 1, 40000, 1586, 0, 0.109375 },
- {4300,4301, 0, 1, 40000, 0, 0, 0.09375 },
- {4302,4303, 0, 1, 40000, 1006, 0, 0.125 },
- {4304,4304, 0, 1, 2680, 793, 0, 0.109375 },
- {4305,4306, 0, 1, 40000, 0, 0, -0.046875 },
- {4307,4308, 0, 1, 9000, 3186, 0, 0.125 },
- {4309,4310, 0, 1, 40000, 1073, 0, -0.078125 },
- {4311,4312, 0, 1, 40000, 2093, 0, 0.140625 },
- {4313,4314, 0, 1, 40000, 0, 0, 0.078125 },
- {4315,4316, 0, 1, 9580, 713, 0, 0.03125 },
- {4317,4317, 0, 0, 1166, 760, 0, 0 },
- {4318,4319, 0, 1, 1186, 240, 0, 0 },
- {4320,4320, 0, 0, 40000, 160, 0, 0 },
- {4321,4321, 0, 0, 40000, 120, 0, 0 },
- {4322,4322, 0, 0, 8673, 2413, 0, 0 },
- {4323,4323, 0, 0, 393, 126, 0, 0 },
- {4324,4324, 0, 0, 246, 93, 0, 0 },
- {4325,4326, 0, 1, 1953, 393, 0, 0 },
- {4327,4328, 0, 1, 4220, 133, 0, 0 },
- {4329,4330, 0, 1, 2873, 73, 0, 0.109375 },
- {4331,4332, 0, 1, 40000, 186, 0, 0 },
- {4333,4333, 0, 0, 1573, 86, 0, 0 },
- {4334,4335, 0, 1, 40000, 793, 0, 0 },
- {4336,4337, 0, 1, 40000, 173, 0, 0 },
- {4338,4339, 0, 1, 40000, 793, 0, 0 },
- {4340,4340, 0, 0, 606, 133, 0, 0 },
- {4044,4341, 63, 1, 160, 80, 0, 0 },
- {4342,4343, 25, 1, 313, 153, 0, 0 },
- {4344,4343, 25, 1, 206, 100, 0, 0 },
- {4345,4346, 61, 1, 153, 93, 0, 0 },
- {4347,4348, 38, 1, 340, 133, 0, 0 },
- {4349,4350, 37, 1, 206, 93, 0, 0 },
- {4351,4352, 15, 1, 346, 153, 10, 0 },
- {4353,4354,100, 1, 146, 80, 0, 0.140625 },
- {4355,4356, 19, 1, 553, 200, 10, 0 },
- {4357,4358, 15, 1, 333, 153, 20, 0 },
- {4359,4360, 12, 1, 340, 146, 20, 0 },
- {4361,4362, 11, 1, 346, 146, 20, 0 },
- {4363,4364, 61, 1, 2706, 1033, 0, 0.09375 },
- {4365,4362, 8, 1, 340, 146, 20, 0 },
- {4366,4367, 91, 1, 1166, 366, 0, -0.046875 },
- {4368,4368, 70, 0, 966, 346, 0, 0 },
- {4369,4370, 80, 1, 300, 93, 0, 0.125 },
- {4371,4371, 58, 0, 206, 53, 0, 0 },
- {4372,4364, 62, 1, 2333, 820, 0, 0.09375 },
- {4373,4374, 31, 1, 773, 200, 0, 0 },
- {4375,4367, 91, 1, 1160, 360, 0, -0.03125 },
- {4376,4377, 41, 1, 373, 113, 0, 0 },
- {4378,4379, 35, 1, 406, 126, 0, 0 },
- {4380,4381, 29, 1, 146, 106, 0, 0 },
- {4382,4383, 41, 1, 400, 126, 0, 0 },
- {4382,4383, 37, 1, 400, 126, 0, 0 },
- {4384,4385, 77, 1, 193, 93, 0, 0 },
- {4386,4387, 72, 1, 200, 93, 0, 0 },
- {4388,4388, 40, 0, 513, 0, 0, 0 },
- {4389,4389, 38, 0, 200, 20, 0, 0 },
- {4390,4390, 36, 0, 620, 20, 0, 0 },
- {4391,4391, 90, 0, 193, 20, 0, 0 },
- {4392,4392, 90, 0, 793, 40, 0, 0 },
- {4393,4394, 80, 1, 406, 153, 0, 0.03125 },
- {4395,4396, 64, 1, 1866, 606, 0, 0 },
- {4397,4398, 50, 1, 173, 126, 0, 0 },
- {4399,4399, 36, 0, 4646, 1606, 0, 0 },
- {4400,4400, 0, 0, 40000, 86, 0, 0 },
- {4401,4401, 0, 0, 40000, 73, 0, 0 },
- {4402,4402, 0, 0, 2433, 700, 0, 0 },
- {4403,4403, 0, 0, 1233, 26, 0, 0 },
- {4404,4404, 0, 0, 40000, 66, 0, 0 },
- {4405,4405, 0, 0, 40000, 60, 0, 0 },
- {4406,4406, 0, 0, 40000, 60, 0, 0 },
- {4407,4407, 0, 0, 40000, 66, 0, 0 },
- {4408,4408, 0, 0, 40000, 66, 0, 0 },
- {4409,4409, 0, 0, 40000, 0, 0, 0 },
- {4409,4409, 73, 0, 40000, 0, 0, 0 },
- {4410,4410, 0, 0, 40000, 60, 0, 0 },
- {4411,4411, 0, 0, 40000, 60, 0, 0 },
- {4412,4412, 0, 0, 7326, 2486, 0, 0 },
- {4413,4413, 0, 0, 4886, 1586, 0, 0 },
- {4414,4414, 0, 0, 646, 20, 0, 0 },
- {4415,4415, 0, 0, 253, 20, 0, 0 },
- {4415,4415, 12, 0, 253, 20, 0, 0 },
- {4416,4416, 0, 0, 640, 100, 0, 0 },
- {4416,4416, 1, 0, 640, 106, 0, 0 },
- {4417,4417, 0, 0, 133, 106, 0, 0 },
- {4417,4417, 23, 0, 133, 106, 0, 0 },
- {4418,4418, 0, 0, 653, 100, 0, 0 },
- {4419,4419, 0, 0, 4166, 1546, 0, 0 },
- {4420,4420, 0, 0, 40000, 73, 0, 0 },
- {4421,4421, 0, 0, 40000, 60, 0, 0 },
- {4422,4422, 0, 0, 40000, 53, 0, 0 },
- {4423,4423, 0, 0, 40000, 0, 0, 0 },
- {4424,4424, 0, 0, 246, 20, 0, 0 },
- {4425,4425, 0, 2, 6, 0, 0, 0 },
- {4426,4426, 0, 0, 4946, 233, 0, 0 },
- {4427,4427, 0, 0, 4946, 233, 0, 0 },
- {4428,4428, 0, 0, 4953, 240, 0, 0 },
- {4429,4429, 0, 0, 4946, 233, 0, 0 },
- {4430,4430, 0, 0, 18233, 46, 0, 0 },
- {4431,4431, 0, 0, 2386, 26, 0, 0 },
- {4432,4432, 0, 0, 4640, 633, 0, 0 },
- {4433,4433, 0, 0, 18466, 100, 0, 0 },
- {4434,4434, 0, 0, 18440, 66, 0, -2 },
- {4435,4435, 0, 0, 18440, 6140, 0, -2 },
- {4436,4436, 0, 0, 1206, 433, 0, -2 },
- {4437,4437, 0, 0, 4626, 240, 0, 0 },
- {4438,4438, 0, 0, 726, 400, 0, 0 },
- {4439,4439, 0, 0, 5866, 73, 0, 0 },
- {4440,4440, 0, 0, 40000, 73, 0, 0 },
- {4441,4441, 0, 0, 40000, 73, 0, 0 },
- {4442,4442, 0, 0, 40000, 73, 0, 0 },
- {4443,4443, 0, 0, 40000, 73, 0, 0 },
- {4444,4444, 0, 0, 6500, 346, 0, 0 },
- {4445,4445, 0, 0, 6506, 346, 0, 0 },
- {4446,4446, 0, 0, 40000, 66, 0, -2 },
- {4447,4447, 0, 0, 40000, 66, 0, -2 },
- {4448,4448, 0, 0, 40000, 0, 0, 0 },
- {4449,4449, 0, 0, 40000, 46, 0, 0 },
- {4450,4450, 0, 0, 40000, 0, 0, 0 },
- {4450,4450, 0, 0, 40000, 0, 0, -2 },
- {4451,4451, 0, 0, 2386, 26, 0, 0 },
- {4452,4452, 0, 0, 40000, 73, 0, -2 },
- {4453,4453, 0, 0, 5866, 26, 0, -2 },
- {4454,4454, 0, 0, 40000, 133, 0, 0 },
- {4455,4455, 0, 0, 40000, 133, 0, 0 },
- {4456,4456, 0, 0, 40000, 126, 0, 0 },
- {4457,4457, 0, 0, 253, 20, 0, 0 },
- {4458,4458, 0, 0, 8866, 1366, 0, 0 },
- {4459,4459, 0, 0, 1040, 766, 0, 0 },
- {4460,4460, 0, 0, 40000, 146, 0, -2 },
- {4461,4461, 0, 0, 40000, 153, 0, -2 },
- {4462,4462, 0, 0, 40000, 466, 0, -2 },
- {4463,4463, 0, 0, 40000, 66, 0, 0 },
- {4464,4464, 0, 0, 2333, 566, 0, 0 },
- {4465,4465, 0, 0, 40000, 140, 0, -2 },
- {4466,4466, 0, 0, 40000, 100, 0, -2 },
- {4467,4467, 0, 0, 40000, 226, 0, -2 },
- {4468,4468, 0, 0, 40000, 0, 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, 0.03125 },
+ {4183,4184, 0, 1, 15553, 546, 0, 0.03125 },
+ {4185,4186, 0, 1, 11746, 320, 0, 0.046875 },
+ {4187,4188, 0, 1, 14706, 646, 0, 0.15625 },
+ {4189,4190, 0, 1, 7320, 100, 0, 0.046875 },
+ {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.5e-05 },
+ {4199,4200, 0, 1, 4980, 3400, 0, 0 },
+ {4201,4202, 0, 1, 7840, 2660, 0, 0.046875 },
+ {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, 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.078125 },
+ {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.140625 },
+ {4224,4225, 0, 1, 40000, 73, 0, 0 },
+ {4226,4227, 0, 1, 40000, 346, 0, 0.109375 },
+ {4228,4229, 0, 1, 3693, 86, 0, 0 },
+ {4230,4231, 0, 1, 6586, 460, 0, 2.5e-05 },
+ {4232,4233, 0, 1, 4320, 93, 0, 0 },
+ {4234,4235, 0, 1, 7346, 126, 0, 0.046875 },
+ {4236,4237, 0, 1, 3633, 260, 0, 0 },
+ {4238,4239, 0, 1, 40000, 126, 0, -1.95312 },
+ {4240,4241, 0, 1, 40000, 126, 0, -1.9375 },
+ {4242,4243, 0, 1, 40000, 46, 0, 0.234375 },
+ {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, 0.046875 },
+ {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, 0.078125 },
+ {4259,4260, 0, 1, 40000, 100, 0, 0 },
+ {4261,4261, 0, 0, 40000, 260, 0, 0 },
+ {4262,4263, 0, 1, 40000, 126, 0, 2.5e-05 },
+ {4264,4264, 0, 0, 40000, 233, 0, 0 },
+ {4265,4266, 0, 1, 40000, 440, 0, 0.078125 },
+ {4267,4268, 0, 1, 2160, 606, 0, 0.109375 },
+ {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.078125 },
+ {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.140625 },
+ {4283,4284, 0, 1, 40000, 806, 0, 0.109375 },
+ {4285,4286, 0, 1, 2040, 486, 0, 0.125 },
+ {4287,4288, 0, 1, 40000, 86, 0, 0 },
+ {4289,4290, 0, 1, 40000, 80, 0, 0.03125 },
+ {4291,4291, 0, 0, 40000, 73, 0, 0 },
+ {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 },
+ {4303,4303, 0, 0, 40000, 60, 0, 0 },
+ {4304,4305, 0, 1, 40000, 140, 0, 0 },
+ {4306,4306, 0, 0, 40000, 140, 0, 0 },
+ {4307,4307, 0, 0, 40000, 66, 0, 0 },
+ {4308,4309, 0, 1, 40000, 133, 0, 0 },
+ {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, 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, 0.125 },
+ {4321,4322, 0, 1, 40000, 86, 0, 0.109375 },
+ {4323,4324, 0, 1, 40000, 146, 0, 0.109375 },
+ {4325,4326, 0, 1, 40000, 66, 0, -0.03125 },
+ {4327,4327, 0, 0, 40000, 60, 0, 0 },
+ {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.078125 },
+ {4336,4337, 0, 1, 40000, 353, 0, 0.109375 },
+ {4338,4339, 0, 1, 40000, 133, 0, 0.078125 },
+ {4340,4341, 0, 1, 40000, 746, 0, 0.140625 },
+ {4342,4343, 0, 1, 40000, 0, 0, 0.109375 },
+ {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.109375 },
+ {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.109375 },
+ {4355,4356, 0, 1, 40000, 0, 0, -0.046875 },
+ {4357,4358, 0, 1, 9000, 3186, 0, 0.125 },
+ {4359,4360, 0, 1, 40000, 1073, 0, -0.078125 },
+ {4361,4362, 0, 1, 40000, 2093, 0, 0.140625 },
+ {4363,4364, 0, 1, 40000, 0, 0, 0.078125 },
+ {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 },
+ {4371,4371, 0, 0, 40000, 120, 0, 0 },
+ {4372,4372, 0, 0, 8673, 2413, 0, 0 },
+ {4373,4373, 0, 0, 393, 126, 0, 0 },
+ {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, 0.109375 },
+ {4381,4382, 0, 1, 40000, 186, 0, 0 },
+ {4383,4383, 0, 0, 1573, 86, 0, 0 },
+ {4384,4385, 0, 1, 40000, 793, 0, 0 },
+ {4386,4387, 0, 1, 40000, 173, 0, 0 },
+ {4388,4389, 0, 1, 40000, 793, 0, 0 },
+ {4390,4390, 0, 0, 606, 133, 0, 0 },
+ {4094,4391, 63, 1, 160, 80, 0, 0 },
+ {4392,4393, 25, 1, 313, 153, 0, 0 },
+ {4394,4393, 25, 1, 206, 100, 0, 0 },
+ {4395,4396, 61, 1, 153, 93, 0, 0 },
+ {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, 0.140625 },
+ {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, 0.09375 },
+ {4415,4412, 8, 1, 340, 146, 20, 0 },
+ {4416,4417, 91, 1, 1166, 366, 0, -0.046875 },
+ {4418,4418, 70, 0, 966, 346, 0, 0 },
+ {4419,4420, 80, 1, 300, 93, 0, 0.125 },
+ {4421,4421, 58, 0, 206, 53, 0, 0 },
+ {4422,4414, 62, 1, 2333, 820, 0, 0.09375 },
+ {4423,4424, 31, 1, 773, 200, 0, 0 },
+ {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 },
+ {4432,4433, 41, 1, 400, 126, 0, 0 },
+ {4432,4433, 37, 1, 400, 126, 0, 0 },
+ {4434,4435, 77, 1, 193, 93, 0, 0 },
+ {4436,4437, 72, 1, 200, 93, 0, 0 },
+ {4438,4438, 40, 0, 513, 0, 0, 0 },
+ {4439,4439, 38, 0, 200, 20, 0, 0 },
+ {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, 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 },
+ {4450,4450, 0, 0, 40000, 86, 0, 0 },
+ {4451,4451, 0, 0, 40000, 73, 0, 0 },
+ {4452,4452, 0, 0, 2433, 700, 0, 0 },
+ {4453,4453, 0, 0, 1233, 26, 0, 0 },
+ {4454,4454, 0, 0, 40000, 66, 0, 0 },
+ {4455,4455, 0, 0, 40000, 60, 0, 0 },
+ {4456,4456, 0, 0, 40000, 60, 0, 0 },
+ {4457,4457, 0, 0, 40000, 66, 0, 0 },
+ {4458,4458, 0, 0, 40000, 66, 0, 0 },
+ {4459,4459, 0, 0, 40000, 0, 0, 0 },
+ {4459,4459, 73, 0, 40000, 0, 0, 0 },
+ {4460,4460, 0, 0, 40000, 60, 0, 0 },
+ {4461,4461, 0, 0, 40000, 60, 0, 0 },
+ {4462,4462, 0, 0, 7326, 2486, 0, 0 },
+ {4463,4463, 0, 0, 4886, 1586, 0, 0 },
+ {4464,4464, 0, 0, 646, 20, 0, 0 },
+ {4465,4465, 0, 0, 253, 20, 0, 0 },
+ {4465,4465, 12, 0, 253, 20, 0, 0 },
+ {4466,4466, 0, 0, 640, 100, 0, 0 },
+ {4466,4466, 1, 0, 640, 106, 0, 0 },
+ {4467,4467, 0, 0, 133, 106, 0, 0 },
+ {4467,4467, 23, 0, 133, 106, 0, 0 },
+ {4468,4468, 0, 0, 653, 100, 0, 0 },
+ {4469,4469, 0, 0, 4166, 1546, 0, 0 },
+ {4470,4470, 0, 0, 40000, 73, 0, 0 },
+ {4471,4471, 0, 0, 40000, 60, 0, 0 },
+ {4472,4472, 0, 0, 40000, 53, 0, 0 },
+ {4473,4473, 0, 0, 40000, 0, 0, 0 },
+ {4474,4474, 0, 0, 246, 20, 0, 0 },
+ {4475,4475, 0, 2, 6, 0, 0, 0 },
+ {4476,4476, 0, 0, 4946, 233, 0, 0 },
+ {4477,4477, 0, 0, 4946, 233, 0, 0 },
+ {4478,4478, 0, 0, 4953, 240, 0, 0 },
+ {4479,4479, 0, 0, 4946, 233, 0, 0 },
+ {4480,4480, 0, 0, 18233, 46, 0, 0 },
+ {4481,4481, 0, 0, 2386, 26, 0, 0 },
+ {4482,4482, 0, 0, 4640, 633, 0, 0 },
+ {4483,4483, 0, 0, 18466, 100, 0, 0 },
+ {4484,4484, 0, 0, 18440, 66, 0, -2 },
+ {4485,4485, 0, 0, 18440, 6140, 0, -2 },
+ {4486,4486, 0, 0, 1206, 433, 0, -2 },
+ {4487,4487, 0, 0, 4626, 240, 0, 0 },
+ {4488,4488, 0, 0, 726, 400, 0, 0 },
+ {4489,4489, 0, 0, 5866, 73, 0, 0 },
+ {4490,4490, 0, 0, 40000, 73, 0, 0 },
+ {4491,4491, 0, 0, 40000, 73, 0, 0 },
+ {4492,4492, 0, 0, 40000, 73, 0, 0 },
+ {4493,4493, 0, 0, 40000, 73, 0, 0 },
+ {4494,4494, 0, 0, 6500, 346, 0, 0 },
+ {4495,4495, 0, 0, 6506, 346, 0, 0 },
+ {4496,4496, 0, 0, 40000, 66, 0, -2 },
+ {4497,4497, 0, 0, 40000, 66, 0, -2 },
+ {4498,4498, 0, 0, 40000, 0, 0, 0 },
+ {4499,4499, 0, 0, 40000, 46, 0, 0 },
+ {4500,4500, 0, 0, 40000, 0, 0, 0 },
+ {4500,4500, 0, 0, 40000, 0, 0, -2 },
+ {4501,4501, 0, 0, 2386, 26, 0, 0 },
+ {4502,4502, 0, 0, 40000, 73, 0, -2 },
+ {4503,4503, 0, 0, 5866, 26, 0, -2 },
+ {4504,4504, 0, 0, 40000, 133, 0, 0 },
+ {4505,4505, 0, 0, 40000, 133, 0, 0 },
+ {4506,4506, 0, 0, 40000, 126, 0, 0 },
+ {4507,4507, 0, 0, 253, 20, 0, 0 },
+ {4508,4508, 0, 0, 8866, 1366, 0, 0 },
+ {4509,4509, 0, 0, 1040, 766, 0, 0 },
+ {4510,4510, 0, 0, 40000, 146, 0, -2 },
+ {4511,4511, 0, 0, 40000, 153, 0, -2 },
+ {4512,4512, 0, 0, 40000, 466, 0, -2 },
+ {4513,4513, 0, 0, 40000, 66, 0, 0 },
+ {4514,4514, 0, 0, 2333, 566, 0, 0 },
+ {4515,4515, 0, 0, 40000, 140, 0, -2 },
+ {4516,4516, 0, 0, 40000, 100, 0, -2 },
+ {4517,4517, 0, 0, 40000, 226, 0, -2 },
+ {4518,4518, 0, 0, 40000, 0, 0, 0 },
{3712,3712, 0, 0, 40000, 226, 0, -2 },
- {4469,4469, 0, 0, 40000, 140, 0, -2 },
- {4470,4470, 0, 0, 40000, 66, 0, 0 },
- {4471,4471, 0, 0, 40000, 73, 0, 0 },
- {4472,4472, 0, 0, 40000, 73, 0, 0 },
- {4473,4473, 0, 0, 40000, 86, 0, -2 },
- {4474,4474, 0, 0, 40000, 80, 0, 0 },
- {4475,4475, 0, 0, 40000, 73, 0, -2 },
- {4476,4476, 0, 0, 40000, 80, 0, -2 },
- {4477,4477, 0, 0, 40000, 73, 0, -2 },
- {4478,4478, 0, 0, 40000, 73, 0, 0 },
- {4479,4479, 0, 0, 40000, 73, 0, 0 },
- {4480,4480, 0, 0, 40000, 93, 0, 0 },
- {4481,4481, 0, 0, 40000, 73, 0, 0 },
- {4482,4482, 0, 0, 11946, 13, 0, 0 },
- {4483,4483, 0, 0, 40000, 73, 0, 0 },
- {4453,4453, 0, 0, 5866, 26, 0, 0 },
- {4484,4484, 0, 0, 40000, 820, 0, 0 },
- {4485,4485, 0, 0, 2153, 873, 0, 0 },
+ {4519,4519, 0, 0, 40000, 140, 0, -2 },
+ {4520,4520, 0, 0, 40000, 66, 0, 0 },
+ {4521,4521, 0, 0, 40000, 73, 0, 0 },
+ {4522,4522, 0, 0, 40000, 73, 0, 0 },
+ {4523,4523, 0, 0, 40000, 86, 0, -2 },
+ {4524,4524, 0, 0, 40000, 80, 0, 0 },
+ {4525,4525, 0, 0, 40000, 73, 0, -2 },
+ {4526,4526, 0, 0, 40000, 80, 0, -2 },
+ {4527,4527, 0, 0, 40000, 73, 0, -2 },
+ {4528,4528, 0, 0, 40000, 73, 0, 0 },
+ {4529,4529, 0, 0, 40000, 73, 0, 0 },
+ {4530,4530, 0, 0, 40000, 93, 0, 0 },
+ {4531,4531, 0, 0, 40000, 73, 0, 0 },
+ {4532,4532, 0, 0, 11946, 13, 0, 0 },
+ {4533,4533, 0, 0, 40000, 73, 0, 0 },
+ {4503,4503, 0, 0, 5866, 26, 0, 0 },
+ {4534,4534, 0, 0, 40000, 820, 0, 0 },
+ {4535,4535, 0, 0, 2153, 873, 0, 0 },
{1221,1221, 0, 0, 40000, 293, 0, 0.171875 },
- {4486,4486, 0, 0, 1620, 120, 0, 0 },
- {4487,4487, 0, 0, 15120, 93, 0, 0 },
- {4488,4488, 0, 0, 14613, 93, 0, 0 },
- {4489,4489, 0, 0, 2346, 793, 0, 0 },
- {4490,4490, 0, 0, 40000, 2380, 0, 0 },
- {4491,4491, 0, 0, 40000, 1280, 0, 0 },
- {4492,4492, 0, 0, 40000, 1460, 0, 0 },
- {4493,4493, 0, 0, 40000, 2513, 0, 0 },
- {4494,4494, 0, 0, 14840, 1266, 0, 0 },
- {4495,4495, 0, 0, 4513, 640, 0, 0 },
- {4496,4496, 0, 0, 4680, 806, 0, 0 },
- {4497,4497, 0, 0, 40000, 100, 0, 0 },
- {4498,4498, 0, 0, 40000, 66, 0, 0 },
- {4499,4499, 0, 0, 2420, 413, 0, 0 },
- {4500,4500, 0, 0, 406, 73, 0, -2 },
- {4501,4501, 0, 0, 1166, 400, 0, 0 },
- {4502,4502, 0, 0, 1213, 106, 0, 0 },
- {4503,4503, 0, 0, 273, 60, 0, -2 },
- {4504,4504, 0, 0, 40000, 2380, 0, 0 },
- {4505,4505, 0, 0, 40000, 440, 0, 0 },
+ {4536,4536, 0, 0, 1620, 120, 0, 0 },
+ {4537,4537, 0, 0, 15120, 93, 0, 0 },
+ {4538,4538, 0, 0, 14613, 93, 0, 0 },
+ {4539,4539, 0, 0, 2346, 793, 0, 0 },
+ {4540,4540, 0, 0, 40000, 2380, 0, 0 },
+ {4541,4541, 0, 0, 40000, 1280, 0, 0 },
+ {4542,4542, 0, 0, 40000, 1460, 0, 0 },
+ {4543,4543, 0, 0, 40000, 2513, 0, 0 },
+ {4544,4544, 0, 0, 14840, 1266, 0, 0 },
+ {4545,4545, 0, 0, 4513, 640, 0, 0 },
+ {4546,4546, 0, 0, 4680, 806, 0, 0 },
+ {4547,4547, 0, 0, 40000, 100, 0, 0 },
+ {4548,4548, 0, 0, 40000, 66, 0, 0 },
+ {4549,4549, 0, 0, 2420, 413, 0, 0 },
+ {4550,4550, 0, 0, 406, 73, 0, -2 },
+ {4551,4551, 0, 0, 1166, 400, 0, 0 },
+ {4552,4552, 0, 0, 1213, 106, 0, 0 },
+ {4553,4553, 0, 0, 273, 60, 0, -2 },
+ {4554,4554, 0, 0, 40000, 2380, 0, 0 },
+ {4555,4555, 0, 0, 40000, 440, 0, 0 },
{1261,1261, 0, 0, 40000, 2960, 0, 0 },
- {4506,4506, 37, 0, 973, 73, 0, -2 },
- {4507,4507, 48, 0, 106, 26, 0, -2 },
- {4508,4508, 48, 0, 286, 133, 0, -2 },
- {4509,4509, 62, 0, 166, 60, 0, 0 },
- {4510,4510, 44, 0, 980, 360, 0, 0 },
- {4511,4511, 80, 0, 100, 33, 0, 0 },
- {4510,4510, 50, 0, 980, 346, 0, 0 },
- {4512,4512, 48, 0, 106, 46, 0, -2 },
- {4510,4510, 55, 0, 973, 360, 0, 0 },
- {4513,4513, 61, 0, 513, 20, 0, 0 },
- {4510,4510, 58, 0, 966, 353, 0, 0 },
- {4510,4510, 63, 0, 973, 353, 0, 0 },
- {4514,4514, 71, 0, 1366, 580, 0, 0 },
- {4510,4510, 72, 0, 820, 306, 0, 0 },
- {4515,4515, 70, 0, 1886, 666, 0, 0 },
- {4514,4514, 88, 0, 1353, 560, 0, 0 },
- {4516,4516, 76, 0, 1873, 653, 0, 0 },
- {4517,4517, 84, 0, 260, 113, 0, 0 },
- {4514,4514, 68, 0, 1366, 553, 0, 0 },
- {4518,4518, 72, 0, 153, 53, 0, 0 },
- {4519,4519, 28, 0, 1193, 413, 0, 0 },
- {4515,4515, 81, 0, 1353, 480, 0, 0 },
- {4520,4520, 58, 0, 246, 120, 0, -2 },
- {4520,4520, 55, 0, 246, 120, 0, -2 },
- {4520,4520, 44, 0, 246, 120, 0, -2 },
- {4520,4520, 49, 0, 246, 120, 0, -2 },
- {4520,4520, 40, 0, 286, 133, 0, -2 },
- {4521,4521, 55, 0, 740, 560, 0, -2 },
- {4521,4521, 48, 0, 893, 693, 0, -2 },
- {4522,4522, 52, 0, 513, 206, 0, 0 },
- {4522,4522, 45, 0, 513, 206, 0, 0 },
- {4523,4523, 48, 0, 173, 100, 0, -2 },
- {4524,4524, 48, 0, 120, 266, 0, -2 },
- {4525,4525, 48, 0, 253, 60, 0, -2 },
- {4500,4500, 73, 0, 160, 20, 0, -2 },
- {4500,4500, 68, 0, 160, 20, 0, -2 },
- {4500,4500, 63, 0, 193, 20, 0, -2 },
- {4526,4526,108, 0, 406, 26, 0, 0 },
- {4527,4527,108, 0, 740, 26, 0, 0 },
+ {4556,4556, 37, 0, 973, 73, 0, -2 },
+ {4557,4557, 48, 0, 106, 26, 0, -2 },
+ {4558,4558, 48, 0, 286, 133, 0, -2 },
+ {4559,4559, 62, 0, 166, 60, 0, 0 },
+ {4560,4560, 44, 0, 980, 360, 0, 0 },
+ {4561,4561, 80, 0, 100, 33, 0, 0 },
+ {4560,4560, 50, 0, 980, 346, 0, 0 },
+ {4562,4562, 48, 0, 106, 46, 0, -2 },
+ {4560,4560, 55, 0, 973, 360, 0, 0 },
+ {4563,4563, 61, 0, 513, 20, 0, 0 },
+ {4560,4560, 58, 0, 966, 353, 0, 0 },
+ {4560,4560, 63, 0, 973, 353, 0, 0 },
+ {4564,4564, 71, 0, 1366, 580, 0, 0 },
+ {4560,4560, 72, 0, 820, 306, 0, 0 },
+ {4565,4565, 70, 0, 1886, 666, 0, 0 },
+ {4564,4564, 88, 0, 1353, 560, 0, 0 },
+ {4566,4566, 76, 0, 1873, 653, 0, 0 },
+ {4567,4567, 84, 0, 260, 113, 0, 0 },
+ {4564,4564, 68, 0, 1366, 553, 0, 0 },
+ {4568,4568, 72, 0, 153, 53, 0, 0 },
+ {4569,4569, 28, 0, 1193, 413, 0, 0 },
+ {4565,4565, 81, 0, 1353, 480, 0, 0 },
+ {4570,4570, 58, 0, 246, 120, 0, -2 },
+ {4570,4570, 55, 0, 246, 120, 0, -2 },
+ {4570,4570, 44, 0, 246, 120, 0, -2 },
+ {4570,4570, 49, 0, 246, 120, 0, -2 },
+ {4570,4570, 40, 0, 286, 133, 0, -2 },
+ {4571,4571, 55, 0, 740, 560, 0, -2 },
+ {4571,4571, 48, 0, 893, 693, 0, -2 },
+ {4572,4572, 52, 0, 513, 206, 0, 0 },
+ {4572,4572, 45, 0, 513, 206, 0, 0 },
+ {4573,4573, 48, 0, 173, 100, 0, -2 },
+ {4574,4574, 48, 0, 120, 266, 0, -2 },
+ {4575,4575, 48, 0, 253, 60, 0, -2 },
+ {4550,4550, 73, 0, 160, 20, 0, -2 },
+ {4550,4550, 68, 0, 160, 20, 0, -2 },
+ {4550,4550, 63, 0, 193, 20, 0, -2 },
+ {4576,4576,108, 0, 406, 26, 0, 0 },
+ {4577,4577,108, 0, 740, 26, 0, 0 },
};
@@ -9302,7 +9430,7 @@ const char* const banknames[76] =
"TMB (Duke Nukem 3D)",
"TMB (Shadow Warrior)",
"DMX (Raptor)",
- "OP3 (Modded GMOPL by Wohlstand)",
+ "SB (Modded GMOPL by Wohlstand)",
"SB (Jamie O'Connell's bank)",
"TMB (Default bank of Apogee Sound System)",
"WOPL (4op bank by James Alan Nguyen and Wohlstand)",
@@ -10315,24 +10443,24 @@ const unsigned short banks[75][256] =
3246,3247,3248,3196,3249,3250,3196,3251,3252,3253,3254,3255,3196,3196,3256,3196,
3257,3196,3258,3196,3259,3260,3196,3261,3196,3196,3262,3196,3196,3196,3196,3196,
3196,3196,3196,3263,3196,3196,3196,3196,3196,3196,3264,3265,3196,3196,3196,3196,
-3266,3267, 285,3268,3269, 287, 288,3270,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3272,3273,3271,3274,3271,3275,3276,3277,3278,3279,3280,3281,3282,
-3282,3283,3280,3284,3271,3271,3285,3286,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,
-3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,3271,
+3266,3267,3268,3269,3270,3271,3272,3273,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3274,3275,3196,3276,3196,3277,3278,3279,3280,3281,3282,3283,3284,
+3284,3285,3282,3286,3196,3196,3287,3288,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
},
{
-3287,3288, 466,3289, 713,3196,3290, 467,3291, 632,3292,3293,3294,3295,3296,3297,
-3298, 598,3299,3300,3301,3302,3303,3304,1512,3305,3294,3306, 759, 437, 437,3307,
-3308,3309, 439,3310, 440,3311, 442, 441,3312,3313,3314,3315,2306,3316,3317, 582,
-3318,3319, 452,3320,3321,3290,3322,3323,3324, 778,3325,2312, 779,3326,3327,3328,
-3329, 769,3330,3331,3332,3333, 663, 664,3334,2316,3335,3336,3337,1299,3338,3339,
-3340,3341,3342,3343,3344,3345,3346, 442,3347,3348,3349,3304,3350,1669,3351,3352,
-3353,3354,3355,3356,3353, 261,3357,3358,1919,2420,3359,3360, 676,3361,3362,3363,
-3364,3365,3366,3367, 677,3368, 677,3369,3370, 677,3371, 455,3372,2421,3373, 465,
+3289,3290, 466,3291, 713,3196,3292, 467,3293, 632,3294,3295,3296,3297,3298,3299,
+3300, 598,3301,3302,3303,3304,3305,3306,1512,3307,3296,3308, 759, 437, 437,3309,
+3310,3311, 439,3312, 440,3313, 442, 441,3314,3315,3316,3317,2306,3318,3319, 582,
+3320,3321, 452,3322,3323,3292,3324,3325,3326, 778,3327,2312, 779,3328,3329,3330,
+3331, 769,3332,3333,3334,3335, 663, 664,3336,2316,3337,3338,3339,1299,3340,3341,
+3342,3343,3344,3345,3346,3347,3348, 442,3349,3350,3351,3306,3352,1669,3353,3354,
+3355,3356,3357,3358,3355, 261,3359,3360,1919,2420,3361,3362, 676,3363,3364,3365,
+3366,3367,3368,3369, 677,3370, 677,3371,3372, 677,3373, 455,3374,2421,3375, 465,
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, 295, 295,
@@ -10343,14 +10471,14 @@ const unsigned short banks[75][256] =
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
},
{
-3374,3374,3375,3376,3377,3378,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,
-3388,3389,3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,
-3404,3405,3406,3407,3408,3409,3410,3411,3412,3413,3414,3415,3416,3417,3418,3419,
-3420,3421,3422,3423,3424,3425,3426,3427,3425,3428,3429,3430,3431,3432,3433,3434,
-3435,3436,3437,3438,3439,3440,3441,3442,3443,3444,3445,3446,3335,3447,3448,3449,
-3450,3451,3452,3453,3454,3455,3456,3457,3458,3459,3460,3461,3462,3462,3463,3464,
-3465,3466,3467,3468,3469,3470,3471,3472,3473,3474,3475,3476,3477,3478,3479,3480,
-3481,3482,3481,3483,3484,3485,3486,3487,3488,3489,3490,3491,3492,3493,3494,3495,
+3376,3376,3377,3378,3379,3380,3380,3381,3382,3383,3384,3385,3386,3387,3388,3389,
+3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,
+3406,3407,3408,3409,3410,3411,3412,3413,3414,3415,3416,3417,3418,3419,3420,3421,
+3422,3423,3424,3425,3426,3427,3428,3429,3427,3430,3431,3432,3433,3434,3435,3436,
+3437,3438,3439,3440,3441,3442,3443,3444,3445,3446,3447,3448,3337,3449,3450,3451,
+3452,3453,3454,3455,3456,3457,3458,3459,3460,3461,3462,3463,3464,3464,3465,3466,
+3467,3468,3469,3470,3471,3472,3473,3474,3475,3476,3477,3478,3479,3480,3481,3482,
+3483,3484,3483,3485,3486,3487,3488,3489,3490,3491,3492,3493,3494,3495,3496,3497,
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, 295, 295,
@@ -10372,114 +10500,114 @@ const unsigned short banks[75][256] =
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, 127, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,3496, 150, 151, 152, 153, 154,
+ 139, 140, 141, 142, 143, 144, 145, 146, 147, 148,3498, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
171, 172, 173, 174, 175, 176, 177, 178, 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,
},
{
-1551,1552,1553,1554, 181, 182, 183,1555, 185,1556,3497,3498,3499, 188, 189,1560,
-1561,1562,1563,3500,1565, 195, 196, 197, 198, 199, 200, 201, 202,1566,1567, 205,
- 206, 207, 208,1568,1569,1570,1571,3501,1572,1573, 214, 215, 216, 217, 218, 219,
+1551,1552,1553,1554, 181, 182, 183,1555, 185,1556,3499,3500,3501, 188, 189,1560,
+1561,1562,1563,3502,1565, 195, 196, 197, 198, 199, 200, 201, 202,1566,1567, 205,
+ 206, 207, 208,1568,1569,1570,1571,3503,1572,1573, 214, 215, 216, 217, 218, 219,
220, 221,1574,1575,1576,1577,1578, 225,1579,1580, 226,1581,1582, 229, 230, 231,
232, 233, 234, 235,1583, 237, 238, 239,1584,1585, 240,1586, 242, 243, 244,1587,
246, 247,1588,1589, 249, 250, 251,1590, 252, 253, 254, 255,1591,1592,1593,1594,
1595, 259,1596,1597,1598,1599,1600,1601, 264, 265, 266, 267, 268, 269, 270, 271,
-1602, 272, 273,1603,1604,1605, 276,1606,1607, 295, 295,1610,3502,3503, 295, 284,
+1602, 272, 273,1603,1604,1605, 276,1606,1607, 295, 295,1610,3504,3505, 295, 284,
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, 127,3504,1613,1614,3505,1616,3506,1618,3507,1620,3508,1622,3509,
-3510,1625,3511,3512,1628,1629,1630,1631,3513,1633,1634,3514,1636,1637,1638,1639,
+ 295, 295, 295, 127,3506,1613,1614,3507,1616,3508,1618,3509,1620,3510,1622,3511,
+3512,1625,3513,3514,1628,1629,1630,1631,3515,1633,1634,3516,1636,1637,1638,1639,
1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,
1656,1657,1658,1659,1660,1661,1662,1663, 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,
},
{
-3515,3516,3517,3518,3519,3520,3521,3522,3523,3524,3525,3526,3527,3528,3529,3530,
-3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,3542,3543,3544,3545,3546,
-3547,3548,3549,3550,3551,3552,3553,3554,3555,3556,3557,3558,3559,3560,3561,3562,
-3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,
-3579,3580,3581,3582,3583,3584,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,
-3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,
-3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,
-3627,3628,3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,
+3517,3518,3519,3520,3521,3522,3523,3524,3525,3526,3527,3528,3529,3530,3531,3532,
+3533,3534,3535,3536,3537,3538,3539,3540,3541,3542,3543,3544,3545,3546,3547,3548,
+3549,3550,3551,3552,3553,3554,3555,3556,3557,3558,3559,3560,3561,3562,3563,3564,
+3565,3566,3567,3568,3569,3570,3571,3572,3573,3574,3575,3576,3577,3578,3579,3580,
+3581,3582,3583,3584,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,
+3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,
+3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,
+3629,3630,3631,3632,3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,3644,
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,3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,
-3657,3658,3659,3660,3658,3661,3662,3658,3663,3658,3664,3665,3666,3667,3668,3669,
-3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,
-3686,3687, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,
+3659,3660,3661,3662,3660,3663,3664,3660,3665,3660,3666,3667,3668,3669,3670,3671,
+3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,3686,3687,
+3688,3689, 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,
},
{
-3287,1492,3688,3289, 713,3689,3690, 730,1914,3691,1533,3293,3692,3693,3694,3695,
-3298,3696,3697,3698,3699,3700,3701,3702,3703,3704,3705,3706, 759, 437,3707,3708,
-3308,3709,3710,3711,3712,3713, 442,3714,3715,3716,3717,3718,3719,3720,3721,3722,
-3723,2306,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,
-3738,3739,3740,3741,3742,3743,3744,3745,3746,3747,3748,3749,3750,3751,3752,3753,
-3754,3755,3756,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,3767,3768,3769,
-3770,3771,3772,3773,3774,3775,3776,3777,3778,3779,3780,3781,3782,3783,3784,3785,
-3786,3787,3788,3789,3790,3791,3792,3793,3794,3795,3371,3796,3797,2421,3798,3799,
+3289,1492,3690,3291, 713,3691,3692, 730,1914,3693,1533,3295,3694,3695,3696,3697,
+3300,3698,3699,3700,3701,3702,3703,3704,3705,3706,3707,3708, 759, 437,3709,3710,
+3310,3711,3712,3713,3714,3715, 442,3716,3717,3718,3719,3720,3721,3722,3723,3724,
+3725,2306,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,3739,
+3740,3741,3742,3743,3744,3745,3746,3747,3748,3749,3750,3751,3752,3753,3754,3755,
+3756,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,3767,3768,3769,3770,3771,
+3772,3773,3774,3775,3776,3777,3778,3779,3780,3781,3782,3783,3784,3785,3786,3787,
+3788,3789,3790,3791,3792,3793,3794,3795,3796,3797,3373,3798,3799,2421,3800,3801,
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,3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,
-3657,3658,3659,3660,3658,3661,3662,3658,3663,3658,3664,3665,3666,3667,3668,3669,
-3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,
-3686,3687, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,3657,3658,
+3659,3660,3661,3662,3660,3663,3664,3660,3665,3660,3666,3667,3668,3669,3670,3671,
+3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,3686,3687,
+3688,3689, 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,
},
{
-3800,3801,3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,
-3816,3817,3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,
-3832,3833,3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,
-3840,3848,3849,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,
-3863,3864,3864,3865,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,
-3878,3879,3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,
-3894,3895,3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,
-3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,3924,3925,
+3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,3816,3817,
+3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,3832,3833,
+3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,3848,3849,
+3842,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,3863,3864,
+3865,3866,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,
+3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,3894,3895,
+3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,3910,3911,
+3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,3924,3925,3926,3927,
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,3927,3928,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,
-3940,3941,3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,
-3956,3957,3958,3959,3960,3936,3961,3962,3963,3964,3965,3966,3967,3968,3969,3970,
-3971,3972,3973, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,3940,3941,
+3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,3956,3957,
+3958,3959,3960,3961,3962,3938,3963,3964,3965,3966,3967,3968,3969,3970,3971,3972,
+3973,3974,3975, 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,
},
{
-3800,3801,3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,
-3816,3817,3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3974,3975,3831,
-3832,3833,3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3976,3845,3846,3847,
-3840,3848,3849,3850,3851,3852,3853,3854,3855,3856,3857,3858,3977,3860,3978,3862,
-3863,3864,3864,3865,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,
-3979,3879,3980,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,
-3894,3895,3896,3897,3898,3899,3900,3901,3902,3903,3981,3982,3983,3907,3908,3909,
-3910,3911,3912,3913,3984,3915,3916,3985,3918,3919,3920,3921,3922,3923,3924,3925,
-3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,
-3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3987,3987,3987,3987,3988,
-3987,3987,3987,3927,3928,3989,3930,3931,3932,3990,3934,3935,3936,3937,3938,3939,
-3940,3941,3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,
-3956,3957,3958,3959,3960,3936,3961,3962,3963,3991,3992,3966,3993,3994,3969,3970,
-3971,3972,3973,3987,3987,3987,3987,3987,3995,3986,3996,3996,3996,3996,3996,3996,
-3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,
-3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,
+3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,3816,3817,
+3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3976,3977,3833,
+3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3978,3847,3848,3849,
+3842,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3979,3862,3980,3864,
+3865,3866,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,
+3981,3881,3982,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,3894,3895,
+3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3983,3984,3985,3909,3910,3911,
+3912,3913,3914,3915,3986,3917,3918,3987,3920,3921,3922,3923,3924,3925,3926,3927,
+3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,
+3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3989,3989,3989,3989,3990,
+3989,3989,3989,3929,3930,3991,3932,3933,3934,3992,3936,3937,3938,3939,3940,3941,
+3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,3956,3957,
+3958,3959,3960,3961,3962,3938,3963,3964,3965,3993,3994,3968,3995,3996,3971,3972,
+3973,3974,3975,3989,3989,3989,3989,3989,3997,3988,3998,3998,3998,3998,3998,3998,
+3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,
+3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,
},
{
1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,
-1238,1239,1240,1241,1242,1243,1244,1245,3997,3998,3999,1249,1250,1376,1377,1253,
-1378,1255,1256,4000,1380,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,4001,
-1270,4002,4003,4004,4005,1275,1276,1277,1278,1279,1381,1281,1282,1283,1284,1285,
+1238,1239,1240,1241,1242,1243,1244,1245,3999,4000,4001,1249,1250,1376,1377,1253,
+1378,1255,1256,4002,1380,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,4003,
+1270,4004,4005,4006,4007,1275,1276,1277,1278,1279,1381,1281,1282,1283,1284,1285,
1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,
-1302,1303,1304,1305,4006,1307,1308,1309,1309,1310,1311,1312,1313,1314,1315,1316,
+1302,1303,1304,1305,4008,1307,1308,1309,1309,1310,1311,1312,1313,1314,1315,1316,
1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,
-1333,1334,1335,1336,1337,4007,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,
+1333,1334,1335,1336,1337,4009,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,
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, 312,1349,1350,4008,1352,4009,1354,4010,1355, 320,1356, 321,1357,
+ 295, 295, 295, 312,1349,1350,4010,1352,4011,1354,4012,1355, 320,1356, 321,1357,
1358,1359,1360,1361,1362,1363,1364,1383,1366,1359,1384,1361, 332, 333, 334, 335,
336,1368,1369, 338, 339, 320,1370, 295, 295, 295, 295,1372,1373,1374,1375, 295,
347, 348, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
@@ -10487,38 +10615,38 @@ const unsigned short banks[75][256] =
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
},
{
-4011,4012,4013,4014,4015,4016, 6, 7,4017, 9, 10,4018, 12, 13, 14, 15,
-4019,4020,4021,4022, 20,4023,4024,4025,4026,4027,4028,4029,4030,4031,4032,4033,
- 32,4034,4035,4036,4037,4038,4039,4040,4041,4042,4043,4044,4045,4046,4047, 46,
-4048,4049,4050,4051,4052,4053,4054, 54,4055,4056,4057,4058,4059,4060,4061,4062,
-4063,4064,4065, 66,4066,4067, 69,4068,4069,4070,4071, 74, 75, 76, 77, 78,
-4072,4073,4074, 82,4075,4076, 85,4077,4078, 88,4079,4080,4081,4082,4083,4084,
- 95, 96, 97,4085,4086,4087,4088, 102, 103,4089, 105, 106, 107,4090,4091,4092,
-4093, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,4094,4095,4096, 125,4097,
+4013,4014,4015,4016,4017,4018,4019, 7,4020, 9, 10,4021,4022,4023, 14, 15,
+4024,4025,4026,4027, 20,4028,4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,
+4039,4040,4041,4042,4043,4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,
+4055,4056,4057,4058,4059,4060,4061, 54,4062,4063,4064,4065,4066,4067,4068,4069,
+4070,4071,4072, 66,4073,4074, 69,4075,4076,4077,4078, 74, 75, 76, 77, 78,
+4079,4080,4081, 82,4082,4083, 85,4084,4085, 88,4086,4087,4088,4089, 93,4090,
+ 95, 96, 97,4091,4092, 100, 101,4093, 103,4094, 105, 106, 107,4095,4096,4097,
+4098, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,4099,4100,4101, 125,4102,
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,3644,3645,3646,3647,3648,3649,3650,3651,3652,3653,3654,3655,3656,
-3657,3658,3659,3660,3658,3661,3662,3658,3663,3658,3664,3665,3666,3667,3668,3669,
-3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,
-3686,3687, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,4104,4104,4105,4106,4107,4108,4109,4110,4111,4112,4113,4114,4115,
+4116,4117,4118,4119,4120,4121,4122,4123,4124,4123,4125,4126,4127,4128,4129,4130,
+4131,4132,4133,4134,4135,4136,4137,4138,4139,4140,4141,4142,4143,4144, 295, 295,
+4146,4147, 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,
},
{
-3287,3288, 466,3289, 713,3196,3290, 467,3291, 632,3292,3293,3294,3295,4098,3297,
-3298, 598,4099,3300,3301,3302,3303,3304,4100,4101,4102,4103, 759, 437, 438,3307,
-3308,3309, 439,3310, 440,4104, 442,4105,3312,3313,3314,3315,2306,4106,3317, 582,
-3318,3319, 452,3320,3321,4107,3322,3323,3324, 778,3325,2312, 779,3326,3327,3328,
-3329, 769,3330,3331,3332,3333, 663, 664,3334,2316,3335,3336,3337,1299,3338,3339,
-3340,3341,4108,3343,3344,3345,4109, 442,3347,3348,3349,3304,3350,1669,3351,3352,
-3353,3354,3355,3356,4110, 261,3357,3358,1919,2420,3359,3360, 676,3361,3362,3363,
-3364,4111,3366,3367,4112,4113, 680,3369,3370, 462,3371, 455,3372,2421,3373, 465,
+3289,3290, 466,3291, 713,3196,3292, 467,3293, 632,3294,3295,3296,3297,4148,3299,
+3300, 598,4149,3302,3303,3304,3305,3306,1512,3307,3707,3308, 759, 437, 438,3309,
+3310,3311, 439,3312, 440,4150, 442, 441,3314,3315,3316,3317,2306,4151,3319, 582,
+3320,3321, 452,3322,3323,4152,3324,3325,3326, 778,3327,2312, 779,3328,3329,3330,
+3331, 769,3332,3333,3334,3335, 663, 664,3336,2316,3337,3338,3339,1299,3340,3341,
+3342,3343,4153,3345,3346,3347,4154, 442,3349,3350,3351,3306,3352,1669,3353,3354,
+3355,3356,3357,3358,4155, 261,3359,3360,1919,2420,3361,3362, 676,3363,3364,3365,
+3366,4156,3368,3369,4157,4158, 680,3371,3372, 462,3373, 455,3374,2421,3375, 465,
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,3644,3645,4114,3649,3648,4115,4116,4117,4118,4119,4120,4121,4122,
-4123,3658,4124,3660,3658,3661,3662,3658,3663,3658,3664,2617,3666,3667,3668,3669,
-3670,3671,3672,3673,3674, 160,3676,3677,3678,3679,3680,3681,3682,3683,3684,3685,
-3686,3687, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4170,4171,
+4172,4173,4174,4175,4176,4177,4178,4179,4180,4176,4181,4182,4183,4184,4185,4186,
+4187,4171,4169,4188,4189,4190,4191,4192,4193,4194,4195,4196,4197,4198,4199,4200,
+4201,4202, 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,
},
@@ -10533,28 +10661,28 @@ const unsigned short banks[75][256] =
111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127,4125,4126,4127, 141,4128,4129,4130,4129,4131,4129,4132,4133,
-4134,1954,4135,4136,4137,4138,4139,4140,4141,4142,4143,4144,4145,4146,4147,4148,
-4149,4150,4151,4152,4153,4154, 163,4155, 625,4156,4157,4158,4159,4160,4161,4162,
-4163,4164,4165,4166,4167,4168,4169, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127,4203,4204,4205, 141,4206,4207,4208,4207,4209,4207,4210,4211,
+4212,1954,4213,4214,4215,4216,4217,4218,4219,4220,4221,4222,4223,4224,4225,4226,
+4227,4228,4229,4230,4231,4232, 163,4233, 625,4234,4235,4236,4237,4238,4239,4240,
+4241,4242,4243,4244,4245,4246,4247, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
},
{
-4170,4171,1553,1554, 181,4172,4173,1555, 185,4174,3497,4175,1559, 188,4176,4177,
-4178,1562,4179,4180,1565, 195,4181, 197,4182,4183, 200, 201, 28,1566,1567,4184,
-4185,4186,4187,4188,4189,4190,4191,4192,1572,1573, 214, 215, 216, 217, 218, 219,
- 220,4193,4194,1575,1576,3852,1578,4195,1579,1580,4196,4197,4198,4199,4200,4201,
- 232, 233, 234, 235,4202, 237, 238,4203,1584,1585, 240,1586,4204, 243, 244,1587,
- 246,4205,4206,1589, 249, 250, 251,1590, 252,4207, 254,3889,4208,4209,4210,4211,
-1595,4212,1596,1597,4213,1599,1600,1601,4214,4215,4216, 267,4217,4218, 270,4219,
-4220,4221,4222,1603,4223,4224, 276,4225,4226,4227,4228,1610,4229,4230,4231, 126,
+4248,4249,1553,1554, 181,4250,4251,1555, 185,4252,3499,4253,1559, 188,4254,4255,
+4256,1562,4257,4258,1565, 195,4259, 197,4260,4261, 200, 201, 28,1566,1567,4262,
+4263,4264,4265,4266,4267,4268,4269,4270,1572,1573, 214, 215, 216, 217, 218, 219,
+ 220,4271,4272,1575,1576,3854,1578,4273,1579,1580,4274,4275,4276,4277,4278,4279,
+ 232, 233, 234, 235,4280, 237, 238,4281,1584,1585, 240,1586,4282, 243, 244,1587,
+ 246,4283,4284,1589, 249, 250, 251,1590, 252,4285, 254,3891,4286,4287,4288,4289,
+1595,4290,1596,1597,4291,1599,1600,1601,4292,4293,4294, 267,4295,4296, 270,4297,
+4298,4299,4300,1603,4301,4302, 276,4303,4304,4305,4306,1610,4307,4308,4309, 126,
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,1662,1663, 295,
- 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,4232,4233,4234,4235,4236,
-4237,4238,4239,4240,1470,1613,4241,1615,4242,1475,4243,1477,4244,1479,4245,1481,
-1482,4246,1484,4247,4248,4249,1630,4250,2291,4251,1634,3514,1636,1637,1638,1639,
-1640,4252,4253,1643,1644, 320,4254,4255, 342,4256,4257,4258,4259,1374,4260,4261,
-1656,4262,4263,1659,1660,4264,1662,1663, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,4310,4311,4312,4313,4314,
+4315,4316,4317,4318,1470,1613,4319,1615,4320,1475,4321,1477,4322,1479,4323,1481,
+1482,4324,1484,4325,4326,4327,1630,4328,2291,4329,1634,3516,1636,1637,1638,1639,
+1640,4330,4331,1643,1644, 320,4332,4333, 342,4334,4335,4336,4337,1374,4338,4339,
+1656,4340,4341,1659,1660,4342,1662,1663, 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,
},
@@ -10566,9 +10694,9 @@ const unsigned short banks[75][256] =
2224, 909,2225, 911, 912,2226,2227, 915, 916,2228,2229, 919, 920, 921, 922, 923,
2230, 925, 926, 927, 928, 929, 295, 931, 932, 933, 934, 935,2232,2233, 938,2234,
940, 295, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955,
- 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966,4267, 968,4268, 295, 295,
-4269,4270,4271,4272,4273,4274,4275, 978,4276,4277,4278,4279,4280,4281,4282,4283,
-4284,4285,4286,4287,4288,4289,4290,4291,4292,4293,4294, 975, 971, 972, 973, 974,
+ 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966,4345, 968,4346, 295, 295,
+4347,4348,4349,4350,4351,4352,4353, 978,4354,4355,4356,4357,4358,4359,4360,4361,
+4362,4363,4364,4365,4366,4367,4368,4369,4370,4371,4372, 975, 971, 972, 973, 974,
975, 310, 976, 977, 978, 974,2239, 980,2240, 982,2241, 984,2242, 985,2243, 987,
988,2244, 990, 325,2244, 325, 991,2244,2245,2246, 330, 993,2247,2248,2249, 997,
998,2250,2251,1001,1002,1003, 340,1004,1005,1006,1007,1008,1009, 310,1010,1011,
@@ -10577,62 +10705,62 @@ const unsigned short banks[75][256] =
295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
},
{
-3287,4296,3196,3196,4297,3196,3196,3196,3196,3196,3196, 378,3196,3196,3694,3196,
-3196,4298,3196,4299,4300,4301,3196,3196,3196, 370,3196,4302,4303,4304,4305,4306,
-3196,4307,4308,4309,3310,3310,4310, 442,4311,3196,3196,4312,4313,4312, 676,4314,
-4315,3196,3196,4316, 51,3196,3196,3196,4317,3324,4318,3196, 59,4319,4317, 62,
-3196,4320,4320,4321, 67,3196, 664,4322,3196,2316,3196,4323, 70,3196,4324, 78,
-4325,4326, 81,3196,3196,3196,3196,3196,3196,3196,3196, 90,3196,4327, 93,4328,
-3196,3196,3196,3196,3196,3196,3196,4329,3196,3196,3196,3196,3196,3196,3196,3196,
-3196,3196,3196,3196,3196,4112,3196,4330,3196,3196,3196,3196,3196,3196,3196,3196,
+3289,4374,3196,3196,4375,3196,3196,3196,3196,3196,3196, 378,3196,3196,3696,3196,
+3196,4376,3196,4377,4378,4379,3196,3196,3196, 370,3196,4380,4381,4382,4383,4384,
+3196,4385,4386,4387,3312,3312,4388, 442,4389,3196,3196,4390,4391,4390, 676,4392,
+4393,3196,3196,4394, 51,3196,3196,3196,4395,3326,4396,3196, 59,4397,4395, 62,
+3196,4398,4398,4399, 67,3196, 664,4400,3196,2316,3196,4401, 70,3196,4402, 78,
+4403,4404, 81,3196,3196,3196,3196,3196,3196,3196,3196, 90,3196,4405, 93,4406,
+3196,3196,3196,3196,3196,3196,3196,4407,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,3196,3196,4157,3196,4408,3196,3196,3196,3196,3196,3196,3196,3196,
3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
-3196,3196,3196,4331,4331,4332,4333,4334,4335,4336,4337,4338,4339,4340,4341,4342,
-4343,4344,4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,3196,3196,4355, 154,
-4356,4357,4358,3196,3196, 160,3196,3196,3196,4359,4360,4361,4362,4363,4364,3196,
-3196,4365, 160,4366,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
+3196,3196,3196,4409,4409,4410,4411,4412,4413,4414,4415,4416,4417,4418,4419,4420,
+4421,4422,4423,4424,4425,4426,4427,4428,4429,4430,4431,4432,3196,3196,4433, 154,
+4434,4435,4436,3196,3196, 160,3196,3196,3196,4437,4438,4439,4440,4441,4442,3196,
+3196,4443, 160,4444,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,3196,
},
{
-3800,3801,3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,
-3816,3817,3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,
-3832,3833,3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,
-3840,3848,3849,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,
-3863,3864,3864,3865,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,
-3878,3879,3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,
-3894,3895,3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,
-3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,4367,3921,3922,3923,3924,3925,
-3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,
-3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3986,3987,3987,3987,3987,3987,
-3987,3987,3987,3927,3928,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,
-3940,3941,3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,
-3956,3957,3958,3959,3960,3936,3961,3962,3963,3964,3965,3966,3967,3968,3969,3970,
-3971,3972,3973,3987,3987,3987,3987,3987,3995,3986,3996,3996,3996,3996,3996,3996,
-3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,
-3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,3996,
+3802,3803,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,3814,3815,3816,3817,
+3818,3819,3820,3821,3822,3823,3824,3825,3826,3827,3828,3829,3830,3831,3832,3833,
+3834,3835,3836,3837,3838,3839,3840,3841,3842,3843,3844,3845,3846,3847,3848,3849,
+3842,3850,3851,3852,3853,3854,3855,3856,3857,3858,3859,3860,3861,3862,3863,3864,
+3865,3866,3866,3867,3868,3869,3870,3871,3872,3873,3874,3875,3876,3877,3878,3879,
+3880,3881,3882,3883,3884,3885,3886,3887,3888,3889,3890,3891,3892,3893,3894,3895,
+3896,3897,3898,3899,3900,3901,3902,3903,3904,3905,3906,3907,3908,3909,3910,3911,
+3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,4445,3923,3924,3925,3926,3927,
+3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,
+3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3988,3989,3989,3989,3989,3989,
+3989,3989,3989,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,3940,3941,
+3942,3943,3944,3945,3946,3947,3948,3949,3950,3951,3952,3953,3954,3955,3956,3957,
+3958,3959,3960,3961,3962,3938,3963,3964,3965,3966,3967,3968,3969,3970,3971,3972,
+3973,3974,3975,3989,3989,3989,3989,3989,3997,3988,3998,3998,3998,3998,3998,3998,
+3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,
+3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,3998,
},
{
-4368,4369,4370,4371,4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,
-4384,4385,4386,4387,4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,
-4400,4401,4402,4403,4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,
-4416,4417,4418,4419,4420,4421,4422,4423,4424,4425,4426,4197,4427,4428,4429,4430,
-4431,4432,4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,4204,4443,4444,4445,
4446,4447,4448,4449,4450,4451,4452,4453,4454,4455,4456,4457,4458,4459,4460,4461,
-4462,4463,4464,4465,4466,4467,4468,4469,4470,4215,4216,4471,4472,4218,4473,4474,
-4475,4476,4222,4477,4478,4224,4479,4480,4226,4481,4228,4482,4483,4484,4485,4486,
+4462,4463,4464,4465,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,4477,
+4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,4490,4491,4492,4493,
+4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4275,4505,4506,4507,4508,
+4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,4519,4520,4282,4521,4522,4523,
+4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,4536,4537,4538,4539,
+4540,4541,4542,4543,4544,4545,4546,4547,4548,4293,4294,4549,4550,4296,4551,4552,
+4553,4554,4300,4555,4556,4302,4557,4558,4304,4559,4306,4560,4561,4562,4563,4564,
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,4232,4233,4234,4235,4487,
-4237,4238,4239,4488,4489,4490,4491,4492,4242,4493,4494,4495,4244,4496,4245,4497,
-4498,4499,4500,4501,4248,4502,4503,4250,4504,4505,4506,4507,4508,4509,4510,4511,
-4512,4252,4253,4513,4514, 320,4515,4516,4517,4256,4257,4258,4259,1374,4260,4261,
-4518,4519,4263,4520,4521,4264,4522,4523, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,4310,4311,4312,4313,4565,
+4315,4316,4317,4566,4567,4568,4569,4570,4320,4571,4572,4573,4322,4574,4323,4575,
+4576,4577,4578,4579,4326,4580,4581,4328,4582,4583,4584,4585,4586,4587,4588,4589,
+4590,4330,4331,4591,4592, 320,4593,4594,4595,4334,4335,4336,4337,1374,4338,4339,
+4596,4597,4341,4598,4599,4342,4600,4601, 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,
},
{
-4524,4525,4526,4527,4525,4528,4529,4530,4531,4532,4533,4535,4536,4537,4538,4539,
-4540,4542,4544,4537,4546,4547,4548,4549,4550,4551,4552, 295, 28, 29, 30, 31,
+4602,4603,4604,4605,4603,4606,4607,4608,4609,4610,4611,4613,4614,4615,4616,4617,
+4618,4620,4622,4615,4624,4625,4626,4627,4628,4629,4630, 295, 28, 29, 30, 31,
32, 33, 34, 35, 36, 37, 38, 33, 39, 40, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
@@ -10641,28 +10769,28 @@ const unsigned short banks[75][256] =
111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
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, 127,4541, 128,4543, 130, 131, 132,4545, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 144,4534, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+ 295, 295, 295, 127,4619, 128,4621, 130, 131, 132,4623, 134, 135, 136, 137, 138,
+ 139, 140, 141, 142, 143, 144,4612, 146, 147, 148, 149, 150, 151, 152, 153, 154,
155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
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, 295, 295,
},
{
-4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,3295,4563,4567,
-3298,4568,4569,3298,4570,4571,4571,4571, 868, 869, 870,4572,4573,4574,4575,4576,
-4577,4578,4579,4579,4580,4577,4581,4582,3842,4583,4584,4584,4585,4586,4587,4588,
-4589,4590,4591,4591,4592,4107,3322,4593,4594,4595,4596,4597,4598,4594,4594,4599,
-3329, 769,3330,3331,4600,4601,4602,4603,4604,4605,4606,4607,4608,4605,1300,4609,
-4610,4611,4605,4570,4612,4594,4613,4614,3347,4615,4616,4617,4618,1314,4619,4620,
-4621,4622,4623,4616,4616,1322,4624,4625,4626,4627,4628,4627,3295,4629,3842,4630,
-4631,1334,4631,4632,4633,4634, 792,4635,1341,1342,1343,1344,4636,4637,4638,1348,
+4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,4644,3297,4641,4645,
+3300,4646,4647,3300,4648,4649,4649,4649, 868, 869, 870,4650,4651,4652,4653,4654,
+4655,4656,4657,4657,4658,4655,4659,4660,3844,4661,4662,4662,4663,4664,4665,4666,
+4667,4668,4669,4669,4670,4152,3324,4671,4672,4673,4674,4675,4676,4672,4672,4677,
+3331, 769,3332,3333,4678,4679,4680,4681,4682,4683,4684,4685,4686,4683,1300,4687,
+4688,4689,4683,4648,4690,4672,4691,4692,3349,4693,4694,4695,4696,1314,4697,4698,
+4699,4700,4701,4694,4694,1322,4702,4703,4704,4705,4706,4705,3297,4707,3844,4708,
+4709,1334,4709,4710,4711,4712, 792,4713,1341,1342,1343,1344,4714,4715,4716,1348,
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,4639,4639,4640,4641,4640,4642,4643,4644,4645,4646,4647,4648,4649,
-4650,4651,4652,4653,4654,4655,4656,4657,4658,4651,4659,4660,4661,4662,4663,4664,
-4665,4666,4667,4668,4669,4670,4671,4668,4669,4670,4672,4673,4674,4675,1375, 295,
-4676,4677, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, 295,
+ 295, 295, 295,4717,4717,4718,4719,4718,4720,4721,4722,4723,4724,4725,4726,4727,
+4728,4729,4730,4731,4732,4733,4734,4735,4736,4729,4737,4738,4739,4740,4741,4742,
+4743,4744,4745,4746,4747,4748,4749,4746,4747,4748,4750,4751,4752,4753,1375, 295,
+4754,4755, 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,
},
@@ -10670,79 +10798,79 @@ const unsigned short banks[75][256] =
const AdlBankSetup adlbanksetup[75] =
{
- {0, 1, 1, 0, 0}, //Bank 0, AIL (Star Control 3, Albion, Empire 2, etc.)
- {0, 1, 1, 0, 0}, //Bank 1, Bisqwit (selection of 4op and 2op)
- {0, 0, 0, 0, 0}, //Bank 2, HMI (Descent, Asterix)
- {0, 0, 0, 0, 0}, //Bank 3, HMI (Descent:: Int)
- {0, 0, 0, 0, 0}, //Bank 4, HMI (Descent:: Ham)
- {0, 0, 0, 0, 0}, //Bank 5, HMI (Descent:: Rick)
- {0, 0, 0, 0, 0}, //Bank 6, HMI (Descent 2)
- {0, 0, 0, 0, 0}, //Bank 7, HMI (Normality)
- {0, 0, 0, 0, 0}, //Bank 8, HMI (Shattered Steel)
- {3, 0, 0, 0, 0}, //Bank 9, HMI (Theme Park)
- {0, 0, 0, 0, 0}, //Bank 10, HMI (3d Table Sports, Battle Arena Toshinden)
- {0, 0, 0, 0, 0}, //Bank 11, HMI (Aces of the Deep)
- {0, 0, 0, 0, 0}, //Bank 12, HMI (Earthsiege)
- {0, 0, 0, 0, 0}, //Bank 13, HMI (Anvil of Dawn)
- {2, 0, 0, 0, 0}, //Bank 14, DMX (Doom 2)
- {2, 0, 0, 0, 0}, //Bank 15, DMX (Hexen, Heretic)
- {2, 0, 0, 0, 0}, //Bank 16, DMX (DOOM, MUS Play)
- {0, 1, 1, 0, 0}, //Bank 17, AIL (Discworld, Grandest Fleet, etc.)
- {0, 1, 1, 0, 0}, //Bank 18, AIL (Warcraft 2)
- {0, 1, 1, 0, 0}, //Bank 19, AIL (Syndicate)
- {0, 1, 1, 0, 0}, //Bank 20, AIL (Guilty, Orion Conspiracy, TNSFC ::4op)
- {0, 1, 1, 0, 0}, //Bank 21, AIL (Magic Carpet 2)
- {0, 1, 1, 0, 0}, //Bank 22, AIL (Nemesis)
- {0, 1, 1, 0, 0}, //Bank 23, AIL (Jagged Alliance)
- {0, 1, 1, 0, 0}, //Bank 24, AIL (When Two Worlds War :MISS-INS:)
- {0, 1, 1, 0, 0}, //Bank 25, AIL (Bards Tale Construction :MISS-INS:)
- {0, 1, 1, 0, 0}, //Bank 26, AIL (Return to Zork)
- {0, 1, 1, 0, 0}, //Bank 27, AIL (Theme Hospital)
- {0, 1, 1, 0, 0}, //Bank 28, AIL (National Hockey League PA)
- {0, 1, 1, 0, 0}, //Bank 29, AIL (Inherit The Earth)
- {0, 1, 1, 0, 0}, //Bank 30, AIL (Inherit The Earth, file two)
- {0, 1, 1, 0, 0}, //Bank 31, AIL (Little Big Adventure :: 4op)
- {0, 1, 1, 0, 0}, //Bank 32, AIL (Wreckin Crew)
- {0, 1, 1, 0, 0}, //Bank 33, AIL (Death Gate)
- {0, 1, 1, 0, 0}, //Bank 34, AIL (FIFA International Soccer)
- {0, 1, 1, 0, 0}, //Bank 35, AIL (Starship Invasion)
- {0, 1, 1, 0, 0}, //Bank 36, AIL (Super Street Fighter 2 :4op:)
- {0, 1, 1, 0, 0}, //Bank 37, AIL (Lords of the Realm :MISS-INS:)
- {0, 1, 1, 0, 0}, //Bank 38, AIL (SimFarm, SimHealth :: 4op)
- {0, 1, 1, 0, 0}, //Bank 39, AIL (SimFarm, Settlers, Serf City)
- {0, 1, 1, 0, 0}, //Bank 40, AIL (Caesar 2, :p4op::MISS-INS:)
- {0, 1, 1, 0, 0}, //Bank 41, AIL (Syndicate Wars)
- {0, 1, 1, 0, 0}, //Bank 42, AIL (Bubble Bobble Feat. Rainbow Islands, Z)
- {0, 1, 1, 0, 0}, //Bank 43, AIL (Warcraft)
- {0, 1, 1, 0, 0}, //Bank 44, AIL (Terra Nova Strike Force Centuri :p4op:)
- {0, 1, 1, 0, 0}, //Bank 45, AIL (System Shock :p4op:)
- {0, 1, 1, 0, 0}, //Bank 46, AIL (Advanced Civilization)
- {0, 1, 1, 0, 0}, //Bank 47, AIL (Battle Chess 4000 :p4op:)
- {0, 1, 1, 0, 0}, //Bank 48, AIL (Ultimate Soccer Manager :p4op:)
- {0, 1, 1, 0, 0}, //Bank 49, AIL (Air Bucks, Blue And The Gray, etc)
- {0, 1, 1, 0, 0}, //Bank 50, AIL (Ultima Underworld 2)
- {0, 1, 1, 0, 0}, //Bank 51, AIL (Kasparov's Gambit)
- {0, 1, 1, 0, 0}, //Bank 52, AIL (High Seas Trader :MISS-INS:)
- {0, 0, 0, 0, 0}, //Bank 53, AIL (Master of Magic, :4op: std percussion)
- {0, 0, 0, 0, 0}, //Bank 54, AIL (Master of Magic, :4op: orchestral percussion)
- {0, 0, 0, 0, 0}, //Bank 55, SB (Action Soccer)
- {0, 0, 0, 0, 0}, //Bank 56, SB (3d Cyberpuck :: melodic only)
- {0, 0, 0, 0, 0}, //Bank 57, SB (Simon the Sorcerer :: melodic only)
- {4, 1, 1, 0, 0}, //Bank 58, OP3 (The Fat Man 2op set)
- {0, 1, 1, 0, 0}, //Bank 59, OP3 (The Fat Man 4op set)
- {4, 1, 1, 0, 0}, //Bank 60, OP3 (JungleVision 2op set :: melodic only)
- {4, 1, 1, 0, 0}, //Bank 61, OP3 (Wallace 2op set, Nitemare 3D :: melodic only)
- {3, 0, 0, 0, 0}, //Bank 62, TMB (Duke Nukem 3D)
- {3, 0, 0, 0, 0}, //Bank 63, TMB (Shadow Warrior)
- {2, 0, 0, 0, 0}, //Bank 64, DMX (Raptor)
- {3, 0, 0, 0, 0}, //Bank 65, OP3 (Modded GMOPL by Wohlstand)
- {3, 0, 0, 0, 0}, //Bank 66, SB (Jamie O'Connell's bank)
- {3, 0, 0, 0, 0}, //Bank 67, TMB (Default bank of Apogee Sound System)
- {0, 1, 1, 0, 0}, //Bank 68, WOPL (4op bank by James Alan Nguyen and Wohlstand)
- {3, 0, 0, 0, 0}, //Bank 69, TMB (Blood)
- {3, 0, 0, 0, 0}, //Bank 70, TMB (Lee)
- {3, 0, 0, 0, 0}, //Bank 71, TMB (Nam)
- {0, 0, 0, 0, 0}, //Bank 72, WOPL (DMXOPL3 bank by Sneakernets)
- {1, 0, 0, 0, 0}, //Bank 73, EA (Cartooners)
- {0, 0, 1, 0, 0} //Bank 74, WOPL (Apogee IMF 90-ish)
+ {0, 1, 1, 0}, //Bank 0, AIL (Star Control 3, Albion, Empire 2, etc.)
+ {0, 1, 1, 0}, //Bank 1, Bisqwit (selection of 4op and 2op)
+ {0, 0, 0, 0}, //Bank 2, HMI (Descent, Asterix)
+ {0, 0, 0, 0}, //Bank 3, HMI (Descent:: Int)
+ {0, 0, 0, 0}, //Bank 4, HMI (Descent:: Ham)
+ {0, 0, 0, 0}, //Bank 5, HMI (Descent:: Rick)
+ {0, 0, 0, 0}, //Bank 6, HMI (Descent 2)
+ {0, 0, 0, 0}, //Bank 7, HMI (Normality)
+ {0, 0, 0, 0}, //Bank 8, HMI (Shattered Steel)
+ {3, 0, 0, 0}, //Bank 9, HMI (Theme Park)
+ {0, 0, 0, 0}, //Bank 10, HMI (3d Table Sports, Battle Arena Toshinden)
+ {0, 0, 0, 0}, //Bank 11, HMI (Aces of the Deep)
+ {0, 0, 0, 0}, //Bank 12, HMI (Earthsiege)
+ {0, 0, 0, 0}, //Bank 13, HMI (Anvil of Dawn)
+ {2, 0, 0, 0}, //Bank 14, DMX (Doom 2)
+ {2, 0, 0, 0}, //Bank 15, DMX (Hexen, Heretic)
+ {2, 0, 0, 0}, //Bank 16, DMX (DOOM, MUS Play)
+ {0, 1, 1, 0}, //Bank 17, AIL (Discworld, Grandest Fleet, etc.)
+ {0, 1, 1, 0}, //Bank 18, AIL (Warcraft 2)
+ {0, 1, 1, 0}, //Bank 19, AIL (Syndicate)
+ {0, 1, 1, 0}, //Bank 20, AIL (Guilty, Orion Conspiracy, TNSFC ::4op)
+ {0, 1, 1, 0}, //Bank 21, AIL (Magic Carpet 2)
+ {0, 1, 1, 0}, //Bank 22, AIL (Nemesis)
+ {0, 1, 1, 0}, //Bank 23, AIL (Jagged Alliance)
+ {0, 1, 1, 0}, //Bank 24, AIL (When Two Worlds War :MISS-INS:)
+ {0, 1, 1, 0}, //Bank 25, AIL (Bards Tale Construction :MISS-INS:)
+ {0, 1, 1, 0}, //Bank 26, AIL (Return to Zork)
+ {0, 1, 1, 0}, //Bank 27, AIL (Theme Hospital)
+ {0, 1, 1, 0}, //Bank 28, AIL (National Hockey League PA)
+ {0, 1, 1, 0}, //Bank 29, AIL (Inherit The Earth)
+ {0, 1, 1, 0}, //Bank 30, AIL (Inherit The Earth, file two)
+ {0, 1, 1, 0}, //Bank 31, AIL (Little Big Adventure :: 4op)
+ {0, 1, 1, 0}, //Bank 32, AIL (Wreckin Crew)
+ {0, 1, 1, 0}, //Bank 33, AIL (Death Gate)
+ {0, 1, 1, 0}, //Bank 34, AIL (FIFA International Soccer)
+ {0, 1, 1, 0}, //Bank 35, AIL (Starship Invasion)
+ {0, 1, 1, 0}, //Bank 36, AIL (Super Street Fighter 2 :4op:)
+ {0, 1, 1, 0}, //Bank 37, AIL (Lords of the Realm :MISS-INS:)
+ {0, 1, 1, 0}, //Bank 38, AIL (SimFarm, SimHealth :: 4op)
+ {0, 1, 1, 0}, //Bank 39, AIL (SimFarm, Settlers, Serf City)
+ {0, 1, 1, 0}, //Bank 40, AIL (Caesar 2, :p4op::MISS-INS:)
+ {0, 1, 1, 0}, //Bank 41, AIL (Syndicate Wars)
+ {0, 1, 1, 0}, //Bank 42, AIL (Bubble Bobble Feat. Rainbow Islands, Z)
+ {0, 1, 1, 0}, //Bank 43, AIL (Warcraft)
+ {0, 1, 1, 0}, //Bank 44, AIL (Terra Nova Strike Force Centuri :p4op:)
+ {0, 1, 1, 0}, //Bank 45, AIL (System Shock :p4op:)
+ {0, 1, 1, 0}, //Bank 46, AIL (Advanced Civilization)
+ {0, 1, 1, 0}, //Bank 47, AIL (Battle Chess 4000 :p4op:)
+ {0, 1, 1, 0}, //Bank 48, AIL (Ultimate Soccer Manager :p4op:)
+ {0, 1, 1, 0}, //Bank 49, AIL (Air Bucks, Blue And The Gray, etc)
+ {0, 1, 1, 0}, //Bank 50, AIL (Ultima Underworld 2)
+ {0, 1, 1, 0}, //Bank 51, AIL (Kasparov's Gambit)
+ {0, 1, 1, 0}, //Bank 52, AIL (High Seas Trader :MISS-INS:)
+ {0, 0, 0, 0}, //Bank 53, AIL (Master of Magic, :4op: std percussion)
+ {0, 0, 0, 0}, //Bank 54, AIL (Master of Magic, :4op: orchestral percussion)
+ {0, 0, 0, 0}, //Bank 55, SB (Action Soccer)
+ {0, 0, 0, 0}, //Bank 56, SB (3d Cyberpuck :: melodic only)
+ {0, 0, 0, 0}, //Bank 57, SB (Simon the Sorcerer :: melodic only)
+ {4, 1, 1, 0}, //Bank 58, OP3 (The Fat Man 2op set)
+ {0, 1, 1, 0}, //Bank 59, OP3 (The Fat Man 4op set)
+ {4, 1, 1, 0}, //Bank 60, OP3 (JungleVision 2op set :: melodic only)
+ {4, 1, 1, 0}, //Bank 61, OP3 (Wallace 2op set, Nitemare 3D :: melodic only)
+ {3, 0, 0, 0}, //Bank 62, TMB (Duke Nukem 3D)
+ {3, 0, 0, 0}, //Bank 63, TMB (Shadow Warrior)
+ {2, 0, 0, 0}, //Bank 64, DMX (Raptor)
+ {0, 0, 0, 0}, //Bank 65, SB (Modded GMOPL by Wohlstand)
+ {0, 0, 0, 0}, //Bank 66, SB (Jamie O'Connell's bank)
+ {3, 0, 0, 0}, //Bank 67, TMB (Default bank of Apogee Sound System)
+ {0, 1, 1, 0}, //Bank 68, WOPL (4op bank by James Alan Nguyen and Wohlstand)
+ {3, 0, 0, 0}, //Bank 69, TMB (Blood)
+ {3, 0, 0, 0}, //Bank 70, TMB (Lee)
+ {3, 0, 0, 0}, //Bank 71, TMB (Nam)
+ {0, 0, 0, 0}, //Bank 72, WOPL (DMXOPL3 bank by Sneakernets)
+ {1, 0, 0, 0}, //Bank 73, EA (Cartooners)
+ {0, 0, 1, 0} //Bank 74, WOPL (Apogee IMF 90-ish)
};
diff --git a/src/adldata.hh b/src/adldata.hh
index 0d219e1..6602e1a 100644
--- a/src/adldata.hh
+++ b/src/adldata.hh
@@ -91,7 +91,6 @@ struct AdlBankSetup
int volumeModel;
bool deepTremolo;
bool deepVibrato;
- bool adLibPercussions;
bool scaleModulators;
};
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp
index 575b533..72cf601 100644
--- a/src/adlmidi.cpp
+++ b/src/adlmidi.cpp
@@ -425,21 +425,11 @@ ADLMIDI_EXPORT int adl_getNumFourOpsChnObtained(struct ADL_MIDIPlayer *device)
return (int)play->m_synth->m_numFourOps;
}
-
+/* !!!DEPRECATED!!! AND !!DUMMIED!! */
ADLMIDI_EXPORT void adl_setPercMode(ADL_MIDIPlayer *device, int percmod)
{
- if(!device) return;
- MidiPlayer *play = GET_MIDI_PLAYER(device);
- assert(play);
- Synth &synth = *play->m_synth;
- play->m_setup.rhythmMode = percmod;
- if(!synth.setupLocked())
- {
- synth.m_rhythmMode = play->m_setup.rhythmMode < 0 ?
- (synth.m_insBankSetup.adLibPercussions) :
- (play->m_setup.rhythmMode != 0);
- synth.updateChannelCategories();
- }
+ ADL_UNUSED(device);
+ ADL_UNUSED(percmod);
}
ADLMIDI_EXPORT void adl_setHVibrato(ADL_MIDIPlayer *device, int hvibro)
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp
index d19c61a..53f2d0c 100644
--- a/src/adlmidi_load.cpp
+++ b/src/adlmidi_load.cpp
@@ -109,7 +109,6 @@ bool MIDIplay::LoadBank(FileAndMemReader &fr)
}
Synth &synth = *m_synth;
- synth.m_insBankSetup.adLibPercussions = false;
synth.m_insBankSetup.scaleModulators = false;
synth.m_insBankSetup.deepTremolo = (wopl->opl_flags & WOPL_FLAG_DEEP_TREMOLO) != 0;
synth.m_insBankSetup.deepVibrato = (wopl->opl_flags & WOPL_FLAG_DEEP_VIBRATO) != 0;
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp
index ca4c65f..1cea7d9 100644
--- a/src/adlmidi_midiplay.cpp
+++ b/src/adlmidi_midiplay.cpp
@@ -79,27 +79,6 @@ static const uint_fast32_t W9X_volume_mapping_table[32] =
//"????????????????" // Prc 96-111
//"????????????????"; // Prc 112-127
-static const uint8_t PercussionMap[256] =
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"//GM
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // 3 = bass drum
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // 4 = snare
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // 5 = tom
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // 6 = cymbal
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" // 7 = hihat
- "\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\0\0\0\0\0\0\0\0\0\0\0\0"//GP0
- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"//GP16
- //2 3 4 5 6 7 8 940 1 2 3 4 5 6 7
- "\0\0\0\3\3\0\0\7\0\5\7\5\0\5\7\5"//GP32
- //8 950 1 2 3 4 5 6 7 8 960 1 2 3
- "\5\6\5\0\6\0\5\6\0\6\0\6\5\5\5\5"//GP48
- //4 5 6 7 8 970 1 2 3 4 5 6 7 8 9
- "\5\0\0\0\0\0\7\0\0\0\0\0\0\0\0\0"//GP64
- "\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\0\0\0\0\0\0\0\0\0\0\0";
-
enum { MasterVolumeDefault = 127 };
inline bool isXgPercChannel(uint8_t msb, uint8_t lsb)
@@ -199,9 +178,6 @@ void MIDIplay::applySetup()
synth.m_deepVibratoMode = m_setup.deepVibratoMode < 0 ?
synth.m_insBankSetup.deepVibrato :
(m_setup.deepVibratoMode != 0);
- synth.m_rhythmMode = m_setup.rhythmMode < 0 ?
- synth.m_insBankSetup.adLibPercussions :
- (m_setup.rhythmMode != 0);
synth.m_scaleModulators = m_setup.scaleModulators < 0 ?
synth.m_insBankSetup.scaleModulators :
(m_setup.scaleModulators != 0);
@@ -492,8 +468,16 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
voices[1].pseudo4op = pseudo_4op;
#endif /* __WATCOMC__ */
- if((synth.m_rhythmMode == 1) && PercussionMap[midiins & 0xFF])
+ if(
+ (synth.m_rhythmMode == 1) &&
+ (
+ ((ains->flags & adlinsdata::Mask_RhythmMode) != 0) ||
+ (m_cmfPercussionMode && (channel >= 11))
+ )
+ )
+ {
voices[1] = voices[0];//i[1] = i[0];
+ }
bool isBlankNote = (ains->flags & adlinsdata::Flag_NoSound) != 0;
@@ -547,9 +531,24 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity)
if(synth.m_rhythmMode)
{
if(m_cmfPercussionMode)
- expected_mode = channel < 11 ? 0 : (3 + channel - 11); // CMF
+ {
+ expected_mode = channel < 11 ? OPL3::ChanCat_Regular : (OPL3::ChanCat_Rhythm_Bass + (channel - 11)); // CMF
+ }
else
- expected_mode = PercussionMap[midiins & 0xFF];
+ {
+ expected_mode = OPL3::ChanCat_Regular;
+ uint32_t rm = (ains->flags & adlinsdata::Mask_RhythmMode);
+ if(rm == adlinsdata::Flag_RM_BassDrum)
+ expected_mode = OPL3::ChanCat_Rhythm_Bass;
+ else if(rm == adlinsdata::Flag_RM_Snare)
+ expected_mode = OPL3::ChanCat_Rhythm_Snare;
+ else if(rm == adlinsdata::Flag_RM_TomTom)
+ expected_mode = OPL3::ChanCat_Rhythm_Tom;
+ else if(rm == adlinsdata::Flag_RM_Cymbal)
+ expected_mode = OPL3::ChanCat_Rhythm_Cymbal;
+ else if(rm == adlinsdata::Flag_RM_HiHat)
+ expected_mode = OPL3::ChanCat_Rhythm_HiHat;
+ }
}
if(synth.m_channelCategory[a] != expected_mode)
diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp
index c2cbb1a..f19ba8b 100644
--- a/src/adlmidi_opl3.cpp
+++ b/src/adlmidi_opl3.cpp
@@ -86,7 +86,7 @@ int adl_getLowestEmulator()
}
//! Per-channel and per-operator registers map
-static const uint16_t g_operatorsMap[23 * 2] =
+static const uint16_t g_operatorsMap[(23 + 5) * 2] =
{
// Channels 0-2
0x000, 0x003, 0x001, 0x004, 0x002, 0x005, // operators 0, 3, 1, 4, 2, 5
@@ -98,17 +98,30 @@ static const uint16_t g_operatorsMap[23 * 2] =
0x100, 0x103, 0x101, 0x104, 0x102, 0x105, // operators 18,21, 19,22, 20,23
0x108, 0x10B, 0x109, 0x10C, 0x10A, 0x10D, // operators 24,27, 25,28, 26,29
0x110, 0x113, 0x111, 0x114, 0x112, 0x115, // operators 30,33, 31,34, 32,35
+
+ //==For Rhythm-mode percussions
// Channel 18
0x010, 0x013, // operators 12,15
// Channel 19
+ 0xFFF, 0x014, // operator 16
+ // Channel 19
+ 0x012, 0xFFF, // operator 14
+ // Channel 19
+ 0xFFF, 0x015, // operator 17
+ // Channel 19
+ 0x011, 0xFFF, // operator 13
+
+ //==For Rhythm-mode percussions in CMF, snare and cymbal operators has inverted!
+ 0x010, 0x013, // operators 12,15
+ // Channel 19
0x014, 0xFFF, // operator 16
// Channel 19
0x012, 0xFFF, // operator 14
// Channel 19
0x015, 0xFFF, // operator 17
// Channel 19
- 0x011, 0xFFF
-}; // operator 13
+ 0x011, 0xFFF // operator 13
+};
//! Channel map to regoster offsets
static const uint16_t g_channelsMap[23] =
@@ -179,7 +192,6 @@ OPL3::OPL3() :
m_insBankSetup.volumeModel = OPL3::VOLUME_Generic;
m_insBankSetup.deepTremolo = false;
m_insBankSetup.deepVibrato = false;
- m_insBankSetup.adLibPercussions = false;
m_insBankSetup.scaleModulators = false;
#ifdef DISABLE_EMBEDDED_BANKS
@@ -335,8 +347,8 @@ void OPL3::noteOn(size_t c1, size_t c2, double hertz) // Hertz range: 0..131071
for(size_t op = 0; op < opsCount; op++)
{
- if((op > 0) && (op_addr[op] == 0xFFF))
- break;
+ if(op_addr[op] == 0xFFF)
+ continue;
if(mul_offset > 0)
{
uint32_t dt = ops[op] & 0xF0;
@@ -377,8 +389,9 @@ void OPL3::touchNote(size_t c, uint8_t volume, uint8_t brightness)
size_t chip = c / 23, cc = c % 23;
const adldata &adli = m_insCache[c];
- uint16_t o1 = g_operatorsMap[cc * 2 + 0];
- uint16_t o2 = g_operatorsMap[cc * 2 + 1];
+ size_t cmf_offset = ((m_musicMode == MODE_CMF) && cc >= 18) ? 10 : 0;
+ uint16_t o1 = g_operatorsMap[cc * 2 + 0 + cmf_offset];
+ uint16_t o2 = g_operatorsMap[cc * 2 + 1 + cmf_offset];
uint8_t x = adli.modulator_40, y = adli.carrier_40;
uint32_t mode = 1; // 2-op AM
@@ -424,7 +437,8 @@ void OPL3::touchNote(size_t c, uint8_t volume, uint8_t brightness)
if(m_musicMode == MODE_RSXX)
{
- writeRegI(chip, 0x40 + o1, x);
+ if(o1 != 0xFFF)
+ writeRegI(chip, 0x40 + o1, x);
if(o2 != 0xFFF)
writeRegI(chip, 0x40 + o2, y - volume / 2);
}
@@ -445,7 +459,8 @@ void OPL3::touchNote(size_t c, uint8_t volume, uint8_t brightness)
carrier = (carrier | 63) - brightness + brightness * (carrier & 63) / 63;
}
- writeRegI(chip, 0x40 + o1, modulator);
+ if(o1 != 0xFFF)
+ writeRegI(chip, 0x40 + o1, modulator);
if(o2 != 0xFFF)
writeRegI(chip, 0x40 + o2, carrier);
}
@@ -477,13 +492,15 @@ void OPL3::setPatch(size_t c, const adldata &instrument)
size_t chip = c / 23, cc = c % 23;
static const uint8_t data[4] = {0x20, 0x60, 0x80, 0xE0};
m_insCache[c] = instrument;
- uint16_t o1 = g_operatorsMap[cc * 2 + 0];
- uint16_t o2 = g_operatorsMap[cc * 2 + 1];
+ size_t cmf_offset = ((m_musicMode == MODE_CMF) && (cc >= 18)) ? 10 : 0;
+ uint16_t o1 = g_operatorsMap[cc * 2 + 0 + cmf_offset];
+ uint16_t o2 = g_operatorsMap[cc * 2 + 1 + cmf_offset];
unsigned x = instrument.modulator_E862, y = instrument.carrier_E862;
for(size_t a = 0; a < 4; ++a, x >>= 8, y >>= 8)
{
- writeRegI(chip, data[a] + o1, x & 0xFF);
+ if(o1 != 0xFFF)
+ writeRegI(chip, data[a] + o1, x & 0xFF);
if(o2 != 0xFFF)
writeRegI(chip, data[a] + o2, y & 0xFF);
}
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp
index b793129..1b65214 100644
--- a/src/adlmidi_private.cpp
+++ b/src/adlmidi_private.cpp
@@ -40,6 +40,7 @@ int adlCalculateFourOpChannels(MIDIplay *play, bool silent)
{
Synth &synth = *play->m_synth;
size_t n_fourop[2] = {0, 0}, n_total[2] = {0, 0};
+ bool rhythmModeNeeded = false;
//Automatically calculate how much 4-operator channels is necessary
#ifndef DISABLE_EMBEDDED_BANKS
@@ -61,6 +62,8 @@ int adlCalculateFourOpChannels(MIDIplay *play, bool silent)
if((ins.flags & adlinsdata::Flag_Real4op) != 0)
++n_fourop[div];
++n_total[div];
+ if(div && ((ins.flags & adlinsdata::Mask_RhythmMode) != 0))
+ rhythmModeNeeded = true;
}
}
}
@@ -71,12 +74,15 @@ int adlCalculateFourOpChannels(MIDIplay *play, bool silent)
for(size_t a = 0; a < 256; ++a)
{
size_t insno = banks[play->m_setup.bankId][a];
+ size_t div = a / 128;
if(insno == 198)
continue;
- ++n_total[a / 128];
+ ++n_total[div];
adlinsdata2 ins = adlinsdata2::from_adldata(::adlins[insno]);
if((ins.flags & adlinsdata::Flag_Real4op) != 0)
- ++n_fourop[a / 128];
+ ++n_fourop[div];
+ if(div && ((ins.flags & adlinsdata::Mask_RhythmMode) != 0))
+ rhythmModeNeeded = true;
}
}
#endif
@@ -107,5 +113,8 @@ int adlCalculateFourOpChannels(MIDIplay *play, bool silent)
if(!silent)
synth.updateChannelCategories();
+ // Set rhythm mode when it needed
+ synth.m_rhythmMode = rhythmModeNeeded;
+
return 0;
}