--- a/mm7_1.cpp	Thu Jan 17 09:24:40 2013 +0600
+++ b/mm7_1.cpp	Thu Jan 17 16:24:25 2013 +0600
@@ -1237,8 +1237,8 @@
 {
   unsigned int v1; // edi@1
   unsigned int v2; // eax@6
-  Texture *v3; // ecx@6
-  GUIButton *v4; // eax@6
+  Texture *pTexture; // ecx@6
+  GUIButton *pButton; // eax@6
   unsigned int v5; // eax@7
   unsigned int v6; // eax@10
   unsigned int v7; // eax@11
@@ -1249,15 +1249,15 @@
     pRenderer->ClearZBuffer(0, 479);
     switch ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] )
     {
-      case 0x64:                                // stats
+      case WINDOW_CharacterWindow_Stats:                                // stats
         sub_4196A0();
         sub_419379();
         CharacterUI_StatsTab_Draw(v1);
         v7 = pIcons_LOD->LoadTexture("ib-cd1-d", TEXTURE_16BIT_PALETTE);
-        v3 = (Texture *)(v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0);
-        v4 = pCharacterScreen_StatsBtn;
+        pTexture = (Texture *)(v7 != -1 ? (int)&pIcons_LOD->pTextures[v7] : 0);
+        pButton = pCharacterScreen_StatsBtn;
         break;
-      case 0x65:                                // skills
+      case WINDOW_CharacterWindow_Skills:                                // skills
         if ( dword_507CC0 != uActiveCharacter )
         {
           sub_4196A0();
@@ -1266,30 +1266,30 @@
         sub_419379();
         CharacterUI_SkillsTab_Draw(v1);
         v6 = pIcons_LOD->LoadTexture("ib-cd2-d", TEXTURE_16BIT_PALETTE);
-        v3 = (Texture *)(v6 != -1 ? (int)&pIcons_LOD->pTextures[v6] : 0);
-        v4 = pCharacterScreen_SkillsBtn;
+        pTexture = (Texture *)(v6 != -1 ? (int)&pIcons_LOD->pTextures[v6] : 0);
+        pButton = pCharacterScreen_SkillsBtn;
         break;
-      case 0x66:                                // awards
+      case WINDOW_CharacterWindow_Awards:                                // awards
         sub_4196A0();
         sub_419379();
         sub_419220();
         CharacterUI_AwardsTab_Draw(v1);
         v5 = pIcons_LOD->LoadTexture("ib-cd4-d", TEXTURE_16BIT_PALETTE);
-        v3 = (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0);
-        v4 = pCharacterScreen_AwardsBtn;
+        pTexture = (Texture *)(v5 != -1 ? (int)&pIcons_LOD->pTextures[v5] : 0);
+        pButton = pCharacterScreen_AwardsBtn;
         break;
-      default:
+      default:                                                            // inventory and other
         if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] != 103 )
           goto LABEL_13;
         sub_4196A0();
         sub_419379();
         CharacterUI_InventoryTab_Draw(v1, 0);
         v2 = pIcons_LOD->LoadTexture("ib-cd3-d", TEXTURE_16BIT_PALETTE);
-        v3 = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0);
-        v4 = pCharacterScreen_InventoryBtn;
+        pTexture = (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0);
+        pButton = pCharacterScreen_InventoryBtn;
         break;
     }
-    pRenderer->DrawTextureIndexed(v4->uX, v4->uY, v3);
+    pRenderer->DrawTextureIndexed(pButton->uX, pButton->uY, pTexture);
 LABEL_13:
     if ( bRingsShownInCharScreen )
       CharacterUI_DrawPaperdollWithRingOverlay(v1);
@@ -1704,7 +1704,6 @@
   //Texture *v18; // ST60_4@1
   unsigned int uTextureID_ib_td4_A; // eax@1
   Texture *v20; // ST78_4@1
-  const char *v21; // ST5C_4@1
   unsigned __int8 v22; // al@1
   //Texture *v23; // ST60_4@1
   Texture *v24; // eax@1
@@ -1773,82 +1772,31 @@
   pPrimaryWindow->CreateButton(0x1BBu, 0x194u, 5u, 0x31u, 1, 93, 0, 4u, 0, "", 0);
   uTextureID_ib_td1_A = pIcons_LOD->LoadTexture("ib-td1-A", TEXTURE_16BIT_PALETTE);
   v6 = (Texture *)(uTextureID_ib_td1_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td1_A] : 0);
-  v7 = pGlobalTXT_LocalizationStrings[174];
+  v7 = pGlobalTXT_LocalizationStrings[174];//Quests
   v8 = pKeyActionMap->GetActionVKey(INPUT_Quest);
-  pBtn_Quests = pPrimaryWindow->CreateButton(
-                 0x1EBu,
-                 0x161u,
-                 v6->uTextureWidth,
-                 v6->uTextureHeight,
-                 1,
-                 0,
-                 0xC8u,
-                 0,
-                 v8,
-                 v7,
-                 v6, 0);
+  pBtn_Quests = pPrimaryWindow->CreateButton(0x1EBu, 0x161u, v6->uTextureWidth, v6->uTextureHeight, 1, 0, 0xC8u, 0, v8, v7, v6, 0);
   uTextureID_ib_td2_A = pIcons_LOD->LoadTexture("ib-td2-A", TEXTURE_16BIT_PALETTE);
   v10 = (Texture *)(uTextureID_ib_td2_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td2_A] : 0);
