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

fopScnRq_Cancel OK

This commit is contained in:
Pheenoh 2021-03-20 20:16:42 -04:00
parent a85040de4f
commit f5e3ba0868
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/f/f_op/f_op_overlap_mng.h
View File

@ -21,5 +21,6 @@ int fopOvlpM_IsDone(void);
int fopOvlpM_IsDoingReq(void); int fopOvlpM_IsDoingReq(void);
int fopOvlpM_ClearOfReq(void); int fopOvlpM_ClearOfReq(void);
request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2); request_base_class* fopOvlpM_Request(s16 param_1, u16 param_2);
int fopOvlpM_Cancel(void);
#endif #endif

10
src/f/f_op/f_op_scene_req.cpp
View File

@ -107,9 +107,13 @@ int fopScnRq_PostMethod(void* param_1, scene_request_class* pScnRq) {
return 1; return 1;
} }
asm void fopScnRq_Cancel(scene_request_class*) { int fopScnRq_Cancel(scene_request_class* pScnRq) {
nofralloc
#include "f/f_op/f_op_scene_req/asm/func_8001EFB0.s" if (pScnRq->mFadeRequest && !fopOvlpM_Cancel()) {
return 0;
}
return 1;
} }
asm void fopScnRq_FadeRequest(s16, u16) { asm void fopScnRq_FadeRequest(s16, u16) {