diff options
| -rw-r--r-- | fm_banks/ibk_files/my-gmopldrums.IBK | bin | 3204 -> 3204 bytes | |||
| -rw-r--r-- | src/adldata.cpp | 58 |
2 files changed, 29 insertions, 29 deletions
diff --git a/fm_banks/ibk_files/my-gmopldrums.IBK b/fm_banks/ibk_files/my-gmopldrums.IBK Binary files differindex 33f065c..c1ade22 100644 --- a/fm_banks/ibk_files/my-gmopldrums.IBK +++ b/fm_banks/ibk_files/my-gmopldrums.IBK diff --git a/src/adldata.cpp b/src/adldata.cpp index eb1ff05..15089dc 100644 --- a/src/adldata.cpp +++ b/src/adldata.cpp @@ -4235,7 +4235,7 @@ const adldata adl[4254] = { 0x0F0F000,0x2C78780, 0x00,0x0A, 0xE,+0 }, // 4219: b65PP54; b66PP54; Tamborin { 0x067FD00,0x086F641, 0x0A,0x0D, 0x6,+0 }, // 4220: b65PP56; b66PP56; CowBell { 0x60070E0,0x6F4A4A0, 0x00,0x1B, 0xC,+0 }, // 4221: b65PP58; b66PP58; VibeSlap - { 0x064DD03,0x205FD02, 0x1D,0x03, 0x8,+0 }, // 4222: b65PP59; b66PP59; Ride1 + { 0x064DD03,0x205ED02, 0x1D,0x03, 0x8,+0 }, // 4222: b65PP59; b66PP59; Ride1 { 0x1F8F830,0x0B6F511, 0x21,0x08, 0x0,+0 }, // 4223: b65PP60; b66PP60; HiBongo { 0x1F8F830,0x0A6F511, 0x1E,0x08, 0x0,+0 }, // 4224: b65PP61; b66PP61; LoBongo { 0x248EB00,0x078F700, 0x95,0x0D, 0x0,+0 }, // 4225: b65PP62; b66PP62; MTHCongo @@ -4246,7 +4246,7 @@ const adldata adl[4254] = { 0x387FD00,0x0F6E622, 0x00,0x08, 0x0,+0 }, // 4230: b65PP67; b66PP67; HiAgogo { 0x387FD00,0x0F6F522, 0x00,0x08, 0x0,+0 }, // 4231: b65PP68; b66PP68; LoAgogo { 0x0FEF025,0x2586C03, 0x00,0x93, 0xE,+0 }, // 4232: b65PP69; b66PP69; Cabasa - { 0x4F77720,0x2F87811, 0x11,0x13, 0x1,+0 }, // 4233: b65PP70; b66PP70; Maracas + { 0x4F77720,0x2F86811, 0x11,0x13, 0x1,+0 }, // 4233: b65PP70; b66PP70; Maracas { 0x3F77723,0x2F68623, 0x04,0x0A, 0xC,+0 }, // 4234: b65PP71; b66PP71; StWhistl { 0x3F76623,0x2F68623, 0x04,0x0A, 0xC,+0 }, // 4235: b65PP72; b66PP72; LgWhistl { 0x1F97869,0x0F9D721, 0xC0,0x00, 0xE,+0 }, // 4236: b65PP73; b66PP73; StGuiro @@ -20950,7 +20950,7 @@ const struct adlinsdata adlins[4203] = // fades to 20% at 0.6s, keyoff fades to 20% in 0.6s. {4221,4221, 35, 0, 593, 593 }, // 4169: b65PP58; b66PP58; VibeSlap - // Amplitude begins at 834.1, peaks 881.3 at 0.0s, + // Amplitude begins at 844.8, peaks 882.9 at 0.0s, // fades to 20% at 0.4s, keyoff fades to 20% in 0.4s. {4222,4222, 35, 0, 386, 386 }, // 4170: b65PP59; b66PP59; Ride1 @@ -20994,9 +20994,9 @@ const struct adlinsdata adlins[4203] = // fades to 20% at 0.1s, keyoff fades to 20% in 0.1s. {4232,4232, 35, 0, 100, 100 }, // 4180: b65PP69; b66PP69; Cabasa - // Amplitude begins at 4.8, peaks 278.5 at 0.0s, + // Amplitude begins at 0.6, peaks 273.6 at 0.0s, // fades to 20% at 0.1s, keyoff fades to 20% in 0.1s. - {4233,4233, 35, 0, 86, 86 }, // 4181: b65PP70; b66PP70; Maracas + {4233,4233, 35, 0, 100, 100 }, // 4181: b65PP70; b66PP70; Maracas // Amplitude begins at 21.7, peaks 489.3 at 0.0s, // fades to 20% at 0.2s, keyoff fades to 20% in 0.2s. @@ -22015,14 +22015,14 @@ const unsigned short banks[67][256] = 2920,2921,2574,2922,2513,2923,2924,2925, 692, 575,2926,2927,2928, 815,2929,2930, 2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2573,2941,2942,2943,2944,2945, 2946,2947, 715, 832,2948, 833,2655,2949,2950,2951,2534,2952,2953,1976,2954,2955, - 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, - 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, - 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, +3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980, +3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3981,3981,3981,3981,3981, +3981,3981,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,3992,3993,3994, +3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,4010, +4011,4012,4013,4014,4015,3991,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025, +4026,4027,4028,3981,3981,3981,3981,3981,3981,3980,4029,4029,4029,4029,4029,4029, +4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029, +4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029, }, { // bank 48, AIL (Ultimate Soccer Manager :: partially 4op) 2521,2522,2523,2524,2525,2526,2527, 766,2528,2529,2530,2531,2532,2533,2534,2535, @@ -22339,14 +22339,14 @@ const unsigned short banks[67][256] = 4127,4128,4129, 83,4130,4131, 86,4132,4133, 89,4134,4135,4136,4137, 94,4138, 96, 97, 98,4139,4140, 101, 102,4141, 104,4142, 106, 107, 108,4143,4144,4145, 4146, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,4147,4148,4149, 126,4150, -4151,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,4152,4152,4153,4154,4155,4156,4157,4158,4159,4160,4161,4162,4161, -4163,4164,4161,4165,4164,4166,4167,4164,4168,4164,4169,4170,4171,4172,4173,4174, -4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4187,4188,4189, -4190,4191,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, + 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, 277, 277, 625, 626, 627, 628, 278, 629, 541, 608, 542, 630, 543, +544, 631, 545, 632, 553, 633,3429, 614, 635, 636,3430, 638, 639, 640, 641, 642, +643, 355, 644, 645, 646, 647, 648, 649, 650, 353,3431, 653, 654, 655, 337, 338, +656, 657, 546, 659, 727, 661, 662, 361, 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, }, { // bank 66, SB (Jammey O'Connel's bank) 3220,3221, 459,3222, 749,3129,3223, 460,3224, 667,3225,3226,3227,3228,4192,3230, @@ -22357,13 +22357,13 @@ const unsigned short banks[67][256] = 3273,3274,4197,3276,3277,3278,4198, 435,3280,3281,3282,3237,3283,1750,3284,3285, 3286,3287,3288,3289,4199, 253,3290,3291,1982,2455,3292,3293, 711,3294,3295,3296, 3297,4200,3299,3300,4201,4202, 715,3302,3303, 455,3304, 448,3305,2456,3306, 458, -4151,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,4152,4152,4153,4154,4155,4156,4157,4158,4159,4160,4161,4162,4161, -4163,4164,4161,4165,4164,4166,4167,4164,4168,4164,4169,4170,4171,4172,4173,4174, -4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4187,4188,4189, -4190,4191,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, -3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204,3204, +3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980, +3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3980,3981,3981,3981,3981,3981, +3981,3981,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,3992,3993,3994, +3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,4010, +4011,4012,4013,4014,4015,3991,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025, +4026,4027,4028,3981,3981,3981,3981,3981,3981,3980,4029,4029,4029,4029,4029,4029, +4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029, +4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029,4029, }, }; |