summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2021-02-17 19:20:55 -0500
committerPheenoh <pheenoh@gmail.com>2021-02-17 19:20:55 -0500
commitbbf1d1c34c015fe92d326fbab6f241b1f6c7fb4f (patch)
tree9c624dd9616c963325d1aad097520bb86e12da30 /src
parenta02a65cb582cf0c620234d71ac32dc4180761a1a (diff)
fopOvlpReq_OverlapClr OK
Diffstat (limited to 'src')
-rw-r--r--src/f/f_op/f_op_overlap_req.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/f/f_op/f_op_overlap_req.cpp b/src/f/f_op/f_op_overlap_req.cpp
index 383aeaf849..585ddd1fda 100644
--- a/src/f/f_op/f_op_overlap_req.cpp
+++ b/src/f/f_op/f_op_overlap_req.cpp
@@ -151,7 +151,10 @@ void fopOvlpReq_SetPeektime(overlap_request_class* pOvlpReq, u16 param_2) {
pOvlpReq->mPeektime = param_2;
}
-asm int fopOvlpReq_OverlapClr(overlap_request_class*) {
- nofralloc
-#include "f/f_op/f_op_overlap_req/asm/func_8001EAD8.s"
+int fopOvlpReq_OverlapClr(overlap_request_class* pOvlpReq) {
+ if ((u8)((pOvlpReq->field_0x0 >> 7) & 1) == 1 || !fopOvlpReq_Is_PeektimeLimit(pOvlpReq)) {
+ return 0;
+ }
+ cReq_Create((request_base_class*)pOvlpReq, 2);
+ return 1;
} \ No newline at end of file