fopOvlp_Draw OK, fopOvlp_Execute OK, fopOvlp_IsDelete OK, fopOvlp_Delete OK

3 files changed, 34 insertions, 53 deletions

diff --git a/src/f/f_op/f_op_draw_iter.cpp b/src/f/f_op/f_op_draw_iter.cpp
index ec047bf10d..31c7b15d86 100644
--- a/src/f/f_op/f_op_draw_iter.cpp
+++ b/src/f/f_op/f_op_draw_iter.cpp
@@ -1,39 +1,41 @@
 /* f_op_draw_iter.cpp autogenerated by split.py v0.4 at 2021-02-15 20:16:49.147351 */
 
+#include "f/f_op/f_op_draw_iter.h"
+#include "SComponent/c_tree.h"
 #include "global.h"
 
 // additional symbols needed for f_op_draw_iter.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:16:49.147373
 extern "C" {
-void fopDwIt_Begin(void);
-void fopDwIt_GetTag(void);
-void fopDwIt_Next(void);
+void fopDwIt_GetTag__Fv(void);
 }
 
 // additional symbols needed for f_op_draw_iter.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:16:49.147378
-extern u8 lbl_804505D0;
-extern u8 lbl_80450CF8;
+extern node_lists_tree_class g_fopDwTg_Queue;
+extern u32 l_fopDwTg_id;
+
+// void fopDwIt_GetTag(void) {
+//     u32 tmp = l_fopDwTg_id;
+//     while (!g_fopDwTg_Queue.mpLists[tmp].mpHead) {
+//         if (g_fopDwTg_Queue.mNumLists <= tmp + 1) {
+//             return;
+//         }
+//         l_fopDwTg_id++;
+//     }
+// }
 
-extern "C" {
-// fopDwIt_GetTag__Fv
-// fopDwIt_GetTag(void)
 asm void fopDwIt_GetTag(void) {
     nofralloc
 #include "f/f_op/f_op_draw_iter/asm/func_80020400.s"
 }
 
-// fopDwIt_Begin__Fv
-// fopDwIt_Begin(void)
 asm void fopDwIt_Begin(void) {
     nofralloc
 #include "f/f_op/f_op_draw_iter/asm/func_80020444.s"
 }
 
-// fopDwIt_Next__FP16create_tag_class
-// fopDwIt_Next(create_tag_class*)
-asm void fopDwIt_Next(void) {
+asm void fopDwIt_Next(create_tag_class* pCreateTag) {
     nofralloc
 #include "f/f_op/f_op_draw_iter/asm/func_80020480.s"
 }
-};
diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp
index 463e68211c..463ccc135a 100644
--- a/src/f/f_op/f_op_draw_tag.cpp
+++ b/src/f/f_op/f_op_draw_tag.cpp
@@ -15,7 +15,7 @@ void fopDwTg_ToDrawQ(void);
 // additional symbols needed for f_op_draw_tag.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463045
 extern u8 lbl_803F1E10;
-extern u8 lbl_804505D0;
+extern u8 g_fopDwTg_Queue;
 
 extern "C" {
 // fopDwTg_ToDrawQ__FP16create_tag_classi
diff --git a/src/f/f_op/f_op_overlap.cpp b/src/f/f_op/f_op_overlap.cpp
index 40016c9fd5..41300d04e7 100644
--- a/src/f/f_op/f_op_overlap.cpp
+++ b/src/f/f_op/f_op_overlap.cpp
@@ -1,59 +1,38 @@
 /* f_op_overlap.cpp autogenerated by split.py v0.4 at 2021-02-15 21:08:55.000952 */
 
+#include "f/f_op/f_op_overlap.h"
+#include "SComponent/c_request.h"
+#include "f/f_pc/f_pc_leaf.h"
 #include "global.h"
 
 // additional symbols needed for f_op_overlap.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 21:08:55.000975
 extern "C" {
 void cReq_Create__FP18request_base_classUc(void);
-void fopOvlp_Draw(void);
-void fpcLf_DrawMethod(void);
-void fpcMtd_Create(void);
-void fpcMtd_Delete(void);
-void fpcMtd_Execute(void);
-void fpcMtd_IsDelete(void);
-void func_8001E3A4(void);
-void func_8001E3CC(void);
-void func_8001E3F4(void);
-void func_8001E41C(void);
 }
 
-// additional symbols needed for f_op_overlap.cpp
-// autogenerated by split.py v0.4 at 2021-02-15 21:08:55.000980
-
-extern "C" {
-// fopOvlp_Draw__FPv
-// fopOvlp_Draw(void*)
-asm void fopOvlp_Draw(void) {
-    nofralloc
-#include "f/f_op/f_op_overlap/asm/func_8001E37C.s"
+void fopOvlp_Draw(void* param_1) {
+    // matches but is probably wrong
+    fpcLf_DrawMethod(
+        (leafdraw_method_class*)((leafdraw_method_class*)param_1)[9].mBase.mpIsDeleteFunc, param_1);
 }
 
-// fopOvlp_Execute__FPv
-// fopOvlp_Execute(void*)
-asm void func_8001E3A4(void) {
-    nofralloc
-#include "f/f_op/f_op_overlap/asm/func_8001E3A4.s"
+void fopOvlp_Execute(void* param_1) {
+    // matches but is probably wrong
+    fpcMtd_Execute((process_method_class*)((int*)param_1)[0x30], param_1);
 }
 
-// fopOvlp_IsDelete__FPv
-// fopOvlp_IsDelete(void*)
-asm void func_8001E3CC(void) {
-    nofralloc
-#include "f/f_op/f_op_overlap/asm/func_8001E3CC.s"
+void fopOvlp_IsDelete(void* param_1) {
+    // matches but is probably wrong
+    fpcMtd_IsDelete((process_method_class*)((int*)param_1)[0x30], param_1);
 }
 
-// fopOvlp_Delete__FPv
-// fopOvlp_Delete(void*)
-asm void func_8001E3F4(void) {
-    nofralloc
-#include "f/f_op/f_op_overlap/asm/func_8001E3F4.s"
+void fopOvlp_Delete(void* param_1) {
+    // matches but is probably wrong
+    fpcMtd_Delete((process_method_class*)((int*)param_1)[0x30], param_1);
 }
 
-// fopOvlp_Create__FPv
-// fopOvlp_Create(void*)
-asm void func_8001E41C(void) {
+asm void fopOvlp_Create(void* param_1) {
     nofralloc
 #include "f/f_op/f_op_overlap/asm/func_8001E41C.s"
 }
-};