diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp
index fe4b0f246..5ac30c2e3 100644
--- a/src/d/d_grass.cpp
+++ b/src/d/d_grass.cpp
@@ -358,8 +358,10 @@ dGrass_data_c::dGrass_data_c() {
 
 /* 80077CDC-80077E58       .text draw__15dGrass_packet_cFv */
 void dGrass_packet_c::draw() {
+#if VERSION != VERSION_JPN
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
+#endif
 
     static GXVtxDescList l_vtxDescList[] = {
         {GX_VA_POS, GX_INDEX8},
@@ -399,7 +401,9 @@ void dGrass_packet_c::draw() {
         }
     }
 
+#if VERSION != VERSION_JPN
     J3DShape::resetVcdVatCache();
+#endif
 }
 
 /* 80077E58-80078008       .text calc__15dGrass_packet_cFv */
@@ -514,7 +518,7 @@ void dGrass_packet_c::setData(dGrass_data_c* data, int nextIdx, cXyz& pos, int i
 
 /* 800785C0-800786FC       .text newData__15dGrass_packet_cFR4cXyziSc */
 dGrass_data_c* dGrass_packet_c::newData(cXyz& pos, int i_roomNo, s8 itemIdx) {
-    JUT_ASSERT(0x600, 0 <= i_roomNo && i_roomNo < 64);
+    JUT_ASSERT(VERSION_SELECT(1530, 1536, 1536), 0 <= i_roomNo && i_roomNo < 64);
 
     dGrass_data_c* data = &mGrassData[mNextIdx];
     s32 i = mNextIdx;