diff options
| author | Pheenoh <pheenoh@gmail.com> | 2021-03-20 19:06:20 -0400 |
|---|---|---|
| committer | Pheenoh <pheenoh@gmail.com> | 2021-03-20 19:06:20 -0400 |
| commit | b17fbd496f4ea6e0b510f9ec53b0e89f9df58ee6 (patch) | |
| tree | 2e565b3a6eca8d202adeb5add2bb65476d780ffa /src | |
| parent | 88c92bda2a5aa3445fb5d53beed9b6587d1fb4c1 (diff) | |
fopScnRq_phase_IsDoneOverlap OK
Diffstat (limited to 'src')
| -rw-r--r-- | src/f/f_op/f_op_scene_req.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp index fa7a7e5ac5..6f8611c6c2 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -71,11 +71,22 @@ scene_request_class* fopScnRq_phase_IsDoingOverlap(scene_request_class* pScnRq) return pScnRq; } -asm void fopScnRq_phase_IsDoneOverlap(scene_request_class*) { - nofralloc -#include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s" +scene_request_class* fopScnRq_phase_IsDoneOverlap(scene_request_class* pScnRq) { + pScnRq = 0; + + if (fopOvlpM_IsDone() == 1) { + pScnRq = (scene_request_class*)2; + return pScnRq; + } + + return pScnRq; } +// asm void fopScnRq_phase_IsDoneOverlap(scene_request_class*) { +// nofralloc +// #include "f/f_op/f_op_scene_req/asm/func_8001EEB4.s" +// } + asm void fopScnRq_phase_Done(scene_request_class*) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001EEE4.s" |