diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp
index ba6997887ba..40f3614a601 100644
--- a/src/f/f_op/f_op_msg_mng.cpp
+++ b/src/f/f_op/f_op_msg_mng.cpp
@@ -2,16 +2,16 @@
 
 #include "f/f_op/f_op_msg_mng.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "d/d_msg_object/d_msg_object.h"
 #include "f/f_op/f_op_scene_iter.h"
+#include "f/f_op/f_op_scene_mng.h"
+#include "f/f_pc/f_pc_executor.h"
 #include "f/f_pc/f_pc_manager.h"
+#include "f/f_pc/f_pc_node.h"
+#include "f/f_pc/f_pc_priority.h"
 #include "f/f_pc/f_pc_stdcreate_req.h"
 #include "global.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
-#include "f/f_op/f_op_scene_mng.h"
-#include "f/f_pc/f_pc_node.h"
-#include "f/f_pc/f_pc_priority.h"
-#include "f/f_pc/f_pc_executor.h"
-#include "d/d_msg_object/d_msg_object.h"
 
 // additional symbols needed for f_op_msg_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945228
@@ -78,7 +78,6 @@ extern u8 lbl_80451C84;
 extern u8 lbl_80451C88;
 extern u8 lbl_80430188;
 
-
 #ifdef NON_MATCHING
 // 1 instruction off, needs alot of cleanup
 void fopMsgM_setStageLayer(void* param_1) {
@@ -93,13 +92,13 @@ void fopMsgM_setStageLayer(void* param_1) {
 
     unk* pScene = (unk*)fopScnM_SearchByID(_mProcID);
 
-    if (!fpcBs_Is_JustOfType(g_fpcNd_type,pScene->field_0xB4)) {
+    if (!fpcBs_Is_JustOfType(g_fpcNd_type, pScene->field_0xB4)) {
         pUnk = (int*)-1;
     } else {
         pUnk = pScene->field_0xC8;
     }
 
-    fpcPi_Change((process_priority_class*)param_1,(u32)pUnk,0xFFFD,0xFFFD);
+    fpcPi_Change((process_priority_class*)param_1, (u32)pUnk, 0xFFFD, 0xFFFD);
 }
 #else
 asm void fopMsgM_setStageLayer(void*) {
@@ -137,30 +136,39 @@ asm dMsgObject_c** createAppend(fopAc_ac_c*, cXyz*, u32*, u32*, unsigned int) {
 
 // createTimerAppend__FiUlUcUcffffUi
 // createTimerAppend__FiUlUcUcffffUi(int, u32, u8, u8, f32, f32, f32, f32, unsigned int)
-asm void createTimerAppend(int, u32, u8, u8, f32, f32, f32, f32, unsigned int) {
-    nofralloc
+asm dMsgObject_c** createTimerAppend(int, u32, u8, u8, f32, f32, f32, f32, unsigned int){nofralloc
 #include "f/f_op/f_op_msg_mng/asm/func_8001FB50.s"
 }
 
-s32 fopMsgM_create(s16 param_1, fopAc_ac_c* pActor, cXyz* pPosition, u32* param_4, u32* param_5, fopMsgCreateFunc param_6) {
+s32 fopMsgM_create(s16 param_1, fopAc_ac_c* pActor, cXyz* pPosition, u32* param_4, u32* param_5,
+                   fopMsgCreateFunc param_6) {
     s32 ret;
-    dMsgObject_c** ppMsg = createAppend(pActor,pPosition,param_4,param_5,-1);
+    dMsgObject_c** ppMsg = createAppend(pActor, pPosition, param_4, param_5, -1);
 
     if (!ppMsg) {
         ret = -1;
     } else {
         layer_class* pLayer = fpcLy_CurrentLayer();
-        ret = fpcSCtRq_Request(pLayer,param_1,(stdCreateFunc)param_6,0,ppMsg);
+        ret = fpcSCtRq_Request(pLayer, param_1, (stdCreateFunc)param_6, 0, ppMsg);
     }
 
     return ret;
 }
 
-// fop_Timer_create__FsUcUlUcUcffffPFPv_i
-// fop_Timer_create__FsUcUlUcUcffffPFPv_i(s16, u8, u32, u8, u8, f32, f32, f32, f32, int (*)(void*))
-asm void fop_Timer_create(s16, u8, u32, u8, u8, f32, f32, f32, f32, int (*)(void*)) {
-    nofralloc
-#include "f/f_op/f_op_msg_mng/asm/func_8001FCC0.s"
+s32 fop_Timer_create(s16 param_1, u8 param_2, u32 param_3, u8 param_4, u8 param_5, f32 param_6,
+                     f32 param_7, f32 param_8, f32 param_9, fopMsgCreateFunc param_10) {
+    s32 ret;
+    dMsgObject_c** ppMsg = createTimerAppend((int)param_2, param_3, param_4, param_5, param_6,
+                                             param_7, param_8, param_9, -1);
+
+    if (!ppMsg) {
+        ret = -1;
+    } else {
+        layer_class* pLayer = fpcLy_CurrentLayer();
+        ret = fpcSCtRq_Request(pLayer, param_1, (stdCreateFunc)param_10, 0, ppMsg);
+    }
+
+    return ret;
 }
 
 // fopMsgM_messageSet__FUlP10fopAc_ac_cUl