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

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 */

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)) {

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();

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) {

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) {

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;

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) {

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);

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();

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) {

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) {

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),

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);
     }
 

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)) {

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);
 

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)

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;
     }
 

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) {

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;
     }

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 {

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");

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) {

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;

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) {

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;

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;

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);

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:

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) {

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) {

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) {

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) {

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);

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);
     }

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},
 };

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;

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) {

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;

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) {

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) {

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) {

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;

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));
         }

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]);
         }

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"
 

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,

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);

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;

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);
     }
 
-    if (dComIfGd_getView() != NULL) {
-        var_f31 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f;
+#ifdef DEBUG
+    if (g_kankyoHIO.field_0xB4 != 0) {
+        var_f31 = g_kankyoHIO.field_0xB8;
     } else {
-        var_f31 = 0.0f;
+        g_kankyoHIO.field_0xB8 = var_f31;
+    }
+#endif
+
+    f32 f29;
+    if (dComIfGd_getView() != NULL) {
+        f29 = (dComIfGd_getInvViewMtx()[1][3] - var_f31) * 0.09f;
+    } else {
+        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) {
-            sp14 = sun_p->mPos[0];
-            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);
+        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);
+
+            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);
 
-    J3DModelData* sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd");
+    a_this->mpKumoModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
+
+    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;
     }
 

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"
 

src/d/d_a_obj.cpp

