--- a/mm7_1.cpp	Mon May 13 17:01:20 2013 +0200
+++ b/mm7_1.cpp	Mon May 13 17:07:52 2013 +0200
@@ -625,7 +625,7 @@
 }
 
 //----- (00420E01) --------------------------------------------------------
-void __cdecl sub_420E01()
+void __cdecl OnChestLeftClick()
 {
   int chest_id; // edi@1
   POINT *v1; // esi@2
@@ -850,7 +850,7 @@
     if ( uActiveCharacter == uPlayerID )
     {
       pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-      pCurrentScreen = SCREEN_F;
+      pCurrentScreen = SCREEN_CHEST_INVENTORY;
       //goto LABEL_28;
       uActiveCharacter = uPlayerID;
       return;
@@ -870,7 +870,7 @@
       uActiveCharacter = uPlayerID;
       return;
     }
-    if ( pCurrentScreen != SCREEN_F )
+    if ( pCurrentScreen != SCREEN_CHEST_INVENTORY )
     {
       viewparams->bRedrawGameUI = true;
       uActiveCharacter = uPlayerID;
@@ -883,7 +883,7 @@
     if ( uActiveCharacter == uPlayerID )
     {
       pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
-      pCurrentScreen = SCREEN_F;
+      pCurrentScreen = SCREEN_CHEST_INVENTORY;
       //goto LABEL_28;
       uActiveCharacter = uPlayerID;
       return;
@@ -916,7 +916,7 @@
 // F8B19C: using guessed type int dword_F8B19C;
 
 //----- (00421EA6) --------------------------------------------------------
-void __cdecl sub_421EA6_OnInventoryLeftClick()
+void __cdecl OnInventoryLeftClick()
 {
   Player *v0; // ebx@1
   signed int v1; // eax@2
@@ -1254,7 +1254,7 @@
       }
       /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
         return;
-      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161;
+      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_StartNPCDialogue;
       pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v18;
 LABEL_42:
       *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
@@ -1270,7 +1270,7 @@
     }
     /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
     {
-      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)23;
+      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Attack;
       goto LABEL_41;
     }*/
     pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
@@ -1287,7 +1287,7 @@
     {
       pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0);
       /*&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
-      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)25;
+      pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_CastQuickSpell;
 LABEL_41:
       pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
       goto LABEL_42;*/