1 files changed, 15 insertions, 10 deletions
diff --git a/src/gen_adldata/gen_adldata.cc b/src/gen_adldata/gen_adldata.cc
index 187d079..78dfbbc 100644
--- a/src/gen_adldata/gen_adldata.cc
+++ b/src/gen_adldata/gen_adldata.cc
@@ -517,18 +517,20 @@ static void LoadMiles(const char* fn, unsigned bank, const char* prefix)
 
     for(unsigned a=0; a<2000; ++a)
     {
-        unsigned gmnumber  = data[a*6+0];
-        unsigned gmnumber2 = data[a*6+1];
+        unsigned gm_patch  = data[a*6+0];
+        unsigned gm_bank = data[a*6+1];
         unsigned offset    = *(unsigned*)&data[a*6+2];
 
-        if(gmnumber == 0xFF) break;
-        int gmno = gmnumber2==0x7F ? gmnumber+0x80 : gmnumber;
+        if(gm_patch == 0xFF)
+            break;
+
+        int gmno = gm_bank==0x7F ? gm_patch + 0x80 : gm_patch;
         int midi_index = gmno < 128 ? gmno
                        : gmno < 128+35 ? -1
                        : gmno < 128+88 ? gmno-35
                        : -1;
         unsigned length = data[offset] + data[offset+1]*256;
-        signed char notenum = data[offset+2];
+        signed char notenum = ((signed char)data[offset+2]);
 
         /*printf("%02X %02X %08X ", gmnumber,gmnumber2, offset);
         for(unsigned b=0; b<length; ++b)
@@ -538,10 +540,11 @@ static void LoadMiles(const char* fn, unsigned bank, const char* prefix)
         }
         printf("\n");*/
 
-        if(gmnumber2 != 0 && gmnumber2 != 0x7F) continue;
+        if(gm_bank != 0 && gm_bank != 0x7F)
+            continue;
 
         char name2[512]; sprintf(name2, "%s%c%u", prefix,
-            (gmno<128?'M':'P'), gmno&127);
+            (gmno < 128 ? 'M':'P'), gmno & 127);
 
         insdata tmp[200];
 
@@ -550,7 +553,7 @@ static void LoadMiles(const char* fn, unsigned bank, const char* prefix)
         {
             unsigned o = offset + 3 + i*11;
             tmp[i].finetune = (gmno < 128 && i == 0) ? notenum : 0;
-            tmp[i].diff=false;
+            tmp[i].diff = false;
             tmp[i].data[0] = data[o+0];  // 20
             tmp[i].data[8] = data[o+1];  // 40 (vol)
             tmp[i].data[2] = data[o+2];  // 60
@@ -570,11 +573,13 @@ static void LoadMiles(const char* fn, unsigned bank, const char* prefix)
                 tmp[1].data[10] = (fb_c & 0x0E) | (fb_c >> 7);
             }
         }
-        if(inscount == 1) tmp[1] = tmp[0];
+        if(inscount == 1)
+            tmp[1] = tmp[0];
+
         if(inscount <= 2)
         {
             struct ins tmp2;
-            tmp2.notenum  = gmno < 128 ? 0 : data[offset+3];
+            tmp2.notenum  = gmno < 128 ? 0 : notenum;
             tmp2.pseudo4op = false;
             tmp2.fine_tune = 0.0;
             std::string name;