@@ -119,12 +119,12 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_
 void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream_spd, f32 param_3,
                     f32 param_4, cXyz const* param_5, f32 friction, f32 no_grade_cos,
                     cXyz const* param_8) {
-    JUT_ASSERT(stream_spd != 0);
+    JUT_ASSERT(0, stream_spd != 0);
 
     cXyz spAC;
     posMoveF_resist_acc(&spAC, i_actor, stream_spd, param_3, param_4);
 
-    JUT_ASSERT((friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) &&
+    JUT_ASSERT(0, (friction >= 0.0f) && (friction < 1.0f) && (no_grade_cos >= 0.0f) &&
                (no_grade_cos <= 1.0f));
 
     cXyz spB8;

src/d/d_bg_w.cpp

@@ -1237,9 +1237,9 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
                                     cx1 -= sp50.x;
                                     cy1 -= sp50.z;
 
-                                    JUT_ASSERT(pwi->GetPos()->x ==
+                                    JUT_ASSERT(0, pwi->GetPos()->x ==
                                                pwi->GetWallCirP(cir_index)->GetCx());
-                                    JUT_ASSERT(pwi->GetPos()->z ==
+                                    JUT_ASSERT(0, pwi->GetPos()->z ==
                                                pwi->GetWallCirP(cir_index)->GetCy());
 
                                     f32 spE0 =
@@ -1250,12 +1250,12 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
                                     f32 onx = -tri->m_plane.GetNP()->x;
                                     f32 ony = -tri->m_plane.GetNP()->z;
 
-                                    JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
+                                    JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
 
                                     if (spE0 < spE4) {
                                         if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) {
-                                            JUT_ASSERT(!(fpclassify(cx0) == 1));
-                                            JUT_ASSERT(!(fpclassify(cy0) == 1));
+                                            JUT_ASSERT(0, !(fpclassify(cx0) == 1));
+                                            JUT_ASSERT(0, !(fpclassify(cy0) == 1));
 
                                             f32 spF0, spF4;
                                             cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0,
@@ -1263,8 +1263,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
                                             pwi->GetPos()->x += cx0 - spF0;
                                             pwi->GetPos()->z += cy0 - spF4;
 
-                                            JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
-                                            JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
+                                            JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
+                                            JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
 
                                             pwi->CalcMovePosWork();
                                             pwi->SetWallCirHit(cir_index);
@@ -1276,8 +1276,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
                                             pwi->SetWallHit();
                                         }
                                     } else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) {
-                                        JUT_ASSERT(!(fpclassify(cx1) == 1));
-                                        JUT_ASSERT(!(fpclassify(cy1) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(cx1) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(cy1) == 1));
 
                                         f32 spF8, spFC;
                                         cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1,
@@ -1285,8 +1285,8 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
                                         pwi->GetPos()->x += cx1 - spF8;
                                         pwi->GetPos()->z += cy1 - spFC;
 
-                                        JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
-                                        JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
 
                                         pwi->CalcMovePosWork();
                                         pwi->SetWallCirHit(cir_index);
@@ -1674,9 +1674,9 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
                                 cx1 -= sp50.x;
                                 cy1 -= sp50.z;
 
-                                JUT_ASSERT(pwi->GetPos()->x ==
+                                JUT_ASSERT(0, pwi->GetPos()->x ==
                                            pwi->GetWallCirP(cir_index)->GetCx());
-                                JUT_ASSERT(pwi->GetPos()->z ==
+                                JUT_ASSERT(0, pwi->GetPos()->z ==
                                            pwi->GetWallCirP(cir_index)->GetCy());
 
                                 f32 spE0 =
@@ -1687,12 +1687,12 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
                                 f32 onx = -tri->m_plane.GetNP()->x;
                                 f32 ony = -tri->m_plane.GetNP()->z;
 
-                                JUT_ASSERT(!(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
+                                JUT_ASSERT(0, !(cM3d_IsZero(onx) && cM3d_IsZero(ony)));
 
                                 if (spE0 < spE4) {
                                     if (!(spE0 > spDC) && !(fabsf(spE0 - spDC) < 0.008f)) {
-                                        JUT_ASSERT(!(fpclassify(cx0) == 1));
-                                        JUT_ASSERT(!(fpclassify(cy0) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(cx0) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(cy0) == 1));
 
                                         f32 spF0, spF4;
                                         cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx0, cy0,
@@ -1700,8 +1700,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
                                         pwi->GetPos()->x += cx0 - spF0;
                                         pwi->GetPos()->z += cy0 - spF4;
 
-                                        JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
-                                        JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
+                                        JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
 
                                         pwi->CalcMovePosWork();
                                         pwi->SetWallCirHit(cir_index);
@@ -1713,8 +1713,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
                                         pwi->SetWallHit();
                                     }
                                 } else if (!(spE4 > spDC) && !(fabsf(spE4 - spDC) < 0.008f)) {
-                                    JUT_ASSERT(!(fpclassify(cx1) == 1));
-                                    JUT_ASSERT(!(fpclassify(cy1) == 1));
+                                    JUT_ASSERT(0, !(fpclassify(cx1) == 1));
+                                    JUT_ASSERT(0, !(fpclassify(cy1) == 1));
 
                                     f32 spF8, spFC;
                                     cM2d_CrossCirLin(*pwi->GetWallCirP(cir_index), cx1, cy1, onx,
@@ -1722,8 +1722,8 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
                                     pwi->GetPos()->x += cx1 - spF8;
                                     pwi->GetPos()->z += cy1 - spFC;
 
-                                    JUT_ASSERT(!(fpclassify(pwi->GetPos()->x) == 1));
-                                    JUT_ASSERT(!(fpclassify(pwi->GetPos()->z) == 1));
+                                    JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->x) == 1));
+                                    JUT_ASSERT(0, !(fpclassify(pwi->GetPos()->z) == 1));
 
                                     pwi->CalcMovePosWork();
                                     pwi->SetWallCirHit(cir_index);
@@ -2313,4 +2313,4 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
 /* 80450F8A 0001+00 data_80450F8A None */
 /* 80450F8B 0005+00 data_80450F8B None */
 extern u8 struct_80450F88[8];
-u8 struct_80450F88[8];
+u8 struct_80450F88[8];

src/d/d_bright_check.cpp

@@ -44,7 +44,7 @@ static procFunc brightChackProc[] = {
 dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) {
     mArchive = i_archive;
     mBrightCheck.mMsgString = new dMsgString_c();
-    JUT_ASSERT(mBrightCheck.mMsgString != 0);
+    JUT_ASSERT(0, mBrightCheck.mMsgString != 0);
 
     screenSet();
     mCompleteCheck = false;
@@ -77,7 +77,7 @@ void dBrightCheck_c::screenSet() {
     };
 
     mBrightCheck.Scr = new J2DScreen();
-    JUT_ASSERT(mBrightCheck.Scr != 0);
+    JUT_ASSERT(0, mBrightCheck.Scr != 0);
     mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive);
 
     mBrightCheck.Scr->search('g_abtn_n')->hide();

src/d/d_demo.cpp

@@ -3,6 +3,7 @@
 #include "m_Do/m_Do_graphic.h"
 #include "d/actor/d_a_movie_player.h"
 #include "JSystem/JGadget/pointer.h"
+#include "JSystem/JGadget/define.h"
 
 namespace {
 /* 80037DE4-80037E44 032724 0060+00 1/0 0/0 0/0 .text
@@ -29,8 +30,9 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData
         msg << iType;
         msg << "\n  demo-object : ";
         msg << id_string;
-#endif
+#else
         break;
+#endif
     }
 }
 
@@ -128,27 +130,27 @@ f32 dDemo_actor_c::getPrm_Morf() {
     dDemo_prm_data* prm = mPrm.mData;
 
     switch (mPrm.field_0x0) {
-    case 1:
+    case ID_UNK_1:
         if (field_0x54 < 4) {
             return 0.0f;
         }
         return prm->field_0x4;
-    case 2:
+    case ID_UNK_2:
         if (field_0x54 < 7) {
             return 0.0f;
         }
         return prm->field_0x7;
-    case 4:
+    case ID_UNK_4:
         if (field_0x54 < 6) {
             return 0.0f;
         }
         return prm->field_0x6;
-    case 5:
+    case ID_UNK_5:
         if (field_0x54 < 0xB) {
             return 0.0f;
         }
         return prm->field_0xb;
-    case 6:
+    case ID_UNK_6:
         if (field_0x54 < 0xF) {
             return 0.0f;
         }
@@ -349,10 +351,12 @@ static void branchFile(char const* resName) {
 /* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata           m_branchId__7dDemo_c */
 s16 dDemo_c::m_branchId = -1;
 
+s16 dDemo_c::m_branchNum = 0;
+
 /* 800387EC-80038920 03312C 0134+00 1/0 0/0 0/0 .text            JSGSetData__13dDemo_actor_cFUlPCvUl
  */
 void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) {
-    if (id == 1) {
+    if (id == ID_UNK_1) {
         JStudio::stb::TParseData_fixed<50, TValueIterator_misaligned<u16> > data(pdata);
         if (!data.isEnd() && data.isValid()) {
             JGadget::binary::TValueIterator_misaligned<u16> value(data.begin());
@@ -360,7 +364,7 @@ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) {
             dDemo_c::setBranchType(*value);
             OS_REPORT("JSGSetData: 分岐条件<%d>\n", *value);
         }
-    } else if (id == 2) {
+    } else if (id == ID_UNK_2) {
         JUT_ASSERT(728, dDemo_c::getBranchId() >= 0);
 
         JStudio::stb::TParseData_string string_data(pdata);
@@ -383,7 +387,7 @@ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) {
         if (strcmp(str, "-") != 0) {
             branchFile(str);
         }
-    } else if (id == 3) {
+    } else if (id == ID_UNK_3) {
         JStudio::stb::TParseData_string data(pdata);
 
         u32 num = data.size();
@@ -414,7 +418,8 @@ void dDemo_actor_c::JSGSetTranslation(Vec const& i_trans) {
         onEnable(ENABLE_TRANS_e);
     } else {
         // "\n\n!!JSGSetTranslation outside of range. x[%f]y[%f]z[%f]\n"
-        JUT_ASSERT(789, "\n\n!!JSGSetTranslationで範囲外の指定がされました。x[%f]y[%f]z[%f]\n", i_trans.x, i_trans.y, i_trans.z);
+        OS_REPORT("\n\n!!JSGSetTranslationで範囲外の指定がされました。x[%f]y[%f]z[%f]\n", i_trans.x, i_trans.y, i_trans.z);
+        JUT_ASSERT(789, 0);
     }
 }
 
@@ -740,7 +745,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
     demoActor = new dDemo_actor_c();
     if (demoActor == NULL) {
         // "Failed to get Demo Actor!!\n"
-        OS_REPORT("デモアクター確保失敗！！\n")
+        OS_REPORT("デモアクター確保失敗！！\n");
         return NULL;
     }
 
@@ -924,32 +929,32 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam
 /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text            create__7dDemo_cFv */
 void dDemo_c::create() {
     m_system = new dDemo_system_c();
-    JUT_ASSERT(m_system != 0);
+    JUT_ASSERT(0, m_system != 0);
 
     m_control = new JStudio::TControl();
-    JUT_ASSERT(m_control != 0);
+    JUT_ASSERT(0, m_control != 0);
 
     m_mesgControl = new jmessage_tControl();
-    JUT_ASSERT(m_mesgControl != 0);
+    JUT_ASSERT(0, m_mesgControl != 0);
 
     m_stage = new JStudio_JStage::TCreateObject(m_system);
-    JUT_ASSERT(m_stage != 0);
+    JUT_ASSERT(0, m_stage != 0);
 
     m_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system);
-    JUT_ASSERT(m_audio != 0);
+    JUT_ASSERT(0, m_audio != 0);
     m_audio->mPermit_onExit_notEnd = true;
 
     m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system);
-    JUT_ASSERT(m_particle != 0);
+    JUT_ASSERT(0, m_particle != 0);
 
     m_message = new jstudio_tCreateObject_message();
-    JUT_ASSERT(m_message != 0);
+    JUT_ASSERT(0, m_message != 0);
 
     m_factory = new JStudio::TFactory();
-    JUT_ASSERT(m_factory != 0);
+    JUT_ASSERT(0, m_factory != 0);
 
     m_object = new dDemo_object_c();
-    JUT_ASSERT(m_object != 0);
+    JUT_ASSERT(0, m_object != 0);
 
     m_control->setSecondPerFrame(1.0f / 30.0f);
     m_control->setFactory(m_factory);
@@ -1022,7 +1027,7 @@ jmessage_tControl::~jmessage_tControl() {}
 
 /* 80039B6C-80039CF8 0344AC 018C+00 1/1 1/1 0/0 .text            start__7dDemo_cFPCUcP4cXyzf */
 int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) {
-    JUT_ASSERT(m_system != 0);
+    JUT_ASSERT(0, m_system != 0);
 
     m_control->reset();
     JStudio::TParse parser(m_control);
@@ -1060,7 +1065,7 @@ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) {
 
 /* 80039CF8-80039D4C 034638 0054+00 1/1 2/2 0/0 .text            end__7dDemo_cFv */
 void dDemo_c::end() {
-    JUT_ASSERT(m_system != 0);
+    JUT_ASSERT(0, m_system != 0);
 
     m_control->destroyObject_all();
     m_object->remove();
@@ -1070,19 +1075,19 @@ void dDemo_c::end() {
 
 /* 80039D4C-80039DA4 03468C 0058+00 1/1 0/0 0/0 .text            branch__7dDemo_cFv */
 void dDemo_c::branch() {
-    JUT_ASSERT(m_system != 0);
+    JUT_ASSERT(0, m_system != 0);
 
     m_control->destroyObject_all();
     const u8* branchData = m_branchData;
     m_branchData = NULL;
 
     int rt = start(branchData, m_translation, m_rotationY);
-    JUT_ASSERT(rt);
+    JUT_ASSERT(0, rt);
 }
 
 /* 80039DA4-80039EDC 0346E4 0138+00 0/0 1/1 0/0 .text            update__7dDemo_cFv */
 int dDemo_c::update() {
-    JUT_ASSERT(m_system != 0);
+    JUT_ASSERT(0, m_system != 0);
 
     if (m_data == NULL) {
         if (m_branchData == NULL) {

src/d/d_door_param2.cpp

@@ -75,7 +75,7 @@ u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) {
 
 /* 8003A218-8003A224 034B58 000C+00 0/0 0/0 2/2 .text getMsgNo__13door_param2_cFP10fopAc_ac_c */
 u16 door_param2_c::getMsgNo(fopAc_ac_c* i_actor) {
-    return i_actor->home.angle.x;
+    return i_actor->home.angle.x & 0xFFFF;
 }
 
 /* 8003A224-8003A230 034B64 000C+00 0/0 0/0 6/6 .text getExitNo__13door_param2_cFP10fopAc_ac_c */
@@ -86,23 +86,23 @@ u8 door_param2_c::getExitNo(fopAc_ac_c* i_actor) {
 /* 8003A230-8003A23C 034B70 000C+00 0/0 0/0 1/1 .text getFLightInf__13door_param2_cFP10fopAc_ac_c
  */
 u32 door_param2_c::getFLightInf(fopAc_ac_c* i_actor) {
-    return fopAcM_GetParamBit(i_actor, 25, 3);
+    return fopAcM_GetParamBit(i_actor, 25, 3) & 0xFF;
 }
 
 /* 8003A23C-8003A248 034B7C 000C+00 0/0 0/0 1/1 .text getBLightInf__13door_param2_cFP10fopAc_ac_c
  */
 u32 door_param2_c::getBLightInf(fopAc_ac_c* i_actor) {
-    return fopAcM_GetParamBit(i_actor, 28, 3);
+    return fopAcM_GetParamBit(i_actor, 28, 3) & 0xFF;
 }
 
 /* 8003A248-8003A254 034B88 000C+00 0/0 0/0 1/1 .text getMFLightInf__13door_param2_cFP10fopAc_ac_c
  */
 u32 door_param2_c::getMFLightInf(fopAc_ac_c* i_actor) {
-    return fopAcM_GetParamBit(i_actor, 19, 3);
+    return fopAcM_GetParamBit(i_actor, 19, 3) & 0xFF;
 }
 
 /* 8003A254-8003A260 034B94 000C+00 0/0 0/0 1/1 .text getMBLightInf__13door_param2_cFP10fopAc_ac_c
  */
 u32 door_param2_c::getMBLightInf(fopAc_ac_c* i_actor) {
-    return fopAcM_GetParamBit(i_actor, 22, 3);
-}
+    return fopAcM_GetParamBit(i_actor, 22, 3) & 0xFF;
+}

src/d/d_ev_camera.cpp

@@ -4,6 +4,7 @@
 //
 
 #include "d/d_ev_camera.h"
+#include "d/d_debug_viewer.h"
 #include "dol2asm.h"
 #include "d/d_demo.h"
 #include "m_Do/m_Do_controller_pad.h"
@@ -1046,7 +1047,7 @@ int dCamera_c::talktoEvCamera() {
 
 #if DEBUG
     if (mCurCamTypeTimer == 0 && mCamSetup.CheckFlag(0x40)) {
-        u32 id = mCamParam.Id();
+        u32 id = mCamParam.Id(style);
         OS_REPORT("camera: event: %16s  = %d (%c%c%c%c)\n", "style", style, (u8)(id >> 0x18), (u8)(id >> 0x10), (u8)(id >> 0x8), (u8)(id));
     }
 #endif

src/d/d_file_sel_info.cpp

@@ -54,7 +54,7 @@ dFile_info_c::~dFile_info_c() {
 /* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text            screenSet__12dFile_info_cFv */
 void dFile_info_c::screenSet() {
     mFileInfo.Scr = new J2DScreen();
-    JUT_ASSERT(mFileInfo.Scr != 0);
+    JUT_ASSERT(0, mFileInfo.Scr != 0);
 
     mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive);
     mFileInfo.mFont = mDoExt_getMesgFont();

src/d/d_file_sel_warning.cpp

@@ -111,10 +111,10 @@ void dFile_warning_c::screenSet() {
     };
 
     mFileWarn.Scr = new J2DScreen();
-    JUT_ASSERT(mFileWarn.Scr != 0);
+    JUT_ASSERT(0, mFileWarn.Scr != 0);
 
     mFileWarn.mMsgString = new dMsgString_c();
-    JUT_ASSERT(mFileWarn.mMsgString != 0);
+    JUT_ASSERT(0, mFileWarn.mMsgString != 0);
 
     mFileWarn.Scr->setPriority(blo_name[field_0x3e], 0x100000, mpArchive);
 
@@ -126,7 +126,7 @@ void dFile_warning_c::screenSet() {
 
     mFileWarn.mFont = mDoExt_getMesgFont();
     mpRootPane = new CPaneMgr(mFileWarn.Scr, 'Nm_02', 0, NULL);
-    JUT_ASSERT(mpRootPane != 0);
+    JUT_ASSERT(0, mpRootPane != 0);
     field_0x34 = mpRootPane->getTranslateY();
 
     mFileWarn.Scr->search('w_msg_jp')->hide();

src/d/d_gameover.cpp

@@ -21,6 +21,8 @@ public:
     /* 8019AFE0 */ dGov_HIO_c();
     /* 8019C06C */ virtual ~dGov_HIO_c() {}
 
+    void genMessage(JORMContext*);
+
     /* 0x04 */ u8 unk_0x4;
     /* 0x08 */ f32 mScale;
     /* 0x0C */ f32 mAlpha;
@@ -147,7 +149,7 @@ int dGameover_c::_create() {
         }
 
         dRes_info_c* resInfo = dComIfG_getObjectResInfo("Gover");
-        JUT_ASSERT(resInfo != 0);
+        JUT_ASSERT(0, resInfo != 0);
 
         mpHeap = (JKRHeap*)dComIfGp_getExpHeap2D();
         dComIfGp_setHeapLockFlag(6);
@@ -156,7 +158,7 @@ int dGameover_c::_create() {
 
         dgo_screen_c = new dDlst_GameOverScrnDraw_c(resInfo->getArchive());
         dMs_c = new dMenu_save_c();
-        JUT_ASSERT(dMs_c != 0);
+        JUT_ASSERT(0, dMs_c != 0);
 
         if (dMeter2Info_getGameOverType() == 1) {
             if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) {
@@ -175,7 +177,7 @@ int dGameover_c::_create() {
 
         dMs_c->_create();
         dgo_capture_c = new dDlst_Gameover_CAPTURE_c();
-        JUT_ASSERT(dgo_capture_c != 0);
+        JUT_ASSERT(0, dgo_capture_c != 0);
 
         OS_REPORT("game over create size ===> %d\n", temp - mpHeap->getTotalFreeSize());
 

src/d/d_map.cpp

@@ -98,7 +98,7 @@ int renderingAmap_c::getDispType() const {
         disp_type = 5;
         break;
     default:
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         break;
     }
 
@@ -336,7 +336,7 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
             *color = borderColor1;
             break;
         default:
-            JUT_ASSERT(0);
+            JUT_ASSERT(0, 0);
             break;
         }
     } else {
@@ -357,7 +357,7 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
 
     const GXColor* color;
     if (isDrawOutSideTrim() && field_0x38 != 2) {
-        JUT_ASSERT(m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0])));
+        JUT_ASSERT(0, m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0])));
         color = &colorTable[m_outSideBlackLineCnt];
     } else {
         color = getLineColor(param_0, param_1);
@@ -427,7 +427,7 @@ int renderingAmap_c::getStayType() const {
  * isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */
 bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2,
                                         int param_3) const {
-    JUT_ASSERT(i_data != 0);
+    JUT_ASSERT(0, i_data != 0);
 
     bool var_r31 = false;
     int disp_type = getDispType();
@@ -443,7 +443,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
     switch (group_no) {
     case 0:
         if (stay_type == 1) {
-            JUT_ASSERT(i_data->mNo != 255);
+            JUT_ASSERT(0, i_data->mNo != 255);
 
             if (var_r23 && i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo) && param_1) {
                 var_r31 = true;
@@ -492,7 +492,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
             }
 
             if (temp_r23_2) {
-                JUT_ASSERT(i_data->mNo != 255);
+                JUT_ASSERT(0, i_data->mNo != 255);
                 bool temp_r23_3 = false;
                 if (i_data->mNo != 255 && !dComIfGs_isTbox(i_data->mNo)) {
                     temp_r23_3 = true;
@@ -592,7 +592,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
         }
         break;
     default:
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         break;
     }
 
@@ -621,7 +621,7 @@ bool dMap_c::isSpecialOutline() {
 
 /* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text            copyPalette__6dMap_cFv */
 void dMap_c::copyPalette() {
-    JUT_ASSERT(m_res != 0);
+    JUT_ASSERT(0, m_res != 0);
 
     cLib_memCpy(m_res, m_res_src, sizeof(dMap_HIO_prm_res_dst_s::m_res->palette_data));
     if (getStayType() == 0) {
@@ -680,7 +680,7 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
     field_0x90 = 0;
 
     m_res = new (0x20) dMap_prm_res_s;
-    JUT_ASSERT(m_res != 0);
+    JUT_ASSERT(0, m_res != 0);
 
     dMap_HIO_prm_res_dst_s::m_res = m_res;
 
@@ -696,12 +696,12 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
 
     int buffer_size = GXGetTexBufferSize(param_2, param_3, 9, GX_FALSE, 0);
     mImage_p = new (0x20) u8[buffer_size];
-    JUT_ASSERT(mImage_p != 0);
+    JUT_ASSERT(0, mImage_p != 0);
 
     renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY);
 
     mResTIMG = new (0x20) ResTIMG;
-    JUT_ASSERT(mResTIMG != 0);
+    JUT_ASSERT(0, mResTIMG != 0);
 
     makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
 }
@@ -732,7 +732,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
     f32 var_f2 = 0.0f;
     f32 var_f3 = 0.0f;
 
-    JUT_ASSERT(i_roomNo >= 0);
+    JUT_ASSERT(0, i_roomNo >= 0);
 
     if (i_roomNo >= 0) {
         f32 temp_f31 = dMpath_c::getMinX();
@@ -746,7 +746,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
         f32 sp8 = 0.0f;
 
         dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo);
-        JUT_ASSERT(fileList2_p != 0);
+        JUT_ASSERT(0, fileList2_p != 0);
 
         if (fileList2_p != NULL) {
             dMapInfo_n::getRoomMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8);
@@ -754,7 +754,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
 
         switch (getDispType()) {
         default:
-            JUT_ASSERT(0);
+            JUT_ASSERT(0, 0);
         case 4:
         case 0:
             var_f0 = temp_f31;
@@ -841,7 +841,7 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
     f32 var_f31 = 0.0f;
     f32 var_f30 = 0.0f;
 
-    JUT_ASSERT(i_roomNo >= 0);
+    JUT_ASSERT(0, i_roomNo >= 0);
 
     if (i_roomNo >= 0) {
         f32 sp14 = 0.0f;
@@ -865,11 +865,11 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
 
 /* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text            calcMapCmPerTexel__6dMap_cFiPf */
 void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
-    JUT_ASSERT(i_roomNo >= 0);
-    JUT_ASSERT(ip_cmPerTexel != 0);
+    JUT_ASSERT(0, i_roomNo >= 0);
+    JUT_ASSERT(0, ip_cmPerTexel != 0);
 
     f32 cmPerTexel = 0.0f;
-    JUT_ASSERT(mTexSizeY != 0);
+    JUT_ASSERT(0, mTexSizeY != 0);
 
     if (i_roomNo >= 0) {
         if (getStayType() == 0) {
@@ -893,7 +893,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
             f32 var_f31 = 0.0f;
 
             stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
-            JUT_ASSERT(pstag != 0);
+            JUT_ASSERT(0, pstag != 0);
 
             if (pstag != NULL) {
                 var_f31 = pstag->field_0x20;
@@ -907,7 +907,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
         }
     }
 
-    JUT_ASSERT(cmPerTexel != 0.0f);
+    JUT_ASSERT(0, cmPerTexel != 0.0f);
 
     if (ip_cmPerTexel != NULL) {
         *ip_cmPerTexel = cmPerTexel;
@@ -942,7 +942,7 @@ inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u
 
 /* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */
 void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
-    JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
+    JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
 
     int pixel;
     u8 scaled_a = 0;
@@ -970,8 +970,8 @@ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
 
 /* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text            copyPalette__6dMap_cFiif */
 void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
-    JUT_ASSERT(i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
-    JUT_ASSERT(i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
+    JUT_ASSERT(0, i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
+    JUT_ASSERT(0, i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
 
     int pixel;
     u8 scaled_a = 0;
@@ -999,7 +999,7 @@ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
 
 /* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */
 void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) {
-    JUT_ASSERT(i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
+    JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
 
     int pixel;
     if (i_scaledA >= 0xE0) {
@@ -1102,7 +1102,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
     switch (getDispType()) {
     default:
     case 0:
-        JUT_ASSERT(0);
+        JUT_ASSERT(0, 0);
         break;
     case 5:
         field_0x8e = 2;
@@ -1301,4 +1301,4 @@ dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0)
 // TODO: this is supposed to be auto-generated, but its not getting put in the right order
 void dDlst_base_c::draw() {
     /* empty function */
-}
+}

src/d/d_menu_dmap.cpp

@@ -791,7 +791,7 @@ void dMenu_DmapBg_c::setFloorMessage() {
     local_d8[7]->setFont(mDoExt_getSubFont());
     local_f8[7]->setFont(mDoExt_getSubFont());
 
-    OS_REPORT("floor ===> %d\n", dMenu_Dmap_c::myclass->getFloorAll())
+    OS_REPORT("floor ===> %d\n", dMenu_Dmap_c::myclass->getFloorAll());
     for (int i = 0; i < 8; i++) {
         int bottomFloor = dMenu_Dmap_c::myclass->getBottomFloor();
         u32 floorAll = dMenu_Dmap_c::myclass->getFloorAll();

src/d/d_menu_letter.cpp

@@ -243,8 +243,8 @@ dMenu_Letter_c::~dMenu_Letter_c() {
     delete mpMenuDMYScreen;
     mpMenuDMYScreen = NULL;
 
-    delete mpMenuBaseScreen;
-    mpMenuBaseScreen = NULL;
+    delete mpBaseScreen;
+    mpBaseScreen = NULL;
 
     delete mpSdwScreen;
     mpSdwScreen = NULL;
@@ -358,7 +358,7 @@ void dMenu_Letter_c::_draw() {
     mpBlackTex->draw(mDoGph_gInf_c::getMinXF(), mDoGph_gInf_c::getMinYF(),
                      mDoGph_gInf_c::getWidthF(), mDoGph_gInf_c::getHeightF(), false, false, false);
     mpBlackTex->setAlpha(prevAlpha);
-    mpMenuBaseScreen->draw(0.0f, 0.0f, grafContext);
+    mpBaseScreen->draw(0.0f, 0.0f, grafContext);
     u32 left, top, width, height;
     GXGetScissor(&left, &top, &width, &height);
     CPaneMgr afStack_138;
@@ -579,8 +579,8 @@ void dMenu_Letter_c::wait_move() {
         }
 
         if (mProcess == 1 || mProcess == 2) {
-            J2DTextBox* textBox = (J2DTextBox*)mpMenuBaseScreen->search('f_t_00');
-            mpMenuBaseScreen->search('t_t00')->hide();
+            J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('f_t_00');
+            mpBaseScreen->search('t_t00')->hide();
             dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100);
             mpString->getString(0x4d6, textBox, NULL, NULL, NULL, 0);
         }
@@ -1052,29 +1052,29 @@ static const u64 tag_pii[9] = {
 /* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text            screenSetBase__14dMenu_Letter_cFv
  */
 void dMenu_Letter_c::screenSetBase() {
-    mpMenuBaseScreen = new J2DScreen();
+    mpBaseScreen = new J2DScreen();
     JUT_ASSERT(1357, mpBaseScreen != 0);
-    bool fg = mpMenuBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive);
+    bool fg = mpBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive);
     JUT_ASSERT(1361, fg != false);
-    dPaneClass_showNullPane(mpMenuBaseScreen);
-    mpMenuBaseScreen->search('wi_btn_n')->hide();
-    mpParent[1] = new CPaneMgr(mpMenuBaseScreen, 'n_all', 2, NULL);
+    dPaneClass_showNullPane(mpBaseScreen);
+    mpBaseScreen->search('wi_btn_n')->hide();
+    mpParent[1] = new CPaneMgr(mpBaseScreen, 'n_all', 2, NULL);
     JUT_ASSERT(1372, mpParent[1] != 0);
     mpParent[1]->setAlphaRate(0.0f);
-    J2DTextBox* piVar9 = (J2DTextBox*)mpMenuBaseScreen->search('f_t_00');
-    mpMenuBaseScreen->search('t_t00')->hide(); 
+    J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('f_t_00');
+    mpBaseScreen->search('t_t00')->hide(); 
     piVar9->setString(0x40, "");
     piVar9->setFont(mDoExt_getSubFont());
     dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100);
     mpString->getString(0x4d6, piVar9, NULL, NULL, NULL, 0);
-    J2DTextBox* text1 = (J2DTextBox*)mpMenuBaseScreen->search('fwpstex1');
-    J2DTextBox* text2 = (J2DTextBox*)mpMenuBaseScreen->search('fwp_tex1');
-    J2DTextBox* text3 = (J2DTextBox*)mpMenuBaseScreen->search('fgps_tx1');
-    J2DTextBox* text4 = (J2DTextBox*)mpMenuBaseScreen->search('fgp_tex1');
-    mpMenuBaseScreen->search('wps_text')->hide();
-    mpMenuBaseScreen->search('w_p_text')->hide();
-    mpMenuBaseScreen->search('g_ps_txt')->hide();
-    mpMenuBaseScreen->search('g_p_text')->hide();
+    J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('fwpstex1');
+    J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('fwp_tex1');
+    J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('fgps_tx1');
+    J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('fgp_tex1');
+    mpBaseScreen->search('wps_text')->hide();
+    mpBaseScreen->search('w_p_text')->hide();
+    mpBaseScreen->search('g_ps_txt')->hide();
+    mpBaseScreen->search('g_p_text')->hide();
     text1->setString(0x40, "");
     text2->setString(0x40, "");
     text3->setString(0x40, "");
@@ -1087,33 +1087,33 @@ void dMenu_Letter_c::screenSetBase() {
     dMeter2Info_getStringKanji(0x4d7, text2->getStringPtr(), 0);
     dMeter2Info_getStringKanji(0x4d7, text3->getStringPtr(), 0);
     dMeter2Info_getStringKanji(0x4d7, text4->getStringPtr(), 0);
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont());
-    ((J2DTextBox*)mpMenuBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont());
-    field_0x1ec = (J2DTextBox*)mpMenuBaseScreen->search('let_area');
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont());
+    ((J2DTextBox*)mpBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont());
+    field_0x1ec = (J2DTextBox*)mpBaseScreen->search('let_area');
     for (int i = 0; i < 9; i++) {
-        field_0x1f0[i] = (J2DTextBox*)mpMenuBaseScreen->search(tag_pip[i]);
+        field_0x1f0[i] = (J2DTextBox*)mpBaseScreen->search(tag_pip[i]);
         if (field_0x374 > 1 && i < field_0x374) {
             field_0x1f0[i]->show();
         } else {
             field_0x1f0[i]->hide();
         }
-        mpPageLight[i] = (J2DPicture*)mpMenuBaseScreen->search(tag_pil[i]);
+        mpPageLight[i] = (J2DPicture*)mpBaseScreen->search(tag_pil[i]);
         if (i == field_0x36f) {
             mpPageLight[i]->show();
         } else {
             mpPageLight[i]->hide();
         }
-        field_0x238[i] = (J2DTextBox*)mpMenuBaseScreen->search(tag_pii[i]);
+        field_0x238[i] = (J2DTextBox*)mpBaseScreen->search(tag_pii[i]);
     }
     if (field_0x374 > 1) {
-        J2DPane* pJVar6 = mpMenuBaseScreen->search('pi_n');
+        J2DPane* pJVar6 = mpBaseScreen->search('pi_n');
         f32 dVar18 = field_0x1f0[1]->getBounds().i.x - field_0x1f0[0]->getBounds().i.x;
         f32 dVar17 = dVar18 * (field_0x374 - 1);
         f32 dVar16 = (pJVar6->getWidth() / 2) - (dVar17 / 2);

src/d/d_meter2_draw.cpp

@@ -18,6 +18,7 @@
 #include "d/d_msg_class.h"
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
+#include "cstring.h"
 
 /* 8020FAB4-802102F8 20A3F4 0844+00 0/0 1/1 0/0 .text            __ct__13dMeter2Draw_cFP10JKRExpHeap
  */
@@ -44,9 +45,9 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     mDoExt_setCurrentHeap(heap);
 
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
     bool fg = mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     mpScreen->search('ju_ring5')->hide();
@@ -54,24 +55,24 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
 
     for (int i = 0; i < 2; i++) {
         mpKanteraMeter[i] = new dKantera_icon_c();
-        JUT_ASSERT(mpKanteraMeter[i] != 0);
+        JUT_ASSERT(0, mpKanteraMeter[i] != 0);
     }
 
     mpKanteraScreen = new J2DScreen();
-    JUT_ASSERT(mpKanteraScreen != 0);
+    JUT_ASSERT(0, mpKanteraScreen != 0);
     fg = mpKanteraScreen->setPriority("zelda_game_image_kantera.blo", 0x20000,
                                       dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpKanteraScreen);
 
     mpPikariScreen = new J2DScreen();
-    JUT_ASSERT(mpPikariScreen != 0);
+    JUT_ASSERT(0, mpPikariScreen != 0);
     fg = mpPikariScreen->setPriority("zelda_icon_pikari.blo", 0x20000, dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpPikariScreen);
 
     mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL);
-    JUT_ASSERT(mpPikariParent != 0);
+    JUT_ASSERT(0, mpPikariParent != 0);
     mPikariBlack = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getBlack();
     mPikariWhite = static_cast<J2DPicture*>(mpPikariScreen->search('pika00'))->getWhite();
 
@@ -86,7 +87,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     playPikariBpkAnimation(1.0f);
 
     mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL);
-    JUT_ASSERT(mpParent != 0);
+    JUT_ASSERT(0, mpParent != 0);
 
     static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'};
     static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
@@ -96,29 +97,29 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
 
     for (int i = 0; i < 5; i++) {
         mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL);
-        JUT_ASSERT(mpAText[i] != 0);
+        JUT_ASSERT(0, mpAText[i] != 0);
         static_cast<J2DTextBox*>(mpAText[i]->getPanePtr())->setString(64, "");
         static_cast<J2DTextBox*>(mpAText[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
         static_cast<J2DTextBox*>(mpAText[i]->getPanePtr())
             ->setCharSpace(g_drawHIO.mButtonATextSpacing);
 
         mpBText[i] = new CPaneMgr(mpScreen, b_tag[i], 0, NULL);
-        JUT_ASSERT(mpBText[i] != 0);
+        JUT_ASSERT(0, mpBText[i] != 0);
         static_cast<J2DTextBox*>(mpBText[i]->getPanePtr())->setString(64, "");
         static_cast<J2DTextBox*>(mpBText[i]->getPanePtr())->setFont(mDoExt_getMesgFont());
 
         mpXYText[i][2] = new CPaneMgr(mpScreen, z_tag[i], 0, NULL);
-        JUT_ASSERT(mpXYText[i][2] != 0);
+        JUT_ASSERT(0, mpXYText[i][2] != 0);
         static_cast<J2DTextBox*>(mpXYText[i][2]->getPanePtr())->setString(64, "");
         static_cast<J2DTextBox*>(mpXYText[i][2]->getPanePtr())->setFont(mDoExt_getMesgFont());
 
         mpXYText[i][0] = new CPaneMgr(mpScreen, x_tag[i], 0, NULL);
-        JUT_ASSERT(mpXYText[i][0] != 0);
+        JUT_ASSERT(0, mpXYText[i][0] != 0);
         static_cast<J2DTextBox*>(mpXYText[i][0]->getPanePtr())->setString(64, "");
         static_cast<J2DTextBox*>(mpXYText[i][0]->getPanePtr())->setFont(mDoExt_getMesgFont());
 
         mpXYText[i][1] = new CPaneMgr(mpScreen, y_tag[i], 0, NULL);
-        JUT_ASSERT(mpXYText[i][1] != 0);
+        JUT_ASSERT(0, mpXYText[i][1] != 0);
         static_cast<J2DTextBox*>(mpXYText[i][1]->getPanePtr())->setString(64, "");
         static_cast<J2DTextBox*>(mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont());
     }
@@ -753,27 +754,27 @@ void dMeter2Draw_c::initLife() {
     };
 
     mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL);
-    JUT_ASSERT(mpLifeParent != 0);
+    JUT_ASSERT(0, mpLifeParent != 0);
 
     for (int i = 0; i < 20; i++) {
         mpLifeParts[i] = new CPaneMgr(mpScreen, life_tag[i], 0, NULL);
-        JUT_ASSERT(mpLifeParts[i] != 0);
+        JUT_ASSERT(0, mpLifeParts[i] != 0);
 
         mpHeartMark[i] = new CPaneMgr(mpScreen, mark_tag[i], 2, NULL);
-        JUT_ASSERT(mpHeartMark[i] != 0);
+        JUT_ASSERT(0, mpHeartMark[i] != 0);
 
         mpHeartBase[i] = new CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL);
-        JUT_ASSERT(mpHeartBase[i] != 0);
+        JUT_ASSERT(0, mpHeartBase[i] != 0);
 
         mpLifeTexture[i][0] = new CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL);
-        JUT_ASSERT(mpLifeTexture[i][0] != 0);
+        JUT_ASSERT(0, mpLifeTexture[i][0] != 0);
 
         mpLifeTexture[i][1] = new CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL);
-        JUT_ASSERT(mpLifeTexture[i][1] != 0);
+        JUT_ASSERT(0, mpLifeTexture[i][1] != 0);
     }
 
     mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL);
-    JUT_ASSERT(mpBigHeart != 0);
+    JUT_ASSERT(0, mpBigHeart != 0);
 
     mpLifeParent->setAlphaRate(0.0f);
 
@@ -795,20 +796,20 @@ void dMeter2Draw_c::initMagic() {
     field_0x554 = 0.0f;
 
     mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL);
-    JUT_ASSERT(mpMagicParent != 0);
+    JUT_ASSERT(0, mpMagicParent != 0);
 
     mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL);
-    JUT_ASSERT(mpMagicBase != 0);
+    JUT_ASSERT(0, mpMagicBase != 0);
 
     mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL);
-    JUT_ASSERT(mpMagicFrameL != 0);
+    JUT_ASSERT(0, mpMagicFrameL != 0);
 
     mpMagicFrameR =
         new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL);
-    JUT_ASSERT(mpMagicFrameR != 0);
+    JUT_ASSERT(0, mpMagicFrameR != 0);
 
     mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL);
-    JUT_ASSERT(mpMagicMeter != 0);
+    JUT_ASSERT(0, mpMagicMeter != 0);
 
     OSInitFastCast();
 
@@ -856,7 +857,7 @@ void dMeter2Draw_c::initMagic() {
 /* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text            initLightDrop__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initLightDrop() {
     mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL);
-    JUT_ASSERT(mpLightDropParent != 0);
+    JUT_ASSERT(0, mpLightDropParent != 0);
 
     static u64 const tuta_0[] = {
         's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07',
@@ -875,20 +876,20 @@ void dMeter2Draw_c::initLightDrop() {
 
     for (int i = 0; i < 16; i++) {
         mpSIParts[i][0] = new CPaneMgr(mpScreen, tuta_0[i], 0, NULL);
-        JUT_ASSERT(mpSIParts[i][0] != 0);
+        JUT_ASSERT(0, mpSIParts[i][0] != 0);
 
         mpSIParts[i][1] = new CPaneMgr(mpScreen, tuta_1[i], 0, NULL);
-        JUT_ASSERT(mpSIParts[i][1] != 0);
+        JUT_ASSERT(0, mpSIParts[i][1] != 0);
 
         mpSIParts[i][2] = new CPaneMgr(mpScreen, tuta_2[i], 0, NULL);
-        JUT_ASSERT(mpSIParts[i][2] != 0);
+        JUT_ASSERT(0, mpSIParts[i][2] != 0);
     }
 
     mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL);
-    JUT_ASSERT(mpSIParent[0] != 0);
+    JUT_ASSERT(0, mpSIParent[0] != 0);
 
     mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL);
-    JUT_ASSERT(mpSIParent[1] != 0);
+    JUT_ASSERT(0, mpSIParent[1] != 0);
 
     mpLightDropParent->setAlphaRate(0.0f);
     field_0x6fc = 0.0f;
@@ -913,7 +914,7 @@ void dMeter2Draw_c::initLightDrop() {
 /* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text            initRupeeKey__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initRupeeKey() {
     mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL);
-    JUT_ASSERT(mpRupeeKeyParent != 0);
+    JUT_ASSERT(0, mpRupeeKeyParent != 0);
     field_0x718 = 1.0f;
 
     static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'};
@@ -921,22 +922,22 @@ void dMeter2Draw_c::initRupeeKey() {
 
     for (int i = 0; i < 4; i++) {
         mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL);
-        JUT_ASSERT(mpRupeeTexture[i][0] != 0);
+        JUT_ASSERT(0, mpRupeeTexture[i][0] != 0);
         mpRupeeTexture[i][0]->getPanePtr()->setBasePosition(J2DBasePosition_4);
 
         mpRupeeTexture[i][1] = new CPaneMgr(mpScreen, rupeet2_tag[i], 0, NULL);
-        JUT_ASSERT(mpRupeeTexture[i][1] != 0);
+        JUT_ASSERT(0, mpRupeeTexture[i][1] != 0);
         mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     }
 
     mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL);
-    JUT_ASSERT(mpRupeeParent[0] != 0);
+    JUT_ASSERT(0, mpRupeeParent[0] != 0);
 
     mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL);
-    JUT_ASSERT(mpRupeeParent[1] != 0);
+    JUT_ASSERT(0, mpRupeeParent[1] != 0);
 
     mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL);
-    JUT_ASSERT(mpRupeeParent[2] != 0);
+    JUT_ASSERT(0, mpRupeeParent[2] != 0);
 
     mpRupeeParent[0]->setAlphaRate(0.0f);
     mpRupeeParent[1]->setAlphaRate(0.0f);
@@ -946,13 +947,13 @@ void dMeter2Draw_c::initRupeeKey() {
 
     for (int i = 0; i < 5; i++) {
         mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL);
-        JUT_ASSERT(mpKeyTexture[i] != 0);
+        JUT_ASSERT(0, mpKeyTexture[i] != 0);
         mpKeyTexture[i]->getPanePtr()->setBasePosition(J2DBasePosition_4);
         mpKeyTexture[i]->hide();
     }
 
     mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL);
-    JUT_ASSERT(mpKeyParent != 0);
+    JUT_ASSERT(0, mpKeyParent != 0);
     mpKeyParent->setAlphaRate(0.0f);
 
     drawRupee(dComIfGs_getRupee());
@@ -978,7 +979,7 @@ void dMeter2Draw_c::initButton() {
     for (int i = 0; i < 2; i++) {
         for (int j = 0; j < 2; j++) {
             mpItemBTex[i][j] = (ResTIMG*)heap->alloc(0xC00, 0x20);
-            JUT_ASSERT(mpItemBTex[i][j] != 0);
+            JUT_ASSERT(0, mpItemBTex[i][j] != 0);
         }
     }
 
@@ -989,13 +990,13 @@ void dMeter2Draw_c::initButton() {
         for (int j = 0; j < 2; j++) {
             for (int k = 0; k < 2; k++) {
                 mpItemXYTex[i][j][k] = (ResTIMG*)heap->alloc(0xC00, 0x20);
-                JUT_ASSERT(mpItemXYTex[i][j][k] != 0);
+                JUT_ASSERT(0, mpItemXYTex[i][j][k] != 0);
             }
         }
     }
 
     mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL);
-    JUT_ASSERT(mpItemB != 0);
+    JUT_ASSERT(0, mpItemB != 0);
     mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4);
     mpItemB->show();
 
@@ -1012,17 +1013,17 @@ void dMeter2Draw_c::initButton() {
         'b_itm_pp',
         JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()),
         static_cast<J2DPicture*>(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
-    JUT_ASSERT(mpItemBPane != 0);
+    JUT_ASSERT(0, mpItemBPane != 0);
     mpItemBPane->setBasePosition(J2DBasePosition_4);
     mpItemB->getPanePtr()->appendChild(mpItemBPane);
 
     mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL);
-    JUT_ASSERT(mpItemXY[0] != 0);
+    JUT_ASSERT(0, mpItemXY[0] != 0);
     mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]);
 
     mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL);
-    JUT_ASSERT(mpItemXY[1] != 0);
+    JUT_ASSERT(0, mpItemXY[1] != 0);
     mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]);
 
@@ -1033,7 +1034,7 @@ void dMeter2Draw_c::initButton() {
         'x_itm_pp',
         JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()),
         static_cast<J2DPicture*>(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
-    JUT_ASSERT(mpItemXYPane[0] != 0);
+    JUT_ASSERT(0, mpItemXYPane[0] != 0);
     mpItemXYPane[0]->setBasePosition(J2DBasePosition_4);
     mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]);
 
@@ -1041,12 +1042,12 @@ void dMeter2Draw_c::initButton() {
         'y_itm_pp',
         JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()),
         static_cast<J2DPicture*>(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
-    JUT_ASSERT(mpItemXYPane[1] != 0);
+    JUT_ASSERT(0, mpItemXYPane[1] != 0);
     mpItemXYPane[1]->setBasePosition(J2DBasePosition_4);
     mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]);
 
     mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL);
-    JUT_ASSERT(mpItemR != 0);
+    JUT_ASSERT(0, mpItemR != 0);
     mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4);
     dMeter2Info_setMeterItemPanePtr(2, mpItemR);
 
@@ -1054,65 +1055,65 @@ void dMeter2Draw_c::initButton() {
         'r_itm_pp',
         JGeometry::TBox2<f32>(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()),
         static_cast<J2DPicture*>(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL);
-    JUT_ASSERT(mpItemXYPane[2] != 0);
+    JUT_ASSERT(0, mpItemXYPane[2] != 0);
     mpItemXYPane[2]->setBasePosition(J2DBasePosition_4);
     mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]);
 
     mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL);
-    JUT_ASSERT(mpLightB != 0);
+    JUT_ASSERT(0, mpLightB != 0);
     mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4);
     field_0x72c = 1.0f;
     mpLightB->hide();
 
     mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL);
-    JUT_ASSERT(mpLightXY[0] != 0);
+    JUT_ASSERT(0, mpLightXY[0] != 0);
     mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     mpLightXY[0]->hide();
 
     mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL);
-    JUT_ASSERT(mpLightXY[1] != 0);
+    JUT_ASSERT(0, mpLightXY[1] != 0);
     mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     mpLightXY[1]->hide();
 
     mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL);
-    JUT_ASSERT(mpLightXY[2] != 0);
+    JUT_ASSERT(0, mpLightXY[2] != 0);
     mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4);
     mpLightXY[2]->hide();
 
     mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL);
-    JUT_ASSERT(mpBTextA != 0);
+    JUT_ASSERT(0, mpBTextA != 0);
 
     mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL);
-    JUT_ASSERT(mpBTextB != 0);
+    JUT_ASSERT(0, mpBTextB != 0);
 
     mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL);
-    JUT_ASSERT(mpBTextXY[0] != 0);
+    JUT_ASSERT(0, mpBTextXY[0] != 0);
 
     mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL);
-    JUT_ASSERT(mpBTextXY[1] != 0);
+    JUT_ASSERT(0, mpBTextXY[1] != 0);
 
     mpBTextXY[2] = NULL;
 
     mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL);
-    JUT_ASSERT(mpTextA != 0);
+    JUT_ASSERT(0, mpTextA != 0);
 
     mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL);
-    JUT_ASSERT(mpTextB != 0);
+    JUT_ASSERT(0, mpTextB != 0);
 
     mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL);
-    JUT_ASSERT(mpTextXY[2] != 0);
+    JUT_ASSERT(0, mpTextXY[2] != 0);
 
     mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL);
-    JUT_ASSERT(mpTextXY[0] != 0);
+    JUT_ASSERT(0, mpTextXY[0] != 0);
 
     mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL);
-    JUT_ASSERT(mpTextXY[1] != 0);
+    JUT_ASSERT(0, mpTextXY[1] != 0);
 
     mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL);
-    JUT_ASSERT(mpTextI != 0);
+    JUT_ASSERT(0, mpTextI != 0);
 
     mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL);
-    JUT_ASSERT(mpTextM != 0);
+    JUT_ASSERT(0, mpTextM != 0);
 
     static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'};
     static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0};
@@ -1120,14 +1121,14 @@ void dMeter2Draw_c::initButton() {
     for (int i = 0; i < 5; i++) {
         if (juji_i_tag[i] != 0) {
             mpJujiI[i] = new CPaneMgr(mpScreen, juji_i_tag[i], 0, NULL);
-            JUT_ASSERT(mpJujiI[i] != 0);
+            JUT_ASSERT(0, mpJujiI[i] != 0);
         } else {
             mpJujiI[i] = NULL;
         }
 
         if (juji_m_tag[i] != 0) {
             mpJujiM[i] = new CPaneMgr(mpScreen, juji_m_tag[i], 0, NULL);
-            JUT_ASSERT(mpJujiM[i] != 0);
+            JUT_ASSERT(0, mpJujiM[i] != 0);
         } else {
             mpJujiM[i] = NULL;
         }
@@ -1137,40 +1138,40 @@ void dMeter2Draw_c::initButton() {
     mpTextXY[1]->hide();
 
     mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL);
-    JUT_ASSERT(mpButtonParent != 0);
+    JUT_ASSERT(0, mpButtonParent != 0);
 
     mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonA != 0);
+    JUT_ASSERT(0, mpButtonA != 0);
 
     mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonB != 0);
+    JUT_ASSERT(0, mpButtonB != 0);
     field_0x730 = 1.0f;
 
     mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL);
-    JUT_ASSERT(mpButtonMidona != 0);
+    JUT_ASSERT(0, mpButtonMidona != 0);
     mButtonZAlpha = 0.0f;
     field_0x724 = 0.0f;
     field_0x738 = 0.0f;
     field_0x740 = 0;
 
     mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonXY[0] != 0);
+    JUT_ASSERT(0, mpButtonXY[0] != 0);
 
     mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonXY[1] != 0);
+    JUT_ASSERT(0, mpButtonXY[1] != 0);
 
     mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonXY[2] != 0);
+    JUT_ASSERT(0, mpButtonXY[2] != 0);
 
     mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL);
-    JUT_ASSERT(mpUzu != 0);
+    JUT_ASSERT(0, mpUzu != 0);
 
     ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource(
         'TIMG', dMeter2Info_getNumberTextureName(0));
     for (int i = 0; i < 2; i++) {
         for (int j = 0; j < 3; j++) {
             mpItemNumTex[i][j] = new J2DPicture(timg);
-            JUT_ASSERT(mpItemNumTex[i][j] != 0);
+            JUT_ASSERT(0, mpItemNumTex[i][j] != 0);
         }
     }
 
@@ -1217,7 +1218,7 @@ void dMeter2Draw_c::initButton() {
  */
 void dMeter2Draw_c::initButtonCross() {
     mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL);
-    JUT_ASSERT(mpButtonCrossParent != 0);
+    JUT_ASSERT(0, mpButtonCrossParent != 0);
 
     static_cast<J2DTextBox*>(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont());
     static_cast<J2DTextBox*>(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont());
@@ -2281,7 +2282,7 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP
         mpTextA->hide();
     }
 
-    JUT_ASSERT(std::strlen(mp_string) < (64));
+    JUT_ASSERT(0, std::strlen (mp_string) < (64));
 
     if (daPy_getPlayerActorClass()->getSumouMode()) {
         mpTextA->show();
@@ -2349,7 +2350,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
         }
     }
 
-    JUT_ASSERT(std::strlen(mp_string) < (64));
+    JUT_ASSERT(0, std::strlen (mp_string) < (64));
 
     for (int i = 0; i < 5; i++) {
         strcpy(static_cast<J2DTextBox*>(mpBText[i]->getPanePtr())->getStringPtr(), mp_string);
@@ -2435,7 +2436,7 @@ void dMeter2Draw_c::drawButtonZ(u8 i_action) {
         mpButtonMidona->show();
     }
 
-    JUT_ASSERT(std::strlen(mp_string) < (64));
+    JUT_ASSERT(0, std::strlen (mp_string) < (64));
 
     for (int i = 0; i < 5; i++) {
         strcpy(static_cast<J2DTextBox*>(mpXYText[i][2]->getPanePtr())->getStringPtr(), mp_string);
@@ -2499,7 +2500,7 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) {
 
 /* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */
 void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) {
-    JUT_ASSERT(i_no < SELECT_MAX_e);
+    JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
     static u64 const tag[] = {'item_x_n', 'item_y_n'};
 
@@ -2540,7 +2541,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_
             mpTextXY[i_no]->hide();
         }
 
-        JUT_ASSERT(std::strlen(mp_string) < (64));
+        JUT_ASSERT(0, std::strlen (mp_string) < (64));
 
         for (int i = 0; i < 5; i++) {
             strcpy(static_cast<J2DTextBox*>(mpXYText[i][i_no]->getPanePtr())->getStringPtr(),
@@ -3225,7 +3226,7 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) {
 /* 80219E98-8021A29C 2147D8 0404+00 0/0 1/1 0/0 .text setButtonIconAlpha__13dMeter2Draw_cFiUcUlb
  */
 void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) {
-    JUT_ASSERT(i_no < SELECT_MAX_e);
+    JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
     if (mpItemXY[i_no]->isVisible() || mpLightXY[i_no]->isVisible() ||
         mpButtonXY[i_no]->isVisible())
@@ -3420,7 +3421,7 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
 
 /* 8021A71C-8021A9C8 21505C 02AC+00 1/1 0/0 0/0 .text changeTextureItemXY__13dMeter2Draw_cFiUc */
 void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) {
-    JUT_ASSERT(i_no < SELECT_MAX_e);
+    JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
     if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) {
         i_itemNo = fpcNm_ITEM_BOW;
@@ -3519,7 +3520,7 @@ void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) {
 /* 8021AB84-8021AEC8 2154C4 0344+00 0/0 6/6 0/0 .text            setItemNum__13dMeter2Draw_cFUcUcUc
  */
 void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) {
-    JUT_ASSERT(i_button < SELECT_MAX_e);
+    JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
     if (i_num > i_max) {
         i_num = i_max;
@@ -3574,7 +3575,7 @@ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) {
 
 /* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text            drawItemNum__13dMeter2Draw_cFUcf */
 void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) {
-    JUT_ASSERT(i_button < SELECT_MAX_e);
+    JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
     if (i_alpha == 1.0f) {
         i_alpha = mpItemXY[i_button]->getAlphaRate();
@@ -3587,7 +3588,7 @@ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) {
 
 /* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */
 void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
-    JUT_ASSERT(i_button < SELECT_MAX_e);
+    JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
     CPaneMgr* pane = mpItemXY[i_button];
     f32 sp10[2] = {0.0f};

src/d/d_meter_haihai.cpp

@@ -24,15 +24,15 @@ dMeterHaihai_c::~dMeterHaihai_c() {
 /* 8020AF6C-8020B0F4 2058AC 0188+00 1/0 0/0 0/0 .text            _create__14dMeterHaihai_cFv */
 int dMeterHaihai_c::_create() {
     mpHaihaiScreen = new J2DScreen();
-    JUT_ASSERT(mpHaihaiScreen != 0);
+    JUT_ASSERT(0, mpHaihaiScreen != 0);
 
     bool fg =
         mpHaihaiScreen->setPriority("zelda_hihi_cursor.blo", 0x20000, dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpHaihaiScreen);
 
     mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL);
-    JUT_ASSERT(mpParent != 0);
+    JUT_ASSERT(0, mpParent != 0);
 
     OSInitFastCast();
     mpCursorBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(
@@ -370,4 +370,4 @@ void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) {
         mpHaihaiScreen->search('npc_l1')->setAnimation(i_bpk);
         mpHaihaiScreen->search('yaji_l')->setAnimation(i_bpk);
     }
-}
+}

src/d/d_meter_hakusha.cpp

@@ -31,25 +31,25 @@ int dMeterHakusha_c::_create() {
 
     for (int i = 0; i < 6; i++) {
         mpHakushaPos[i] = new CPaneMgr(field_0x004, haku_tag[i], 0, NULL);
-        JUT_ASSERT(mpHakushaPos[i] != 0);
+        JUT_ASSERT(0, mpHakushaPos[i] != 0);
     }
 
     mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL);
-    JUT_ASSERT(mpHakushaParent != 0);
+    JUT_ASSERT(0, mpHakushaParent != 0);
 
     mpHakushaScreen = new J2DScreen();
-    JUT_ASSERT(mpHakushaScreen != 0);
+    JUT_ASSERT(0, mpHakushaScreen != 0);
 
     bool fg = mpHakushaScreen->setPriority("zelda_game_image_hakusha_parts.blo", 0x20000,
                                            dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpHakushaScreen);
 
     mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL);
-    JUT_ASSERT(mpHakushaOn != 0);
+    JUT_ASSERT(0, mpHakushaOn != 0);
 
     mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL);
-    JUT_ASSERT(mpHakushaOff != 0);
+    JUT_ASSERT(0, mpHakushaOff != 0);
 
     mpHakushaOn->setAlphaRate(0.0f);
     mpHakushaOff->setAlphaRate(0.0f);
@@ -67,15 +67,15 @@ int dMeterHakusha_c::_create() {
     mHakushaNum = dMeter2Info_getHorseLifeCount();
 
     mpButtonScreen = new J2DScreen();
-    JUT_ASSERT(mpButtonScreen != 0);
+    JUT_ASSERT(0, mpButtonScreen != 0);
 
     fg = mpButtonScreen->setPriority("zelda_game_image_hakusha_a_btn.blo", 0x20000,
                                      dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpButtonScreen);
 
     mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL);
-    JUT_ASSERT(mpButtonA != 0);
+    JUT_ASSERT(0, mpButtonA != 0);
     mpButtonA->show();
     mpButtonA->setAlphaRate(0.0f);
 
@@ -353,4 +353,4 @@ int dMeterHakusha_c::getHakushaNum() {
     }
 
     return hakusha_num;
-}
+}

src/d/d_meter_string.cpp

@@ -48,10 +48,10 @@ int dMeterString_c::_create() {
     }
 
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive);
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     OSInitFastCast();
@@ -59,13 +59,13 @@ int dMeterString_c::_create() {
         JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive));
 
     mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL);
-    JUT_ASSERT(mpParentPane != 0);
+    JUT_ASSERT(0, mpParentPane != 0);
 
     mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL);
-    JUT_ASSERT(mpRootPane != 0);
+    JUT_ASSERT(0, mpRootPane != 0);
 
     mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL);
-    JUT_ASSERT(mpTextPane != 0);
+    JUT_ASSERT(0, mpTextPane != 0);
 
     static_cast<J2DTextBox*>(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont());
     static_cast<J2DTextBox*>(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont());
@@ -263,4 +263,4 @@ void dMeterString_c::drawPikari() {
 /* 8020FA88-8020FAB4 20A3C8 002C+00 1/1 0/0 0/0 .text            isLeadByte__14dMeterString_cFi */
 bool dMeterString_c::isLeadByte(int c) {
     return (c >= 0x81 && c <= 0x9F) || (c >= 0xE0 && c <= 0xFC);
-}
+}

src/d/d_msg_object.cpp

@@ -716,7 +716,7 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
     }
 
     if (i >= msgIndexCount) {
-        JUT_WARN(1937, "Message Index Not Exist!! %d", param_0)
+        JUT_WARN(1937, "Message Index Not Exist!! %d", param_1)
         rv = 612;
     }
     return rv;
@@ -1364,7 +1364,7 @@ void dMsgObject_c::talkStartInit() {
         mpTalkHeap->getTotalFreeSize();
         bool local_98 = false;
         if (mpOutFont == NULL) {
-            OS_REPORT("free size (0x%x)=====> %d\n", :mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize());
+            OS_REPORT("free size (0x%x)=====> %d\n", mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize());
             mpOutFont = new COutFont_c(0);
             JUT_ASSERT(3035, mpOutFont != 0);
             mpOutFont->createPane();

src/d/d_msg_scrn_3select.cpp

@@ -47,10 +47,10 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
     static u32 unkdata[9] = {0};
 
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0));
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     OSInitFastCast();
@@ -72,11 +72,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
     mBtkFrame = 0.0f;
 
     mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL);
-    JUT_ASSERT(mpSelectCursor != 0);
+    JUT_ASSERT(0, mpSelectCursor != 0);
     mpSelectCursor->setAlphaRate(0.0f);
 
     mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL);
-    JUT_ASSERT(mpParent != 0);
+    JUT_ASSERT(0, mpParent != 0);
 
     for (int i = 0; i < 3; i++) {
         mCursorPos[i].x = 0.0f;
@@ -84,46 +84,46 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
         mCursorPos[i].z = 0.0f;
 
         mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL);
-        JUT_ASSERT(mpSel_c[i] != 0);
+        JUT_ASSERT(0, mpSel_c[i] != 0);
         mpSel_c[i]->hide();
 
         mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL);
-        JUT_ASSERT(mpSelCld_c[i] != 0);
+        JUT_ASSERT(0, mpSelCld_c[i] != 0);
         mpSelCld_c[i]->getPanePtr()->setAnimation(mpAnmBtk);
 
         mpSelCldr_c[i] = new CPaneMgr(mpScreen, tag_name[i][2], 0, NULL);
-        JUT_ASSERT(mpSelCldr_c[i] != 0);
+        JUT_ASSERT(0, mpSelCldr_c[i] != 0);
         mpSelCldr_c[i]->getPanePtr()->setAnimation(mpAnmBtk);
 
         mpSelCldm_c[i] = new CPaneMgr(mpScreen, tag_name[i][3], 0, NULL);
-        JUT_ASSERT(mpSelCldm_c[i] != 0);
+        JUT_ASSERT(0, mpSelCldm_c[i] != 0);
         mpSelCldm_c[i]->getPanePtr()->setAnimation(mpAnmBpk);
 
         for (int j = 0; j < 5; j++) {
             mpSelCldw_c[j][i] = new CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL);
-            JUT_ASSERT(mpSelCldw_c[j][i] != 0);
+            JUT_ASSERT(0, mpSelCldw_c[j][i] != 0);
         }
 
         mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL);
-        JUT_ASSERT(mpSelPo_c[i] != 0);
+        JUT_ASSERT(0, mpSelPo_c[i] != 0);
         mpSelPo_c[i]->hide();
 
         mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL);
-        JUT_ASSERT(mpKahen_c[i] != 0);
+        JUT_ASSERT(0, mpKahen_c[i] != 0);
 
         mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL);
-        JUT_ASSERT(mpCursor_c[i] != 0);
+        JUT_ASSERT(0, mpCursor_c[i] != 0);
         mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0);
     }
 
     mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL);