-  v11 = pGlobalTXT_LocalizationStrings[154];
+  v11 = pGlobalTXT_LocalizationStrings[154];//Autonotes
   v12 = pKeyActionMap->GetActionVKey(INPUT_Autonotes);
-  pBtn_Autonotes = pPrimaryWindow->CreateButton(
-                 0x20Fu,
-                 0x161u,
-                 v10->uTextureWidth,
-                 v10->uTextureHeight,
-                 1,
-                 0,
-                 0xC9u,
-                 0,
-                 v12,
-                 v11,
-                 v10);
+  pBtn_Autonotes = pPrimaryWindow->CreateButton(0x20Fu, 0x161u, v10->uTextureWidth, v10->uTextureHeight, 1, 0, 0xC9u, 0, v12, v11, v10, 0);
   v14 = pIcons_LOD->LoadTexture("ib-td3-A", TEXTURE_16BIT_PALETTE);
   v15 = (Texture *)(v14 != -1 ? (int)&pIcons_LOD->pTextures[v14] : 0);
-  v16 = pGlobalTXT_LocalizationStrings[139];
+  v16 = pGlobalTXT_LocalizationStrings[139];//Maps
   v17 = pKeyActionMap->GetActionVKey(INPUT_Mapbook);
-  pBtn_Maps = pPrimaryWindow->CreateButton(
-                 0x222u,
-                 0x161u,
-                 v15->uTextureWidth,
-                 v15->uTextureHeight,
-                 1,
-                 0,
-                 0xCAu,
-                 0,
-                 v17,
-                 v16,
-                 v15);
+  pBtn_Maps = pPrimaryWindow->CreateButton(0x222u, 0x161u, v15->uTextureWidth, v15->uTextureHeight, 1, 0, 0xCAu, 0, v17, v16, v15, 0);
   uTextureID_ib_td4_A = pIcons_LOD->LoadTexture("ib-td4-A", TEXTURE_16BIT_PALETTE);
   v20 = (Texture *)(uTextureID_ib_td4_A != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_ib_td4_A] : 0);
-  v21 = pGlobalTXT_LocalizationStrings[78];
   v22 = pKeyActionMap->GetActionVKey(INPUT_TimeCal);
-  pBtn_Calendar = pPrimaryWindow->CreateButton(
-                   0x23Au,
-                   0x161u,
-                   v20->uTextureWidth,
-                   v20->uTextureHeight,
-                   1,
-                   0,
-                   0xCBu,
-                   0,
-                   v22,
-                   v21,
-                   v20);
+  pBtn_Calendar = pPrimaryWindow->CreateButton(0x23Au, 0x161u, v20->uTextureWidth, v20->uTextureHeight, 1, 0, 0xCBu, 0, v22,
+                                                pGlobalTXT_LocalizationStrings[78],//Calendar
+                                                 v20, 0);
   uTextureID_ib_td5_A = pIcons_LOD->LoadTexture("ib-td5-A", TEXTURE_16BIT_PALETTE);
-  pBtn_History = pPrimaryWindow->CreateButton(
-                 0x258u,
-                 0x169u,
+  pBtn_History = pPrimaryWindow->CreateButton(0x258u, 0x169u,
                  (uTextureID_ib_td5_A != -1 ? pIcons_LOD->pTextures[uTextureID_ib_td5_A].uTextureWidth : 24),
                  (uTextureID_ib_td5_A != -1 ? pIcons_LOD->pTextures[uTextureID_ib_td5_A].uTextureHeight : 26),
-                 1,
-                 0,
-                 0xE0u,
-                 0,
-                 0x48u,
-                 pGlobalTXT_LocalizationStrings[602],
-                 (Texture *)(uTextureID_ib_td5_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td5_A] : 0),
-                 0);
+                 1, 0, 0xE0u, 0, 0x48u, pGlobalTXT_LocalizationStrings[602],//History
+                 (Texture *)(uTextureID_ib_td5_A != -1 ? &pIcons_LOD->pTextures[uTextureID_ib_td5_A] : 0), 0);
   v24 = &pIcons_LOD->pTextures[uTextureID_507980];
   v25 = (Texture *)(uTextureID_507980 != -1 ? (int)v24 : 0);
   bFlashHistoryBook = 0;
@@ -5311,7 +5259,7 @@
   if ( uNumVisibleWindows <= 0 )
   {
 LABEL_38:
-    if ( pCurrentScreen == 10 )
+    if ( pCurrentScreen == 10 ) // ChestScreen
     {
       sub_42038D();
       //goto _return;
@@ -5326,7 +5274,7 @@
       uLastPointedObjectID = pMouse->uPointingObjectID;
       return;
     }
-    if ( pCurrentScreen == 13 )
+    if ( pCurrentScreen == 13 ) // HouseScreen
     {
       if ( dword_F8B19C != 2
         || (v16 = pRenderer->pActiveZBuffer[pX + pSRZBufferLineOffsets[pY]], v16 == 0)
@@ -5411,7 +5359,7 @@
             && (signed int)pY <= (signed int)pButton->uW )
           {
             pMessageType3 = (UIMessageType)pButton->field_1C;
-            if ( pMessageType3 == 0 )
+            if ( pMessageType3 == 0 ) // For books
               //goto LABEL_28;
             {
               v13 = pButton->pButtonName;