f_op_camera_mng OK

src/d/d_camera.cpp

@@ -11,12 +11,14 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "f/f_op/f_op_actor_iter.h"
 #include "f/f_op/f_op_actor_mng.h"
+#include "f/f_op/f_op_camera_mng.h"
 #include "f/f_pc/f_pc_searcher.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_graphic/m_Do_graphic.h"
 
 extern "C" {
+void fopCamM_GetParam__FP12camera_class(void);
 void __dt__8cM3dGLinFv(void);
 double func_8036C668(double);
 int func_80368954(char*, char*, u32);

src/d/d_stage.cpp

@@ -3,11 +3,13 @@
 #include "d/d_stage/d_stage.h"
 #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_pc/f_pc_stdcreate_req.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
 
 extern "C" {
+void fopCamM_Create__FisPv(void);
 char* strcpy(char*, const char*);
 int strcmp(const char*, const char*);
 void __arraydtor_5375(void);

src/f/f_ap_game.cpp

@@ -14,7 +14,6 @@ extern "C" {
 void __dl__FPv(void);
 void fapGm_HIO_c(void);
 void fapGm_HIO_c_NS_dtor(void);
-void fopCamM_Init(void);
 void fopDwTg_CreateQueue(void);
 void fopOvlpM_Init(void);
 void fopScnM_Init(void);

src/f/f_op/f_op_camera_mng.cpp

@@ -1,6 +1,8 @@
 /* f_op_camera_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:39:01.831629 */
 
 #include "f/f_op/f_op_camera_mng.h"
+#include "f/f_pc/f_pc_layer.h"
+#include "f/f_pc/f_pc_stdcreate_req.h"
 #include "global.h"
 
 // additional symbols needed for f_op_camera_mng.cpp
@@ -8,44 +10,25 @@
 extern "C" {
 void _restgpr_29(void);
 void _savegpr_29(void);
-void fopCamM_Create(void);
-void fopCamM_GetParam(void);
-void fopCamM_Init(void);
-void fopCamM_Management(void);
-void fpcLy_CurrentLayer(void);
-void fpcSCtRq_Request(void);
 }
 
 // additional symbols needed for f_op_camera_mng.cpp
 // autogenerated by split.py v0.4 at 2021-02-13 20:39:01.831656
-extern u8 lbl_803F1DD8;
+extern u32 l_fopCamM_id[4];
 
-extern "C" {
-// fopCamM_GetParam__FP12camera_class
-// fopCamM_GetParam(camera_class*)
-asm void fopCamM_GetParam(void) {
-    nofralloc
-#include "f/f_op_camera_mng/asm/func_8001E308.s"
+u32 fopCamM_GetParam(camera_class* pCamera) {
+    return pCamera->parameter;
 }
 
-// fopCamM_Create__FisPv
-// fopCamM_Create(int, s16, void*)
-asm void fopCamM_Create(void) {
-    nofralloc
-#include "f/f_op_camera_mng/asm/func_8001E310.s"
+u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3) {
+    l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), pProcName, 0, 0, param_3);
+    return l_fopCamM_id[i_cameraIdx];
 }
 
-// fopCamM_Management__Fv
-// fopCamM_Management(void)
-asm void fopCamM_Management(void) {
-    nofralloc
-#include "f/f_op_camera_mng/asm/func_8001E374.s"
+void fopCamM_Management(void) {
+    return;
 }
 
-// fopCamM_Init__Fv
-// fopCamM_Init(void)
-asm void fopCamM_Init(void) {
-    nofralloc
-#include "f/f_op_camera_mng/asm/func_8001E378.s"
+void fopCamM_Init(void) {
+    return;
 }
-};