-    JUT_ASSERT(mpTmSel_c[0] != 0);
+    JUT_ASSERT(0, mpTmSel_c[0] != 0);
 
     mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL);
-    JUT_ASSERT(mpTmSel_c[1] != 0);
+    JUT_ASSERT(0, mpTmSel_c[1] != 0);
 
     mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL);
-    JUT_ASSERT(mpTmSel_c[2] != 0);
+    JUT_ASSERT(0, mpTmSel_c[2] != 0);
 
     for (int i = 0; i < 3; i++) {
         ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, "");
@@ -229,17 +229,17 @@ bool dMsgScrn3Select_c::isSelect() {
 /* 80239C78-80239D08 2345B8 0090+00 0/0 5/5 0/0 .text setString__17dMsgScrn3Select_cFPcPcPc */
 void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) {
     if (mpTmSel_c[0] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(mpText0));
     }
 
     if (mpTmSel_c[1] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[1]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(mpText1));
     }
 
     if (mpTmSel_c[2] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[2]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(mpText2));
     }
 
@@ -259,17 +259,17 @@ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) {
 /* 80239D08-80239D98 234648 0090+00 0/0 5/5 0/0 .text setRubyString__17dMsgScrn3Select_cFPcPcPc */
 void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) {
     if (mpTmrSel_c[0] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(pText0));
     }
 
     if (mpTmrSel_c[1] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[1]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(pText1));
     }
 
     if (mpTmrSel_c[2] != NULL) {
-        JUT_ASSERT(((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() >
+        JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[2]->getPanePtr()))->getStringAllocByte() >
                    std::strlen(pText2));
     }
 

