From 43ee8581f3c3c83bf6bd669c9b3e2981c6dd04b3 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Wed, 17 Feb 2021 11:43:15 -0500 Subject: [PATCH] fopOvlpReq_phase_IsComplete OK --- src/f/f_op/f_op_overlap_req.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/f/f_op/f_op_overlap_req.cpp b/src/f/f_op/f_op_overlap_req.cpp index 441983de60b..806ec6dade0 100644 --- a/src/f/f_op/f_op_overlap_req.cpp +++ b/src/f/f_op/f_op_overlap_req.cpp @@ -77,7 +77,7 @@ int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* pOvlpReq) { } if (((u8)(pOvlpReq->field_0x0 & 0x3F)) == 2 && !pOvlpReq->field_0x6) { - cReq_Command((request_base_class*)(pOvlpReq->field_0x20+0xC4),2); + cReq_Command((request_base_class*)(pOvlpReq->field_0x20 + 0xC4), 2); return 2; } @@ -85,9 +85,12 @@ int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* pOvlpReq) { return 0; } -asm void fopOvlpReq_phase_IsComplete(overlap_request_class*) { - nofralloc -#include "f/f_op/f_op_overlap_req/asm/func_8001E854.s" +int fopOvlpReq_phase_IsComplete(overlap_request_class* pOvlpReq) { + if (cReq_Is_Done((request_base_class*)(pOvlpReq->field_0x20 + 0xC4))) { + cReq_Done((request_base_class*)pOvlpReq); + return 2; + } + return 0; } asm void fopOvlpReq_phase_IsCreated(overlap_request_class*) {