diff --git a/configure.py b/configure.py
index 22615e3796d..d592b55afc7 100755
--- a/configure.py
+++ b/configure.py
@@ -377,7 +377,7 @@ if config.version != "ShieldD":
 
 
 if config.version == "ShieldD":
-    cflags_framework.extend(["-O0", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"])
+    cflags_framework.extend(["-O0,p", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"])
 elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]:
     cflags_framework.extend(["-ipa file", "-RTTI on", "-DWIDESCREEN_SUPPORT=1"])
 
@@ -385,9 +385,12 @@ if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio:
     cflags_framework.extend(["-DENABLE_REGHIO=1"])
 
 if config.version != "ShieldD":
-    if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]:
+    if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]:
         # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong?
         cflags_framework.extend(["-inline noauto", "-O4,s", "-sym on"])
+    elif config.version in ["Shield"]:
+        # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong?
+        cflags_framework.extend(["-inline noauto", "-O4,p", "-sym on"])
     else:
         cflags_framework.extend(["-inline noauto", "-O3,s", "-sym on", "-str reuse,pool,readonly"])
 
@@ -2101,7 +2104,7 @@ config.libs = [
         ],
     },
     Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile_lst.cpp")]),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_andsw"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_andsw"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_bg"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_bg_obj"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_dmidna"),
@@ -2139,7 +2142,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_telop"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tbox2"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox"),
@@ -2227,7 +2230,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv2prchk"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"),
@@ -2353,7 +2356,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_yh"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_yk"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_ym"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_e_ym_tag"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_e_ym_tag"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_ymb"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_yr"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_e_zh"),
@@ -2435,12 +2438,12 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lf"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lud"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_midp"),
-    ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_mk"),
+    ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moi"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moir"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_myna2"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_ne"),
-    ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_p2"),
+    ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_p2"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_besu"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_maro"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_taro"),
@@ -2809,7 +2812,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_startAndGoal"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_swBall"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_swLBall"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_swTime"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_swTime"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"),
@@ -2825,7 +2828,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"),
     ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_instruction"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kago_fall"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lightball"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"),
@@ -2838,7 +2841,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"),
     ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_schedule"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setBall"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_setBall"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"),
@@ -2854,7 +2857,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wljump"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_talk"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tboxSw"),
+    ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_title"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_warp_bug"),
 ]
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index b403528a3c2..caf638fe4e4 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -214,7 +214,7 @@ public:
     virtual u32 getType() { return 'CLOF'; }
     virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x121, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
-        J3D_ASSERT_NULLPTR(0x122, color != 0);
+        J3D_ASSERT_NULLPTR(0x122, color != NULL);
         mMatColor[idx] = *color;
     }
     virtual void setMatColor(u32 idx, J3DGXColor color) {
@@ -227,7 +227,7 @@ public:
     }
     virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
     virtual void setColorChanNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x137, num != 0);
+        J3D_ASSERT_NULLPTR(0x137, num != NULL);
         mColorChanNum = *num;
     }
     virtual u8 getColorChanNum() const { return mColorChanNum; }
@@ -237,7 +237,7 @@ public:
     }
     virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x148, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
-        J3D_ASSERT_NULLPTR(0x149, chan != 0);
+        J3D_ASSERT_NULLPTR(0x149, chan != NULL);
         mColorChan[idx] = *chan;
     }
     virtual J3DColorChan* getColorChan(u32 idx) {
@@ -245,7 +245,7 @@ public:
         return &mColorChan[idx];
     }
     virtual void setCullMode(u8 const* mode) {
-        J3D_ASSERT_NULLPTR(0x154, mode != 0);
+        J3D_ASSERT_NULLPTR(0x154, mode != NULL);
         mCullMode = *mode;
     }
     virtual void setCullMode(u8 mode) { mCullMode = mode; }
@@ -281,7 +281,7 @@ public:
     virtual u32 getType() { return 'CLAB'; }
     virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1a3, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
-        J3D_ASSERT_NULLPTR(0x1a4, color != 0);
+        J3D_ASSERT_NULLPTR(0x1a4, color != NULL);
         mAmbColor[idx] = *color;
     }
     virtual void setAmbColor(u32 idx, J3DGXColor color) {
@@ -322,7 +322,7 @@ public:
     virtual u32 getType() { return 'CLON'; }
     virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1e9, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
-        J3D_ASSERT_NULLPTR(0x1ea, color != 0);
+        J3D_ASSERT_NULLPTR(0x1ea, color != NULL);
         mMatColor[idx] = *color;
     }
     virtual void setMatColor(u32 idx, J3DGXColor color) {
@@ -335,7 +335,7 @@ public:
     }
     virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1fc, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
-        J3D_ASSERT_NULLPTR(0x1fd, color != 0);
+        J3D_ASSERT_NULLPTR(0x1fd, color != NULL);
         mAmbColor[idx] = *color;
     }
     virtual void setAmbColor(u32 idx, J3DGXColor color) {
@@ -348,7 +348,7 @@ public:
     }
     virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
     virtual void setColorChanNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x212, num != 0);
+        J3D_ASSERT_NULLPTR(0x212, num != NULL);
         mColorChanNum = *num;
     }
     virtual u8 getColorChanNum() const { return mColorChanNum; }
@@ -358,7 +358,7 @@ public:
     }
     virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x223, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