src/d/d_msg_scrn_arrow.cpp

@@ -7,10 +7,10 @@
 /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */
 dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
     bool fg =
         mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0));
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     OSInitFastCast();
@@ -25,10 +25,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mBpkFrame = 0.0f;
 
     mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL);
-    JUT_ASSERT(mpParent_c != 0);
+    JUT_ASSERT(0, mpParent_c != 0);
 
     mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL);
-    JUT_ASSERT(mpArw_c != 0);
+    JUT_ASSERT(0, mpArw_c != 0);
 
     mpArw_c->hide();
     mpArw_c->mPane->setAnimation(mpBck);
@@ -36,7 +36,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mpScreen->search('yajinexl')->setAnimation(mpBpk);
 
     mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL);
-    JUT_ASSERT(mpDot_c != 0);
+    JUT_ASSERT(0, mpDot_c != 0);
 
     mpDot_c->hide();
     mpScreen->search('yaj_end')->setAnimation(mpBpk);
@@ -140,4 +140,4 @@ void dMsgScrnArrow_c::dotAnimeMove() {
 
     mpBpk->setFrame(mBpkFrame);
     mpScreen->animation();
-}
+}

src/d/d_msg_scrn_jimaku.cpp

@@ -25,32 +25,32 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
     init();
 
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000,
                                     dComIfGp_getMsgCommonArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     mpLight_c = new dMsgScrnLight_c(0, param_0);
