diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index a5a060661d4..c7b300f1d3f 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -4,21 +4,10 @@
 //
 
 #include "f_op/f_op_kankyo.h"
+#include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
-//
-// Types:
-//
-
-struct process_method_class {};
-
-struct leafdraw_method_class {};
-
-struct leafdraw_class {};
-
-struct create_tag_class {};
-
 //
 // Forward References:
 //
@@ -44,7 +33,6 @@ extern "C" void fpcMtd_Execute__FP20process_method_classPv();
 extern "C" void fpcMtd_IsDelete__FP20process_method_classPv();
 extern "C" void fpcMtd_Delete__FP20process_method_classPv();
 extern "C" void fpcMtd_Create__FP20process_method_classPv();
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 pauseTimer__9dScnPly_c[4];
 
 //
@@ -52,6 +40,17 @@ extern "C" extern u8 pauseTimer__9dScnPly_c[4];
 //
 
 /* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text            fopKy_Draw__FPv */
+#ifndef NONMATCHING
+static int fopKy_Draw(void* param_0) {
+    int ret;
+
+    if (!dComIfGp_isPauseFlag()) {
+        ret = fpcLf_DrawMethod(((msg_class*)param_0)->field_0xd8, param_0);
+    }
+
+    return ret;
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -60,8 +59,14 @@ static asm void fopKy_Draw(void* param_0) {
 #include "asm/f_op/f_op_kankyo/fopKy_Draw__FPv.s"
 }
 #pragma pop
+#endif
 
 /* 8001F2C0-8001F314 019C00 0054+00 1/0 0/0 0/0 .text            fopKy_Execute__FPv */
+#ifdef NONMATCHING
+static void fopKy_Execute(void* param_0) {
+    
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -70,8 +75,14 @@ static asm void fopKy_Execute(void* param_0) {
 #include "asm/f_op/f_op_kankyo/fopKy_Execute__FPv.s"
 }
 #pragma pop
+#endif
 
 /* 8001F314-8001F368 019C54 0054+00 1/0 0/0 0/0 .text            fopKy_IsDelete__FPv */
+#ifdef NONMATCHING
+static void fopKy_IsDelete(void* param_0) {
+    
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -80,8 +91,14 @@ static asm void fopKy_IsDelete(void* param_0) {
 #include "asm/f_op/f_op_kankyo/fopKy_IsDelete__FPv.s"
 }
 #pragma pop
+#endif
 
 /* 8001F368-8001F3B4 019CA8 004C+00 1/0 0/0 0/0 .text            fopKy_Delete__FPv */
+#ifdef NONMATCHING
+static void fopKy_Delete(void* param_0) {
+    
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -90,12 +107,18 @@ static asm void fopKy_Delete(void* param_0) {
 #include "asm/f_op/f_op_kankyo/fopKy_Delete__FPv.s"
 }
 #pragma pop
+#endif
 
 /* ############################################################################################## */
 /* 80450CE8-80450CF0 0001E8 0004+04 1/1 0/0 0/0 .sbss            fopKy_KANKYO_TYPE */
 static u8 fopKy_KANKYO_TYPE[4 + 4 /* padding */];
 
 /* 8001F3B4-8001F488 019CF4 00D4+00 1/0 0/0 0/0 .text            fopKy_Create__FPv */
+#ifdef NONMATCHING
+static void fopKy_Create(void* param_0) {
+    
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -104,6 +127,7 @@ static asm void fopKy_Create(void* param_0) {
 #include "asm/f_op/f_op_kankyo/fopKy_Create__FPv.s"
 }
 #pragma pop
+#endif
 
 /* ############################################################################################## */
 /* 803A3940-803A3958 -00001 0014+04 0/0 7/0 0/0 .data            g_fopKy_Method */