-        J3D_ASSERT_NULLPTR(0x224, chan != 0);
+        J3D_ASSERT_NULLPTR(0x224, chan != NULL);
         mColorChan[idx] = *chan;
     }
     virtual J3DColorChan* getColorChan(u32 idx) {
@@ -374,7 +374,7 @@ public:
         return mLight[idx];
     }
     virtual void setCullMode(u8 const* mode) {
-        J3D_ASSERT_NULLPTR(0x23b, mode != 0);
+        J3D_ASSERT_NULLPTR(0x23b, mode != NULL);
         mCullMode = *mode;
     }
     virtual void setCullMode(u8 mode) {
@@ -466,14 +466,14 @@ public:
     virtual s32 countDLSize();
     virtual u32 getType() { return 'TGPT'; }
     virtual void setTexGenNum(u32 const* num) {
-        J3D_ASSERT_NULLPTR(0x335, num != 0);
+        J3D_ASSERT_NULLPTR(0x335, num != NULL);
         mTexGenNum = *num;
     }
     virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
     virtual u32 getTexGenNum() const { return mTexGenNum; }
     virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
         J3D_ASSERT_RANGE(0x344, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
-        J3D_ASSERT_NULLPTR(0x345, coord != 0);
+        J3D_ASSERT_NULLPTR(0x345, coord != NULL);
         mTexCoord[idx] = *coord;
     }
     virtual J3DTexCoord* getTexCoord(u32 idx) {
@@ -515,7 +515,7 @@ public:
     virtual s32 countDLSize();
     virtual u32 getType() { return 'TGB4'; }
     virtual void setNBTScale(J3DNBTScale const* scale) {
-        J3D_ASSERT_NULLPTR(0x393, scale != 0);
+        J3D_ASSERT_NULLPTR(0x393, scale != NULL);
         mNBTScale = *scale;
     }
     virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
@@ -542,7 +542,7 @@ public:
     virtual s32 countDLSize();
     virtual u32 getType() { return 'TGBC'; }
     virtual void setNBTScale(J3DNBTScale const* scale) {
-        J3D_ASSERT_NULLPTR(0x3ca, scale != 0);
+        J3D_ASSERT_NULLPTR(0x3ca, scale != NULL);
         mNBTScale = *scale;
     }
     virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
@@ -674,7 +674,7 @@ public:
     virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
     virtual u32 getType() { return 'TVPT'; }
     virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x52c, num != 0);
+        J3D_ASSERT_NULLPTR(0x52c, num != NULL);
         mTevStageNum = *num;
     }
     virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
@@ -682,7 +682,7 @@ public:
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x53b, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
-        J3D_ASSERT_NULLPTR(0x53c, texNo != 0);
+        J3D_ASSERT_NULLPTR(0x53c, texNo != NULL);
         mTexNo[idx] = *texNo;
     }
     virtual void setTexNo(u32 idx, u16 texNo) {
@@ -695,7 +695,7 @@ public:
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x550, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
-        J3D_ASSERT_NULLPTR(0x551, order != 0);
+        J3D_ASSERT_NULLPTR(0x551, order != NULL);
         mTevOrder[idx] = *order;
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder order) {
@@ -708,7 +708,7 @@ public:
     }
     virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x563, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x564, stage != 0);
+        J3D_ASSERT_NULLPTR(0x564, stage != NULL);
         mTevStage[idx] = *stage;
     }
     virtual void setTevStage(u32 idx, J3DTevStage stage) {
@@ -721,7 +721,7 @@ public:
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x576, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
-        J3D_ASSERT_NULLPTR(0x577, stage != 0);
+        J3D_ASSERT_NULLPTR(0x577, stage != NULL);
         mIndTevStage[idx] = *stage;
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
@@ -734,7 +734,7 @@ public:
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x589, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
-        J3D_ASSERT_NULLPTR(0x58a, color != 0);
+        J3D_ASSERT_NULLPTR(0x58a, color != NULL);
         mTevColor[idx] = *color;
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
@@ -747,7 +747,7 @@ public:
     }
     virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x59c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
-        J3D_ASSERT_NULLPTR(0x59d, color != 0);
+        J3D_ASSERT_NULLPTR(0x59d, color != NULL);
         mTevKColor[idx] = *color;
     }
     virtual void setTevKColor(u32 idx, J3DGXColor color) {
@@ -760,7 +760,7 @@ public:
     }
     virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x5af, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
