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

fopOvlpReq_phase_WaitOfFadeout OK

This commit is contained in:
Pheenoh 2021-02-17 11:40:50 -05:00
parent 8c2b4bb213
commit 28f5b0c24c
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
class overlap_request_class { class overlap_request_class {
public: public:
u8 field_0x0; s8 field_0x0;
u8 field_0x1; u8 field_0x1;
s16 field_0x2; s16 field_0x2;
u16 field_0x4; u16 field_0x4;

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

@ -71,9 +71,18 @@ int fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* pOvlpReq) {
return 0; return 0;
} }
asm void fopOvlpReq_phase_WaitOfFadeout(overlap_request_class*) { int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* pOvlpReq) {
nofralloc if (pOvlpReq->field_0x6) {
#include "f/f_op/f_op_overlap_req/asm/func_8001E7E4.s" pOvlpReq->field_0x6--;
}
if (((u8)(pOvlpReq->field_0x0 & 0x3F)) == 2 && !pOvlpReq->field_0x6) {
cReq_Command((request_base_class*)(pOvlpReq->field_0x20+0xC4),2);
return 2;
}
pOvlpReq->field_0x8 = 1;
return 0;
} }
asm void fopOvlpReq_phase_IsComplete(overlap_request_class*) { asm void fopOvlpReq_phase_IsComplete(overlap_request_class*) {