fix functions not returning values (#3018)

10 files changed, 65 insertions, 23 deletions

diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h
index f467b953db..0d194c4995 100644
--- a/include/JSystem/J2DGraph/J2DWindow.h
+++ b/include/JSystem/J2DGraph/J2DWindow.h
@@ -9,9 +9,16 @@ class JUTTexture;
 
 enum J2DTextureBase {
     TEXTUREBASE_0 = 0,
+    TEXTUREBASE_1 = 1,
+    TEXTUREBASE_2 = 2,
+    TEXTUREBASE_3 = 3,
 };
 
 enum J2DWindowMirror {
+    WINDOWMIRROR_39 = 39,
+    WINDOWMIRROR_114 = 114,
+    WINDOWMIRROR_141 = 141,
+    WINDOWMIRROR_216 = 216,
 };
 
 /**
diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h
index 5234e1bdc2..0a0b10eada 100644
--- a/include/d/actor/d_a_npc_hoz.h
+++ b/include/d/actor/d_a_npc_hoz.h
@@ -100,7 +100,7 @@ public:
     static cutFunc mCutList[];
 
 private:
-    /* 0xE40 */ u8 field_0xE40[0xE44 - 0xE40];
+    /* 0xE40 */ int field_0xE40;
     /* 0xE44 */ dCcD_Cyl mCyl;
     /* 0xF80 */ u8 mType;
     /* 0xF84 */ daStartAndGoal_c* field_0xf84;
diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h
index bf28ec9eca..713794c3b1 100644
--- a/include/d/actor/d_a_obj_bemos.h
+++ b/include/d/actor/d_a_obj_bemos.h
@@ -46,6 +46,7 @@ public:
         };
 
         Bgc_c();
+        static void chk_wall_touch(const fopAc_ac_c*, const daObjBm_c::BgcSrc_c*, short);
         void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32);
         bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16);
 
diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp
index 8e02439053..c33fd3c095 100644
--- a/src/JSystem/J2DGraph/J2DWindow.cpp
+++ b/src/JSystem/J2DGraph/J2DWindow.cpp
@@ -276,8 +276,23 @@ void J2DWindow::initinfo2() {
     }
 }
 