-        J3D_ASSERT_NULLPTR(0x5b0, sel != 0);
+        J3D_ASSERT_NULLPTR(0x5b0, sel != NULL);
         mTevKColorSel[idx] = *sel;
     }
     virtual void setTevKColorSel(u32 idx, u8 sel) {
@@ -818,7 +818,7 @@ public:
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* no) {
         J3D_ASSERT_RANGE(0x618, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
-        J3D_ASSERT_NULLPTR(0x619, no != 0);
+        J3D_ASSERT_NULLPTR(0x619, no != NULL);
         mTexNo[idx] = *no;
     }
     virtual void setTexNo(u32 idx, u16 no) {
@@ -831,7 +831,7 @@ public:
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x62d, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
-        J3D_ASSERT_NULLPTR(0x62e, order != 0);
+        J3D_ASSERT_NULLPTR(0x62e, order != NULL);
         mTevOrder[idx] = *order;
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder order) {
@@ -847,7 +847,7 @@ public:
     virtual u8 getTevStageNum() const { return 1; }
     virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x64b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x64c, stage != 0);
+        J3D_ASSERT_NULLPTR(0x64c, stage != NULL);
         mTevStage[idx] = *stage;
     }
     virtual void setTevStage(u32 idx, J3DTevStage stage) {
@@ -860,7 +860,7 @@ public:
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x65e, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
-        J3D_ASSERT_NULLPTR(0x65f, stage != 0);
+        J3D_ASSERT_NULLPTR(0x65f, stage != NULL);
         mIndTevStage[idx] = *stage;
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
@@ -908,7 +908,7 @@ public:
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x6b4, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
-        J3D_ASSERT_NULLPTR(0x6b5, texNo != 0);
+        J3D_ASSERT_NULLPTR(0x6b5, texNo != NULL);
         mTexNo[idx] = *texNo;
     }
     virtual void setTexNo(u32 idx, u16 texNo) {
@@ -921,7 +921,7 @@ public:
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x6c9, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
-        J3D_ASSERT_NULLPTR(0x6ca, order != 0);
+        J3D_ASSERT_NULLPTR(0x6ca, order != NULL);
         mTevOrder[idx] = *order;
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder order) {
@@ -934,7 +934,7 @@ public:
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x6dc, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
-        J3D_ASSERT_NULLPTR(0x6dd, color != 0);
+        J3D_ASSERT_NULLPTR(0x6dd, color != NULL);
         mTevColor[idx] = *color;
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
@@ -947,7 +947,7 @@ public:
     }
     virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x6ef, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
-        J3D_ASSERT_NULLPTR(0x6f0, color != 0);
+        J3D_ASSERT_NULLPTR(0x6f0, color != NULL);
         mTevKColor[idx] = *color;
     }
     virtual void setTevKColor(u32 idx, J3DGXColor color) {
@@ -960,7 +960,7 @@ public:
     }
     virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x702, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
-        J3D_ASSERT_NULLPTR(0x703, sel != 0);
+        J3D_ASSERT_NULLPTR(0x703, sel != NULL);
         mTevKColorSel[idx] = *sel;
     }
     virtual void setTevKColorSel(u32 idx, u8 sel) {
@@ -973,7 +973,7 @@ public:
     }
     virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x715, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
-        J3D_ASSERT_NULLPTR(0x716, sel != 0);
+        J3D_ASSERT_NULLPTR(0x716, sel != NULL);
         mTevKAlphaSel[idx] = *sel;
     }
     virtual void setTevKAlphaSel(u32 idx, u8 sel) {
@@ -985,14 +985,14 @@ public:
         return mTevKAlphaSel[idx];
     }
     virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x727, num != 0);
+        J3D_ASSERT_NULLPTR(0x727, num != NULL);
         mTevStageNum = *num;
     }
     virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     virtual u8 getTevStageNum() const { return mTevStageNum; }
     virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x736, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x737, stage != 0);
+        J3D_ASSERT_NULLPTR(0x737, stage != NULL);
         mTevStage[idx] = *stage;
     }
     virtual void setTevStage(u32 idx, J3DTevStage stage) {
@@ -1005,7 +1005,7 @@ public:
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x749, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x74a, info != 0);
+        J3D_ASSERT_NULLPTR(0x74a, info != NULL);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
@@ -1014,7 +1014,7 @@ public:
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x757, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
-        J3D_ASSERT_NULLPTR(0x758, table != 0);
+        J3D_ASSERT_NULLPTR(0x758, table != NULL);
         mTevSwapModeTable[idx] = *table;
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
@@ -1027,7 +1027,7 @@ public:
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x76a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
-        J3D_ASSERT_NULLPTR(0x76b, stage != 0);
+        J3D_ASSERT_NULLPTR(0x76b, stage != NULL);
         mIndTevStage[idx] = *stage;
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
@@ -1084,7 +1084,7 @@ public:
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x7d5, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
-        J3D_ASSERT_NULLPTR(0x7d6, texNo != 0);
+        J3D_ASSERT_NULLPTR(0x7d6, texNo != NULL);
         mTexNo[idx] = *texNo;
     }
     virtual void setTexNo(u32 idx, u16 texNo) {
@@ -1097,7 +1097,7 @@ public:
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x7ea, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
-        J3D_ASSERT_NULLPTR(0x7eb, order != 0);
+        J3D_ASSERT_NULLPTR(0x7eb, order != NULL);
         mTevOrder[idx] = *order;
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder order) {
@@ -1110,7 +1110,7 @@ public:
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x7fd, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
-        J3D_ASSERT_NULLPTR(0x7fe, color != 0);
+        J3D_ASSERT_NULLPTR(0x7fe, color != NULL);
         mTevColor[idx] = *color;
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
@@ -1123,7 +1123,7 @@ public:
     }
     virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x810, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
-        J3D_ASSERT_NULLPTR(0x811, color != 0);
+        J3D_ASSERT_NULLPTR(0x811, color != NULL);
         mTevKColor[idx] = *color;
     }
     virtual void setTevKColor(u32 idx, J3DGXColor color) {
@@ -1136,7 +1136,7 @@ public:
     }
     virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x823, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
-        J3D_ASSERT_NULLPTR(0x824, sel != 0);
+        J3D_ASSERT_NULLPTR(0x824, sel != NULL);
         mTevKColorSel[idx] = *sel;
     }
     virtual void setTevKColorSel(u32 idx, u8 sel) {
@@ -1149,7 +1149,7 @@ public:
     }
     virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x836, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
