some cleanup of f_pc/f_op files (#2254)

* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work

1 files changed, 51 insertions, 50 deletions

diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp
index 6b3cc84f72..5c985ace73 100644
--- a/src/f_pc/f_pc_stdcreate_req.cpp
+++ b/src/f_pc/f_pc_stdcreate_req.cpp
@@ -6,16 +6,17 @@
 #include "f_pc/f_pc_stdcreate_req.h"
 #include "f_pc/f_pc_load.h"
 #include "f_pc/f_pc_node.h"
+#include "f_pc/f_pc_manager.h"
 
 /* 80023B70-80023BC4 0054+00 s=1 e=0 z=5  None .text
  * fpcSCtRq_phase_Load__FP29standard_create_request_class       */
-s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) {
-    switch (fpcLd_Load(i_SCtReq->mLoadID)) {
-    case 0:
+s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
+    switch (fpcLd_Load(i_request->process_name)) {
+    case cPhs_INIT_e:
         return cPhs_INIT_e;
-    case 4:
-        return 2;
-    case 5:
+    case cPhs_COMPLEATE_e:
+        return cPhs_NEXT_e;
+    case cPhs_ERROR_e:
     default:
         return cPhs_ERROR_e;
     }
@@ -23,64 +24,64 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) {
 
 /* 80023BC4-80023C2C 0068+00 s=1 e=0 z=9  None .text
  * fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */
-s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) {
-    fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer);
-    i_SCtReq->mBase.mpRes =
-        fpcBs_Create(i_SCtReq->mLoadID, i_SCtReq->mBase.mBsPcId, i_SCtReq->unk_0x54);
-    if (i_SCtReq->mBase.mpRes == NULL) {
-        fpcLd_Free(i_SCtReq->mLoadID);
+s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
+    fpcLy_SetCurrentLayer(i_request->base.layer);
+    i_request->base.process =
+        fpcBs_Create(i_request->process_name, i_request->base.id, i_request->process_append);
+    if (i_request->base.process == NULL) {
+        fpcLd_Free(i_request->process_name);
         return cPhs_ERROR_e;
     } else {
-        i_SCtReq->mBase.mpRes->mpCtRq = (struct create_request*)i_SCtReq;
-        return 2;
+        i_request->base.process->create_req = &i_request->base;
+        return cPhs_NEXT_e;
     }
 }
 
 /* 80023C2C-80023C64 0038+00 s=1 e=0 z=3  None .text
  * fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */
-s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) {
-    fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer);
-    return fpcBs_SubCreate(i_SCtReq->mBase.mpRes);
+s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
+    fpcLy_SetCurrentLayer(i_request->base.layer);
+    return fpcBs_SubCreate(i_request->base.process);
 }
 
 /* 80023C64-80023CBC 0058+00 s=1 e=0 z=14  None .text
  * fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */
-s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) {
-    process_node_class* procNode = (process_node_class*)i_SCtReq->mBase.mpRes;
-    if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->mBase.mSubType) == 1) {
-        if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) {
+s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
+    process_node_class* procNode = (process_node_class*)i_request->base.process;
+    if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.subtype) == TRUE) {
+        if (fpcLy_IsCreatingMesg(&procNode->layer) == TRUE) {
             return cPhs_INIT_e;
         }
     }
-    return 2;
+    return cPhs_NEXT_e;
 }
 
 /* 80023CBC-80023D0C 0050+00 s=1 e=0 z=5  None .text
  * fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */
-s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) {
-    if (i_SCtReq->unk_0x58 != NULL &&
-        i_SCtReq->unk_0x58(i_SCtReq->mBase.mpRes, i_SCtReq->unk_0x5C) == 0)
+s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
+    if (i_request->create_post_method != NULL &&
+        i_request->create_post_method(i_request->base.process, i_request->unk_0x5C) == 0)
     {
         return cPhs_INIT_e;
     } else {
-        return 2;
+        return cPhs_NEXT_e;
     }
 }
 
 /* 80023D0C-80023D14 0008+00 s=1 e=0 z=0  None .text
  * fpcSCtRq_phase_Done__FP29standard_create_request_class       */
-s32 fpcSCtRq_phase_Done(standard_create_request_class* i_SCtReq) {
-    return 2;
+s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
+    return cPhs_NEXT_e;
 }
 
 /* 80023D14-80023D84 0070+00 s=1 e=0 z=2  None .text
  * fpcSCtRq_Handler__FP29standard_create_request_class          */
-s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) {
-    s32 phase_state = cPhs_Do(&i_SCtReq->unk_0x48, i_SCtReq);
+s32 fpcSCtRq_Handler(standard_create_request_class* i_request) {
+    s32 phase_state = cPhs_Do(&i_request->phase_request, i_request);
 
     switch (phase_state) {
     case cPhs_NEXT_e:
-        return fpcSCtRq_Handler(i_SCtReq);
+        return fpcSCtRq_Handler(i_request);
     case cPhs_COMPLEATE_e:
         return cPhs_COMPLEATE_e;
     case cPhs_LOADING_e:
@@ -92,20 +93,20 @@ s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) {
 
 /* 80023D84-80023D8C 0008+00 s=1 e=0 z=0  None .text
  * fpcSCtRq_Delete__FP29standard_create_request_class           */
-s32 fpcSCtRq_Delete(standard_create_request_class* i_SCtReq) {
+s32 fpcSCtRq_Delete(standard_create_request_class* i_request) {
     return 1;
 }
 
 /* 80023D8C-80023D94 0008+00 s=1 e=0 z=1  None .text
  * fpcSCtRq_Cancel__FP29standard_create_request_class           */
-s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) {
+s32 fpcSCtRq_Cancel(standard_create_request_class* i_request) {
     return 1;
 }
 
 /* 80023D94-80023E28 0094+00 s=0 e=12 z=1  None .text
  * fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv               */
-s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc,
-                     void* param_4, void* param_5) {
+fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc,
+                     void* param_4, void* i_append) {
     static create_request_method_class submethod = {
         (cPhs__Handler)fpcSCtRq_Handler,
         (process_method_func)fpcSCtRq_Cancel,
@@ -123,19 +124,19 @@ s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_creat
     };
 
     if (i_procName >= 0x7FFF) {
-        return -1;
-    } else {
-        standard_create_request_class* request =
-            (standard_create_request_class*)fpcCtRq_Create(i_layer, 0x60, &submethod);
-        if (request == NULL) {
-            return -1;
-        } else {
-            cPhs_Set(&request->unk_0x48, method);
-            request->mLoadID = i_procName;
-            request->unk_0x58 = i_createFunc;
-            request->unk_0x5C = param_4;
-            request->unk_0x54 = param_5;
-            return request->mBase.mBsPcId;
-        }
+        return fpcM_ERROR_PROCESS_ID_e;
     }
-}
\ No newline at end of file
+
+    standard_create_request_class* request =
+        (standard_create_request_class*)fpcCtRq_Create(i_layer, sizeof(standard_create_request_class), &submethod);
+    if (request == NULL) {
+        return fpcM_ERROR_PROCESS_ID_e;
+    }
+
+    cPhs_Set(&request->phase_request, method);
+    request->process_name = i_procName;
+    request->create_post_method = i_createFunc;
+    request->unk_0x5C = param_4;
+    request->process_append = i_append;
+    return request->base.id;
+}