fopScnM_SearchByID attempt

src/d/d_stage.cpp

@@ -4,11 +4,13 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "f/f_op/f_op_actor_mng.h"
 #include "f/f_op/f_op_camera_mng.h"
+#include "f/f_op/f_op_scene_iter.h"
 #include "f/f_pc/f_pc_stdcreate_req.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 
 extern "C" {
+    void fopScnM_SearchByID__FUi(void);
 void fopCamM_Create__FisPv(void);
 char* strcpy(char*, const char*);
 int strcmp(const char*, const char*);

src/f/f_op/f_op_actor_mng.cpp

@@ -50,6 +50,7 @@ const char* lbl_80378A49 = "\x00\x00\x00\x00\x00\x00";
 // additional symbols needed for f_op_actor_mng.cpp
 // autogenerated by split.py v0.4 at 2021-01-25 19:11:04.087547
 extern "C" {
+void fopScnM_SearchByID__FUi(void);
 void J3DTexMtxInfo_NS_setEffectMtx(void);
 void J3DUClipper_NS_calcViewFrustum(void);
 void MtxPosition__FP4cXyzP4cXyz(void);

src/f/f_op/f_op_actor_tag.cpp

@@ -2,8 +2,6 @@
 #include "SComponent/c_tag.h"
 #include "global.h"
 
-extern "C" {
-
 u32 fopAcTg_ToActorQ(create_tag_class* c) {
     return cTg_Addition(&lbl_803A35E0, c);
 }
@@ -15,5 +13,4 @@ u32 fopAcTg_ActorQTo(create_tag_class* pTag) {
 u32 fopAcTg_Init(create_tag_class* pTag, void* data) {
     cTg_Create(pTag, data);
     return 1;
-}
 }

src/f/f_op/f_op_msg_mng.cpp

@@ -1,11 +1,13 @@
 /* f_op_msg_mng.cpp autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945184 */
 
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "f/f_op/f_op_scene_iter.h"
 #include "global.h"
 
 // additional symbols needed for f_op_msg_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:21:51.945228
 extern "C" {
+    void fopScnM_SearchByID__FUi(void);
 void _restgpr_26(void);
 void _restgpr_27(void);
 void _restgpr_28(void);

src/f/f_op/f_op_scene_iter.cpp

@@ -1,6 +1,7 @@
 /* f_op_scene_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795954 */
 
 #include "SComponent/c_tag_iter.h"
+#include "f/f_op/f_op_scene_iter.h"
 #include "global.h"
 
 // additional symbols needed for f_op_scene_iter.cpp
@@ -14,11 +15,7 @@ void fopScnIt_Judge(void);
 // autogenerated by split.py v0.4 at 2021-02-15 20:27:34.795978
 extern u8 lbl_803A3918;
 
-extern "C" {
-// fopScnIt_Judge__FPFPvPv_PvPv
-// fopScnIt_Judge(void* (*)(void*, void*), void*)
-asm void fopScnIt_Judge(void) {
+asm void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pFunc2) {
     nofralloc
 #include "f/f_op/f_op_scene_iter/asm/func_8001EC74.s"
 }
-};

src/f/f_op/f_op_scene_mng.cpp

@@ -1,12 +1,12 @@
 /* f_op_scene_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409351 */
 
 #include "f/f_op/f_op_scene_mng.h"
+#include "f/f_op/f_op_scene_iter.h"
 #include "global.h"
 
 // additional symbols needed for f_op_scene_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409404
 extern "C" {
-void fopScnIt_Judge(void);
 void fopScnM_ChangeReq(void);
 void fopScnM_CreateReq(void);
 void fopScnM_DeleteReq(void);
@@ -17,20 +17,26 @@ void fopScnRq_Handler(void);
 void fopScnRq_ReRequest(void);
 void fopScnRq_Request(void);
 void fpcSch_JudgeByID(void);
+void fopScnIt_Judge__FPFPvPv_PvPv(void);
 }
 
 // additional symbols needed for f_op_scene_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-13 20:33:37.409412
 extern u8 lbl_804505B8;
 
-extern "C" {
 // fopScnM_SearchByID__FUi
 // fopScnM_SearchByID(unsigned int)
-asm void fopScnM_SearchByID(void) {
+// void* fopScnM_SearchByID(unsigned int id) {
+//     unsigned int tmp = id + 8; 
+//     return fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, (void*)tmp);
+// }
+
+asm void* fopScnM_SearchByID(unsigned int) {
     nofralloc
 #include "f/f_op_scene_mng/asm/func_8001ECB0.s"
 }
 
+extern "C" {
 // fopScnM_ChangeReq__FP11scene_classssUs
 // fopScnM_ChangeReq(scene_class*, s16, s16, u16)
 asm void fopScnM_ChangeReq(void) {

src/f/f_pc/f_pc_manager.cpp

@@ -82,12 +82,12 @@ void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2) {
             }
             fpcPi_Handler();
             fpcCt_Handler();
-            if (pFunc1 != NULL) {
+            if (pFunc1) {
                 pFunc1();
             }
             fpcEx_Handler((cNdIt_MethodFunc)fpcM_Execute);
             fpcDw_Handler((void*)fpcM_DrawIterater, fpcM_Draw);
-            if (pFunc2 != NULL) {
+            if (pFunc2) {
                 pFunc2();
             }
             g_dComIfG_gameInfo.getPlay().drawSimpleModel();