-        J3D_ASSERT_NULLPTR(0x837, sel != 0);
+        J3D_ASSERT_NULLPTR(0x837, sel != NULL);
         mTevKAlphaSel[idx] = *sel;
     }
     virtual void setTevKAlphaSel(u32 idx, u8 sel) {
@@ -1161,14 +1161,14 @@ public:
         return mTevKAlphaSel[idx];
     }
     virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x848, num != 0);
+        J3D_ASSERT_NULLPTR(0x848, num != NULL);
         mTevStageNum = *num;
     }
     virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     virtual u8 getTevStageNum() const { return mTevStageNum; }
     virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x857, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x858, stage != 0);
+        J3D_ASSERT_NULLPTR(0x858, stage != NULL);
         mTevStage[idx] = *stage;
     }
     virtual void setTevStage(u32 idx, J3DTevStage stage) {
@@ -1181,7 +1181,7 @@ public:
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x86a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x86b, info != 0);
+        J3D_ASSERT_NULLPTR(0x86b, info != NULL);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
@@ -1190,7 +1190,7 @@ public:
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x878, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
-        J3D_ASSERT_NULLPTR(0x879, table != 0);
+        J3D_ASSERT_NULLPTR(0x879, table != NULL);
         mTevSwapModeTable[idx] = *table;
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
@@ -1203,7 +1203,7 @@ public:
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x88b, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
-        J3D_ASSERT_NULLPTR(0x88c, stage != 0);
+        J3D_ASSERT_NULLPTR(0x88c, stage != NULL);
         mIndTevStage[idx] = *stage;
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
@@ -1260,7 +1260,7 @@ public:
     virtual s32 countDLSize();
     virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x8f6, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
-        J3D_ASSERT_NULLPTR(0x8f7, texNo != 0);
+        J3D_ASSERT_NULLPTR(0x8f7, texNo != NULL);
         mTexNo[idx] = *texNo;
     }
     virtual void setTexNo(u32 idx, u16 texNo) {
@@ -1273,7 +1273,7 @@ public:
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x90b, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
-        J3D_ASSERT_NULLPTR(0x90c, order != 0);
+        J3D_ASSERT_NULLPTR(0x90c, order != NULL);
         mTevOrder[idx] = *order;
     }
     virtual void setTevOrder(u32 idx, J3DTevOrder order) {
@@ -1286,7 +1286,7 @@ public:
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x91e, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
-        J3D_ASSERT_NULLPTR(0x91f, color != 0);
+        J3D_ASSERT_NULLPTR(0x91f, color != NULL);
         mTevColor[idx] = *color;
     }
     virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
@@ -1299,7 +1299,7 @@ public:
     }
     virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x931, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
-        J3D_ASSERT_NULLPTR(0x932, color != 0);
+        J3D_ASSERT_NULLPTR(0x932, color != NULL);
         mTevKColor[idx] = *color;
     }
     virtual void setTevKColor(u32 idx, J3DGXColor color) {
@@ -1312,7 +1312,7 @@ public:
     }
     virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x944, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
-        J3D_ASSERT_NULLPTR(0x945, sel != 0);
+        J3D_ASSERT_NULLPTR(0x945, sel != NULL);
         mTevKColorSel[idx] = *sel;
     }
     virtual void setTevKColorSel(u32 idx, u8 sel) {
@@ -1325,7 +1325,7 @@ public:
     }
     virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x957, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
-        J3D_ASSERT_NULLPTR(0x958, sel != 0);
+        J3D_ASSERT_NULLPTR(0x958, sel != NULL);
         mTevKAlphaSel[idx] = *sel;
     }
     virtual void setTevKAlphaSel(u32 idx, u8 sel) {
@@ -1337,14 +1337,14 @@ public:
         return mTevKAlphaSel[idx];
     }
     virtual void setTevStageNum(u8 const* num) {
-        J3D_ASSERT_NULLPTR(0x969, num != 0);
+        J3D_ASSERT_NULLPTR(0x969, num != NULL);
         mTevStageNum = *num;
     }
     virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
     virtual u8 getTevStageNum() const { return mTevStageNum; }
     virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x978, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x979, stage != 0);
+        J3D_ASSERT_NULLPTR(0x979, stage != NULL);
         mTevStage[idx] = *stage;
     }
     virtual void setTevStage(u32 idx, J3DTevStage stage) {
@@ -1357,7 +1357,7 @@ public:
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x98b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
-        J3D_ASSERT_NULLPTR(0x98c, info != 0);
+        J3D_ASSERT_NULLPTR(0x98c, info != NULL);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
     virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
@@ -1366,7 +1366,7 @@ public:
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x999, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
-        J3D_ASSERT_NULLPTR(0x99a, table != 0);
+        J3D_ASSERT_NULLPTR(0x99a, table != NULL);
         mTevSwapModeTable[idx] = *table;
     }
     virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
@@ -1379,7 +1379,7 @@ public:
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x9ac, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
-        J3D_ASSERT_NULLPTR(0x9ad, stage != 0);
+        J3D_ASSERT_NULLPTR(0x9ad, stage != NULL);
         mIndTevStage[idx] = *stage;
     }
     virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
