diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h
index 714bcb659..bc302239e 100644
--- a/include/JSystem/JFramework/JFWSystem.h
+++ b/include/JSystem/JFramework/JFWSystem.h
@@ -34,27 +34,27 @@ struct JFWSystem {
     static JKRExpHeap* getSystemHeap() { return systemHeap; }
     static JUTResFont* getSystemFont() { return systemFont; }
     static void setMaxStdHeap(int max) {
-        JUT_ASSERT(47, sInitCalled == 0);
+        JUT_ASSERT(47, sInitCalled == FALSE);
         CSetUpParam::maxStdHeaps = max;
     }
     static void setSysHeapSize(u32 size) {
-        JUT_ASSERT(50, sInitCalled == 0);
+        JUT_ASSERT(50, sInitCalled == FALSE);
         CSetUpParam::sysHeapSize = size;
     }
     static void setFifoBufSize(u32 size) {
-        JUT_ASSERT(53, sInitCalled == 0);
+        JUT_ASSERT(53, sInitCalled == FALSE);
         CSetUpParam::fifoBufSize = size;
     }
     static void setAramAudioBufSize(u32 size) {
-        JUT_ASSERT(58, sInitCalled == 0);
+        JUT_ASSERT(58, sInitCalled == FALSE);
         CSetUpParam::aramAudioBufSize = size;
     }
     static void setAramGraphBufSize(u32 size) {
-        JUT_ASSERT(61, sInitCalled == 0);
+        JUT_ASSERT(61, sInitCalled == FALSE);
         CSetUpParam::aramGraphBufSize = size;
     }
     static void setRenderMode(GXRenderModeObj* p_modeObj) {
-        JUT_ASSERT(80, sInitCalled == 0);
+        JUT_ASSERT(80, sInitCalled == FALSE);
         CSetUpParam::renderMode = p_modeObj;
     }
 
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
index a99621a63..717ec3600 100644
--- a/include/d/d_demo.h
+++ b/include/d/d_demo.h
@@ -52,11 +52,11 @@ class dDemo_actor_c : public JStage::TActor {
     void JSGSetTextureAnimation(u32);
     void JSGSetTextureAnimationFrame(f32);
     s32 JSGFindNodeID(const char* name) const {
-        JUT_ASSERT(0x4d, mModel != 0);
+        JUT_ASSERT(0x4d, mModel != NULL);
         return mModel->getModelData()->getJointName()->getIndex(name);
     }
     int JSGGetNodeTransformation(u32 no, Mtx dst) const {
-        JUT_ASSERT(0x52, mModel != 0);
+        JUT_ASSERT(0x52, mModel != NULL);
         cMtx_copy(mModel->getAnmMtx((u16)no), dst);
         return 1;
     }
diff --git a/src/JSystem/JAudio/JASBNKParser.cpp b/src/JSystem/JAudio/JASBNKParser.cpp
index 195008403..8e702a10a 100644
--- a/src/JSystem/JAudio/JASBNKParser.cpp
+++ b/src/JSystem/JAudio/JASBNKParser.cpp
@@ -32,7 +32,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
         TInst* instRaw = JSUConvertOffsetToPtr<TInst>(header, header->mInstOffsets[i]);
         if (instRaw != NULL) {
             TBasicInst* instp = new (heap, 0) TBasicInst();
-            JUT_ASSERT(56, instp != 0);
+            JUT_ASSERT(56, instp != NULL);
             instp->field_0x4 = instRaw->field_0x8;
             instp->field_0x8 = instRaw->field_0xC;
 
@@ -43,14 +43,14 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
                     TOscillator::Osc_* osc = findOscPtr(bank, header, oscRaw);
                     if (osc == NULL) {
                         osc = new (heap, 0) TOscillator::Osc_();
-                        JUT_ASSERT(72, osc != 0);
+                        JUT_ASSERT(72, osc != NULL);
                         osc->field_0x0 = oscRaw->field_0x0;
                         osc->field_0x4 = oscRaw->field_0x4;
                         s16* oscTable = JSUConvertOffsetToPtr<s16>(header, oscRaw->field_0x8);
                         if (oscTable != NULL) {
                             s32 tableLength = getOscTableEndPtr(oscTable) - oscTable;
                             osc->table = new (heap, 0) s16[tableLength];
-                            JUT_ASSERT(82, osc->table != 0);
+                            JUT_ASSERT(82, osc->table != NULL);
                             Calc::bcopy(oscTable, osc->table, tableLength * sizeof(s16));
                         } else {
                             osc->table = NULL;
@@ -59,7 +59,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
                         if (oscTable != NULL) {
                             s32 tableLength = getOscTableEndPtr(oscTable) - oscTable;
                             osc->rel_table = new (heap, 0) s16[tableLength];
-                            JUT_ASSERT(94, osc->rel_table != 0);
+                            JUT_ASSERT(94, osc->rel_table != NULL);
                             Calc::bcopy(oscTable, osc->rel_table, tableLength * sizeof(s16));
                         } else {
                             osc->rel_table = NULL;
@@ -77,7 +77,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
                 TRand* randRaw = JSUConvertOffsetToPtr<TRand>(header, instRaw->mRandOffsets[j]);
                 if (randRaw != NULL) {
                     TInstRand* randp = new (heap, 0) TInstRand();
-                    JUT_ASSERT(120, randp != 0);
+                    JUT_ASSERT(120, randp != NULL);
                     randp->setTarget(randRaw->field_0x0);
                     randp->field_0x8 = randRaw->field_0x4;
                     randp->field_0xc = randRaw->field_0x8;
@@ -88,7 +88,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
                 TSense* senseRaw = JSUConvertOffsetToPtr<TSense>(header, instRaw->mSenseOffsets[j]);
                 if (senseRaw != NULL) {
                     TInstSense* sensep = new (heap, 0) TInstSense();
-                    JUT_ASSERT(133, sensep != 0);
+                    JUT_ASSERT(133, sensep != NULL);
                     sensep->setTarget(senseRaw->field_0x0);
                     sensep->setParams(senseRaw->field_0x1, senseRaw->field_0x2, senseRaw->field_0x4, senseRaw->field_0x8);
                     instp->setEffect(j + 2, sensep);
@@ -118,7 +118,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
         TPerc* percRaw = JSUConvertOffsetToPtr<TPerc>(header, header->mPercOffsets[i]);
         if (percRaw != NULL) {
             TDrumSet* setp = new (heap, 0) TDrumSet();
-            JUT_ASSERT(183, setp != 0);
+            JUT_ASSERT(183, setp != NULL);
             for (int j = 0; j < 0x80; j++) {
                 TPmap* pmapRaw = JSUConvertOffsetToPtr<TPmap>(header, percRaw->mPmapOffsets[j]);
                 if (pmapRaw != NULL) {
@@ -134,7 +134,7 @@ JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void* stream) {
                         TRand* randRaw = JSUConvertOffsetToPtr<TRand>(header, pmapRaw->mRandOffsets[k]);
                         if (randRaw != NULL) {
                             TInstRand* randp = new (heap, 0) TInstRand();
-                            JUT_ASSERT(207, randp != 0);
+                            JUT_ASSERT(207, randp != NULL);
                             randp->setTarget(randRaw->field_0x0);
                             randp->field_0x8 = randRaw->field_0x4;
                             randp->field_0xc = randRaw->field_0x8;
diff --git a/src/JSystem/JAudio/JASBankMgr.cpp b/src/JSystem/JAudio/JASBankMgr.cpp
index 56bb2941e..aff147352 100644
--- a/src/JSystem/JAudio/JASBankMgr.cpp
+++ b/src/JSystem/JAudio/JASBankMgr.cpp
@@ -24,9 +24,9 @@ u16* JASystem::BankMgr::sVir2PhyTable;
 void JASystem::BankMgr::init(int param_1) {
     u32 r31 = param_1 * 4;
     sBankArray = (TBank**)new (JASDram, 0) u8[r31];
-    JUT_ASSERT(69, sBankArray != 0);
+    JUT_ASSERT(69, sBankArray != NULL);
     sVir2PhyTable = new (JASDram, 0) u16[param_1];
-    JUT_ASSERT(72, sVir2PhyTable != 0);
+    JUT_ASSERT(72, sVir2PhyTable != NULL);
     Calc::bzero(sBankArray, r31);
     for (int i = 0; i < param_1; i++) {
         sVir2PhyTable[i] = 0xffffffff;
diff --git a/src/JSystem/JAudio/JASBasicBank.cpp b/src/JSystem/JAudio/JASBasicBank.cpp
index bf833a286..5afd1a261 100644
--- a/src/JSystem/JAudio/JASBasicBank.cpp
+++ b/src/JSystem/JAudio/JASBasicBank.cpp
@@ -23,7 +23,7 @@ JASystem::TBasicBank::~TBasicBank() {
 void JASystem::TBasicBank::setInstCount(u32 param_1) {
     delete[] mInstTable;
     mInstTable = new (getCurrentHeap(), 0) TInst*[param_1];
-    JUT_ASSERT(36, mInstTable != 0);
+    JUT_ASSERT(36, mInstTable != NULL);
     Calc::bzero(mInstTable, param_1 * 4);
     mInstCount = param_1;
 }
diff --git a/src/JSystem/JAudio/JASBasicInst.cpp b/src/JSystem/JAudio/JASBasicInst.cpp
index a19afc15b..2fb64ae97 100644
--- a/src/JSystem/JAudio/JASBasicInst.cpp
+++ b/src/JSystem/JAudio/JASBasicInst.cpp
@@ -95,7 +95,7 @@ int JASystem::TBasicInst::getKeymapIndex(int index) const {
 void JASystem::TBasicInst::setKeyRegionCount(u32 num) {
     delete[] mKeymap;
     mKeymap = new (TBank::getCurrentHeap(), 0) TKeymap[num];
-    JUT_ASSERT(140, mKeymap != 0);
+    JUT_ASSERT(140, mKeymap != NULL);
     mKeyRegionCount = num;
 }
 
@@ -108,7 +108,7 @@ void JASystem::TBasicInst::setEffectCount(u32 num) {
         return;
     }
     mEffect = new (TBank::getCurrentHeap(), 0) TInstEffect*[num];
-    JUT_ASSERT(157, mEffect != 0);
+    JUT_ASSERT(157, mEffect != NULL);
     Calc::bzero(mEffect, num * 4);
 }
 
@@ -128,7 +128,7 @@ void JASystem::TBasicInst::setOscCount(u32 num) {
         return;
     }
     mOsc = new (TBank::getCurrentHeap(), 0) TOscillator::Osc_*[num];
-    JUT_ASSERT(193, mOsc != 0);
+    JUT_ASSERT(193, mOsc != NULL);
     Calc::bzero(mOsc, num * 4);
 }
 
@@ -157,7 +157,7 @@ JASystem::TBasicInst::TKeymap::~TKeymap() {
 void JASystem::TBasicInst::TKeymap::setVeloRegionCount(u32 num) {
     delete[] mVelomap;
     mVelomap = new (TBank::getCurrentHeap(), 0) JASystem::TBasicInst::TVeloRegion[num];
-    JUT_ASSERT(244, mVelomap != 0);
+    JUT_ASSERT(244, mVelomap != NULL);
     mVeloRegionCount = num;
 }
 
diff --git a/src/JSystem/JAudio/JASBasicWaveBank.cpp b/src/JSystem/JAudio/JASBasicWaveBank.cpp
index d5add7c67..d1a12de74 100644
--- a/src/JSystem/JAudio/JASBasicWaveBank.cpp
+++ b/src/JSystem/JAudio/JASBasicWaveBank.cpp
@@ -43,7 +43,7 @@ void JASystem::TBasicWaveBank::setGroupCount(u32 param_1) {
     delete[] mWaveGroupArray;
     mWaveGroupCount = param_1;
     mWaveGroupArray = new (getCurrentHeap(), 0) TWaveGroup*[param_1];
-    JUT_ASSERT(58, mWaveGroupArray != 0);
+    JUT_ASSERT(58, mWaveGroupArray != NULL);
     for (int i = 0; i < mWaveGroupCount; i++) {
         mWaveGroupArray[i] = new (getCurrentHeap(), 0) TWaveGroup(this);
     }
@@ -53,7 +53,7 @@ void JASystem::TBasicWaveBank::setGroupCount(u32 param_1) {
 void JASystem::TBasicWaveBank::setWaveTableSize(u32 param_1) {
     delete[] mWaveTable;
     mWaveTable = new (getCurrentHeap(), 0) TWaveInfo*[param_1];
-    JUT_ASSERT(70, mWaveTable != 0);
+    JUT_ASSERT(70, mWaveTable != NULL);
     Calc::bzero(mWaveTable, param_1 * 4);
     mWaveCount = param_1;
 }
@@ -112,7 +112,7 @@ void JASystem::TBasicWaveBank::TWaveGroup::setWaveCount(u32 num) {
     delete[] mCtrlWaveArray;
     mWaveCount = num;
     mCtrlWaveArray = new (getCurrentHeap(), 0) TWaveInfo[num];
-    JUT_ASSERT(180, mCtrlWaveArray != 0);
+    JUT_ASSERT(180, mCtrlWaveArray != NULL);
     for (int i = 0; i < num; i++) {
         mCtrlWaveArray[i].mWaveHandle.mHeap = &mHeap;
         mCtrlWaveArray[i].mWaveHandle.mWaveInfo.field_0x24 = &field_0x4c;
diff --git a/src/JSystem/JAudio/JASCalc.cpp b/src/JSystem/JAudio/JASCalc.cpp
index d5e3034ee..09d80009a 100644
--- a/src/JSystem/JAudio/JASCalc.cpp
+++ b/src/JSystem/JAudio/JASCalc.cpp
@@ -15,9 +15,9 @@ f32* JASystem::Calc::JASC_DOL2TABLE;
 /* 8027A804-8027A9C8       .text initSinfT__Q28JASystem4CalcFv */
 void JASystem::Calc::initSinfT() {
     JASC_SINTABLE = new (JASDram, 0) f32[257];
-    JUT_ASSERT(49, JASC_SINTABLE != 0);
+    JUT_ASSERT(49, JASC_SINTABLE != NULL);
     JASC_DOL2TABLE = new (JASDram, 0) f32[257];
-    JUT_ASSERT(51, JASC_DOL2TABLE != 0);
+    JUT_ASSERT(51, JASC_DOL2TABLE != NULL);
     for (u32 i = 0; i < 257; i++) {
         JASC_SINTABLE[i] = sin((M_PI / 2) * i / 256.0f);
     }
diff --git a/src/JSystem/JAudio/JASCallback.cpp b/src/JSystem/JAudio/JASCallback.cpp
index e6e2eb4ad..6a3a3207f 100644
--- a/src/JSystem/JAudio/JASCallback.cpp
+++ b/src/JSystem/JAudio/JASCallback.cpp
@@ -17,7 +17,7 @@ bool JASystem::Kernel::callbackInit;
 void JASystem::Kernel::resetCallback() {
     if (callbackInit != true) {
         callList = (unk_callList*)new (JASDram, 0) unk_callList[maxCallbacksUser];
-        JUT_ASSERT(58, callList != 0);
+        JUT_ASSERT(58, callList != NULL);
         BOOL enable = OSDisableInterrupts();
         for (int i = 0; i < maxCallbacksUser; i++) {
             callList[i].field_0x0 = NULL;
diff --git a/src/JSystem/JAudio/JASCmdStack.cpp b/src/JSystem/JAudio/JASCmdStack.cpp
index 71e10166a..91a57de53 100644
--- a/src/JSystem/JAudio/JASCmdStack.cpp
+++ b/src/JSystem/JAudio/JASCmdStack.cpp
@@ -25,8 +25,8 @@ bool JASystem::Kernel::TPortCmd::addPortCmdOnce() {
 
 /* 8027D730-8027D7E8       .text setPortCmd__Q38JASystem6Kernel8TPortCmdFPFPQ38JASystem6Kernel9TPortArgs_vPQ38JASystem6Kernel9TPortArgs */
 bool JASystem::Kernel::TPortCmd::setPortCmd(void (*func)(JASystem::Kernel::TPortArgs*), JASystem::Kernel::TPortArgs* pargs) {
-    JUT_ASSERT(83, func != 0);
-    JUT_ASSERT(84, pargs != 0);
+    JUT_ASSERT(83, func != NULL);
+    JUT_ASSERT(84, pargs != NULL);
     field_0x8 = func;
     field_0xc = pargs;
     field_0x0 = NULL;
@@ -36,7 +36,7 @@ bool JASystem::Kernel::TPortCmd::setPortCmd(void (*func)(JASystem::Kernel::TPort
 /* 8027D7E8-8027D8A4       .text addPortCmd__Q38JASystem6Kernel8TPortCmdFPQ38JASystem6Kernel9TPortHead */
 bool JASystem::Kernel::TPortCmd::addPortCmd(JASystem::Kernel::TPortHead* phead) {
     /* Nonmatching */
-    JUT_ASSERT(105, phead != 0);
+    JUT_ASSERT(105, phead != NULL);
     BOOL enable = OSDisableInterrupts();
     if (field_0x0) {
         OSRestoreInterrupts(enable);
@@ -56,7 +56,7 @@ bool JASystem::Kernel::TPortCmd::addPortCmd(JASystem::Kernel::TPortHead* phead)
 
 /* 8027D8A4-8027D924       .text portCmdProcOnce__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
 void JASystem::Kernel::portCmdProcOnce(JASystem::Kernel::TPortHead* phead) {
-    JUT_ASSERT(223, phead != 0);
+    JUT_ASSERT(223, phead != NULL);
     while (true) {
         TPortCmd* cmd = getPortCmd(phead);
         if (!cmd) {
@@ -68,7 +68,7 @@ void JASystem::Kernel::portCmdProcOnce(JASystem::Kernel::TPortHead* phead) {
 
 /* 8027D924-8027D9A4       .text portCmdProcStay__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
 void JASystem::Kernel::portCmdProcStay(JASystem::Kernel::TPortHead* phead) {
-    JUT_ASSERT(245, phead != 0);
+    JUT_ASSERT(245, phead != NULL);
     TPortCmd* cmd = phead->field_0x0;
     while (true) {
         if (!cmd) {
@@ -81,7 +81,7 @@ void JASystem::Kernel::portCmdProcStay(JASystem::Kernel::TPortHead* phead) {
 
 /* 8027D9A4-8027DA0C       .text portHeadInit__Q28JASystem6KernelFPQ38JASystem6Kernel9TPortHead */
 void JASystem::Kernel::portHeadInit(JASystem::Kernel::TPortHead* phead) {
-    JUT_ASSERT(267, phead != 0);
+    JUT_ASSERT(267, phead != NULL);
     phead->field_0x0 = NULL;
     phead->field_0x4 = NULL;
 }
@@ -99,7 +99,7 @@ void JASystem::Kernel::portCmdInit() {
 JASystem::Kernel::TPortCmd* JASystem::Kernel::getPortCmd(JASystem::Kernel::TPortHead* phead) {
     TPortCmd* r31;
     TPortCmd* r30 = NULL;
-    JUT_ASSERT(311, phead != 0);
+    JUT_ASSERT(311, phead != NULL);
     r31 = phead->field_0x0;
     if (r31) {
         r30 = r31;
diff --git a/src/JSystem/JAudio/JASDSPInterface.cpp b/src/JSystem/JAudio/JASDSPInterface.cpp
index ce633615e..dd5c635de 100644
--- a/src/JSystem/JAudio/JASDSPInterface.cpp
+++ b/src/JSystem/JAudio/JASDSPInterface.cpp
@@ -67,7 +67,7 @@ void JASystem::DSPInterface::setupBuffer() {
 void JASystem::DSPInterface::initBuffer() {
     CH_BUF = new(JASDram, 0x20) DSPBuffer[64];
     FX_BUF = new(JASDram, 0x20) FXBuffer[4];
-    JUT_ASSERT(163, (CH_BUF != 0) && (FX_BUF != 0));
+    JUT_ASSERT(163, (CH_BUF != NULL) && (FX_BUF != NULL));
     for (u8 i = 0; i < 4; i++) {
         FX_BUF[i].setFXLine(NULL, NULL);
     }
diff --git a/src/JSystem/JAudio/JASDrumSet.cpp b/src/JSystem/JAudio/JASDrumSet.cpp
index 21474e3b1..32ee3fc0b 100644
--- a/src/JSystem/JAudio/JASDrumSet.cpp
+++ b/src/JSystem/JAudio/JASDrumSet.cpp
@@ -107,7 +107,7 @@ void JASystem::TDrumSet::TPerc::setEffectCount(u32 param_1) {
         return;
     }
     mEffect = new (TBank::getCurrentHeap(), 0) TInstEffect*[param_1];
-    JUT_ASSERT(146, mEffect != 0);
+    JUT_ASSERT(146, mEffect != NULL);
     Calc::bzero(mEffect, param_1 * 4);
 }
 
@@ -115,7 +115,7 @@ void JASystem::TDrumSet::TPerc::setEffectCount(u32 param_1) {
 void JASystem::TDrumSet::TPerc::setVeloRegionCount(u32 param_1) {
     delete[] mVelomap;
     mVelomap = new (TBank::getCurrentHeap(), 0) TBasicInst::TVeloRegion[param_1];
-    JUT_ASSERT(155, mVelomap != 0);
+    JUT_ASSERT(155, mVelomap != NULL);
     mVelomapCount = param_1;
 }
 
diff --git a/src/JSystem/JAudio/JASHardStream.cpp b/src/JSystem/JAudio/JASHardStream.cpp
index 95f07b31e..9125f065d 100644
--- a/src/JSystem/JAudio/JASHardStream.cpp
+++ b/src/JSystem/JAudio/JASHardStream.cpp
@@ -323,7 +323,7 @@ BOOL JASystem::HardStream::TControl::clearListOne() {
 
 /* 8027C67C-8027C710       .text setLastAddr__Q38JASystem10HardStream8TControlFP11DVDFileInfo */
 void JASystem::HardStream::TControl::setLastAddr(DVDFileInfo* finfo) {
-    JUT_ASSERT(906, finfo != 0);
+    JUT_ASSERT(906, finfo != NULL);
     field_0x44[field_0x4c] = finfo->start_address + finfo->length - 0x8000;
     field_0x4c ^= 1;
 }
diff --git a/src/JSystem/JAudio/JASHeapCtrl.cpp b/src/JSystem/JAudio/JASHeapCtrl.cpp
index 5734a2373..257a2eb34 100644
--- a/src/JSystem/JAudio/JASHeapCtrl.cpp
+++ b/src/JSystem/JAudio/JASHeapCtrl.cpp
@@ -30,7 +30,7 @@ void JASystem::Kernel::THeap::initRootHeap(void* ptr, u32 size, Type type) {
 
 /* 8027CD38-8027CF68       .text alloc__Q38JASystem6Kernel5THeapFPQ38JASystem6Kernel5THeapUl */
 bool JASystem::Kernel::THeap::alloc(THeap* mother, u32 param_2) {
-    JUT_ASSERT(118, mother != 0);
+    JUT_ASSERT(118, mother != NULL);
     OSLockMutex(&mMutex);
     if (isAllocated()) {
         OSReport("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n");
@@ -131,8 +131,8 @@ static void dummy(JASystem::Kernel::TDisposer* disposer) {
 
 /* 8027D088-8027D1FC       .text insertChild__Q38JASystem6Kernel5THeapFPQ38JASystem6Kernel5THeapPQ38JASystem6Kernel5THeapPvUlb */
 void JASystem::Kernel::THeap::insertChild(THeap* heap, THeap* next, void* param_3, u32 param_4, bool param_5) {
-    JUT_ASSERT(537, heap != 0);
-    JUT_ASSERT(538, next == 0 || &mTree == next->mTree.getParent());
+    JUT_ASSERT(537, heap != NULL);
+    JUT_ASSERT(538, next == NULL || &mTree == next->mTree.getParent());
     OSLockMutex(&mMutex);
     if (!param_5) {
         JSUTreeIterator<THeap> it;
diff --git a/src/JSystem/JAudio/JASSeqParser.cpp b/src/JSystem/JAudio/JASSeqParser.cpp
index 02c42cca2..7e4280bdb 100644
--- a/src/JSystem/JAudio/JASSeqParser.cpp
+++ b/src/JSystem/JAudio/JASSeqParser.cpp
@@ -107,7 +107,7 @@ int JASystem::TSeqParser::cmdWritePort(TTrack* track, u32* params) {
 int JASystem::TSeqParser::cmdParentWritePort(TTrack* track, u32* params) {
     /* Nonmatching */
     TTrack* parent = track->getParent();
-    JUT_ASSERT(452, parent != 0);
+    JUT_ASSERT(452, parent != NULL);
     parent->writePortAppDirect(params[0] & 0xf, params[1]);
     return 0;
 }
@@ -118,7 +118,7 @@ int JASystem::TSeqParser::cmdChildWritePort(TTrack* track, u32* params) {
     u8 param1 = JSULoByte(params[0]);
     u8 b1 = JSUHiNibble(param1);
     TTrack* child = track->getChild(b1);
-    JUT_ASSERT(462, child != 0);
+    JUT_ASSERT(462, child != NULL);
     child->writePortAppDirect(JSULoNibble(param1), params[1]);
     return 0;
 }
diff --git a/src/JSystem/JAudio/JASSimpleWaveBank.cpp b/src/JSystem/JAudio/JASSimpleWaveBank.cpp
index c3b29fb6b..cccbb4fd9 100644
--- a/src/JSystem/JAudio/JASSimpleWaveBank.cpp
+++ b/src/JSystem/JAudio/JASSimpleWaveBank.cpp
@@ -26,7 +26,7 @@ JASystem::TSimpleWaveBank::TWaveHandle::~TWaveHandle() {}
 void JASystem::TSimpleWaveBank::setWaveTableSize(u32 size) {
     delete[] mWaveTable;
     mWaveTable = new (getCurrentHeap(), 0) TWaveHandle[size];
-    JUT_ASSERT(34, mWaveTable != 0);
+    JUT_ASSERT(34, mWaveTable != NULL);
     mWaveCount = size;
 }
 
diff --git a/src/JSystem/JAudio/JASSystemHeap.cpp b/src/JSystem/JAudio/JASSystemHeap.cpp
index 748684ed4..5b8a32ae4 100644
--- a/src/JSystem/JAudio/JASSystemHeap.cpp
+++ b/src/JSystem/JAudio/JASSystemHeap.cpp
@@ -29,7 +29,7 @@ void* JASystem::Kernel::allocFromSysDram(u32 size) {
     void* ptr;
     BOOL enable = OSDisableInterrupts();
     ptr = new (JASDram, 0x20) u8[size];
-    JUT_ASSERT(79, ptr != 0);
+    JUT_ASSERT(79, ptr != NULL);
     OSRestoreInterrupts(enable);
     return ptr;
 }
diff --git a/src/JSystem/JAudio/JASTrack.cpp b/src/JSystem/JAudio/JASTrack.cpp
index c37fc0a7a..4ce8e3844 100644
--- a/src/JSystem/JAudio/JASTrack.cpp
+++ b/src/JSystem/JAudio/JASTrack.cpp
@@ -278,7 +278,7 @@ int JASystem::TTrack::noteOn(u8 param_1, s32 param_2, s32 param_3, s32 param_4,
         parent = parent->mParent;
     }
     if (field_0x37b == 4) {
-        JUT_ASSERT(527, mParent != 0);
+        JUT_ASSERT(527, mParent != NULL);
         if (r31 != &mParent->field_0xf8) {
             if (moveFreeChannel(r31, &mParent->field_0xf8, 1) != 1) {
                 OSReport("in Player (NOTE-MODE) ... ボイス借用に失敗しました！！ (%d)\n", r31->field_0x0);
diff --git a/src/JSystem/JAudio/JASWaveBankMgr.cpp b/src/JSystem/JAudio/JASWaveBankMgr.cpp
index 20f51845c..bf8b5a2b9 100644
--- a/src/JSystem/JAudio/JASWaveBankMgr.cpp
+++ b/src/JSystem/JAudio/JASWaveBankMgr.cpp
@@ -21,7 +21,7 @@ JASystem::TWaveBank** JASystem::WaveBankMgr::sWaveBank;
 void JASystem::WaveBankMgr::init(int param_1) {
     u32 size = param_1 * 4;
     sWaveBank = (TWaveBank**) new (JASDram, 0) u8[size];
-    JUT_ASSERT(39, sWaveBank != 0);
+    JUT_ASSERT(39, sWaveBank != NULL);
     Calc::bzero(sWaveBank, size);
     sTableSize = param_1;
 }
diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp
index 31d719591..a1bdcfec9 100644
--- a/src/JSystem/JFramework/JFWSystem.cpp
+++ b/src/JSystem/JFramework/JFWSystem.cpp
@@ -44,7 +44,7 @@ bool JFWSystem::sInitCalled = false;
 
 /* 80254DD0-80254E54       .text firstInit__9JFWSystemFv */
 void JFWSystem::firstInit() {
-    JUT_ASSERT(80, rootHeap == 0);
+    JUT_ASSERT(80, rootHeap == NULL);
 
     OSInit();
     DVDInit();
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index 284ce298d..783c33696 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -333,12 +333,12 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
 
     u32 szsBufferSize = JKRAram::getSzpBufferSize();
     szpBuf = (u8 *)JKRAllocFromSysHeap(szsBufferSize, 32);
-    JUT_ASSERT(VERSION_SELECT(1091, 1077, 1077), szpBuf != 0);
+    JUT_ASSERT(VERSION_SELECT(1091, 1077, 1077), szpBuf != NULL);
 
     szpEnd = szpBuf + szsBufferSize;
     if (offset != 0) {
         refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, 0);
-        JUT_ASSERT(VERSION_SELECT(1100, 1086, 1086), refBuf != 0);
+        JUT_ASSERT(VERSION_SELECT(1100, 1086, 1086), refBuf != NULL);
         refEnd = refBuf + 0x1120;
         refCurrent = refBuf;
     }
diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp
index 1510056be..c6be4b92d 100644
--- a/src/JSystem/JKernel/JKRAramArchive.cpp
+++ b/src/JSystem/JKernel/JKRAramArchive.cpp
@@ -254,7 +254,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
     case COMPRESSION_NONE:
         {
             buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20));
-            JUT_ASSERT(VERSION_SELECT(676, 662, 662), buffer != 0);
+            JUT_ASSERT(VERSION_SELECT(676, 662, 662), buffer != NULL);
             JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL);
             *out = buffer;
             return length;
diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp
index a22a21984..540e1ee44 100644
--- a/src/JSystem/JKernel/JKRArchivePub.cpp
+++ b/src/JSystem/JKernel/JKRArchivePub.cpp
@@ -271,7 +271,7 @@ void JKRArchive::removeResourceAll() {
 
 /* 802B89B8-802B8A54       .text removeResource__10JKRArchiveFPv */
 bool JKRArchive::removeResource(void* resource) {
-    JUT_ASSERT(VERSION_SELECT(755, 687, 687), resource != 0);
+    JUT_ASSERT(VERSION_SELECT(755, 687, 687), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
@@ -284,7 +284,7 @@ bool JKRArchive::removeResource(void* resource) {
 
 /* 802B8A54-802B8AE4       .text detachResource__10JKRArchiveFPv */
 bool JKRArchive::detachResource(void* resource) {
-    JUT_ASSERT(VERSION_SELECT(787, 719, 719), resource != 0);
+    JUT_ASSERT(VERSION_SELECT(787, 719, 719), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
@@ -296,7 +296,7 @@ bool JKRArchive::detachResource(void* resource) {
 
 /* 802B8AE4-802B8B6C       .text getResSize__10JKRArchiveCFPCv */
 u32 JKRArchive::getResSize(const void* resource) const {
-    JUT_ASSERT(VERSION_SELECT(814, 746, 746), resource != 0);
+    JUT_ASSERT(VERSION_SELECT(814, 746, 746), resource != NULL);
 
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
index e18e81555..ccfa563da 100644
--- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -249,14 +249,14 @@ static int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 file
     OSLockMutex(&decompMutex);
     u32 bufferSize = JKRDvdAramRipper::getSzpBufferSize();
     szpBuf = (u8*)JKRAllocFromSysHeap(bufferSize, 0x20);
-    JUT_ASSERT(VERSION_SELECT(703, 693, 693), szpBuf != 0);
+    JUT_ASSERT(VERSION_SELECT(703, 693, 693), szpBuf != NULL);
     szpEnd = szpBuf + bufferSize;
     refBuf = (u8*)JKRAllocFromSysHeap(0x1120, 0);
-    JUT_ASSERT(VERSION_SELECT(711, 701, 701), refBuf != 0);
+    JUT_ASSERT(VERSION_SELECT(711, 701, 701), refBuf != NULL);
     refEnd = refBuf + 0x1120;
     refCurrent = refBuf;
     dmaBuf = (u8*)JKRAllocFromSysHeap(0x100, 0x20);
-    JUT_ASSERT(VERSION_SELECT(720, 710, 710), dmaBuf != 0);
+    JUT_ASSERT(VERSION_SELECT(720, 710, 710), dmaBuf != NULL);
     dmaEnd = dmaBuf + 0x100;
     dmaCurrent = dmaBuf;
     srcFile = dvdFile;
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 372dbd34b..88b9f2d60 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -281,7 +281,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
         switch (fileCompression) {
         case COMPRESSION_NONE:
             buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
-            JUT_ASSERT(VERSION_SELECT(638, 631, 631), buffer != 0);
+            JUT_ASSERT(VERSION_SELECT(638, 631, 631), buffer != NULL);
 
             JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL,
                             JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL);
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index b3d18ff6f..7c1583807 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -221,12 +221,12 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3
     OSLockMutex(&decompMutex);
     int bufSize = JKRDvdRipper::getSzpBufferSize();
     szpBuf = (u8 *)JKRAllocFromSysHeap(bufSize, -0x20);
-    JUT_ASSERT(VERSION_SELECT(913, 884, 884), szpBuf != 0);
+    JUT_ASSERT(VERSION_SELECT(913, 884, 884), szpBuf != NULL);
 
     szpEnd = szpBuf + bufSize;
     if (inFileOffset != 0) {
         refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, -4);
-        JUT_ASSERT(VERSION_SELECT(922, 893, 893), refBuf != 0);
+        JUT_ASSERT(VERSION_SELECT(922, 893, 893), refBuf != NULL);
         refEnd = refBuf + 0x1120;
         refCurrent = refBuf;
     } else {
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index e7892172a..7719fb517 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -952,7 +952,7 @@ static void dummy2() {
 
 /* 802B30A4-802B31D4       .text state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl */
 void JKRExpHeap::state_register(TState* p, u32 param_1) const {
-    JUT_ASSERT(2423, p != 0);
+    JUT_ASSERT(2423, p != NULL);
     JUT_ASSERT(2424, p->getHeap() == this);
     p->mId = param_1;
     if (param_1 <= 0xff) {
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index f32de3634..8af2e2ffd 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -130,7 +130,7 @@ void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
 }
 
 static void dummy1(JKRHeap* heap) {
-    JUT_ASSERT(0, heap != 0);
+    JUT_ASSERT(0, heap != NULL);
 }
 
 /* 802B0494-802B0518       .text alloc__7JKRHeapFUli */
@@ -420,7 +420,7 @@ static void dummy3() {
 
 /* 802B0D70-802B0E14       .text state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
 void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
-    JUT_ASSERT(VERSION_SELECT(1034, 1090, 1090), p != 0);
+    JUT_ASSERT(VERSION_SELECT(1034, 1090, 1090), p != NULL);
     JUT_ASSERT(VERSION_SELECT(1035, 1091, 1091), p->getHeap() == this);
 }
 
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index 3bf26df33..9674420cc 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -236,7 +236,7 @@ bool JKRSolidHeap::dump() {
 
 /* 802B3A68-802B3B4C       .text state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
 void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
-    JUT_ASSERT(VERSION_SELECT(610, 607, 607), p != 0);
+    JUT_ASSERT(VERSION_SELECT(610, 607, 607), p != NULL);
     JUT_ASSERT(VERSION_SELECT(611, 608, 608), p->getHeap() == this);
 
     getState_(p);
diff --git a/src/JSystem/JKernel/JKRStdHeap.cpp b/src/JSystem/JKernel/JKRStdHeap.cpp
index aa03a6633..0b95401c6 100644
--- a/src/JSystem/JKernel/JKRStdHeap.cpp
+++ b/src/JSystem/JKernel/JKRStdHeap.cpp
@@ -125,7 +125,7 @@ void* JKRStdHeap::do_getMaxFreeBlock() {
 
 /* 802B1338-802B13F0       .text state_register__10JKRStdHeapCFPQ27JKRHeap6TStateUl */
 void JKRStdHeap::state_register(JKRHeap::TState* p, u32 id) const {
-    JUT_ASSERT(370, p != 0);
+    JUT_ASSERT(370, p != NULL);
     JUT_ASSERT(371, p->getHeap() == this);
     setState_u32ID_(p, id);
     setState_uUsedSize_(p, 0);
diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp
index 382dd35fb..cc9c78405 100644
--- a/src/JSystem/JKernel/JKRThread.cpp
+++ b/src/JSystem/JKernel/JKRThread.cpp
@@ -85,7 +85,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
 
 /* 802B4050-802B40EC       .text createManager__15JKRThreadSwitchFP7JKRHeap */
 JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
-    JUT_ASSERT(184, sManager == 0);
+    JUT_ASSERT(184, sManager == NULL);
 
     if (!heap) {
         heap = JKRGetCurrentHeap();
diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp
index 444d6988e..f92986cb6 100644
--- a/src/JSystem/JParticle/JPAEmitterManager.cpp
+++ b/src/JSystem/JParticle/JPAEmitterManager.cpp
@@ -51,7 +51,7 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(const JGeometry::TVec3<
     /* Nonmatching - regalloc */
     JUT_ASSERT(0x56, groupID < 16);
     JUT_ASSERT(0x57, rmID < 8);
-    JUT_ASSERT(0x58, pResMgrArray[rmID] != 0);
+    JUT_ASSERT(0x58, pResMgrArray[rmID] != NULL);
 
     JPABaseEmitter* emtr;
     JPAEmitterData* emtrData;
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index 309772b8d..e4e5d235d 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -18,7 +18,7 @@ JUTConsoleManager* JUTConsoleManager::sManager;
 /* 802CA2FC-802CA3CC       .text create__10JUTConsoleFUiUiP7JKRHeap */
 JUTConsole* JUTConsole::create(uint param_0, uint maxLines, JKRHeap* p_heap) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
-    JUT_ASSERT(33, pManager != 0);
+    JUT_ASSERT(33, pManager != NULL);
 
     void* buffer = JKRAllocFromHeap(p_heap, getObjectSizeFromBufferSize(param_0, maxLines), 0);
     u8* tmpBuf = (u8*)buffer;
@@ -34,7 +34,7 @@ JUTConsole* JUTConsole::create(uint param_0, uint maxLines, JKRHeap* p_heap) {
 /* 802CA3CC-802CA4C8       .text create__10JUTConsoleFUiPvUl */
 JUTConsole* JUTConsole::create(uint param_0, void* buffer, u32 bufferSize) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
-    JUT_ASSERT(59, pManager != 0);
+    JUT_ASSERT(59, pManager != NULL);
     JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0);
     u32 maxLines = getLineFromObjectSize(bufferSize, param_0);
 
@@ -353,7 +353,7 @@ static void dummy2() {
 
 /* 802CB2E8-802CB380       .text createManager__17JUTConsoleManagerFP7JKRHeap */
 JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
-    JUT_ASSERT(922, sManager == 0);
+    JUT_ASSERT(922, sManager == NULL);
     if (pHeap == NULL) {
         pHeap = JKRHeap::sCurrentHeap;
     }
@@ -369,7 +369,7 @@ static void dummy3() {
 
 /* 802CB380-802CB4C4       .text appendConsole__17JUTConsoleManagerFP10JUTConsole */
 void JUTConsoleManager::appendConsole(JUTConsole* console) {
-    JUT_ASSERT(0x3bf, sManager != 0 && console != 0);
+    JUT_ASSERT(0x3bf, sManager != NULL && console != NULL);
 
     JUT_ASSERT(0x3c2, soLink_.Find( console ) == soLink_.end());
 
@@ -381,7 +381,7 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) {
 
 /* 802CB4C4-802CB674       .text removeConsole__17JUTConsoleManagerFP10JUTConsole */
 void JUTConsoleManager::removeConsole(JUTConsole* console) {
-    JUT_ASSERT(0x3d6, sManager != 0 && console != 0);
+    JUT_ASSERT(0x3d6, sManager != NULL && console != NULL);
     JUT_ASSERT(0x3d9, soLink_.Find( console ) != soLink_.end());
 
     if (mActiveConsole == console) {
diff --git a/src/JSystem/JUtility/JUTGba.cpp b/src/JSystem/JUtility/JUTGba.cpp
index 4bfbc577b..187ca7760 100644
--- a/src/JSystem/JUtility/JUTGba.cpp
+++ b/src/JSystem/JUtility/JUTGba.cpp
@@ -24,7 +24,7 @@ JUTGba* JUTGba::sManager;
 
 /* 802CBEB4-802CC03C       .text create__6JUTGbaFv */
 JUTGba* JUTGba::create() {
-    JUT_ASSERT(61, sManager == 0);
+    JUT_ASSERT(61, sManager == NULL);
     sManager = new JUTGba();
     GBAInit();
     OSReport(":::GBA: Init()\n");
@@ -82,8 +82,8 @@ int JUTGba::resultStatus_common(int param_1, u32 param_2, u8* oStatus) {
 
 /* 802CC0E8-802CC1F8       .text doJoyBoot__6JUTGbaFillPUcUlPFP11JUTGbaParamPv_vPv */
 void JUTGba::doJoyBoot(int param_1, s32 palette_color, s32 palette_speed, u8* program, u32 length, JUTGba_Func param_6, void* param_7) {
-    JUT_ASSERT(183, sManager != 0);
-    JUT_ASSERT(184, program != 0 && length != 0);
+    JUT_ASSERT(183, sManager != NULL);
+    JUT_ASSERT(184, program != NULL && length != 0);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->program = program;
     param->length = length;
@@ -97,7 +97,7 @@ void JUTGba::doJoyBoot(int param_1, s32 palette_color, s32 palette_speed, u8* pr
 
 /* 802CC1F8-802CC308       .text resultJoyBoot__6JUTGbaFiPUc */
 int JUTGba::resultJoyBoot(int param_1, u8* param_2) {
-    JUT_ASSERT(212, sManager != 0);
+    JUT_ASSERT(212, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     if (param->field_0x24 != 1) {
         return -1;
@@ -124,7 +124,7 @@ int JUTGba::resultJoyBoot(int param_1, u8* param_2) {
 
 /* 802CC308-802CC3A8       .text doInitProbe__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
 void JUTGba::doInitProbe(int param_1, JUTGba_Func param_2, void* param_3) {
-    JUT_ASSERT(255, sManager != 0);
+    JUT_ASSERT(255, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_2;
     param->field_0x50 = param_3;
@@ -134,13 +134,13 @@ void JUTGba::doInitProbe(int param_1, JUTGba_Func param_2, void* param_3) {
 
 /* 802CC3A8-802CC430       .text resultInitProbe__6JUTGbaFiPUl */
 int JUTGba::resultInitProbe(int param_1, u32* param_2) {
-    JUT_ASSERT(278, sManager != 0);
+    JUT_ASSERT(278, sManager != NULL);
     return result_common(param_1, 2, param_2);
 }
 
 /* 802CC430-802CC4D0       .text doProbe__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
 void JUTGba::doProbe(int param_1, JUTGba_Func param_2, void* param_3) {
-    JUT_ASSERT(287, sManager != 0);
+    JUT_ASSERT(287, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_2;
     param->field_0x50 = param_3;
@@ -150,13 +150,13 @@ void JUTGba::doProbe(int param_1, JUTGba_Func param_2, void* param_3) {
 
 /* 802CC4D0-802CC558       .text resultProbe__6JUTGbaFiPUl */
 BOOL JUTGba::resultProbe(int param_1, u32* param_2) {
-    JUT_ASSERT(310, sManager != 0);
+    JUT_ASSERT(310, sManager != NULL);
     return result_common(param_1, 3, param_2);
 }
 
 /* 802CC558-802CC5F8       .text doReset__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
 void JUTGba::doReset(int param_1, JUTGba_Func param_2, void* param_3) {
-    JUT_ASSERT(320, sManager != 0);
+    JUT_ASSERT(320, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_2;
     param->field_0x50 = param_3;
@@ -166,13 +166,13 @@ void JUTGba::doReset(int param_1, JUTGba_Func param_2, void* param_3) {
 
 /* 802CC5F8-802CC680       .text resultReset__6JUTGbaFiPUc */
 BOOL JUTGba::resultReset(int param_1, u8* param_2) {
-    JUT_ASSERT(340, sManager != 0);
+    JUT_ASSERT(340, sManager != NULL);
     return resultStatus_common(param_1, 4, param_2);
 }
 
 /* 802CC680-802CC728       .text doRead__6JUTGbaFiPUcPFP11JUTGbaParamPv_vPv */
 void JUTGba::doRead(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4) {
-    JUT_ASSERT(350, sManager != 0);
+    JUT_ASSERT(350, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_3;
     param->field_0x50 = param_4;
@@ -183,13 +183,13 @@ void JUTGba::doRead(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4
 
 /* 802CC728-802CC7B0       .text resultRead__6JUTGbaFiPUc */
 BOOL JUTGba::resultRead(int param_1, u8* param_2) {
-    JUT_ASSERT(371, sManager != 0);
+    JUT_ASSERT(371, sManager != NULL);
     return resultStatus_common(param_1, 5, param_2);
 }
 
 /* 802CC7B0-802CC858       .text doWrite__6JUTGbaFiPUcPFP11JUTGbaParamPv_vPv */
 void JUTGba::doWrite(int param_1, u8* param_2, JUTGba_Func param_3, void* param_4) {
-    JUT_ASSERT(381, sManager != 0);
+    JUT_ASSERT(381, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_3;
     param->field_0x50 = param_4;
@@ -200,13 +200,13 @@ void JUTGba::doWrite(int param_1, u8* param_2, JUTGba_Func param_3, void* param_
 
 /* 802CC858-802CC8E0       .text resultWrite__6JUTGbaFiPUc */
 BOOL JUTGba::resultWrite(int param_1, u8* param_2) {
-    JUT_ASSERT(403, sManager != 0);
+    JUT_ASSERT(403, sManager != NULL);
     return resultStatus_common(param_1, 6, param_2);
 }
 
 /* 802CC8E0-802CC980       .text doGetStatus__6JUTGbaFiPFP11JUTGbaParamPv_vPv */
 void JUTGba::doGetStatus(int param_1, JUTGba_Func param_2, void* param_3) {
-    JUT_ASSERT(413, sManager != 0);
+    JUT_ASSERT(413, sManager != NULL);
     JUTGbaParam* param = &sManager->mParams[param_1];
     param->field_0x4c = param_2;
     param->field_0x50 = param_3;
@@ -216,7 +216,7 @@ void JUTGba::doGetStatus(int param_1, JUTGba_Func param_2, void* param_3) {
 
 /* 802CC980-802CCA08       .text resultGetStatus__6JUTGbaFiPUc */
 BOOL JUTGba::resultGetStatus(int param_1, u8* param_2) {
-    JUT_ASSERT(434, sManager != 0);
+    JUT_ASSERT(434, sManager != NULL);
     return resultStatus_common(param_1, 7, param_2);
 }
 
diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp
index 0b22ce886..efe175e8d 100644
--- a/src/JSystem/JUtility/JUTNameTab.cpp
+++ b/src/JSystem/JUtility/JUTNameTab.cpp
@@ -28,7 +28,7 @@ void JUTNameTab::setResource(const ResNTAB* pNameTable) {
 }
 
 s32 JUTNameTab::getIndex(const char* pName) const {
-    JUT_ASSERT(101, mNameTable != 0);
+    JUT_ASSERT(101, mNameTable != NULL);
 
     const ResNTAB::Entry* pEntry = mNameTable->mEntries;
     u16 keyCode = calcKeyCode(pName);
@@ -42,7 +42,7 @@ s32 JUTNameTab::getIndex(const char* pName) const {
 }
 
 const char* JUTNameTab::getName(u16 index) const {
-    JUT_ASSERT(138, mNameTable != 0);
+    JUT_ASSERT(138, mNameTable != NULL);
 
     if (index < mNameNum)
         return mNameTable->getName(index);
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h
index dacf39977..44848f5cb 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h
@@ -16,7 +16,7 @@ typedef long ptrdiff_t;
 #define offsetof(type, member)	((size_t)&(((type*)0)->member))
 
 #ifndef NULL
-#define NULL (0)
+#define NULL 0
 #endif
 
 #ifdef __cplusplus
diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp
index bac3132c7..7434ca68c 100644
--- a/src/SSystem/SComponent/c_bg_w.cpp
+++ b/src/SSystem/SComponent/c_bg_w.cpp
@@ -752,7 +752,7 @@ void cBgW::GetTrans(cXyz* dst) const {
 
 /* 80249A58-80249B64       .text GetTriPnt__4cBgWCFiP4cXyzP4cXyzP4cXyz */
 void cBgW::GetTriPnt(int i_no, cXyz* p0, cXyz* p1, cXyz* p2) const {
-    JUT_ASSERT(0xcb3, pm_bgd != 0);
+    JUT_ASSERT(0xcb3, pm_bgd != NULL);
 
     cBgD_Tri_t * tri = &pm_bgd->m_t_tbl[i_no];
     p0->set(pm_vtx_tbl[tri->vtx0]);
diff --git a/src/SSystem/SComponent/c_xyz.cpp b/src/SSystem/SComponent/c_xyz.cpp
index 0fa538e63..012eea7ae 100644
--- a/src/SSystem/SComponent/c_xyz.cpp
+++ b/src/SSystem/SComponent/c_xyz.cpp
@@ -113,7 +113,7 @@ cXyz cXyz::normZC(void) const {
 
 /* 80245ADC-80245B80       .text normalize__4cXyzFv */
 cXyz cXyz::normalize(void) {
-    JUT_ASSERT(267, isNearZeroSquare() == 0);
+    JUT_ASSERT(267, isNearZeroSquare() == FALSE);
     VECNormalize(this, this);
     return *this;
 }
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index f39e7d154..4eb700f59 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -470,7 +470,7 @@ s32 cCc_Init() {
             continue;
 
         JUT_ASSERT(0x39, d.mKey < ARRAY_SIZE(DMC));
-        JUT_ASSERT(0x3a, DMC[d.mKey] == 0);
+        JUT_ASSERT(0x3a, DMC[d.mKey] == NULL);
 
         for (int j = 0; j < ARRAY_SIZE(DMC); j++) {
             if (DMC[j] != NULL) {
@@ -568,7 +568,7 @@ BOOL cDyl_InitCallback(void*) {
 void cDyl_InitAsync() {
     cCc_Init();
 
-    JUT_ASSERT(0x145, cDyl_DVD == 0);
+    JUT_ASSERT(0x145, cDyl_DVD == NULL);
     cDyl_DVD = mDoDvdThd_callback_c::create((mDoDvdThd_callback_func) cDyl_InitCallback, NULL);
 }
 
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index c77a0d167..8fd60345c 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -380,7 +380,7 @@ int daAgb_c::uploadSelect() {
             strcat(path, ".bin");
             l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, dMsg_getAgbWorkArea());
 #endif
-            JUT_ASSERT(VERSION_SELECT(591, 860, 861), l_gbaCommand != 0);
+            JUT_ASSERT(VERSION_SELECT(591, 860, 861), l_gbaCommand != NULL);
 
             mDoGaC_GbaReboot();
             mDoGaC_setPortNo(mPortNo);
@@ -396,7 +396,7 @@ int daAgb_c::uploadSelect() {
 int daAgb_c::uploadJoyboot1() {
     if (l_gbaCommand->sync()) {
         void* programp = l_gbaCommand->getMemAddress();
-        JUT_ASSERT(VERSION_SELECT(622, 891, 892), programp != 0);
+        JUT_ASSERT(VERSION_SELECT(622, 891, 892), programp != NULL);
 
         JUTGba::getManager()->doJoyBoot(mDoGaC_getPortNo(), 3, -1, (u8*)programp,
                                         l_gbaCommand->getMemSize() - 4, NULL, NULL);
@@ -456,7 +456,7 @@ int daAgb_c::uploadMessageLoad() {
         strcat(path, ".bin");
         l_gbaCommand = mDoDvdThd_toMainRam_c::create(path, 0, NULL);
 #endif
-        JUT_ASSERT(VERSION_SELECT(715, 1000, 1001), l_gbaCommand != 0);
+        JUT_ASSERT(VERSION_SELECT(715, 1000, 1001), l_gbaCommand != NULL);
 
         mUploadAction  = UpAct_UNK7;
         mDoGaC_onComEnable();
@@ -479,7 +479,7 @@ int daAgb_c::uploadMessageLoad2() {
 int daAgb_c::uploadConnect() {
     if (mDoGaC_getComEnable() && mDoGaC_GbaLink()) {
         void* programp = l_gbaCommand->getMemAddress();
-        JUT_ASSERT(VERSION_SELECT(760, 1045, 1046), programp != 0);
+        JUT_ASSERT(VERSION_SELECT(760, 1045, 1046), programp != NULL);
         mDoGac_SendDataSet((u32*)programp, l_gbaCommand->getMemSize(), 0, 0);
 
         mUploadAction  = UpAct_UNK8;
@@ -1720,7 +1720,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 800D396C-800D3B58       .text createHeap__7daAgb_cFv */
 int daAgb_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR);
-    JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != 0);
+    JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index ac020581e..eaff569ef 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -105,7 +105,7 @@ BOOL daArrow_c::_createHeap() {
         modelFileIndex = LINK_BDL_ARROW;
     }
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, modelFileIndex);
-    JUT_ASSERT(190, modelData != 0);
+    JUT_ASSERT(190, modelData != NULL);
     
     mpModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022);
     if (!mpModel) {
diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp
index 8a0dc5c40..714feaab0 100644
--- a/src/d/actor/d_a_arrow_iceeff.cpp
+++ b/src/d/actor/d_a_arrow_iceeff.cpp
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 BOOL daArrow_Iceeff_c::CreateHeap() {
     if(field_0xA38 == 0) {
         J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER00));
-        JUT_ASSERT(87, modelData != 0);
+        JUT_ASSERT(87, modelData != NULL);
         for(int i = 0; i < 30; i++) {
             field_0x298[i] = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
             if(field_0x298[i] == 0) {
@@ -30,14 +30,14 @@ BOOL daArrow_Iceeff_c::CreateHeap() {
     }
     else {
         J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GICER01));
-        JUT_ASSERT(98, modelData != 0);
+        JUT_ASSERT(98, modelData != NULL);
         mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
         if(mpModel == NULL) {
             return false;
         }
         
         J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Link", LINK_BCK_GICER01));
-        JUT_ASSERT(107, bck != 0);
+        JUT_ASSERT(107, bck != NULL);
         if(!mBck.init(modelData, bck, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
             return false;
         }
diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp
index 5dfb4dc05..842b7878c 100644
--- a/src/d/actor/d_a_arrow_lighteff.cpp
+++ b/src/d/actor/d_a_arrow_lighteff.cpp
@@ -89,7 +89,7 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
         modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_GARWG00));
     }
 
-    JUT_ASSERT(187, modelData != 0);
+    JUT_ASSERT(187, modelData != NULL);
 
     field_0x298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x3F441422);
     if(field_0x298 == 0) {
@@ -111,8 +111,8 @@ BOOL daArrow_Lighteff_c::CreateHeap() {
         brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Link", LINK_BRK_GARWG00));
     }
 
-    JUT_ASSERT(216, btk != 0);
-    JUT_ASSERT(217, brk != 0);
+    JUT_ASSERT(216, btk != NULL);
+    JUT_ASSERT(217, brk != NULL);
 
     if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
         return false;
diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp
index ddd28c7b5..e1df48dfe 100644
--- a/src/d/actor/d_a_bflower.cpp
+++ b/src/d/actor/d_a_bflower.cpp
@@ -122,7 +122,7 @@ BOOL daBFlower_c::CreateHeap() {
     }
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKH));
-    JUT_ASSERT(0x1B2, modelData != 0);
+    JUT_ASSERT(0x1B2, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL) {
@@ -130,7 +130,7 @@ BOOL daBFlower_c::CreateHeap() {
     }
 
     J3DAnmTransform* pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAHX));
-    JUT_ASSERT(0x1C3, pbck != 0);
+    JUT_ASSERT(0x1C3, pbck != NULL);
 
     if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, false)) {
         return FALSE;
@@ -138,7 +138,7 @@ BOOL daBFlower_c::CreateHeap() {
     mBck1.setFrame(mBck1.getEndFrame());
 
     J3DAnmTevRegKey* pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAHX));
-    JUT_ASSERT(0x1D9, pbrk != 0);
+    JUT_ASSERT(0x1D9, pbrk != NULL);
 
     if (!mBrk1.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
@@ -146,7 +146,7 @@ BOOL daBFlower_c::CreateHeap() {
     mBrk1.setPlaySpeed(0.0f);
 
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname, VBAKH_BDL_VBAKM));
-    JUT_ASSERT(0x1E7, modelData != 0);
+    JUT_ASSERT(0x1E7, modelData != NULL);
 
     mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel2 == NULL) {
@@ -154,7 +154,7 @@ BOOL daBFlower_c::CreateHeap() {
     }
 
     pbck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_arcname, VBAKH_BCK_VBAMX));
-    JUT_ASSERT(0x1F7, pbck != 0);
+    JUT_ASSERT(0x1F7, pbck != NULL);
 
     if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
         return FALSE;
@@ -162,7 +162,7 @@ BOOL daBFlower_c::CreateHeap() {
     mBck2.setPlaySpeed(0.0f);
 
     pbrk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arcname, VBAKH_BRK_VBAMX));
-    JUT_ASSERT(0x208, pbrk != 0);
+    JUT_ASSERT(0x208, pbrk != NULL);
 
     if (!mBrk2.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp
index 645b3e55c..8e3c5bd8a 100644
--- a/src/d/actor/d_a_bg.cpp
+++ b/src/d/actor/d_a_bg.cpp
@@ -344,7 +344,7 @@ s32 daBg_c::create() {
     JKRExpHeap * roomHeap = dStage_roomControl_c::getMemoryBlock(roomNo);
     if (roomHeap != NULL) {
         heap = JKRSolidHeap::create(-1, roomHeap, false);
-        JUT_ASSERT(0x2fd, heap != 0);
+        JUT_ASSERT(0x2fd, heap != NULL);
         JKRHeap * oldHeap = mDoExt_setCurrentHeap(heap);
         s32 rt = createHeap();
         JUT_ASSERT(0x302, rt == 1);
diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp
index 9ee9e8a77..f8b5f46dc 100644
--- a/src/d/actor/d_a_bita.cpp
+++ b/src/d/actor/d_a_bita.cpp
@@ -186,14 +186,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) {
         type = 1;
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bita", ita_bmd[type]);
-    JUT_ASSERT(0x23b, modelData != 0);
+    JUT_ASSERT(0x23b, modelData != NULL);
     J3DModel* model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (model == NULL)
         return FALSE;
     i_this->mpModel = model;
 
     modelData = (J3DModelData*)dComIfG_getObjectRes("Bita", ita_Ef_bmd[type]);
-    JUT_ASSERT(0x247, modelData != 0);
+    JUT_ASSERT(0x247, modelData != NULL);
     model = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (model == NULL)
         return FALSE;
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index 4a016b49e..9a2ecafd8 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -1068,7 +1068,7 @@ static void jyunkai(bk_class* i_this) {
                     }
                     if ((i_this->ppd->mNextPathId & 0xFFFF) != 0xFFFF) {
                         i_this->ppd = dPath_GetRoomPath(i_this->ppd->mNextPathId, fopAcM_GetRoomNo(i_this));
-                        JUT_ASSERT(2924, i_this->ppd != 0);
+                        JUT_ASSERT(2924, i_this->ppd != NULL);
                     }
                 } else if (i_this->m1216 < 0) {
                     i_this->m1217 = 1;
@@ -2489,7 +2489,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     
     J3DModelData* modelData;
     modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_KB);
-    JUT_ASSERT(9418, modelData != 0);
+    JUT_ASSERT(9418, modelData != NULL);
     if (i_this->m02D5 & 0x40) {
         J3DMaterialTable* bmt = (J3DMaterialTable*)dComIfG_getObjectRes("Bk", BK_BMT_BK_KEN);
         modelData->setMaterialTable(bmt, J3DMatCopyFlag_Material);
@@ -2508,13 +2508,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
     if (i_this->m02D4 != 0) {
         modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BMD_BK_TATE);
         i_this->m02D0 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
-        JUT_ASSERT(9445, modelData != 0);
+        JUT_ASSERT(9445, modelData != NULL);
     }
     
     if (i_this->m02DC != 0) {
         modelData = (J3DModelData*)dComIfG_getObjectRes("Bk", BK_BDL_BOUEN);
         i_this->m02D8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
-        JUT_ASSERT(9454, modelData != 0);
+        JUT_ASSERT(9454, modelData != NULL);
     }
     
     static Vec hip_offset[] = {
diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index 9ef8ab31a..023e02257 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -269,15 +269,15 @@ namespace daBomb2 {
         const char* resName = attr().resName;
 
         J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(attr().resName, VBAKH_BDL_VBAKM));
-        JUT_ASSERT(0x303, mdl_data != 0);
+        JUT_ASSERT(0x303, mdl_data != NULL);
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
 
         J3DAnmTransform* bck_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(resName, VBAKH_BCK_VBAKM));
-        JUT_ASSERT(0x30D, bck_data != 0);
+        JUT_ASSERT(0x30D, bck_data != NULL);
         int temp = mBck0.init(mdl_data, bck_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
 
         J3DAnmTevRegKey* brk_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(resName, VBAKH_BRK_VBAKM));
-        JUT_ASSERT(0x314, brk_data != 0);
+        JUT_ASSERT(0x314, brk_data != NULL);
         int temp3 = mBrk0.init(mdl_data, brk_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
 
         return mpModel && temp && temp3;
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index d3017414a..42c6bc58e 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -1280,30 +1280,30 @@ BOOL daBomb_c::createHeap() {
     BOOL ret;
     if(mType == 1) {
         J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BDL_VBAKM));
-        JUT_ASSERT(0x9A5, modelData != 0);
+        JUT_ASSERT(0x9A5, modelData != NULL);
         mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
         
         J3DAnmTransform* bck0_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAMX));
-        JUT_ASSERT(0x9AE, bck0_data != 0);
+        JUT_ASSERT(0x9AE, bck0_data != NULL);
         int temp = mBck0.init(modelData, bck0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
         
         J3DAnmTransform* bck1_data = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BCK_VBAKM));
-        JUT_ASSERT(0x9B4, bck1_data != 0);
+        JUT_ASSERT(0x9B4, bck1_data != NULL);
         int temp2 = mBck1.init(modelData, bck1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
         
         J3DAnmTevRegKey* brk0_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAMX));
-        JUT_ASSERT(0x9BB, brk0_data != 0);
+        JUT_ASSERT(0x9BB, brk0_data != NULL);
         int temp3 = mBrk0.init(modelData, brk0_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
         
         J3DAnmTevRegKey* brk1_data = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_attrType[mType].resName, VBAKH_BRK_VBAKM));
-        JUT_ASSERT(0x9C1, brk1_data != 0);
+        JUT_ASSERT(0x9C1, brk1_data != NULL);
         int temp4 = mBrk1.init(modelData, brk1_data, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
 
         return mpModel && temp && temp2 && temp3 && temp4;
     }
     else {
         J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_attrType[mType].resName, LINK_BDL_BOMB));
-        JUT_ASSERT(0x9CE, modelData != 0);
+        JUT_ASSERT(0x9CE, modelData != NULL);
         mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
 
         if(!mpModel) {
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp
index 8702f2895..85feaeb4e 100644
--- a/src/d/actor/d_a_branch.cpp
+++ b/src/d/actor/d_a_branch.cpp
@@ -72,9 +72,9 @@ int daBranch_c::CreateHeap() {
         J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes(m_arcname, bmd[i]));
         J3DAnmTransformKey* bckData = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectIDRes(m_arcname, bck[i]));
 
-        JUT_ASSERT(0x1CC, modelData != 0);
+        JUT_ASSERT(0x1CC, modelData != NULL);
         // Bug: They probably meant to assert that bckData isn't null, but accidentally used the array of bck file IDs.
-        JUT_ASSERT(0x1CD, bck != 0);
+        JUT_ASSERT(0x1CD, bck != NULL);
 
         mAnims[i] = new mDoExt_McaMorf(
             static_cast<J3DModelData*>(dComIfG_getObjectIDRes(m_arcname, bmd[i])),
diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp
index 172731c40..31a7819b5 100644
--- a/src/d/actor/d_a_dai_item.cpp
+++ b/src/d/actor/d_a_dai_item.cpp
@@ -185,7 +185,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
 /* 800E37B8-800E3AF8       .text CreateHeap__13daStandItem_cFv */
 BOOL daStandItem_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, m_bmdidx[mItemType]);
-    JUT_ASSERT(0x239, modelData != 0);
+    JUT_ASSERT(0x239, modelData != NULL);
 
     if (mItemNo == PRESIDENT_STATUE) {
         mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
@@ -198,7 +198,7 @@ BOOL daStandItem_c::CreateHeap() {
 
     if (m_bckidx[mItemType] != -1) {
         J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, m_bckidx[mItemType]);
-        JUT_ASSERT(0x250, pbck != 0);
+        JUT_ASSERT(0x250, pbck != NULL);
         mpBckAnm = new mDoExt_bckAnm();
 
         static const u32 playmode[12] = {
diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp
index 17ca46839..fdbc5966a 100644
--- a/src/d/actor/d_a_deku_item.cpp
+++ b/src/d/actor/d_a_deku_item.cpp
@@ -65,7 +65,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000000F0-000002C8       .text CreateHeap__12daDekuItem_cFv */
 BOOL daDekuItem_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, DEKU_BDL_VLFDM);
-    JUT_ASSERT(0xF4, modelData != 0);
+    JUT_ASSERT(0xF4, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
 
@@ -74,14 +74,14 @@ BOOL daDekuItem_c::CreateHeap() {
     }
 
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK);
-    JUT_ASSERT(0x103, pbck != 0);
+    JUT_ASSERT(0x103, pbck != NULL);
 
     if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) {
         return FALSE;
     }
 
     pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM);
-    JUT_ASSERT(0x110, pbck != 0);
+    JUT_ASSERT(0x110, pbck != NULL);
 
     if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) {
         return FALSE;
diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp
index eeb705039..bd97560bf 100644
--- a/src/d/actor/d_a_esa.cpp
+++ b/src/d/actor/d_a_esa.cpp
@@ -228,7 +228,7 @@ static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) {
     esa_class* i_this = static_cast<esa_class*>(i_actor);
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Link", LINK_BDL_ESA));
-    JUT_ASSERT(0x1E8, modelData != 0);
+    JUT_ASSERT(0x1E8, modelData != NULL);
     i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
 
     if(i_this->mpModel == NULL) {
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index 4b0b018d2..140b3e413 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -71,7 +71,7 @@ BOOL daFan_c::Delete() {
 /* 000000F0-0000040C       .text CreateHeap__7daFan_cFv */
 int daFan_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType]));
-    JUT_ASSERT(0x15e, modelData != 0);
+    JUT_ASSERT(0x15e, modelData != NULL);
 
     mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mModel == NULL)
@@ -79,23 +79,23 @@ int daFan_c::CreateHeap() {
     mModel->setUserArea((u32)this);
 
     modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00);
-    JUT_ASSERT(0x17f, modelData != 0);
+    JUT_ASSERT(0x17f, modelData != NULL);
     mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
     if (mWindModel == NULL)
         return FALSE;
 
     J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01);
-    JUT_ASSERT(400, pbtk != 0);
+    JUT_ASSERT(400, pbtk != NULL);
     if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false, 0))
         return FALSE;
 
     pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02);
-    JUT_ASSERT(0x19c, pbtk != 0);
+    JUT_ASSERT(0x19c, pbtk != NULL);
     if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0,-1, false, 0))
         return FALSE;
 
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00);
-    JUT_ASSERT(0x1a9, pbck != 0);
+    JUT_ASSERT(0x1a9, pbck != NULL);
     if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0,-1, false))
         return FALSE;
 
diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp
index a3ce87caa..ac1e874b1 100644
--- a/src/d/actor/d_a_floor.cpp
+++ b/src/d/actor/d_a_floor.cpp
@@ -36,7 +36,7 @@ BOOL daFloor_c::Delete() {
 /* 0000012C-000001E8       .text CreateHeap__9daFloor_cFv */
 int daFloor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1);
-    JUT_ASSERT(0xc1, modelData != 0);
+    JUT_ASSERT(0xc1, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL)
         return FALSE;
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index e7bea9a9e..f6cbab541 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -38,7 +38,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 00000118-0000032C .text _createHeap__13daGhostship_cFv */
 BOOL daGhostship_c::_createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BDL_AYUSH));
-    JUT_ASSERT(88, modelData != 0);
+    JUT_ASSERT(88, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if(!mpModel) {
@@ -46,7 +46,7 @@ BOOL daGhostship_c::_createHeap() {
     }
 
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, AYUSH_BTK_AYUSH));
-    JUT_ASSERT(95, btk != 0);
+    JUT_ASSERT(95, btk != NULL);
 
     if(!mBtk.init(modelData, btk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
         return false;
@@ -356,7 +356,7 @@ bool daGhostship_c::_execute() {
     if(mAlpha == l_HIO.shipAlpha && dist < l_HIO.shipEnterDist && dComIfGs_getEventReg(0x8803) < 3 && !mbEnteredShip) {
         mDoAud_seStart(JA_SE_LK_WARP_TO_G_SHIP);
         stage_scls_info_class* scls_data = dComIfGd_getMeshSceneList(current.pos);
-        JUT_ASSERT(463, scls_data != 0)
+        JUT_ASSERT(463, scls_data != NULL)
 
         u8 startCode = scls_data->mStart;
         dComIfGs_setEventReg(0xC3FF, scls_data->mRoom);
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index c133381e4..afa824079 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -424,17 +424,17 @@ s32 daIball_c::_daIball_create() {
 /* 800F489C-800F4B40       .text CreateHeap__9daIball_cFv */
 BOOL daIball_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, ALWAYS_BDL_IB);
-    JUT_ASSERT(1135, modelData != 0);
+    JUT_ASSERT(1135, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
     if (!mpModel) { return FALSE; }
     
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, ALWAYS_BCK_START);
-    JUT_ASSERT(1152, pbck != 0);
+    JUT_ASSERT(1152, pbck != NULL);
     int ret = mBckAnm.init(modelData, pbck, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false);
     if (!ret) { return FALSE; }
     
     J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, ALWAYS_BTK_IB);
-    JUT_ASSERT(1164, pbtk != 0);
+    JUT_ASSERT(1164, pbtk != NULL);
     ret = mBtkAnm.init(modelData, pbtk, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
     if (!ret) { return FALSE; }
     
@@ -445,7 +445,7 @@ BOOL daIball_c::CreateHeap() {
     J3DAnmTevRegKey* pbrk;
     for (int i = 0; i < (int)ARRAY_SIZE(mBrkAnm); i++) {
         pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, brkIds[i]);
-        JUT_ASSERT(1182, pbrk != 0);
+        JUT_ASSERT(1182, pbrk != NULL);
         ret = mBrkAnm[i].init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
         if (!ret) { return FALSE; }
     }
diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index f5b2f7132..6b63720b2 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -44,7 +44,7 @@ BOOL daIkari_c::_createHeap() {
 
     J3DModelData* modelData =
         static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ikari_bdl[mModelType]));
-    JUT_ASSERT(0x7e, modelData != 0);
+    JUT_ASSERT(0x7e, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x00080000, 0x11000022);
 
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 1328f090f..21156d0be 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -32,7 +32,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     JUT_ASSERT(78, 0 <= m_itemNo && m_itemNo <= 255);
     
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(resName, resIdx);
-    JUT_ASSERT(85, modelData != 0);
+    JUT_ASSERT(85, modelData != NULL);
     
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (!mpModel) {
@@ -60,7 +60,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     mpBtkAnm1 = NULL;
     if (btkAnm1 != -1) {
         pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm1);
-        JUT_ASSERT(140, pbtk != 0);
+        JUT_ASSERT(140, pbtk != NULL);
         mpBtkAnm1 = new mDoExt_btkAnm();
         if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
             return FALSE;
@@ -70,7 +70,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     mpBtkAnm2 = NULL;
     if (btkAnm2 != -1) {
         pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm2);
-        JUT_ASSERT(156, pbtk != 0);
+        JUT_ASSERT(156, pbtk != NULL);
         mpBtkAnm2 = new mDoExt_btkAnm();
         if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
             return FALSE;
@@ -81,7 +81,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     mpBrkAnm1 = NULL;
     if (brkAnm1 != -1) {
         pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm1);
-        JUT_ASSERT(172, pbrk != 0);
+        JUT_ASSERT(172, pbrk != NULL);
         s8 tevFrm = dItem_data::getTevFrm(m_itemNo);
         BOOL shouldAnimate = TRUE;
         if (tevFrm != -1) {
@@ -96,7 +96,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     mpBrkAnm2 = NULL;
     if (brkAnm2 != -1) {
         pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm2);
-        JUT_ASSERT(197, pbrk != 0);
+        JUT_ASSERT(197, pbrk != NULL);
         mpBrkAnm2 = new mDoExt_brkAnm();
         if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, false)) {
             return FALSE;
@@ -107,7 +107,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, s16 resIdx, s16 btkAnm1,
     mpBckAnm = NULL;
     if (bckAnm != -1) {
         pbck = (J3DAnmTransform*)dComIfG_getObjectRes(resName, bckAnm);
-        JUT_ASSERT(212, pbck != 0);
+        JUT_ASSERT(212, pbck != NULL);
         mpBckAnm = new mDoExt_bckAnm();
         if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2, 1.0f, 0, -1, false)) {
             return FALSE;
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index 66ec33bd8..8e9e0fd04 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -25,7 +25,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-000001F4       .text CreateHeap__8daKaji_cFv */
 BOOL daKaji_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KAJI_INDEX_BDL_ASODA);
-    JUT_ASSERT(0x55, modelData != 0);
+    JUT_ASSERT(0x55, modelData != NULL);
     
     mpMorf = new mDoExt_McaMorf(
         modelData,
diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp
index d0970c27a..e43820856 100644
--- a/src/d/actor/d_a_komore.cpp
+++ b/src/d/actor/d_a_komore.cpp
@@ -21,7 +21,7 @@ bool daKomore::Act_c::create_heap() {
 
     mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x04));
 
-    JUT_ASSERT(0x66, mdl_data != 0);
+    JUT_ASSERT(0x66, mdl_data != NULL);
 
     if (mdl_data != NULL) {
         mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11020203);
@@ -29,7 +29,7 @@ bool daKomore::Act_c::create_heap() {
 
     btk_data = (J3DAnmTextureSRTKey*)(dComIfG_getObjectRes(M_arcname, 0x07));
 
-    JUT_ASSERT(0x6d, btk_data != 0);
+    JUT_ASSERT(0x6d, btk_data != NULL);
 
     s32 btkRet =
         mBtkAnm.init(mdl_data, btk_data, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp
index 8b6275923..0fbdc246b 100644
--- a/src/d/actor/d_a_lamp.cpp
+++ b/src/d/actor/d_a_lamp.cpp
@@ -161,7 +161,7 @@ static BOOL daLamp_Delete(lamp_class* i_this) {
 /* 00000678-0000073C       .text useHeapInit__FP10lamp_class */
 static BOOL useHeapInit(lamp_class* i_this) {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Lamp", LAMP_BMD_LAMP_00));
-    JUT_ASSERT(0x170, modelData != 0);
+    JUT_ASSERT(0x170, modelData != NULL);
 
     i_this->mModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (i_this->mModel == 0) {
diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp
index de5ea6301..5010f4cca 100644
--- a/src/d/actor/d_a_lbridge.cpp
+++ b/src/d/actor/d_a_lbridge.cpp
@@ -17,7 +17,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-00000384       .text CreateHeap__11daLbridge_cFv */
 BOOL daLbridge_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GBRG00_BDL_GBRG00);
-    JUT_ASSERT(0xD6, modelData != 0);
+    JUT_ASSERT(0xD6, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000223U);
 
@@ -26,14 +26,14 @@ BOOL daLbridge_c::CreateHeap() {
     }
 
     J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BTK_GBRG00);
-    JUT_ASSERT(0xE8, pbtk != 0);
+    JUT_ASSERT(0xE8, pbtk != NULL);
 
     if (!mBtkAnm.init(modelData, pbtk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
     }
 
     J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(m_arcname, GBRG00_BPK_GBRG00);
-    JUT_ASSERT(0xF6, pbpk != 0);
+    JUT_ASSERT(0xF6, pbpk != NULL);
 
     if (!mBpkAnm.init(modelData, pbpk, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
@@ -43,7 +43,7 @@ BOOL daLbridge_c::CreateHeap() {
     mBpkAnm.setPlaySpeed(1.0f);
 
     J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GBRG00_BRK_GBRG00);
-    JUT_ASSERT(0x106, pbrk != 0);
+    JUT_ASSERT(0x106, pbrk != NULL);
 
     if (!mBrkAnm.init(modelData, pbrk, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 180ad2551..a07a2da9f 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -126,22 +126,22 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000002FC-0000060C       .text CreateHeap__10daMbdoor_cFv */
 BOOL daMbdoor_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getFuBdl()));
-    JUT_ASSERT(198, modelData != 0)
+    JUT_ASSERT(198, modelData != NULL)
     mpFuModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpFuModel) { return FALSE; }
     
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getLBdl()));
-    JUT_ASSERT(209, modelData != 0)
+    JUT_ASSERT(209, modelData != NULL)
     mpLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpLModel) { return FALSE; }
     
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getRBdl()));
-    JUT_ASSERT(220, modelData != 0)
+    JUT_ASSERT(220, modelData != NULL)
     mpRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpRModel) { return FALSE; }
     
     modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getToBdl()));
-    JUT_ASSERT(231, modelData != 0)
+    JUT_ASSERT(231, modelData != NULL)
     mpToModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpToModel) { return FALSE; }
     
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index aa69949b9..53f47507b 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -75,10 +75,10 @@ BOOL daMozo_c::CreateHeap() {
     mAnimMorf = newMorf;
 
     m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_BRK_MOZ);
-    JUT_ASSERT(0x16A, m_brk != 0);
+    JUT_ASSERT(0x16A, m_brk != NULL);
 
     m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ);
-    JUT_ASSERT(0x16D, m_btk != 0);
+    JUT_ASSERT(0x16D, m_btk != NULL);
 
     int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
     int btkInitResult = mBtkAnm.init(mdlData, m_btk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0);
diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp
index df2129e49..4e3b00c65 100644
--- a/src/d/actor/d_a_mtoge.cpp
+++ b/src/d/actor/d_a_mtoge.cpp
@@ -32,7 +32,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000000A4-000001E8       .text CreateHeap__9daMtoge_cFv */
 BOOL daMtoge_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, MTOGE_BMD_S_MTOGE));
-    JUT_ASSERT(0x70, modelData != 0);
+    JUT_ASSERT(0x70, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
 
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index ebd97a627..46ec3f452 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -103,7 +103,7 @@ void daNh_c::setBaseMtx() {
 /* 800F9980-800F9A54       .text createHeap__6daNh_cFv */
 BOOL daNh_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_NH);
-    JUT_ASSERT(359, modelData != 0);
+    JUT_ASSERT(359, modelData != NULL);
     
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (!mpModel) {
@@ -427,7 +427,7 @@ BOOL daNh_c::initBrkAnm(bool i_modify) {
     bool success = false;
     
     J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Always", ALWAYS_BRK_TNH);
-    JUT_ASSERT(883, a_brk != 0);
+    JUT_ASSERT(883, a_brk != NULL);
     
     if (mBrkAnm.init(modelData, a_brk, true, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, false)) {
         success = true;
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index 790017c4d..ac21ee627 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -193,7 +193,7 @@ static BOOL nodeCallBack_Bs(J3DNode* node, int value) {
 BOOL daNpc_Bs1_c::initTexPatternAnm(bool i_modify) {
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
     m_head_tex_pattern = (J3DAnmTexPattern*)dComIfG_getObjectRes("Bs", l_btp_ix_tbl[m828]);
-    JUT_ASSERT(0x1bd, m_head_tex_pattern != 0);
+    JUT_ASSERT(0x1bd, m_head_tex_pattern != NULL);
     if (!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) {
         return FALSE;
     }
diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp
index 8ecd5fe88..284eeebba 100644
--- a/src/d/actor/d_a_npc_btsw2.cpp
+++ b/src/d/actor/d_a_npc_btsw2.cpp
@@ -138,7 +138,7 @@ static BOOL nodeCallBack(J3DNode* node, int param_1) {
 BOOL daNpc_Btsw2_c::initTexPatternAnm(bool i_modify) {
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
     m_btp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes(m_arc_name, l_btp_ix_tbl[m744]));
-    JUT_ASSERT(282, m_btp != 0);
+    JUT_ASSERT(282, m_btp != NULL);
     if (!mBtpAnm.init(modelData, m_btp, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, i_modify, 0)) {
         return FALSE;
     }
@@ -346,7 +346,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
 /* 00000BB4-00000EFC       .text CreateHeap__13daNpc_Btsw2_cFv */
 BOOL daNpc_Btsw2_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, BTSW_INDEX_BDL_BN));
-    JUT_ASSERT(616, modelData != 0);
+    JUT_ASSERT(616, modelData != NULL);
     mpMorf = new mDoExt_McaMorf(
         modelData,
         NULL, NULL,
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 2213a6cb3..699b72db2 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -3210,10 +3210,10 @@ BOOL daNpc_Ji1_c::CreateHeap() {
     field_0x3F8 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
 
     J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Ji", JI_BRK_YJITR00));
-    JUT_ASSERT(0x15CD, a_brk != 0);
+    JUT_ASSERT(0x15CD, a_brk != NULL);
 
     J3DAnmTextureSRTKey* a_btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Ji", JI_BTK_YJITR00));
-    JUT_ASSERT(0x15D0, a_btk != 0);
+    JUT_ASSERT(0x15D0, a_btk != NULL);
 
     int temp1 = field_0x3FC.init(modelData, a_brk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
     int temp2 = field_0x418.init(modelData, a_btk, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
@@ -3223,7 +3223,7 @@ BOOL daNpc_Ji1_c::CreateHeap() {
     }
 
     headTexPattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Ji", JI_BTP_JI));
-    JUT_ASSERT(0x15D8, headTexPattern != 0);
+    JUT_ASSERT(0x15D8, headTexPattern != NULL);
 
     if(field_0x3D8.init(modelData, headTexPattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0) == 0) {
         return false;
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 12c6df1f8..ad2e5914a 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -217,7 +217,7 @@ static int headNodeCallBack(J3DNode* node, int param_1) {
 /* 00000CD0-00000EB8       .text createHeap__11daNpc_kam_cFv */
 BOOL daNpc_kam_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kamome", KAMOME_BDL_KA_HYOI);
-    JUT_ASSERT(763, modelData != 0);
+    JUT_ASSERT(763, modelData != NULL);
     
     mpMorf = new mDoExt_McaMorf(
         modelData,
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 5fc98378e..0e739794e 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -759,7 +759,7 @@ BOOL daNpc_Md_c::createHeap() {
     }
     
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "md.bdl");
-    JUT_ASSERT(1995, modelData != 0);
+    JUT_ASSERT(1995, modelData != NULL);
     
     mpMorf = new mDoExt_McaMorf2(
         modelData,
@@ -805,7 +805,7 @@ BOOL daNpc_Md_c::createHeap() {
     mpMorf->getModel()->setUserArea((u32)this);
     
     modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdarm.bdl");
-    JUT_ASSERT(2051, modelData != 0);
+    JUT_ASSERT(2051, modelData != NULL);
     
     mpArmMorf = new mDoExt_McaMorf2(
         modelData,
@@ -835,7 +835,7 @@ BOOL daNpc_Md_c::createHeap() {
     
     if (!isTypeShipRide()) {
         modelData = (J3DModelData*)dComIfG_getObjectRes(mModelArcName, "mdwing.bdl");
-        JUT_ASSERT(2083, modelData != 0);
+        JUT_ASSERT(2083, modelData != NULL);
         
         mpWingMorf = new mDoExt_McaMorf(
             modelData,
@@ -2198,7 +2198,7 @@ BOOL daNpc_Md_c::initTexPatternAnm(u8 btpAnmTblIdx, bool param_2) {
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
     bool ret = false;
     J3DAnmTexPattern* eyeTexPtrn = (J3DAnmTexPattern*)dComIfG_getObjectRes(mModelArcName, btpAnmTbl[btpAnmTblIdx].m00);
-    JUT_ASSERT(7502, eyeTexPtrn != 0);
+    JUT_ASSERT(7502, eyeTexPtrn != NULL);
     if (m0520.init(modelData, eyeTexPtrn, TRUE, J3DFrameCtrl::LOOP_ONCE_RESET_e, 1.0f, 0, -1, param_2, 0)) {
         m3112 = eyeTexPtrn->getFrameMax();
         m3133 = 0;
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index 7d6c8e86e..93292003d 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -148,7 +148,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 00000D18-00000F98       .text _createHeap__10daNpc_Nz_cFv */
 BOOL daNpc_Nz_c::_createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_bdl_arc_name, NPCNZ_BDL_NZ));
-    JUT_ASSERT(0xD0, modelData != 0);
+    JUT_ASSERT(0xD0, modelData != NULL);
 
     mpMorf = new mDoExt_McaMorf(
         modelData,
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 1f0110063..0e739db79 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -237,7 +237,7 @@ static BOOL tunoNodeCallBack(J3DNode* node, int param_1) {
 /* 00000988-00000C94       .text createHeap__10daNpc_Os_cFv */
 BOOL daNpc_Os_c::createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Os", OS_BDL_OS));
-    JUT_ASSERT(0x2F9, modelData != 0);
+    JUT_ASSERT(0x2F9, modelData != NULL);
 
     mpMorf = new mDoExt_McaMorf(
         modelData,
@@ -1702,7 +1702,7 @@ BOOL daNpc_Os_c::initBrkAnm(u8 param_1, bool param_2) {
     bool ret = false;
     if(field_0x7A2 != param_1) {
         J3DAnmTevRegKey* a_brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Os", brkAnmTbl[param_1].brkFileIndex));
-        JUT_ASSERT(0xBB9, a_brk != 0);
+        JUT_ASSERT(0xBB9, a_brk != NULL);
 
         if(mBrkAnm.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) {
             field_0x7A2 = param_1;
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index ac1219bf2..97461e597 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -7584,7 +7584,7 @@ BOOL daNpcPeople_c::initTexPatternAnm(bool param_1) {
         }
 
         m_head_tex_pattern = (J3DAnmTexPattern*)dComIfG_getObjectIDRes(l_arcname_tbl[mNpcType], l_btp_ix_tbl[mNpcType]);
-        JUT_ASSERT(0x231D, m_head_tex_pattern != 0);
+        JUT_ASSERT(0x231D, m_head_tex_pattern != NULL);
 
         if(!mBtpAnm.init(modelData, m_head_tex_pattern, 1, 2, 1.0f, 0, -1, param_1, 0)) {
             return false;
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 77cb03e2c..3120268ef 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -2691,7 +2691,7 @@ BOOL daNpcRoten_c::initTexPatternAnm(bool modify) {
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
 
     m_head_tex_pattern = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectIDRes(l_arcname_tbl[mNpcNo], l_btp_ix_tbl[mNpcNo]));
-    JUT_ASSERT(0xBFF, m_head_tex_pattern != 0);
+    JUT_ASSERT(0xBFF, m_head_tex_pattern != NULL);
 
     if(!mBtpAnm.init(modelData, m_head_tex_pattern, TRUE, J3DFrameCtrl::LOOP_REPEAT_e,  1.0f, 0, -1, modify, 0)) {
         return false;
diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp
index 7e7fcff28..a86c38b28 100644
--- a/src/d/actor/d_a_obj_Yboil.cpp
+++ b/src/d/actor/d_a_obj_Yboil.cpp
@@ -20,13 +20,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-00000368       .text CreateHeap__12daObjYboil_cFv */
 BOOL daObjYboil_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Yboil", YBOIL_BDL_YBOIL00);
-    JUT_ASSERT(92, modelData != 0);
+    JUT_ASSERT(92, modelData != NULL);
     J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Yboil", YBOIL_BCK_YBOIL00));
-    JUT_ASSERT(96, bck != 0);
+    JUT_ASSERT(96, bck != NULL);
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BTK_YBOIL00));
-    JUT_ASSERT(100, btk != 0);
+    JUT_ASSERT(100, btk != NULL);
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes("Yboil", YBOIL_BRK_YBOIL00));
-    JUT_ASSERT(104, brk != 0);
+    JUT_ASSERT(104, brk != NULL);
 
     for (s32 i = 0; i < 50; i++) {
         mModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp
index 349d460ef..7c0ff5281 100644
--- a/src/d/actor/d_a_obj_adnno.cpp
+++ b/src/d/actor/d_a_obj_adnno.cpp
@@ -40,7 +40,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-00000178       .text CreateHeap__12daObjAdnno_cFv */
 BOOL daObjAdnno_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Adnno", ADNNO_BDL_ADNNO));
-    JUT_ASSERT(0x5c, modelData != 0);
+    JUT_ASSERT(0x5c, modelData != NULL);
     for (s32 i = 0; i < 16; i++) {
         mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x37441422);
         if (!mpModel[i])
diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp
index ca6ff0c55..61cd20316 100644
--- a/src/d/actor/d_a_obj_akabe.cpp
+++ b/src/d/actor/d_a_obj_akabe.cpp
@@ -36,7 +36,7 @@ namespace daObjAkabe {
         if (mpBgW != NULL) {
             static const s16 dzb[4] = { AKABE_DZB_AKABE, AKABED_DZB_AKABED, AKABEK_DZB_AKABEK, NBOX_DZB_NBOX, };
             cBgD_t * bgw_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mType], dzb[mType]);
-            JUT_ASSERT(0x82, bgw_data != 0);
+            JUT_ASSERT(0x82, bgw_data != NULL);
             if (!mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx))
                 rt = true;
         }
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 4cb976e41..ece99613d 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -299,8 +299,8 @@ void daObjBarrier_ef_c::setDummyTexture(int i_idx) {
     J3DTexture* texture = modelData->getTexture();
     JUTNameTab* textureName = modelData->getTextureName();
 
-    JUT_ASSERT(808, texture != 0);
-    JUT_ASSERT(809, textureName != 0);
+    JUT_ASSERT(808, texture != NULL);
+    JUT_ASSERT(809, textureName != NULL);
 
     for (u16 i = 0; i < texture->getNum(); i++) {
         if (strcmp(textureName->getName(i), "__dummy") == 0) {
@@ -375,13 +375,13 @@ void daObjBarrier_ef_c::birth(fopAc_ac_c* i_hitActor, f32 i_radius, cXyz i_cente
         J3DModelData* modelData = mpModel[effect_idx]->getModelData();
 
         J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BTK_YHRBR00));
-        JUT_ASSERT(937, btk_anm_p != 0);
+        JUT_ASSERT(937, btk_anm_p != NULL);
 
         J3DAnmTransform* bck_anm_p = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(l_arcname, YCAGE_BCK_YHRBR00));
-        JUT_ASSERT(942, bck_anm_p != 0);
+        JUT_ASSERT(942, bck_anm_p != NULL);
 
         J3DAnmTevRegKey* brk_anm_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcname, YCAGE_BRK_YHRBR00));
-        JUT_ASSERT(947, brk_anm_p != 0);
+        JUT_ASSERT(947, brk_anm_p != NULL);
 
         mBtk[effect_idx].init(modelData, btk_anm_p, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1,
                               true, 0);
diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp
index ad841b4e9..fef4167f3 100644
--- a/src/d/actor/d_a_obj_bscurtain.cpp
+++ b/src/d/actor/d_a_obj_bscurtain.cpp
@@ -49,7 +49,7 @@ BOOL daObj_Bscurtain_c::CreateHeap() {
         modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname, PTC_INDEX_BDL_PTCU);
     }
 
-    JUT_ASSERT(0xa9, modelData != 0);
+    JUT_ASSERT(0xa9, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x0, 0x11020203);
 
     return mpModel != NULL;
diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp
index 1f0b89ae1..ae648fa28 100644
--- a/src/d/actor/d_a_obj_cafelmp.cpp
+++ b/src/d/actor/d_a_obj_cafelmp.cpp
@@ -21,7 +21,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-0000015C       .text CreateHeap__14daObjCafelmp_cFv */
 BOOL daObjCafelmp_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Cafelmp", CAFELMP_BDL_YLAMP));
-    JUT_ASSERT(0x51, modelData != 0);
+    JUT_ASSERT(0x51, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
     if (!mpModel)
         return FALSE;
diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp
index 29f9f19f8..9110509b5 100644
--- a/src/d/actor/d_a_obj_dmgroom.cpp
+++ b/src/d/actor/d_a_obj_dmgroom.cpp
@@ -21,13 +21,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-000001FC       .text CreateHeap__14daObjDmgroom_cFv */
 BOOL daObjDmgroom_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BDL_DMGROOM));
-    JUT_ASSERT(0x52, modelData != 0);
+    JUT_ASSERT(0x52, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
     if (!mpModel)
         return FALSE;
 
     J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dmgroom", DMGROOM_BRK_DMGROOM));
-    JUT_ASSERT(0x5c, brk != 0);
+    JUT_ASSERT(0x5c, brk != NULL);
     if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0))
         return FALSE;
 
diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp
index 88ac4d24b..4a425a40e 100644
--- a/src/d/actor/d_a_obj_doguu_demo.cpp
+++ b/src/d/actor/d_a_obj_doguu_demo.cpp
@@ -23,7 +23,7 @@ BOOL daObjDoguuD_c::CreateHeap() {
     mUnusedParam = fopAcM_GetParam(this) & 0xFF;
 
     J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("DoguuD", DOGUUD_BDL_ESKZTO));
-    JUT_ASSERT(0x65, modelData != 0);
+    JUT_ASSERT(0x65, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
     if (mpModel == NULL)
         return FALSE;
diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp
index 14db164f6..efd069ccb 100644
--- a/src/d/actor/d_a_obj_dragonhead.cpp
+++ b/src/d/actor/d_a_obj_dragonhead.cpp
@@ -55,7 +55,7 @@ namespace daObjDragonhead_prm {
 /* 00000098-00000228       .text CreateHeap__17daObjDragonhead_cFv */
 BOOL daObjDragonhead_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)(dComIfG_getObjectRes("Qdghd", QDGHD_BDL_QDGHD));
-    JUT_ASSERT(0xA0, model_data != 0);
+    JUT_ASSERT(0xA0, model_data != NULL);
     mpModel = mDoExt_J3DModel__create(model_data, 0x00, 0x11020203);
     if (!mpModel)
         return FALSE;
diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp
index 3372d416d..74d6c86e8 100644
--- a/src/d/actor/d_a_obj_eayogn.cpp
+++ b/src/d/actor/d_a_obj_eayogn.cpp
@@ -25,7 +25,7 @@ BOOL daObjEayogn_c::create_heap() {
     BOOL ret = FALSE;
 
     J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, EAYOGN_BDL_EAYOGN));
-    JUT_ASSERT(0x5c, mdl_data != 0);
+    JUT_ASSERT(0x5c, mdl_data != NULL);
 
     if (mdl_data != NULL) {
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x00, 0x11020203);
diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp
index a7b66ef9b..94c22415b 100644
--- a/src/d/actor/d_a_obj_eskban.cpp
+++ b/src/d/actor/d_a_obj_eskban.cpp
@@ -120,10 +120,10 @@ static dCcD_SrcSph sph_check_src = {
 int daObjEskban::Act_c::CreateHeap() {
     J3DModelData* model_data =
         static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, ESKBAN_BDL_ESKBAN));
-    JUT_ASSERT(261, model_data != 0);
+    JUT_ASSERT(261, model_data != NULL);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203U);
     M_smoke = new dPa_smokeEcallBack();
-    JUT_ASSERT(264, M_smoke != 0);
+    JUT_ASSERT(264, M_smoke != NULL);
     return mpModel != NULL;
 }
 
diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp
index 7af677515..13a82a9ee 100644
--- a/src/d/actor/d_a_obj_ferris.cpp
+++ b/src/d/actor/d_a_obj_ferris.cpp
@@ -91,14 +91,14 @@ BOOL daObjFerris::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
 bool daObjFerris::Act_c::create_heap() {
     s32 i;
     J3DModelData* mdl_data_gondola = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SGONDOR));
-    JUT_ASSERT(0x183, mdl_data_gondola != 0);
+    JUT_ASSERT(0x183, mdl_data_gondola != NULL);
     if (mdl_data_gondola != NULL) {
         for (i = 0; i < 5; i++)
             mpModel[i] = mDoExt_J3DModel__create(mdl_data_gondola, 0, 0x11020203);
     }
 
     J3DModelData* mdl_data_wheelbase = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, SKANRAN_BDL_SKANRAN));
-    JUT_ASSERT(0x18c, mdl_data_wheelbase != 0);
+    JUT_ASSERT(0x18c, mdl_data_wheelbase != NULL);
     if (mdl_data_wheelbase != NULL) {
         mpModel[5] = mDoExt_J3DModel__create(mdl_data_wheelbase, 0, 0x11020203);
     }
@@ -107,7 +107,7 @@ bool daObjFerris::Act_c::create_heap() {
         init_mtx();
 
     cBgD_t* bgw_data_gondola = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SGONDOR));
-    JUT_ASSERT(0x1a0, bgw_data_gondola != 0);
+    JUT_ASSERT(0x1a0, bgw_data_gondola != NULL);
     if (bgw_data_gondola != NULL) {
         for (i = 0; i < 5; i++) {
             mpBgW[i] = new dBgW();
@@ -117,7 +117,7 @@ bool daObjFerris::Act_c::create_heap() {
     }
 
     cBgD_t* bgw_data_wheelbase = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, SKANRAN_DZB_SKANRAN));
-    JUT_ASSERT(0x1b0, bgw_data_wheelbase != 0);
+    JUT_ASSERT(0x1b0, bgw_data_wheelbase != NULL);
     if (bgw_data_wheelbase != NULL) {
         mpBgW[5] = new dBgW();
         if (mpBgW[5] != NULL && mpBgW[5]->Set(bgw_data_wheelbase, dBgW::MOVE_BG_e, &mMtx[5]) == 1)
diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp
index 50c132cfc..898ab5625 100644
--- a/src/d/actor/d_a_obj_gaship2.cpp
+++ b/src/d/actor/d_a_obj_gaship2.cpp
@@ -24,12 +24,12 @@ bool daObjGaship2::Act_c::create_heap() {
     cBgD_t *bgw_data;
 
     mdl_data = (J3DModelData *) (dComIfG_getObjectRes(M_arcname, YAKEROM_BDL_YAKEROM));
-    JUT_ASSERT(0x5A, mdl_data != 0);
+    JUT_ASSERT(0x5A, mdl_data != NULL);
 
     mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
     set_mtx();
     bgw_data = (cBgD_t *) (dComIfG_getObjectRes(M_arcname, YAKEROM_DZB_YAKEROM));
-    JUT_ASSERT(0x67, bgw_data != 0);
+    JUT_ASSERT(0x67, bgw_data != NULL);
     if (bgw_data != NULL) {
         mpBgW = new dBgW();
         if (mpBgW != NULL && (mpBgW->Set(bgw_data, cBgW::MOVE_BG_e, &mMtx) == true)) {
diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp
index 4358d8c80..72b9e533a 100644
--- a/src/d/actor/d_a_obj_gong.cpp
+++ b/src/d/actor/d_a_obj_gong.cpp
@@ -41,7 +41,7 @@ BOOL daObjGong::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
 bool daObjGong::Act_c::create_heap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BDL_VDORA));
     J3DAnmTransformKey* bck = static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes(M_arcname, VDORA_INDEX_BCK_05_VDORA_CUT02_HIT));
-    JUT_ASSERT(0xbd, (modelData != 0) && (bck != 0));
+    JUT_ASSERT(0xbd, (modelData != NULL) && (bck != NULL));
 
     mpMorf = new mDoExt_McaMorf(
         modelData,
diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp
index c33297288..b56152e57 100644
--- a/src/d/actor/d_a_obj_gryw00.cpp
+++ b/src/d/actor/d_a_obj_gryw00.cpp
@@ -32,7 +32,7 @@ f32 daObjGryw00_c::get_draw_water_lv(void* p) {
 BOOL daObjGryw00_c::setup_high_water_level_btk_anm() {
     BOOL ret = TRUE;
     J3DAnmTextureSRTKey* btk_anm_p = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00));
-    JUT_ASSERT(223, btk_anm_p != 0);
+    JUT_ASSERT(223, btk_anm_p != NULL);
     if (!mBtk.init(mpModel->getModelData(), btk_anm_p, 1, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0x191, -1, -1, 0)) {
         ret = FALSE;
     }
diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp
index 2a768d81f..8671b87ac 100644
--- a/src/d/actor/d_a_obj_hbrf1.cpp
+++ b/src/d/actor/d_a_obj_hbrf1.cpp
@@ -16,7 +16,7 @@ const char daObjHbrf1::Act_c::M_evname[] = "ami_cam";
 /* 00000078-0000012C       .text CreateHeap__Q210daObjHbrf15Act_cFv */
 BOOL daObjHbrf1::Act_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, HBRF1_BDL_HBRF1);
-    JUT_ASSERT(0x5E, model_data != 0);
+    JUT_ASSERT(0x5E, model_data != NULL);
 
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
 
diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp
index c323003ad..b2b294c3b 100644
--- a/src/d/actor/d_a_obj_hole.cpp
+++ b/src/d/actor/d_a_obj_hole.cpp
@@ -225,7 +225,7 @@ void daObj_Hole_c::createInit() {
 BOOL daObj_Hole_c::_createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, AANA_BDL_AANA);
 
-    JUT_ASSERT(0x13D, modelData != 0);
+    JUT_ASSERT(0x13D, modelData != NULL);
 
     mpMdl = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
 
diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp
index fb90b91cd..0bd7018c2 100644
--- a/src/d/actor/d_a_obj_kanat.cpp
+++ b/src/d/actor/d_a_obj_kanat.cpp
@@ -15,7 +15,7 @@ const char daObjKanat::Act_c::M_arcname[] = "Kanat";
 /* 00000078-0000012C       .text CreateHeap__Q210daObjKanat5Act_cFv */
 int daObjKanat::Act_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KANAT_BDL_KANAT);
-    JUT_ASSERT(79, model_data != 0);
+    JUT_ASSERT(79, model_data != NULL);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
     return !!mpModel;
 }
diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp
index 08f322ec2..06e1a989a 100644
--- a/src/d/actor/d_a_obj_ladder.cpp
+++ b/src/d/actor/d_a_obj_ladder.cpp
@@ -67,7 +67,7 @@ const char daObjLadder::Act_c::M_arcname[] = "Mhsg";
 /* 00000078-0000013C       .text CreateHeap__Q211daObjLadder5Act_cFv */
 BOOL daObjLadder::Act_c::CreateHeap() {
     J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, attr_type(mType).modelId));
-    JUT_ASSERT(0x17E, model_data != 0);
+    JUT_ASSERT(0x17E, model_data != NULL);
 
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000U, 0x11000022U);
 
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 568118eae..f8fad2157 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -176,8 +176,8 @@ int daObjMknjD::Act_c::CreateHeap() {
     J3DModelData* model_data_d = (J3DModelData*)temp_r26;
     J3DModelData* model_data_h = (J3DModelData*)dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJH);
 
-    JUT_ASSERT(0x123, model_data_d != 0)
-    JUT_ASSERT(0x124, model_data_h != 0)
+    JUT_ASSERT(0x123, model_data_d != NULL)
+    JUT_ASSERT(0x124, model_data_h != NULL)
     
     mMainMdl = mDoExt_J3DModel__create(model_data_d, 0x80000, 0x31000002);
     mBreakMdl = mDoExt_J3DModel__create(model_data_h, 0x80000, 0x11000002);
diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp
index 12809c220..3aaad19ae 100644
--- a/src/d/actor/d_a_obj_monument.cpp
+++ b/src/d/actor/d_a_obj_monument.cpp
@@ -37,7 +37,7 @@ bool daObjMonument::Act_c::create_heap() {
     bool ret = true;
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, attr(mType).mModelId));
-    JUT_ASSERT(0x81, modelData != 0);
+    JUT_ASSERT(0x81, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x00, 0x11020203);
     if (!mpModel)
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 39f3fc1c3..9a1d728bc 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -1219,7 +1219,7 @@ namespace daObjMovebox {
         BOOL success = TRUE;
         if (i_attr()->mModelFileIndex >= 0) {
             J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr()->mModelFileIndex);
-            JUT_ASSERT(1722, modelData != 0);
+            JUT_ASSERT(1722, modelData != NULL);
             
             mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
             success = (mpModel != 0);
diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp
index 9ba2bc733..e660fe49b 100644
--- a/src/d/actor/d_a_obj_mtest.cpp
+++ b/src/d/actor/d_a_obj_mtest.cpp
@@ -100,7 +100,7 @@ BOOL daObjMtest::Act_c::CreateHeap() {
     s16 bmdIdx = bmd_data[M_type];
     if (bmdIdx >= 0) {
         J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname[M_type], bmdIdx);
-        JUT_ASSERT(257, model_data != 0);
+        JUT_ASSERT(257, model_data != NULL);
         
         mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
         return !!mpModel;
diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp
index ad71865a1..9ab831c7f 100644
--- a/src/d/actor/d_a_obj_ojtree.cpp
+++ b/src/d/actor/d_a_obj_ojtree.cpp
@@ -16,7 +16,7 @@ const char daObjOjtree::Act_c::M_arcname[] = "Ojtree";
 /* 00000078-0000012C       .text CreateHeap__Q211daObjOjtree5Act_cFv */
 int daObjOjtree::Act_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OJTREE_BDL_OJTREE);
-    JUT_ASSERT(67, model_data != 0);
+    JUT_ASSERT(67, model_data != NULL);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022);
     return !!mpModel;
 }
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index 1fbf69890..d421deaf6 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -134,7 +134,7 @@ namespace daObjPaper {
 
         mdl_data = (J3DModelData*)dComIfG_getObjectRes(attr(mType).mResName, attr(mType).mModelId);
 
-        JUT_ASSERT(0x13E, mdl_data != 0);
+        JUT_ASSERT(0x13E, mdl_data != NULL);
 
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000022);
         if (mpModel)
diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp
index f3f21b714..b8371923d 100644
--- a/src/d/actor/d_a_obj_pbco.cpp
+++ b/src/d/actor/d_a_obj_pbco.cpp
@@ -39,7 +39,7 @@ BOOL daObj_Pbco_c::CreateHeap() {
     } else {
         modelData = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, PBCO_INDEX_BDL_PBC2));
     }
-    JUT_ASSERT(0xa9, modelData != 0);
+    JUT_ASSERT(0xa9, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     if (dComIfGs_isEventBit(0x0a02) && !checkItemGet(dItem_PEARL_NAYRU_e, TRUE)) {
         mpBgW = NULL;
diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp
index 610bf4a97..2ddbcbe52 100644
--- a/src/d/actor/d_a_obj_pbka.cpp
+++ b/src/d/actor/d_a_obj_pbka.cpp
@@ -18,7 +18,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 00000098-0000015C       .text CreateHeap__11daObjPbka_cFv */
 BOOL daObjPbka_c::CreateHeap() {
     J3DModelData *modelData = (J3DModelData *)dComIfG_getObjectRes("Pbka", PBKA_BDL_PBKA);
-    JUT_ASSERT(0x51, modelData != 0);
+    JUT_ASSERT(0x51, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData,0,0x11020203);
     if(mpModel == NULL) {
         return FALSE;
diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp
index e3ce8d18a..ab3656b55 100644
--- a/src/d/actor/d_a_obj_roten.cpp
+++ b/src/d/actor/d_a_obj_roten.cpp
@@ -47,7 +47,7 @@ BOOL daObj_Roten_c::CreateHeap() {
     };
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType]));
-    JUT_ASSERT(0xB0, modelData != 0);
+    JUT_ASSERT(0xB0, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
     mpBgW = new dBgW();
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 6c0357c3e..db11dd8f5 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -89,7 +89,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 0000010C-0000022C       .text _createHeap__12daObjTpost_cFv */
 BOOL daObjTpost_c::_createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arc_name, TORIPOST_BDL_VPOST);
-    JUT_ASSERT(132, modelData != 0);
+    JUT_ASSERT(132, modelData != NULL);
 
     mMorf = new mDoExt_McaMorf(
         modelData,
diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp
index 0702752e6..16ab91047 100644
--- a/src/d/actor/d_a_obj_tower.cpp
+++ b/src/d/actor/d_a_obj_tower.cpp
@@ -20,7 +20,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 BOOL daObjTower_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("X_tower", X_TOWER_BDL_X_TOWER);
 
-    JUT_ASSERT(0x56, modelData != 0);
+    JUT_ASSERT(0x56, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
 
diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp
index 7b93ba1e8..7959f6045 100644
--- a/src/d/actor/d_a_obj_vfan.cpp
+++ b/src/d/actor/d_a_obj_vfan.cpp
@@ -50,7 +50,7 @@ static dCcD_SrcCyl cyl_check_src = {
 int daObjVfan::Act_c::CreateHeap() {
     J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, VFAN_BDL_V_FAN_00));
 
-    JUT_ASSERT(0x8c, model_data != 0);
+    JUT_ASSERT(0x8c, model_data != NULL);
 
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
 
diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp
index fcceff5ec..927346c7c 100644
--- a/src/d/actor/d_a_obj_xfuta.cpp
+++ b/src/d/actor/d_a_obj_xfuta.cpp
@@ -41,7 +41,7 @@ bool Act_c::create_heap() {
 
     mdl_data = (J3DModelData*)(dComIfG_getObjectRes(M_arcname, 0x03));
 
-    JUT_ASSERT(0x105, mdl_data != 0);
+    JUT_ASSERT(0x105, mdl_data != NULL);
 
     mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
 
diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp
index 6ec541f26..6beb69068 100644
--- a/src/d/actor/d_a_obj_zouK.cpp
+++ b/src/d/actor/d_a_obj_zouK.cpp
@@ -67,9 +67,9 @@ BOOL daObjZouk::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
 /* 0000009C-00000468       .text create_heap__Q29daObjZouk5Act_cFv */
 bool daObjZouk::Act_c::create_heap() {
     J3DModelData* mdl_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BDL_VZOUK);
-    JUT_ASSERT(0x171, mdl_data != 0);
+    JUT_ASSERT(0x171, mdl_data != NULL);
     M_bck_data = (J3DAnmTransformKey*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_BCK_VZOUK);
-    JUT_ASSERT(0x175, M_bck_data != 0);
+    JUT_ASSERT(0x175, M_bck_data != NULL);
     if (mdl_data != NULL && M_bck_data != NULL) {
         M_anm = new mDoExt_McaMorf(
             mdl_data,
@@ -81,7 +81,7 @@ bool daObjZouk::Act_c::create_heap() {
             0x11020203
         );
     }
-    JUT_ASSERT(0x183, M_anm != 0);
+    JUT_ASSERT(0x183, M_anm != NULL);
     if (M_anm != NULL) {
         if (dComIfGs_isCollect(0, 1)) {
             M_anm->setPlaySpeed(0.0f);
@@ -94,7 +94,7 @@ bool daObjZouk::Act_c::create_heap() {
     set_mtx();
 
     cBgD_t* bgw_data_before = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_MAEKISI);
-    JUT_ASSERT(0x196, bgw_data_before != 0);
+    JUT_ASSERT(0x196, bgw_data_before != NULL);
     if (bgw_data_before != NULL) {
         mBgBefore = new dBgW();
         if (mBgBefore != NULL) {
@@ -104,7 +104,7 @@ bool daObjZouk::Act_c::create_heap() {
     }
 
     cBgD_t* bgw_data_after = (cBgD_t*)dComIfG_getObjectRes(M_arcname, VZOUK_INDEX_DZB_ATOKISI);
-    JUT_ASSERT(0x1a4, bgw_data_after != 0);
+    JUT_ASSERT(0x1a4, bgw_data_after != NULL);
     if (bgw_data_after != NULL) {
         mBgAfter = new dBgW();
         if (mBgAfter != NULL) {
diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp
index 14c9bc226..84db00727 100644
--- a/src/d/actor/d_a_pedestal.cpp
+++ b/src/d/actor/d_a_pedestal.cpp
@@ -37,7 +37,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000000FC-00000244       .text CreateHeap__Q210daPedestal7daPds_cFv */
 BOOL daPds_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HDAI1_BDL_HDAI1);
-    JUT_ASSERT(0xC1, modelData != 0);
+    JUT_ASSERT(0xC1, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U);
 
@@ -347,7 +347,7 @@ BOOL daPds_c::initBrkAnm(u8 param_1, bool param_2) {
     bool ret = false;
 
     J3DAnmTevRegKey* a_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, HDAI1_BRK_HDAI1);
-    JUT_ASSERT(0x28C, a_brk != 0);
+    JUT_ASSERT(0x28C, a_brk != NULL);
 
     if (mBrk.init(modelData, a_brk, TRUE, brkAnmTbl[param_1].loopMode, brkAnmTbl[param_1].speed, 0, -1, param_2, 0)) {
         unk30E = param_1;
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index e1dc0f312..11d72166c 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -3745,20 +3745,20 @@ static BOOL daPy_Delete(daPy_lk_c* i_this) {
 /* 80123078-80123360       .text initTextureAnime__9daPy_lk_cFv */
 void daPy_lk_c::initTextureAnime() {
     m_tex_anm_heap.m_buffer = new(0x20) u8[0x1000];
-    JUT_ASSERT(20869, m_tex_anm_heap.m_buffer != 0);
+    JUT_ASSERT(20869, m_tex_anm_heap.m_buffer != NULL);
     
     JKRReadIdxResource(m_tex_anm_heap.m_buffer, 0x1000, LKANM_BTP_TMABAA, dComIfGp_getAnmArchive());
     J3DAnmTexPattern* btp = static_cast<J3DAnmTexPattern*>(J3DAnmLoaderDataBase::load(m_tex_anm_heap.m_buffer));
     btp->searchUpdateMaterialID(mpCLModelData);
     u16 material_num = btp->getUpdateMaterialNum();
     m_texNoAnms = new J3DTexNoAnm[material_num];
-    JUT_ASSERT(20885, m_texNoAnms != 0);
+    JUT_ASSERT(20885, m_texNoAnms != NULL);
     
     for (u16 i = 0; i < material_num; i++) {
         u16 matID = btp->getUpdateMaterialID(i);
         if (matID != 0xFFFF) {
             J3DMaterialAnm* mat_anm = new J3DMaterialAnm();
-            JUT_ASSERT(20894, mat_anm != 0);
+            JUT_ASSERT(20894, mat_anm != NULL);
             
             if (matID != 1 && matID != 4) {
                 // Not eyeL or eyeR (i.e. it's mouth, mayuL, or mayuR)
@@ -3792,7 +3792,7 @@ void daPy_lk_c::initTextureAnime() {
 void daPy_lk_c::initTextureScroll() {
     /* Nonmatching - regalloc */
     m_tex_scroll_heap.m_buffer = new(0x20) u8[0x800];
-    JUT_ASSERT(20944, m_tex_scroll_heap.m_buffer != 0);
+    JUT_ASSERT(20944, m_tex_scroll_heap.m_buffer != NULL);
     
     JKRReadIdxResource(m_tex_scroll_heap.m_buffer, 0x800, LKANM_BTK_TMABA, dComIfGp_getAnmArchive());
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(J3DAnmLoaderDataBase::load(m_tex_scroll_heap.m_buffer));
@@ -3801,13 +3801,13 @@ void daPy_lk_c::initTextureScroll() {
     JUT_ASSERT(20958, material_num == 2);
     
     m_texMtxAnm = new J3DTexMtxAnm[material_num];
-    JUT_ASSERT(20961, m_texMtxAnm != 0);
+    JUT_ASSERT(20961, m_texMtxAnm != NULL);
     
     for (u16 no = 0; no < material_num; no++) {
         u16 matID = btk->getUpdateMaterialID(no);
         if (matID != 0xFFFF) {
             m_tex_eye_scroll[no] = new daPy_matAnm_c();
-            JUT_ASSERT(20972, m_tex_eye_scroll[no] != 0);
+            JUT_ASSERT(20972, m_tex_eye_scroll[no] != NULL);
             
             mpCLModelData->getMaterialNodePointer(matID)->change();
             mpCLModelData->getMaterialNodePointer(matID)->setMaterialAnm(m_tex_eye_scroll[no]);
@@ -3818,7 +3818,7 @@ void daPy_lk_c::initTextureScroll() {
                 J3DTexMtx* tmtx;
                 if (mtl->getTexMtx(texMtxID) == NULL) {
                     tmtx = new J3DTexMtx();
-                    JUT_ASSERT(20984, tmtx != 0);
+                    JUT_ASSERT(20984, tmtx != NULL);
                     mtl->setTexMtx(no, tmtx);
                 }
                 if (mtl->getTexCoord(texMtxID) != NULL) {
@@ -3838,7 +3838,7 @@ void daPy_lk_c::initTextureScroll() {
                 temp = &btk->getSRTCenter(no);
                 tmtx->getTexMtxInfo().mCenter.z = temp->z;
                 
-                JUT_ASSERT(21001, mtl->getMaterialAnm() != 0);
+                JUT_ASSERT(21001, mtl->getMaterialAnm() != NULL);
                 
                 mtl->getMaterialAnm()->setTexMtxAnm(texMtxID, &m_texMtxAnm[no]);
             }
@@ -3903,11 +3903,11 @@ BOOL daPy_lk_c::createHeap() {
     mpYbafo00Btk->setFrame(mpYbafo00Btk->getFrameMax()-0.001f);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_YAURA00));
-    JUT_ASSERT(21130, tmp_modelData != 0);
+    JUT_ASSERT(21130, tmp_modelData != NULL);
     daPy_aura_c* aura_p = mMagicArmorAuraEntries;
     for (int i = 0; i < 6; i++) {
         aura_p->setModel(mDoExt_J3DModel__create(tmp_modelData, 0x00080000, 0x11001222));
-        JUT_ASSERT(21139, aura_p->getModel() != 0);
+        JUT_ASSERT(21139, aura_p->getModel() != NULL);
         aura_p++;
     }
     mpYaura00Btk = entryBtk(tmp_modelData, LINK_BTK_YAURA00);
@@ -3924,54 +3924,54 @@ BOOL daPy_lk_c::createHeap() {
     mYmgcs00Brk.entryFrame(0.0f);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_BOMB));
-    JUT_ASSERT(21169, tmp_modelData != 0);
+    JUT_ASSERT(21169, tmp_modelData != NULL);
     mpBombBrk = entryBrk(tmp_modelData, LINK_BRK_BOMB);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_GWP00));
-    JUT_ASSERT(21176, tmp_modelData != 0);
+    JUT_ASSERT(21176, tmp_modelData != NULL);
     mpGwp00BrkData = entryBrk(tmp_modelData, LINK_BRK_GWP00);
     mpGwp00BtkData = entryBtk(tmp_modelData, LINK_BTK_GWP00);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_ARROW));
-    JUT_ASSERT(21184, tmp_modelData != 0);
+    JUT_ASSERT(21184, tmp_modelData != NULL);
     mpIceArrowBtk = entryBtk(tmp_modelData, LINK_BTK_TTIPICE);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_ARROWGLITTER));
-    JUT_ASSERT(21191, tmp_modelData != 0);
+    JUT_ASSERT(21191, tmp_modelData != NULL);
     mpLightArrowBtk = entryBtk(tmp_modelData, LINK_BTK_TARROWGLITTER);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_GICER00));
-    JUT_ASSERT(21198, tmp_modelData != 0);
+    JUT_ASSERT(21198, tmp_modelData != NULL);
     mpGicer00Btk = entryBtk(tmp_modelData, LINK_BTK_GICER00);
     
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, LINK_BDL_GICER01));
-    JUT_ASSERT(21205, tmp_modelData != 0);
+    JUT_ASSERT(21205, tmp_modelData != NULL);
     mpGicer01Btk = entryBtk(tmp_modelData, LINK_BTK_GICER01);
     
     const int numCLJoints = 0x2A;
     m_old_fdata = new mDoExt_MtxCalcOldFrame(new J3DTransformInfo[numCLJoints], new Quaternion[numCLJoints]);
-    JUT_ASSERT(21233, m_old_fdata != 0);
+    JUT_ASSERT(21233, m_old_fdata != NULL);
     
     m_pbCalc[PART_UNDER_e] = new mDoExt_MtxCalcAnmBlendTblOld(m_old_fdata, ARRAY_SIZE(mAnmRatioUnder), mAnmRatioUnder);
-    JUT_ASSERT(21239, m_pbCalc[PART_UNDER_e] != 0);
+    JUT_ASSERT(21239, m_pbCalc[PART_UNDER_e] != NULL);
     
     m_pbCalc[PART_UPPER_e] = new mDoExt_MtxCalcAnmBlendTblOld(m_old_fdata, ARRAY_SIZE(mAnmRatioUpper), mAnmRatioUpper);
-    JUT_ASSERT(21245, m_pbCalc[PART_UPPER_e] != 0);
+    JUT_ASSERT(21245, m_pbCalc[PART_UPPER_e] != NULL);
     
     initTextureScroll();
     initTextureAnime();
     
     m_HIO = new daPy_HIO_c();
-    JUT_ASSERT(21254, m_HIO != 0);
+    JUT_ASSERT(21254, m_HIO != NULL);
     
     m_anm_heap_under[UNDER_MOVE0_e].m_buffer = new(0x20) u8[0xB400];
-    JUT_ASSERT(21259, m_anm_heap_under[UNDER_MOVE0_e].m_buffer != 0);
+    JUT_ASSERT(21259, m_anm_heap_under[UNDER_MOVE0_e].m_buffer != NULL);
     
     m_sanm_buffer = new(0x20) u8[0x200];
-    JUT_ASSERT(21266, m_sanm_buffer != 0);
+    JUT_ASSERT(21266, m_sanm_buffer != NULL);
     
     m_item_bck_buffer = new(0x20) u8[0x1000];
-    JUT_ASSERT(21269, m_item_bck_buffer != 0);
+    JUT_ASSERT(21269, m_item_bck_buffer != NULL);
     
     return TRUE;
 }
@@ -3992,16 +3992,16 @@ void daPy_lk_c::createAnimeHeap(JKRSolidHeap** pHeap, daPy_HEAP_TYPE heapType) {
     
     if (heapType == HEAP_TYPE_ITEM_ANIME_e) {
         mDoExt_transAnmBas* tmp_trans_bas = new mDoExt_transAnmBas(NULL);
-        JUT_ASSERT(21307, tmp_trans_bas != 0);
+        JUT_ASSERT(21307, tmp_trans_bas != NULL);
     } else if (heapType == HEAP_TYPE_UNDER_UPPER_e) {
         J3DAnmTransformKey* tmp_trans = new J3DAnmTransformKey;
-        JUT_ASSERT(21310, tmp_trans != 0);
+        JUT_ASSERT(21310, tmp_trans != NULL);
     } else if (heapType == HEAP_TYPE_TEXTURE_ANIME_e) {
         J3DAnmTexPattern* tmp_tp = new J3DAnmTexPattern;
-        JUT_ASSERT(21313, tmp_tp != 0);
+        JUT_ASSERT(21313, tmp_tp != NULL);
     } else { // heapType == HEAP_TYPE_TEXTURE_SCROLL_e
         J3DAnmTextureSRTKey* tmp_tk = new J3DAnmTextureSRTKey;
-        JUT_ASSERT(21316, tmp_tk != 0);
+        JUT_ASSERT(21316, tmp_tk != NULL);
     }
     
     mDoExt_restoreCurrentHeap();
@@ -4012,9 +4012,9 @@ void daPy_lk_c::createAnimeHeap(JKRSolidHeap** pHeap, daPy_HEAP_TYPE heapType) {
 J3DModelData* daPy_lk_c::initModel(J3DModel** i_model, int i_fileIndex, u32 i_differedDlistFlag) {
     J3DModelData* tmp_modelData;
     tmp_modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, i_fileIndex));
-    JUT_ASSERT(21340, tmp_modelData != 0);
+    JUT_ASSERT(21340, tmp_modelData != NULL);
     *i_model = mDoExt_J3DModel__create(tmp_modelData, 0x00080000, i_differedDlistFlag);
-    JUT_ASSERT(21344, *i_model != 0);
+    JUT_ASSERT(21344, *i_model != NULL);
     return tmp_modelData;
 }
 
@@ -4181,13 +4181,13 @@ void daPy_lk_c::playerInit() {
     
     mpItemHeaps[0] = mDoExt_createSolidHeapFromGameToCurrent(0xE600, 0x20);
     u8* dummy_data = new u8[0xE600];
-    JUT_ASSERT(0x5493, dummy_data != 0);
+    JUT_ASSERT(0x5493, dummy_data != NULL);
     mDoExt_restoreCurrentHeap();
     mDoExt_adjustSolidHeap(mpItemHeaps[0]);
     
     mpItemHeaps[1] = mDoExt_createSolidHeapFromGameToCurrent(0xE600, 0x20);
     dummy_data = new u8[0xE600];
-    JUT_ASSERT(0x5499, dummy_data != 0);
+    JUT_ASSERT(0x5499, dummy_data != NULL);
     mDoExt_restoreCurrentHeap();
     mDoExt_adjustSolidHeap(mpItemHeaps[1]);
     
@@ -4212,10 +4212,10 @@ void daPy_lk_c::playerInit() {
     resetSeAnime();
     
     ResTIMG* tmp_tex = (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_I4_BALL128B);
-    JUT_ASSERT(0x54B7, tmp_tex != 0);
+    JUT_ASSERT(0x54B7, tmp_tex != NULL);
     mSightPacket.setSightTex(tmp_tex);
     ResTIMG* tmp_img = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_ROCK_MARK);
-    JUT_ASSERT(0x54BD, tmp_img != 0);
+    JUT_ASSERT(0x54BD, tmp_img != NULL);
     void* tmp_img_data = reinterpret_cast<void*>(reinterpret_cast<u32>(tmp_img) + tmp_img->imageOffset);
     mSightPacket.setLockTex(tmp_img_data);
     mSightPacket.setImage(tmp_img);
@@ -4263,9 +4263,9 @@ void daPy_lk_c::playerInit() {
     ResTIMG* linktex_casual = (ResTIMG*)dComIfG_getObjectRes(l_arcName, LINK_BTI_LINKTEXBCI4);
     int num_linktex_headers_seen = 0;
     J3DTexture* texture = mpCLModelData->getTexture();
-    JUT_ASSERT(0x5504, texture != 0);
+    JUT_ASSERT(0x5504, texture != NULL);
     JUTNameTab* textureName = mpCLModelData->getTextureName();
-    JUT_ASSERT(0x5506, textureName != 0);
+    JUT_ASSERT(0x5506, textureName != NULL);
     for (u16 i = 0; i < texture->getNum(); i++) {
         const char* texName = textureName->getName(i);
         if (strcmp(texName, "linktexS3TC") != 0) {
diff --git a/src/d/actor/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp
index e384cd9dd..39c6378b1 100644
--- a/src/d/actor/d_a_player_npc.cpp
+++ b/src/d/actor/d_a_player_npc.cpp
@@ -77,13 +77,13 @@ void daPy_npc_c::setOffsetHomePos() {
 
 /* 8015A6A4-8015AA0C       .text setPointRestart__10daPy_npc_cFsSc */
 void daPy_npc_c::setPointRestart(s16 i_point, s8 option) {
-    JUT_ASSERT(157, dComIfGp_getStagePlayer() != 0);
+    JUT_ASSERT(157, dComIfGp_getStagePlayer() != NULL);
     stage_scls_info_dummy_class* sclsinfo = dComIfGp_getStageSclsInfo();
-    JUT_ASSERT(159, sclsinfo != 0);
+    JUT_ASSERT(159, sclsinfo != NULL);
     
     JUT_ASSERT(161, 0 <= i_point && i_point < sclsinfo->num);
     stage_scls_info_class* scls_data = sclsinfo->m_entries;
-    JUT_ASSERT(163, scls_data != 0);
+    JUT_ASSERT(163, scls_data != NULL);
     
     stage_actor_data_class* player_data = dComIfGp_getStagePlayer()->m_entries;
     int scls_start_code = scls_data[i_point].mStart;
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 6cfca54cc..2fbc360bd 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -203,7 +203,7 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) {
 /* 000006C0-0000096C       .text _createHeap__6daRd_cFv */
 BOOL daRd_c::_createHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, RD_BDL_RD));
-    JUT_ASSERT(504, modelData != 0);
+    JUT_ASSERT(504, modelData != NULL);
     
     mpMorf = new mDoExt_McaMorf(
         modelData,
@@ -224,7 +224,7 @@ BOOL daRd_c::_createHeap() {
     }
     
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, RD_BTK_RD_CLOSE));
-    JUT_ASSERT(525, btk != 0);
+    JUT_ASSERT(525, btk != NULL);
     if (!mBtkAnm.init(modelData, btk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
     }
@@ -232,7 +232,7 @@ BOOL daRd_c::_createHeap() {
     modelData->getJointNodePointer(0x0C)->setCallBack(nodeHeadControl_CB); // ree_atama_1
     
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, RD_BRK_NML));
-    JUT_ASSERT(550, brk != 0);
+    JUT_ASSERT(550, brk != NULL);
     if (!mBrkAnm.init(modelData, brk, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0)) {
         return FALSE;
     }
@@ -1341,7 +1341,7 @@ void daRd_c::setBrkAnm(s8 idx) {
     
     J3DModel* model = mpMorf->getModel();
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(m_arc_name, a_anm_idx_tbl[idx]));
-    JUT_ASSERT(1890, brk != 0);
+    JUT_ASSERT(1890, brk != NULL);
     mBrkAnm.init(model->getModelData(), brk, true, a_play_mod_tbl[idx], 1.0f, 0, -1, true, 0);
 }
 
@@ -1373,7 +1373,7 @@ void daRd_c::setBtkAnm(s8 idx) {
     int r5 = a_play_prm_tbl[m6DB].m00;
     if (m6DC != m6DB && r5 != -1) {
         J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(m_arc_name, a_anm_idx_tbl[r5]));
-        JUT_ASSERT(1930, btk != 0);
+        JUT_ASSERT(1930, btk != NULL);
         J3DModelData* modelData = mpMorf->getModel()->getModelData();
         mBtkAnm.init(modelData, btk, true, a_play_prm_tbl[m6DB].m04, 1.0f, 0, -1, true, 0);
         
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index fb79b7616..6dbbfd51a 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -657,7 +657,7 @@ void daSea_packet_c::draw() {
         return;
     }
 
-    JUT_ASSERT(VERSION_SELECT(0x519, 0x518, 0x518), m_draw_vtx != 0); // Redundant assert
+    JUT_ASSERT(VERSION_SELECT(0x519, 0x518, 0x518), m_draw_vtx != NULL); // Redundant assert
 
 #if VERSION != VERSION_JPN
     j3dSys.reinitGX();
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index da8392475..75141a94f 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -103,7 +103,7 @@ s32 daSwhit0_c::getSwNo2() {
 /* 000000C4-00000230       .text CreateHeap__10daSwhit0_cFv */
 BOOL daSwhit0_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_OBM_SYOUGEKISW);
-    JUT_ASSERT(0xD5, modelData != 0);
+    JUT_ASSERT(0xD5, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202);
     if (mpModel == NULL) {
diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp
index 1041233eb..fbc1f2822 100644
--- a/src/d/actor/d_a_swtact.cpp
+++ b/src/d/actor/d_a_swtact.cpp
@@ -32,7 +32,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_ac) {
 /* 000000CC-00000194       .text CreateHeap__10daSwTact_cFv */
 BOOL daSwTact_c::CreateHeap() {
     J3DModelData * modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, ITACT_BDL_ITACT);
-    JUT_ASSERT(0xe1, modelData != 0);
+    JUT_ASSERT(0xe1, modelData != NULL);
     model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (model == NULL)
         return FALSE;
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index ecf784bcb..0e893e60b 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -95,7 +95,7 @@ s32 daTbox_c::commonShapeSet() {
 
     // Load model
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", mdlInfo.modelId);
-    JUT_ASSERT(0xA0, modelData != 0);
+    JUT_ASSERT(0xA0, modelData != NULL);
 
     u32 modelFlags = 0x11000022;
 
@@ -176,7 +176,7 @@ s32 daTbox_c::commonShapeSet() {
 /* 00000598-00000764       .text effectShapeSet__8daTbox_cFv */
 s32 daTbox_c::effectShapeSet() {
     J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH);
-    JUT_ASSERT(0x117, flashModelData != 0);
+    JUT_ASSERT(0x117, flashModelData != NULL);
 
     mpFlashMdl = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200);
     if (mpFlashMdl == NULL) {
@@ -239,7 +239,7 @@ s32 daTbox_c::bgCheckSet() {
     modelInfo& mdlInfo = getModelInfo();
 
     cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", mdlInfo.closedColId);
-    JUT_ASSERT(0x195, bgd != 0);
+    JUT_ASSERT(0x195, bgd != NULL);
 
     mpBgWClosed = new dBgW();
     if (mpBgWClosed == NULL) {
@@ -251,7 +251,7 @@ s32 daTbox_c::bgCheckSet() {
     }
 
     bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", mdlInfo.openColId);
-    JUT_ASSERT(0x1A6, bgd != 0);
+    JUT_ASSERT(0x1A6, bgd != NULL);
 
     mpBgWOpen = new dBgW();
     if (mpBgWOpen == NULL) {
@@ -264,7 +264,7 @@ s32 daTbox_c::bgCheckSet() {
 
     if (getFuncType() == FUNC_TYPE_SWITCH_VISIBLE) {
         bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", DALWAYS_DZB_KINB_00);
-        JUT_ASSERT(0x1B9, bgd != 0);
+        JUT_ASSERT(0x1B9, bgd != NULL);
 
         mpBgWVines = new dBgW();
         if (mpBgWVines == NULL) {
diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp
index 48bd22cbe..53dd117e2 100644
--- a/src/d/actor/d_a_toge.cpp
+++ b/src/d/actor/d_a_toge.cpp
@@ -68,7 +68,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 0000015C-00000290       .text CreateHeap__8daToge_cFv */
 BOOL daToge_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HTOGE1_BDL_HTOGE1);
-    JUT_ASSERT(0x11A, modelData != 0);
+    JUT_ASSERT(0x11A, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000U, 0x11000002U);
 
diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp
index 5e7fb9132..807070f04 100644
--- a/src/d/actor/d_a_vrbox.cpp
+++ b/src/d/actor/d_a_vrbox.cpp
@@ -165,7 +165,7 @@ static BOOL daVrbox_solidHeapCB(fopAc_ac_c* i_actor) {
     vrbox_class* i_this = static_cast<vrbox_class*>(i_actor);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_sky.bdl");
-    JUT_ASSERT(469, modelData != 0);
+    JUT_ASSERT(469, modelData != NULL);
 
     i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
 
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index 554d233dd..868c18b94 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -256,7 +256,7 @@ static BOOL daVrbox2_solidHeapCB(fopAc_ac_c* i_actor) {
     vrbox2_class* i_this = static_cast<vrbox2_class*>(i_actor);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_back_cloud.bdl");
-    JUT_ASSERT(0x211, modelData != 0);
+    JUT_ASSERT(0x211, modelData != NULL);
     i_this->mpBackCloud = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202);
 
     modelData = (J3DModelData*)dComIfG_getStageRes("Stage", "vr_kasumi_mae.bdl");
diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp
index 58d70e0f5..bcd783f53 100644
--- a/src/d/actor/d_a_wall.cpp
+++ b/src/d/actor/d_a_wall.cpp
@@ -106,7 +106,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 BOOL daWall_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)(dComIfG_getObjectRes(m_arcname[mType], m_bmdname[mType]));
-    JUT_ASSERT(0x181, modelData != 0);
+    JUT_ASSERT(0x181, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (mpModel == NULL)
diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp
index 353f91fa0..75ebf5206 100644
--- a/src/d/actor/d_a_wind_tag.cpp
+++ b/src/d/actor/d_a_wind_tag.cpp
@@ -76,7 +76,7 @@ BOOL daWindTag::CheckCreateHeap(fopAc_ac_c* i_ac) {
 BOOL daWindTag::daWindTag_c::CreateHeap() {
     /* Nonmatching */
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType]);
-    JUT_ASSERT(0x16A, modelData != 0);
+    JUT_ASSERT(0x16A, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
     if (mpModel == NULL)
diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp
index 7c6750fb5..56e2573d2 100644
--- a/src/d/actor/d_a_ygcwp.cpp
+++ b/src/d/actor/d_a_ygcwp.cpp
@@ -49,7 +49,7 @@ BOOL daYgcwp_c::create_heap() {
     s32 i;
     BOOL ret = FALSE;
     J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, YGCWP_BDL_YGCWP00));
-    JUT_ASSERT(0xBE, mdl_data != 0);
+    JUT_ASSERT(0xBE, mdl_data != NULL);
 
     if (mdl_data != NULL) {
         mpModel = mDoExt_J3DModel__create(mdl_data, 0x80000, 0x11000222);
@@ -58,7 +58,7 @@ BOOL daYgcwp_c::create_heap() {
 
             for (i = 0; i < (s32)ARRAY_SIZE(mBrkAnm); i++) {
                 J3DAnmTevRegKey* brk_p = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(M_arcname, M_brk_table[i]));
-                JUT_ASSERT(0xC9, brk_p != 0);
+                JUT_ASSERT(0xC9, brk_p != NULL);
                 if (brk_p != NULL) {
                     if (!mBrkAnm[i].init(mdl_data, brk_p, TRUE, M_brk_mode_table[i], 1.0f, 0, -1, false, 0)) {
                         ret = FALSE;
diff --git a/src/d/d_a_branch_static.cpp b/src/d/d_a_branch_static.cpp
index 185adcdd5..c57fbc8d3 100644
--- a/src/d/d_a_branch_static.cpp
+++ b/src/d/d_a_branch_static.cpp
@@ -9,7 +9,7 @@
 
 /* 80068510-800685F8       .text getJointMtx__10daBranch_cFPCc */
 MtxP daBranch_c::getJointMtx(const char* jointName) {
-    JUT_ASSERT(22, mModel[0] != 0);
+    JUT_ASSERT(22, mModel[0] != NULL);
     JUTNameTab* nameTable = mModel[0]->getModelData()->getJointName();
     u16 jointNum = mModel[0]->getModelData()->getJointNum();
     if (nameTable == NULL || jointNum == 0) {
diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp
index ae7542d3b..2437094ee 100644
--- a/src/d/d_a_obj.cpp
+++ b/src/d/d_a_obj.cpp
@@ -143,7 +143,7 @@ namespace daObj {
     /* 80066D6C-8006700C       .text posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz */
     void posMoveF_grade(fopAc_ac_c* pActor, const cXyz* pAddVel, const cXyz* stream_spd, f32 param_4, f32 param_5, const cXyz* pNorm, f32 friction, f32 no_grade_cos, const cXyz* pAddAccel) {
         /* Nonmatching */
-        JUT_ASSERT(0x118, stream_spd != 0)
+        JUT_ASSERT(0x118, stream_spd != NULL)
 
         cXyz resist_accel;
         posMoveF_resist_acc(&resist_accel, pActor, stream_spd, param_4, param_5);
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 385e7f0e3..910dc3019 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -51,10 +51,10 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) {
     field_0x01b = 0;
     mLockOnTargetBsPcID = fpcM_ERROR_PROCESS_ID_e;
     heap = mDoExt_createSolidHeapFromGameToCurrent(0x3600, 0);
-    JUT_ASSERT(0xb9, heap != 0);
+    JUT_ASSERT(0xb9, heap != NULL);
 
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YAZIRUSHI_01);
-    JUT_ASSERT(0xbe, modelData != 0);
+    JUT_ASSERT(0xbe, modelData != NULL);
 
     int anmColNum = 0;
     for (u32 i = 0; i < 5; i++) {
@@ -62,7 +62,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) {
             ALWAYS_BPK_YJ_IN, ALWAYS_BPK_YJ_OUT, ALWAYS_BPK_YJ_SCALE, ALWAYS_BPK_YJ_LOOP, ALWAYS_BPK_YJ_DELETE,
         };
         J3DAnmColor* anmCol = (J3DAnmColor*)dComIfG_getObjectRes("Always", l_bpkIdx[i]);
-        JUT_ASSERT(0xcc, anmCol != 0);
+        JUT_ASSERT(0xcc, anmCol != NULL);
 
         anmCol->searchUpdateMaterialID(modelData);
         if (anmCol->getUpdateMaterialNum() > anmColNum)
@@ -79,7 +79,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* player, u32 playerNo) {
             0x00080000,
             0x01000003
         );
-        JUT_ASSERT(0xe3, draw[i].anm != 0 && draw[i].anm->getModel() != 0);
+        JUT_ASSERT(0xe3, draw[i].anm != NULL && draw[i].anm->getModel() != NULL);
         draw[i].mpAnmClr = NULL;
         draw[i].mpAnmMatClr = new J3DMatColorAnm[anmColNum];
     }
diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp
index 88af2ea2c..6a6e63f8e 100644
--- a/src/d/d_bg_s_acch.cpp
+++ b/src/d/d_bg_s_acch.cpp
@@ -94,8 +94,8 @@ void dBgS_Acch::Set(cXyz* pos, cXyz* old_pos, fopAc_ac_c* actor, int tbl_size, d
                     csXyz* angle, csXyz* shape_angle) {
     pm_pos = pos;
     pm_old_pos = old_pos;
-    JUT_ASSERT(221, pm_pos != 0);
-    JUT_ASSERT(222, pm_old_pos != 0);
+    JUT_ASSERT(221, pm_pos != NULL);
+    JUT_ASSERT(222, pm_old_pos != NULL);
 
     m_my_ac = actor;
     SetActorPid(fopAcM_GetID(actor));
@@ -218,8 +218,8 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
         return;
     }
 
-    JUT_ASSERT(494, pm_pos != 0);
-    JUT_ASSERT(495, pm_old_pos != 0);
+    JUT_ASSERT(494, pm_pos != NULL);
+    JUT_ASSERT(495, pm_old_pos != NULL);
 
     CHECK_FLOAT_CLASS(535, pm_pos->x);
     CHECK_FLOAT_CLASS(536, pm_pos->y);
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index 53df21454..ffaffc8c3 100644
--- a/src/d/d_cc_d.cpp
+++ b/src/d/d_cc_d.cpp
@@ -263,7 +263,7 @@ void dCcD_GObjInf::Set(const dCcD_SrcGObjInf& src) {
 
 /* 800ABC54-800ABCC4       .text dCcD_GetGObjInf__FP8cCcD_Obj */
 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* pobj) {
-    JUT_ASSERT(VERSION_SELECT(466, 531, 531), pobj != 0);
+    JUT_ASSERT(VERSION_SELECT(466, 531, 531), pobj != NULL);
     return (dCcD_GObjInf*)pobj->GetGObjInf();
 }
 
diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp
index 3102d64a3..c3f569cb2 100644
--- a/src/d/d_cc_mass_s.cpp
+++ b/src/d/d_cc_mass_s.cpp
@@ -34,14 +34,14 @@ void dCcMassS_Mng::Prepare() {
     cCcD_ShapeAttr* attr;
     for (dCcMassS_Obj* mass = mMassObjs; mass < mMassObjs + mMassObjCount; mass++) {
         cCcD_Obj* pobj = mass->GetObj();
-        JUT_ASSERT(61, pobj != 0);
+        JUT_ASSERT(61, pobj != NULL);
         attr = pobj->GetShapeAttr();
         attr->CalcAabBox();
         area.SetMinMax(attr->GetWorkAab());
     }
     for (dCcMassS_Obj* mass = mMassAreas; mass < mMassAreas + mMassAreaCount; mass++) {
         cCcD_Obj* parea = mass->GetObj();
-        JUT_ASSERT(73, parea != 0);
+        JUT_ASSERT(73, parea != NULL);
         attr = parea->GetShapeAttr();
         attr->CalcAabBox();
         area.SetMinMax(attr->GetWorkAab());
@@ -54,14 +54,14 @@ void dCcMassS_Mng::Prepare() {
     mDivideArea.SetArea(area);
     for (dCcMassS_Obj* mass = mMassObjs; mass < mMassObjs + mMassObjCount; mass++) {
         cCcD_Obj* pobj = mass->GetObj();
-        JUT_ASSERT(93, pobj != 0);
+        JUT_ASSERT(93, pobj != NULL);
         cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
         cCcD_DivideInfo* divideInfo = mass->GetPDivideInfo();
         mDivideArea.CalcDivideInfo(divideInfo, shape->GetWorkAab(), 0);
     }
     for (dCcMassS_Obj* mass = mMassAreas; mass < mMassAreas + mMassAreaCount; mass++) {
         cCcD_Obj* parea = mass->GetObj();
-        JUT_ASSERT(104, parea != 0);
+        JUT_ASSERT(104, parea != NULL);
         cCcD_ShapeAttr* shape = parea->GetShapeAttr();
         cCcD_DivideInfo* divideInfo = mass->GetPDivideInfo();
         mDivideArea.CalcDivideInfo(divideInfo, shape->GetWorkAab(), 0);
@@ -96,7 +96,7 @@ u32 dCcMassS_Mng::Chk(cXyz* r29, fopAc_ac_c** r30, dCcMassS_HitInf* r31) {
             }
             
             cCcD_Obj* pobj = mass->GetObj();
-            JUT_ASSERT(174, pobj != 0);
+            JUT_ASSERT(174, pobj != NULL);
             cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
             
             f32 sp10;
@@ -121,7 +121,7 @@ u32 dCcMassS_Mng::Chk(cXyz* r29, fopAc_ac_c** r30, dCcMassS_HitInf* r31) {
         
         cCcD_Obj* pobj = mass->GetObj();
         dCcD_GObjInf* inf = (dCcD_GObjInf*)pobj->GetGObjInf();
-        JUT_ASSERT(214, pobj != 0);
+        JUT_ASSERT(214, pobj != NULL);
         cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
         cXyz temp;
         if (pobj->ChkAtSet() && !inf->ChkAtNoMass() &&
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 293a0fb76..e981195fb 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -269,14 +269,14 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
 void dComIfG_play_c::createParticle() {
     mParticle = new dPa_control_c();
 
-    JUT_ASSERT(VERSION_SELECT(358, 360, 360), mParticle != 0);
+    JUT_ASSERT(VERSION_SELECT(358, 360, 360), mParticle != NULL);
 }
 
 /* 800528F4-8005297C       .text createDemo__14dComIfG_play_cFv */
 void dComIfG_play_c::createDemo() {
     mDemo = new dDemo_manager_c();
 
-    JUT_ASSERT(VERSION_SELECT(388, 390, 390), mDemo != 0);
+    JUT_ASSERT(VERSION_SELECT(388, 390, 390), mDemo != NULL);
 }
 
 /* 8005297C-800529B8       .text removeDemo__14dComIfG_play_cFv */
@@ -1060,12 +1060,12 @@ static void dummy() {
 /* 8005468C-800547BC       .text getSceneList__Fi */
 stage_scls_info_class* getSceneList(int i_no) {
     stage_scls_info_dummy_class* sclsInfo = dComIfGp_getStage().getSclsInfo();
-    JUT_ASSERT(VERSION_SELECT(2129, 2132, 2132), sclsInfo != 0);
+    JUT_ASSERT(VERSION_SELECT(2129, 2132, 2132), sclsInfo != NULL);
 
     JUT_ASSERT(VERSION_SELECT(2131, 2134, 2134), 0 <= i_no && i_no < sclsInfo->num);
 
     stage_scls_info_class* sclsData = sclsInfo->m_entries;
-    JUT_ASSERT(VERSION_SELECT(2133, 2136, 2136), sclsData != 0);
+    JUT_ASSERT(VERSION_SELECT(2133, 2136, 2136), sclsData != NULL);
 
     return &sclsData[i_no];
 }
@@ -1205,7 +1205,7 @@ void dComIfGs_setGameStartStage() {
             strcpy(stage_name, "sea");
 
             stage_map_info_class* mapInfo = dComIfGp_getStage().getMapInfo();
-            JUT_ASSERT(VERSION_SELECT(2359, 2362, 2362), mapInfo != 0);
+            JUT_ASSERT(VERSION_SELECT(2359, 2362, 2362), mapInfo != NULL);
 
             room_no = 4 + dStage_mapInfo_GetOceanX(mapInfo) + ((dStage_mapInfo_GetOceanZ(mapInfo) + 3) * 7);
             point = 0;
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 7df64c53d..5468abcfd 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -80,9 +80,9 @@ void dDemo_getJaiPointer(const char*, u32, int, u16*) {
 BOOL dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, const char*, int, u16*, u32, s8) {
     /* Nonmatching */
     char* a_name;
-    JUT_ASSERT(0, a_name != 0);
+    JUT_ASSERT(0, a_name != NULL);
     void* i_key;
-    JUT_ASSERT(0, i_key != 0);
+    JUT_ASSERT(0, i_key != NULL);
 }
 
 /* 80069BC0-80069BDC       .text JSGSetData__13dDemo_actor_cFUlPCvUl */
@@ -496,21 +496,21 @@ dDemo_manager_c::dDemo_manager_c() {
     mFrame = 0;
     
     mMesgControl = new dMesg_tControl();
-    JUT_ASSERT(0x5b7, mMesgControl != 0);
+    JUT_ASSERT(0x5b7, mMesgControl != NULL);
     mSystem = new dDemo_system_c();
-    JUT_ASSERT(0x5ba, mSystem != 0);
+    JUT_ASSERT(0x5ba, mSystem != NULL);
     mControl = new JStudio::TControl();
-    JUT_ASSERT(0x5bc, mControl != 0);
+    JUT_ASSERT(0x5bc, mControl != NULL);
     mStage = new JStudio_JStage::TCreateObject(mSystem);
-    JUT_ASSERT(0x5be, mStage != 0);
+    JUT_ASSERT(0x5be, mStage != NULL);
     mAudio = new JStudio_JAudio::TCreateObject(mDoAud_zelAudio_c::getInterface());
-    JUT_ASSERT(0x5c0, mAudio != 0);
+    JUT_ASSERT(0x5c0, mAudio != NULL);
     mParticle = new JStudio_JParticle::TCreateObject(dPa_control_c::getEmitterManager(), mSystem);
-    JUT_ASSERT(0x5c3, mParticle != 0);
+    JUT_ASSERT(0x5c3, mParticle != NULL);
     mMessage = new JStudio_JMessage::TCreateObject(mMesgControl);
-    JUT_ASSERT(0x5c6, mMessage != 0);
+    JUT_ASSERT(0x5c6, mMessage != NULL);
     mFactory = new JStudio::TFactory();
-    JUT_ASSERT(0x5c9, mFactory != 0);
+    JUT_ASSERT(0x5c9, mFactory != NULL);
     
     // This gets compiled to a double literal, but the lack of precision indicates it was written as a float literal.
     mControl->mSecondPerFrame = 1/30.0f;
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 5b4f1170b..bbacc02af 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -2279,7 +2279,7 @@ void dDlst_list_c::wipeIn(f32 speed, GXColor& color) {
         mWipeRate = 1.0f;
     }
     ResTIMG* texture = (ResTIMG*)JKRGetResource('TIMG', "wipe_00.bti", dComIfGp_getMenuArchive());
-    JUT_ASSERT(0x1637, texture != 0);
+    JUT_ASSERT(0x1637, texture != NULL);
     mWipeDlst.init(texture, -9.0f, -21.0f, 659.0f, 524.0f, 0, 1, 1, 2.0f, 2.436f);
 }
 
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index 5aa8ac2cf..cbcfd867f 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -149,7 +149,7 @@ s32 dGameover_c::_create() {
     if (rt == cPhs_COMPLEATE_e) {
         dComIfGs_addDeathCount();
         dRes_info_c* resInfo = dComIfG_getObjectResInfo("Gover");
-        JUT_ASSERT(0xa0, resInfo != 0);
+        JUT_ASSERT(0xa0, resInfo != NULL);
 
         mpHeap = dComIfGp_getExpHeap2D();
         dComIfGp_setHeapLockFlag(4);
@@ -159,12 +159,12 @@ s32 dGameover_c::_create() {
         dgo_scrn_c->setScreen("gameover.blo", resInfo->getArchive());
 
         dMs_c = new dMenu_save_c();
-        JUT_ASSERT(0xb6, dMs_c != 0);
+        JUT_ASSERT(0xb6, dMs_c != NULL);
         dMs_c->field_0x0537 = 2;
         dMs_c->_create();
 
         dgo_capture_c = new dDlst_Gameover_CAPTURE_c();
-        JUT_ASSERT(0xbb, dgo_capture_c != 0);
+        JUT_ASSERT(0xbb, dgo_capture_c != NULL);
 
         mDoExt_setCurrentHeap(oldHeap);
     } else {
diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp
index 5fbf223db..44fda1007 100644
--- a/src/d/d_ky_thunder.cpp
+++ b/src/d/d_ky_thunder.cpp
@@ -138,7 +138,7 @@ s32 dThunder_c::create() {
 
     new(this) dThunder_c();
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YTHDR00);
-    JUT_ASSERT(0x6e, modelData != 0);
+    JUT_ASSERT(0x6e, modelData != NULL);
 
     mModelInfo.mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x01000200);
     if (mModelInfo.mpModel == NULL)
@@ -148,12 +148,12 @@ s32 dThunder_c::create() {
         return cPhs_ERROR_e;
 
     J3DAnmTextureSRTKey * anm = (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("Always", ALWAYS_BTK_YTHDR00);
-    JUT_ASSERT(0x7d, anm != 0);
+    JUT_ASSERT(0x7d, anm != NULL);
     if (!mModelInfo.mBtk.init(modelData, anm, false, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0))
         return cPhs_ERROR_e;
 
     J3DAnmTevRegKey * canm = (J3DAnmTevRegKey *)dComIfG_getObjectRes("Always", ALWAYS_BRK_YTHDR00);
-    JUT_ASSERT(0x8c, canm != 0);
+    JUT_ASSERT(0x8c, canm != NULL);
     if (!mModelInfo.mBrk.init(modelData, canm, true, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0))
         return cPhs_ERROR_e;
 
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index e9b328097..0c87b8358 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -86,7 +86,7 @@ void dLib_debugDrawFan(cXyz& center, s16 angleY, s16 fanSpreadAngle, f32 radius,
 /* 80057510-800575E0       .text dLib_brkInit__FP12J3DModelDataP13mDoExt_brkAnmPCci */
 bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcName, int fileno) {
     J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(arcName, fileno);
-    JUT_ASSERT(0xae, brk != 0);
+    JUT_ASSERT(0xae, brk != NULL);
     if (anm->init(modelData, brk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0)
         return false;
     return true;
@@ -95,7 +95,7 @@ bool dLib_brkInit(J3DModelData* modelData, mDoExt_brkAnm* anm, const char* arcNa
 /* 800575E0-800576B0       .text dLib_btkInit__FP12J3DModelDataP13mDoExt_btkAnmPCci */
 bool dLib_btkInit(J3DModelData* modelData, mDoExt_btkAnm* anm, const char* arcName, int fileno) {
     J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(arcName, fileno);
-    JUT_ASSERT(0xbb, btk != 0);
+    JUT_ASSERT(0xbb, btk != NULL);
     if (anm->init(modelData, btk, 1, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false, 0) == 0)
         return false;
     return true;
@@ -196,7 +196,7 @@ void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no) {
     }
     
     stage_scls_info_class* scls_data = sclsinfo->m_entries;
-    JUT_ASSERT(462, scls_data != 0);
+    JUT_ASSERT(462, scls_data != NULL);
     JUT_ASSERT(463, 0 <= i_sclsnum && i_sclsnum < sclsinfo->num);
     
     stage_scls_info_class* scls_entry = &scls_data[i_sclsnum];
diff --git a/src/d/d_material.cpp b/src/d/d_material.cpp
index 8dcec714e..26813d5f4 100644
--- a/src/d/d_material.cpp
+++ b/src/d/d_material.cpp
@@ -16,7 +16,7 @@ dMat_ice_c* dMat_control_c::mIce;
 
 /* 8006F62C-8006F69C       .text restore__13dMat_backup_cFv */
 void dMat_backup_c::restore() {
-    JUT_ASSERT(82, mModelData != 0);
+    JUT_ASSERT(82, mModelData != NULL);
     field_0x8.restore(mModelData);
 }
 
@@ -24,7 +24,7 @@ void dMat_backup_c::restore() {
 void dMat_ice_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
     mMaterialTable = param_1;
     int rt = mBtkAnm.init(mMaterialTable, param_2, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false, 0);
-    JUT_ASSERT(98, rt != 0);
+    JUT_ASSERT(98, rt != FALSE);
     mBtkAnm.entry(mMaterialTable, mBtkAnm.getFrameCtrl()->getFrame());
 }
 
@@ -141,11 +141,11 @@ void dMat_ice_c::entryDL(mDoExt_McaMorf* morf, s8 backupNo, mDoExt_invisibleMode
 /* 8006FB84-8006FCF0       .text create__14dMat_control_cFP16J3DMaterialTableP19J3DAnmTextureSRTKey */
 void dMat_control_c::create(J3DMaterialTable* param_1, J3DAnmTextureSRTKey* param_2) {
     mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
-    JUT_ASSERT(308, mHeap != 0);
+    JUT_ASSERT(308, mHeap != NULL);
     JKRHeap* heap = mDoExt_setCurrentHeap(mHeap);
     mBackup = new dMat_backup_c[16];
     mIce = new dMat_ice_c();
-    JUT_ASSERT(313, mBackup != 0 && mIce != 0);
+    JUT_ASSERT(313, mBackup != NULL && mIce != NULL);
     mIce->create(param_1, param_2);
     mTempBackup.create(0x40);
     mDoExt_adjustSolidHeap(mHeap);
diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp
index 5cb9ce866..75c5abb21 100644
--- a/src/d/d_meter.cpp
+++ b/src/d/d_meter.cpp
@@ -1838,39 +1838,39 @@ static s32 dMeter_Create(msg_class* i_this) {
 
     sub_meter_class* i_Meter = (sub_meter_class*)i_this;
     i_Meter->heap = fopMsgM_createExpHeap(0x2a819);
-    JUT_ASSERT(0x34a3, i_Meter->heap != 0);
+    JUT_ASSERT(0x34a3, i_Meter->heap != NULL);
 
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(i_Meter->heap);
     sMainParts1 = new J2DScreen();
-    JUT_ASSERT(0x34a8, sMainParts1 != 0);
+    JUT_ASSERT(0x34a8, sMainParts1 != NULL);
     sMainParts1->set("main_parts1.blo", dComIfGp_getMenuArchive());
 
     sMainParts2 = new J2DScreen();
-    JUT_ASSERT(0x34ac, sMainParts2 != 0);
+    JUT_ASSERT(0x34ac, sMainParts2 != NULL);
     sMainParts2->set("main_parts2.blo", dComIfGp_getMenuArchive());
 
     sMainParts3 = new J2DScreen();
-    JUT_ASSERT(0x34ac, sMainParts3 != 0);
+    JUT_ASSERT(0x34ac, sMainParts3 != NULL);
     sMainParts3->set("main_parts3.blo", dComIfGp_getMenuArchive());
 
     sChoiceRoad = new J2DScreen();
-    JUT_ASSERT(0x34ac, sChoiceRoad != 0);
+    JUT_ASSERT(0x34ac, sChoiceRoad != NULL);
     sChoiceRoad->set("choice_road.blo", dComIfGp_getMenuArchive());
 
     for (s32 i = 0; i < 3; i++) {
         i_Meter->actionTex[i] = (ResTIMG*)i_Meter->heap->alloc(0xc00, 0x20);
-        JUT_ASSERT(0x34b9, i_Meter->actionTex[i] != 0);
+        JUT_ASSERT(0x34b9, i_Meter->actionTex[i] != NULL);
 
         i_Meter->xyIconTex[i] = (ResTIMG*)i_Meter->heap->alloc(0xc00, 0x20);
-        JUT_ASSERT(0x34bb, i_Meter->xyIconTex[i] != 0);
+        JUT_ASSERT(0x34bb, i_Meter->xyIconTex[i] != NULL);
     }
 
     for (s32 i = 0; i < 2; i++) {
         i_Meter->moveIconTex[i] = (ResTIMG*)i_Meter->heap->alloc(0xc00, 0x20);
-        JUT_ASSERT(0x34c2, i_Meter->moveIconTex[i] != 0);
+        JUT_ASSERT(0x34c2, i_Meter->moveIconTex[i] != NULL);
 
         i_Meter->arrowTex[i] = (ResTIMG*)i_Meter->heap->alloc(0xc00, 0x20);
-        JUT_ASSERT(0x34c5, i_Meter->arrowTex[i] != 0);
+        JUT_ASSERT(0x34c5, i_Meter->arrowTex[i] != NULL);
     }
 
     if (strcmp(dComIfGp_getStartStageName(), "sea_T") != 0) {
diff --git a/src/d/d_metronome.cpp b/src/d/d_metronome.cpp
index 456276567..e67cbf37b 100644
--- a/src/d/d_metronome.cpp
+++ b/src/d/d_metronome.cpp
@@ -507,7 +507,7 @@ void dMetronome_c::initialize() {
 /* 8022309C-8022319C       .text _create__12dMetronome_cFv */
 void dMetronome_c::_create() {
     scrn = new J2DScreen();
-    JUT_ASSERT(0x2db, scrn != 0);
+    JUT_ASSERT(0x2db, scrn != NULL);
     scrn->set("baton_input.blo", dComIfGp_getTmsgArchive());
     screenSet();
     initialize();
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index dff2dcc3d..54984964b 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -96,12 +96,12 @@ void dPa_J3DmodelEmitter_c::draw() {
 /* 8007ADC4-8007AECC       .text __ct__18dPa_modelControl_cFP12J3DModelData */
 dPa_modelControl_c::dPa_modelControl_c(J3DModelData* modelData) {
     mModel = new dPa_J3Dmodel_c[0x80];
-    JUT_ASSERT(0x10f, mModel != 0);
+    JUT_ASSERT(0x10f, mModel != NULL);
 
     dPa_J3Dmodel_c * model = mModel;
     for (s32 i = 0; i < 0x80; i++, model++) {
         model->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x37221223);
-        JUT_ASSERT(0x120, model->mModel != 0);
+        JUT_ASSERT(0x120, model->mModel != NULL);
     }
 
     cLs_Create(this);
@@ -411,7 +411,7 @@ u8 dPa_control_c::mStatus;
 /* 8007C8E8-8007C9A4       .text __ct__13dPa_control_cFv */
 dPa_control_c::dPa_control_c() {
     mHeap = mDoExt_createSolidHeapFromSystem(0x16e800, 0);
-    JUT_ASSERT(0x4d8, mHeap != 0);
+    JUT_ASSERT(0x4d8, mHeap != NULL);
     mSceneNo = 0xFF;
     mCount = 0;
     mEmitterMng = NULL;
@@ -439,13 +439,13 @@ void dPa_control_c::swapFrameBufferTexture() {
 void dPa_control_c::createCommon(const void* param_1) {
     /* Nonmatching */
     mCommonResMng = new (mHeap, 0) JPAResourceManager(param_1, mHeap);
-    JUT_ASSERT(1313, mCommonResMng != 0);
+    JUT_ASSERT(1313, mCommonResMng != NULL);
     mCommonResMng->swapTexture(mDoGph_gInf_c::mFrameBufferTimg, "AK_kagerouSwap00");
     mEmitterMng = new(mHeap, 0) JPAEmitterManager(mCommonResMng, 3000, 150, 200, mHeap);
-    JUT_ASSERT(1324, mEmitterMng != 0);
+    JUT_ASSERT(1324, mEmitterMng != NULL);
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(mHeap);
     mModelControl = new dPa_modelControl_c((J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_MPODA));
-    JUT_ASSERT(1332, mModelControl != 0);
+    JUT_ASSERT(1332, mModelControl != NULL);
     for (u16 i = 0; i < 8; i++) {
         u16 var1 = dPa_name::j_o_id[i];
         if (mCommonResMng->pEmtrRes->checkUserIndexDuplication(var1)) {
@@ -461,10 +461,10 @@ void dPa_control_c::createCommon(const void* param_1) {
 void dPa_control_c::createRoomScene(const void* param_1) {
     /* Nonmatching */
     mSceneHeap = mDoExt_createSolidHeapFromGame(0, 0);
-    JUT_ASSERT(1369, mSceneHeap != 0);
+    JUT_ASSERT(1369, mSceneHeap != NULL);
     mpData = param_1;
     mSceneResMng = new (mSceneHeap, 0) JPAResourceManager(mpData, mSceneHeap);
-    JUT_ASSERT(1373, mSceneResMng != 0);
+    JUT_ASSERT(1373, mSceneResMng != NULL);
     mSceneResMng->swapTexture(mDoGph_gInf_c::mFrameBufferTimg, "AK_kagerouSwap00");
     mEmitterMng->pResMgrArray[1] = mSceneResMng;
     mDoExt_adjustSolidHeap(mSceneHeap);
diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp
index e48aa6a59..10596350f 100644
--- a/src/d/d_path.cpp
+++ b/src/d/d_path.cpp
@@ -9,7 +9,7 @@
 
 /* 80080018-8008010C       .text dPath_GetPnt__FP5dPathi */
 dPath__Point* dPath_GetPnt(dPath* path, int pnt_index) {
-    JUT_ASSERT(30, path != 0);
+    JUT_ASSERT(30, path != NULL);
     JUT_ASSERT(31, 0 <= pnt_index && pnt_index < path->m_num);
 
     if (path == NULL || path->mpPnt == NULL || 0 > pnt_index || pnt_index >= path->m_num)
diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp
index 59afc0c40..802551467 100644
--- a/src/d/d_place_name.cpp
+++ b/src/d/d_place_name.cpp
@@ -87,7 +87,7 @@ class dPn_c : public msg_class {
 /* 80160F60-801610A8       .text setScreen__13dPlace_name_cFPCcP10JKRArchive */
 void dPlace_name_c::setScreen(const char* name, JKRArchive* arc) {
     scrn = new J2DScreen();
-    JUT_ASSERT(VERSION_SELECT(69, 91, 91), scrn != 0);
+    JUT_ASSERT(VERSION_SELECT(69, 91, 91), scrn != NULL);
 
     scrn->set(name, arc);
     fopMsgM_setPaneData(&pane, scrn, 0x706e);
@@ -141,13 +141,13 @@ s32 dPn_c::_create() {
     if (mState == 0) {
         if (rt == cPhs_COMPLEATE_e) {
             dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName");
-            JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != 0);
+            JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != NULL);
 
             mpHeap = dComIfGp_getExpHeap2D();
             dComIfGp_setHeapLockFlag(10);
             JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
             dPn_scrn = new dPlace_name_c();
-            JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != 0);
+            JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != NULL);
             dPn_scrn->setScreen("place_name.blo", resInfo->getArchive());
             mpTIMG = (ResTIMG*)mpHeap->alloc(0x3c00, 0x20);
             mDoExt_setCurrentHeap(oldHeap);
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 7b2d4889e..f18173ccd 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -142,7 +142,7 @@ static void setToonTex(J3DMaterialTable* pMaterialTable) {
 
 /* 8006DFD4-8006E7A4       .text loadResource__11dRes_info_cFv */
 int dRes_info_c::loadResource() {
-    JUT_ASSERT(0x25f, mRes == 0);
+    JUT_ASSERT(0x25f, mRes == NULL);
 
     s32 fileNum = getResNum();
     mRes = new void*[fileNum];
@@ -397,7 +397,7 @@ int dRes_info_c::setRes() {
         }
         if (mpParentHeap != NULL) {
             mDataHeap = mDoExt_createSolidHeapToCurrent(0, mpParentHeap, 0x20);
-            JUT_ASSERT(0x3f5, mDataHeap != 0);
+            JUT_ASSERT(0x3f5, mDataHeap != NULL);
 
             loadResource();
             mDoExt_restoreCurrentHeap();
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index c6f1aaeb2..1b45ee73e 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -678,11 +678,11 @@ s32 phase_1(dScnLogo_c* i_this) {
 
     toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOON);
 
-    JUT_ASSERT(VERSION_SELECT(1208, 1426, 1466), toonImage != 0);
+    JUT_ASSERT(VERSION_SELECT(1208, 1426, 1466), toonImage != NULL);
     dDlst_list_c::setToonImage(toonImage);
 
     toonImage = (ResTIMG *)dComIfG_getObjectRes("System", SYSTEM_BTI_TOONEX);
-    JUT_ASSERT(VERSION_SELECT(1213, 1431, 1471), toonImage != 0);
+    JUT_ASSERT(VERSION_SELECT(1213, 1431, 1471), toonImage != NULL);
     dDlst_list_c::setToonExImage(toonImage);
 
     i_this->field_0x1f8 = mDoExt_getGameHeap()->alloc(0x3c8a0, 4);
@@ -714,9 +714,9 @@ s32 phase_2(dScnLogo_c* i_this) {
     ResTIMG * timg;
     
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_NINTENDO_376X104);
-    JUT_ASSERT(VERSION_SELECT(1264, 1482, 1522), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1264, 1482, 1522), timg != NULL);
     i_this->nintendoImg = new dDlst_2D_c(timg, 133, 170, 0);
-    JUT_ASSERT(VERSION_SELECT(1267, 1485, 1525), i_this->nintendoImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1267, 1485, 1525), i_this->nintendoImg != NULL);
     i_this->nintendoImg->setAlpha(0xFF);
 #if VERSION == VERSION_JPN
     // Blue Nintendo logo for JPN.
@@ -727,9 +727,9 @@ s32 phase_2(dScnLogo_c* i_this) {
 #endif
 
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_TITLE_DOLBY_MARK);
-    JUT_ASSERT(VERSION_SELECT(1276, 1498, 1538), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1276, 1498, 1538), timg != NULL);
     i_this->dolbyImg = new dDlst_2D_c(timg, 218, 166, 0);
-    JUT_ASSERT(VERSION_SELECT(1280, 1502, 1542), i_this->dolbyImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1280, 1502, 1542), i_this->dolbyImg != NULL);
     i_this->dolbyImg->setAlpha(0xFF);
 
 #if VERSION == VERSION_PAL
@@ -775,9 +775,9 @@ s32 phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_CHOICE);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1286, 1565, 1605), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1286, 1565, 1605), timg != NULL);
     i_this->progchoiceImg = new dDlst_2D_c(timg, 113, 281, 0);
-    JUT_ASSERT(VERSION_SELECT(1288, 1567, 1607), i_this->progchoiceImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1288, 1567, 1607), i_this->progchoiceImg != NULL);
     i_this->progchoiceImg->setAlpha(0x00);
 
 #if VERSION == VERSION_PAL
@@ -785,9 +785,9 @@ s32 phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_YES);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1295, 1579, 1619), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1295, 1579, 1619), timg != NULL);
     i_this->progyesImg = new dDlst_2D_c(timg, 211, 372, 0);
-    JUT_ASSERT(VERSION_SELECT(1297, 1581, 1621), i_this->progyesImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1297, 1581, 1621), i_this->progyesImg != NULL);
     i_this->progyesImg->getPicture()->setWhite((GXColor){0xFF, 0xC8, 0x00, 0xFF});
     i_this->progyesImg->setAlpha(0x00);
 
@@ -796,9 +796,9 @@ s32 phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_NO);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1305, 1594, 1634), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1305, 1594, 1634), timg != NULL);
     i_this->prognoImg = new dDlst_2D_c(timg, 350, 372, 0);
-    JUT_ASSERT(VERSION_SELECT(1307, 1596, 1636), i_this->prognoImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1307, 1596, 1636), i_this->prognoImg != NULL);
     i_this->prognoImg->getPicture()->setWhite((GXColor){0xA0, 0xA0, 0xA0, 0xFF});
     i_this->prognoImg->setAlpha(0x00);
 
@@ -807,9 +807,9 @@ s32 phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_PRO);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1315, 1609, 1649), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1315, 1609, 1649), timg != NULL);
     i_this->progImg = new dDlst_2D_c(timg, 153, 309, 0);
-    JUT_ASSERT(VERSION_SELECT(1317, 1611, 1651), i_this->progImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1317, 1611, 1651), i_this->progImg != NULL);
     i_this->progImg->setAlpha(0x00);
 
 #if VERSION == VERSION_PAL
@@ -817,15 +817,15 @@ s32 phase_2(dScnLogo_c* i_this) {
 #else
     timg = (ResTIMG *)dComIfG_getObjectRes("Logo", LOGO_BTI_PROGRESSIVE_INTER);
 #endif
-    JUT_ASSERT(VERSION_SELECT(1324, 1623, 1663), timg != 0);
+    JUT_ASSERT(VERSION_SELECT(1324, 1623, 1663), timg != NULL);
     i_this->interImg = new dDlst_2D_c(timg, 153, 309, 0);
-    JUT_ASSERT(VERSION_SELECT(1326, 1625, 1665), i_this->interImg != 0);
+    JUT_ASSERT(VERSION_SELECT(1326, 1625, 1665), i_this->interImg != NULL);
     i_this->interImg->setAlpha(0x00);
 
     JKRHeap::free(i_this->field_0x1f8, NULL);
 
     l_lodCommand = aramMount("/res/Stage/sea/LODALL.arc");
-    JUT_ASSERT(VERSION_SELECT(1346, 1645, 1685), l_lodCommand != 0);
+    JUT_ASSERT(VERSION_SELECT(1346, 1645, 1685), l_lodCommand != NULL);
     
     rt = dComIfG_setObjectRes("Always", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
     JUT_ASSERT(VERSION_SELECT(1351, 1650, 1690), rt == 1);
@@ -887,11 +887,11 @@ s32 phase_2(dScnLogo_c* i_this) {
     l_rubyCommand = onMemMount("/res/Msg/rubyres.arc");
     l_particleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", JKRArchive::DEFAULT_MOUNT_DIRECTION, dComIfGp_particle_getCommonHeap());
     l_itemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1418, 1743, 1783), l_itemTableCommand != 0);
+    JUT_ASSERT(VERSION_SELECT(1418, 1743, 1783), l_itemTableCommand != NULL);
     l_ActorDataCommand = mDoDvdThd_toMainRam_c::create("/res/ActorDat/ActorDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1422, 1747, 1787), l_ActorDataCommand != 0);
+    JUT_ASSERT(VERSION_SELECT(1422, 1747, 1787), l_ActorDataCommand != NULL);
     l_FmapDataCommand = mDoDvdThd_toMainRam_c::create("/res/FmapDat/FmapDat.bin", JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL);
-    JUT_ASSERT(VERSION_SELECT(1426, 1751, 1791), l_FmapDataCommand != 0);
+    JUT_ASSERT(VERSION_SELECT(1426, 1751, 1791), l_FmapDataCommand != NULL);
 
     JAIZelBasic::getInterface()->loadStaticWaves();
     mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60);
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp
index 143a82f95..2a0bc0577 100644
--- a/src/d/d_s_menu.cpp
+++ b/src/d/d_s_menu.cpp
@@ -109,9 +109,9 @@ static BOOL dScnMenu_Delete(menu_of_scene_class* i_this) {
 s32 phase_1(menu_of_scene_class* i_this) {
     /* Nonmatching */
     i_this->command = mDoDvdThd_toMainRam_c::create("/res/Menu/Menu1.dat", 0, NULL);
-    JUT_ASSERT(732, i_this->command != 0);
+    JUT_ASSERT(732, i_this->command != NULL);
     i_this->fontCommand = mDoDvdThd_toMainRam_c::create("/res/Menu/kanfont_fix16.bfn", 0, NULL);
-    JUT_ASSERT(735, i_this->fontCommand != 0);
+    JUT_ASSERT(735, i_this->fontCommand != NULL);
     return cPhs_NEXT_e;
 }
 
@@ -122,7 +122,7 @@ s32 phase_2(menu_of_scene_class* i_this) {
         return cPhs_INIT_e;
     }
     i_this->info = (menu_of_scene_class::info1_s*)i_this->command->getMemAddress();
-    JUT_ASSERT(779, i_this->info != 0);
+    JUT_ASSERT(779, i_this->info != NULL);
     delete i_this->command;
     menu_of_scene_class::info1_s* info = i_this->info;
     info->field_0x4 = (menu_of_scene_class::info2_s*)(u32(info->field_0x4) + u32(info));
@@ -131,7 +131,7 @@ s32 phase_2(menu_of_scene_class* i_this) {
     }
     if (!l_groupPoint) {
         l_groupPoint = new s8[info->field_0x0];
-        JUT_ASSERT(792, l_groupPoint != 0);
+        JUT_ASSERT(792, l_groupPoint != NULL);
         for (int i = 0; i < info->field_0x0; i++) {
             l_groupPoint[i] = 0;
         }
diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp
index 899f60966..c9b15130e 100644
--- a/src/d/d_s_name.cpp
+++ b/src/d/d_s_name.cpp
@@ -104,7 +104,7 @@ s32 dScnName_c::create() {
     s32 rt = resLoad(&mPhs, "Stage");
     if (rt == cPhs_COMPLEATE_e) {
         heap = JKRCreateExpHeap(0x68000, mDoExt_getGameHeap(), false);
-        JUT_ASSERT(0x1c8, heap != 0);
+        JUT_ASSERT(0x1c8, heap != NULL);
 
         oldHeap = mDoExt_setCurrentHeap(heap);
         mArchive = new JKRMemArchive();
@@ -112,17 +112,17 @@ s32 dScnName_c::create() {
         cloth_create();
         buttonIconCreate();
         dFs_c = new dFile_select_c();
-        JUT_ASSERT(470, dFs_c != 0);
+        JUT_ASSERT(470, dFs_c != NULL);
         dFs_c->field_0x0 = mArchive;
         savePicDatabuf = new (0x20) u8[0x12000];
-        JUT_ASSERT(476, savePicDatabuf != 0);
+        JUT_ASSERT(476, savePicDatabuf != NULL);
         if (fpcM_GetName(this) == PROC_NAME_SCENE) {
             dFs_c->field_0x3940 = 0;
             dNm_c = new dName_c();
-            JUT_ASSERT(484, dNm_c != 0);
+            JUT_ASSERT(484, dNm_c != NULL);
             dNm_c->_create();
             dFe_c = new dFile_error_c();
-            JUT_ASSERT(489, dFe_c != 0);
+            JUT_ASSERT(489, dFe_c != NULL);
             dFe_c->_create();
             dMs_c = NULL;
             g_dComIfG_gameInfo.save.field_0x1291 = 0;
@@ -132,7 +132,7 @@ s32 dScnName_c::create() {
             dComIfGs_setClearCount(1);
             dFs_c->field_0x3940 = 1;
             dMs_c = new dMenu_save_c();
-            JUT_ASSERT(511, dMs_c != 0);
+            JUT_ASSERT(511, dMs_c != NULL);
             dMs_c->field_0x0537 = 3;
             dMs_c->_create();
             dFe_c = NULL;
@@ -210,7 +210,7 @@ void dScnName_c::cloth_move() {
 void dScnName_c::cloth2D_create() {
     JKRArchive* clothRes = dComIfGp_getClothResArchive();
     cloth.cloth_c = new dMCloth_c();
-    JUT_ASSERT(801, cloth.cloth_c != 0);
+    JUT_ASSERT(801, cloth.cloth_c != NULL);
     cloth.cloth_c->setArchive(clothRes);
     cloth.cloth_c->setClothType(1); // ?
 }
@@ -225,7 +225,7 @@ static void dummy() {
 /* 802302F8-80230500       .text buttonIconCreate__10dScnName_cFv */
 void dScnName_c::buttonIconCreate() {
     btnIcon.scr = new J2DScreen();
-    JUT_ASSERT(866, btnIcon.scr != 0);
+    JUT_ASSERT(866, btnIcon.scr != NULL);
     btnIcon.scr->set("main_parts_fileselect.blo", mArchive);
     fopMsgM_setPaneData(&field_0x43c, btnIcon.scr->search('cent'));
     fopMsgM_setPaneData(&field_0x474, btnIcon.scr->search('bab'));
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index 48c03ebaa..6f6b70c72 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -23,7 +23,7 @@ s32 dScnOpen_c::create() {
     s32 rt = dComIfG_resLoad(&mPhs, "Opening");
     if (rt == cPhs_COMPLEATE_e) {
         solid_heap = mDoExt_createSolidHeapFromGameToCurrent(0x20000, 0);
-        JUT_ASSERT(0x3b, solid_heap != 0);
+        JUT_ASSERT(0x3b, solid_heap != NULL);
         mpProc = new dScnOpen_proc_c();
         field_0x1d4 = NULL;
         mDoExt_restoreCurrentHeap();
diff --git a/src/d/d_s_open_sub.cpp b/src/d/d_s_open_sub.cpp
index 5a1bf5917..f57ca3566 100644
--- a/src/d/d_s_open_sub.cpp
+++ b/src/d/d_s_open_sub.cpp
@@ -35,14 +35,14 @@ dScnOpen_message_c::~dScnOpen_message_c() {
 dScnOpen_proc_c::dScnOpen_proc_c() {
     /* Nonmatching */
     exp_heap = fopMsgM_createExpHeap(0x20000);
-    JUT_ASSERT(0xe2, exp_heap != 0);
+    JUT_ASSERT(0xe2, exp_heap != NULL);
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(exp_heap);
     m_Screen = new J2DScreen();
-    JUT_ASSERT(0xe7, m_Screen != 0);
+    JUT_ASSERT(0xe7, m_Screen != NULL);
     m_message = new dScnOpen_message_c(exp_heap);
-    JUT_ASSERT(0xe9, m_message != 0);
+    JUT_ASSERT(0xe9, m_message != NULL);
     dRes_info_c* resInfo = dComIfG_getObjectResInfo("Opening");
-    JUT_ASSERT(0xeb, resInfo != 0);
+    JUT_ASSERT(0xeb, resInfo != NULL);
     m_Screen->set("Opening.blo", resInfo->getArchive());
     d1 = m_Screen->search('\0\0d1');
     d2 = m_Screen->search('\0\0d2');
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index b5c5c2db6..96285399c 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -1229,7 +1229,7 @@ s32 phase_0(dScnPly_ply_c* i_this) {
             char buf[32];
             sprintf(buf, "/res/Object/LkD%02d.arc", dComIfGp_getLkDemoAnmNo());
             l_lkDemoAnmCommand = mDoDvdThd_mountXArchive_c::create(buf, 0, JKRArchive::MOUNT_ARAM);
-            JUT_ASSERT(VERSION_SELECT(3399, 3414, 3414), l_lkDemoAnmCommand != 0);
+            JUT_ASSERT(VERSION_SELECT(3399, 3414, 3414), l_lkDemoAnmCommand != NULL);
         }
 
         return cPhs_NEXT_e;
@@ -1297,7 +1297,7 @@ int phase_3(dScnPly_ply_c* i_this) {
 /* 80235B0C-80236334       .text phase_4__FP13dScnPly_ply_c */
 s32 phase_4(dScnPly_ply_c* i_this) {
     if (i_this->sceneCommand != NULL) {
-        JUT_ASSERT(VERSION_SELECT(3552, 3567, 3567), i_this->sceneCommand->getMemAddress() != 0);
+        JUT_ASSERT(VERSION_SELECT(3552, 3567, 3567), i_this->sceneCommand->getMemAddress() != NULL);
         dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress());
         delete i_this->sceneCommand;
     } else {
@@ -1320,7 +1320,7 @@ s32 phase_4(dScnPly_ply_c* i_this) {
     dComIfGd_setView(NULL);
 
     JKRExpHeap* heap = fopMsgM_createExpHeap(VERSION_SELECT(0x736A1, 0x73EA1, 0x73EA1));
-    JUT_ASSERT(VERSION_SELECT(3633, 3653, 3653), heap != 0);
+    JUT_ASSERT(VERSION_SELECT(3633, 3653, 3653), heap != NULL);
     dComIfGp_setExpHeap2D(heap);
 
     dStage_Create();
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp
index 1423a142d..a1627b3d7 100644
--- a/src/d/d_s_room.cpp
+++ b/src/d/d_s_room.cpp
@@ -226,7 +226,7 @@ s32 phase_2(room_of_scene_class* i_this) {
         }
 
         dStage_FileList_dt_c * fileList = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getFileListInfo();
-        JUT_ASSERT(499, fileList != 0);
+        JUT_ASSERT(499, fileList != NULL);
 
         u8 particleNo = dStage_FileList_dt_GetParticleNo(fileList);
         i_this->mbHasRoomParticle = dComIfGp_particle_readScene(particleNo, &i_this->sceneCommand);
@@ -251,7 +251,7 @@ s32 phase_3(room_of_scene_class* i_this) {
         if (i_this->sceneCommand->sync() == 0)
             return cPhs_INIT_e;
 
-        JUT_ASSERT(0x215, i_this->sceneCommand->getMemAddress() != 0);
+        JUT_ASSERT(0x215, i_this->sceneCommand->getMemAddress() != NULL);
         dComIfGp_particle_createRoomScene(i_this->sceneCommand->getMemAddress());
         delete i_this->sceneCommand;
     }
diff --git a/src/d/d_salvage.cpp b/src/d/d_salvage.cpp
index cd7e05c44..140795f5b 100644
--- a/src/d/d_salvage.cpp
+++ b/src/d/d_salvage.cpp
@@ -38,7 +38,7 @@ void dSalvage_control_c::init_end() {
 
 /* 800CC7C4-800CCB70       .text entry__18dSalvage_control_cFP10fopAc_ac_cP14JPABaseEmitter */
 void dSalvage_control_c::entry(fopAc_ac_c* pact, JPABaseEmitter* emtr) {
-    JUT_ASSERT(0x8b, pact != 0);
+    JUT_ASSERT(0x8b, pact != NULL);
     s8 roomNo = fopAcM_GetRoomNo(pact);
     u32 kind = daSalvage_prm::getKind(pact);
     u32 itemNo = daSalvage_prm::getItemNo(pact);
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index c7ccf9363..5b76a2694 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1377,7 +1377,7 @@ stage_actor_data_class* dStage_decodeSearchIkada(void* i_file, int ikadaShipId)
 /* 8004184C-800419D0       .text dStage_playerInitIkada__FP16fopAcM_prm_classPv */
 void dStage_playerInitIkada(fopAcM_prm_class* player_prm, void* i_file) {
     stage_actor_data_class* ikada_data = dStage_decodeSearchIkada(i_file, dComIfGp_getIkadaShipId());
-    JUT_ASSERT(1590, ikada_data != 0);
+    JUT_ASSERT(1590, ikada_data != NULL);
     
     u8 roomNo = dComIfGp_getIkadaShipBeforeRoomId();
     player_prm->mParameter = 0xFF000000 | roomNo;
@@ -1437,7 +1437,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
     i_stage->setPlayerNum(num);
 
     fopAcM_prm_class* appen = fopAcM_CreateAppend();
-    JUT_ASSERT(1735, appen != 0);
+    JUT_ASSERT(1735, appen != NULL);
 
     int point = dComIfGp_getStartStagePoint();
     u32 roomParam = dComIfGs_getRestartRoomParam();
@@ -1484,7 +1484,7 @@ int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* i_file)
     dStage_actorCreate(player_data, appen);
 
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-    JUT_ASSERT(1842, stageProc != 0);
+    JUT_ASSERT(1842, stageProc != NULL);
 
     if (stageProc->base.base.mProcName != PROC_PLAY_SCENE) {
         fopAcM_create(PROC_TITLE, 0);
@@ -1808,7 +1808,7 @@ int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) {
 
         for (int i = 0; i < pd->num; i++) {
             JKRExpHeap* heap = dStage_roomControl_c::createMemoryBlock(i, *entry_p + 0x300);
-            JUT_ASSERT(2932, heap != 0);
+            JUT_ASSERT(2932, heap != NULL);
             entry_p++;
         }
     }
@@ -1999,8 +1999,8 @@ void dStage_dt_c_offsetToPtr(void* i_data) {
 void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
     static FuncTable l_funcTable[] = {"STAG", dStage_stagInfoInit};
 
-    JUT_ASSERT(3557, i_data != 0);
-    JUT_ASSERT(3558, i_stage != 0);
+    JUT_ASSERT(3557, i_data != NULL);
+    JUT_ASSERT(3558, i_stage != NULL);
 
     dStage_dt_c_offsetToPtr(i_data);
     i_stage->init();
@@ -2153,7 +2153,7 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
 /* 8004324C-800432EC       .text dStage_infoCreate__Fv */
 void dStage_infoCreate() {
     void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs");
-    JUT_ASSERT(3834, stageRsrc != 0)
+    JUT_ASSERT(3834, stageRsrc != NULL)
 
     dStage_dt_c_stageInitLoader(stageRsrc, &dComIfGp_getStage());
 }
@@ -2163,7 +2163,7 @@ void dStage_Create() {
     dKankyo_create();
 
     void* stageRsrc = dComIfG_getStageRes("Stage", "stage.dzs");
-    JUT_ASSERT(3862, stageRsrc != 0)
+    JUT_ASSERT(3862, stageRsrc != NULL)
 
     dComIfGp_roomControl_init();
     dStage_dt_c_stageLoader(stageRsrc, &dComIfGp_getStage());
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index f9f963f9e..0d4bef42e 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -58,7 +58,7 @@ s32 dTimer_c::_create() {
             return cPhs_ERROR_e;
 
         dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer");
-        JUT_ASSERT(0x44, resInfo != 0);
+        JUT_ASSERT(0x44, resInfo != NULL);
 
         if (prm->mIconType == 0) {
             mpSolidHeap = mDoExt_createSolidHeapFromGameToCurrent(0x34C0, 0x20);
@@ -71,7 +71,7 @@ s32 dTimer_c::_create() {
             mpScrnDraw->setScreen("ship_race0.blo", resInfo->getArchive());
             if (prm->mIconType != 0) {
                 iconTex = mpSolidHeap->alloc(0xC00, 0x20);
-                JUT_ASSERT(0x5a, iconTex != 0);
+                JUT_ASSERT(0x5a, iconTex != NULL);
                 mpScrnDraw->setIconType(iconTex, prm->mIconType);
             }
 
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 69d4e5cf2..4b9e5d32d 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -35,7 +35,7 @@ static Vec dummy_3569;
 /* 80024060-80024104       .text fopAcM_setStageLayer__FPv */
 void fopAcM_setStageLayer(void* pProc) {
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-    JUT_ASSERT(0xee, stageProc != 0);
+    JUT_ASSERT(0xee, stageProc != NULL);
     fpcM_ChangeLayerID(pProc, fopScnM_LayerID(stageProc));
 }
 
@@ -43,7 +43,7 @@ void fopAcM_setStageLayer(void* pProc) {
 void fopAcM_setRoomLayer(void* pProc, int room_no) {
     if (room_no >= 0) {
         scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(room_no));
-        JUT_ASSERT(0x105, roomProc != 0);
+        JUT_ASSERT(0x105, roomProc != NULL);
         fpcM_ChangeLayerID(pProc, fopScnM_LayerID(roomProc));
     }
 }
@@ -270,7 +270,7 @@ uint fopAcM_createChildFromOffset(char* pProcNameString, uint parentPcId, u32 pa
 /* 80024B78-80024CA0       .text fopAcM_createHeap__FP10fopAc_ac_cUlUl */
 s32 fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) {
     JUT_ASSERT(0x33b, i_this);
-    JUT_ASSERT(0x33c, i_this->heap == 0);
+    JUT_ASSERT(0x33c, i_this->heap == NULL);
     fopAcM_Log(i_this, "アクターのヒープの生成");
     if (align == 0)
         align = 0x20;
@@ -379,7 +379,7 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_this, heapCallbackFunc createHeapCB, u3
                 heap = NULL;
                 bool result = createHeapCB(i_this);
                 mDoExt_restoreCurrentHeap();
-                JUT_ASSERT(0x48d, result != 0);
+                JUT_ASSERT(0x48d, result != FALSE);
                 if (result == 0) {
                     OSReport_Error("ぴったりサイズで、登録失敗？(バグ)\n");
                     mDoExt_destroySolidHeap(heap1);
@@ -1250,7 +1250,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) {
     JUT_ASSERT(0xe07, roomNo >= 0);
 
     scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(roomNo));
-    JUT_ASSERT(0xe0a, roomProc != 0);
+    JUT_ASSERT(0xe0a, roomProc != NULL);
 
     uint grabProcID = daPy_getPlayerActorClass()->getGrabActorID();
     fopAc_ac_c* enemy = fopAcM_SearchByID(grabProcID);
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index c855ab7dd..b73ac9b21 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -135,7 +135,7 @@ void fopMsgM_hyrule_language_check(u32) {
 /* 8002AE28-8002AED4       .text fopMsgM_setStageLayer__FPv */
 s32 fopMsgM_setStageLayer(void* proc) {
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
-    JUT_ASSERT(0x189, stageProc != 0);
+    JUT_ASSERT(0x189, stageProc != NULL);
     u32 layer = fpcM_LayerID(stageProc);
     return fpcM_ChangeLayerID(proc, layer);
 }
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index 0697235d3..179cc11c9 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -80,13 +80,13 @@ void messageSet(u32 status) {
     const char * msg = (const char*)((u8*)inf1->getNext() + sizeof(JUTDataBlockHeader) + inf1->entries[status]);
 
     J2DTextBox * tpane = new J2DTextBox('TXT1', JGeometry::TBox2<f32>(0.0f, 0.0f, 660.0f, 200.0f), (ResFONT*)font_data, msg, HBIND_CENTER, VBIND_CENTER);
-    JUT_ASSERT(VERSION_SELECT(0x12b, 0x141, 0x141), tpane != 0);
+    JUT_ASSERT(VERSION_SELECT(0x12b, 0x141, 0x141), tpane != NULL);
 
     J2DTextBox * spane = new J2DTextBox('TXT2', JGeometry::TBox2<f32>(0.0f, 0.0f, 660.0f, 200.0f), (ResFONT*)font_data, msg, HBIND_CENTER, VBIND_CENTER);
-    JUT_ASSERT(VERSION_SELECT(0x133, 0x149, 0x149), spane != 0);
+    JUT_ASSERT(VERSION_SELECT(0x133, 0x149, 0x149), spane != NULL);
 
     J2DPicture * ppane = new J2DPicture('PIC1', JGeometry::TBox2<f32>(0.0f, 0.0f, 665.0f, 530.0f), (ResTIMG*)black_tex, NULL);
-    JUT_ASSERT(VERSION_SELECT(0x138, 0x14e, 0x14e), ppane != 0);
+    JUT_ASSERT(VERSION_SELECT(0x138, 0x14e, 0x14e), ppane != NULL);
 
     J2DTextBox::TFontSize size;
     size.mSizeX = 27.0f;
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 39da4ec40..c36c470bf 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -52,13 +52,13 @@ JKRExpHeap* mDoAud_audioStreamHeap;
 
 /* 80006DD4-80006F88       .text mDoAud_allocStreamBuffer__Fv */
 void mDoAud_allocStreamBuffer() {
-    JUT_ASSERT(98, mDoAud_StreamBufferPointer == 0);
+    JUT_ASSERT(98, mDoAud_StreamBufferPointer == NULL);
     u32 var1 = mDoAud_StreamBufferBlocks;
     u32 size;
     while (true) {
         JAIGlobalParameter::setParamStreamDecodedBufferBlocks(var1);
         size = JAInter::StreamLib::getNeedBufferSize();
-        JUT_ASSERT(124, mDoAud_audioStreamHeap == 0);
+        JUT_ASSERT(124, mDoAud_audioStreamHeap == NULL);
         mDoAud_audioStreamHeap = archiveHeap;
         mDoAud_StreamBufferPointer = JKRAllocFromHeap(archiveHeap, size, 0);
         if (!mDoAud_StreamBufferPointer) {
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 54b5a0b97..015df60b3 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -109,7 +109,7 @@ int mDoExt_baseAnm::initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_
 
 /* 8000DF24-8000DFC4       .text play__14mDoExt_baseAnmFv */
 int mDoExt_baseAnm::play() {
-    JUT_ASSERT(462, mFrameCtrl != 0);
+    JUT_ASSERT(462, mFrameCtrl != NULL);
     mFrameCtrl->update();
     return isStop();
 }
@@ -128,7 +128,7 @@ void mDoExt_bpkAnm::entry(J3DModelData* i_modelData, f32 param_1) {
 int mDoExt_bpkAnm::init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, int i_entry) {
 
     JUT_ASSERT(531, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(533, i_matTable != 0 && i_bpk != 0);
+    JUT_ASSERT(533, i_matTable != NULL && i_bpk != NULL);
     mpAnm = i_bpk;
     mpAnm->searchUpdateMaterialID(i_matTable);
 
@@ -180,7 +180,7 @@ void mDoExt_btpAnm::entry(J3DModelData* i_modelData, s16 i_frame) {
 /* 8000E37C-8000E610       .text init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifssbi */
 int mDoExt_btpAnm::init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btp, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, int i_entry) {
     JUT_ASSERT(648, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(650, i_matTable != 0 && i_btp != 0);
+    JUT_ASSERT(650, i_matTable != NULL && i_btp != NULL);
     mpAnm = i_btp;
     mpAnm->searchUpdateMaterialID(i_matTable);
 
@@ -232,7 +232,7 @@ void mDoExt_btkAnm::entry(J3DModelData* i_modelData, f32 i_frame) {
 /* 8000E71C-8000EAE4       .text init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifssbi */
 int mDoExt_btkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, int i_entry) {
     JUT_ASSERT(781, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(783, i_matTable != 0 && i_btk != 0);
+    JUT_ASSERT(783, i_matTable != NULL && i_btk != NULL);
     mpAnm = i_btk;
     mpAnm->searchUpdateMaterialID(i_matTable);
 
@@ -299,7 +299,7 @@ void mDoExt_brkAnm::entry(J3DModelData* i_modelData, f32 i_frame) {
 /* 8000EBC4-8000EEE8       .text init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifssbi */
 int mDoExt_brkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, int i_entry) {
     JUT_ASSERT(910, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(912, i_matTable != 0 && i_brk != 0);
+    JUT_ASSERT(912, i_matTable != NULL && i_brk != NULL);
     mpAnm = i_brk;
     mpAnm->searchUpdateMaterialID(i_matTable);
 
@@ -356,7 +356,7 @@ void mDoExt_brkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) {
 /* 8000EFBC-8000F178       .text init__13mDoExt_bvaAnmFP8J3DModelP20J3DAnmVisibilityFulliifssbi */
 int mDoExt_bvaAnm::init(J3DModel* i_model, J3DAnmVisibilityFull* i_bva, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify, int i_entry) {
     JUT_ASSERT(1002, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(1004, i_model != 0 && i_bva != 0);
+    JUT_ASSERT(1004, i_model != NULL && i_bva != NULL);
     mpAnm = i_bva;
     if (!i_modify) {
         field_0xc = new J3DVisibilityManager(mpAnm);
@@ -386,7 +386,7 @@ void mDoExt_bvaAnm::entry(J3DModel* i_model, s16 i_frame) {
 /* 8000F1B4-8000F408       .text init__13mDoExt_bckAnmFP12J3DModelDataP15J3DAnmTransformiifssb */
 int mDoExt_bckAnm::init(J3DModelData* i_modelData, J3DAnmTransform* i_bck, BOOL i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify) {
     JUT_ASSERT(1065, i_modify || isCurrentSolidHeap());
-    JUT_ASSERT(1067, i_bck != 0);
+    JUT_ASSERT(1067, i_bck != NULL);
     mAnmTransform = i_bck;
     if (!i_modify) {
         mAnm = new J3DMtxCalcMayaAnm(mAnmTransform);
@@ -407,7 +407,7 @@ int mDoExt_bckAnm::init(J3DModelData* i_modelData, J3DAnmTransform* i_bck, BOOL
 /* 8000F590-8000F610       .text changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform */
 void mDoExt_bckAnm::changeBckOnly(J3DAnmTransform* i_bck) {
     mAnmTransform = i_bck;
-    JUT_ASSERT(1104, mAnm != 0);
+    JUT_ASSERT(1104, mAnm != NULL);
     mAnm->setAnmTransform(mAnmTransform);
 }
 
@@ -793,7 +793,7 @@ JKRExpHeap* gameHeap;
 
 /* 80011734-800117E4       .text mDoExt_createGameHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* i_heap) {
-    JUT_ASSERT(2050, gameHeap == 0 || heapSize == 0);
+    JUT_ASSERT(2050, gameHeap == NULL || heapSize == 0);
     gameHeap = JKRExpHeap::create(heapSize, i_heap, true);
     gameHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1);
     return gameHeap;
@@ -820,7 +820,7 @@ JKRExpHeap* zeldaHeap;
 
 /* 8001181C-800118C0       .text mDoExt_createZeldaHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* i_heap) {
-    JUT_ASSERT(2112, zeldaHeap == 0 || heapSize == 0);
+    JUT_ASSERT(2112, zeldaHeap == NULL || heapSize == 0);
     return zeldaHeap = JKRExpHeap::create(heapSize, i_heap, true);
 }
 
@@ -845,7 +845,7 @@ JKRExpHeap* commandHeap;
 
 /* 800118F8-8001199C       .text mDoExt_createCommandHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* i_heap) {
-    JUT_ASSERT(2173, commandHeap == 0 || heapSize == 0);
+    JUT_ASSERT(2173, commandHeap == NULL || heapSize == 0);
     return commandHeap = JKRExpHeap::create(heapSize, i_heap, true);
 }
 
@@ -870,7 +870,7 @@ JKRExpHeap* archiveHeap;
 
 /* 800119D4-80011A84       .text mDoExt_createArchiveHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* i_heap) {
-    JUT_ASSERT(2237, archiveHeap == 0 || heapSize == 0);
+    JUT_ASSERT(2237, archiveHeap == NULL || heapSize == 0);
     archiveHeap = JKRExpHeap::create(heapSize, i_heap, true);
     archiveHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1);
     return archiveHeap;
@@ -946,7 +946,7 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32 i_size, JKRHeap* i_parent, u32
         return NULL;
     }
     JUT_ASSERT(2545, OSGetCurrentThread() == &mainThread);
-    JUT_ASSERT(2546, mDoExt_SaveCurrentHeap == 0);
+    JUT_ASSERT(2546, mDoExt_SaveCurrentHeap == NULL);
     mDoExt_SaveCurrentHeap = JKRGetCurrentHeap();
     mDoExt_setCurrentHeap(resultHeap);
 
@@ -978,7 +978,7 @@ void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap) {
 
 /* 80011D68-80011DD4       .text mDoExt_setCurrentHeap__FP7JKRHeap */
 JKRHeap* mDoExt_setCurrentHeap(JKRHeap* heap) {
-    JUT_ASSERT(2684, heap != 0);
+    JUT_ASSERT(2684, heap != NULL);
     return heap->becomeCurrentHeap();
 }
 
@@ -990,7 +990,7 @@ JKRHeap* mDoExt_getCurrentHeap() {
 /* 80011DDC-80011E98       .text mDoExt_restoreCurrentHeap__Fv */
 void mDoExt_restoreCurrentHeap() {
     JUT_ASSERT(2754, OSGetCurrentThread() == &mainThread);
-    JUT_ASSERT(2755, mDoExt_SaveCurrentHeap != 0);
+    JUT_ASSERT(2755, mDoExt_SaveCurrentHeap != NULL);
     mDoExt_SaveCurrentHeap->becomeCurrentHeap();
     mDoExt_SaveCurrentHeap = NULL;
 }
@@ -1918,7 +1918,7 @@ void mDoExt_3DlineMat1_c::update(u16, f32, GXColor&, u16, dKy_tevstr_c*) {
 void mDoExt_3DlineMat1_c::update(u16, GXColor&, dKy_tevstr_c*) {
     /* Nonmatching */
     u8* size_p = mpLines->mpSize;
-    JUT_ASSERT(5243, size_p != 0);
+    JUT_ASSERT(5243, size_p != NULL);
 }
 
 /* 80016518-8001657C       .text setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c */
@@ -1945,13 +1945,13 @@ void mDoExt_3DlineMatSortPacket::draw() {
 void mDoExt_initFontCommon(JUTFont** p_font, ResFONT** p_resfont, JKRHeap* p_heap, const char* param_4,
                            JKRArchive* p_archive, u8 param_6, u32 param_7, u32 param_8) {
     JUTFont* mDoExt_font = *p_font;
-    JUT_ASSERT(6648, mDoExt_font == 0);
+    JUT_ASSERT(6648, mDoExt_font == NULL);
     ResFONT* mDoExt_resfont = *p_resfont;
-    JUT_ASSERT(6649, mDoExt_resfont == 0);
+    JUT_ASSERT(6649, mDoExt_resfont == NULL);
     
     *p_resfont = (ResFONT*)p_archive->getGlbResource('ROOT', param_4, p_archive);
     mDoExt_resfont = *p_resfont;
-    JUT_ASSERT(6651, mDoExt_resfont != 0);
+    JUT_ASSERT(6651, mDoExt_resfont != NULL);
     
     if (param_6 == 0) {
         u32 temp = (((param_8+0x1F) & ~0x1F) + 0x40) * param_7;
@@ -1974,7 +1974,7 @@ void mDoExt_initFontCommon(JUTFont** p_font, ResFONT** p_resfont, JKRHeap* p_hea
     }
     
     mDoExt_font = *p_font;
-    JUT_ASSERT(6685, mDoExt_font != 0);
+    JUT_ASSERT(6685, mDoExt_font != NULL);
 }
 
 JUTFont* mDoExt_font0;
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 385a39e1f..7e5678678 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -74,7 +74,7 @@ void mDoGph_gInf_c::create() {
     JFWDisplay::createManager(JKRHeap::getCurrentHeap(), JUTXfb::UNK_2, true);
     JFWDisplay::getManager()->setDrawDoneMethod(JFWDisplay::UNK_METHOD_1);
     JUTFader* faderPtr = new JUTFader(0, 0, JUTVideo::getManager()->getRenderMode()->fb_width, JUTVideo::getManager()->getRenderMode()->efb_height, JUtility::TColor(0, 0, 0, 0));
-    JUT_ASSERT(0x1a0, faderPtr != 0);
+    JUT_ASSERT(0x1a0, faderPtr != NULL);
     setFader(faderPtr);
     JFWDisplay::getManager()->setFader(faderPtr);
     JUTProcBar::getManager()->setVisibleHeapBar(false);
@@ -111,10 +111,10 @@ void mDoGph_gInf_c::createHeap() {
     JKRHeap* parentHeap = JKRHeap::getCurrentHeap();
 
     mHeap[0] = JKRSolidHeap::create(0x10000, parentHeap, false);
-    JUT_ASSERT(0x1eb, mHeap[0] != 0);
+    JUT_ASSERT(0x1eb, mHeap[0] != NULL);
 
     mHeap[1] = JKRSolidHeap::create(0x10000, parentHeap, false);
-    JUT_ASSERT(0x1ed, mHeap[1] != 0);
+    JUT_ASSERT(0x1ed, mHeap[1] != NULL);
 
     mCurrentHeap = 0;
 }
@@ -812,7 +812,7 @@ bool mDoGph_screenCapture() {
     GXCopyTex(mCaptureCaptureBuffer, GX_FALSE);
     GXPixModeSync();
 
-    JUT_ASSERT(0xac1, mCaptureOldCB == 0);
+    JUT_ASSERT(0xac1, mCaptureOldCB == NULL);
     mCaptureOldCB = GXSetDrawSyncCallback(mCaptureGXDrawSyncCallback);
     OSCreateAlarm(&mCaptureTimeOutAlarm);
     OSSetAlarm(&mCaptureTimeOutAlarm, mCaptureTimeOutTicks, mCaptureGXDrawSyncTimeOut);
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
index 85c492240..f34af3ad4 100644
--- a/src/m_Do/m_Do_lib.cpp
+++ b/src/m_Do/m_Do_lib.cpp
@@ -15,7 +15,7 @@
 u8 mDoLib_setResTimgObj(ResTIMG* i_img, GXTexObj* o_texObj, u32 i_tlut_name, GXTlutObj * o_tlutObj) {
     /* Nonmatching - regalloc */
     if (i_img->indexTexture) {
-        JUT_ASSERT(0x2b, o_tlutObj != 0);
+        JUT_ASSERT(0x2b, o_tlutObj != NULL);
         GXInitTlutObj(o_tlutObj, ((char*)i_img) + i_img->paletteOffset, (GXTlutFmt)i_img->colorFormat, i_img->numColors);
         GXInitTexObjCI(o_texObj, ((char*)i_img) + i_img->imageOffset, i_img->width, i_img->height, (GXCITexFmt)i_img->format,
             (GXTexWrapMode)i_img->wrapS, (GXTexWrapMode)i_img->wrapT, (GXBool)(i_img->mipmapCount > 1), i_tlut_name);