From c71234f3085f956d3f9e406da8932c0dc11ddf05 Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Sun, 21 Feb 2021 19:41:58 -0500
Subject: [PATCH] clang-format + fixes for jasper

---
 include/f/f_op/f_op_scene_iter.h | 6 +++---
 include/f/f_op/f_op_scene_req.h  | 2 +-
 src/d/d_com/d_com_inf_game.cpp   | 2 +-
 src/f/f_op/f_op_msg_mng.cpp      | 3 ---
 src/f/f_op/f_op_scene_mng.cpp    | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/f/f_op/f_op_scene_iter.h b/include/f/f_op/f_op_scene_iter.h
index 4e641dc5c6f..2f3a8b8cdbf 100644
--- a/include/f/f_op/f_op_scene_iter.h
+++ b/include/f/f_op/f_op_scene_iter.h
@@ -2,9 +2,9 @@
 #define F_F_OP_SCENE_ITER_H_
 
 #include "dolphin/types.h"
+#include "f/f_pc/f_pc_base.h"
 
-typedef void* (*fop_ScnItFunc)(void*, void*);
-
-void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pFunc2);
+typedef void* (*fop_ScnItFunc)(base_process_class* pProc, void* pUserData);
+void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData);
 
 #endif
\ No newline at end of file
diff --git a/include/f/f_op/f_op_scene_req.h b/include/f/f_op/f_op_scene_req.h
index 54b07cdea9a..6c2b15aa12d 100644
--- a/include/f/f_op/f_op_scene_req.h
+++ b/include/f/f_op/f_op_scene_req.h
@@ -6,7 +6,7 @@ void fopScnRq_Handler(void);
 void fopScnRq_ReRequest(void);
 }
 
-u32 fopScnRq_Request(int,scene_class*,s16,void*,s16,u16);
+u32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16);
 u32 fopScnRq_ReRequest(unsigned int, s16, void*);
 
 #endif
\ No newline at end of file
diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index eda882934f8..40f0073238c 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -4,13 +4,13 @@
 #include "d/d_bg/d_bg_s/d_bg_s.h"
 #include "d/d_item/d_item/d_item.h"
 #include "d/d_kankyo/d_kankyo.h"
+#include "f/f_op/f_op_scene_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 #include "msl_c/string.h"
-#include "f/f_op/f_op_scene_mng.h"
 
 extern "C" {
 bool dComIfGp_checkMapShow(void);
diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp
index 1302b54edab..ca7f5d663f0 100644
--- a/src/f/f_op/f_op_msg_mng.cpp
+++ b/src/f/f_op/f_op_msg_mng.cpp
@@ -43,11 +43,8 @@ void fopMsgM_setStageLayer(void);
 void fopMsgM_valueIncrease(void);
 void fopScnM_SearchByID(void);
 void fop_Timer_create(void);
-void fpcBs_Is_JustOfType(void);
 void fpcEx_SearchByID(void);
-void fpcLy_CurrentLayer(void);
 void fpcM_Delete(void);
-void fpcPi_Change(void);
 void fpcSCtRq_Request(void);
 void func_80020158(void);
 void func_800202CC(void);
diff --git a/src/f/f_op/f_op_scene_mng.cpp b/src/f/f_op/f_op_scene_mng.cpp
index 7af43e2cc3b..e3ca5a64dbc 100644
--- a/src/f/f_op/f_op_scene_mng.cpp
+++ b/src/f/f_op/f_op_scene_mng.cpp
@@ -14,11 +14,11 @@ void fopScnRq_Request__FiP11scene_classsPvsUs(void);
 // autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409412
 extern unsigned int l_scnRqID;
 
-// matches but is proabably wrong
+// matches but can be improved
 void* fopScnM_SearchByID(unsigned int id) {
     unsigned int local_8[2];
     local_8[0] = id;
-    return fopScnIt_Judge(fpcSch_JudgeByID, (void*)local_8);
+    return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)local_8);
 }
 
 int fopScnM_ChangeReq(scene_class* pScene, s16 param_2, s16 param_3, u16 param_4) {