@@ -1671,7 +1671,7 @@ public:
     virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
     virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
     virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
-        J3D_ASSERT_NULLPTR(0xa94, order != 0);
+        J3D_ASSERT_NULLPTR(0xa94, order != NULL);
         J3D_ASSERT_RANGE(0xa95, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = *order;
     }
@@ -1684,7 +1684,7 @@ public:
         return &mIndTexOrder[idx];
     }
     virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
-        J3D_ASSERT_NULLPTR(0xaa7, mtx != 0);
+        J3D_ASSERT_NULLPTR(0xaa7, mtx != NULL);
         J3D_ASSERT_RANGE(0xaa8, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = *mtx;
     }
@@ -1697,7 +1697,7 @@ public:
         return &mIndTexMtx[idx];
     }
     virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
-        J3D_ASSERT_NULLPTR(0xaba, scale != 0);
+        J3D_ASSERT_NULLPTR(0xaba, scale != NULL);
         J3D_ASSERT_RANGE(0xabb, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = *scale;
     }
@@ -1831,31 +1831,31 @@ public:
     virtual s32 countDLSize();
     virtual u32 getType() { return 'PEFG'; }
     virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
-        J3D_ASSERT_NULLPTR(0xbf9, alphaComp != 0);
+        J3D_ASSERT_NULLPTR(0xbf9, alphaComp != NULL);
         mAlphaComp = *alphaComp;
     }
     virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
     virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
     virtual void setBlend(J3DBlend const* blend) {
-        J3D_ASSERT_NULLPTR(0xc07, blend != 0);
+        J3D_ASSERT_NULLPTR(0xc07, blend != NULL);
         mBlend = *blend;
     }
     virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
     virtual J3DBlend* getBlend() { return &mBlend; }
     virtual void setZMode(J3DZMode const* zMode) {
-        J3D_ASSERT_NULLPTR(0xc15, zMode != 0);
+        J3D_ASSERT_NULLPTR(0xc15, zMode != NULL);
         mZMode = *zMode;
     }
     virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
     virtual J3DZMode* getZMode() { return &mZMode; }
     virtual void setZCompLoc(u8 const* zCompLoc) {
-        J3D_ASSERT_NULLPTR(0xc23, zCompLoc != 0);
+        J3D_ASSERT_NULLPTR(0xc23, zCompLoc != NULL);
         mZCompLoc = *zCompLoc;
     }
     virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
     virtual u8 getZCompLoc() const { return mZCompLoc; }
     virtual void setDither(u8 const* dither) {
-        J3D_ASSERT_NULLPTR(0xc31, dither != 0);
+        J3D_ASSERT_NULLPTR(0xc31, dither != NULL);
         mDither = *dither;
     }
     virtual void setDither(u8 dither) { mDither = dither; }
@@ -1892,31 +1892,31 @@ public:
     virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
     virtual J3DFog* getFog() { return &mFog; }
     virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
-        J3D_ASSERT_NULLPTR(0xc7d, alphaComp != 0);
+        J3D_ASSERT_NULLPTR(0xc7d, alphaComp != NULL);
         mAlphaComp = *alphaComp;
     }
     virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
     virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
     virtual void setBlend(J3DBlend const* blend) {
-        J3D_ASSERT_NULLPTR(0xc8b, blend != 0);
+        J3D_ASSERT_NULLPTR(0xc8b, blend != NULL);
         mBlend = *blend;
     }
     virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
     virtual J3DBlend* getBlend() { return &mBlend; }
     virtual void setZMode(J3DZMode const* zMode) {
-        J3D_ASSERT_NULLPTR(0xc99, zMode != 0);
+        J3D_ASSERT_NULLPTR(0xc99, zMode != NULL);
         mZMode = *zMode;
     }
     virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
     virtual J3DZMode* getZMode() { return &mZMode; }
     virtual void setZCompLoc(u8 const* zCompLoc) {
-        J3D_ASSERT_NULLPTR(0xca7, zCompLoc != 0);
+        J3D_ASSERT_NULLPTR(0xca7, zCompLoc != NULL);
         mZCompLoc = *zCompLoc;
     }
     virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
     virtual u8 getZCompLoc() const { return mZCompLoc; }
     virtual void setDither(u8 const* dither) {
-        J3D_ASSERT_NULLPTR(0xcb5, dither != 0);
+        J3D_ASSERT_NULLPTR(0xcb5, dither != NULL);
         mDither = *dither;
     }
     virtual void setDither(u8 dither) { mDither = dither; }
diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/src/JSystem/J3DGraphBase/J3DTexture.cpp
index 60c0590222e..70d9a69031c 100644
--- a/src/JSystem/J3DGraphBase/J3DTexture.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTexture.cpp
@@ -49,7 +49,7 @@ void J3DTexture::addResTIMG(u16 newNum, const ResTIMG* newRes) {
     if (newNum == 0)
         return;
 
-    J3D_ASSERT_NULLPTR(105, newRes != 0);
+    J3D_ASSERT_NULLPTR(105, newRes != NULL);
 
     u16 oldNum = mNum;
     ResTIMG* oldRes = mpRes;
diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/src/JSystem/JAWExtSystem/JAWWindow.cpp
index 0a8b8f1afd4..7153fd0d2d0 100644
--- a/src/JSystem/JAWExtSystem/JAWWindow.cpp
+++ b/src/JSystem/JAWExtSystem/JAWWindow.cpp
@@ -207,7 +207,7 @@ void JAWWindow::TWindowText::drawSelf(f32, f32, Mtx* param_3) {
     MTXConcat(*param_3, mGlobalMtx, stack_48);
     GXLoadPosMtxImm(stack_48, 0);
     field_0xfc.setParentAlpha(mColorAlpha);
-    JUT_ASSERT(209, m_pParent != 0);
+    JUT_ASSERT(209, m_pParent != NULL);
     m_pParent->setMatrix(stack_48);
     m_pParent->onDraw(&field_0xfc);
 }
diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp
index a78c66d3ec3..34a2c811c7b 100644
--- a/src/JSystem/JAudio2/JASAramStream.cpp
+++ b/src/JSystem/JAudio2/JASAramStream.cpp
@@ -89,7 +89,7 @@ JASAramStream::JASAramStream() {
 }
 
 void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, void* i_callbackData) {
-    JUT_ASSERT(153, sReadBuffer != 0);
+    JUT_ASSERT(153, sReadBuffer != NULL);
     field_0x148 = param_0;
     field_0x14c = param_1;
     field_0x0c8 = 0.0f;
diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp
index 66b97467158..c19daf5fe11 100644
--- a/src/JSystem/JAudio2/JASBNKParser.cpp
+++ b/src/JSystem/JAudio2/JASBNKParser.cpp
@@ -95,7 +95,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
             switch (*data++) {
             case 'Inst': {
                 JASBasicInst* instp = new (heap, 0) JASBasicInst();
-                JUT_ASSERT(187, instp != 0);
+                JUT_ASSERT(187, instp != NULL);
                 u32 count = *data++;
                 for (int j = 0; j < count; j++) {
                     u32 index = *data++;
@@ -127,7 +127,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
 
             case 'Perc': {
                 JASDrumSet* drump = new (heap, 0) JASDrumSet();
-                JUT_ASSERT(264, drump != 0);
+                JUT_ASSERT(264, drump != NULL);
                 u32 pmap_count = data[1];
                 JUT_ASSERT(268, pmap_count <= 128);
                 u32 count = *data++;
diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp
index 051136bc465..4cd85278f66 100644
--- a/src/JSystem/JAudio2/JASBasicInst.cpp
+++ b/src/JSystem/JAudio2/JASBasicInst.cpp
@@ -49,8 +49,8 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con
 
 void JASBasicInst::setKeyRegionCount(u32 count, JKRHeap* param_1) {
     delete [] mKeymap;
-    mKeymap      = new (param_1, 0) TKeymap[count];
-    JUT_ASSERT(114, mKeymap != 0);
+    mKeymap = new (param_1, 0) TKeymap[count];
+    JUT_ASSERT(114, mKeymap != NULL);
 	mKeymapCount = count;
 }
 
diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/src/JSystem/JAudio2/JASCmdStack.cpp
index 8d214151cc0..1a39ab1560c 100644
--- a/src/JSystem/JAudio2/JASCmdStack.cpp
+++ b/src/JSystem/JAudio2/JASCmdStack.cpp
@@ -18,7 +18,7 @@ bool JASPortCmd::addPortCmdOnce() {
 }
 
 bool JASPortCmd::setPortCmd(Command func, JASPortArgs* args) {
-	JUT_ASSERT(81, func != 0);
+	JUT_ASSERT(81, func != NULL);
 	if (getSupervisor()) {
 		return false;
 	}
diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
index 1dc9da38eaa..5598ab22772 100644
--- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
@@ -15,7 +15,7 @@ JASSimpleWaveBank::~JASSimpleWaveBank() {
 void JASSimpleWaveBank::setWaveTableSize(u32 size, JKRHeap* heap) {
     delete[] mWaveTable;
     mWaveTable = new (heap, 0) TWaveHandle[size];
-    JUT_ASSERT(29, mWaveTable != 0);
+    JUT_ASSERT(29, mWaveTable != NULL);
     mWaveTableSize = size;
 }
 
diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp
index 6ba0a66a79f..eec0ebd644e 100644
--- a/src/JSystem/JAudio2/JASTrack.cpp
+++ b/src/JSystem/JAudio2/JASTrack.cpp
@@ -190,7 +190,7 @@ void JASTrack::stopSeq() {
 }
 
 void JASTrack::start() {
-    JUT_ASSERT(289, mParent != 0);
+    JUT_ASSERT(289, mParent != NULL);
     JUT_ASSERT(290, mStatus == STATUS_FREE);
     mStatus = STATUS_RUN;
 }
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 3aada44eb10..3a929bb4336 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -262,7 +262,7 @@ f64 TFunctionValue_composite::composite_raw(TVector_pointer<TFunctionValue*> con
     }
     TFunctionValue** p = (TFunctionValue**)param_1.begin();
     std::advance(p, index);
-    JUT_ASSERT(0x247, p!=0);
+    JUT_ASSERT(0x247, p!=NULL);
     TFunctionValue* piVar4 = *p;
     return piVar4->getValue(param_3);
 }
@@ -348,7 +348,7 @@ f64 TFunctionValue_composite::composite_add(TVector_pointer<TFunctionValue*> con
     TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
     while (aTStack_18) {
         TFunctionValue* const* p = *aTStack_18;
-        JUT_ASSERT(0x2a1, p!=0);
+        JUT_ASSERT(0x2a1, p!=NULL);
         TFunctionValue* piVar3 = *p;
         dVar4 += piVar3->getValue(param_3);
     }
@@ -368,7 +368,7 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointer<TFunctionValue*
     f64 dVar4 = pFront->getValue(param_3);
     while (aTStack_18) {
         TFunctionValue* const* p = *aTStack_18;
-        JUT_ASSERT(0x2b5, p!=0);
+        JUT_ASSERT(0x2b5, p!=NULL);
         TFunctionValue* piVar3 = *p;
         dVar4 -= piVar3->getValue(param_3);
     }
@@ -383,7 +383,7 @@ f64 TFunctionValue_composite::composite_multiply(TVector_pointer<TFunctionValue*
     TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
     while (aTStack_18) {
         TFunctionValue* const* p = *aTStack_18;
-        JUT_ASSERT(0x2c5, p!=0);
+        JUT_ASSERT(0x2c5, p!=NULL);
         TFunctionValue* piVar3 = *p;
         dVar4 *= piVar3->getValue(param_3);
     }
@@ -403,7 +403,7 @@ f64 TFunctionValue_composite::composite_divide(TVector_pointer<TFunctionValue*>
     TValue fData = pFront->getValue(param_3);
     while (aTStack_18) {
         TFunctionValue* const* p = *aTStack_18;
-        JUT_ASSERT(0x2d9, p!=0);
+        JUT_ASSERT(0x2d9, p!=NULL);
         TFunctionValue* piVar3 = *p;
         fData /= piVar3->getValue(param_3);
         JGADGET_ASSERTWARN(0x2db, fData!=TValue(0));
diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp
index ce703f62dcc..d10cd0c78a1 100644
--- a/src/JSystem/JStudio/JStudio/fvb.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb.cpp
@@ -374,14 +374,14 @@ void TFactory::destroy(TObject* pObject) {
 }
 
 TParse::TParse(TControl* pControl) : pControl_(pControl) {
-    ASSERT(pControl_ != 0);
+    ASSERT(pControl_ != NULL);
 }
 
 TParse::~TParse() {}
 
 bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 flags) {
-    ASSERT(ppData_inout != 0);
-    ASSERT(puBlock_out != 0);
+    ASSERT(ppData_inout != NULL);
+    ASSERT(puBlock_out != NULL);
 
     const void* pData = *ppData_inout;
     ASSERT(pData != NULL);
@@ -415,8 +415,8 @@ bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 f
 }
 
 bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 flags) {
-    ASSERT(ppData_inout != 0);
-    ASSERT(puData_out != 0);
+    ASSERT(ppData_inout != NULL);
+    ASSERT(puData_out != NULL);
 
     const void* pData = *ppData_inout;
     ASSERT(pData != NULL);
@@ -425,7 +425,7 @@ bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 fla
     *puData_out = blk.get_size();
 
     TControl* pControl = getControl();
-    ASSERT(pControl != 0);
+    ASSERT(pControl != NULL);
 
     if (flags & 0x10) {
         if (pControl->getObject(blk.get_ID(), blk.get_IDSize()) != NULL)
diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp
index 2073b86fa9c..0a61d678823 100644
--- a/src/d/actor/d_a_npc_ashB.cpp
+++ b/src/d/actor/d_a_npc_ashB.cpp
@@ -943,7 +943,7 @@ bool daNpcAshB_c::demo(void* param_0) {
             s32 staff_id = evtmgr.getMyStaffId(l_myName, NULL, 0);
             if (staff_id != -1) {
                 mStaffID = staff_id;
-                JUT_ASSERT(1523, mEvtSeqList[mOrderEvtNo] != 0);
+                JUT_ASSERT(1523, mEvtSeqList[mOrderEvtNo] != NULL);
                 if ((this->*(mEvtSeqList[mOrderEvtNo]))(staff_id)) {
                     evtmgr.cutEnd(staff_id);
                 }
diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp
index cf8a2b06b09..d9299694f9a 100644
--- a/src/d/actor/d_a_obj_brakeeff.cpp
+++ b/src/d/actor/d_a_obj_brakeeff.cpp
@@ -147,7 +147,7 @@ int useHeapInit(fopAc_ac_c* i_this) {
     J3DModelData* modelData =
         static_cast<J3DModelData*>(dComIfG_getObjectRes("Obj_Bef", bef_bmd[a_this->mEffectType]));
 
-    JUT_ASSERT(339, modelData != 0);
+    JUT_ASSERT(339, modelData != NULL);
 
     a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
 
diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp
index d2105d38b02..9815391dfad 100644
--- a/src/d/actor/d_a_obj_shield.cpp
+++ b/src/d/actor/d_a_obj_shield.cpp
@@ -349,11 +349,13 @@ static int daItemShield_Execute(daItemShield_c* i_this) {
 }
 
 static int daItemShield_Delete(daItemShield_c* i_this) {
+    fopAcM_RegisterDeleteID(i_this, "ObjSShield");
     return i_this->_delete();
 }
 
 static int daItemShield_Create(fopAc_ac_c* i_this) {
-    return static_cast<daItemShield_c*>(i_this)->create();
+    fopAcM_RegisterCreateID(daItemShield_c, i_this, "ObjSShield");
+    return a_this->create();
 }
 
 static actor_method_class l_daItemShield_Method = {
diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp
index 7c1b06a5c1f..15b920f211a 100644
--- a/src/d/actor/d_a_tag_watchge.cpp
+++ b/src/d/actor/d_a_tag_watchge.cpp
@@ -59,17 +59,20 @@ static int daTagWatchGe_Delete(daTagWatchGe_c* i_this) {
 
 int daTagWatchGe_c::create() {
     fopAcM_ct(this, daTagWatchGe_c);
+    OS_REPORT("Tag_WatchGe PARAM %x\n", fopAcM_GetParam(this));
     mGroupNo = fopAcM_GetParam(this);
 
     if (mGroupNo == 0xFF) {
+        OS_REPORT("監視するグェーのグループが指定されてません！");
         return cPhs_ERROR_e;
     } else {
-        field_0x568 = fopAcM_GetParam(this) >> 8;
+        field_0x568 = (fopAcM_GetParam(this) >> 8) & 0xFF;
 
         if (field_0x568 == 0xFF) {
+            OS_REPORT("グェー監視タグのスイッチが指定されてません！");
             return cPhs_ERROR_e;
         }
-        if (dComIfGs_isSwitch(field_0x568,fopAcM_GetRoomNo(this)) != 0) {
+        if (dComIfGs_isSwitch(field_0x568, fopAcM_GetRoomNo(this)) != 0) {
             return cPhs_ERROR_e;
         }
     }
diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp
index 22d39a7bbb6..3072d3c24c7 100644
--- a/src/d/actor/d_a_title.cpp
+++ b/src/d/actor/d_a_title.cpp
@@ -117,6 +117,7 @@ int daTitle_c::create() {
     field_0x5f9 = 0;
 
     m2DHeap = JKRExpHeap::create(0x8000, mDoExt_getGameHeap(), false);
+    JUT_ASSERT(345, m2DHeap != NULL);
     loadWait_init();
     g_daTitHIO.field_0x4 = -1;
 
diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index afba0654ffb..d34b981e890 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -173,7 +173,7 @@ bool dMpath_HIO_file_base_c::readBinaryFile(const char* param_1)  {
     if (file.open(JORFile::EFlags_READ, r26, NULL, NULL, NULL)) {
         s32 r28 = file.getFileSize();
         char* buf = new char[r28];
-        JUT_ASSERT(855, buf != 0);
+        JUT_ASSERT(855, buf != NULL);
         file.readData(buf, r28);
         copyReadBufToData(buf, r28);
         OSReport("write read success!::%6d\n", r28);
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp
index 649df3039f1..1fb29a54ce0 100644
--- a/src/d/d_menu_fmap.cpp
+++ b/src/d/d_menu_fmap.cpp
@@ -189,7 +189,7 @@ dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
     }
 
     mpTalkHeap = JKRCreateExpHeap(0x32000, mpHeap, false);
-    JUT_ASSERT(359, mpTalkHeap != 0);
+    JUT_ASSERT(359, mpTalkHeap != NULL);
     field_0x200 = 0;
     mIsWarpMap = false;
 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index f8c2d657283..228bc9f29f7 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -831,17 +831,42 @@ u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) {
         return -1;
     }
 
+    u32 estimatedSize = i_heap->getHeapSize();
     s32 result = i_heap->adjustSize();
     if (result < 0) {
         // "adjustSize failure %08x\n"
         OSReport_Error("adjustSize失敗 %08x\n", i_heap);
         return -1;
     }
+    u32 actualSize = i_heap->getHeapSize();
+
+    #if DEBUG
+    if (lbl_8074C3B9[0]) {
+        // "\x1B[33mSolid heap estimate: %08x actual: %08x\n\x1B[m"
+        OS_REPORT("\x1B[33mソリッドヒープの見積もり %08x 実際 %08x\n\x1B[m", estimatedSize, actualSize);
+
+        if (estimatedSize > 0x400 && estimatedSize > (actualSize + 0x400)) {
+            // "\x1B[33mThe estimate is %x bytes too large (%5.2f times). This could lead to degraded memory efficiency.\n\x1B[m"
+            OS_REPORT("\x1B[33m見積もりが %x バイト大きい(%5.2f倍)です。メモリ効率悪化が懸念されます。\n\x1B[m", estimatedSize - actualSize, (f32)estimatedSize / (f32)actualSize);
+        } else if (estimatedSize >= (actualSize + 0x20)) {
+            // "\x1B[36mThe estimate is %x bytes too large. That's pretty good.\n\x1B[m"
+            OS_REPORT("\x1B[36m見積もりが %x バイト大きいです。だいぶいい感じです。\n\x1B[m", estimatedSize - actualSize);
+        } else {
+            // "\x1B[32mThe estimate is spot on! Perfect.\n\x1B[m"
+            OS_REPORT("\x1B[32m見積もりが、ジャストミート！完璧です。\n\x1B[m");
+        }
+    }
+
+    if (lbl_8074C3B9[0]) {
+        OS_REPORT("JKRSolidHeap::adjustSize %08x (%08x bytes)\n", (u32)i_heap, result);
+    }
+    #endif
 
     // this probably indicates that 0x80 is some constant, maybe from a sizeof(JKRSolidHeap)
     // with alignment?
-    if (result >= (u32)0x80) {
-        result -= 0x80;
+    u32 r25 = 0x80;
+    if (result >= r25) {
+        return result - r25;
     }
 
     return result;