mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-02 00:38:46 -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_mng.cpp
+13 -15
View File
@@ -12,42 +12,40 @@ scene_class* fopScnM_SearchByID(fpc_ProcID id) {
return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id);
}
/* ############################################################################################## */
/* 804505B8-804505C0 000038 0004+04 2/2 0/0 0/0 .sdata l_scnRqID */
static u32 l_scnRqID = 0xFFFFFFFF;
static fpc_ProcID l_scnRqID = fpcM_ERROR_PROCESS_ID_e;
/* 8001ECE0-8001ED3C 019620 005C+00 0/0 4/4 1/1 .text fopScnM_ChangeReq__FP11scene_classssUs */
int fopScnM_ChangeReq(scene_class* i_scene, s16 param_2, s16 param_3, u16 param_4) {
u32 sceneRequestID = fopScnRq_Request(2, i_scene, param_2, 0, param_3, param_4);
if (sceneRequestID == 0xFFFFFFFF) {
int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4) {
fpc_ProcID request_id = fopScnRq_Request(2, i_scene, i_procName, NULL, param_3, param_4);
if (request_id == fpcM_ERROR_PROCESS_ID_e) {
return 0;
}
l_scnRqID = sceneRequestID;
l_scnRqID = request_id;
return 1;
}
/* 8001ED3C-8001ED84 01967C 0048+00 0/0 1/1 0/0 .text fopScnM_DeleteReq__FP11scene_class
*/
fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) {
u32 sceneRequestID = fopScnRq_Request(1, i_scene, 0x7FFF, 0, 0x7FFF, 0);
return sceneRequestID != 0xFFFFFFFF;
fpc_ProcID request_id = fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0);
return request_id != fpcM_ERROR_PROCESS_ID_e;
}
/* 8001ED84-8001EDCC 0196C4 0048+00 0/0 2/2 0/0 .text fopScnM_CreateReq__FssUsUl */
int fopScnM_CreateReq(s16 param_1, s16 param_2, u16 param_3, u32 param_4) {
u32 sceneRequestID = fopScnRq_Request(0, 0, param_1, (void*)param_4, param_2, param_3);
return sceneRequestID != 0xFFFFFFFF;
int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data) {
fpc_ProcID request_id = fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3);
return request_id != fpcM_ERROR_PROCESS_ID_e;
}
/* 8001EDCC-8001EE10 01970C 0044+00 0/0 1/1 0/0 .text fopScnM_ReRequest__FsUl */
u32 fopScnM_ReRequest(s16 param_1, u32 param_2) {
if (l_scnRqID == 0xFFFFFFFF) {
u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) {
if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) {
return 0;
}
return fopScnRq_ReRequest(l_scnRqID, param_1, (void*)param_2);
return fopScnRq_ReRequest(l_scnRqID, i_procName, (void*)i_data);
}
/* 8001EE10-8001EE30 019750 0020+00 0/0 1/1 0/0 .text fopScnM_Management__Fv */