-    JUT_ASSERT(mpLight_c != 0);
+    JUT_ASSERT(0, mpLight_c != 0);
 
     void* mpBuf = heap->alloc(0x106A, 0x20);
-    JUT_ASSERT(mpBuf != 0);
+    JUT_ASSERT(0, mpBuf != 0);
     memset(mpBuf, 0, 0x106A);
     mCharInfoPtr = (CharInfo_c*)mpBuf;
 
     mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL);
-    JUT_ASSERT(mpPmP_c != 0);
+    JUT_ASSERT(0, mpPmP_c != 0);
     mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY);
     field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5];
     mpPmP_c->paneTrans(0.0f, field_0xcc);
 
     mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL);
-    JUT_ASSERT(mpTm_c[0] != 0);
+    JUT_ASSERT(0, mpTm_c[0] != 0);
 
     mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL);
-    JUT_ASSERT(mpTm_c[1] != 0);
+    JUT_ASSERT(0, mpTm_c[1] != 0);
 
     mpScreen->search('n_3line')->hide();
     mpScreen->search('n_3fline')->hide();
@@ -176,4 +176,4 @@ void dMsgScrnJimaku_c::fukiScale(f32 i_scale) {}
 void dMsgScrnJimaku_c::fukiTrans(f32 i_posX, f32 i_posY) {}
 
 /* 80244E34-80244E38 23F774 0004+00 1/0 0/0 0/0 .text            fontAlpha__16dMsgScrnJimaku_cFf */
