mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-06 14:01:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fopOvlp_Create attempt, fopScnRq_phase_ClearOverlap OK

Browse Source
This commit is contained in:
Pheenoh
2021-03-20 19:01:48 -04:00
parent 80ba3d9fd2
commit 1d779a0b78
19 changed files with 424 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f/f_op/f_op_overlap.cpp
+15
View File
@@ -32,7 +32,22 @@ void fopOvlp_Delete(void* param_1) {
fpcMtd_Delete((process_method_class*)((int*)param_1)[0x30], param_1);
}
// register scheduling
#ifdef NON_MATCHING
void fopOvlp_Create(void* param_1) {
request_base_class* pReqBase = (request_base_class*)param_1;
if (!pReqBase->field_0xc) {
int* tmp = pReqBase->field_0x10;
request_base_class* tmp2 = (request_base_class*)&pReqBase->field_0xc4;
cReq_Create(tmp2, 1);
pReqBase->field_0xc0 = tmp[9];
pReqBase->field_0xc8 = (u32*)-1;
}
fpcMtd_Create((process_method_class*)pReqBase->field_0xc0, param_1);
}
#else
asm void fopOvlp_Create(void* param_1) {
nofralloc
#include "f/f_op/f_op_overlap/asm/func_8001E41C.s"
}
#endif
src/f/f_op/f_op_scene_req.cpp
+36 -49
View File
@@ -1,13 +1,14 @@
/* f_op_scene_req.cpp autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358849 */
/* f_op_scene_req.cpp autogenerated by split.py v0.4 at 2021-03-20 21:43:05.095943 */
#include "SComponent/c_phase.h"
#include "f/f_pc/f_pc_manager.h"
#include "f/f_pc/f_pc_node.h"
#include "f/f_op/f_op_scene_req.h"
#include "f/f_op/f_op_overlap_mng.h"
#include "global.h"
// additional symbols needed for f_op_scene_req.cpp
// autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358877
// autogenerated by split.py v0.4 at 2021-03-20 21:43:05.095971
extern "C" {
void _restgpr_26(void);
void _savegpr_26(void);
void cPhs_Do__FP30request_of_phase_process_classPv(void);
void cPhs_Set__FP30request_of_phase_process_classPPFPv_i(void);
void fopOvlpM_Cancel__Fv(void);
@@ -21,9 +22,15 @@ void fopScnPause_Enable__FP11scene_class(void);
void fopScnRq_Execute__FP19scene_request_class(void);
void fopScnRq_FadeRequest__FsUs(void);
void fopScnRq_Handler__Fv(void);
void fopScnRq_ReRequest(void);
void fopScnRq_Request(void);
void fopScnRq_ReRequest__FUisPv(void);
void fopScnRq_Request__FiP11scene_classsPvsUs(void);
void fopScnRq_phase_ClearOverlap__FP19scene_request_class(void);
void fpcEx_SearchByID__FUi(void);
void fpcNdRq_Delete__FP19node_create_request(void);
void fpcNdRq_Execute__FP19node_create_request(void);
void fpcNdRq_Handler__Fv(void);
void fpcNdRq_ReRequest__FUisPv(void);
void fpcNdRq_Request__FUliP18process_node_classsPvP32node_create_request_method_class(void);
void func_8001EE64(void);
void func_8001EE84(void);
void func_8001EEB4(void);
@@ -33,92 +40,72 @@ void func_8001EFB0(void);
}
// additional symbols needed for f_op_scene_req.cpp
// autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358882
// autogenerated by split.py v0.4 at 2021-03-20 21:43:05.095976
extern u8 lbl_803A38C8;
extern u8 lbl_80450CE0;
extern "C" {
// fopScnRq_phase_ClearOverlap__FP19scene_request_class
// fopScnRq_phase_ClearOverlap__FP19scene_request_class(scene_request_class*)
asm void fopScnRq_phase_ClearOverlap__FP19scene_request_class(void) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EE34.s"
scene_request_class* fopScnRq_phase_ClearOverlap(scene_request_class* param_1) {
param_1 = 0;
if (fopOvlpM_ClearOfReq() == 1) {
param_1 = (scene_request_class*)2;
return param_1;
}
return param_1;
}
// fopScnRq_phase_Execute__FP19scene_request_class
// fopScnRq_phase_Execute(scene_request_class*)
asm void func_8001EE64(void) {
asm void fopScnRq_phase_Execute(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EE64.s"
}
// fopScnRq_phase_IsDoingOverlap__FP19scene_request_class
// fopScnRq_phase_IsDoingOverlap(scene_request_class*)
asm void func_8001EE84(void) {
asm void fopScnRq_phase_IsDoingOverlap(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EE84.s"
}
// fopScnRq_phase_IsDoneOverlap__FP19scene_request_class
// fopScnRq_phase_IsDoneOverlap(scene_request_class*)
asm void func_8001EEB4(void) {
asm void fopScnRq_phase_IsDoneOverlap(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s"
}
// fopScnRq_phase_Done__FP19scene_request_class
// fopScnRq_phase_Done(scene_request_class*)
asm void func_8001EEE4(void) {
asm void fopScnRq_phase_Done(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EEE4.s"
}
// fopScnRq_Execute__FP19scene_request_class
// fopScnRq_Execute__FP19scene_request_class(scene_request_class*)
asm void fopScnRq_Execute__FP19scene_request_class(void) {
asm void fopScnRq_Execute(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EF24.s"
}
// fopScnRq_PostMethod__FPvP19scene_request_class
// fopScnRq_PostMethod(void*, scene_request_class*)
asm void func_8001EF6C(void) {
asm void fopScnRq_PostMethod(void*, scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EF6C.s"
}
// fopScnRq_Cancel__FP19scene_request_class
// fopScnRq_Cancel(scene_request_class*)
asm void func_8001EFB0(void) {
asm void fopScnRq_Cancel(scene_request_class*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EFB0.s"
}
// fopScnRq_FadeRequest__FsUs
// fopScnRq_FadeRequest__FsUs(s16, u16)
asm void fopScnRq_FadeRequest__FsUs(void) {
asm void fopScnRq_FadeRequest(s16, u16) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s"
}
// fopScnRq_Request__FiP11scene_classsPvsUs
// fopScnRq_Request(int, scene_class*, s16, void*, s16, u16)
asm void fopScnRq_Request(void) {
asm u32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001F034.s"
}
// fopScnRq_ReRequest__FUisPv
// fopScnRq_ReRequest(unsigned int, s16, void*)
asm void fopScnRq_ReRequest(void) {
asm u32 fopScnRq_ReRequest(unsigned int, s16, void*) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001F0FC.s"
}
// fopScnRq_Handler__Fv
// fopScnRq_Handler__Fv(void)
asm void fopScnRq_Handler__Fv(void) {
asm void fopScnRq_Handler(void) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001F11C.s"
}
};
}