falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fopOvlpReq_phase_Create OK

This commit is contained in:
Pheenoh 2021-02-17 12:10:21 -05:00
parent 9ed5e03d25
commit e262f2c224
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/f/f_op/f_op_overlap_req.h
View File

@ -2,6 +2,7 @@
#define F_F_OP_OVERLAP_REQ_H_
#include "SComponent/c_request.h"
#include "f/f_pc/f_pc_layer.h"
#include "dolphin/types.h"
class overlap_request_class {
@ -13,8 +14,7 @@ public:
u16 field_0x6;
u32 field_0x8;
u32 field_0xc;
u8 field_0x10;
u8 field_0x11;
s16 field_0x10;
u8 field_0x12;
u8 field_0x13;
int field_0x14;
@ -27,6 +27,7 @@ public:
u8 field_0x1e;
u8 field_0x1f;
u8* field_0x20;
layer_class* pCurrentLayer;
};
int fopOvlpReq_OverlapClr(overlap_request_class* param_1);
request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16);

9
src/f/f_op/f_op_overlap_req.cpp
View File

@ -3,6 +3,7 @@
#include "f/f_op/f_op_overlap_req.h"
#include "f/f_pc/f_pc_executor.h"
#include "f/f_pc/f_pc_manager.h"
#include "f/f_pc/f_pc_stdcreate_req.h"
#include "global.h"
// 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_SetPeektime(void);
void fopOvlpReq_phase_Done(void);
void fpcSCtRq_Request(void);
void func_8001E748(void);
void func_8001E794(void);
void func_8001E7E4(void);
@ -105,9 +105,10 @@ int fopOvlpReq_phase_IsCreated(overlap_request_class* pOvlpReq) {
return 0;
}
asm void fopOvlpReq_phase_Create(overlap_request_class*) {
nofralloc
#include "f/f_op/f_op_overlap_req/asm/func_8001E904.s"
int fopOvlpReq_phase_Create(overlap_request_class* pOvlpReq) {
fpcLy_SetCurrentLayer(pOvlpReq->pCurrentLayer);
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) {