--- a/mm7_2.cpp	Wed Aug 21 14:26:36 2013 +0200
+++ b/mm7_2.cpp	Wed Aug 21 16:06:50 2013 +0200
@@ -598,7 +598,7 @@
 }
 
 //----- (004BD8B5) --------------------------------------------------------
-signed int  sub_4BD8B5()
+int sub_4BD8B5()
 {
   int v0; // eax@4
   int v1; // eax@29
@@ -607,7 +607,7 @@
 
   if ( pMessageQueue_50CBD0->uNumMessages )
     pMessageQueue_50CBD0->uNumMessages = pMessageQueue_50CBD0->pMessages[0].field_8 != 0;
-  pKeyActionMap->SetWindowInputStatus(3);
+  pKeyActionMap->SetWindowInputStatus(WINDOW_INPUT_CANCELLED);
   pKeyActionMap->ResetKeys();
   activeLevelDecoration = NULL;
   current_npc_text = 0;
@@ -1578,7 +1578,7 @@
 }
 
 //----- (00450521) --------------------------------------------------------
-signed int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6)
+int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6)
 {
   int v6; // edi@1
   int v7; // esi@1
@@ -3034,7 +3034,7 @@
 // 6BE35C: using guessed type int uLevel_StartingPointType;
 
 //----- (00461103) --------------------------------------------------------
-void  sub_461103()
+void  _461103_load_level_sub()
 {
   //GUIProgressBar *v0; // ebx@1
   //signed int v1; // ebp@1
@@ -3188,7 +3188,7 @@
     uNumActors = 0;
   if ( dword_6BE368_debug_settings_2 & 8 )
     uNumLevelDecorations = 0;
-  sub_4613C4();
+  init_event_triggers();
 
   pGameLoadingUI_ProgressBar->Progress();
 
@@ -3206,38 +3206,15 @@
 }
 
 //----- (004613C4) --------------------------------------------------------
-int  sub_4613C4()
+void init_event_triggers()
 {
-  unsigned __int16 v0; // ax@1
-  size_t v1; // ecx@1
-  int v2; // esi@1
-  int result; // eax@1
-  LevelDecoration *v4; // edx@2
-  int v5; // edi@4
-
-  _6836C8_num_decorations_6807E8 = 0;
-  v0 = pDecorationList->GetDecorIdByName("Event Trigger");
-  v1 = uNumLevelDecorations;
-  v2 = (signed __int16)v0;
-  result = 0;
-  if ( (signed int)uNumLevelDecorations > 0 )
-  {
-    v4 = pLevelDecorations.data();
-    do
-    {
-      if ( v4->uDecorationDescID == v2 )
-      {
-        v5 = _6836C8_num_decorations_6807E8++;
-        _6807E8_level_decorations_ids[v5] = result;
-      }
-      ++result;
-      ++v4;
-    }
-    while ( result < (signed int)v1 );
-  }
-  return result;
+  uint id = pDecorationList->GetDecorIdByName("Event Trigger");
+  
+  num_event_triggers = 0;
+  for (uint i = 0; i < uNumLevelDecorations; ++i)
+    if (pLevelDecorations[i].uDecorationDescID == id)
+      event_triggers[num_event_triggers++] = i;
 }
-// 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
 
 //----- (004621DA) --------------------------------------------------------
 int int_get_vector_length(signed int x, signed int y, signed int z)
@@ -4165,7 +4142,7 @@
   else
     PrepareToLoadBLV(v9);
   pAudioPlayer->SetMapEAX();
-  sub_461103();
+  _461103_load_level_sub();
   if ( !_stricmp(pCurrentMapName.data(), "d11.blv") || !_stricmp(pCurrentMapName.data(), "d10.blv") )
   {
     //spawning grounds & good analogue - no loot & exp from monsters
@@ -4180,7 +4157,7 @@
   bDialogueUI_InitializeActor_NPC_ID = 0;
   OnMapLoad();
   pGameLoadingUI_ProgressBar->Progress();
-memset(&pRenderer->pBillboardRenderListD3D, 0, sizeof(pRenderer->pBillboardRenderListD3D));
+  memset(&pRenderer->pBillboardRenderListD3D, 0, sizeof(pRenderer->pBillboardRenderListD3D));
   pGameLoadingUI_ProgressBar->Release();
   _flushall();
 }
@@ -5774,12 +5751,9 @@
   return uCurrentMenuID;
 }
 
-// 720980: using guessed type int uTextureID_720980;
-
-// 4E28F8: using guessed type int pCurrentScreen;
 
 //----- (0046A6AC) --------------------------------------------------------
-int __fastcall sub_46A6AC(int a1, int a2, int a3)
+int __fastcall _46A6AC_spell_render(int a1, int a2, int a3)
 {
   int result; // eax@2
   unsigned int v4; // edx@3
@@ -5800,10 +5774,11 @@
   v14 = a1;
   if ( pRenderer->pRenderD3D )
   {
-    result = sub_46A7C8(a1, a2, a3);
+    result = _46A6AC_spell_render_d3d(a1, a2, a3);
   }
   else
   {
+    __debugbreak(); // SW render never called
     v16 = 0;
     v4 = viewparams->uScreen_topL_X;
     v12 = viewparams->uScreen_BttmR_X;
@@ -5862,7 +5837,7 @@
 }
 
 //----- (0046A7C8) --------------------------------------------------------
-int __fastcall sub_46A7C8(int a1, int a2, signed int a3)
+int __fastcall _46A6AC_spell_render_d3d(int a1, int a2, int a3)
 {
   unsigned int v3; // eax@2
   int v4; // ecx@2
@@ -5931,7 +5906,7 @@
 }
 
 //----- (0046A89E) --------------------------------------------------------
-int __fastcall sub_46A89E(int a1, int a2, signed int a3)
+int __fastcall _46A89E_immolation_effect(int a1, int a2, int a3)
 {
   signed int v3; // edi@1
   Actor *v4; // esi@2