diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index aa110df62..a408d3f19 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -14,7 +14,7 @@ daObjIkariHIO_c l_HIO;
 const char daIkari_c::M_arcname[6] = "Ikari";
 
 /* 000000EC-0000010C       .text createHeap_CB__FP10fopAc_ac_c */
-static int createHeap_CB(fopAc_ac_c* i_this) {
+static BOOL createHeap_CB(fopAc_ac_c* i_this) {
     return ((daIkari_c*)i_this)->_createHeap();
 }
 
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 0ae4761cb..9ab065920 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -961,7 +961,7 @@ void daTbox_c::setCollision() {
 
 /* 000024AC-000024B4       .text actionWait__8daTbox_cFv */
 BOOL daTbox_c::actionWait() {
-    return true;
+    return TRUE;
 }
 
 /* 000024B4-000025A4       .text actionDemo__8daTbox_cFv */
@@ -972,7 +972,8 @@ BOOL daTbox_c::actionDemo() {
 
     if (dComIfGp_evmng_endCheck(eventId)) {
         setAction(&daTbox_c::actionWait);
-        play->mEvtCtrl.reset();
+        // dComIfGp_event_reset();
+        play->getEvent().reset();
 
         dKy_set_allcol_ratio(1.0f);
 
@@ -991,7 +992,7 @@ BOOL daTbox_c::actionDemo() {
         demoProc();
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 000025A4-00002634       .text actionDemo2__8daTbox_cFv */
@@ -1004,7 +1005,7 @@ BOOL daTbox_c::actionDemo2() {
         demoProc();
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 00002634-000027C8       .text actionOpenWait__8daTbox_cFv */
@@ -1052,7 +1053,7 @@ BOOL daTbox_c::actionOpenWait() {
         }
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 000027C8-000028A0       .text actionSwOnWait__8daTbox_cFv */
@@ -1070,7 +1071,7 @@ BOOL daTbox_c::actionSwOnWait() {
         }
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 000028A0-00002914       .text actionSwOnWait2__8daTbox_cFv */
@@ -1080,7 +1081,7 @@ BOOL daTbox_c::actionSwOnWait2() {
         setDzb();
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 00002914-00002A2C       .text actionGenocide__8daTbox_cFv */
@@ -1105,7 +1106,7 @@ BOOL daTbox_c::actionGenocide() {
         }
     }
 
-    return true;
+    return TRUE;
 }
 
 /* 00002C10-00002FB0       .text draw__8daTbox_cFv */
diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp
index 8e014c4ee..dc9014758 100644
--- a/src/d/actor/d_a_warpfout.cpp
+++ b/src/d/actor/d_a_warpfout.cpp
@@ -60,13 +60,9 @@ void daWarpfout_c::eventOrder() {}
 
 /* 0000012C-00000248       .text demo_proc__12daWarpfout_cFv */
 void daWarpfout_c::demo_proc() {
-    dComIfG_inf_c* gameinfo = &g_dComIfG_gameInfo;
-
     mStaffId = dComIfGp_evmng_getMyStaffId("Warpfo");
 
-    if (gameinfo->play.getEvent().getMode() != dEvtMode_NONE_e && !mEvtInfo.checkCommandTalk() &&
-        mStaffId != -1)
-    {
+    if (dComIfGp_event_runCheck() && !mEvtInfo.checkCommandTalk() && mStaffId != -1) {
         int actIdx =
             dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0);