-void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {}
+void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {}

src/d/d_msg_scrn_light.cpp

@@ -129,10 +129,10 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) {
     g_MsgScrnLight_HIO_c.updateColor(i_colorType);
 
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
     bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000,
                                     dComIfGp_getMain2DArchive());
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     OSInitFastCast();
@@ -146,7 +146,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) {
     mBpkFrame = 0.0f;
 
     mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL);
-    JUT_ASSERT(mpParent_c != 0);
+    JUT_ASSERT(0, mpParent_c != 0);
 
     mpParent_c->getPanePtr()->setAnimation(mpBck);
     mpParent_c->getPanePtr()->setAnimation(mpBpk);
@@ -283,4 +283,4 @@ void dMsgScrnLight_c::drawCommon(f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_sca
     }
 
     mAlpha = i_alpha;
-}
+}

src/d/d_name.cpp

@@ -1159,7 +1159,7 @@ SECTION_DATA extern void* __vt__7dName_c[3 + 3 /* padding */] = {
 /* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text            screenSet__7dName_cFv */
 void dName_c::screenSet() {
     nameIn.NameInScr = new J2DScreen();
-    JUT_ASSERT(nameIn.NameInScr != 0);
+    JUT_ASSERT(0, nameIn.NameInScr != 0);
 
     archive = dComIfGp_getNameResArchive();
     nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive);
@@ -1167,12 +1167,12 @@ void dName_c::screenSet() {
     nameIn.field_0x10 = nameIn.NameInScr->search('name_n');
 
     void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive);
-    JUT_ASSERT(bpk != 0);
+    JUT_ASSERT(0, bpk != 0);
     mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk);
     mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr);
 
     void* btk = JKRGetNameResource("zelda_player_name.btk", archive);
