From b17fbd496f4ea6e0b510f9ec53b0e89f9df58ee6 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 20 Mar 2021 19:06:20 -0400 Subject: [PATCH] fopScnRq_phase_IsDoneOverlap OK --- src/f/f_op/f_op_scene_req.cpp | 17 ++++++++++++++--- 1 file 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 fa7a7e5ac5c..6f8611c6c23 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"