diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-08-16 13:32:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 14:32:40 -0600 |
| commit | 114582643fcdb8b99499984e7e8e1f6c4e0671da (patch) | |
| tree | db35b5a92bedd6f6e0f12045fe2188ad1269f6a7 /src/f_pc | |
| parent | 7fd7d0c1f3ac84a4f10b41fab925c18e0be0c5dc (diff) | |
Kytag00 / Vrbox2 work, some cphase / kankyo doc (#1886)
* kytag00 work
* d_a_vrbox2 close to done
* rename cPhase enum values
* some enums from noclip / kankyo doc
* remove asm
* use macro
* uncomment ok-check.yml
Diffstat (limited to 'src/f_pc')
| -rw-r--r-- | src/f_pc/f_pc_base.cpp | 4 | ||||
| -rw-r--r-- | src/f_pc/f_pc_node_req.cpp | 6 | ||||
| -rw-r--r-- | src/f_pc/f_pc_stdcreate_req.cpp | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 57d4fcfca2..833b503bca 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -117,11 +117,11 @@ s32 fpcBs_SubCreate(base_process_class* i_proc) { fpcBs_DeleteAppend(i_proc); i_proc->mUnk2 = 2; return 2; - case cPhs_ZERO_e: + case cPhs_INIT_e: case 1: i_proc->mInitState = 1; i_proc->mUnk2 = 0; - return cPhs_ZERO_e; + return cPhs_INIT_e; case 3: i_proc->mUnk2 = 3; return 3; diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 4107e18091..6781915a11 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -36,7 +36,7 @@ void fpcNdRq_ToRequestQ(node_create_request* i_NdCtReq) { * fpcNdRq_phase_IsCreated__FP19node_create_request */ s32 fpcNdRq_phase_IsCreated(node_create_request* i_NdCtReq) { if (fpcCtRq_IsCreatingByID(i_NdCtReq->mCreatingID) == TRUE) { - return cPhs_ZERO_e; + return cPhs_INIT_e; } else { return fpcEx_IsExist(i_NdCtReq->mCreatingID) == TRUE ? 2 : 3; } @@ -61,7 +61,7 @@ s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_NdCtReq) { /* 8002290C-8002293C 0030+00 s=2 e=0 z=0 None .text * fpcNdRq_phase_IsDeleted__FP19node_create_request */ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { - return fpcDt_IsComplete() == 0 ? cPhs_ZERO_e : 2; + return fpcDt_IsComplete() == 0 ? cPhs_INIT_e : 2; } /* 8002293C-80022990 0054+00 s=2 e=0 z=0 None .text fpcNdRq_phase_Delete__FP19node_create_request @@ -69,7 +69,7 @@ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { s32 fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) { if (i_NdCtReq->mNodeProc.mpNodeProc != NULL) { if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->mBase) == 0) { - return cPhs_ZERO_e; + return cPhs_INIT_e; } i_NdCtReq->mNodeProc.mpNodeProc = NULL; } diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index c677785913..94a9d023ea 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -12,7 +12,7 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { switch (fpcLd_Load(i_SCtReq->mLoadID)) { case 0: - return cPhs_ZERO_e; + return cPhs_INIT_e; case 4: return 2; case 5: @@ -49,7 +49,7 @@ 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) { - return cPhs_ZERO_e; + return cPhs_INIT_e; } } return 2; @@ -61,7 +61,7 @@ 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) { - return cPhs_ZERO_e; + return cPhs_INIT_e; } else { return 2; } @@ -79,11 +79,11 @@ s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { s32 phase_state = cPhs_Do(&i_SCtReq->unk_0x48, i_SCtReq); switch (phase_state) { - case cPhs_TWO_e: + case cPhs_NEXT_e: return fpcSCtRq_Handler(i_SCtReq); case cPhs_COMPLEATE_e: return cPhs_COMPLEATE_e; - case cPhs_ONE_e: + case cPhs_LOADING_e: case cPhs_ERROR_e: default: return phase_state; |
