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_IsWaitOfFadeout OK

Browse Source
This commit is contained in:
Pheenoh
2021-02-17 10:45:52 -05:00
parent 3f7fdd4503
commit 8c2b4bb213
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f/f_op/f_op_overlap_req.cpp
+15 -3
View File
@@ -49,14 +49,26 @@ int fopOvlpReq_phase_Done(overlap_request_class* pOvlpReq) {
return 0; return 0;
} }
// return line is wrong
#ifdef NONMATCHING
s16 fopOvlpReq_phase_IsDone(overlap_request_class* param_1) {
cReq_Done((request_base_class*)param_1);
param_1->field_0x2--;
return ((int)param_1->field_0x2 | ~-(int)param_1->field_0x2) >> 0x1F & 2;
}
#else
asm void fopOvlpReq_phase_IsDone(overlap_request_class*) { asm void fopOvlpReq_phase_IsDone(overlap_request_class*) {
nofralloc nofralloc
#include "f/f_op/f_op_overlap_req/asm/func_8001E748.s" #include "f/f_op/f_op_overlap_req/asm/func_8001E748.s"
} }
#endif
asm void fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class*) { int fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* pOvlpReq) {
nofralloc if (cReq_Is_Done((request_base_class*)(pOvlpReq->field_0x20 + 0xC4))) {
#include "f/f_op/f_op_overlap_req/asm/func_8001E794.s" pOvlpReq->field_0x8 = 0;
return 2;
}
return 0;
} }
asm void fopOvlpReq_phase_WaitOfFadeout(overlap_request_class*) { asm void fopOvlpReq_phase_WaitOfFadeout(overlap_request_class*) {