mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 07:21:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup of f_pc/f_op files (#2254)

Browse Source 
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_scene_req.cpp
+43 -43
View File
@@ -8,6 +8,7 @@
#include "f_op/f_op_scene.h"
#include "f_op/f_op_scene_pause.h"
#include "f_pc/f_pc_executor.h"
#include "f_pc/f_pc_manager.h"
/* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text
* fopScnRq_phase_ClearOverlap__FP19scene_request_class */
@@ -22,7 +23,7 @@ static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) {
/* 8001EE64-8001EE84 0197A4 0020+00 2/0 0/0 0/0 .text
* fopScnRq_phase_Execute__FP19scene_request_class */
static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) {
return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->mCrtReq);
return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->create_request);
}
/* 8001EE84-8001EEB4 0197C4 0030+00 1/0 0/0 0/0 .text
@@ -45,42 +46,43 @@ static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq)
}
}
/* ############################################################################################## */
/* 80450CE0-80450CE8 0001E0 0004+04 2/2 0/0 0/0 .sbss l_fopScnRq_IsUsingOfOverlap */
static s32 l_fopScnRq_IsUsingOfOverlap;
static BOOL l_fopScnRq_IsUsingOfOverlap;
/* 8001EEE4-8001EF24 019824 0040+00 2/0 0/0 0/0 .text fopScnRq_phase_Done__FP19scene_request_class
*/
static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) {
if (i_sceneReq->mCrtReq.mParameter != 1) {
fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->mCrtReq.mCreatingID));
if (i_sceneReq->create_request.parameters != 1) {
fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->create_request.creating_id));
}
l_fopScnRq_IsUsingOfOverlap = 0;
l_fopScnRq_IsUsingOfOverlap = FALSE;
return cPhs_NEXT_e;
}
/* 8001EF24-8001EF6C 019864 0048+00 1/0 0/0 0/0 .text fopScnRq_Execute__FP19scene_request_class */
static void fopScnRq_Execute(scene_request_class* i_sceneReq) {
int tmp = cPhs_Do(&i_sceneReq->mReqPhsProcCls, i_sceneReq);
switch (tmp) {
case 2:
int phase_state = cPhs_Do(&i_sceneReq->phase_request, i_sceneReq);
switch (phase_state) {
case cPhs_NEXT_e:
fopScnRq_Execute(i_sceneReq);
}
}
/* 8001EF6C-8001EFB0 0198AC 0044+00 1/0 0/0 0/0 .text
* fopScnRq_PostMethod__FPvP19scene_request_class */
static int fopScnRq_PostMethod(void* param_1, scene_request_class* i_sceneReq) {
if (i_sceneReq->mFadeRequest) {
fopScnPause_Enable((scene_class*)param_1);
fopOvlpM_ToldAboutID(((scene_class*)param_1)->mBase.mBase.mBsPcId);
static int fopScnRq_PostMethod(void* i_scene, scene_request_class* i_sceneReq) {
if (i_sceneReq->fade_request != NULL) {
fopScnPause_Enable((scene_class*)i_scene);
fopOvlpM_ToldAboutID(((scene_class*)i_scene)->base.base.id);
}
return 1;
}
/* 8001EFB0-8001EFF0 0198F0 0040+00 1/0 0/0 0/0 .text fopScnRq_Cancel__FP19scene_request_class */
static int fopScnRq_Cancel(scene_request_class* i_sceneReq) {
if (i_sceneReq->mFadeRequest && !fopOvlpM_Cancel()) {
if (i_sceneReq->fade_request != NULL && !fopOvlpM_Cancel()) {
return 0;
} else {
return 1;
@@ -88,20 +90,20 @@ static int fopScnRq_Cancel(scene_request_class* i_sceneReq) {
}
/* 8001EFF0-8001F034 019930 0044+00 1/1 0/0 0/0 .text fopScnRq_FadeRequest__FsUs */
static scene_request_class* fopScnRq_FadeRequest(s16 param_1, u16 param_2) {
request_base_class* req = NULL;
static scene_request_class* fopScnRq_FadeRequest(s16 i_procname, u16 i_peektime) {
overlap_request_class* req = NULL;
if (l_fopScnRq_IsUsingOfOverlap == 0 && (req = fopOvlpM_Request(param_1, param_2), req != NULL))
if (!l_fopScnRq_IsUsingOfOverlap && (req = fopOvlpM_Request(i_procname, i_peektime), req != NULL))
{
l_fopScnRq_IsUsingOfOverlap = 1;
l_fopScnRq_IsUsingOfOverlap = TRUE;
}
return (scene_request_class*)req;
}
/* 8001F034-8001F0FC 019974 00C8+00 0/0 3/3 0/0 .text fopScnRq_Request__FiP11scene_classsPvsUs */
s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param_4, s16 param_5,
u16 param_6) {
fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 i_fadename,
u16 i_peektime) {
static node_create_request_method_class submethod = {
(process_method_func)fopScnRq_Execute,
(process_method_func)fopScnRq_Cancel,
@@ -131,36 +133,34 @@ s32 fopScnRq_Request(int param_1, scene_class* i_scene, s16 param_3, void* param
NULL,
};
s32 ret;
int tmp = 0;
cPhs__Handler* phase_handler_table;
phase_handler_table = noFadeFase;
scene_request_class* pScnReq = (scene_request_class*)fpcNdRq_Request(
sizeof(scene_request_class), param_1, (process_node_class*)i_scene, param_3, param_4,
scene_request_class* fade_req = NULL;
cPhs__Handler* phase_handler = noFadeFase;
scene_request_class* req = (scene_request_class*)fpcNdRq_Request(
sizeof(scene_request_class), i_reqType, (process_node_class*)i_scene, i_procName, i_data,
&submethod);
if (!pScnReq) {
ret = -1;
} else {
if (param_5 != 0x7fff) {
phase_handler_table = fadeFase;
tmp = (int)fopScnRq_FadeRequest(param_5, param_6);
if (!tmp) {
fpcNdRq_Delete(&pScnReq->mCrtReq);
return -1;
}
}
pScnReq->mFadeRequest = tmp;
cPhs_Set(&pScnReq->mReqPhsProcCls, phase_handler_table);
ret = pScnReq->mCrtReq.mRequestId;
if (req == NULL) {
return fpcM_ERROR_PROCESS_ID_e;
}
return ret;
if (i_fadename != 0x7FFF) {
phase_handler = fadeFase;
fade_req = fopScnRq_FadeRequest(i_fadename, i_peektime);
if (fade_req == NULL) {
fpcNdRq_Delete(&req->create_request);
return fpcM_ERROR_PROCESS_ID_e;
}
}
req->fade_request = fade_req;
cPhs_Set(&req->phase_request, phase_handler);
return req->create_request.request_id;
}
/* 8001F0FC-8001F11C 019A3C 0020+00 0/0 1/1 0/0 .text fopScnRq_ReRequest__FUisPv */
s32 fopScnRq_ReRequest(fpc_ProcID param_1, s16 param_2, void* param_3) {
return fpcNdRq_ReRequest(param_1, param_2, param_3);
s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) {
return fpcNdRq_ReRequest(i_requestId, i_procName, i_data);
}
/* 8001F11C-8001F13C 019A5C 0020+00 0/0 1/1 0/0 .text fopScnRq_Handler__Fv */