Use FALSE macro in asserts, remove JUT_PANIC macro

14 files changed, 22 insertions, 22 deletions

diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 9116d346..180ad255 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -209,7 +209,7 @@ BOOL daMbdoor_c::CreateInit() {
     s32 type = getType();
     
     if (dComIfG_Bgsp()->Regist(mpBgW, this)) {
-        JUT_ASSERT(334, 0);
+        JUT_ASSERT(334, FALSE);
     }
     field_0x2ac = true;
     tevStr.mRoomNo = current.roomNo;
diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp
index e22e61a5..df2129e4 100644
--- a/src/d/actor/d_a_mtoge.cpp
+++ b/src/d/actor/d_a_mtoge.cpp
@@ -72,7 +72,7 @@ BOOL daMtoge_c::CreateInit() {
     s32 sw = getSwbit();
 
     if (dComIfG_Bgsp()->Regist(mpBgW, this)) {
-        JUT_PANIC(0xA8);
+        JUT_ASSERT(0xA8, FALSE);
     }
 
     tevStr.mRoomNo = fopAcM_GetRoomNo(this);
diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp
index 72e2cc31..fd6a1a4d 100644
--- a/src/d/actor/d_a_obj_AjavW.cpp
+++ b/src/d/actor/d_a_obj_AjavW.cpp
@@ -30,7 +30,7 @@ bool daObjAjavW_c::create_heap() {
     J3DAnmTextureSRTKey * pBtk = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes(l_arcname, AJAVW_BTK_AJAVW);
 
     if (!pModelData || !pBtk) {
-        JUT_ASSERT(0xa7, 0);
+        JUT_ASSERT(0xa7, FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp
index 66b414b9..99ae6f41 100644
--- a/src/d/actor/d_a_obj_Vteng.cpp
+++ b/src/d/actor/d_a_obj_Vteng.cpp
@@ -40,7 +40,7 @@ bool daObjVteng_c::create_heap() {
     J3DAnmTransform * pAnm = (J3DAnmTransform *)dComIfG_getObjectRes(l_arcname, VTENG_BCK_VTENG);
 
     if (!pModelData || !pAnm) {
-        JUT_ASSERT(0xb7, 0);
+        JUT_ASSERT(0xb7, FALSE);
         ret = false;
     } else {
         mpMorf = new mDoExt_McaMorf(
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 952cd26b..f4d4c236 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -43,7 +43,7 @@ bool daObjYgush00_c::create_heap() {
     J3DAnmTransform * pBck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, bck_table[mType]));
 
     if (!pModelData || !pBtk || !pBck) {
-        JUT_ASSERT(207, 0);
+        JUT_ASSERT(207, FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000222);
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 6753fc3f..4cb976e4 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -104,7 +104,7 @@ bool daObjBarrier_anm_c::init() {
     J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YCAGE00));
 
     if (modelData == NULL || pbtk == NULL || pbrk == NULL) {
-        JUT_PANIC(407);
+        JUT_ASSERT(407, FALSE);
         rt = false;
     } else {
         mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x1000200);
@@ -407,7 +407,7 @@ bool daObjBarrier_ef_c::init() {
     J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00));
 
     if (modelData == NULL || pbtk == NULL || pbck == NULL || pbrk == NULL) {
-        JUT_PANIC(1016);
+        JUT_ASSERT(1016, FALSE);
         rt = false;
     } else {
         for (int i = 0; i < 4; i++) {
diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp
index c20f6176..15996f59 100644
--- a/src/d/actor/d_a_obj_ganonbed.cpp
+++ b/src/d/actor/d_a_obj_ganonbed.cpp
@@ -37,7 +37,7 @@ bool daObjGbed_c::create_heap() {
     J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, GBED_BDL_K_GBED));
 
     if (!pModelData) {
-        JUT_ASSERT(0xb1, 0);
+        JUT_ASSERT(0xb1, FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp
index a419784c..c3329728 100644
--- a/src/d/actor/d_a_obj_gryw00.cpp
+++ b/src/d/actor/d_a_obj_gryw00.cpp
@@ -97,7 +97,7 @@ int daObjGryw00_c::CreateHeap() {
     J3DAnmTextureSRTKey* pbtk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00));
     J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, GRYW00_BCK_GRYW00));
     if (!mdlData || !pbtk || !pbck) {
-        JUT_PANIC(409);
+        JUT_ASSERT(409, FALSE);
         ret = FALSE;
     } else {
         mpModel = mDoExt_J3DModel__create(mdlData, 0x80000U, 0x11000222U);
diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp
index cf1d1e5c..b18d1afc 100644
--- a/src/d/actor/d_a_obj_hfuck1.cpp
+++ b/src/d/actor/d_a_obj_hfuck1.cpp
@@ -69,7 +69,7 @@ bool daObjHfuck1_c::create_heap() {
     J3DModelData* pModelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcname, HFUCK1_BDL_HFUCK1));
 
     if (!pModelData) {
-        JUT_ASSERT(0xf5, 0);
+        JUT_ASSERT(0xf5, FALSE);
         ret = false;
     } else {
         mpModel = mDoExt_J3DModel__create(pModelData, 0x80000, 0x11000022);
diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc
index 36172926..42d8b730 100644
--- a/src/d/actor/d_a_player_fan.inc
+++ b/src/d/actor/d_a_player_fan.inc
@@ -92,7 +92,7 @@ void daPy_lk_c::setParachuteFanModel(f32 f31) {
         0x00000000,
         0x11020203
     );
-    if (mpParachuteFanMorf == NULL || mpParachuteFanMorf->getModel() == NULL) { JUT_ASSERT(323, 0); }
+    if (mpParachuteFanMorf == NULL || mpParachuteFanMorf->getModel() == NULL) { JUT_ASSERT(323, FALSE); }
     
     mpEquipItemModel = mpParachuteFanMorf->getModel();
     mDoExt_setCurrentHeap(oldHeap);
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index a15c25ad..e1dc0f31 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -3864,7 +3864,7 @@ BOOL daPy_lk_c::createHeap() {
     tmp_modelData = initModel(&mpSwgripmsModel, LINK_BDL_SWGRIPMS, 0x37221222);
     bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_SWGRIPMSAB);
     ret = mSwgripmsabBckAnim.init(mpSwgripmsModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false);
-    if (!ret) { JUT_ASSERT(21046, 0); }
+    if (!ret) { JUT_ASSERT(21046, FALSE); }
     mpTswgripmsabBrk = entryBrk(tmp_modelData, LINK_BRK_TSWGRIPMSAB);
     mpTswgripmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSWGRIPMS);
     
@@ -3873,13 +3873,13 @@ BOOL daPy_lk_c::createHeap() {
     tmp_modelData = initModel(&mpShaModel, LINK_BDL_SHA, 0x37221222);
     bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_ATNGSHA);
     ret = mAtngshaBck.init(mpShaModel->getModelData(), bck, false, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
-    if (!ret) { JUT_ASSERT(21063, 0); }
+    if (!ret) { JUT_ASSERT(21063, FALSE); }
     
     tmp_modelData = initModel(&mpShmsModel, LINK_BDL_SHMS, 0x37221222);
     mpTshmsBtk = entryBtk(tmp_modelData, LINK_BTK_TSHMS);
     J3DSkinDeform* shmsSkinDeform = new J3DSkinDeform();
-    if (!shmsSkinDeform) { JUT_ASSERT(21077, 0); }
-    if (mpShmsModel->setSkinDeform(shmsSkinDeform, 1) != J3DErrType_Success ) { JUT_ASSERT(21080, 0); }
+    if (!shmsSkinDeform) { JUT_ASSERT(21077, FALSE); }
+    if (mpShmsModel->setSkinDeform(shmsSkinDeform, 1) != J3DErrType_Success ) { JUT_ASSERT(21080, FALSE); }
     
     tmp_modelData = initModel(&mpYmsls00Model, LINK_BDL_YMSLS00, 0x13000222);
     mpYmsls00Btk = entryBtk(tmp_modelData, LINK_BTK_YMSLS00);
@@ -3893,7 +3893,7 @@ BOOL daPy_lk_c::createHeap() {
     tmp_modelData = initModel(&mpYuchw00Model, LINK_BDL_YUCHW00, 0x13000222);
     bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, LINK_BCK_YUCHW00);
     ret = mYuchw00Bck.init(tmp_modelData, bck, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false);
-    if (!ret) { JUT_ASSERT(21113, 0); }
+    if (!ret) { JUT_ASSERT(21113, FALSE); }
     mpYuchw00Btk = entryBtk(tmp_modelData, LINK_BTK_YUCHW00);
     mpYuchw00Brk = entryBrk(tmp_modelData, LINK_BRK_YUCHW00);
     mpYuchw00Brk->setFrame(mpYuchw00Brk->getFrameMax()-0.001f);
@@ -3913,14 +3913,14 @@ BOOL daPy_lk_c::createHeap() {
     mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00);
     brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YAURA00_R);
     ret = mYaura00rBrk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
-    if (!ret) { JUT_ASSERT(21147, 0); }
+    if (!ret) { JUT_ASSERT(21147, FALSE); }
     mYaura00rBrk.entryFrame(0.0f);
     
     tmp_modelData = initModel(&mpYmgcs00Model, LINK_BDL_YMGCS00, 0x11001222);
     mpYmgcs00Btk = entryBtk(tmp_modelData, LINK_BTK_YMGCS00);
     brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, LINK_BRK_YMGCS00_MS);
     ret = mYmgcs00Brk.init(tmp_modelData, brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
-    if (!ret) { JUT_ASSERT(21161, 0); }
+    if (!ret) { JUT_ASSERT(21161, FALSE); }
     mYmgcs00Brk.entryFrame(0.0f);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_BOMB));
@@ -4031,7 +4031,7 @@ J3DAnmTevRegKey* daPy_lk_c::entryBrk(J3DModelData*, int) {
 /* 80124C98-80125CC8       .text playerInit__9daPy_lk_cFv */
 void daPy_lk_c::playerInit() {
     if (!fopAcM_entrySolidHeap(this, daPy_createHeap, 0xB0000)) {
-        JUT_ASSERT(0x53B6, 0);
+        JUT_ASSERT(0x53B6, FALSE);
     }
     
     fopAcM_SetMtx(this, mpCLModel->getBaseTRMtx());
diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc
index 527e7cdb..d83af017 100644
--- a/src/d/actor/d_a_player_sword.inc
+++ b/src/d/actor/d_a_player_sword.inc
@@ -60,7 +60,7 @@ void daPy_lk_c::setSwordModel(BOOL r28) {
     const sword_model_tbl_s& model_tbl = checkNormalSwordEquip() ? sword_model_tbl[0] : sword_model_tbl[1];
     J3DModelData* modelData = initModel(&mpEquipItemModel, model_tbl.bladeModel, 0x37221222);
     BOOL ret = mSwordAnim.init(modelData, bck, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false);
-    if (!ret) { JUT_ASSERT(86, 0); }
+    if (!ret) { JUT_ASSERT(86, FALSE); }
     
     if (!checkNormalSwordEquip()) {
         buffer = new(0x20) u8[0x400];
diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp
index bf215472..631e3a03 100644
--- a/src/d/actor/d_a_tag_island.cpp
+++ b/src/d/actor/d_a_tag_island.cpp
@@ -247,7 +247,7 @@ BOOL daTag_Island_c::demoProcTact_Af() {
             setFlag(0x02);
             fopAcM_orderChangeEventId(this, daPy_getPlayerLinkActorClass(), mEventId, 0, 0xFFFF);
         } else {
-            JUT_ASSERT(0x1b3, 0);
+            JUT_ASSERT(0x1b3, FALSE);
             dComIfGp_evmng_cutEnd(mStaffId);
         }
     }
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 91ac7a8f..ecf784bc 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -528,7 +528,7 @@ void daTbox_c::CreateInit() {
                         mpAppearRegAnm->setFrame(30.0f);
                         break;
                     default:
-                        JUT_ASSERT(0x328, 0);
+                        JUT_ASSERT(0x328, FALSE);
                         break;
                 }