Fixed messed up JungleVision banks

2 files changed, 6 insertions, 4 deletions

diff --git a/src/adldata.cppx b/src/adldata.cppx
index 5cb1103..b80b96b 100644
--- a/src/adldata.cppx
+++ b/src/adldata.cppx
@@ -90,7 +90,7 @@ const BanksDump::BankEntry g_embeddedBanks[] =
 };
 
 const size_t g_embeddedBanksMidiIndex[] =
-{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 15, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 34, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 39, 73, 74, 75, 39, 76, 77, 34, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 67, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 54, 101, 102, 50, 103, 50, 39, 104, 105, 106, 107, 50, 108, 109, 110, 50, 111, 50, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 14, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149 };
+{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 15, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 34, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 39, 73, 74, 75, 39, 76, 77, 34, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 67, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 54, 101, 102, 50, 103, 50, 39, 104, 105, 106, 107, 26, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 14, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151 };
 
 const BanksDump::MidiBank g_embeddedBanksMidi[] =
 {
@@ -202,11 +202,13 @@ const BanksDump::MidiBank g_embeddedBanksMidi[] =
     { 0, 0, {3782, 3783, 3784, 3785, 3786, 3787, 3788, 3789, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3790, 3791, 3712, 3792, 3712, 3793, 3794, 3795, 3796, 3797, 3798, 3799, 3800, 3800, 3801, 3798, 3802, 3712, 3712, 3803, 3804, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712, 3712} },
     { 0, 0, {3805, 3806, 551, 3807, 867, 3712, 3808, 552, 3809, 783, 3810, 3811, 3812, 3813, 3814, 3815, 3816, 716, 3817, 3818, 3819, 3820, 3821, 3822, 3823, 3824, 3812, 3825, 913, 522, 522, 3826, 3827, 3828, 524, 3829, 525, 3830, 527, 526, 3831, 3832, 3833, 3834, 3835, 3836, 3837, 700, 3838, 3839, 537, 3840, 3841, 3808, 3842, 3843, 3844, 933, 3845, 3846, 934, 3847, 3848, 3849, 3850, 924, 3851, 3852, 3853, 3854, 815, 816, 3855, 3856, 3857, 3858, 3859, 3860, 3861, 3862, 3863, 3864, 3865, 3866, 3867, 3868, 3869, 527, 3870, 3871, 3872, 3822, 3873, 3874, 3875, 3876, 3877, 3878, 3879, 3880, 3877, 261, 3881, 3882, 2187, 3883, 3884, 3885, 829, 3886, 3887, 3888, 3889, 3890, 3891, 3892, 830, 3893, 830, 3894, 3895, 830, 3896, 540, 3897, 3898, 3899, 550} },
     { 0, 0, {3900, 3900, 3901, 3902, 3903, 3904, 3904, 3905, 3906, 3907, 3908, 3909, 3910, 3911, 3912, 3913, 3914, 3915, 3916, 3917, 3918, 3919, 3920, 3921, 3922, 3923, 3924, 3925, 3926, 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, 3951, 3954, 3955, 3956, 3957, 3958, 3959, 3960, 3961, 3962, 3963, 3964, 3965, 3966, 3967, 3968, 3969, 3970, 3971, 3972, 3857, 3973, 3974, 3975, 3976, 3977, 3978, 3979, 3980, 3981, 3982, 3983, 3984, 3985, 3986, 3987, 3988, 3988, 3989, 3990, 3991, 3992, 3993, 3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4007, 4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021} },
-    { 0, 0, {1383, 1384, 1385, 1386, 4, 5, 1387, 1388, 8, 1389, 1390, 11, 12, 1391, 1392, 1393, 385, 386, 387, 388, 20, 389, 390, 391, 392, 393, 26, 1394, 28, 1395, 395, 396, 397, 398, 399, 649, 649, 745, 746, 130, 747, 640, 748, 641, 728, 642, 749, 643, 644, 750, 645, 751, 657, 752, 4022, 734, 754, 755, 4023, 757, 758, 759, 760, 761, 762, 647, 763, 764, 765, 766, 767, 768, 769, 694, 4024, 166, 167, 168, 169, 170, 772, 773, 646, 775, 845, 777, 778, 696, 435, 436, 437, 90, 438, 92, 439, 94, 440, 96, 97, 441, 99, 442, 443, 444, 103, 104, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 122, 462, 463, 464, 465} },
+    { 0, 0, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 649, 649, 745, 746, 130, 747, 640, 748, 641, 728, 642, 749, 643, 644, 750, 645, 751, 657, 752, 4022, 734, 754, 755, 4023, 757, 758, 759, 760, 761, 762, 647, 763, 764, 765, 766, 767, 768, 769, 694, 4024, 166, 167, 168, 169, 170, 772, 773, 646, 775, 845, 777, 778, 696, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1} },
     { 0, 0, {1792, 1793, 1794, 1795, 181, 182, 183, 1796, 185, 1797, 4025, 4026, 4027, 188, 189, 1801, 1802, 1803, 1804, 4028, 1806, 195, 196, 197, 198, 199, 200, 201, 202, 1807, 1808, 205, 206, 207, 208, 1809, 1810, 1811, 1812, 4029, 1813, 1814, 214, 215, 216, 217, 218, 219, 220, 221, 1815, 1816, 1817, 1818, 1819, 225, 1820, 1821, 1822, 1823, 1824, 229, 230, 231, 232, 233, 234, 235, 1825, 237, 238, 239, 1826, 1827, 240, 1828, 242, 243, 244, 1829, 246, 247, 1830, 1831, 249, 250, 251, 1832, 252, 253, 254, 255, 1833, 1834, 1835, 1836, 1837, 259, 1838, 1839, 1840, 1841, 1842, 1843, 264, 265, 266, 267, 268, 269, 270, 271, 1844, 272, 273, 1845, 1846, 1847, 276, 1848, 1849, 1850, 1851, 1852, 4030, 4031, 283, 284} },
     { 0, 0, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 127, 4032, 1855, 1856, 4033, 1858, 4034, 1860, 4035, 1862, 4036, 1864, 4037, 4038, 1867, 4039, 4040, 1870, 1871, 1872, 1873, 4041, 1875, 1876, 4042, 1878, 1879, 1880, 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, 1903, 1904, 1905, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1} },
