f_op_actor_mng split & started decomp (#112)

* fop-actor-mng

* rodata

* more actor mng progress

* actor mng progress

* format

* cleanup

* fix Mtx function signatures

* PR suggestion

Co-authored-by: Pheenoh <pheenoh@gmail.com>

src/d/d_a/d_a_alink.cpp

@@ -9,6 +9,8 @@
 #include "Z2AudioLib/Z2SoundObject/Z2SoundObject.h"
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
 #include "d/d_kankyo/d_kankyo.h"
+#include "f/f_op/f_op_actor_iter.h"
+#include "f/f_op/f_op_actor_mng.h"
 #include "f/f_pc/f_pc_manager.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
@@ -1247,7 +1249,6 @@ void mDoExt_J3DModel__create(void);
 void mDoExt_modelEntryDL(void);
 void mDoExt_MtxCalcAnmBlendTbl_NS_getAnm(void);
 void mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf(void);
-void mDoExt_setCurrentHeap(void);
 void mDoLib_pos2camera(void);
 void mDoLib_project(void);
 void mDoMtx_MtxToRot(void);

src/d/d_attention.cpp

@@ -3,10 +3,13 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_a/d_a_alink/d_a_alink.h"
 #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_pc/f_pc_searcher.h"
 #include "global.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"
 
 extern "C" {
 double func_8036C668(double);
@@ -55,7 +58,6 @@ void mDoExt_brkAnm_NS_init(void);
 void mDoExt_btkAnm_NS_entry(void);
 void mDoExt_btkAnm_NS_init(void);
 void mDoExt_createSolidHeapFromGameToCurrent_X1_(void);
-void mDoExt_destroySolidHeap(void);
 void mDoExt_J3DModel__create(void);
 void mDoExt_modelUpdateDL(void);
 void mDoExt_restoreCurrentHeap(void);

src/d/d_camera.cpp

@@ -9,6 +9,8 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
 #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_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"
@@ -298,12 +300,6 @@ void dPath_GetRoomPath(void);
 void dRes_control_c_NS_getRes_X1_(void);
 void dStage_roomControl_c_NS_getStatusRoomDt(void);
 void dVibration_c_NS_StartShock(void);
-void fopAcIt_Judge(void);
-void fopAcM_GetID(void);
-void fopAcM_GetName(void);
-void fopAcM_GetParam(void);
-void fopAcM_searchFromName4Event(void);
-void fopAcM_setStageLayer(void);
 void fopCamM_GetParam(void);
 void func_80361C24(void);
 void func_80361D60(void);

src/d/d_kankyo.cpp

@@ -1,6 +1,7 @@
 /* d_kankyo.cpp autogenerated by split.py v0.3 at 2021-01-01 22:51:09.344700 */
 
 #include "d/d_kankyo/d_kankyo.h"
+#include "JSystem/JMath/JMath.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
@@ -127,7 +128,6 @@ void mDoExt_baseAnm_NS_play(void);
 void mDoExt_btkAnm_NS_entry(void);
 void mDoExt_btkAnm_NS_init(void);
 void mDoExt_createSolidHeapFromGameToCurrent_X1_(void);
-void mDoExt_destroySolidHeap(void);
 void mDoExt_J3DModel__create(void);
 void mDoExt_modelUpdateDL(void);
 void mDoExt_restoreCurrentHeap(void);

src/d/d_kankyo/d_kankyo_rain.cpp

@@ -1,5 +1,6 @@
 /* d_kankyo_rain.cpp autogenerated by split.py v0.3 at 2021-01-01 22:35:45.009983 */
 
+#include "JSystem/JMath/JMath.h"
 #include "SComponent/c_math.h"
 #include "d/d_bg/d_bg_s/d_bg_s_poly_pass_chk.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"

src/d/d_kankyo/d_kankyo_wether.cpp

@@ -1,5 +1,6 @@
 /* d_kankyo_wether.cpp autogenerated by split.py v0.3 at 2021-01-01 22:17:50.097171 */
 
+#include "JSystem/JMath/JMath.h"
 #include "SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"

src/d/d_meter2.cpp

@@ -175,7 +175,6 @@ void isCollectCrystal__20dSv_player_collect_cCFUc(void);
 void isCollectMirror__20dSv_player_collect_cCFUc(void);
 void isEventBit__11dSv_event_cCFUs(void);
 void isLightDropGetFlag__16dSv_light_drop_cCFUc(void);
-void mDoExt_setCurrentHeap(void);
 void onCollectCrystal__20dSv_player_collect_cFUc(void);
 void onCollectMirror__20dSv_player_collect_cFUc(void);
 void setBombNum__24dSv_player_item_record_cFUcUc(void);

src/d/d_meter2/d_meter2_draw.cpp

@@ -116,7 +116,6 @@ void J2DScreen_NS_setPriority(void);
 void J2DTextBox_NS_getStringPtr(void);
 void J2DTextBox_NS_setString_X1_(void);
 void mDoExt_getMesgFont(void);
-void mDoExt_setCurrentHeap(void);
 void rotate__7J2DPaneFff13J2DRotateAxisf(void);
 void setBasePosition__7J2DPaneF15J2DBasePosition(void);
 }

src/d/d_stage.cpp

@@ -2,6 +2,7 @@
 
 #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_pc/f_pc_stdcreate_req.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
@@ -42,9 +43,6 @@ void dStage_roomStatus_c_NS_dtor(void);
 void dStage_roomStatus_c(void);
 void dSvBit_HIO_c_NS_init(void);
 void dTres_c_NS_addData(void);
-void fopAcM_CreateAppend(void);
-void fopAcM_delete(void);
-void fopAcM_FastCreate(void);
 void fopCamM_Create(void);
 void fopKyM_fastCreate(void);
 void fopMsgM_Create(void);
@@ -345,7 +343,7 @@ asm roomRead_class* dStage_stageDt_c::getRoom(void) const {
 
 // dStage_searchName__FPCc
 // dStage_searchName(const char*)
-asm void dStage_searchName(void) {
+asm objectNameInfo* dStage_searchName(const char*) {
     nofralloc
 #include "d/d_stage/asm/func_80024DC0.s"
 }

src/f/f_op/f_op_actor_iter.cpp

@@ -1 +1,28 @@
-// ok
+/* f_op_actor_iter.cpp autogenerated by split.py v0.4 at 2021-01-26 14:07:38.773979 */
+
+#include "f/f_op/f_op_actor_iter.h"
+#include "SComponent/c_list_iter.h"
+#include "SComponent/c_tag_iter.h"
+#include "f/f_op/f_op_actor_tag.h"
+
+// fopAcIt_Executor__FPFPvPv_iPv
+int fopAcIt_Executor(fopAcIt_ExecutorFunc pExecFunc, void* pData) {
+    struct {
+        fopAcIt_ExecutorFunc func;
+        void* data;
+    } userData;
+    userData.func = pExecFunc;
+    userData.data = pData;
+    cLsIt_Method(&lbl_803A35E0, (cNdIt_MethodFunc)cTgIt_MethodCall, &userData);
+}
+
+// fopAcIt_Judge__FPFPvPv_PvPv
+void* fopAcIt_Judge(fopAcIt_JudgeFunc pJudgeFunc, void* pData) {
+    struct {
+        fopAcIt_JudgeFunc func;
+        void* data;
+    } userData;
+    userData.func = pJudgeFunc;
+    userData.data = pData;
+    cLsIt_Judge(&lbl_803A35E0, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &userData);
+}

src/f/f_op/f_op_actor_tag.cpp

@@ -2,9 +2,6 @@
 #include "SComponent/c_tag.h"
 #include "global.h"
 
-// f_op_actor_tag::g_fopAcTg_Queue
-extern node_list_class lbl_803A35E0;
-
 extern "C" {
 
 u32 fopAcTg_ToActorQ(create_tag_class* c) {

src/f/f_pc/f_pc_manager.cpp

@@ -52,8 +52,8 @@ void fpcM_Execute(void* pProc) {
     fpcEx_Execute((base_process_class*)pProc);
 }
 
-void fpcM_Delete(void* pProc) {
-    fpcDt_Delete((base_process_class*)pProc);
+s32 fpcM_Delete(void* pProc) {
+    return fpcDt_Delete((base_process_class*)pProc);
 }
 
 BOOL fpcM_IsCreating(u32 pID) {

src/f/f_pc/f_pc_stdcreate_req.cpp

@@ -91,9 +91,9 @@ s32 fpcSCtRq_Cancel(standard_create_request_class* pStdCreateReq) {
     return 1;
 }
 
-s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4,
+s32 fpcSCtRq_Request(layer_class* param_1, s16 pProcName, stdCreateFunc param_3, void* param_4,
                      void* param_5) {
-    if (param_2 >= 0x7FFF) {
+    if (pProcName >= 0x7FFF) {
         return -1;
     } else {
         standard_create_request_class* request =
@@ -102,7 +102,7 @@ s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, v
             return -1;
         } else {
             cPhs_Set(&request->unk_0x48, lbl_803A3AFC);
-            request->mLoadID = param_2;
+            request->mLoadID = pProcName;
             request->unk_0x58 = param_3;
             request->unk_0x5C = param_4;
             request->unk_0x54 = param_5;

src/m_Do/m_Do_ext.cpp

@@ -296,7 +296,6 @@ void mDoExt_createSolidHeapToCurrent(void);
 void mDoExt_createSolidHeapToCurrent_X1_(void);
 void mDoExt_createZeldaHeap(void);
 void mDoExt_destroyExpHeap(void);
-void mDoExt_destroySolidHeap(void);
 void mDoExt_getArchiveHeapPtr(void);
 void mDoExt_getAssertHeap(void);
 
@@ -325,7 +324,6 @@ void mDoExt_removeSubFont(void);
 void mDoExt_resIDToIndex(void);
 void mDoExt_restoreCurrentHeap(void);
 void mDoExt_setAraCacheSize(void);
-void mDoExt_setCurrentHeap(void);
 void mDoMtx_stack_c_NS_dtor_X1_(void);
 void normalizeZP__4cXyzFv(void);
 void outprod__4cXyzCFRC3Vec(void);
@@ -1304,7 +1302,7 @@ asm void mDoExt_adjustSolidHeapToSystem(void) {
 
 // mDoExt_destroySolidHeap__FP12JKRSolidHeap
 // mDoExt_destroySolidHeap(JKRSolidHeap*)
-asm void mDoExt_destroySolidHeap(void) {
+asm void mDoExt_destroySolidHeap(JKRSolidHeap*) {
     nofralloc
 #include "m_Do/m_Do_ext/asm/func_8000F18C.s"
 }
@@ -1318,7 +1316,7 @@ asm void mDoExt_destroyExpHeap(void) {
 
 // mDoExt_setCurrentHeap__FP7JKRHeap
 // mDoExt_setCurrentHeap(JKRHeap*)
-asm void mDoExt_setCurrentHeap(void) {
+asm JKRHeap* mDoExt_setCurrentHeap(JKRHeap*) {
     nofralloc
 #include "m_Do/m_Do_ext/asm/func_8000F1CC.s"
 }

src/m_Do/m_Do_graphic.cpp

@@ -1,12 +1,14 @@
 #include "m_Do/m_Do_graphic/m_Do_graphic.h"
 #include "JSystem/J2DSys.h"
 #include "JSystem/JKernel/JKRHeap/JKRHeap.h"
+#include "JSystem/JMath/JMath.h"
 #include "JSystem/JUtility/JUTGamePad/JUTGamePad.h"
 #include "SComponent/c_lib.h"
 #include "d/d_a/d_a_player/d_a_player.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "d/d_drawlist/d_drawlist.h"
 #include "d/d_kankyo/d_kankyo.h"
+#include "f/f_op/f_op_actor_iter.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
 #include "gx/GX.h"
@@ -87,7 +89,7 @@ void mDoGph_gInf_c::onBlure(void) {
 
 void mDoGph_gInf_c::onBlure(const Mtx InMtx) {
     lbl_80450BE4 = true;
-    PSMTXCopy((Mtx*)InMtx, &lbl_803DD43C);
+    PSMTXCopy(InMtx, lbl_803DD43C);
 }
 
 void mDoGph_gInf_c::fadeOut(f32 speed) {

src/m_Do/m_Do_lib.cpp

@@ -1,5 +1,6 @@
 /* m_Do_lib.cpp autogenerated by split.py v0.4 at 2021-01-31 21:06:36.599841 */
 
+#include "JSystem/JMath/JMath.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 

src/m_Do/m_Do_main.cpp

@@ -6,6 +6,7 @@
 #include "SComponent/c_API_controller_pad.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "dvd/dvd.h"
+#include "f/f_op/f_op_actor_mng.h"
 #include "global.h"
 #include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"

src/m_Do/m_Do_mtx.cpp

@@ -1,5 +1,6 @@
 /* m_Do_mtx.cpp autogenerated by split.py v0.4 at 2021-01-31 21:20:08.836503 */
 
+#include "JSystem/JMath/JMath.h"
 #include "global.h"
 
 // additional symbols needed for m_Do_mtx.cpp