encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

fopOvlpReq_phase_Create OK

Browse Source
This commit is contained in:
Pheenoh
2021-02-17 12:10:21 -05:00
parent 9ed5e03d25
commit e262f2c224
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/f/f_op/f_op_overlap_req.h
+3 -2
View File
@@ -2,6 +2,7 @@
#define F_F_OP_OVERLAP_REQ_H_ #define F_F_OP_OVERLAP_REQ_H_
#include "SComponent/c_request.h" #include "SComponent/c_request.h"
#include "f/f_pc/f_pc_layer.h"
#include "dolphin/types.h" #include "dolphin/types.h"
class overlap_request_class { class overlap_request_class {
@@ -13,8 +14,7 @@ public:
u16 field_0x6; u16 field_0x6;
u32 field_0x8; u32 field_0x8;
u32 field_0xc; u32 field_0xc;
u8 field_0x10; s16 field_0x10;
u8 field_0x11;
u8 field_0x12; u8 field_0x12;
u8 field_0x13; u8 field_0x13;
int field_0x14; int field_0x14;
@@ -27,6 +27,7 @@ public:
u8 field_0x1e; u8 field_0x1e;
u8 field_0x1f; u8 field_0x1f;
u8* field_0x20; u8* field_0x20;
layer_class* pCurrentLayer;
}; };
int fopOvlpReq_OverlapClr(overlap_request_class* param_1); int fopOvlpReq_OverlapClr(overlap_request_class* param_1);
request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16); request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16);
src/f/f_op/f_op_overlap_req.cpp
+5 -4
View File
@@ -3,6 +3,7 @@
#include "f/f_op/f_op_overlap_req.h" #include "f/f_op/f_op_overlap_req.h"
#include "f/f_pc/f_pc_executor.h" #include "f/f_pc/f_pc_executor.h"
#include "f/f_pc/f_pc_manager.h" #include "f/f_pc/f_pc_manager.h"
#include "f/f_pc/f_pc_stdcreate_req.h"
#include "global.h" #include "global.h"
// additional symbols needed for f_op_overlap_req.cpp // additional symbols needed for f_op_overlap_req.cpp
@@ -24,7 +25,6 @@ void fopOvlpReq_SetPeektime__FP21overlap_request_classUs(void);
void fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class(void); void fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class(void);
void fopOvlpReq_SetPeektime(void); void fopOvlpReq_SetPeektime(void);
void fopOvlpReq_phase_Done(void); void fopOvlpReq_phase_Done(void);
void fpcSCtRq_Request(void);
void func_8001E748(void); void func_8001E748(void);
void func_8001E794(void); void func_8001E794(void);
void func_8001E7E4(void); void func_8001E7E4(void);
@@ -105,9 +105,10 @@ int fopOvlpReq_phase_IsCreated(overlap_request_class* pOvlpReq) {
return 0; return 0;
} }
asm void fopOvlpReq_phase_Create(overlap_request_class*) { int fopOvlpReq_phase_Create(overlap_request_class* pOvlpReq) {
nofralloc fpcLy_SetCurrentLayer(pOvlpReq->pCurrentLayer);
#include "f/f_op/f_op_overlap_req/asm/func_8001E904.s" pOvlpReq->field_0x14 = fpcSCtRq_Request(fpcLy_CurrentLayer(),pOvlpReq->field_0x10, 0,0,0);
return 2;
} }
asm request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16) { asm request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16) {