Debug version now builds OK and all_source compiles (#2343)

* Fix missing arg to JUT_ASSERT

* Fix some MWCC version diff errors

* Compile m_Do_ext, d_demo, actor_mng

* Add VSCode task to quickly switch between versions

* Unlink magLift for debug

* Update the hash of the debug dol

The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment.

The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol.

The DOL now builds OK.

* Fix all debug REL dtor splits

All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.

* Add genMessage declarations to all HIO subclasses

* Fixing more compilation errors

* m_Do_mtx 100% on debug

Cannot be linked due to weak function name mangling?

* Improve various matches

* Fix all remaining compilation errors

* Fix new compilation errors from main

* Fix retail regression

* Link f_pc_profile_lst

50 files changed, 246 insertions, 396 deletions

diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp
index 51d8883d5e..3bd81ae678 100644
--- a/src/d/actor/d_a_andsw.cpp
+++ b/src/d/actor/d_a_andsw.cpp
@@ -6,13 +6,31 @@
 #include "d/actor/d_a_andsw.h"
 #include "d/d_procname.h"
 
+#ifdef DEBUG
+daAndsw_HIO_c l_HIO;
+
+daAndsw_HIO_c::daAndsw_HIO_c() {
+    field_0x6 = 0;
+}
+
+void daAndsw_HIO_c::genMessage(JORMContext* ctx) {
+    ctx->genLabel("ＳＷ監視", 0, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
+    ctx->genCheckBox("ＳＷ状態出力", &field_0x6, 0x01, 0, NULL, 0xFFFF, 0xFFFF, 512, 24);
+}
+#endif
+
 /* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text            Create__9daAndsw_cFv */
 int daAndsw_c::Create() {
     mSwNo = getSwNo();
     mSwNo2 = getSwNo2();
-    u16 timer = getTimer();
 
-    timer != 0xFF ? mTimer = getTimer() * 15 : mTimer = 0;
+    if (getTimer() != 0xFF) {
+        mTimer = getTimer() * 15;
+    } else {
+        mTimer = 0;
+    }
+
+    OS_REPORT("ANDSW PARAM 0x%x\n", fopAcM_GetParam(this));
 
     return 1;
 }
@@ -23,6 +41,11 @@ int daAndsw_c::create() {
     if (!Create()) {
         return cPhs_ERROR_e;
     }
+
+#ifdef DEBUG
+    l_HIO.entryHIO("ＳＷ監視");
+#endif
+
     return cPhs_COMPLEATE_e;
 }
 
@@ -35,18 +58,35 @@ int daAndsw_c::execute() {
 
         if (mTimer == 0) {
             fopAcM_offSwitch(this,mSwNo);
+
+#ifdef DEBUG
+            if (l_HIO.field_0x6 != 0) {
+                OS_REPORT("-- ＳＷ監視状態出力 --\n");
+                OS_REPORT("sw<%d>ＯＦＦしました\n", mSwNo);
+            }
+#endif
         
             if (getType() == 1) {
                 fopAcM_delete(this);
+                OS_REPORT("ＳＷ監視：ＳＷＯＦＦしたので処理終わりますSW<%d>\n", mSwNo);
             }
         }
     }
+#ifdef DEBUG
+    else if (l_HIO.field_0x6 != 0) {
+        OS_REPORT("sw2<%d>を待っています\n", mSwNo2);
+        l_HIO.field_0x6 = 0;
+    }
+#endif
 
     return 1;
 }
 
 /* 80457ABC-80457AC4 0001BC 0008+00 1/1 0/0 0/0 .text            _delete__9daAndsw_cFv */
 int daAndsw_c::_delete() {
+#ifdef DEBUG
+    l_HIO.removeHIO();
+#endif
     return 1;
 }
 
@@ -57,12 +97,14 @@ static int daAndsw_Execute(daAndsw_c* i_this) {
 
 /* 80457AE4-80457B04 0001E4 0020+00 1/0 0/0 0/0 .text            daAndsw_Delete__FP9daAndsw_c */
 static int daAndsw_Delete(daAndsw_c* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Andsw");
     return i_this->_delete();
 }
 
 /* 80457B04-80457B24 000204 0020+00 1/0 0/0 0/0 .text            daAndsw_Create__FP10fopAc_ac_c */
 static int daAndsw_Create(fopAc_ac_c* i_this) {
-    return static_cast<daAndsw_c*>(i_this)->create();
+    fopAcM_RegisterCreateID(daAndsw_c, i_this, "Andsw");
+    return a_this->create();
 }
 
 /* ############################################################################################## */
@@ -70,7 +112,9 @@ static int daAndsw_Create(fopAc_ac_c* i_this) {
 static actor_method_class l_daAndsw_Method = {
     (process_method_func)daAndsw_Create,
     (process_method_func)daAndsw_Delete,
-    (process_method_func)daAndsw_Execute
+    (process_method_func)daAndsw_Execute,
+    (process_method_func)NULL,
+    (process_method_func)NULL,
 };
 
 /* 80457B4C-80457B7C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ANDSW */
diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp
index fcc1b55dae..c6208b94bb 100644
--- a/src/d/actor/d_a_b_bq.cpp
+++ b/src/d/actor/d_a_b_bq.cpp
@@ -2284,14 +2284,14 @@ static int daB_BQ_Execute(b_bq_class* i_this) {
         sp50 = a_this->eyePos;
         i_this->mCcCoreSph.SetC(sp50 + sp68);
 
-        MTXCopy(model->getAnmMtx(YREG_S(2) + JNT_CORE_3), *calc_mtx);
+        MTXCopy(model->getAnmMtx(YREG_S(2) + (int)JNT_CORE_3), *calc_mtx);
         sp44.set(YREG_F(3) + -250.0f, YREG_F(4), YREG_F(5));
         MtxPosition(&sp44, &sp50);
 
         i_this->mCcSph.SetC(sp50 + sp68);
         i_this->mCcSph.SetR(YREG_F(14) + 350.0f);
     } else {
-        MTXCopy(model->getAnmMtx(YREG_S(1) + JNT_CORE_3), *calc_mtx);
+        MTXCopy(model->getAnmMtx(YREG_S(1) + (int)JNT_CORE_3), *calc_mtx);
         sp44.set((XREG_F(3) + 300.0f) - 70.0f, XREG_F(4) + 50.0f, XREG_F(5));
         MtxPosition(&sp44, &a_this->eyePos);
         a_this->attention_info.position = a_this->eyePos;
@@ -2480,7 +2480,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", 0x1A);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (a_this->mpEyeballModel == NULL) {
@@ -2523,7 +2523,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
 
         dComIfGs_offSwitch((fopAcM_GetParam(i_this) >> 0x10) & 0xFF, fopAcM_GetRoomNo(i_this));
 
-        OS_REPORT("B_BQ PARAM %x\n" fopAcM_GetParam(i_this));
+        OS_REPORT("B_BQ PARAM %x\n", fopAcM_GetParam(i_this));
         OS_REPORT("B_BQ//////////////B_BQ SET 1 !!\n");
 
         if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x6FA0)) {
diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp
index 47d43ed088..46772094e8 100644
--- a/src/d/actor/d_a_b_dr.cpp
+++ b/src/d/actor/d_a_b_dr.cpp
@@ -403,7 +403,7 @@ int daB_DR_c::draw() {
         dDbVw_drawLineXlu(home.pos, sp24, color, TRUE, 12);
     }
 
-    dComIfG_Bgsp().DrawWall(&mAcch);
+    mAcch.DrawWall(dComIfG_Bgsp());
 #endif
 
     J3DModel* model_p = mpModelMorf->getModel();
diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp
index ce3d755a71..029f7f0e06 100644
--- a/src/d/actor/d_a_b_ds.cpp
+++ b/src/d/actor/d_a_b_ds.cpp
@@ -5554,7 +5554,7 @@ int daB_DS_c::CreateHeap() {
         anm_res = ANM_HEAD_FWAIT;
     }
 
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpMorf = new mDoExt_McaMorfSO(
         modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
@@ -5572,7 +5572,7 @@ int daB_DS_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpSwordMorf = new mDoExt_McaMorfSO(
         modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
@@ -5594,7 +5594,7 @@ int daB_DS_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpZantMorf = new mDoExt_McaMorfSO(
         modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
@@ -5604,7 +5604,7 @@ int daB_DS_c::CreateHeap() {
     }
 
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 73));
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
     if (mpOpPatternModel == NULL) {
@@ -5636,7 +5636,7 @@ int daB_DS_c::CreateHeap() {
     }
 
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 72));
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
     if (mpPatternModel == NULL) {
diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp
index 1b21fc4e95..72c0684934 100644
--- a/src/d/actor/d_a_b_ob.cpp
+++ b/src/d/actor/d_a_b_ob.cpp
@@ -3815,7 +3815,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", 0x21);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
     if (a_this->mpSuiModel == NULL) {
diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp
index ada17bd9b8..d2ed24f9d5 100644
--- a/src/d/actor/d_a_b_zant.cpp
+++ b/src/d/actor/d_a_b_zant.cpp
@@ -5570,7 +5570,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) {
 /* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text            CreateHeap__10daB_ZANT_cFv */
 int daB_ZANT_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x48);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x12), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
     if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
         return 0;
@@ -5637,14 +5637,14 @@ int daB_ZANT_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4A);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpSwordLModel == NULL) {
         return 0;
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4B);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpSwordRModel == NULL) {
         return 0;
diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp
index 2dd10d89ab..b94734e368 100644
--- a/src/d/actor/d_a_b_zant_mobile.cpp
+++ b/src/d/actor/d_a_b_zant_mobile.cpp
@@ -421,7 +421,7 @@ static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) {
 /* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text            CreateHeap__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", 0x4C);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", 0x44), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
     if (mpMorf == NULL) {
diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp
index a2ebeb076e..b60b9ea408 100644
--- a/src/d/actor/d_a_door_mbossL1.cpp
+++ b/src/d/actor/d_a_door_mbossL1.cpp
@@ -338,7 +338,7 @@ J3DModelData* daMBdoorL1_c::getDoorModelData() {
 int daMBdoorL1_c::CreateHeap() {
     int level = getNowLevel(this);
     J3DModelData* modelData = getDoorModelData();
-    JUT_ASSERT(579. modelData != 0);
+    JUT_ASSERT(579, modelData != 0);
     if (getDoorType() == DOOR_TYPE_2) {
         for (int i = 0; i < 2; i++) {
             mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp
index 9e2795cf14..1002a62f41 100644
--- a/src/d/actor/d_a_door_shutter.cpp
+++ b/src/d/actor/d_a_door_shutter.cpp
@@ -949,7 +949,7 @@ int daDoor20_c::demoProc() {
             if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
                                                              1, 0, 1.0f, 0, -1, true))
             {
-                JUT_PANIC(0);
+                JUT_PANIC(1799, 0);
             }
             field_0x67c = 0;
             openInit2();
@@ -961,7 +961,7 @@ int daDoor20_c::demoProc() {
             if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
                                                              1, 0, 1.0f, 0, -1, true))
             {
-                JUT_PANIC(0);
+                JUT_PANIC(1812, 0);
             }
             field_0x67c = 0;
             openInit2();
diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp
index a7cc8626d1..f0de66acd4 100644
--- a/src/d/actor/d_a_e_arrow.cpp
+++ b/src/d/actor/d_a_e_arrow.cpp
@@ -780,7 +780,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->mResName, res_id);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (a_this->mpModel == NULL) {
diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp
index 3ab7abf13c..2b54eb9d66 100644
--- a/src/d/actor/d_a_e_bi_leaf.cpp
+++ b/src/d/actor/d_a_e_bi_leaf.cpp
@@ -86,7 +86,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
     if (a_this->field_0x5b4 != 1) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BI", 15);
-        JUT_ASSERT(modelData != 0);
+        JUT_ASSERT(0, modelData != 0);
 
         a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
         if (a_this->mpModel == NULL) {
diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp
index be16bd8f0b..2915273c2a 100644
--- a/src/d/actor/d_a_e_ph.cpp
+++ b/src/d/actor/d_a_e_ph.cpp
@@ -164,7 +164,7 @@ void daE_PH_c::setCcSph() {
 
 int daE_PH_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpMorf = new mDoExt_McaMorfSO(
         modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT),
diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp
index b0a9498356..3b6afd80dd 100644
--- a/src/d/actor/d_a_e_vt.cpp
+++ b/src/d/actor/d_a_e_vt.cpp
@@ -3820,7 +3820,7 @@ static int daE_VA_Delete(daE_VA_c* i_this) {
 // NONMATCHING weird data issue / reg alloc (probably related)
 int daE_VA_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
                                   (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 15), 0, 1.0f, 0,
@@ -3843,7 +3843,7 @@ int daE_VA_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x30);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpWeaponModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
     if (mpWeaponModel == NULL) {
@@ -3863,7 +3863,7 @@ int daE_VA_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x37);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpEndEfMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
                                        (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 7), 0, 1.0f,
@@ -3934,7 +3934,7 @@ int daE_VA_c::CreateHeap() {
             break;
         }
 
-        JUT_ASSERT(modelData != 0);
+        JUT_ASSERT(0, modelData != 0);
         mpCardModels[i] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
     }
 
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index f381e417ee..4fbb91c017 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -27,10 +27,10 @@ int daItemBase_c::__CreateHeap() {
 /* 8014475C-80144B94 13F09C 0438+00 0/0 3/3 0/0 .text CreateItemHeap__12daItemBase_cFPCcsssssss */
 int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btkName, s16 i_bpkName,
                                  s16 i_bckName, s16 i_bxaName, s16 i_brkName, s16 i_btpName) {
-    JUT_ASSERT(0 <= m_itemNo && m_itemNo <= 255);
+    JUT_ASSERT(0, 0 <= m_itemNo && m_itemNo <= 255);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_arcName, i_bmdName);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     u32 flags = 0x11000084;
     u32 modelflags = 0x80000;