-    JUT_ASSERT(btk != 0);
+    JUT_ASSERT(0, btk != 0);
     mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk);
     mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr);
 
@@ -1246,7 +1246,7 @@ void dName_c::screenSet() {
     mCharRow = 0;
 
     mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL);
-    JUT_ASSERT(mSelIcon != 0);
+    JUT_ASSERT(0, mSelIcon != 0);
     mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f);
 
     Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0);

src/d/d_ovlp_fade.cpp

@@ -24,7 +24,7 @@ static int dOvlpFd_Draw(overlap1_class* i_this) {
 /* 80252184-802521F4 24CAC4 0070+00 1/1 0/0 0/0 .text            dOvlpFd_startFadeIn__Fi */
 static void dOvlpFd_startFadeIn(int param_0) {
     JUTFader* fader = JFWDisplay::getManager()->getFader();
-    JUT_ASSERT(fader != 0);
+    JUT_ASSERT(0, fader != 0);
 
     fader->setStatus(JUTFader::UNKSTATUS_0, 0);
     fader->setStatus(JUTFader::UNKSTATUS_0, -1);

src/d/d_resorce.cpp

@@ -356,7 +356,7 @@ int dRes_info_c::loadResource() {
                     strncpy(arcName, name_p, resNameLen);
                     arcName[resNameLen] = '\0';
 
-                    JKRHeap* parentHeap = JKRHeap::findFromRoot(JKRHeap::getCurrentHeap());
+                    JKRExpHeap* parentHeap = (JKRExpHeap*)JKRHeap::findFromRoot(JKRHeap::getCurrentHeap());
                     JUT_ASSERT(0x308, parentHeap != 0 && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap()));
 #ifdef DEBUG
                     char* heapName;
@@ -369,7 +369,7 @@ int dRes_info_c::loadResource() {
                     // ">>>>>>>>>>>>>>>>>> Pack Archive<%s> <%s>\n"
                     OSReport(">>>>>>>>>>>>>>>>>> パックアーカイブ<%s> <%s>\n", arcName, heapName);
 #endif
-                    if (parentHeap == (JKRHeap*)mDoExt_getGameHeap()) {
+                    if (parentHeap == (JKRExpHeap*)mDoExt_getGameHeap()) {
                         parentHeap = NULL;
                     }
 
@@ -507,12 +507,12 @@ void dRes_info_c::deleteArchiveRes() {
                     JKRArchive::SDIFileEntry* fileEntry = mArchive->findIdxResource(fileIndex);
                     u32 nameOffset = fileEntry->getNameOffset();
                     char* fileName = mArchive->mStringTable + nameOffset;
-                    size_t nameLen = strlen(fileName) - 4;
+                    size_t resNameLen = strlen(fileName) - 4;
                     JUT_ASSERT(0x46C, resNameLen <= NAME_MAX);
 
                     char nameBuffer[12];
-                    strncpy(nameBuffer, fileName, nameLen);
-                    nameBuffer[nameLen] = '\0';
+                    strncpy(nameBuffer, fileName, resNameLen);
+                    nameBuffer[resNameLen] = '\0';
                     
                     int rt = dComIfG_deleteObjectResMain(nameBuffer);
                     JUT_ASSERT(0x470, rt);

src/d/d_save.cpp

@@ -659,7 +659,7 @@ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) {
 u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) {
     u8 bombBags = 0;
 
-    for (int i = 0; i < BOMB_BAG_MAX; i++) {
+    for (int i = 0; i < dSv_player_item_c::BOMB_BAG_MAX; i++) {
         if (i_itemNo == mItems[i + SLOT_15]) {
             bombBags++;
         }

src/d/d_shop_system.cpp

@@ -48,7 +48,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) {
             dShopSystem_item_count < dShopSystem_sellItemMax)
         {
             u8 i_posID = (fopAcM_GetParam(i_actor) >> 0x18) & 0xF;
-            JUT_ASSERT(i_posID <= dShopSystem_c::ITEM_MAX_e);
+            JUT_ASSERT(0, i_posID <= dShopSystem_c::ITEM_MAX_e);
 
             if (dShopSystem_itemActor[0] != i_actor && dShopSystem_itemActor[1] != i_actor &&
                 dShopSystem_itemActor[2] != i_actor && dShopSystem_itemActor[3] != i_actor &&

src/d/d_timer.cpp

@@ -34,7 +34,7 @@ int dTimer_c::_create() {
         }
 
         dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer");
-        JUT_ASSERT(resInfo != 0);
+        JUT_ASSERT(0, resInfo != 0);
         dComIfGp_setAllMapArchive(resInfo->getArchive());
 
         mp_heap = fopMsgM_createExpHeap(0x11000, NULL);
@@ -43,7 +43,7 @@ int dTimer_c::_create() {
             mp_heap->getTotalFreeSize();
 
             mp_tm_scrn = new dDlst_TimerScrnDraw_c();
-            JUT_ASSERT(mp_tm_scrn != 0);
+            JUT_ASSERT(0, mp_tm_scrn != 0);
 
             if (appen->timer_mode == 10) {
                 mp_tm_scrn->setScreen(dComIfG_getTimerMode(), resInfo->getArchive());
@@ -612,10 +612,10 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
     setShowType(3);
 
     mpGetInScreen = new J2DScreen();
-    JUT_ASSERT(mpGetInScreen != 0);
+    JUT_ASSERT(0, mpGetInScreen != 0);
 
     bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive);
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpGetInScreen);
 
     OSInitFastCast();
@@ -623,13 +623,13 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
         JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive));
 
     mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL);
-    JUT_ASSERT(mpGetInParent != 0);
+    JUT_ASSERT(0, mpGetInParent != 0);
 
     mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL);
-    JUT_ASSERT(mpGetInRoot != 0);
+    JUT_ASSERT(0, mpGetInRoot != 0);
 
     mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL);
-    JUT_ASSERT(mpGetInText != 0);
+    JUT_ASSERT(0, mpGetInText != 0);
 
     static_cast<J2DTextBox*>(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont());
     static_cast<J2DTextBox*>(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont());
@@ -652,24 +652,24 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
 /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::setScreenBase() {
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive);
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     mpParent = NULL;
 
     mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL);
-    JUT_ASSERT(mpCowParent != 0);
+    JUT_ASSERT(0, mpCowParent != 0);
     mpCowParent->setAlphaRate(0.0f);
 
     mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL);
-    JUT_ASSERT(mpTimeParent != 0);
+    JUT_ASSERT(0, mpTimeParent != 0);
     mpTimeParent->setAlphaRate(0.0f);
 
     mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL);