+    { 0, 0, {4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050, 4051, 4052, 4053, 4054, 4055, 4056, 4057, 4058, 4059, 4060, 4061, 4062, 4063, 4064, 4065, 4066, 4067, 4068, 4069, 4070, 4071, 4072, 4073, 4074, 4075, 4076, 4077, 4078, 4079, 4080, 4081, 4082, 4083, 4084, 4085, 4086, 4087, 4088, 4089, 4090, 4091, 4092, 4093, 4094, 4095, 4096, 4097, 4098, 4099, 4100, 4101, 4102, 4103, 4104, 4105, 4106, 4107, 4108, 4109, 4110, 4111, 4112, 4113, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, 4123, 4124, 4125, 4126, 4127, 4128, 4129, 4130, 4131, 4132, 4133, 4134, 4135, 4136, 4137, 4138, 4139, 4140, 4141, 4142, 4143, 4144, 4145, 4146, 4147, 4148, 4149, 4150, 4151, 4152, 4153, 4154, 4155, 4156, 4157, 4158, 4159, 4160, 4161, 4162, 4163, 4164, 4165, 4166, 4167, 4168, 4169, 4170} },
     { 0, 0, {4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4186, 4189, 4190, 4186, 4191, 4186, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 961, 961, 961, 961, 961, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171, 4171} },
