diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp
index 2f1af1fe7..5a56ca6af 100644
--- a/src/d/actor/d_a_obj_hat.cpp
+++ b/src/d/actor/d_a_obj_hat.cpp
@@ -145,7 +145,6 @@ static daObjHat_c::MoveFunc_t moveProc[] = {
 
 /* 0000073C-00000884       .text _execute__10daObjHat_cFv */
 BOOL daObjHat_c::_execute() {
-
     (this->*moveProc[mState])();
     f32 xspeed = mMoveNorm.x * speedF;
     f32 yspeed = speed.y + gravity;
diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp
index 08c24957c..a9321308d 100644
--- a/src/d/actor/d_a_obj_rforce.cpp
+++ b/src/d/actor/d_a_obj_rforce.cpp
@@ -18,7 +18,6 @@ BOOL daObjRforce::Act_c::solidHeapCB(fopAc_ac_c* this_i) {
 
 /* 0000009C-00000220       .text create_heap__Q211daObjRforce5Act_cFv */
 bool daObjRforce::Act_c::create_heap() {
-
     J3DModelData* mdl_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, STPTETU_BDL_STPTETU));
     JUT_ASSERT(0x57, mdl_data != NULL);
     mpModel = mDoExt_J3DModel__create(mdl_data, 0, 0x11000002);
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index a030c89c2..3b9bb2ae0 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -482,7 +482,6 @@ void daSea_packet_c::CheckRoomChange() {
     dStage_roomDt_c * room = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo());
     if (room != NULL) {
         mRoomNo = dComIfGp_roomControl_getStayNo();
-        u32 procName = PROC_DAIOCTA;
         daDaiocta_c* octa = (daDaiocta_c *)fopAcM_SearchByName(PROC_DAIOCTA);
         if (octa == NULL) {
             if (mFlags & 0x01) {
@@ -1073,7 +1072,6 @@ void daSea_packet_c::draw() {
             int count = temp_r26_2 + trunc;
 
             for (; z < end; z++) {
-
                 GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, (1+count) * 2);
 
                 f32 texX;
diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp
index 46e18b61e..b78b10f06 100644
--- a/src/d/actor/d_a_ship.cpp
+++ b/src/d/actor/d_a_ship.cpp
@@ -4080,7 +4080,6 @@ BOOL daShip_c::execute() {
         attention_info.position = current.pos;
         if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && dComIfGs_isEventBit(0x908) && !checkStateFlg(daSFLG_UNK800000_e)) {
             if (dComIfGs_isEventBit(0x1980) || !dComIfGs_isEventBit(0x902)) {
-                
                 attention_info.flags = fopAc_Attn_ACTION_SHIP_e;
             }
             else {
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index 437f97be1..bc0c22ba3 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -873,7 +873,6 @@ void daTbox_c::OpenInit_com() {
 
     s32 openSwNo = home.angle.z & 0xFF;
     if (openSwNo != 0xFF) {
-
         dComIfGs_onSwitch(openSwNo, mRoomNo);
     }
 
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 1e41ab961..7db5f320d 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1651,8 +1651,6 @@ void dDlst_shadowSimple_c::draw() {
 
 /* 80084AC8-80084D48       .text set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj */
 void dDlst_shadowSimple_c::set(cXyz* pos, f32 y, f32 param_3, cXyz* floorNrm, s16 rotY, f32 param_6, GXTexObj* texObj) {
-    /* Nonmatching */
-
     f32 offsetY = param_3 * 16.0f * (1.0f - floorNrm->y) + 1.0f;
     mDoMtx_stack_c::transS(pos->x, y + offsetY, pos->z);
     mDoMtx_stack_c::YrotM(rotY);
@@ -1733,10 +1731,10 @@ void dDlst_shadowControl_c::imageDraw(Mtx mtx) {
 
 /* 80084EF0-800850D4       .text draw__21dDlst_shadowControl_cFPA4_f */
 void dDlst_shadowControl_c::draw(Mtx drawMtx) {
-    /* Nonmatching */
-
     j3dSys.reinitGX();
+#if VERSION != VERSION_JPN
     GXSetNumIndStages(0);
+#endif
     dKy_GxFog_set();
     GXSetChanCtrl(GX_ALPHA0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE);
     GXSetChanMatColor(GX_ALPHA0, (GXColor){ 0x00, 0x00, 0x00, 0x20 });
@@ -1847,9 +1845,10 @@ void dDlst_shadowControl_c::setSimpleTex(void* pImg) {
 
 /* 80085348-800855B4       .text draw__18dDlst_mirrorPacketFv */
 void dDlst_mirrorPacket::draw() {
-    /* Nonmatching */
     j3dSys.reinitGX();
+#if VERSION != VERSION_JPN
     GXSetNumIndStages(0);
+#endif
     dKy_GxFog_set();
 
     static GXColor l_color = { 0xFF, 0xFF, 0xFF, 0x40 };
@@ -1895,7 +1894,9 @@ void dDlst_mirrorPacket::draw() {
     GXCallDisplayList(l_shadowVolDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
+#if VERSION != VERSION_JPN
     J3DShape::resetVcdVatCache();
+#endif
 }
 
 /* 800855B4-80085624       .text init__18dDlst_mirrorPacketFP7ResTIMG */
@@ -1994,7 +1995,9 @@ void dDlst_alphaVolPacket::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
+#if VERSION != VERSION_JPN
     J3DShape::resetVcdVatCache();
+#endif
 }
 
 /* 80085AF4-80085BBC       .text draw__23dDlst_alphaInvVolPacketFv */
@@ -2012,7 +2015,9 @@ void dDlst_alphaInvVolPacket::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
     GXSetColorUpdate(GX_TRUE);
     GXSetAlphaUpdate(GX_FALSE);
+#if VERSION != VERSION_JPN
     J3DShape::resetVcdVatCache();
+#endif
 }
 
 /* 80085BBC-80085BFC       .text newData__13dDlst_peekZ_cFssPUl */
@@ -2218,7 +2223,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 != NULL);
+    JUT_ASSERT(VERSION_SELECT(5679, 5687, 5687), 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_lib.cpp b/src/d/d_lib.cpp
index 3d98e5044..c34e5c5b6 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -360,7 +360,6 @@ s32 STControl::checkTrigger() {
         u8 newAngle = 0;
     s16 iVar6 = (0x2000 - field_0x26) >> 1;
     if (!cM3d_IsZero(valueStick)) {
-
         if (angleStick < field_0x22 + -0x7000 + iVar6) {
             newAngle |= 4;
         } else if (angleStick < field_0x22 + -0x5000 - iVar6) {