diff --git a/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp
index 6c109b3f8b..df6c977560 100644
--- a/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp
+++ b/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp
@@ -265,7 +265,7 @@ void J3DMaterial::diff(u32 diffFlags) {
 }
 
 void J3DMaterial::calc(f32 const (*param_0)[4]) {
-    if (j3dSys.checkFlag(0x40000000)) {
+    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
         mTexGenBlock->calcPostTexMtx(param_0);
     } else {
         mTexGenBlock->calc(param_0);
@@ -276,7 +276,7 @@ void J3DMaterial::calc(f32 const (*param_0)[4]) {
 }
 
 void J3DMaterial::calcDiffTexMtx(f32 const (*param_0)[4]) {
-    if (j3dSys.checkFlag(0x40000000)) {
+    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
         mTexGenBlock->calcPostTexMtxWithoutViewMtx(param_0);
     } else {
         mTexGenBlock->calcWithoutViewMtx(param_0);
@@ -288,7 +288,7 @@ void J3DMaterial::setCurrentMtx() {
 }
 
 void J3DMaterial::calcCurrentMtx() {
-    if (!j3dSys.checkFlag(0x40000000)) {
+    if (!j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
         mCurrentMtx.setCurrentTexMtx(
             getTexCoord(0)->getTexGenMtx(),
             getTexCoord(1)->getTexGenMtx(),
diff --git a/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
index 09ddc0b405..719976770b 100644
--- a/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
+++ b/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp
@@ -37,9 +37,9 @@ void loadTexCoordGens(u32 texGenNum, J3DTexCoord* texCoords) {
     var_r28 = 61;
     J3DGDWriteXFCmdHdr(GX_XF_REG_DUALTEX0, texGenNum);
 
-    if (j3dSys.checkFlag(0x40000000)) {
+    if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
         for (int i = 0; i < texGenNum; i++) {
-            if (texCoords[i].getTexGenMtx() != 60) {
+            if (texCoords[i].getTexGenMtx() != GX_IDENTITY) {
                 var_r28 = i * 3;
             } else {
                 var_r28 = 61;