-    { 0, 0, {3805, 4216, 4217, 3807, 867, 4218, 4219, 884, 4220, 4221, 4222, 3811, 4223, 4224, 4225, 4226, 3816, 4227, 4228, 4229, 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237, 913, 522, 4238, 4239, 3827, 4240, 4241, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4186, 4189, 4190, 4186, 4191, 4186, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, 4314, 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326, 3896, 4327, 4328, 3898, 4329, 4330} },
+    { 0, 0, {3805, 4216, 4217, 3807, 867, 4218, 4219, 884, 4220, 4221, 4222, 3811, 4223, 4224, 4225, 4226, 3816, 4227, 4228, 4229, 4230, 4231, 4232, 4233, 4234, 4235, 4236, 4237, 913, 522, 4238, 4239, 3827, 4240, 4241, 4242, 4243, 4244, 527, 4245, 4246, 4247, 4248, 4249, 4250, 4251, 4252, 4253, 4254, 3835, 4255, 4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274, 4275, 4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293, 4294, 4295, 4296, 4297, 4298, 4299, 4300, 4301, 4302, 4303, 4304, 4305, 4306, 4307, 4308, 4309, 4310, 4311, 4312, 4313, 4314, 4315, 4316, 4317, 4318, 4319, 4320, 4321, 4322, 4323, 4324, 4325, 4326, 3896, 4327, 4328, 3898, 4329, 4330} },
+    { 0, 0, {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4172, 4173, 4174, 4175, 4176, 4177, 4178, 4179, 4180, 4181, 4182, 4183, 4184, 4185, 4186, 4187, 4188, 4186, 4189, 4190, 4186, 4191, 4186, 4192, 4193, 4194, 4195, 4196, 4197, 4198, 4199, 4200, 4201, 4202, 4203, 4204, 4205, 4206, 4207, 4208, 4209, 4210, 4211, 4212, 4213, 4214, 4215, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1} },
     { 0, 0, {4331, 4332, 4333, 4334, 4335, 4336, 4337, 4338, 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4360, 4361, 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, 4375, 4376, 4377, 4378, 4371, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, 4387, 4388, 4389, 4390, 4391, 4392, 4393, 4394, 4395, 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, 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, 4435, 4436, 4437, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4445, 4446, 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456} },
     { 0, 0, {4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4458, 4459, 4460, 4461, 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, 4467, 4492, 4493, 4494, 4495, 4496, 4497, 4498, 4499, 4500, 4501, 4502, 4503, 4504, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457} },
     { 0, 0, {4331, 4332, 4333, 4334, 4335, 4336, 4337, 4338, 4339, 4340, 4341, 4342, 4343, 4344, 4345, 4346, 4347, 4348, 4349, 4350, 4351, 4352, 4353, 4354, 4355, 4356, 4357, 4358, 4359, 4505, 4506, 4362, 4363, 4364, 4365, 4366, 4367, 4368, 4369, 4370, 4371, 4372, 4373, 4374, 4507, 4376, 4377, 4378, 4371, 4379, 4380, 4381, 4382, 4383, 4384, 4385, 4386, 4387, 4388, 4389, 4508, 4391, 4509, 4393, 4394, 4395, 4395, 4396, 4397, 4398, 4399, 4400, 4401, 4402, 4403, 4404, 4405, 4406, 4407, 4408, 4510, 4410, 4511, 4412, 4413, 4414, 4415, 4416, 4417, 4418, 4419, 4420, 4421, 4422, 4423, 4424, 4425, 4426, 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, 4512, 4513, 4514, 4438, 4439, 4440, 4441, 4442, 4443, 4444, 4515, 4446, 4447, 4516, 4449, 4450, 4451, 4452, 4453, 4454, 4455, 4456} },
diff --git a/utils/gen_adldata/file_formats/load_jv.h b/utils/gen_adldata/file_formats/load_jv.h
index a7ebf7b..ef36f76 100644
--- a/utils/gen_adldata/file_formats/load_jv.h
+++ b/utils/gen_adldata/file_formats/load_jv.h
@@ -42,7 +42,7 @@ bool BankFormats::LoadJunglevision(BanksDump &db, const char *fn, unsigned bank,
                          : gmno < 128 + 88 ? int(gmno - 35)
                          : -1;
 
-        bool isPercussion = ins_count >= 128;
+        bool isPercussion = a >= ins_count;
         size_t patchId = (a < ins_count) ? (a + first_ins) : ((a - ins_count) + first_drum);
         BanksDump::MidiBank &bnk = isPercussion ? bnkPercussion : bnkMelodique;
         BanksDump::InstrumentEntry inst;