From 88c92bda2a5aa3445fb5d53beed9b6587d1fb4c1 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 20 Mar 2021 19:05:15 -0400 Subject: [PATCH] fopScnRq_phase_IsDoingOverlap OK --- src/f/f_op/f_op_scene_req.cpp | 12 +++++++++--- 1 file changed, 9 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 ed8ec726d4a..fa7a7e5ac5c 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -60,9 +60,15 @@ void fopScnRq_phase_Execute(scene_request_class* pScnRq) { fpcNdRq_Execute((node_create_request*)pScnRq); } -asm void fopScnRq_phase_IsDoingOverlap(scene_request_class*) { - nofralloc -#include "f/f_op/f_op_scene_req/asm/func_8001EE84.s" +scene_request_class* fopScnRq_phase_IsDoingOverlap(scene_request_class* pScnRq) { + pScnRq = 0; + + if (fopOvlpM_IsDoingReq() == 1) { + pScnRq = (scene_request_class*)2; + return pScnRq; + } + + return pScnRq; } asm void fopScnRq_phase_IsDoneOverlap(scene_request_class*) {