--- a/mm7_1.cpp	Sun Jan 27 09:58:10 2013 +0000
+++ b/mm7_1.cpp	Sun Jan 27 11:39:11 2013 +0000
@@ -227,7 +227,7 @@
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, v5, a5, pTmpBuf, 0, 0, 0);
   v6 = pGUIWindow_CurrentMenu;
   v70 = 0;
-  v80 = dword_4E2A2C;
+  v80 = pWeaponSkills;
   do
   {
     v62 = *v80;
@@ -286,7 +286,9 @@
         if ( !(v87 & 0xC0) )
         {
           sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v62], uY);
-          goto LABEL_28;
+          pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0);
+		  v6 = pGUIWindow_CurrentMenu;
+		  continue;
         }
         v16 = pGlobalTXT_LocalizationStrings[432];
         if ( (v87 & 0x80u) == 0 )
@@ -299,13 +301,12 @@
         v46 = v88;
       }
       sprintf(pTmpBuf, "%s ", pSkillNames[v62], v15, v46, v50, v54);
-LABEL_28:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, v5, v58, pTmpBuf, 0, 0, 0);
       v6 = pGUIWindow_CurrentMenu;
     }
     ++v80;
   }
-  while ( (signed int)v80 < (signed int)dword_4E2A50 );
+  while ( v80 <= &pWeaponSkills[8]);
   if ( !v70 )
   {
     v5 = v5 + LOBYTE(pFontLucida->uFontHeight) - 3;
@@ -316,7 +317,7 @@
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 24, uYa, a5, pTmpBuf, 0, 0, 0);
   v17 = pGUIWindow_CurrentMenu;
   v71 = 0;
-  v81 = _4E2A80_skills;
+  v81 = pMagicSkills;
   do
   {
     v18 = 0;
@@ -336,7 +337,10 @@
       }
       v20 = v19->field_1C;
       if ( SBYTE1(v20) >= 0 || (BYTE1(v20) &= 0x7Fu, v20 != v63) )
-        goto LABEL_59;
+	  {
+        v18 = v67++ + 1;
+		continue;
+	  }
       ++v71;
       uYa = v19->uY;
       v21 = pPlayer->pActiveSkills[v63];
@@ -371,7 +375,10 @@
         if ( !(v21 & 0xC0) )
         {
           sprintf(pTmpBuf, "%s\r400%2d", pSkillNames[v63], v23);
-          goto LABEL_58;
+          pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0);
+		  v17 = pGUIWindow_CurrentMenu;
+		  v18 = v67++ + 1;
+		  continue;
         }
         v25 = (v21 & 0x80u) != 0;
         v26 = pGlobalTXT_LocalizationStrings[432];
@@ -385,15 +392,15 @@
         v47 = v89;
       }
       sprintf(pTmpBuf, "%s ", pSkillNames[v63], v24, v47, v51, v55);
-LABEL_58:
+//LABEL_58:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 24, uYa, v59, pTmpBuf, 0, 0, 0);
       v17 = pGUIWindow_CurrentMenu;
-LABEL_59:
+//LABEL_59:
       v18 = v67++ + 1;
     }
     ++v81;
   }
-  while ( (signed int)v81 < (signed int)pAwardsTextColors );
+  while ( v81 <= &pMagicSkills[8]);
   if ( !v71 )
     v17->DrawText(
       pFontLucida,
@@ -429,7 +436,10 @@
       }
       v31 = v30->field_1C;
       if ( SBYTE1(v31) >= 0 || (BYTE1(v31) &= 0x7Fu, v31 != v64) )
-        goto LABEL_89;
+	  {
+		  v29 = v68++ + 1;
+		  continue;
+	  }
       v27 = v30->uY;
       ++v72;
       v60 = 0;
@@ -465,7 +475,10 @@
         if ( !(v90 & 0xC0) )
         {
           sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v64], uYb);
-          goto LABEL_88;
+		  pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0);
+		  v28 = pGUIWindow_CurrentMenu;
+		  v29 = v68++ + 1;
+		  continue;
         }
         v35 = pGlobalTXT_LocalizationStrings[432];
         if ( (v90 & 0x80u) == 0 )
@@ -478,15 +491,15 @@
         v48 = v91;
       }
       sprintf(pTmpBuf, "%s ", pSkillNames[v64], v34, v48, v52, v56);
-LABEL_88:
+//LABEL_88:
       pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, v27, v60, pTmpBuf, 0, 0, 0);
       v28 = pGUIWindow_CurrentMenu;
-LABEL_89:
+//LABEL_89:
       v29 = v68++ + 1;
     }
     ++v82;
   }
-  while ( (signed int)v82 < (signed int)dword_4E2A2C );
+  while ( v82 <= &pArmorSkills[4]);
   if ( !v72 )
   {
     v27 = v27 + LOBYTE(pFontLucida->uFontHeight) - 3;
@@ -497,7 +510,7 @@
   pGUIWindow_CurrentMenu->DrawText(pFontArrus, 248, uYc, a5, pTmpBuf, 0, 0, 0);
   v36 = pGUIWindow_CurrentMenu;
   v73 = 0;
-  v83 = dword_4E2A50;
+  v83 = pMiscSkills;
   do
   {
     v37 = 0;
@@ -518,7 +531,11 @@
       }
       v39 = v38->field_1C;
       if ( SBYTE1(v39) >= 0 || (BYTE1(v39) &= 0x7Fu, v39 != v65) )
-        goto LABEL_119;
+	  {
+        //goto LABEL_119;
+		v37 = v69++ + 1;
+		continue;
+	  }
       ++v73;
       uYc = v38->uY;
       v40 = pPlayer->pActiveSkills[v65];
@@ -553,7 +570,10 @@
         if ( !(v40 & 0xC0) )
         {
           sprintf(pTmpBuf, "%s\r177%2d", pSkillNames[v65], v42);
-          goto LABEL_118;
+          LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0);
+		  v36 = pGUIWindow_CurrentMenu;
+		  v37 = v69++ + 1;
+		  continue;
         }
         v25 = (v40 & 0x80u) != 0;
         v44 = pGlobalTXT_LocalizationStrings[432];
@@ -567,15 +587,13 @@
         v49 = v92;
       }
       sprintf(pTmpBuf, "%s ", pSkillNames[v65], v43, v49, v53, v57);
-LABEL_118:
       LOBYTE(v38) = pGUIWindow_CurrentMenu->DrawText(pFontLucida, 248, uYc, v61, pTmpBuf, 0, 0, 0);
       v36 = pGUIWindow_CurrentMenu;
-LABEL_119:
       v37 = v69++ + 1;
     }
     ++v83;
   }
-  while ( (signed int)v83 < (signed int)_4E2A80_skills );
+  while ( v83 <= &pMiscSkills[11]);
   if ( !v73 )
     LOBYTE(v38) = v36->DrawText(
                     pFontLucida,