--- a/mm7_3.cpp	Tue Feb 19 13:29:02 2013 +0200
+++ b/mm7_3.cpp	Tue Feb 19 13:31:50 2013 +0200
@@ -15230,7 +15230,7 @@
 	else if (v16 == 24)
     {
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->evtf - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_F - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15244,7 +15244,7 @@
 	else if (v16 == 19)
 	{
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->bDrawSomeAnim - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_A - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15255,7 +15255,7 @@
 	else if (v16 == 20)
 	{
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->_anim_current_time - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_B - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15266,7 +15266,7 @@
 	else if (v16 == 21)
 	{
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->_anim_end_time - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_C - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15277,7 +15277,7 @@
 	else if (v16 == 22)
 	{
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->evtd - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_D - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15288,7 +15288,7 @@
 	else if (v16 == 23)
 	{
       __debugbreak(); // learn conditions of this event
-      auto topic = pNPCTopics[pNPC->evte - 1].pTopic;//(&dword_721660)[8 * v23];
+      auto topic = pNPCTopics[pNPC->evt_E - 1].pTopic;//(&dword_721660)[8 * v23];
       if (!topic)
       {
         v14->pButtonName[0] = 0;
@@ -15477,12 +15477,12 @@
       }
       return &pNPCStats->pNewNPCData[v1];// - 1];
     }
-    return &pNPCStats->array_13EF4[npcid - 5000];
+    return &pNPCStats->pAdditionalNPC[npcid - 5000];
   }
 
 
   if ( npcid >= 5000 )
-    return &pNPCStats->array_13EF4[npcid - 5000];
+    return &pNPCStats->pAdditionalNPC[npcid - 5000];
   if (uDialogue_SpeakingActorNPC_ID >= 0)
   {
     result = 0;
@@ -15558,7 +15558,7 @@
     }
 LABEL_7:
     *(int *)a2 = npcid - 5000;
-    return &pNPCStats->array_13EF4[npcid - 5000];
+    return &pNPCStats->pAdditionalNPC[npcid - 5000];
   }
   if ( npcid >= 5000 )
     goto LABEL_7;
@@ -16314,31 +16314,31 @@
                     if ( v37 )
                     {
                       if ( v37 == 1 )
-                        v33->evtf = v30;
+                        v33->evt_F = v30;
                     }
                     else
                     {
-                      v33->evte = v30;
+                      v33->evt_E = v30;
                     }
                   }
                   else
                   {
-                    v33->evtd = v30;
+                    v33->evt_D = v30;
                   }
                 }
                 else
                 {
-                  v33->_anim_end_time = v30;
+                  v33->evt_C = v30;
                 }
               }
               else
               {
-                v33->_anim_current_time = v30;
+                v33->evt_B = v30;
               }
             }
             else
             {
-              v33->bDrawSomeAnim = v30;
+              v33->evt_A = v30;
             }
             if ( v29 == 8 )
             {
@@ -16448,7 +16448,7 @@
             //v7 = "";
             break;
           case EVENT_MoveNPC:
-            pNPCStats->pNewNPCData[_evt->v5 + ((_evt->v6 + ((_evt->v7 + ((uint)_evt->v8 << 8)) << 8)) << 8)].house = _evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8);
+            pNPCStats->pNewNPCData[_evt->v5 + ((_evt->v6 + ((_evt->v7 + ((uint)_evt->v8 << 8)) << 8)) << 8)].Location2D = _evt->v9 + ((_evt->v10 + ((_evt->v11 + ((uint)_evt->v12 << 8)) << 8)) << 8);
             if ( ptr_507BC0 )
             {
               v46 = ptr_507BC0->ptr_1C;