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

fopOvlpReq_Is_PeektimeLimit OK

This commit is contained in:
Pheenoh 2021-02-17 16:54:58 -05:00
parent d4a7f23bc5
commit f2335e88fa
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,8 @@ public:
int fopOvlpReq_OverlapClr(overlap_request_class* param_1);
request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16);
int fopOvlpReq_Handler(overlap_request_class*);
bool fopOvlpReq_Cancel(overlap_request_class*);
int fopOvlpReq_Cancel(overlap_request_class*);
int fopOvlpReq_phase_Done(overlap_request_class* param_1);
int fopOvlpReq_Is_PeektimeLimit(overlap_request_class*);
#endif

2
src/f/f_op/f_op_overlap_mng.cpp
View File

@ -108,7 +108,7 @@ int fopOvlpM_Cancel(void) {
if (!l_fopOvlpM_overlap) {
return 1;
}
if (fopOvlpReq_Cancel((overlap_request_class*)l_fopOvlpM_overlap) == 1) {
if (fopOvlpReq_Cancel((overlap_request_class*)l_fopOvlpM_overlap) == true) {
l_fopOvlpM_overlap = 0;
return 1;
}

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

@ -136,13 +136,12 @@ asm int fopOvlpReq_Handler(overlap_request_class*) {
#include "f/f_op/f_op_overlap_req/asm/func_8001E9F0.s"
}
bool fopOvlpReq_Cancel(overlap_request_class* pOvlpReq) {
return (bool)(fopOvlpReq_phase_Done(pOvlpReq) == 2);
int fopOvlpReq_Cancel(overlap_request_class* pOvlpReq) {
return fopOvlpReq_phase_Done(pOvlpReq) == 2 ? 1 : 0;
}
asm void fopOvlpReq_Is_PeektimeLimit(overlap_request_class*) {
nofralloc
#include "f/f_op/f_op_overlap_req/asm/func_8001EAB4.s"
int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* pOvlpReq) {
return pOvlpReq->field_0x6 == 0 ? 1 : 0;
}
asm void fopOvlpReq_SetPeektime(overlap_request_class*, u16) {