--- a/mm7_5.cpp	Tue May 14 12:35:06 2013 +0200
+++ b/mm7_5.cpp	Tue May 14 14:03:07 2013 +0200
@@ -9990,86 +9990,8 @@
   return pGlobalTXT_LocalizationStrings[567];
 }
 
-//----- (00413D6F) --------------------------------------------------------
-char __cdecl DrawBook_Calendar()
-{
-  unsigned int v0; // esi@1
-  char *v1; // eax@5
-  int v2; // ecx@5
-  char *v3; // eax@6
-  GUIWindow a1; // [sp+Ch] [bp-60h]@5
-  unsigned int v6; // [sp+60h] [bp-Ch]@1
-  int v7; // [sp+64h] [bp-8h]@1
-  int a5; // [sp+68h] [bp-4h]@1
-
-  v0 = pParty->uCurrentHour;
-  v6 = pMapStats->GetMapInfo(pCurrentMapName);
-  a5 = TargetColor(0x4Bu, 0x4Bu, 0x4Bu);
-  pRenderer->DrawTextureIndexed(pViewport->uViewportTL_X, pViewport->uViewportTL_Y, pSpellBookPagesTextr_13);
-  v7 = (unsigned __int8)pDayMoonPhase[pParty->uDaysPlayed];
-  if ( (signed int)v0 <= 12 )
-  {
-    if ( !v0 )
-      v0 = 12;
-  }
-  else
-  {
-    v0 -= 12;
-  }
-  a1.uFrameX = game_viewport_x;
-  a1.uFrameY = game_viewport_y;
-  a1.uFrameWidth = game_viewport_width;
-  a1.uFrameHeight = game_viewport_height;
-  a1.uFrameZ = game_viewport_z;
-  a1.uFrameW = game_viewport_w;
-  a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[186], 3u);
-  if ( pParty->uCurrentHour >= 12 )
-  {
-    if ( pParty->uCurrentHour >= 24 )
-		v2=0;
-	else
-		v2=1;
-  }
-  else
-    v2=0;
-  v1 = GetDayPart();
-  sprintf(
-    pTmpBuf,
-    "%s\t100:\t110%d:%02d %s - %s",
-    pGlobalTXT_LocalizationStrings[526],
-    v0,
-    pParty->uCurrentMinute,
-    aAMPMNames[v2],
-    v1);
-  a1.DrawText(pBookFont, 70, 55, a5, pTmpBuf, 0, 0, 0);
-  sprintf(
-    pTmpBuf,
-    "%s\t100:\t110%d - %s",
-    pGlobalTXT_LocalizationStrings[56],
-    pParty->uDaysPlayed + 1,
-    aDayNames[pParty->uDaysPlayed % 7]);
-  a1.DrawText(pBookFont, 70, 2 * LOBYTE(pBookFont->uFontHeight) + 49, a5, pTmpBuf, 0, 0, 0);
-  sprintf(
-    pTmpBuf,
-    "%s\t100:\t110%d - %s",
-    pGlobalTXT_LocalizationStrings[146],
-    pParty->uCurrentMonth + 1,
-    aMonthNames[pParty->uCurrentMonth]);
-  a1.DrawText(pBookFont, 70, 4 * LOBYTE(pBookFont->uFontHeight) + 43, a5, pTmpBuf, 0, 0, 0);
-  sprintf(pTmpBuf, "%s\t100:\t110%d", pGlobalTXT_LocalizationStrings[245], pParty->uCurrentYear);
-  a1.DrawText(pBookFont, 70, 6 * LOBYTE(pBookFont->uFontHeight) + 37, a5, pTmpBuf, 0, 0, 0);
-  sprintf(pTmpBuf, "%s\t100:\t110%s", pGlobalTXT_LocalizationStrings[530], aMoonPhaseNames[v7]);
-  a1.DrawText(pBookFont, 70, 8 * LOBYTE(pBookFont->uFontHeight) + 31, a5, pTmpBuf, 0, 0, 0);
-  if ( v6 )
-    v3 = pMapStats->pInfos[v6].pName;
-  else
-    v3 = "Unknown";
-  sprintf(pTmpBuf, "%s\t100:\t110%s", pGlobalTXT_LocalizationStrings[531], v3);
-  return a1.DrawText(pBookFont, 70, 10 * LOBYTE(pBookFont->uFontHeight) + 25, a5, pTmpBuf, 0, 0, 0);
-}
-
 //----- (00413FF1) --------------------------------------------------------
-void __cdecl SetMonthNames()
+void SetMonthNames()
 {
   aMonthNames[0] = pGlobalTXT_LocalizationStrings[415];
   aMonthNames[1] = pGlobalTXT_LocalizationStrings[416];
@@ -10086,7 +10008,7 @@
 }
 
 //----- (0041406F) --------------------------------------------------------
-void __cdecl SetDayNames()
+void SetDayNames()
 {
   aDayNames[0] = pGlobalTXT_LocalizationStrings[145];
   aDayNames[1] = pGlobalTXT_LocalizationStrings[230];
@@ -10098,7 +10020,7 @@
 }
 
 //----- (004140BB) --------------------------------------------------------
-void __cdecl SetSpellSchoolNames()
+void SetSpellSchoolNames()
 {
   aSpellSchoolNames[0] = pGlobalTXT_LocalizationStrings[87];
   aSpellSchoolNames[1] = pGlobalTXT_LocalizationStrings[6];
@@ -10112,7 +10034,7 @@
 }
 
 //----- (0041411B) --------------------------------------------------------
-void __cdecl SetAttributeNames()
+void SetAttributeNames()
 {
   aAttributeNames[0] = pGlobalTXT_LocalizationStrings[144];
   aAttributeNames[1] = pGlobalTXT_LocalizationStrings[116];
@@ -10124,13 +10046,13 @@
 }
 
 //----- (00414162) --------------------------------------------------------
-void __cdecl uGameUIFontMain_initialize()
+void uGameUIFontMain_initialize()
 {
   uGameUIFontMain = TargetColor(0xAu, 0, 0);
 }
 
 //----- (00414174) --------------------------------------------------------
-void __cdecl uGameUIFontShadow_initialize()
+void uGameUIFontShadow_initialize()
 {
   uGameUIFontShadow = TargetColor(0xE6u, 214u, 193u);
 }
@@ -10276,7 +10198,7 @@
       }
       case WINDOW_Book:
       {
-        DrawCurrentBook((unsigned int)pWindow->ptr_1C);
+        BookUI_Draw((WindowType)(int)pWindow->ptr_1C);
         continue;
       }
       case WINDOW_Dialogue: