fix functions not returning values (#2942)

* fix functions not returning values

* implement functions that should return values

34 files changed, 139 insertions, 55 deletions

diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 3e5ec522a2..52e642b711 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -654,7 +654,7 @@ f64 TFunctionValue_list::update_INTERPOLATE_BSPLINE_dataMore3_(
             dVar8 = rThis._44[param_2._10 + 2];
         }
     }
-    functionvalue::interpolateValue_BSpline_uniform(param_2._0 - param_2._8, dVar9, dVar11, dVar10, dVar8);
+    return functionvalue::interpolateValue_BSpline_uniform(param_2._0 - param_2._8, dVar9, dVar11, dVar10, dVar8);
 }
 
 
diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp
index 0a82df0be1..ffdc8f3538 100644
--- a/src/d/actor/d_a_b_tn.cpp
+++ b/src/d/actor/d_a_b_tn.cpp
@@ -4902,7 +4902,7 @@ int daB_TN_c::execute() {
 }
 
 static int daB_TN_Execute(daB_TN_c* i_this) {
-    i_this->execute();
+    return i_this->execute();
 }
 
 static int daB_TN_IsDelete(daB_TN_c* i_this) {
@@ -4924,7 +4924,7 @@ int daB_TN_c::_delete() {
 }
 
 static int daB_TN_Delete(daB_TN_c* i_this) {
-    i_this->_delete();
+    return i_this->_delete();
 }
 
 int daB_TN_c::CreateHeap() {
@@ -5024,7 +5024,7 @@ int daB_TN_c::CreateHeap() {
 }
 
 static int useHeapInit(fopAc_ac_c* actor) {
-    ((daB_TN_c*)actor)->CreateHeap();
+    return ((daB_TN_c*)actor)->CreateHeap();
 }
 
 int daB_TN_c::create() {
diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp
index 5f3c9f5003..99ad3813cc 100644
--- a/src/d/actor/d_a_cstaF.cpp
+++ b/src/d/actor/d_a_cstaF.cpp
@@ -436,7 +436,7 @@ void daCstaF_c::setAnime() {
 
 BOOL daCstaF_c::initBrk(u16 i_brkIdx) {
     void* pbrk = dComIfG_getObjectRes(m_arcName, i_brkIdx);
-    m_brk.init(mp_model->getModelData(), (J3DAnmTevRegKey*)pbrk, 1, -1, 1.0f, 0, -1);
+    return m_brk.init(mp_model->getModelData(), (J3DAnmTevRegKey*)pbrk, 1, -1, 1.0f, 0, -1);
 }
 
 void daCstaF_c::initStopBrkBtk() {
diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp
index b6623e996e..0f35f2d978 100644
--- a/src/d/actor/d_a_e_df.cpp
+++ b/src/d/actor/d_a_e_df.cpp
@@ -51,7 +51,7 @@ int daE_DF_c::CreateHeap() {
 
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_DF_c* actor = static_cast<daE_DF_c*>(i_this);
-    actor->CreateHeap();
+    return actor->CreateHeap();
 }
 
 void daE_DF_c::initCcCylinder() {
diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp
index 31377ac4f1..a8cd7c4061 100644
--- a/src/d/actor/d_a_e_fk.cpp
+++ b/src/d/actor/d_a_e_fk.cpp
@@ -189,7 +189,7 @@ static f32 dummyFloat3(int _) {
     switch (_) {
     case 0:
         return 30.0f;
-    case 1:
+    default:
         return 300.0f;
     }
 }
@@ -266,7 +266,7 @@ static f32 dummyFloat4(int _) {
         return 2000.0f;
     case 1:
         return 1000.0f;
-    case 2:
+    default:
         return -4000.0f;
     }
 }
diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp
index bc63ac103d..2ba1994dbe 100644
--- a/src/d/actor/d_a_e_sm.cpp
+++ b/src/d/actor/d_a_e_sm.cpp
@@ -183,7 +183,7 @@ static BOOL pl_check(daE_SM_c* i_this, f32 param_2) {
     return FALSE;
 }
 
-static BOOL move_check(daE_SM_c* i_this, int* param_2) {
+static void move_check(daE_SM_c* i_this, int* param_2) {
     *param_2 = -1;
     
     if (pl_check(i_this, i_this->field_0x970)) {
diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp
index 935dc6db6e..6d77b5a3c8 100644
--- a/src/d/actor/d_a_npc_aru.cpp
+++ b/src/d/actor/d_a_npc_aru.cpp
@@ -422,7 +422,7 @@ int daNpc_Aru_c::Draw() {
         mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
     }
 
-    draw(
+    return draw(
 #if DEBUG
         chkAction(&daNpc_Aru_c::test),
 #else
@@ -2019,6 +2019,23 @@ int daNpc_Aru_c::talk(void* param_1) {
 }
 
 int daNpc_Aru_c::test(void* param_1) {
+    switch(mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fallthrough
+    case 2:
+        mFaceMotionSeqMngr.setNo(mHIO->param.common.face_expression, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(mHIO->param.common.motion, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+        break;
+    case 3:
+        break;
+    }
+    return 1;
 }
 
 static int daNpc_Aru_Create(void* a_this) {
diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp
index 191ac9a8f3..d7d5056d81 100644
--- a/src/d/actor/d_a_npc_besu.cpp
+++ b/src/d/actor/d_a_npc_besu.cpp
@@ -1488,7 +1488,7 @@ void daNpc_Besu_c::drawOtherMdl() {
     }
 }
 
-int daNpc_Besu_c::setCupAnm(int arg0, int i_attr, f32 i_morf) {
+bool daNpc_Besu_c::setCupAnm(int arg0, int i_attr, f32 i_morf) {
     static int cupAnmData[33][2] = {
         {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0},
         {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0},
@@ -1508,12 +1508,12 @@ int daNpc_Besu_c::setCupAnm(int arg0, int i_attr, f32 i_morf) {
         }
     }
 
-    return 1;
+    return true;
 }
 
 bool daNpc_Besu_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int param_3) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
-    setCupAnm(arg0, arg1, var_f30);
+    return setCupAnm(arg0, arg1, var_f30);
 }
 
 daNpcT_faceMotionAnmData_c daNpc_Besu_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c arg0) {
diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp
index cacfe23527..423192b4c5 100644
--- a/src/d/actor/d_a_npc_chin.cpp
+++ b/src/d/actor/d_a_npc_chin.cpp
@@ -439,7 +439,7 @@ int daNpcChin_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
 
 int daNpcChin_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcChin_c* chin = (daNpcChin_c*)i_this;
-    chin->CreateHeap();
+    return chin->CreateHeap();
 }
 
 int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp
index 0bf2359a43..9033238475 100644
--- a/src/d/actor/d_a_npc_doc.cpp
+++ b/src/d/actor/d_a_npc_doc.cpp
@@ -831,7 +831,24 @@ int daNpc_Doc_c::talk(void* param_0) {
 }
 
 int daNpc_Doc_c::test(void* i_this) {
-    // DEBUG NONMATCHING
+    int ret = 0;
+    switch(mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fallthrough
+    case 2:
+        mFaceMotionSeqMngr.setNo(mpHIO->m.common.face_expression, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(mpHIO->m.common.motion, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+        break;
+    case 3:
+        break;
+    }
+    return ret;
 }
 
 static int daNpc_Doc_Create(void* i_this) {
diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp
index f8beca273e..77baa5480d 100644
--- a/src/d/actor/d_a_npc_grs.cpp
+++ b/src/d/actor/d_a_npc_grs.cpp
@@ -265,13 +265,13 @@ int daNpc_grS_c::Delete() {
 }
 
 int daNpc_grS_c::Execute() {
-    execute();
+    return execute();
 }
 
 int daNpc_grS_c::Draw() {
     J3DModelData* modelData = mAnm_p->getModel()->getModelData();
     modelData->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
-    draw(chkAction(&daNpc_grS_c::test),0, mpHIO->m.common.real_shadow_size,NULL,0);
+    return draw(chkAction(&daNpc_grS_c::test),0, mpHIO->m.common.real_shadow_size,NULL,0);
 }
 
 int daNpc_grS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
@@ -318,7 +318,7 @@ int daNpc_grS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
 
 int daNpc_grS_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_grS_c* grS = (daNpc_grS_c*)i_this;
-    grS->CreateHeap();
+    return grS->CreateHeap();
 }
 
 int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp
index dd9cd849b5..5abf670fc5 100644
--- a/src/d/actor/d_a_npc_hoz.cpp
+++ b/src/d/actor/d_a_npc_hoz.cpp
@@ -333,7 +333,7 @@ static f32 dummyFloat(int _) {
     switch (_) {
     case 0: return 0.0f;
     case 1: return 65536.0f;
-    case 2: return 0.2f;
+    default: return 0.2f;
     }
 }
 
diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp
index 15a9b4e71e..01912a8b2e 100644
--- a/src/d/actor/d_a_npc_kn.cpp
+++ b/src/d/actor/d_a_npc_kn.cpp
@@ -1023,11 +1023,11 @@ u32 daNpc_Kn_c::setParamTeach05() {
 }
 
 u32 daNpc_Kn_c::setParamTeach06() {
-    setParamTeach05();
+    return setParamTeach05();
 }
 
 u32 daNpc_Kn_c::setParamTeach07() {
-    setParamTeach05();
+    return setParamTeach05();
 }
 
 void daNpc_Kn_c::setAfterTalkMotion() {
diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp
index 72a428872a..fcf881e7f4 100644
--- a/src/d/actor/d_a_npc_kolinb.cpp
+++ b/src/d/actor/d_a_npc_kolinb.cpp
@@ -381,7 +381,7 @@ int daNpc_Kolinb_c::Draw() {
         modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
     }
 
-    draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
+    return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
 int daNpc_Kolinb_c::createHeapCallBack(fopAc_ac_c* a_this) {
diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp
index 2aba09429e..8701ef64a7 100644
--- a/src/d/actor/d_a_npc_lud.cpp
+++ b/src/d/actor/d_a_npc_lud.cpp
@@ -879,7 +879,7 @@ bool daNpc_Lud_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int p
     if (mCreating == true) {
         param_2 = 0.0f;
     }
-    setBowlAnm(param_0, param_1, param_2);
+    return setBowlAnm(param_0, param_1, param_2);
 }
 
 int daNpc_Lud_c::selectAction() {
diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp
index 4c78c54d94..a4e02c2211 100644
--- a/src/d/actor/d_a_npc_pachi_besu.cpp
+++ b/src/d/actor/d_a_npc_pachi_besu.cpp
@@ -1089,7 +1089,23 @@ BOOL daNpc_Pachi_Besu_c::talk(void* param_1) {
 }
 
 BOOL daNpc_Pachi_Besu_c::test(void* param_1) {
-    // DEBUG NONMATCHING
+    switch(mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fallthrough
+    case 2:
+        mFaceMotionSeqMngr.setNo(mHIO->param.common.face_expression, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(mHIO->param.common.motion, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+        break;
+    case 3:
+        break;
+    }
+    return 1;
 }
 
 BOOL daNpc_Pachi_Besu_c::_turn_to_link(s16 param_1) {
diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp
index 2041dc4e12..07f65ecd49 100644
--- a/src/d/actor/d_a_npc_post.cpp
+++ b/src/d/actor/d_a_npc_post.cpp
@@ -983,7 +983,7 @@ void daNpc_Post_c::drawOtherMdl() {
     }
 }
 
-BOOL daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
+bool daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
     static daNpc_GetParam1 flagAnmData[13] = {
         {BCK_POST_FLAG_WAIT_A, POST},
         {BCK_POST_FLAG_RUN, POST1},
@@ -1011,12 +1011,12 @@ BOOL daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 bool daNpc_Post_c::afterSetMotionAnm(int i_idx, int i_attr, f32 i_morf, int param_4) {
     f32 morf = mCreating == true ? 0.0f : i_morf;
-    setFlagAnm(i_idx, i_attr, morf);
+    return setFlagAnm(i_idx, i_attr, morf);
 }
 
 BOOL daNpc_Post_c::selectAction() {
diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp
index 014c8d4466..2fe7966305 100644
--- a/src/d/actor/d_a_npc_raca.cpp
+++ b/src/d/actor/d_a_npc_raca.cpp
@@ -310,7 +310,7 @@ int daNpc_Raca_c::Draw() {
         modelData->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
     }
 
-    draw(
+    return draw(
 #if DEBUG
         chkAction(mAction),
 #else
@@ -796,19 +796,19 @@ int daNpc_Raca_c::talk(void* param_1) {
 }
 
 static int daNpc_Raca_Create(void* a_this) {
-    static_cast<daNpc_Raca_c*>(a_this)->create();
+    return static_cast<daNpc_Raca_c*>(a_this)->create();
 }
 
 static int daNpc_Raca_Delete(void* a_this) {
-    static_cast<daNpc_Raca_c*>(a_this)->Delete();
+    return static_cast<daNpc_Raca_c*>(a_this)->Delete();
 }
 
 static int daNpc_Raca_Execute(void* a_this) {
-    static_cast<daNpc_Raca_c*>(a_this)->Execute();
+    return static_cast<daNpc_Raca_c*>(a_this)->Execute();
 }
 
 static int daNpc_Raca_Draw(void* a_this) {
-    static_cast<daNpc_Raca_c*>(a_this)->Draw();
+    return static_cast<daNpc_Raca_c*>(a_this)->Draw();
 }
 
 static int daNpc_Raca_IsDelete(void* a_this) {
diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp
index 784e45eb13..ed6f43831d 100644
--- a/src/d/actor/d_a_npc_seira.cpp
+++ b/src/d/actor/d_a_npc_seira.cpp
@@ -757,7 +757,7 @@ bool daNpc_Seira_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
 
 bool daNpc_Seira_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int arg3) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
-    setBottleAnm(arg0, arg1, var_f30, 1);
+    return setBottleAnm(arg0, arg1, var_f30, 1);
 }
 
 void daNpc_Seira_c::changeAnm(int* arg0, int* arg1) {
diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp
index 8702cce37a..902dacf90c 100644
--- a/src/d/actor/d_a_npc_seira2.cpp
+++ b/src/d/actor/d_a_npc_seira2.cpp
@@ -669,7 +669,7 @@ bool daNpc_Seira2_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
 
 bool daNpc_Seira2_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
-    setBottleAnm(arg0, arg1, var_f30, 1);
+    return setBottleAnm(arg0, arg1, var_f30, 1);
 }
 
 int daNpc_Seira2_c::selectAction() {
diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp
index 7f932a7b25..2fd65efc6d 100644
--- a/src/d/actor/d_a_npc_shaman.cpp
+++ b/src/d/actor/d_a_npc_shaman.cpp
@@ -1115,7 +1115,23 @@ int daNpc_Sha_c::talk(void* param_1) {
 }
 
 int daNpc_Sha_c::test(void* param_1) {
-
+    switch(mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fallthrough
+    case 2:
+        mFaceMotionSeqMngr.setNo(mpHIO->m.common.face_expression, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(mpHIO->m.common.motion, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+        break;
+    case 3:
+        break;
+    }
+    return 1;
 }
 
 const u16 daNpc_Sha_c::mEvtBitLabels[6] = {
diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp
index 17a0104acf..0a622914ec 100644
--- a/src/d/actor/d_a_npc_sola.cpp
+++ b/src/d/actor/d_a_npc_sola.cpp
@@ -162,7 +162,7 @@ int daNpc_solA_c::Delete() {
 }
 
 int daNpc_solA_c::Execute() {
-    execute();
+    return execute();
 }
 
 void daNpc_solA_c::Draw() {
@@ -449,7 +449,7 @@ static int daNpc_solA_Delete(void* param_0) {
 }
 
 static int daNpc_solA_Execute(void* param_0) {
-    static_cast<daNpc_solA_c*>(param_0)->Execute();
+    return static_cast<daNpc_solA_c*>(param_0)->Execute();
 }
 
 static void daNpc_solA_Draw(void* param_0) {
diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp
index 5ef139a2e9..46c57e776d 100644
--- a/src/d/actor/d_a_npc_tkj.cpp
+++ b/src/d/actor/d_a_npc_tkj.cpp
@@ -239,7 +239,7 @@ int daNpcTkj_c::Draw() {
         mdlData_p->getMaterialNodePointer(getEyeballMaterialNo())->setMaterialAnm(mpMatAnm[0]);
     }
 
-    draw(FALSE, 0, daNpc_Tkj_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
+    return draw(FALSE, 0, daNpc_Tkj_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
 int daNpcTkj_c::createHeapCallBack(fopAc_ac_c* i_this) {
diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp
index e8ea58b0be..5abd9994f6 100644
--- a/src/d/actor/d_a_npc_toby.cpp
+++ b/src/d/actor/d_a_npc_toby.cpp
@@ -2184,7 +2184,23 @@ int daNpc_Toby_c::talk(void*) {
 }
 
 int daNpc_Toby_c::test(void* param_0) {
-    // TODO
+    switch(mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fallthrough
+    case 2:
+        mFaceMotionSeqMngr.setNo(mpHIO->m.common.face_expression, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(mpHIO->m.common.motion, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+        break;
+    case 3:
+        break;
+    }
+    return 1;
 }
 
 static int daNpc_Toby_Create(void* i_this) {
diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp
index b63be7ae67..8522d99bf2 100644
--- a/src/d/actor/d_a_obj_crvhahen.cpp
+++ b/src/d/actor/d_a_obj_crvhahen.cpp
@@ -28,7 +28,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 }
 
 static int daObjCRVHAHEN_Create(fopAc_ac_c* i_this) {
-    static_cast<daObjCRVHAHEN_c*>(i_this)->create();
+    return static_cast<daObjCRVHAHEN_c*>(i_this)->create();
 }
 
 static int daObjCRVHAHEN_Delete(daObjCRVHAHEN_c* i_this) {
@@ -206,7 +206,7 @@ static int daObjCRVHAHEN_Draw(daObjCRVHAHEN_c* i_this) {
 }
 
 static int daObjCRVHAHEN_Execute(daObjCRVHAHEN_c* i_this) {
-    i_this->Execute();
+    return i_this->Execute();
 }
 
 int daObjCRVHAHEN_c::create() {
diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp
index 43d55c53a8..ffba4604bd 100644
--- a/src/d/actor/d_a_obj_magne_arm.cpp
+++ b/src/d/actor/d_a_obj_magne_arm.cpp
@@ -381,7 +381,7 @@ int daObjMarm_c::create1st() {
         &daObjMarm_c::phase_1,
         &daObjMarm_c::phase_2,
     };
-    (this->*l_ct_func[mPhaseIndex])();
+    return (this->*l_ct_func[mPhaseIndex])();
 }
 
 int daObjMarm_c::Execute(Mtx** i_bgMtx) {
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 48b9976add..326ad20996 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -598,6 +598,8 @@ fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i
 
         a_this->field_0x8fe = 1;
     }
+
+    return i_bgActor;
 }
 
 int daObjMovebox::Act_c::Create() {
diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp
index 31bb71ef78..6cee9cf7b0 100644
--- a/src/d/actor/d_a_obj_nagaisu.cpp
+++ b/src/d/actor/d_a_obj_nagaisu.cpp
@@ -234,7 +234,7 @@ void daObjIsuChild_c::create(daObjNagaisu_c* i_parent, dCcD_Stts* i_ccStts) {
     }
 }
 
-int daObjIsuChild_c::execute() {
+void daObjIsuChild_c::execute() {
     if (!mIsDead) {
         if (chkHit()) {
             callEmt();
@@ -249,7 +249,7 @@ int daObjIsuChild_c::execute() {
     }
 }
 
-int daObjIsuChild_c::draw(dMdl_c* i_mdl) {
+void daObjIsuChild_c::draw(dMdl_c* i_mdl) {
     if (!mIsDead) {
         mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z);
         mDoMtx_stack_c::YrotM(-0x8000);
diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp
index cc2bb52860..d1ed19203c 100644
--- a/src/d/actor/d_a_obj_sekizoa.cpp
+++ b/src/d/actor/d_a_obj_sekizoa.cpp
@@ -309,7 +309,7 @@ int daObj_Sekizoa_c::Draw() {
 }
 
 int daObj_Sekizoa_c::createHeapCallBack(fopAc_ac_c* i_this) {
-    static_cast<daObj_Sekizoa_c*>(i_this)->CreateHeap();
+    return static_cast<daObj_Sekizoa_c*>(i_this)->CreateHeap();
 }
 
 void* daObj_Sekizoa_c::srchSekizoa(void* i_actor, void* i_this) {
diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp
index 6970789bdf..ccb0f7eaad 100644
--- a/src/d/actor/d_a_obj_smtile.cpp
+++ b/src/d/actor/d_a_obj_smtile.cpp
@@ -294,19 +294,19 @@ void daObj_SMTile_c::setMtx() {
 }
 
 static int daObj_SMTile_Create(void* i_this) {
-    static_cast<daObj_SMTile_c*>(i_this)->create();
+    return static_cast<daObj_SMTile_c*>(i_this)->create();
 }
 
 static int daObj_SMTile_Delete(void* i_this) {
-    static_cast<daObj_SMTile_c*>(i_this)->Delete();
+    return static_cast<daObj_SMTile_c*>(i_this)->Delete();
 }
 
 static int daObj_SMTile_Execute(void* i_this) {
-    static_cast<daObj_SMTile_c*>(i_this)->Execute();
+    return static_cast<daObj_SMTile_c*>(i_this)->Execute();
 }
 
 static int daObj_SMTile_Draw(void* i_this) {
-    static_cast<daObj_SMTile_c*>(i_this)->Draw();
+    return static_cast<daObj_SMTile_c*>(i_this)->Draw();
 }
 
 static int daObj_SMTile_IsDelete(void* i_this) {
diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp
index 27f8199b16..bbb9142154 100644
--- a/src/d/actor/d_a_peru.cpp
+++ b/src/d/actor/d_a_peru.cpp
@@ -279,7 +279,7 @@ int daPeru_c::Draw() {
         u16 eyeballMat = getEyeballMaterialNo();
         modelData->getMaterialNodePointer(eyeballMat)->setMaterialAnm(matAnm);
     }
-    draw(0, 0, daPeru_Param_c::m.field_0x00[3], NULL, 100.0f, 0, field_0xe80, 0);
+    return draw(0, 0, daPeru_Param_c::m.field_0x00[3], NULL, 100.0f, 0, field_0xe80, 0);
 }
 
 int daPeru_c::createHeapCallBack(fopAc_ac_c* i_this) {
diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp
index 32050e09ad..ac0f1191f1 100644
--- a/src/d/d_ev_camera.cpp
+++ b/src/d/d_ev_camera.cpp
@@ -921,15 +921,15 @@ bool dCamera_c::fixedPositionEvCamera() {
 }
 
 bool dCamera_c::uniformTransEvCamera() {
-    transEvCamera(1);
+    return transEvCamera(1);
 }
 
 bool dCamera_c::uniformBrakeEvCamera() {
-    transEvCamera(2);
+    return transEvCamera(2);
 }
 
 bool dCamera_c::uniformAcceleEvCamera() {
-    transEvCamera(3);
+    return transEvCamera(3);
 }
 
 namespace {
diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 04cd7da9f7..87ae6c1c02 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -1613,7 +1613,7 @@ void dFile_select_c::copyToSelPaneMove() {
     }
 }
 
-bool dFile_select_c::yesnoMenuMoveAnmInitSet(int param_1, int param_2) {
+void dFile_select_c::yesnoMenuMoveAnmInitSet(int param_1, int param_2) {
     if (!field_0x0108) {
         field_0x0268 = false;
         field_0x0269 = true;
diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp
index c98d396a58..9043a5657e 100644
--- a/src/d/d_menu_dmap_map.cpp
+++ b/src/d/d_menu_dmap_map.cpp
@@ -435,7 +435,7 @@ s8 dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_r
         *i_rotY = rightModeCnvRot(var_r29);
     }
 
-    dMapInfo_c::calcNowStayFloorNo(sp10.y, true);
+    return dMapInfo_c::calcNowStayFloorNo(sp10.y, true);
 }
 
 void dMenu_StageMapCtrl_c::setPlusNowStayFloorNo(s8 param_0, u8 param_1) {