@@ -60,7 +60,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     if (i_btkName > 0) {
         J3DAnmTextureSRTKey* pbtk =
             (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_btkName);
-        JUT_ASSERT(pbtk != 0);
+        JUT_ASSERT(0, pbtk != 0);
 
         mpBtkAnm = new mDoExt_btkAnm();
         if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
@@ -71,7 +71,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     mpBpkAnm = NULL;
     if (i_bpkName > 0) {
         J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(i_arcName, i_bpkName);
-        JUT_ASSERT(pbpk != 0);
+        JUT_ASSERT(0, pbpk != 0);
 
         mpBpkAnm = new mDoExt_bpkAnm();
         if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
@@ -82,7 +82,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     mpBckAnm = NULL;
     if (i_bckName > 0) {
         J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_bckName);
-        JUT_ASSERT(pbck != 0);
+        JUT_ASSERT(0, pbck != 0);
 
         mpBckAnm = new mDoExt_bckAnm();
         if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
@@ -93,7 +93,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     mpBrkAnm = NULL;
     if (i_brkName > 0) {
         J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_brkName);
-        JUT_ASSERT(pbrk != 0);
+        JUT_ASSERT(0, pbrk != 0);
 
         s8 tevFrm = getTevFrm();
         int anmPlay = TRUE;
@@ -110,7 +110,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     mpBtpAnm = NULL;
     if (i_btpName > 0) {
         J3DAnmTexPattern* pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_btpName);
-        JUT_ASSERT(pbtp != 0);
+        JUT_ASSERT(0, pbtp != 0);
 
         mpBtpAnm = new mDoExt_btpAnm();
         if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp
index 3443f61b6a..69065b7780 100644
--- a/src/d/actor/d_a_kytag08.cpp
+++ b/src/d/actor/d_a_kytag08.cpp
@@ -223,7 +223,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     kytag08_class* a_this = (kytag08_class*)i_this;
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag08", 3);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
 
diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp
index da42db665d..34d5d66b78 100644
--- a/src/d/actor/d_a_mirror.cpp
+++ b/src/d/actor/d_a_mirror.cpp
@@ -204,7 +204,7 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
     }
 
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
-    JUT_ASSERT(kankyo != 0);
+    JUT_ASSERT(0, kankyo != 0);
 
     GXColor color = {0};
     color.r = kankyo->bg_amb_col[0].r;
@@ -310,7 +310,7 @@ void dMirror_packet_c::mainDraw() {
                     temp_f1 = (temp_f22 - sp19C[temp_r29].z) / temp_f1;
                     sp11C *= temp_f1;
 
-                    JUT_ASSERT(0 <= prjPosNum && prjPosNum < (4 + 1));
+                    JUT_ASSERT(0, 0 <= prjPosNum && prjPosNum < (4 + 1));
 
                     sp19C[4] = sp19C[temp_r29] + sp11C;
 
@@ -595,7 +595,7 @@ int daMirror_c::execute() {
     }
 
     daPy_py_c* player = daPy_getLinkPlayerActorClass();
-    JUT_ASSERT(player != 0);
+    JUT_ASSERT(0, player != 0);
 
     if (mPacket.getViewScale().y > 0.0f && player->getKandelaarFlamePos() &&
         fopAcM_searchActorDistance2(this, player) < 40000.0f)
diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp
index 5ac606d44c..a0c5139b16 100644
--- a/src/d/actor/d_a_movie_player.cpp
+++ b/src/d/actor/d_a_movie_player.cpp
@@ -3550,7 +3550,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
     
     if (!daMP_THPPlayerOpen(moviePath, 0)) {
         OSReport("Fail to open the thp file\n");
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         return 0;
     }
 
@@ -3569,7 +3569,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
     daMP_buffer = mDoExt_getArchiveHeap()->alloc(daMP_THPPlayerCalcNeedMemory(), 0x20);
     if (daMP_buffer == NULL) {
         OSReport("Can't allocate the memory");
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         return 0;
     }
 
@@ -3577,7 +3577,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
 
     if (!daMP_THPPlayerPrepare(0, 0, daMP_audioInfo.field_0xc != 1 ? OSGetTick() % daMP_audioInfo.field_0xc : 0)) {
         OSReport("Fail to prepare\n");
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         return 0;
     }
 
diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp
index b876abb490..d89e9d4e2f 100644
--- a/src/d/actor/d_a_nbomb.cpp
+++ b/src/d/actor/d_a_nbomb.cpp
@@ -140,7 +140,7 @@ int daNbomb_c::createHeap() {
 
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(m_arcNameList[mType], bmdIdx[mType]);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return 0;
@@ -149,13 +149,13 @@ int daNbomb_c::createHeap() {
     J3DAnmTransform* trans = NULL;
     if (mType == TYPE_INSECT_ENEMY) {
         trans = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcNameBombE, 6);
-        JUT_ASSERT(trans);
+        JUT_ASSERT(0, trans);
     } else if (mType == TYPE_WATER_ENEMY) {
         trans = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcNameBombEW, 5);
-        JUT_ASSERT(trans);
+        JUT_ASSERT(0, trans);
     } else if (mType == TYPE_INSECT_PLAYER) {
         trans = (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x15);
-        JUT_ASSERT(trans);
+        JUT_ASSERT(0, trans);
     }
 
     if (trans != NULL) {
diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp
index b8b2f9419c..bda39213ec 100644
--- a/src/d/actor/d_a_no_chg_room.cpp
+++ b/src/d/actor/d_a_no_chg_room.cpp
@@ -31,7 +31,7 @@ static bool isLoadRoom(int i_roomNo) {
             if (dComIfGp_roomControl_checkStatusFlag(load_room_index, 9) == (u32)TRUE) {
                 room_of_scene_class* roomScene = (room_of_scene_class*)fopScnM_SearchByID(
                     dStage_roomControl_c::getStatusProcID(load_room_index));
-                JUT_ASSERT(roomScene != 0);
+                JUT_ASSERT(0, roomScene != 0);
 
                 if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->base)) {
                     // "Room <%d> objects loading!\n"
@@ -105,10 +105,10 @@ int daNocrm_c::getRoomNo(int param_0) {
         mDoMtx_multVec(mMtx, &offset, &check_pos);
 
         bool groundHit = fopAcM_gc_c::gndCheck(&check_pos);
-        JUT_ASSERT(groundHit);
+        JUT_ASSERT(0, groundHit);
 
         int roomNo = fopAcM_gc_c::getRoomId();
-        JUT_ASSERT(0 <= roomNo && roomNo < 64);
+        JUT_ASSERT(0, 0 <= roomNo && roomNo < 64);
 
         mRoomNo[param_0] = roomNo;
     }
diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp
index 5c5804418b..b3b68b9b71 100644
--- a/src/d/actor/d_a_npc_cd2.cpp
+++ b/src/d/actor/d_a_npc_cd2.cpp
@@ -17,6 +17,8 @@ struct daNpcCd2_HIO_Jnt_c
     /* 8015A6E8 */ virtual ~daNpcCd2_HIO_Jnt_c() {}
     /* 8015A788 */ daNpcCd2_HIO_Jnt_c();
 
+    void genMessage(JORMContext*);
+
     /* 0x04 */ f32 field_0x04[3];
     /* 0x10 */ s16 field_0x10[3];
 };
@@ -42,6 +44,8 @@ struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c {
     /* 8015A4D8 */ daNpcCd2_HIO_c();
     /* 8015A860 */ virtual ~daNpcCd2_HIO_c() {}
 
+    void genMessage(JORMContext*);
+
     /* 0x0004 */ daNpcCd2_HIO_MChild_c field_0x0004[16];
     /* 0x20C4 */ daNpcCd2_HIO_WChild_c field_0x20c4[14];
 };
@@ -206,13 +210,13 @@ static char* const l_resWANb2[6] = {
     "WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-struct tbl_entry {
+struct anmTblPrm {
     char* name;
     int index;
 };
 
 /* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTbl */
-SECTION_RODATA static tbl_entry const l_objTbl[13] = {
+SECTION_RODATA static anmTblPrm const l_objTbl[13] = {
     {"object", 9},  {"object", 9},  {"object", 8},  {"object", 3}, {"object", 13},
     {"object", 14}, {"object", 12}, {"object", 6},  {"object", 7}, {"object", 10},
     {"object", 11}, {"object", 15}, {"object", 16},
@@ -220,14 +224,14 @@ SECTION_RODATA static tbl_entry const l_objTbl[13] = {
 COMPILER_STRIP_GATE(0x80393520, &l_objTbl);
 
 /* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTWTbl */
-static tbl_entry const l_objTWTbl[13] = {
+static anmTblPrm const l_objTWTbl[13] = {
     {"objectTW", 9},  {"objectTW", 9},  {"objectTW", 8},  {"objectTW", 3}, {"objectTW", 13},
     {"objectTW", 14}, {"objectTW", 12}, {"objectTW", 6},  {"objectTW", 7}, {"objectTW", 10},
     {"objectTW", 11}, {"objectTW", -1}, {"objectTW", -1},
 };
 
 /* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata          l_bckTbl_M */
-static tbl_entry const l_bckTbl_M[54] = {
+static anmTblPrm const l_bckTbl_M[54] = {
     {"Mgeneral", 26}, {"Mgeneral", 27}, {"Mgeneral", 29}, {"Mgeneral", 30}, {"Mgeneral", 8},
     {"Mgeneral", 9},  {"Mgeneral", 20}, {"Mgeneral", 21}, {"Mgeneral", 23}, {"Mgeneral", 5},
     {"Mgeneral", 6},  {"Mgeneral", 28}, {"Mgeneral", 24}, {"Mgeneral", 22}, {"Mgeneral", 17},
@@ -242,7 +246,7 @@ static tbl_entry const l_bckTbl_M[54] = {
 };
 
 /* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata          l_bckTbl_W */
-SECTION_RODATA static tbl_entry const l_bckTbl_W[54] = {
+SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = {
     {"Wgeneral", 31}, {"Wgeneral", 32}, {"Wgeneral", 34}, {"Wgeneral", 35}, {"Wgeneral", 13},
     {"Wgeneral", 14}, {"Wgeneral", 25}, {"Wgeneral", 26}, {"Wgeneral", 28}, {"Wgeneral", 10},
     {"Wgeneral", 11}, {"Wgeneral", 33}, {"Wgeneral", 29}, {"Wgeneral", 27}, {"Wgeneral", 22},
@@ -363,7 +367,7 @@ J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) {
 /* 801580A8-801580F0 1529E8 0048+00 4/4 0/0 5/5 .text            isM___10daNpcCd2_cFv */
 bool daNpcCd2_c::isM_() {
     if (mpMorf == NULL) {
-        return field_0xa98 < 16;
+        return m_type < 16;
     }
     u16 a_jntNum = mpMorf->getModel()->getModelData()->getJointNum();
     JUT_ASSERT(738, (a_jntNum == JntM_NUM_e) || (a_jntNum == JntW_NUM_e));
@@ -385,7 +389,7 @@ static char* const* l_resNameTbl[30] = {
 };
 
 /* 803B6244-803B6334 013364 00F0+00 1/2 0/0 0/0 .data            l_bmdTbl */
-static tbl_entry const l_bmdTbl[30] = {
+static anmTblPrm const l_bmdTbl[30] = {
     l_resMANa[0],  3, l_resMADa[0],  3, l_resMCNa[0],  4, l_resMONa[0],  4, l_resMANb[0],  3,
     l_resMANc[0],  4, l_resMASa[0],  4, l_resMBNa[0],  4, l_resMANa2[0], 4, l_resMADa2[0], 4,
     l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4,
@@ -395,7 +399,7 @@ static tbl_entry const l_bmdTbl[30] = {
 };
 
 /* 803B6334-803B6424 013454 00F0+00 1/2 0/0 0/0 .data            l_bmdTWTbl */
-static tbl_entry const l_bmdTWTbl[30] = {
+static anmTblPrm const l_bmdTWTbl[30] = {
     l_resMANa[1],  3, l_resMADa[1],  3, l_resMCNa[1],  4, l_resMONa[1],  4, l_resMANb[1],  3,
     l_resMANc[1],  4, l_resMASa[1],  4, l_resMBNa[1],  4, l_resMANa2[1], 4, l_resMADa2[1], 3,
     l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4,
@@ -405,7 +409,7 @@ static tbl_entry const l_bmdTWTbl[30] = {
 };
 
 /* 803B6424-803B6514 013544 00F0+00 1/2 0/0 0/0 .data            l_btpTbl */
-static tbl_entry const l_btpTbl[30] = {
+static anmTblPrm const l_btpTbl[30] = {
     l_resMANa[0],  -1, l_resMADa[0],  -1, l_resMCNa[0],  7, l_resMONa[0],  7, l_resMANb[0],  -1,
     l_resMANc[0],  7, l_resMASa[0],  7, l_resMBNa[0],  7, l_resMANa2[0], 7, l_resMADa2[0], 7,
     l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7,
@@ -415,7 +419,7 @@ static tbl_entry const l_btpTbl[30] = {
 };
 
 /* 803B6514-803B6604 013634 00F0+00 1/2 0/0 0/0 .data            l_btpTWTbl */
-static tbl_entry const l_btpTWTbl[30] = {
+static anmTblPrm const l_btpTWTbl[30] = {
     l_resMANa[1],  -1, l_resMADa[1],  -1, l_resMCNa[1],  7, l_resMONa[1],  7, l_resMANb[1],  -1,
     l_resMANc[1],  7, l_resMASa[1],  7, l_resMBNa[1],  7, l_resMANa2[1], 7, l_resMADa2[1], -1,
     l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7,
@@ -1547,7 +1551,7 @@ void* daNpcCd2_c::getAnmP(int param_1, int param_2) {
     case 0x2b:
     case 0x2c:
     case 0x2e:
-        //JUT_ASSERT(939, m_type == MdlMANa_e || m_type == MdlMADa_e);
+        JUT_ASSERT(939, m_type == MdlMANa_e || m_type == MdlMADa_e);
         break;
     default:
         return 0;
@@ -1560,7 +1564,7 @@ void* daNpcCd2_c::getAnmP(int param_1, int param_2) {
         name = l_bckTbl_M[a_anmNum].name;
         index = l_bckTbl_M[a_anmNum].index;
     } else {
-        JUT_ASSERT(948, 0 <= a_anmNum && a_anmNum < (sizeof(l_bckTbl_W)/sizeof(anmTblPrm)));
+        JUT_ASSERT(953, 0 <= a_anmNum && a_anmNum < (sizeof(l_bckTbl_W)/sizeof(anmTblPrm)));
         name = l_bckTbl_W[a_anmNum].name;
         index = l_bckTbl_W[a_anmNum].index;
     }
@@ -1844,10 +1848,10 @@ static inline s16 Cd2_HIO_jntRX(int param_1, int param_2) {
  */
 int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) {
     int jntNo = param_1->getJntNo();
-    cXyz cStack_3c(Cd2_HIO_jntTX(field_0xa98, jntNo), Cd2_HIO_jntTY(field_0xa98, jntNo), Cd2_HIO_jntTZ(field_0xa98, jntNo));
-    s16 rz = Cd2_HIO_jntRZ(field_0xa98, jntNo);
-    s16 ry = Cd2_HIO_jntRY(field_0xa98, jntNo);
-    s16 rx = Cd2_HIO_jntRX(field_0xa98, jntNo);
+    cXyz cStack_3c(Cd2_HIO_jntTX(m_type, jntNo), Cd2_HIO_jntTY(m_type, jntNo), Cd2_HIO_jntTZ(m_type, jntNo));
+    s16 rz = Cd2_HIO_jntRZ(m_type, jntNo);
+    s16 ry = Cd2_HIO_jntRY(m_type, jntNo);
+    s16 rx = Cd2_HIO_jntRX(m_type, jntNo);
     csXyz cStack_44(rx, ry, rz);
     mDoMtx_stack_c::copy(param_2->getAnmMtx(jntNo));
     mDoMtx_stack_c::ZXYrotM(cStack_44);
@@ -1948,7 +1952,7 @@ bool daNpcCd2_c::checkFearSituation() {
 
 /* 801598E8-8015994C 154228 0064+00 1/1 0/0 0/0 .text            getNpcMdlDataP__10daNpcCd2_cFi */
 J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
-    const tbl_entry* def;
+    const anmTblPrm* def;
     if (field_0xac6) {
         def = &l_bmdTWTbl[param_1];
     } else {
@@ -1960,7 +1964,7 @@ J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
 /* 8015994C-801599C4 15428C 0078+00 1/1 0/0 0/0 .text            getObjMdlDataP__10daNpcCd2_cFi */
 J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
     J3DModelData* model_data = NULL;
-    const tbl_entry* def;
+    const anmTblPrm* def;
     if (field_0xac6) {
         def = &l_objTWTbl[param_1];
     } else {
@@ -1974,7 +1978,7 @@ J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
 
 /* 801599C4-80159A38 154304 0074+00 1/1 0/0 0/0 .text            getTexAnmP__10daNpcCd2_cFi */
 J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) {
-    const tbl_entry* def;
+    const anmTblPrm* def;
     if (field_0xac6) {
         def = &l_btpTWTbl[param_1];
     } else {
diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp
index aeb53d4baa..87409546bb 100644
--- a/src/d/actor/d_a_npc_hanjo.cpp
+++ b/src/d/actor/d_a_npc_hanjo.cpp
@@ -773,8 +773,9 @@ int daNpc_Hanjo_c::create() {
     int rv = loadRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
     if (rv == cPhs_COMPLEATE_e) {
         OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x<%08x> ", fopAcM_getProcNameString(this), (uint)mType,
-                              field_0xa7c, getPathID(), fopAcM_GetParam(this));
+                              mFlowNodeNo, getPathID(), fopAcM_GetParam(this));
         if (isDelete()) {
+            OS_REPORT("===>isDelete:TRUE\n");
             return cPhs_ERROR_e;
         }
         OS_REPORT("\n");
diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp
index 4e433a6e5c..5e13d97bde 100644
--- a/src/d/actor/d_a_obj_Lv5Key.cpp
+++ b/src/d/actor/d_a_obj_Lv5Key.cpp
@@ -15,7 +15,7 @@ static char* l_arcName = "Lv5_KEY";
 int daObjLv5Key_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp
index 48a2906d48..f47dcb84f0 100644
--- a/src/d/actor/d_a_obj_brg.cpp
+++ b/src/d/actor/d_a_obj_brg.cpp
@@ -1587,12 +1587,12 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) {
 
     static const int obj_brg_bmd[] = {5, 6, 7};
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", obj_brg_bmd[sp30]);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     J3DModelData* modelData2;
     if (a_this->mType == 8) {
         modelData2 = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", 8);
-        JUT_ASSERT(modelData2 != 0);
+        JUT_ASSERT(0, modelData2 != 0);
     }
     
     br_s* part = a_this->mBr;
diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp
index d3081d9894..b1513b30b8 100644
--- a/src/d/actor/d_a_obj_crvsteel.cpp
+++ b/src/d/actor/d_a_obj_crvsteel.cpp
@@ -101,10 +101,9 @@ int daObjCRVSTEEL_c::create() {
     if (rv == cPhs_COMPLEATE_e) {
         gravity = -9.0f;
         int dzb_id = dComIfG_getObjctResName2Index(l_arcName, "U_CrvSteelGate.dzb");
-        JUT_ASSERT()
         if (dzb_id == -1) {
             OS_REPORT("dzbデータが見つかりませんでした!<%s>\n\n", l_arcName);
-            JUT_PANIC(443, dzb_id != -1);
+            JUT_ASSERT(443, dzb_id != -1);
         }
         rv = MoveBGCreate(l_arcName, dzb_id, dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL);
         if (rv == cPhs_ERROR_e) {
diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp
index acfcca3998..921b3a4090 100644
--- a/src/d/actor/d_a_obj_drop.cpp
+++ b/src/d/actor/d_a_obj_drop.cpp
@@ -16,6 +16,10 @@
 #include "d/actor/d_a_e_ym.h"
 #include "d/actor/d_a_e_ymb.h"
 
+#ifdef DEBUG
+daObjDrop_HIO_c l_HIO;
+#endif
+
 /* 80BDFCD8-80BDFD8C 000078 00B4+00 2/2 0/0 0/0 .text            searchParentSub__FPvPv */
 static void* searchParentSub(void* pproc, void* pdata) {
     daObjDrop_c* pdrop = (daObjDrop_c*)pdata;
diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp
index d2f1de48d2..5d0d5e523b 100644
--- a/src/d/actor/d_a_obj_firepillar.cpp
+++ b/src/d/actor/d_a_obj_firepillar.cpp
@@ -6,6 +6,7 @@
 #include "d/actor/d_a_obj_firepillar.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
+#include "d/d_debug_viewer.h"
 #include "f_op/f_op_actor_mng.h"
 
 /* 80BE9118-80BE9138 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjFPillar_cFv */
@@ -210,7 +211,7 @@ static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) {
     #if DEBUG
     mDoMtx_stack_c::transS(pos->x, pos->y, pos->z);
     mDoMtx_stack_c::ZXYrotM(angle->x, angle->y, angle->z);
-    mDoMtx_stack_c::scaleM(scale.x * 50.0f, scale.y * 50.0f, scale.x * 50.0f);
+    mDoMtx_stack_c::scaleM(scale->x * 50.0f, scale->y * 50.0f, scale->x * 50.0f);
     mDoMtx_stack_c::transM(0.0f, 1.0f, 0.0f);
     mDoMtx_stack_c::XrotM(0x4000);
     Mtx mtx;
diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp
index 4c8ce4405b..7541843d98 100644
--- a/src/d/actor/d_a_obj_iceblock.cpp
+++ b/src/d/actor/d_a_obj_iceblock.cpp
@@ -339,7 +339,7 @@ int daObjIceBlk_c::CreateHeap() {
 
     if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]);
-        JUT_ASSERT(modelData != 0);
+        JUT_ASSERT(0, modelData != 0);
 
         mpIceModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
         if (mpIceModel == NULL) {
@@ -360,10 +360,10 @@ int daObjIceBlk_c::CreateHeap() {
     }
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[1]);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]);
-    JUT_ASSERT(shareModelData != 0);
+    JUT_ASSERT(0, shareModelData != 0);
 
     mDoExt_setupShareTexture(modelData, shareModelData);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp
index be533830c7..f9a3982b21 100644
--- a/src/d/actor/d_a_obj_item.cpp
+++ b/src/d/actor/d_a_obj_item.cpp
@@ -294,7 +294,7 @@ int daItem_c::_daItem_create() {
     {
         // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n"
         OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo);
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         return cPhs_ERROR_e;
     } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 ||
                m_itemNo == fpcNm_ITEM_BOMB_30)
@@ -526,7 +526,7 @@ void daItem_c::procInitGetDemoEvent() {
 
     m_item_id = fopAcM_createItemForTrBoxDemo(&current.pos, m_itemNo, -1, fopAcM_GetRoomNo(this),
                                               NULL, NULL);
-    JUT_ASSERT(m_item_id != fpcM_ERROR_PROCESS_ID_e);
+    JUT_ASSERT(0, m_item_id != fpcM_ERROR_PROCESS_ID_e);
 
     setStatus(STATUS_WAIT_GET_DEMO_EVENT_e);
 }
@@ -1181,7 +1181,7 @@ void daItem_c::initFlag() {
     default:
         // "Item: Set Type<%d>\n"
         OS_REPORT("アイテム：セットタイプ<%d>\n", type);
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
     case TYPE_LAUNCH_e:
     case TYPE_LAUNCH_SMALL_e:
     case TYPE_LAUNCH_FROM_PLAYER_e:
@@ -1232,7 +1232,7 @@ void daItem_c::initScale() {
         scale.setall(0.0f);
         break;
     default:
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
     case TYPE_FIXED_PLACE_e:
     case TYPE_WAIT_e:
     case TYPE_SIMPLE_GET_e:
diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp
index 2f677d4fbb..887b4258b3 100644
--- a/src/d/actor/d_a_obj_lv3WaterB.cpp
+++ b/src/d/actor/d_a_obj_lv3WaterB.cpp
@@ -115,7 +115,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     obj_lv3WaterB_class* a_this = static_cast<obj_lv3WaterB_class*>(i_this);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L3_bwater", 5);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpBWaterModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
     if (a_this->mpBWaterModel == NULL) {
@@ -145,7 +145,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("S_octhibi", 4);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     a_this->mpOctHibiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (a_this->mpOctHibiModel == NULL) {
diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp
index 5f39823ef3..965ebe1b10 100644
--- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp
+++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp
@@ -47,7 +47,7 @@ void daFlorBoad_c::setBaseMtx() {
 /* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daFlorBoad_cFv */
 int daFlorBoad_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5haYuka", 4);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp
index 37f6d21b08..e59d82b9e5 100644
--- a/src/d/actor/d_a_obj_lv5IceWall.cpp
+++ b/src/d/actor/d_a_obj_lv5IceWall.cpp
@@ -49,7 +49,7 @@ void daIceWall_c::setBaseMtx() {
 /* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text            CreateHeap__11daIceWall_cFv */
 int daIceWall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpModel[0] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
     if (mpModel[0] == NULL) {
@@ -57,7 +57,7 @@ int daIceWall_c::CreateHeap() {
     }
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 5);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpModel[1] = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
     if (mpModel[1] == NULL) {
diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp
index 8a9fa4dcfe..b5acef7067 100644
--- a/src/d/actor/d_a_obj_lv5SwIce.cpp
+++ b/src/d/actor/d_a_obj_lv5SwIce.cpp
@@ -42,7 +42,7 @@ void daLv5SwIce_c::setBaseMtx() {
 /* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daLv5SwIce_cFv */
 int daLv5SwIce_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5SwIce", 4);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp
index d08ccac399..38fa292e2d 100644
--- a/src/d/actor/d_a_obj_lv5ychndlr.cpp
+++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp
@@ -95,7 +95,7 @@ void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) {
 /* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text            CreateHeap__14daObjYchndlr_cFv */
 int daObjYchndlr_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]);
-    JUT_ASSERT(model_data != 0);
+    JUT_ASSERT(0, model_data != 0);
 
     mpChandlierModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     if (mpChandlierModel == NULL) {
@@ -103,7 +103,7 @@ int daObjYchndlr_c::CreateHeap() {
     }
 
     model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]);
-    JUT_ASSERT(model_data != 0);
+    JUT_ASSERT(0, model_data != 0);
 
     for (int i = 0; i < 4; i++) {
         mpShaftModels[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp
index 1d91ec145f..1fd2442be3 100644
--- a/src/d/actor/d_a_obj_lv5yiblltray.cpp
+++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp
@@ -66,7 +66,7 @@ void daObjYIblltray_c::setMtx() {
 /* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text            CreateHeap__16daObjYIblltray_cFv */
 int daObjYIblltray_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9);
-    JUT_ASSERT(model_data != 0);
+    JUT_ASSERT(0, model_data != 0);
 
     mpTrayModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     if (mpTrayModel == NULL) {
@@ -74,7 +74,7 @@ int daObjYIblltray_c::CreateHeap() {
     }
 
     model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
-    JUT_ASSERT(model_data != 0);
+    JUT_ASSERT(0, model_data != 0);
 
     mpHandleModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     if (mpHandleModel == NULL) {
@@ -267,7 +267,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
     if (!getNoSameRoom() && mTrayID == fpcM_ERROR_PROCESS_ID_e) {
         daObjYIblltray_c* ptray =
             (daObjYIblltray_c*)fopAcM_Search((fopAcIt_JudgeFunc)searchObjYIblltray, this);
-        JUT_ASSERT(ptray != 0);
+        JUT_ASSERT(0, ptray != 0);
 
         mTrayID = fopAcM_GetID(ptray);
     }
diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp
index 54b6b35b8b..b06ad4e832 100644
--- a/src/d/actor/d_a_obj_mirror_6pole.cpp
+++ b/src/d/actor/d_a_obj_mirror_6pole.cpp
@@ -35,7 +35,7 @@ static char* l_arcName = "MR-6Pole";
 
 /* 80C96580-80C965B0 000054 0030+00 3/4 0/0 0/0 .data            ActionTable__18daObjMirror6Pole_c
  */
-static actionFunc daObjMirror6Pole_c::ActionTable[][2] = {
+actionFunc daObjMirror6Pole_c::ActionTable[][2] = {
     {&daObjMirror6Pole_c::initWait, &daObjMirror6Pole_c::executeWait},
     {&daObjMirror6Pole_c::initDemo, &daObjMirror6Pole_c::executeDemo},
 };
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 26a4b1cb62..764f4621cb 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -553,7 +553,7 @@ int daObjMovebox::Act_c::CreateHeap() {
     if (i_attr().field_0x58 >= 0) {
         J3DModelData* modelData =
             (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr().field_0x58);
-        JUT_ASSERT(modelData != 0);
+        JUT_ASSERT(0, modelData != 0);
 
         mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
         var_r29 = mpModel != NULL;
@@ -1128,7 +1128,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
                     cXyz sp48(current.pos);
                     J3DModelData* kibako_bmd =
                         (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
-                    JUT_ASSERT(kibako_bmd != 0);
+                    JUT_ASSERT(0, kibako_bmd != 0);
 
                     JPABaseEmitter* emitter = dComIfGp_particle_set(
                         0x82AF, &sp48, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(),
@@ -1265,7 +1265,7 @@ int daObjMovebox::Act_c::Mthd_Create() {
 
         phase_state = MoveBGCreate(M_arcname[mType], i_attr().field_0x5c, dBgS_MoveBGProc_Trans,
                                    heap_size, NULL);
-        JUT_ASSERT((phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
+        JUT_ASSERT(0, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e));
     }
 
     return phase_state;
diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp
index b306e164e8..af7bf6e873 100644
--- a/src/d/actor/d_a_obj_oiltubo.cpp
+++ b/src/d/actor/d_a_obj_oiltubo.cpp
@@ -69,7 +69,7 @@ const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = {
 /* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName);
-    JUT_ASSERT(mdlData_p != 0);
+    JUT_ASSERT(0, mdlData_p != 0);
 
     mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084);
     if (mpModel == NULL) {
@@ -77,7 +77,7 @@ int daObj_Oiltubo_c::CreateHeap() {
     }
 
     J3DModelData* mdlBData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bbmdFileName);
-    JUT_ASSERT(mdlBData_p != 0);
+    JUT_ASSERT(0, mdlBData_p != 0);
 
     mpBModel = mDoExt_J3DModel__create(mdlBData_p, 0x80000, 0x19000284);
     if (mpBModel == NULL) {
diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp
index 236e8a2a8b..764fdec123 100644
--- a/src/d/actor/d_a_obj_pdoor.cpp
+++ b/src/d/actor/d_a_obj_pdoor.cpp
@@ -75,7 +75,7 @@ int daObjPDoor_c::Create() {
         mDoorDirection = 1;
         shape_angle.y = home.angle.y + 0x1555;
     } else if (!isSw2) {
-        OS_REPORT("城下町押引扉：SW1,SW2共にＯＮになっています！\n")
+        OS_REPORT("城下町押引扉：SW1,SW2共にＯＮになっています！\n");
         JUT_PANIC(235, "0");
     } else {
         mDoorDirection = -1;
diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp
index 5256261dec..1c67cb02ca 100644
--- a/src/d/actor/d_a_obj_pillar.cpp
+++ b/src/d/actor/d_a_obj_pillar.cpp
@@ -177,7 +177,7 @@ int daPillar_c::Create() {
 /* 80CAF7A8-80CAF8A4 000568 00FC+00 1/0 0/0 0/0 .text            CreateHeap__10daPillar_cFv */
 int daPillar_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_bmd[mMdlType]);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return 0;
@@ -185,7 +185,7 @@ int daPillar_c::CreateHeap() {
 
     if (checkShadow() == 0xFF) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_shadowBmd[mMdlType]);
-        JUT_ASSERT(modelData != 0);
+        JUT_ASSERT(0, modelData != 0);
         mpShadowModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
         if (mpShadowModel == NULL) {
             return 0;
@@ -448,7 +448,7 @@ int daPillar_c::Execute(Mtx** param_0) {
         }
         break;
     default:
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
     }
 
     if (shape_angle.x != 0) {
diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp
index 2bb452ee56..e299e1119e 100644
--- a/src/d/actor/d_a_obj_shield.cpp
+++ b/src/d/actor/d_a_obj_shield.cpp
@@ -120,10 +120,10 @@ int daItemShield_c::create() {
         return cPhs_ERROR_e;
     }
     if (getSwBit2() == 0xff) {
-        OS_REPORT(1Bh,"[43;30m木の盾：スイッチビット２指定がありません！\n\x1b[m");
+        OS_REPORT("[43;30m木の盾：スイッチビット２指定がありません！\n\x1b[m");
     }
     if (getSwBit() == 0xff) {
-        OS_REPORT(1Bh,"[43;30m木の盾：スイッチビット指定がありません！\n\x1b[m");
+        OS_REPORT("[43;30m木の盾：スイッチビット指定がありません！\n\x1b[m");
     }
     int rv = dComIfG_resLoad(&mPhase, dItem_data::getFieldArc(m_itemNo));
     if (rv == cPhs_COMPLEATE_e) {
diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp
index 7c58f68db9..3fe0057d3c 100644
--- a/src/d/actor/d_a_obj_udoor.cpp
+++ b/src/d/actor/d_a_obj_udoor.cpp
@@ -92,7 +92,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     obj_udoor_class* a_this = static_cast<obj_udoor_class*>(i_this);
 
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Obj_udoor", bmdd[a_this->field_0x570]);
-    JUT_ASSERT(model_data != 0);
+    JUT_ASSERT(301, model_data != 0);
 
     a_this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     if (a_this->mpModel == NULL) {
diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp
index da7598471e..53568332c3 100644
--- a/src/d/actor/d_a_obj_waterPillar.cpp
+++ b/src/d/actor/d_a_obj_waterPillar.cpp
@@ -160,7 +160,7 @@ cPhs__Step daWtPillar_c::create() {
             mMaxHeight += mRelativeWaterHeight;
 
             // "== Underwater (%f) (%f) type: %d ==\n"
-            OS_REPORT("== 水中にある (%f) (%f) type:%d ==\n", mMaxHeight, mRelativeWaterHeight, mRisesAndFalls);
+            OS_REPORT("== 水中にある (%f) (%f) type:%d ==\n", mMaxHeight, mRelativeWaterHeight, mType);
         }
 
         mEffectOscillationAngleStep = mPillarIsPreparingToRise = mStartedRisingOrDoesNotRiseAndFall = field_0xB44 = 0;
diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp
index af4f48f902..539ee5814a 100644
--- a/src/d/actor/d_a_obj_wflag.cpp
+++ b/src/d/actor/d_a_obj_wflag.cpp
@@ -206,7 +206,7 @@ static int daObj_Wflag_Create(fopAc_ac_c* i_this) {
             OS_REPORT("//////////////OBJ_WFLAG SET NON !!\n");
             return cPhs_ERROR_e;
         } else {
-            OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n")
+            OS_REPORT("//////////////OBJ_WFLAG SET 2 !!\n");
             ((obj_wflag_class*)i_this)->field_0x836 = cM_rndF(65536.0f);
             daObj_Wflag_Execute(((obj_wflag_class*)i_this));
         }
diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp
index 6642d5dbb9..4aead60cc1 100644
--- a/src/d/actor/d_a_passer_mng.cpp
+++ b/src/d/actor/d_a_passer_mng.cpp
@@ -576,7 +576,7 @@ void daPasserMng_c::create_init() {
             }
         }
         #ifdef DEBUG
-        OS_REPORT("初期ばらまき位置 Path=%d ", getPathID())
+        OS_REPORT("初期ばらまき位置 Path=%d ", getPathID());
         for (int i = 0; i < max; i++) {
             OS_REPORT("%d, ", arr[i]);
         }
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 70c2db1f25..20d4edd495 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "d/actor/d_a_shop_item.h"
+#include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_lib.h"
 
diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp
index 51d1e0bfbb..a2c5ef5da0 100644
--- a/src/d/actor/d_a_startAndGoal.cpp
+++ b/src/d/actor/d_a_startAndGoal.cpp
@@ -98,7 +98,7 @@ void daStartAndGoal_c::init() {
 
     mPath.initialize();
     mPath.setPathInfo(fopAcM_GetParam(this) >> 8, fopAcM_GetRoomNo(this), 0);
-    JUT_ASSERT(0 != mPath.getPathInfo());
+    JUT_ASSERT(0, 0 != mPath.getPathInfo());
 
     if (dComIfG_getTimerPtr() == NULL) {
         dTimer_createTimer(l_timerType[mType].mode, 9999000, l_timerType[mType].type, 0, 210.0f,
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index 62a85db593..4b9f7b355a 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -123,7 +123,7 @@ int daTag_Msg_c::execute() {
     if (set_event && rangeCheck() && otherCheck()) {
         if (field_0x5dd) {
             mOrderEvtNum = 1;
-            JUT_ASSERT(0 != l_evtNameTBL[mOrderEvtNum]);
+            JUT_ASSERT(0, 0 != l_evtNameTBL[mOrderEvtNum]);
 
             mEventIdx =
                 dComIfGp_getEventManager().getEventIdx(this, l_evtNameTBL[mOrderEvtNum], 0xFF);
diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp
index 06f5aa405d..cbe8910332 100644
--- a/src/d/actor/d_a_tbox2.cpp
+++ b/src/d/actor/d_a_tbox2.cpp
@@ -128,7 +128,7 @@ int daTbox2_c::Create() {
 int daTbox2_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no);
-    JUT_ASSERT(modelData != 0);
+    JUT_ASSERT(0, modelData != 0);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mpModel == NULL) {
         return false;
@@ -136,7 +136,7 @@ int daTbox2_c::CreateHeap() {
 
     J3DAnmTransform* pbck =
         (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no);
-    JUT_ASSERT(pbck != 0);
+    JUT_ASSERT(0, pbck != 0);
     mpBck = new mDoExt_bckAnm();
     if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) {
         return false;
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index 9ad904efb9..d51ec5760b 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -11,78 +11,12 @@
 #include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"
 
-
-//
-// Forward References:
-//
-
-extern "C" static void texScrollCheck__FRf();
-extern "C" static void daVrbox2_Draw__FP12vrbox2_class();
-extern "C" static void daVrbox2_color_set__FP12vrbox2_class();
-extern "C" static void daVrbox2_Execute__FP12vrbox2_class();
-extern "C" static bool daVrbox2_IsDelete__FP12vrbox2_class();
-extern "C" static bool daVrbox2_Delete__FP12vrbox2_class();
-extern "C" static void daVrbox2_solidHeapCB__FP10fopAc_ac_c();
-extern "C" static void daVrbox2_Create__FP10fopAc_ac_c();
-extern "C" void __dt__12J3DFrameCtrlFv();
-extern "C" extern char const* const d_a_vrbox2__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_XrotM__FPA4_fs();
-extern "C" void mDoMtx_YrotM__FPA4_fs();
-extern "C" void mDoMtx_ZrotM__FPA4_fs();
-extern "C" void scaleM__14mDoMtx_stack_cFfff();
-extern "C" void play__14mDoExt_baseAnmFv();
-extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
-extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef();
-extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
-extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl();
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl();
-extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
-extern "C" void dComIfG_getStageRes__FPCc();
-extern "C" void dKyw_get_wind_vec__Fv();
-extern "C" void dKyw_get_wind_pow__Fv();
-extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
-extern "C" void dKy_get_parcent__Ffff();
-extern "C" void dKy_GxFog_set__Fv();
-extern "C" void cM_rndF__Ff();
-extern "C" void cM3d_VectorProduct2d__Fffffff();
-extern "C" void cLib_addCalc__FPfffff();
-extern "C" void cLib_targetAngleY__FPC3VecPC3Vec();
-extern "C" void cLib_targetAngleX__FPC4cXyzPC4cXyz();
-extern "C" void __dl__FPv();
-extern "C" void init__12J3DFrameCtrlFs();
-extern "C" void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey();
-extern "C" void _savegpr_17();
-extern "C" void _savegpr_25();
-extern "C" void _restgpr_17();
-extern "C" void _restgpr_25();
-extern "C" u8 now__14mDoMtx_stack_c[48];
-
 //
 // Declarations:
 //
 
 static int daVrbox2_color_set(vrbox2_class* param_0);
 
-/* ############################################################################################## */
-/* 80499A6C-80499A70 000000 0004+00 4/4 0/0 0/0 .rodata          @3627 */
-SECTION_RODATA static f32 const lit_3627 = 1.0f;
-COMPILER_STRIP_GATE(0x80499A6C, &lit_3627);
-
-/* 80499A70-80499A74 000004 0004+00 1/3 0/0 0/0 .rodata          @3628 */
-SECTION_RODATA static u8 const lit_3628[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x80499A70, &lit_3628);
-
 /* 80498A78-80498ACC 000078 0054+00 1/1 0/0 0/0 .text            texScrollCheck__FRf */
 static void texScrollCheck(f32& param_0) {
     while (param_0 < 0.0f)
@@ -92,105 +26,9 @@ static void texScrollCheck(f32& param_0) {
         param_0 -= 1.0f;
 }
 
-
-/* ############################################################################################## */
-/* 80499A74-80499A78 000008 0004+00 0/1 0/0 0/0 .rodata          @3835 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3835 = 9.0f / 100.0f;
-COMPILER_STRIP_GATE(0x80499A74, &lit_3835);
-#pragma pop
-
-/* 80499A78-80499A7C 00000C 0004+00 0/1 0/0 0/0 .rodata          @3836 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3836 = 8000.0f;
-COMPILER_STRIP_GATE(0x80499A78, &lit_3836);
-#pragma pop
-
-/* 80499A7C-80499A80 000010 0004+00 1/3 0/0 0/0 .rodata          @3837 */
-SECTION_RODATA static f32 const lit_3837 = 255.0f;
-COMPILER_STRIP_GATE(0x80499A7C, &lit_3837);
-
-/* 80499A80-80499A84 000014 0004+00 0/1 0/0 0/0 .rodata          @3838 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3838 = 2.0f / 5.0f;
-COMPILER_STRIP_GATE(0x80499A80, &lit_3838);
-#pragma pop
-
-/* 80499A84-80499A88 000018 0004+00 0/1 0/0 0/0 .rodata          @3839 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3839 = 270.0f;
-COMPILER_STRIP_GATE(0x80499A84, &lit_3839);
-#pragma pop
-
-/* 80499A88-80499A8C 00001C 0004+00 0/1 0/0 0/0 .rodata          @3840 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3840 = 240.0f;
-COMPILER_STRIP_GATE(0x80499A88, &lit_3840);
-#pragma pop
-
-/* 80499A8C-80499A90 000020 0004+00 0/2 0/0 0/0 .rodata          @3841 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3841 = 1.0f / 5.0f;
-COMPILER_STRIP_GATE(0x80499A8C, &lit_3841);
-#pragma pop
-
-/* 80499A90-80499A94 000024 0004+00 0/1 0/0 0/0 .rodata          @3842 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3842 = 300.0f;
-COMPILER_STRIP_GATE(0x80499A90, &lit_3842);
-#pragma pop
-
-/* 80499A94-80499A98 000028 0004+00 0/1 0/0 0/0 .rodata          @3843 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3843 = 17.0f / 20.0f;
-COMPILER_STRIP_GATE(0x80499A94, &lit_3843);
-#pragma pop
-
-/* 80499A98-80499A9C 00002C 0004+00 0/1 0/0 0/0 .rodata          @3844 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3844 = 3.0f / 20.0f;
-COMPILER_STRIP_GATE(0x80499A98, &lit_3844);
-#pragma pop
-
-/* 80499A9C-80499AA0 000030 0004+00 0/1 0/0 0/0 .rodata          @3845 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3845 = 483.0f;
-COMPILER_STRIP_GATE(0x80499A9C, &lit_3845);
-#pragma pop
-
-/* 80499AA0-80499AA4 000034 0004+00 0/1 0/0 0/0 .rodata          @3846 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3846 = 100.0f;
-COMPILER_STRIP_GATE(0x80499AA0, &lit_3846);
-#pragma pop
-
-/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80499AC4 = "F_SP102";
-SECTION_DEAD static char const* const stringBase_80499ACC = "F_SP127";
-#pragma pop
-
-/* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss             mangZ$3688 */
-static s16 mangZ;
-
 /* 80498ACC-804990DC 0000CC 0610+00 1/0 0/0 0/0 .text            daVrbox2_Draw__FP12vrbox2_class */
 // NONMATCHING - reg alloc
 static int daVrbox2_Draw(vrbox2_class* i_this) {
-    cXyz sp14;
-    cXyz sp8;
-
     camera_class* camera_p = dComIfGp_getCamera(0);
     dKankyo_sunlenz_Packet* lenz_p = g_env_light.mpSunLenzPacket;
     J3DModel* kumo_model_p = i_this->mpKumoModel;
@@ -204,8 +42,11 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
     dKy_GxFog_set();
 
     // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData?
-    for (int i = ((J3DModelData*)kumo_model_p)->getMaterialNum() - 1; i >= 0; i--) {
-        J3DMaterial* material_p = ((J3DModelData*)kumo_model_p)->getMaterialNodePointer(i);
+    J3DModelData* sp38 = (J3DModelData*)kumo_model_p;
+    J3DModelData* sp34 = (J3DModelData*)sun_model_p;
+    J3DModelData* sp30 = (J3DModelData*)kasumim_model_p;
+    for (int i = sp38->getMaterialNum() - 1; i >= 0; i--) {
+        J3DMaterial* material_p = sp38->getMaterialNodePointer(i);
 
         J3DFogInfo* fogInfo_p;
         if (material_p != NULL) {
@@ -215,9 +56,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
         fogInfo_p->mType = 2;
     }
 
-    // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData?
-    for (int i = ((J3DModelData*)sun_model_p)->getMaterialNum() - 1; i >= 0; i--) {
-        J3DMaterial* material_p = ((J3DModelData*)sun_model_p)->getMaterialNodePointer(i);
+    for (int i = sp34->getMaterialNum() - 1; i >= 0; i--) {
+        J3DMaterial* material_p = sp34->getMaterialNodePointer(i);
 
         J3DFogInfo* fogInfo_p;
         if (material_p != NULL) {
@@ -227,9 +67,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
         fogInfo_p->mType = 2;
     }
 
-    // these casts look like fake matches, but this ptr is used as both J3DModel and J3DModelData?
-    for (int i = ((J3DModelData*)kasumim_model_p)->getMaterialNum() - 1; i >= 0; i--) {
-        J3DMaterial* material_p = ((J3DModelData*)kasumim_model_p)->getMaterialNodePointer(i);
+    for (int i = sp30->getMaterialNum() - 1; i >= 0; i--) {
+        J3DMaterial* material_p = sp30->getMaterialNodePointer(i);
 
         J3DFogInfo* fogInfo_p;
         if (material_p != NULL) {
@@ -251,27 +90,35 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
     daVrbox2_color_set(i_this);
 
     if (dComIfGp_roomControl_getStayNo() >= 0) {
-        s32 stayNo = dComIfGp_roomControl_getStayNo();
-        filelist_p = dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo();
+        filelist_p = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo();
     }
 
     if (filelist_p != NULL) {
         var_f31 = dStage_FileList_dt_SeaLevel(filelist_p);
     }
 
+#ifdef DEBUG
+    if (g_kankyoHIO.field_0xB4 != 0) {
+        var_f31 = g_kankyoHIO.field_0xB8;
+    } else {
+        g_kankyoHIO.field_0xB8 = var_f31;
+    }
+#endif
+
+    f32 f29;
     if (dComIfGd_getView() != NULL) {
-        var_f31 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f;
+        f29 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f;
     } else {
-        var_f31 = 0.0f;
+        f29 = 0.0f;
     }
 
     dComIfGd_setListSky();
-    mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31,
+    mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - f29,
                            dComIfGd_getInvViewMtx()[2][3]);
     kasumim_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
     mDoExt_modelUpdateDL(kasumim_model_p);
 
-    mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - var_f31,
+    mDoMtx_stack_c::transS(dComIfGd_getInvViewMtx()[0][3], dComIfGd_getInvViewMtx()[1][3] - f29,
                            dComIfGd_getInvViewMtx()[2][3]);
     kumo_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
     mDoExt_modelUpdateDL(kumo_model_p);
@@ -279,20 +126,24 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
     if (dStage_stagInfo_GetArg0(dComIfGp_getStage()->getStagInfo()) != 0 && sun_model_p != NULL &&
         sun_p != NULL && sun_p->mSunAlpha > 0.0f)
     {
+        cXyz sp14;
         sp14 = sun_p->mPos[0];
 
+#ifndef DEBUG
+        cXyz sp8;
         if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) {
             dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8);
             sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x);
             sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y);
             sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z);
         }
+#endif
 
         s16 temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14);
         s16 temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14);
         mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z);
         mDoMtx_stack_c::YrotM((s16)temp_r18);
-        mDoMtx_stack_c::XrotM(0x7FFF - temp_r19);
+        mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19);
 
         f32 scale;
         if (g_env_light.daytime < 255.0f) {
@@ -317,15 +168,19 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
         sun_model_p->setBaseTRMtx(mDoMtx_stack_c::get());
         mDoExt_modelUpdateDL(sun_model_p);
 
+
         if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) {
+            /* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss             mangZ$3688 */
+            static s16 mangZ;
+
             sp14 = sun_p->mPos[0];
-            sp14.y = 300.0f - (sp14.y * 0.85f);
+            sp14.y = 300.0f + -(sp14.y * 0.85f);
 
-            s16 temp_r19_2 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14);
-            s16 temp_r18_2 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14);
+            temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14);
+            temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14);
             mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z);
-            mDoMtx_stack_c::YrotM((s16)temp_r18_2);
-            mDoMtx_stack_c::XrotM(0x7FFF - temp_r19_2);
+            mDoMtx_stack_c::YrotM((s16)temp_r18);
+            mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19);
             mDoMtx_stack_c::ZrotM(mangZ);
 
             mDoMtx_stack_c::scaleM(scale, scale + 0.15f, scale);
@@ -345,72 +200,10 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80499AA4-80499AA8 000038 0004+00 0/1 0/0 0/0 .rodata          @4069 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u32 const lit_4069 = 0x3A03126F;
-COMPILER_STRIP_GATE(0x80499AA4, &lit_4069);
-#pragma pop
-
-/* 80499AA8-80499AAC 00003C 0004+00 0/1 0/0 0/0 .rodata          @4070 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4070 = 3.0f / 10.0f;
-COMPILER_STRIP_GATE(0x80499AA8, &lit_4070);
-#pragma pop
-
-/* 80499AAC-80499AB0 000040 0004+00 0/1 0/0 0/0 .rodata          @4071 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4071 = 1.75f;
-COMPILER_STRIP_GATE(0x80499AAC, &lit_4071);
-#pragma pop
-
-/* 80499AB0-80499AB4 000044 0004+00 0/1 0/0 0/0 .rodata          @4072 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4072 = 22.0f / 5.0f;
-COMPILER_STRIP_GATE(0x80499AB0, &lit_4072);
-#pragma pop
-
-/* 80499AB4-80499AB8 000048 0004+00 0/1 0/0 0/0 .rodata          @4073 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4073 = 11.0f / 5.0f;
-COMPILER_STRIP_GATE(0x80499AB4, &lit_4073);
-#pragma pop
-
-/* 80499AB8-80499ABC 00004C 0004+00 0/1 0/0 0/0 .rodata          @4074 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4074 = 97.5f;
-COMPILER_STRIP_GATE(0x80499AB8, &lit_4074);
-#pragma pop
-
-/* 80499ABC-80499AC0 000050 0004+00 0/1 0/0 0/0 .rodata          @4075 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_4075 = 1.0f / 10.0f;
-COMPILER_STRIP_GATE(0x80499ABC, &lit_4075);
-#pragma pop
-
-/* 80499AC0-80499AC4 000054 0004+00 0/1 0/0 0/0 .rodata          @4076 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u32 const lit_4076 = 0x38D1B717;
-COMPILER_STRIP_GATE(0x80499AC0, &lit_4076);
-#pragma pop
-
-/* 80499AC4-80499AC4 000058 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80499AD4 = "R_SP30";
-#pragma pop
-
 /* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */
-// NONMATCHING - some regalloc at the end
 static int daVrbox2_color_set(vrbox2_class* i_this) {
+    fopAc_ac_c* actor = i_this;
+
     dKankyo_sun_Packet* sun_p = g_env_light.mpSunPacket;
 
     if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
@@ -433,7 +226,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
 
     wind_vec = *windVec_p;
 
-    dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo());
+    u32 sp10 = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo());
 
     cam_eye = camera_p->lookat.eye;
     cam_center = camera_p->lookat.center;
@@ -442,13 +235,12 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
 
     dKyr_get_vectle_calc(&cam_eye, &cam_center, &camFwdXZ);
     f32 temp_f30 =
-        cM3d_VectorProduct2d(0.0f, 0.0f, -wind_vec.x, -wind_vec.z, camFwdXZ.x, camFwdXZ.z) *
-        0.0005f;
-    f32 var_f29 = temp_f30 * wind_pow;
+        cM3d_VectorProduct2d(0.0f, 0.0f, -wind_vec.x, -wind_vec.z, camFwdXZ.x, camFwdXZ.z);
+    f32 var_f29 = temp_f30 * 0.0005f * wind_pow;
 
     if (strcmp(dComIfGp_getStartStageName(), "R_SP30") == 0) {
-        dKyw_get_wind_vec();
-        var_f29 = temp_f30 * (wind_pow + 0.3f);
+        cXyz* sp0C = dKyw_get_wind_vec();
+        var_f29 = temp_f30 * 0.0005f * (wind_pow + 0.3f);
     }
 
     J3DModelData* modelData = i_this->mpKumoModel->getModelData();
@@ -485,8 +277,8 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
     }
 
     modelData = i_this->mpKumoModel->getModelData();
-    J3DGXColor k_color;
-    J3DGXColorS10 color;
+    GXColor k_color;
+    GXColorS10 color;
 
     J3DMaterial* kumo_material0 = modelData->getMaterialNodePointer(0);
     if (kumo_material0 != NULL) {
@@ -497,13 +289,13 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
         k_color.g = g_env_light.vrbox_kumo_bottom_col.g;
         k_color.b = g_env_light.vrbox_kumo_bottom_col.b;
         k_color.a = g_env_light.vrbox_kumo_top_col.a;
-        kumo_material0->setTevKColor(0, &k_color);
+        kumo_material0->setTevKColor(0, (J3DGXColor*)&k_color);
 
         color.r = g_env_light.vrbox_kumo_shadow_col.r;
         color.g = g_env_light.vrbox_kumo_shadow_col.g;
         color.b = g_env_light.vrbox_kumo_shadow_col.b;
         color.a = (u8)g_env_light.vrbox_kumo_top_col.a;
-        kumo_material0->setTevColor(0, &color);
+        kumo_material0->setTevColor(0, (J3DGXColorS10*)&color);
     }
 
     J3DMaterial* kumo_material1 = modelData->getMaterialNodePointer(1);
@@ -515,13 +307,13 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
         k_color.g = g_env_light.vrbox_kumo_bottom_col.g;
         k_color.b = g_env_light.vrbox_kumo_bottom_col.b;
         k_color.a = g_env_light.vrbox_kumo_top_col.a;
-        kumo_material1->setTevKColor(0, &k_color);
+        kumo_material1->setTevKColor(0, (J3DGXColor*)&k_color);
 
         color.r = g_env_light.vrbox_kumo_shadow_col.r;
         color.g = g_env_light.vrbox_kumo_shadow_col.g;
         color.b = g_env_light.vrbox_kumo_shadow_col.b;
         color.a = g_env_light.vrbox_kumo_top_col.a;
-        kumo_material1->setTevColor(0, &color);
+        kumo_material1->setTevColor(0, (J3DGXColorS10*)&color);
     }
 
     modelData = i_this->mpKasumimModel->getModelData();
@@ -534,7 +326,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
         color.g = g_env_light.vrbox_kasumi_outer_col.g;
         color.b = g_env_light.vrbox_kasumi_outer_col.b;
         color.a = g_env_light.vrbox_kasumi_outer_col.a;
-        kasumim_material0->setTevColor(0, &color);
+        kasumim_material0->setTevColor(0, (J3DGXColorS10*)&color);
     }
 
     if (sun_p != NULL) {
@@ -550,10 +342,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
                 color.g = sun_p->mColor.g;
                 color.b = sun_p->mColor.b;
 
-                k_color.r = sun_p->field_0x74.r;
-                k_color.g = sun_p->field_0x74.g;
-                k_color.b = sun_p->field_0x74.b;
-                k_color.a = sun_p->field_0x74.a;
+                k_color = sun_p->field_0x74;
 
                 if (i == 1) {
                     if (g_env_light.daytime > 255.0f || g_env_light.daytime < 97.5f) {
@@ -562,21 +351,18 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
                         cLib_addCalc(&sun_p->field_0x64, 0.0f, 0.2f, 0.1f, 0.0001f);
                     }
 
-                    int alpha = sun_p->field_0x64 * 255.0f * sun_p->mSunAlpha;
-                    color.a = alpha;
-                    k_color.a = alpha;
+                    color.a = sun_p->field_0x64 * 255.0f * sun_p->mSunAlpha;
+                    k_color.a = color.a;
                 } else if (i == 2) {
-                    int alpha = sun_p->mSunAlpha * 255.0f * (1.0f - sun_p->field_0x64);
-                    color.a = alpha;
-                    k_color.a = alpha;
+                    color.a = sun_p->mSunAlpha * 255.0f * (1.0f - sun_p->field_0x64);
+                    k_color.a = color.a;
                 } else {
-                    int alpha = sun_p->mSunAlpha * 255.0f;
-                    color.a = alpha;
-                    k_color.a = alpha;
+                    color.a = sun_p->mSunAlpha * 255.0f;
+                    k_color.a = color.a;
                 }
 
-                material_p->setTevColor(0, &color);
-                material_p->setTevKColor(0, &k_color);
+                material_p->setTevColor(0, (J3DGXColorS10*)&color);
+                material_p->setTevKColor(0, (J3DGXColor*)&k_color);
             }
         }
     }
@@ -587,7 +373,9 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
 /* 804997E8-8049982C 000DE8 0044+00 1/0 0/0 0/0 .text            daVrbox2_Execute__FP12vrbox2_class
  */
 static int daVrbox2_Execute(vrbox2_class* i_this) {
-    if (g_env_light.daytime > FLOAT_LABEL(lit_3837)) {
+    i_this = i_this; // ?? fakematch? only needed for debug
+
+    if (g_env_light.daytime > 255.0f) {
         i_this->mSunBtk.play();
     }
 
@@ -603,6 +391,7 @@ static int daVrbox2_IsDelete(vrbox2_class* i_this) {
 /* 80499834-8049983C 000E34 0008+00 1/0 0/0 0/0 .text            daVrbox2_Delete__FP12vrbox2_class
  */
 static int daVrbox2_Delete(vrbox2_class* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "Vrbox2");
     return 1;
 }
 
@@ -610,21 +399,28 @@ static int daVrbox2_Delete(vrbox2_class* i_this) {
 static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) {
     vrbox2_class* a_this = (vrbox2_class*)i_this;
 
-    a_this->mpKumoModel = mDoExt_J3DModel__create(
-        (J3DModelData*)dComIfG_getStageRes("vrbox_kumo.bmd"), 0x80000, 0x11020202);
+    J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kumo.bmd");
+    JUT_ASSERT(785, modelData != 0);
+
+    a_this->mpKumoModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
 
-    J3DModelData* sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd");
+    J3DModelData* kasumi_modelData;
+    J3DModelData* sun_modelData;
+    sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd");
     if (sun_modelData != NULL) {
         a_this->model2 = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202);
+        JUT_ASSERT(809, a_this->model2 != 0);
         a_this->model2_und = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202);
+        JUT_ASSERT(820, a_this->model2_und != 0);
 
         J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes("vrbox_sun.btk");
-        if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, FLOAT_LABEL(lit_3627), 0, -1)) {
+        JUT_ASSERT(825, pbtk != 0);
+        if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) {
             return 0;
         }
     }
 
-    J3DModelData* kasumi_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kasumiM.bmd");
+    kasumi_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kasumiM.bmd");
     if (kasumi_modelData != NULL) {
         a_this->mpKasumimModel = mDoExt_J3DModel__create(kasumi_modelData, 0x80000, 0x11020202);
     }
@@ -635,10 +431,9 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) {
 /* 80499978-80499A1C 000F78 00A4+00 1/0 0/0 0/0 .text            daVrbox2_Create__FP10fopAc_ac_c */
 static int daVrbox2_Create(fopAc_ac_c* i_this) {
     fopAcM_SetupActor(i_this, vrbox2_class);
-    vrbox2_class* a_this = (vrbox2_class*)i_this;
 
     int phase = cPhs_COMPLEATE_e;
-    if (!fopAcM_entrySolidHeap(a_this, daVrbox2_solidHeapCB, 0x80004340)) {
+    if (!fopAcM_entrySolidHeap(i_this, daVrbox2_solidHeapCB, 0x80004340)) {
         phase = cPhs_ERROR_e;
     }
 
diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp
index 85d5c5b97a..932f9882d5 100644
--- a/src/d/actor/d_a_warp_bug.cpp
+++ b/src/d/actor/d_a_warp_bug.cpp
@@ -4,6 +4,7 @@
  */
 
 #include "d/actor/d_a_warp_bug.h"
+#include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"