fopOvlpM_Done OK, fopOvlpM_ToldAboutID OK, fopOvlpM_IsPeek OK, fopOvlpM_IsDone OK

This commit is contained in:
Pheenoh
2021-02-14 13:36:25 -05:00
parent 7f95de6c60
commit c29034f4bd
22 changed files with 264 additions and 65 deletions
+2 -1
View File
@@ -11,6 +11,7 @@
#include "d/d_kankyo/d_kankyo.h"
#include "f/f_op/f_op_actor_iter.h"
#include "f/f_op/f_op_actor_mng.h"
#include "f/f_op/f_op_overlap_mng.h"
#include "f/f_pc/f_pc_manager.h"
#include "f/f_pc/f_pc_searcher.h"
#include "m_Do/m_Do_audio/m_Do_audio.h"
@@ -1156,7 +1157,6 @@ void fopKyM_create(void);
void fopKyM_createWpillar(void);
void fopMsgM_messageSet_X1_(void);
void fopMsgM_SearchByID(void);
void fopOvlpM_IsPeek(void);
void fpoAcM_relativePos(void);
void freeAll__7JKRHeapFv(void);
void func_80361C24(void);
@@ -1164,6 +1164,7 @@ void func_80361D60(void);
void func_80361F14(void);
void func_80362018(void);
void func_80362084(void);
void fopOvlpM_IsPeek__Fv(void);
void __cvt_fp2unsigned(void);
void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void);
void getLightDropNum__16dSv_light_drop_cCFUc(void);
+21 -30
View File
@@ -1,22 +1,19 @@
/* f_op_overlap_mng.cpp autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072583 */
#include "f/f_op/f_op_overlap_mng.h"
#include "SComponent/c_request.h"
#include "global.h"
// additional symbols needed for f_op_overlap_mng.cpp
// autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072614
extern "C" {
void cReq_Done__FP18request_base_class(void);
// void cReq_Done__FP18request_base_class(void);
void cReq_Is_Done__FP18request_base_class(void);
void fopOvlpM_Cancel(void);
void fopOvlpM_ClearOfReq(void);
void fopOvlpM_Done(void);
void fopOvlpM_Init(void);
void fopOvlpM_IsDoingReq(void);
void fopOvlpM_IsDone(void);
void fopOvlpM_IsOutReq(void);
void fopOvlpM_IsPeek(void);
void fopOvlpM_Management(void);
void fopOvlpM_Request(void);
void fopOvlpM_SceneIsStart(void);
void fopOvlpM_SceneIsStop(void);
@@ -33,7 +30,7 @@ void fpcEx_SearchByID(void);
// additional symbols needed for f_op_overlap_mng.cpp
// autogenerated by split.py v0.4 at 2021-02-13 20:35:13.072619
extern u8 lbl_803F1DE8;
extern u8 lbl_804505B0;
extern request_base_class* l_fopOvlpM_overlap;
extern "C" {
// fopOvlpM_SceneIsStop__Fv
@@ -49,42 +46,36 @@ asm void fopOvlpM_SceneIsStart(void) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E4C4.s"
}
};
// fopOvlpM_IsOutReq__FP18overlap_task_class
// fopOvlpM_IsOutReq(overlap_task_class*)
asm void fopOvlpM_IsOutReq(void) {
// 1 instruction off
#ifdef NONMATCHING
BOOL fopOvlpM_IsOutReq(overlap_task_class* pTaskClass) {
return pTaskClass->field_0xc4 == 2;
}
#else
asm BOOL fopOvlpM_IsOutReq(overlap_task_class* pTaskClass) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E504.s"
}
#endif
// fopOvlpM_Done__FP18overlap_task_class
// fopOvlpM_Done(overlap_task_class*)
asm void fopOvlpM_Done(void) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E51C.s"
void fopOvlpM_Done(overlap_task_class* pTaskClass) {
cReq_Done((request_base_class*)&pTaskClass->field_0xc4);
}
// fopOvlpM_ToldAboutID__FUi
// fopOvlpM_ToldAboutID(unsigned int)
asm void fopOvlpM_ToldAboutID(void) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E540.s"
void fopOvlpM_ToldAboutID(unsigned int param_1) {
l_fopOvlpM_overlap ? l_fopOvlpM_overlap->field_0x20[0x32] = param_1 : 0;
}
// fopOvlpM_IsPeek__Fv
// fopOvlpM_IsPeek(void)
asm void fopOvlpM_IsPeek(void) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E558.s"
u32 fopOvlpM_IsPeek(void) {
return l_fopOvlpM_overlap ? l_fopOvlpM_overlap->field_0x8 : 0;
}
// fopOvlpM_IsDone__Fv
// fopOvlpM_IsDone(void)
asm void fopOvlpM_IsDone(void) {
nofralloc
#include "f/f_op_overlap_mng/asm/func_8001E574.s"
int fopOvlpM_IsDone(void) {
return l_fopOvlpM_overlap ? cReq_Is_Done(l_fopOvlpM_overlap) : 0;
}
extern "C" {
// fopOvlpM_IsDoingReq__Fv
// fopOvlpM_IsDoingReq(void)
asm void fopOvlpM_IsDoingReq(void) {