From f2335e88fad9ef49f2b845456422270832b5e52c Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Wed, 17 Feb 2021 16:54:58 -0500
Subject: [PATCH] fopOvlpReq_Is_PeektimeLimit OK

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

diff --git a/include/f/f_op/f_op_overlap_req.h b/include/f/f_op/f_op_overlap_req.h
index b20fe4ab319..5a9bec0224a 100644
--- a/include/f/f_op/f_op_overlap_req.h
+++ b/include/f/f_op/f_op_overlap_req.h
@@ -26,7 +26,8 @@ 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*);
-bool fopOvlpReq_Cancel(overlap_request_class*);
+int fopOvlpReq_Cancel(overlap_request_class*);
 int fopOvlpReq_phase_Done(overlap_request_class* param_1);
+int fopOvlpReq_Is_PeektimeLimit(overlap_request_class*);
 
 #endif
\ No newline at end of file
diff --git a/src/f/f_op/f_op_overlap_mng.cpp b/src/f/f_op/f_op_overlap_mng.cpp
index f4e85bbda00..4152e7b8608 100644
--- a/src/f/f_op/f_op_overlap_mng.cpp
+++ b/src/f/f_op/f_op_overlap_mng.cpp
@@ -108,7 +108,7 @@ int fopOvlpM_Cancel(void) {
     if (!l_fopOvlpM_overlap) {
         return 1;
     }
-    if (fopOvlpReq_Cancel((overlap_request_class*)l_fopOvlpM_overlap) == 1) {
+    if (fopOvlpReq_Cancel((overlap_request_class*)l_fopOvlpM_overlap) == true) {
         l_fopOvlpM_overlap = 0;
         return 1;
     }
diff --git a/src/f/f_op/f_op_overlap_req.cpp b/src/f/f_op/f_op_overlap_req.cpp
index 6441a43078a..23e6a4e3939 100644
--- a/src/f/f_op/f_op_overlap_req.cpp
+++ b/src/f/f_op/f_op_overlap_req.cpp
@@ -136,13 +136,12 @@ asm int fopOvlpReq_Handler(overlap_request_class*) {
 #include "f/f_op/f_op_overlap_req/asm/func_8001E9F0.s"
 }
 
-bool fopOvlpReq_Cancel(overlap_request_class* pOvlpReq) {
-    return (bool)(fopOvlpReq_phase_Done(pOvlpReq) == 2);
+int fopOvlpReq_Cancel(overlap_request_class* pOvlpReq) {
+    return fopOvlpReq_phase_Done(pOvlpReq) == 2 ? 1 : 0;
 }
 
-asm void fopOvlpReq_Is_PeektimeLimit(overlap_request_class*) {
-    nofralloc
-#include "f/f_op/f_op_overlap_req/asm/func_8001EAB4.s"
+int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* pOvlpReq) {
+    return pOvlpReq->field_0x6 == 0 ? 1 : 0;
 }
 
 asm void fopOvlpReq_SetPeektime(overlap_request_class*, u16) {