From d4a7f23bc5262455c926faf15dd7285ff38442ac Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Wed, 17 Feb 2021 13:12:34 -0500
Subject: [PATCH] fopOvlpReq_Cancel OK

---
 include/f/f_op/f_op_overlap_req.h | 2 +-
 src/f/f_op/f_op_overlap_req.cpp   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/f/f_op/f_op_overlap_req.h b/include/f/f_op/f_op_overlap_req.h
index 9a7c6c55868..b20fe4ab319 100644
--- a/include/f/f_op/f_op_overlap_req.h
+++ b/include/f/f_op/f_op_overlap_req.h
@@ -26,7 +26,7 @@ public:
 int fopOvlpReq_OverlapClr(overlap_request_class* param_1);
 request_base_class* fopOvlpReq_Request(overlap_request_class*, s16, u16);
 int fopOvlpReq_Handler(overlap_request_class*);
-int fopOvlpReq_Cancel(overlap_request_class*);
+bool fopOvlpReq_Cancel(overlap_request_class*);
 int fopOvlpReq_phase_Done(overlap_request_class* param_1);
 
 #endif
\ No newline at end of file
diff --git a/src/f/f_op/f_op_overlap_req.cpp b/src/f/f_op/f_op_overlap_req.cpp
index d191be96ece..6441a43078a 100644
--- a/src/f/f_op/f_op_overlap_req.cpp
+++ b/src/f/f_op/f_op_overlap_req.cpp
@@ -136,9 +136,8 @@ asm int fopOvlpReq_Handler(overlap_request_class*) {
 #include "f/f_op/f_op_overlap_req/asm/func_8001E9F0.s"
 }
 
-asm int fopOvlpReq_Cancel(overlap_request_class*) {
-    nofralloc
-#include "f/f_op/f_op_overlap_req/asm/func_8001EA88.s"
+bool fopOvlpReq_Cancel(overlap_request_class* pOvlpReq) {
+    return (bool)(fopOvlpReq_phase_Done(pOvlpReq) == 2);
 }
 
 asm void fopOvlpReq_Is_PeektimeLimit(overlap_request_class*) {