diff options
Diffstat (limited to 'src/adldata.cpp')
| -rw-r--r-- | src/adldata.cpp | 431 |
1 files changed, 245 insertions, 186 deletions
diff --git a/src/adldata.cpp b/src/adldata.cpp index 8a5a8f3..58e1ec8 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[4384] = +const adldata adl[4424] = { // ,---------+-------- Wave select settings // | ,-------ч-+------ Sustain/release rates // | | ,-----ч-ч-+---- Attack/decay rates @@ -4115,45 +4115,47 @@ const adldata adl[4384] = { 0x306FF80,0x0164F11, 0x00,0x00, 0xE, +0 }, { 0x332F985,0x0A5D684, 0x05,0x40, 0xE, +0 }, { 0x0FFF00B,0x2FF220C, 0x00,0x00, 0xE, +0 }, - { 0x223E133,0x4F4F131, 0xA5,0x09, 0xE, +0 }, - { 0x223F132,0x0F4F131, 0x24,0x0A, 0xE, +0 }, - { 0x433F133,0x0F4F131, 0xA3,0x09, 0xC, +0 }, - { 0x2F3F132,0x4F6F131, 0xA0,0x0F, 0x6, +0 }, - { 0x4B3E131,0x0F4F130, 0x1A,0x88, 0x8, +12 }, - { 0x1B3F130,0x214F211, 0x08,0x86, 0xB, +12 }, + { 0x223A133,0x4F4F131, 0xD6,0x09, 0x6, +0 }, + { 0x223B132,0x0F4F131, 0xD3,0x0A, 0x6, +0 }, + { 0x433F133,0x0F4F131, 0xD6,0x09, 0x8, +0 }, + { 0x2F3F132,0x4F6F131, 0xD3,0x0A, 0x6, +0 }, + { 0x2A4A112,0x4B5F211, 0xD2,0x05, 0x4, +0 }, + { 0x4A49112,0x2B5D110, 0xCF,0x05, 0x4, +0 }, { 0x073FA31,0x4F4D111, 0x8E,0x08, 0xA, +0 }, { 0x473FA32,0x4F4D111, 0x8C,0x09, 0xA, +0 }, + { 0x2E7F21A,0x0B8F201, 0x6F,0x48, 0xC, +0 }, { 0x0E5B111,0x0B8F211, 0x9C,0x80, 0x0, +0 }, { 0x2C7F436,0x0D7F231, 0x9D,0x0A, 0xE, +0 }, { 0x0C7F021,0x0F8F111, 0x1E,0x0F, 0x0, +0 }, - { 0x523F134,0x4F5D111, 0x51,0x08, 0x6, +0 }, - { 0x203FC32,0x1F7D111, 0x4B,0x09, 0x6, +0 }, + { 0x523F134,0x4F5D111, 0x51,0x0D, 0x6, +0 }, + { 0x203FC32,0x1F7D111, 0x4B,0x0D, 0x6, +0 }, { 0x559F101,0x0F7F111, 0x44,0x08, 0x6, +0 }, { 0x0F00000,0x4F7F111, 0x3F,0x0D, 0x9, +0 }, { 0x087F607,0x0E4F231, 0x54,0x08, 0x9, +0 }, { 0x587F617,0x0E4F231, 0x54,0x08, 0x9, +0 }, { 0x0A5F33F,0x0F2C312, 0xA1,0x06, 0xC, -12 }, { 0x0A5F43F,0x0F2F392, 0xD5,0x07, 0x0, -12 }, - { 0x004561A,0x004F601, 0x9E,0x08, 0x8, +0 }, - { 0x004A417,0x004F600, 0x9F,0x08, 0x8, +12 }, + { 0x461A417,0x0017C11, 0xAA,0x08, 0x7, +0 }, + { 0x061A416,0x0018911, 0xA7,0x07, 0x7, +0 }, { 0x0F6F2B2,0x0F6F281, 0xE5,0x00, 0xF, +0 }, { 0x0F6F2A4,0x007F08F, 0x40,0x00, 0x1, +0 }, { 0x0F6F618,0x0F7E500, 0x63,0x80, 0x6, +12 }, { 0x5A6F40E,0x007D804, 0x5B,0x80, 0x0, +0 }, - { 0x096F616,0x0F5F111, 0x1F,0x03, 0x4, +0 }, + { 0x2F6F71A,0x0F5F413, 0x1F,0x03, 0x4, -19 }, + { 0x0F00000,0x1F7F715, 0x3F,0x00, 0x1, +2 }, { 0x082F307,0x0E3F302, 0x97,0x8A, 0x6, -12 }, { 0x082D307,0x0E3F302, 0x97,0x8A, 0x6, -12 }, { 0x4109131,0x3B5F322, 0x52,0x88, 0x8, +0 }, { 0x118B1A4,0x11BD161, 0x88,0x80, 0x7, +0 }, { 0x108B1A3,0x11BD161, 0x88,0x88, 0x5, +12 }, - { 0x0F8F032,0x0F8F001, 0x65,0x00, 0xE, -12 }, - { 0x0F8F024,0x008F009, 0x43,0x00, 0x1, -12 }, - { 0x018AA70,0x0088AB1, 0x44,0x0A, 0x4, +0 }, - { 0x118AA71,0x0088AB2, 0x4B,0x0A, 0x4, +0 }, + { 0x0F8F032,0x0F8F001, 0x65,0x07, 0xE, -12 }, + { 0x0F8F024,0x008F009, 0x43,0x07, 0x1, -12 }, + { 0x018AA70,0x0088AB1, 0x44,0x10, 0x4, +0 }, + { 0x118AA71,0x0088AB2, 0x4B,0x10, 0x4, +0 }, { 0x1043031,0x1145432, 0x92,0x80, 0xD, +0 }, { 0x1045033,0x1145430, 0x92,0x80, 0xB, +0 }, - { 0x0178001,0x1176082, 0x54,0x8B, 0x4, +0 }, - { 0x0178000,0x1176081, 0x54,0x8B, 0x6, +0 }, + { 0x1178001,0x1176082, 0x5D,0x83, 0x4, +0 }, + { 0x4178000,0x1176081, 0x54,0x83, 0x6, +0 }, { 0x025A721,0x1264132, 0x4D,0x08, 0x6, +0 }, { 0x1258621,0x1264633, 0x4F,0x08, 0x6, +0 }, { 0x4FAF022,0x01A6221, 0x96,0x08, 0xC, +0 }, @@ -4168,8 +4170,8 @@ const adldata adl[4384] = { 0x11FF023,0x088F211, 0x5E,0x80, 0xA, +0 }, { 0x132ED11,0x3E7D211, 0x87,0x0A, 0x6, +0 }, { 0x332ED12,0x1E7D211, 0x80,0x45, 0x2, +0 }, - { 0x0F4E431,0x0F5F331, 0x97,0x80, 0x8, +0 }, - { 0x3F0F701,0x1F8F900, 0x00,0x11, 0xE, +0 }, + { 0x0F4E431,0x0F5F331, 0x97,0x86, 0x8, +0 }, + { 0x3F0F701,0x1F8F900, 0x00,0x0D, 0xE, +0 }, { 0x0F78111,0x3F7F054, 0x40,0x45, 0x8, +0 }, { 0x0F78140,0x3F7F040, 0x40,0x01, 0xC, +14 }, { 0x0F78111,0x2F7F054, 0x40,0x45, 0xA, +0 }, @@ -4178,10 +4180,10 @@ const adldata adl[4384] = { 0x6F78AE8,0x649B1F4, 0x43,0x4B, 0xA, +0 }, { 0x0209221,0x0E6C131, 0x97,0x05, 0x0, +0 }, { 0x0608521,0x0E6A131, 0xD4,0x05, 0x4, +0 }, - { 0x0F9F030,0x0F8F131, 0x9D,0x00, 0xA, +12 }, + { 0x0F9F030,0x0F8F131, 0x9D,0x05, 0xA, +12 }, { 0x7F0F017,0x7F9B700, 0x00,0x0F, 0xA, +12 }, - { 0x026AA21,0x0D7F132, 0xCF,0x80, 0xA, +0 }, - { 0x5F9F40B,0x445F711, 0x4B,0x57, 0x2, +0 }, + { 0x026AA21,0x0D7F132, 0xCF,0x84, 0xA, +0 }, + { 0x5F9F40B,0x445F711, 0x4B,0x4D, 0x2, +0 }, { 0x010D331,0x0B68112, 0x9A,0x40, 0x6, +0 }, { 0x0404121,0x0B56113, 0x9B,0x4C, 0x8, +0 }, { 0x2E69419,0x5B6B311, 0x5E,0x08, 0x0, +0 }, @@ -4208,10 +4210,8 @@ const adldata adl[4384] = { 0x433CB32,0x5057561, 0x9B,0x8A, 0xA, +0 }, { 0x1029033,0x4044561, 0x5B,0x85, 0x4, +0 }, { 0x4109033,0x2044520, 0xA8,0x85, 0xA, +0 }, - { 0x1254732,0x40256B1, 0xA4,0x0A, 0x8, +0 }, - { 0x1054934,0x50256B2, 0xAA,0x0D, 0x8, -12 }, - { 0x0031122,0x1046121, 0x58,0x84, 0x0, +0 }, - { 0x2331121,0x1364121, 0x8D,0x84, 0x8, +0 }, + { 0x2034170,0x0043671, 0x08,0x20, 0x9, +0 }, + { 0x1022171,0x0042671, 0x0C,0x17, 0xB, +0 }, { 0x0055021,0x0F55022, 0x1C,0x0F, 0x7, +0 }, { 0x0F54066,0x0F55024, 0x5A,0x0F, 0x7, -12 }, { 0x239B420,0x0076121, 0x50,0x05, 0x6, +0 }, @@ -4244,7 +4244,7 @@ const adldata adl[4384] = { 0x0177532,0x0174531, 0x93,0x03, 0xC, +0 }, { 0x0277530,0x0174536, 0x14,0x9C, 0xE, +12 }, { 0x08D6EF1,0x02A3571, 0xC0,0x00, 0xE, +0 }, - { 0x08860A1,0x02A6561, 0xA6,0x00, 0x8, +0 }, + { 0x08860A1,0x01A6561, 0x5C,0x00, 0x8, +0 }, { 0x2176522,0x0277421, 0x5A,0x00, 0x6, +0 }, { 0x1274472,0x01745B1, 0x8D,0x05, 0x4, +0 }, { 0x2F0F051,0x09A7801, 0x03,0x12, 0xA, +0 }, @@ -4263,8 +4263,8 @@ const adldata adl[4384] = { 0x2444830,0x43D67A1, 0x22,0x00, 0x8, +0 }, { 0x534B821,0x13D87A1, 0x1F,0x00, 0xA, +0 }, { 0x32B7420,0x12BF134, 0x46,0x00, 0x8, +0 }, - { 0x5029072,0x0069061, 0x96,0x09, 0x8, +0 }, - { 0x1019031,0x0069061, 0x1A,0x09, 0x6, +0 }, + { 0x5029072,0x0069061, 0x96,0x0C, 0x8, +0 }, + { 0x1019031,0x0069061, 0x1A,0x0C, 0x6, +0 }, { 0x245C224,0x2550133, 0x83,0x80, 0x9, -36 }, { 0x2459224,0x2556133, 0x83,0x80, 0x9, -36 }, { 0x132ED10,0x3E7D010, 0x87,0x08, 0x6, +12 }, @@ -4307,7 +4307,8 @@ const adldata adl[4384] = { 0x033F201,0x373F402, 0xD1,0x8A, 0x0, +0 }, { 0x6A7F907,0x229A904, 0x1A,0x00, 0xA, -12 }, { 0x332F320,0x6E49423, 0x0E,0x08, 0x8, +0 }, - { 0x0328416,0x073B411, 0xA1,0x00, 0xF, +0 }, + { 0x455F71C,0x0D68501, 0xA3,0x08, 0x6, +0 }, + { 0x055F718,0x0D6E501, 0x23,0x08, 0x0, +0 }, { 0x1397931,0x2099B22, 0x80,0x00, 0x6, +0 }, { 0x2137931,0x1079B22, 0x42,0xC2, 0xA, +0 }, { 0x302A130,0x0266221, 0x1E,0x00, 0xE, +0 }, @@ -4328,8 +4329,8 @@ const adldata adl[4384] = { 0x4543311,0x357451A, 0x19,0x03, 0xE, -14 }, { 0x00437D2,0x0343471, 0xA1,0x07, 0xC, +0 }, { 0x0F0F00C,0x0F66700, 0x00,0xCD, 0xE, +0 }, - { 0x200C327,0x6021300, 0x80,0x08, 0xE, -23 }, - { 0x200C32B,0x6021300, 0x80,0x08, 0xE, -24 }, + { 0x200C327,0x6021300, 0x80,0x12, 0xE, -23 }, + { 0x200C32B,0x6021300, 0x80,0x12, 0xE, -24 }, { 0x003EBD7,0x06845D8, 0xD4,0x00, 0x7, +12 }, { 0x62FDA20,0x614B009, 0x42,0x48, 0x4, -24 }, { 0x62FDA20,0x614B009, 0x82,0x48, 0x4, -20 }, @@ -4338,20 +4339,43 @@ const adldata adl[4384] = { 0x200832F,0x6044020, 0x80,0x00, 0xE, -36 }, { 0x200832F,0x6044020, 0x80,0x00, 0xE, -35 }, { 0x2305431,0x6E7F600, 0x00,0x00, 0xE, +0 }, - { 0x057FB00,0x046F800, 0x00,0x00, 0x0, +12 }, + { 0x059F802,0x01CF600, 0x11,0x00, 0xC, +0 }, + { 0x2159506,0x65AB701, 0x00,0x04, 0xE, +0 }, + { 0x10F5F81,0x0164611, 0x00,0x0A, 0x6, +0 }, + { 0x00F5F01,0x20F5F00, 0x00,0x00, 0x8, +0 }, + { 0x0D6D725,0x3A9A909, 0x1F,0x00, 0xE, -9 }, + { 0x0F0A00F,0x0F8F80F, 0x00,0x0C, 0xE, +0 }, + { 0x2FDFD00,0x6FAFA00, 0x00,0x00, 0xE, +0 }, + { 0x4F1F103,0x6FAFA07, 0x00,0x00, 0x8, +0 }, + { 0x0F0F007,0x2F6F60F, 0x27,0x00, 0x0, +21 }, + { 0x559FA00,0x047F800, 0x00,0x00, 0x4, +0 }, + { 0x3F1F102,0x0078400, 0x00,0x26, 0xC, +0 }, + { 0x048FA00,0x008F900, 0x00,0x00, 0x6, +12 }, { 0x287F702,0x678F802, 0x80,0x88, 0xE, +12 }, { 0x2F7F602,0x0F8F802, 0x00,0x88, 0xE, +12 }, { 0x05476C1,0x30892C5, 0x80,0x08, 0x0, +0 }, { 0x05477C1,0x30892C5, 0x00,0x08, 0xA, -2 }, - { 0x508F601,0x104F600, 0x08,0x00, 0x6, +0 }, - { 0x254D307,0x3288905, 0x04,0x08, 0xA, -5 }, - { 0x508F601,0x104F600, 0x0C,0x00, 0x8, +0 }, - { 0x210F509,0x305FE03, 0x8A,0x88, 0xE, +12 }, - { 0x200F508,0x305FE03, 0xC7,0x88, 0xC, +12 }, + { 0x017C604,0x017C604, 0x00,0x00, 0x1, +0 }, + { 0x201F302,0x057AB09, 0x03,0x00, 0xC, +12 }, + { 0x254F307,0x307F905, 0x04,0x08, 0x6, -5 }, + { 0x254F307,0x207F905, 0x04,0x08, 0x8, +0 }, + { 0x016C604,0x016C604, 0x00,0x00, 0x1, +0 }, + { 0x201F312,0x057AB09, 0x03,0x00, 0xC, +12 }, + { 0x254D307,0x3288905, 0x04,0x03, 0xA, -5 }, + { 0x016E614,0x016C614, 0x00,0x00, 0x1, +0 }, + { 0x201F312,0x057AB09, 0x00,0x00, 0xC, +12 }, + { 0x035C618,0x015C618, 0x00,0x00, 0x1, +0 }, + { 0x001F312,0x047BB05, 0x03,0x00, 0xC, +12 }, + { 0x015C618,0x015C618, 0x00,0x00, 0x1, +0 }, + { 0x201F312,0x047BB09, 0x03,0x00, 0xC, +12 }, + { 0x210F509,0x305FE03, 0x8A,0x85, 0xE, +12 }, + { 0x200F508,0x305FE03, 0xC7,0x85, 0xC, +12 }, + { 0x2E1F119,0x3F3F11B, 0x04,0x0D, 0x8, +0 }, { 0x2777603,0x3679601, 0x87,0x08, 0x6, +12 }, { 0x277C643,0x3679601, 0x87,0x08, 0xE, +12 }, { 0x366F905,0x099F701, 0x00,0x00, 0xC, +12 }, - { 0x422F120,0x056B40E, 0x81,0x00, 0xA, +12 }, + { 0x431A000,0x085B41A, 0x81,0x05, 0xA, +12 }, + { 0x459F640,0x185B418, 0x00,0x20, 0xB, +12 }, { 0x212FD04,0x305FD03, 0x01,0x00, 0x8, +12 }, { 0x2A8F9E3,0x0779643, 0x1E,0x08, 0x2, +6 }, { 0x0A5F7E8,0x0D89949, 0xDE,0x00, 0x0, +0 }, @@ -4361,19 +4385,35 @@ const adldata adl[4384] = { 0x0A5F7E9,0x0D8994A, 0x29,0x08, 0xC, +10 }, { 0x2A8F9E2,0x0779642, 0x1E,0x00, 0xE, +8 }, { 0x0A5F7E9,0x5D8994A, 0x08,0x00, 0xC, +0 }, - { 0x367FD01,0x098F601, 0x00,0x08, 0x8, +12 }, + { 0x456FB02,0x017F700, 0x81,0x00, 0xC, +12 }, + { 0x556FA01,0x117F701, 0x00,0x0D, 0xA, +10 }, + { 0x556FB02,0x117F701, 0x81,0x0D, 0xA, +10 }, + { 0x367FE06,0x668F701, 0x09,0x08, 0x8, +12 }, { 0x367FD10,0x098F901, 0x00,0x0D, 0x8, +6 }, - { 0x367FD10,0x098F901, 0x00,0x0D, 0x8, +11 }, + { 0x367FE05,0x678F701, 0x09,0x08, 0x8, +12 }, + { 0x367FD10,0x078F901, 0x00,0x0D, 0x8, +11 }, { 0x098600F,0x3FC8590, 0x08,0xC0, 0xE, +12 }, { 0x009F020,0x37DA588, 0x07,0x00, 0xA, +12 }, { 0x00FC020,0x32DA5A8, 0x07,0x00, 0xA, +12 }, { 0x0D1F815,0x078F512, 0x44,0x00, 0x8, +12 }, + { 0x2D1F213,0x098F614, 0x9D,0x00, 0x0, +0 }, + { 0x2D1F213,0x098F614, 0x9D,0x21, 0x0, -2 }, + { 0x0985900,0x039870F, 0x07,0x00, 0x8, +13 }, + { 0x2F3F307,0x09C9B0F, 0x1D,0x00, 0x0, +13 }, + { 0x09C4B00,0x43A6705, 0x21,0x00, 0xC, +13 }, + { 0x0F7F907,0x2987805, 0x1C,0x00, 0x0, +13 }, { 0x160F2C6,0x07AF4D4, 0x4F,0x80, 0x8, +12 }, { 0x160F286,0x0B7F294, 0x4F,0x80, 0x8, +12 }, { 0x227A305,0x36A560A, 0x87,0x08, 0xE, +12 }, { 0x247C345,0x3697809, 0x87,0x08, 0xE, +12 }, { 0x4755406,0x3667601, 0x87,0x08, 0x6, +12 }, { 0x275A346,0x3667601, 0x87,0x08, 0x6, +12 }, + { 0x6E4840B,0x6E4B409, 0x12,0x09, 0x1, +0 }, + { 0x6E4440B,0x6E46407, 0x21,0x13, 0x1, +3 }, + { 0x037A309,0x06DF904, 0x11,0x00, 0xE, +0 }, + { 0x6F9A902,0x2F7C801, 0x00,0x40, 0x8, +0 }, + { 0x4F9F901,0x4F7C713, 0x1F,0x48, 0x0, -7 }, + { 0x4B7C720,0x1F3F300, 0x0B,0x00, 0x0, +0 }, { 0x01BF4E0,0x018F3E0, 0x8D,0x23, 0xA, +12 }, { 0x00FFFE4,0x00FFFE1, 0x8A,0xA9, 0x1, +0 }, { 0x031FF10,0x004FF01, 0x07,0x25, 0xA, +12 }, @@ -4401,7 +4441,7 @@ const adldata adl[4384] = { 0x04CA700,0x04FC600, 0x00,0x2B, 0x0, -12 }, { 0x0B5F704,0x002010C, 0x00,0x00, 0x8, +21 }, }; -const struct adlinsdata adlins[4528] = +const struct adlinsdata adlins[4547] = { { 0, 0, 0, 0, 1660, 1660,0.000000 }, { 1, 1, 0, 0, 1746, 1746,0.000000 }, @@ -8742,58 +8782,58 @@ const struct adlinsdata adlins[4528] = {3547,3547,109, 0, 1780, 1780,0.000000 }, {4097,4097, 79, 0, 126, 126,0.000000 }, {4098,4098, 0, 0, 3413, 3413,0.000000 }, - {4099,4100, 0, 1, 1773, 1773,0.031250 }, - {4101,4102, 0, 1, 1933, 1933,0.031250 }, - {4103,4104, 0, 1, 1580, 1580,0.031250 }, + {4099,4100, 0, 1, 2040, 2040,0.031250 }, + {4101,4102, 0, 1, 2146, 2146,0.031250 }, + {4103,4104, 0, 1, 1646, 1646,0.046875 }, {4105,4106, 0, 1, 1900, 1900,0.156250 }, - { 172,4107, 0, 1, 1740, 1740,0.046875 }, - {4108,4109, 0, 1, 1020, 1020,0.062500 }, - {4110,4111, 0, 1, 2126, 2126,0.000000 }, - {4112,4113, 0, 1, 1740, 1740,0.000000 }, - {4114,4115, 0, 1, 993, 993,0.000025 }, - {4116,4117, 0, 1, 886, 886,0.000000 }, - {4118,4119, 0, 1, 513, 513,0.062500 }, - {4120,4121, 0, 1, 1420, 1420,0.000000 }, - {4122,4123, 0, 1, 193, 193,0.000000 }, - {4124,4124, 0, 0, 1846, 1846,0.000000 }, - {4125,4126, 0, 1, 1400, 1400,0.031250 }, - {4127,4127, 0, 1, 980, 980,0.031250 }, - {4128,4129, 0, 1, 40000, 6,0.156250 }, - {4130,4131, 0, 1, 40, 13,0.000000 }, - {4132,4133, 0, 1, 7180, 13,0.156250 }, - {4134,4135, 0, 1, 40000, 180,0.031250 }, - {4136,4137, 0, 1, 40000, 46,0.000000 }, - {4138,4139, 0, 1, 40000, 46,0.140625 }, - {4140,4141, 0, 1, 40000, 6,0.000000 }, - {4142,4143, 0, 1, 40000, 153,0.109375 }, - {4144,4145, 0, 1, 600, 600,0.000000 }, - {4146,4147, 0, 1, 653, 653,0.000025 }, - {4148,4149, 0, 1, 633, 633,0.000000 }, - {4150,4151, 0, 1, 893, 893,0.046875 }, - {4152,4153, 0, 1, 493, 493,0.000000 }, - {4154,4155, 0, 1, 40000, 60,-1.906250 }, + {4107,4108, 0, 1, 1473, 1473,0.046875 }, + {4109,4110, 0, 1, 1020, 1020,0.062500 }, + {4111,4112, 0, 1, 2126, 2126,0.000000 }, + {4113,4114, 0, 1, 1740, 1740,0.000000 }, + {4115,4116, 0, 1, 993, 993,0.000025 }, + {4117,4118, 0, 1, 886, 886,0.000000 }, + {4119,4120, 0, 1, 1900, 1900,0.046875 }, + {4121,4122, 0, 1, 1420, 1420,0.000000 }, + {4123,4124, 0, 1, 193, 193,0.000000 }, + {4125,4126, 0, 1, 406, 406,0.000000 }, + {4127,4128, 0, 1, 1400, 1400,0.031250 }, + {4129,4129, 0, 1, 980, 980,0.031250 }, + {4130,4131, 0, 1, 40000, 6,0.156250 }, + {4132,4133, 0, 1, 40, 13,0.078125 }, + {4134,4135, 0, 1, 7180, 13,0.156250 }, + {4136,4137, 0, 1, 40000, 180,0.031250 }, + {4138,4139, 0, 1, 40000, 46,0.062500 }, + {4140,4141, 0, 1, 40000, 46,0.140625 }, + {4142,4143, 0, 1, 40000, 6,0.000000 }, + {4144,4145, 0, 1, 40000, 153,0.109375 }, + {4146,4147, 0, 1, 600, 600,0.000000 }, + {4148,4149, 0, 1, 653, 653,0.000025 }, + {4150,4151, 0, 1, 633, 633,0.000000 }, + {4152,4153, 0, 1, 893, 893,0.046875 }, + {4154,4155, 0, 1, 440, 440,0.000000 }, {4156,4157, 0, 1, 40000, 60,-1.906250 }, - {4158,4159, 0, 1, 2033, 2033,0.234375 }, - {4160,4161, 0, 1, 1600, 1600,0.031250 }, - {4162,4163, 0, 1, 1526, 1526,0.000000 }, - {4164,4165, 0, 1, 2133, 2133,0.000000 }, - {4166,4167, 0, 1, 1933, 1933,0.046875 }, - {4168,4169, 0, 1, 633, 633,0.000000 }, - {4170,4171, 0, 1, 486, 486,0.000000 }, - {4172,4172, 0, 0, 313, 313,0.000000 }, - {4173,4173, 0, 1, 40000, 33,0.156250 }, - {4174,4175, 0, 1, 2040, 13,0.000000 }, - {4176,4176, 0, 0, 40000, 66,0.000000 }, - {4177,4178, 0, 1, 40000, 60,0.000025 }, - {4179,4179, 0, 0, 40000, 133,0.000000 }, - {4180,4181, 0, 1, 40000, 173,0.078125 }, - {4182,4183, 0, 1, 320, 320,0.156250 }, - {4184,4185, 0, 1, 1813, 1813,0.031250 }, - {4186,4187, 0, 1, 1740, 1740,0.031250 }, - {4188,4189, 0, 1, 40000, 213,0.062500 }, - {4190,4191, 0, 1, 40000, 500,-0.062500 }, - {4192,4193, 0, 1, 40000, 766,0.062500 }, - {4194,4195, 0, 1, 40000, 300,0.109375 }, + {4158,4159, 0, 1, 40000, 60,-1.906250 }, + {4160,4161, 0, 1, 2033, 2033,0.234375 }, + {4162,4163, 0, 1, 1600, 1600,0.031250 }, + {4164,4165, 0, 1, 1453, 1453,0.000000 }, + {4166,4167, 0, 1, 2186, 2186,0.000000 }, + {4168,4169, 0, 1, 1933, 1933,0.046875 }, + {4170,4171, 0, 1, 633, 633,0.000000 }, + {4172,4173, 0, 1, 486, 486,0.000000 }, + {4174,4174, 0, 0, 313, 313,0.000000 }, + {4175,4175, 0, 1, 40000, 33,0.156250 }, + {4176,4177, 0, 1, 2040, 13,0.000000 }, + {4178,4178, 0, 0, 40000, 66,0.000000 }, + {4179,4180, 0, 1, 40000, 60,0.000025 }, + {4181,4181, 0, 0, 40000, 133,0.000000 }, + {4182,4183, 0, 1, 40000, 173,0.078125 }, + {4184,4185, 0, 1, 320, 320,0.156250 }, + {4186,4187, 0, 1, 1813, 1813,0.031250 }, + {4188,4189, 0, 1, 1740, 1740,0.031250 }, + {4190,4191, 0, 1, 40000, 213,0.062500 }, + {4192,4193, 0, 1, 40000, 500,-0.062500 }, + {4194,4194, 0, 1, 40000, 326,0.109375 }, + {4195,4195, 0, 1, 40000, 406,0.109375 }, {4196,4197, 0, 1, 40000, 280,0.140625 }, {4198,4199, 0, 1, 40000, 53,0.140625 }, {4200,4201, 0, 1, 40000, 286,0.156250 }, @@ -8815,7 +8855,7 @@ const struct adlinsdata adlins[4528] = {4224,4224, 0, 0, 40000, 6,0.000000 }, {4225,4226, 0, 1, 40000, 40,0.000000 }, {4227,4227, 0, 0, 40000, 0,0.000000 }, - {4228,4228, 0, 0, 40000, 0,0.000000 }, + {4228,4228, 0, 0, 40000, 6,0.000000 }, {4229,4229, 0, 0, 40000, 33,0.000000 }, {4230,4231, 0, 1, 40000, 33,0.031250 }, {4232,4233, 0, 1, 40000, 20,0.046875 }, @@ -8828,7 +8868,7 @@ const struct adlinsdata adlins[4528] = {4244,4245, 0, 1, 120, 0,-0.031250 }, {4246,4246, 0, 0, 40000, 6,0.000000 }, {4247,4248, 0, 1, 40000, 133,0.156250 }, - {4249,4250, 0, 1, 3886, 3886,0.078125 }, + {4249,4250, 0, 1, 3886, 3886,0.125000 }, {4251,4252, 0, 1, 40000, 26,0.031250 }, {4253,4254, 0, 1, 40000, 320,0.078125 }, {4255,4256, 0, 1, 846, 66,0.109375 }, @@ -8850,87 +8890,106 @@ const struct adlinsdata adlins[4528] = {4286,4287, 0, 1, 760, 760,0.000000 }, {4288,4289, 0, 1, 126, 126,0.031250 }, {4290,4290, 0, 0, 633, 633,0.000000 }, - {4291,4291, 0, 0, 246, 246,0.000000 }, - {4292,4293, 0, 1, 40000, 26,0.062500 }, - {4294,4294, 0, 0, 40000, 66,0.000000 }, - {4295,4295, 0, 0, 40000, 53,0.000000 }, - {4296,4296, 0, 0, 1940, 1940,0.000000 }, - {4297,4297, 0, 0, 86, 86,0.000000 }, - {4298,4299, 0, 1, 280, 280,0.031250 }, - {4300,4300, 0, 0, 40, 40,0.000000 }, - {4301,4302, 0, 1, 53, 53,0.000000 }, - {4303,4304, 0, 1, 140, 140,0.000000 }, - {4305,4306, 0, 1, 26, 26,0.000000 }, - {4307,4308, 0, 1, 2153, 2153,0.109375 }, - {4309,4309, 0, 0, 600, 600,0.000000 }, - {4310,4311, 0, 1, 993, 26,0.000000 }, - {4312,4313, 0, 1, 5613, 5613,0.000000 }, - {4314,4314, 0, 0, 220, 220,0.000000 }, - {4315,4316, 0, 1, 10306, 526,0.000000 }, - {4317,4318, 0, 1, 1486, 13,0.000000 }, - {4319,4320, 0, 1, 40000, 660,0.000000 }, - {4321,4321, 0, 0, 120, 120,0.000000 }, - {4322,4322, 25, 0, 33, 33,0.000000 }, - {4323,4324, 61, 1, 40, 40,0.000000 }, - {4325,4326, 37, 1, 53, 53,0.000000 }, - {4327,4327, 32, 0, 60, 60,0.000000 }, - {4327,4327, 34, 0, 73, 73,0.000000 }, - {4328,4328, 48, 0, 53, 53,0.000000 }, - {4329,4329, 37, 0, 46, 46,0.000000 }, - {4329,4329, 40, 0, 40, 40,0.000000 }, - {4329,4329, 43, 0, 33, 33,0.000000 }, - {4329,4329, 46, 0, 60, 60,0.000000 }, - {4330,4331, 60, 1, 286, 286,0.062500 }, - {4332,4333, 80, 1, 106, 106,0.125000 }, - {4334,4334, 58, 0, 73, 73,0.000000 }, - {4335,4335, 24, 0, 780, 780,0.000000 }, - {4336,4336, 61, 0, 206, 206,0.000000 }, - {4337,4338, 41, 1, 100, 100,0.000000 }, - {4339,4340, 35, 1, 160, 160,0.000000 }, - {4341,4342, 29, 1, 40, 40,0.000000 }, - {4343,4344, 41, 1, 166, 166,0.000000 }, - {4343,4344, 37, 1, 160, 160,0.000000 }, - {4041,4043, 51, 1, 80, 80,0.000000 }, - {4345,4346, 78, 1, 126, 126,0.000000 }, - {4345,4347, 73, 1, 113, 113,0.000000 }, - {4348,4348, 40, 0, 140, 140,0.000000 }, - {4349,4349, 45, 0, 313, 313,0.000000 }, - {4350,4350, 42, 0, 40000, 0,0.000000 }, - {4351,4351, 73, 0, 60, 60,0.000000 }, - {4352,4352, 90, 0, 80, 80,0.000000 }, - {4353,4353, 90, 0, 306, 306,0.000000 }, - {4354,4355, 64, 1, 233, 233,0.031250 }, - {4356,4357, 80, 1, 140, 140,0.031250 }, - {4358,4358, 0, 0, 40000, 20,0.000000 }, - {4359,4359, 0, 0, 40000, 0,0.000000 }, - {4360,4360, 0, 0, 360, 360,0.000000 }, - {4361,4361, 0, 0, 586, 586,0.000000 }, - {4362,4362, 0, 0, 40000, 0,0.000000 }, - {4363,4363, 0, 0, 40000, 0,0.000000 }, - {4364,4364, 0, 0, 40000, 0,0.000000 }, - {4365,4365, 0, 0, 40000, 6,0.000000 }, - {4366,4366, 0, 0, 40000, 0,0.000000 }, - {4367,4367, 0, 0, 146, 146,0.000000 }, - {4367,4367, 73, 0, 886, 886,0.000000 }, - {4368,4368, 0, 0, 40, 0,0.000000 }, - {4369,4369, 0, 0, 486, 0,0.000000 }, - {4370,4370, 0, 0, 1226, 1226,0.000000 }, - {4371,4371, 0, 0, 1480, 1480,0.000000 }, - {4372,4372, 0, 0, 46, 46,0.000000 }, - {4373,4373, 0, 0, 126, 126,0.000000 }, - {4373,4373, 12, 0, 106, 106,0.000000 }, - {4374,4374, 0, 0, 160, 160,0.000000 }, - {4374,4374, 1, 0, 153, 153,0.000000 }, - {4375,4375, 0, 0, 20, 20,0.000000 }, - {4375,4375, 23, 0, 26, 26,0.000000 }, - {4376,4376, 0, 0, 140, 140,0.000000 }, - {4377,4377, 0, 0, 486, 486,0.000000 }, - {4378,4378, 0, 0, 40000, 13,0.000000 }, - {4379,4379, 0, 0, 40000, 0,0.000000 }, - {4380,4380, 0, 0, 1226, 1226,0.000000 }, - {4381,4381, 0, 0, 766, 766,0.000000 }, - {4382,4382, 0, 0, 93, 93,0.000000 }, - {4383,4383, 0, 2, 40000, 0,0.000000 }, + {4291,4292, 0, 1, 280, 280,0.000000 }, + {4293,4294, 0, 1, 40000, 26,0.062500 }, + {4295,4295, 0, 0, 40000, 66,0.000000 }, + {4296,4296, 0, 0, 40000, 53,0.000000 }, + {4297,4297, 0, 0, 1940, 1940,0.000000 }, + {4298,4298, 0, 0, 86, 86,0.000000 }, + {4299,4300, 0, 1, 280, 280,0.031250 }, + {4301,4301, 0, 0, 40, 40,0.000000 }, + {4302,4303, 0, 1, 53, 53,0.000000 }, + {4304,4305, 0, 1, 140, 140,0.000000 }, + {4306,4307, 0, 1, 26, 26,0.000000 }, + {4308,4309, 0, 1, 2153, 2153,0.109375 }, + {4310,4310, 0, 0, 600, 600,0.000000 }, + {4311,4312, 0, 1, 993, 26,0.000000 }, + {4313,4314, 0, 1, 5613, 5613,0.000000 }, + {4315,4315, 0, 0, 220, 220,0.000000 }, + {4316,4317, 0, 1, 10306, 526,0.000000 }, + {4318,4319, 0, 1, 1486, 13,0.000000 }, + {4320,4321, 0, 1, 40000, 660,0.000000 }, + {4322,4322, 0, 0, 120, 120,0.000000 }, + {4323,4323, 34, 0, 40, 40,0.000000 }, + {4324,4324, 28, 0, 73, 73,0.000000 }, + {4325,4326, 39, 1, 233, 233,0.000000 }, + {4325,4326, 33, 1, 193, 193,0.000000 }, + {4327,4328, 63, 1, 33, 33,0.000000 }, + {4329,4329, 15, 0, 13, 13,0.000000 }, + {4330,4330, 36, 0, 13, 13,0.000000 }, + {4330,4331, 36, 1, 133, 133,0.406250 }, + {4332,4333, 25, 1, 13, 13,0.000000 }, + {4334,4333, 25, 1, 33, 33,0.000000 }, + {4335,4336, 61, 1, 40, 40,0.000000 }, + {4337,4338, 37, 1, 53, 53,0.000000 }, + {4339,4340, 15, 1, 93, 93,0.000000 }, + {4341,4342, 48, 1, 73, 73,-1.906250 }, + {4343,4344, 19, 1, 160, 160,0.000000 }, + {4345,4345, 48, 0, 53, 53,0.000000 }, + {4346,4347, 22, 1, 146, 146,0.000000 }, + {4348,4349, 13, 1, 93, 93,0.000000 }, + {4350,4351, 16, 1, 106, 106,0.000000 }, + {4350,4351, 20, 1, 280, 280,0.000000 }, + {4352,4353, 60, 1, 286, 286,0.062500 }, + {4354,4354, 62, 0, 1726, 1726,0.000000 }, + {4355,4356, 80, 1, 106, 106,0.125000 }, + {4357,4357, 58, 0, 73, 73,0.000000 }, + {4358,4359, 31, 1, 313, 313,0.000000 }, + {4360,4360, 61, 0, 206, 206,0.000000 }, + {4361,4362, 41, 1, 100, 100,0.000000 }, + {4363,4364, 35, 1, 160, 160,0.000000 }, + {4365,4366, 29, 1, 40, 40,0.000000 }, + {4367,4368, 41, 1, 166, 166,0.000000 }, + {4367,4368, 37, 1, 160, 160,0.000000 }, + {4369,4370, 54, 1, 80, 80,0.000000 }, + {4369,4371, 48, 1, 80, 80,0.000000 }, + {4372,4373, 77, 1, 53, 53,0.000000 }, + {4374,4375, 72, 1, 46, 46,0.000000 }, + {4376,4376, 40, 0, 140, 140,0.000000 }, + {4377,4377, 45, 0, 313, 313,0.000000 }, + {4378,4378, 42, 0, 40000, 0,0.000000 }, + {4379,4379, 73, 0, 60, 60,0.000000 }, + {4380,4381, 68, 1, 40, 40,0.000000 }, + {4382,4383, 18, 1, 60, 60,0.000000 }, + {4384,4385, 18, 1, 106, 106,0.000000 }, + {4386,4386, 90, 0, 80, 80,0.000000 }, + {4387,4387, 90, 0, 306, 306,0.000000 }, + {4388,4389, 64, 1, 233, 233,0.031250 }, + {4390,4391, 80, 1, 140, 140,0.031250 }, + {4392,4393, 64, 1, 606, 606,0.000000 }, + {4394,4394, 67, 0, 20, 20,0.000000 }, + {4395,4396, 50, 1, 53, 53,0.000000 }, + {4397,4397, 36, 0, 66, 66,0.000000 }, + {4398,4398, 0, 0, 40000, 20,0.000000 }, + {4399,4399, 0, 0, 40000, 0,0.000000 }, + {4400,4400, 0, 0, 360, 360,0.000000 }, + {4401,4401, 0, 0, 586, 586,0.000000 }, + {4402,4402, 0, 0, 40000, 0,0.000000 }, + {4403,4403, 0, 0, 40000, 0,0.000000 }, + {4404,4404, 0, 0, 40000, 0,0.000000 }, + {4405,4405, 0, 0, 40000, 6,0.000000 }, + {4406,4406, 0, 0, 40000, 0,0.000000 }, + {4407,4407, 0, 0, 146, 146,0.000000 }, + {4407,4407, 73, 0, 886, 886,0.000000 }, + {4408,4408, 0, 0, 40, 0,0.000000 }, + {4409,4409, 0, 0, 486, 0,0.000000 }, + {4410,4410, 0, 0, 1226, 1226,0.000000 }, + {4411,4411, 0, 0, 1480, 1480,0.000000 }, + {4412,4412, 0, 0, 46, 46,0.000000 }, + {4413,4413, 0, 0, 126, 126,0.000000 }, + {4413,4413, 12, 0, 106, 106,0.000000 }, + {4414,4414, 0, 0, 160, 160,0.000000 }, + {4414,4414, 1, 0, 153, 153,0.000000 }, + {4415,4415, 0, 0, 20, 20,0.000000 }, + {4415,4415, 23, 0, 26, 26,0.000000 }, + {4416,4416, 0, 0, 140, 140,0.000000 }, + {4417,4417, 0, 0, 486, 486,0.000000 }, + {4418,4418, 0, 0, 40000, 13,0.000000 }, + {4419,4419, 0, 0, 40000, 0,0.000000 }, + {4420,4420, 0, 0, 1226, 1226,0.000000 }, + {4421,4421, 0, 0, 766, 766,0.000000 }, + {4422,4422, 0, 0, 93, 93,0.000000 }, + {4423,4423, 0, 2, 40000, 0,0.000000 }, }; @@ -10325,17 +10384,17 @@ const unsigned short banks[74][256] = 4435,4436,4437,4438,4439,4440,4441,4442,4443,4444,4445,4446,4447,4448,4449,4450, 4451,4452,4453,4454,4455,4456,4457,4458,4459,4460,4461,4462,4463,4464,4465,4466, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, - 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, - 806, 806, 806,4467,1349,4468,4217,4469,4218,4470,4219,4471,4472,4473,4221,4474, -4475,4222,4476,4477,4224,4225,4478,4226,4479,4227,4480,4481,4482,4483,4484,4485, -4486,4228,4487,4488,4489, 320,4490,4491,4492,4231,4232,4493,1373,1374,4233,4234, -4494,4495,4496,4497, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, + 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806,4467,4468,4469,4470,4471, +4472,4473,4474,4475,4476,4477,4217,4478,4218,4479,4480,4481,4482,4483,4221,4484, +4485,4222,4486,4487,4224,4488,4489,4226,4490,4227,4491,4492,4493,4494,4495,4496, +4497,4498,4499,4500,4501, 320,4502,4503,4504,4231,4232,4505,4506,1374,4507,4508, +4509,4510,4511,4512,4513,4514,4515,4516, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, 806, }, { -4498,4499,4500,4501,4499,4502,4503,4504,4505,4506,4507,4509,4510,4511,4512,4513, -4514,4516,4518,4511,4520,4521,4522,4523,4524,4525,4526, 295, 28, 29, 30, 31, +4517,4518,4519,4520,4518,4521,4522,4523,4524,4525,4526,4528,4529,4530,4531,4532, +4533,4535,4537,4530,4539,4540,4541,4542,4543,4544,4545, 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, @@ -10344,8 +10403,8 @@ const unsigned short banks[74][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,4515, 128,4517, 130, 131, 132,4519, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144,4508, 146, 147, 148, 149, 150, 151, 152, 153, 154, + 295, 295, 295, 127,4534, 128,4536, 130, 131, 132,4538, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144,4527, 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, @@ -10427,6 +10486,6 @@ const AdlBankSetup adlbanksetup[74] = {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 72, WOPL (DMXOPL3 bank by Sneakernets) {1, 0, 0, 0, 0} //Bank 73, EA (Cartooners) }; |