diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-03-20 20:31:57 -0400 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-03-20 20:31:57 -0400 |
| commit | 0911cb0e2c696e714e8f5c3b4ea9c625ebd5e563 (patch) | |
| tree | de5e327049b7ed0e11781142fced9114187b324b /src | |
| parent | f5e3ba086845ea80f96b0b18f22ce2d3d788f5f6 (diff) | |
fopScnRq_FadeRequest OK
Diffstat (limited to 'src')
| -rw-r--r-- | src/f/f_op/f_op_scene_req.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp index 335dc5d213..97e2d265d3 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -43,7 +43,7 @@ void func_8001EFB0(void); // additional symbols needed for f_op_scene_req.cpp // autogenerated by split.py v0.4 at 2021-03-20 21:43:05.095976 extern u8 lbl_803A38C8; -extern u32 l_fopScnRq_IsUsingOfOverlap; +extern int l_fopScnRq_IsUsingOfOverlap; scene_request_class* fopScnRq_phase_ClearOverlap(scene_request_class* pScnRq) { pScnRq = 0; @@ -116,9 +116,14 @@ int fopScnRq_Cancel(scene_request_class* pScnRq) { return 1; } -asm void fopScnRq_FadeRequest(s16, u16) { - nofralloc -#include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s" +request_base_class* fopScnRq_FadeRequest(s16 param_1, u16 param_2) { + request_base_class* tmp = 0; + + if (l_fopScnRq_IsUsingOfOverlap == 0 && (tmp = fopOvlpM_Request(param_1,param_2), tmp != 0)) { + l_fopScnRq_IsUsingOfOverlap = 1; + } + + return tmp; } asm u32 fopScnRq_Request(int, scene_class*, s16, void*, s16, u16) { |