-    JUT_ASSERT(mpImageParent != 0);
+    JUT_ASSERT(0, mpImageParent != 0);
     mpImageParent->setAlphaRate(0.0f);
 
     field_0x5c[0][0] = mpScreen->search('c_n_2');
@@ -700,23 +700,23 @@ void dDlst_TimerScrnDraw_c::setScreenBase() {
  */
 void dDlst_TimerScrnDraw_c::setScreenBoatRace() {
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_game_image_zora_kawakudari.blo", 0x20000, mpArchive);
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     mpParent = new CPaneMgr(mpScreen, 'ta_co_n', 2, NULL);
-    JUT_ASSERT(mpParent != 0);
+    JUT_ASSERT(0, mpParent != 0);
 
     mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL);
-    JUT_ASSERT(mpCowParent != 0);
+    JUT_ASSERT(0, mpCowParent != 0);
     mpCowParent->setAlphaRate(0.0f);
 
     mpTimeParent = NULL;
 
     mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL);
-    JUT_ASSERT(mpImageParent != 0);
+    JUT_ASSERT(0, mpImageParent != 0);
     mpImageParent->setAlphaRate(0.0f);
 
     mpScreen->search('w_target')->hide();
@@ -743,22 +743,22 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() {
 /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::setScreenRider() {
     mpScreen = new J2DScreen();
-    JUT_ASSERT(mpScreen != 0);
+    JUT_ASSERT(0, mpScreen != 0);
 
     bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive);
-    JUT_ASSERT(fg != false);
+    JUT_ASSERT(0, fg != false);
     dPaneClass_showNullPane(mpScreen);
 
     mpParent = NULL;
 
     mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL);
-    JUT_ASSERT(mpCowParent != 0);
+    JUT_ASSERT(0, mpCowParent != 0);
     mpCowParent->setAlphaRate(0.0f);
 
     mpTimeParent = NULL;
 
     mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL);
-    JUT_ASSERT(mpImageParent != 0);
+    JUT_ASSERT(0, mpImageParent != 0);
     mpImageParent->setAlphaRate(0.0f);
 
     field_0x5c[0][0] = mpScreen->search('n_n_2');
@@ -1684,4 +1684,4 @@ extern msg_process_profile_definition g_profile_TIMER = {
     &g_fopMsg_Method,
     768,
     &l_dTimer_Method,
-};
+};