-J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase) {
-
+J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase texBase) {
+    J2DWindowMirror winMirror = WINDOWMIRROR_39;
+    switch (texBase) {
+    case TEXTUREBASE_0:
+        winMirror = WINDOWMIRROR_39;
+        break;
+    case TEXTUREBASE_1:
+        winMirror = WINDOWMIRROR_141;
+        break;
+    case TEXTUREBASE_2:
+        winMirror = WINDOWMIRROR_114;
+        break;
+    case TEXTUREBASE_3:
+        winMirror = WINDOWMIRROR_216;
+        break;
+    }
+    return winMirror;
 }
 
 J2DWindow::~J2DWindow() {
diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp
index ffa19293e0..5e82d25366 100644
--- a/src/JSystem/JAudio2/JASHeapCtrl.cpp
+++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp
@@ -323,9 +323,9 @@ JASHeap* JASKernel::getAramHeap() {
 }
 
 u32 JASKernel::getAramFreeSize() {
-    audioAramHeap.getFreeSize();
+    return audioAramHeap.getFreeSize();
 }
 
 u32 JASKernel::getAramSize() {
-    audioAramHeap.getSize();
+    return audioAramHeap.getSize();
 }
diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp
index 3463b27cde..1990a7cf2b 100644
--- a/src/d/actor/d_a_npc_hoz.cpp
+++ b/src/d/actor/d_a_npc_hoz.cpp
@@ -818,6 +818,25 @@ BOOL daNpc_Hoz_c::drawDbgInfo() {
 
 int daNpc_Hoz_c::test(void* i_this) {
     // DEBUG NONMATCHING
+    int r30 = 0;
+    switch (mMode) {
+    case 0:
+    case 1:
+        speedF = 0.0f;
+        speed.setall(0.0f);
+        mMode = 2;
+        // fall-through
+    case 2:
+        // TODO: determine pointer type of field_0xE40
+        mFaceMotionSeqMngr.setNo(field_0xE40, -1.0f, 0, 0);
+        mMotionSeqMngr.setNo(field_0xE40, -1.0f, 0, 0);
+        mJntAnm.lookNone(0);
+        attention_info.flags = 0;
+    case 3:
+    default:
+        break;
+    }
+    return r30;
 }
 
 int daNpc_Hoz_c::selectAction() {
diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp
index 52d796d6b5..44a8c086e7 100644
--- a/src/d/actor/d_a_obj_bemos.cpp
+++ b/src/d/actor/d_a_obj_bemos.cpp
@@ -1117,8 +1117,9 @@ dBgS_WtrChk daObjBm_c::Bgc_c::M_wrt_work;
 
 dBgS_ObjLinChk daObjBm_c::Bgc_c::M_wall_work[23];
 
-static dBgS_ObjGndChk dummy_touch_work() {
+void daObjBm_c::Bgc_c::chk_wall_touch(const fopAc_ac_c*, const daObjBm_c::BgcSrc_c*, short) {
     static dBgS_ObjLinChk touch_work;
+    const static float bgc_add = 10.0f;
 }
 
 static f32 dummy_rodata_5158() {
diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp
index 96c3711ca3..e2e425097c 100644
--- a/src/d/actor/d_a_obj_kshutter.cpp
+++ b/src/d/actor/d_a_obj_kshutter.cpp
@@ -308,12 +308,8 @@ cPhs__Step daObjKshtr_c::phase_0() {
     if (!field_0x619) {
         mHomeAngleZ = home.angle.z;
         mHomeAngleX = home.angle.x;
-        shape_angle.x = 0;
-        current.angle.x = 0;
-        home.angle.x = 0;
-        shape_angle.z = 0;
-        current.angle.z = 0;
-        home.angle.z = 0;
+        home.angle.x = current.angle.x = shape_angle.x = 0;
+        home.angle.z = current.angle.z = shape_angle.z = 0;
         field_0x619 = true;
     }
 
@@ -330,7 +326,8 @@ cPhs__Step daObjKshtr_c::phase_0() {
     #endif
 
     #if DEBUG
-    if (mType >= 6) {
+    int r28 = 5;
+    if (mType > r28) {
         OS_REPORT_ERROR("鍵付き壁ドア：引数０のタイプ指定が不正値です\n"); // Locked wall door: The type specification for argument 0 is invalid
 
         return cPhs_ERROR_e;
@@ -345,7 +342,8 @@ cPhs__Step daObjKshtr_c::phase_0() {
         }
     }
 
-    if (dComIfG_resLoad(&mPhase1, l_arcName[mType]) == cPhs_COMPLEATE_e) {
+    phase = (cPhs__Step)dComIfG_resLoad(&mPhase1, l_arcName[mType]);
+    if (phase == cPhs_COMPLEATE_e) {
         phase = (cPhs__Step)MoveBGCreate(l_arcName[mType], l_dzb[mType], NULL, l_heap_size[mType], NULL);
         if (phase == cPhs_ERROR_e) {
             return phase;
@@ -355,6 +353,7 @@ cPhs__Step daObjKshtr_c::phase_0() {
         OS_REPORT("KSHTR PARAM:0x%x\n", fopAcM_GetParam(this));
         return cPhs_INIT_e;
     }
+    return phase;
 }
 
 cPhs__Step daObjKshtr_c::phase_1() {
diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp
index 557f02c22a..bee5fc640d 100644
--- a/src/d/actor/d_a_obj_stopper.cpp
+++ b/src/d/actor/d_a_obj_stopper.cpp
@@ -70,18 +70,18 @@ int daObjStopper_c::create() {
     if (!field_0x9fc) {
         field_0x9f8 = home.angle.x;
         field_0x9fa = home.angle.z;
-        home.angle.z = 0;
-        home.angle.x = 0;
-        current.angle.z = 0;
-        current.angle.x = 0;
-        shape_angle.z = 0;
-        shape_angle.x = 0;
+        home.angle.x = home.angle.z = 0;
+        current.angle.x = current.angle.z = 0;
+        shape_angle.x = shape_angle.z = 0;
         field_0x9fc = 1;
     }
-    cPhs__Step phase = (cPhs__Step)MoveBGCreate(NULL, -1, dBgS_MoveBGProc_TypicalRotY, 0x810, NULL);
-    if (phase != cPhs_ERROR_e) {
+    cPhs__Step phase = cPhs_COMPLEATE_e;
+    phase = (cPhs__Step)MoveBGCreate(NULL, -1, dBgS_MoveBGProc_TypicalRotY, 0x810, NULL);
+    if (phase == cPhs_ERROR_e) {
         return phase;
     }
+    OS_REPORT("STOPPER PARAM<0x%x>\n", fopAcM_GetParam(this));
+    return phase;
 }
 
 int daObjStopper_c::Execute(Mtx** param_0) {
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index 94aed7f3e8..8c98a1693c 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -165,5 +165,5 @@ s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) {
 }
 
 int fopScnRq_Handler() {
-    fpcNdRq_Handler();
+    return fpcNdRq_Handler();
 }