fopOvlp_Draw OK, fopOvlp_Execute OK, fopOvlp_IsDelete OK, fopOvlp_Delete OK

7 files changed, 29 insertions, 11 deletions

diff --git a/include/f/f_op/f_op_draw_iter.h b/include/f/f_op/f_op_draw_iter.h
new file mode 100644
index 0000000000..9da1e53ca9
--- /dev/null
+++ b/include/f/f_op/f_op_draw_iter.h
@@ -0,0 +1,10 @@
+#ifndef F_F_OP_DRAW_ITER_H_
+#define F_F_OP_DRAW_ITER_H_
+
+#include "SComponent/c_tag.h"
+
+void fopDwIt_GetTag(void);
+void fopDwIt_Begin(void);
+void fopDwIt_Next(create_tag_class* pCreateTag);
+
+#endif
\ No newline at end of file
diff --git a/include/f/f_op/f_op_draw_iter/asm/func_80020400.s b/include/f/f_op/f_op_draw_iter/asm/func_80020400.s
index 1f740a04da..86a9d33b14 100644
--- a/include/f/f_op/f_op_draw_iter/asm/func_80020400.s
+++ b/include/f/f_op/f_op_draw_iter/asm/func_80020400.s
@@ -1,17 +1,17 @@
-/* 80020400 0001D340  80 8D 80 50 */ lwz r4, lbl_804505D0-_SDA_BASE_(r13)
-/* 80020404 0001D344  38 6D 80 50 */ la r3, lbl_804505D0(r13)
+/* 80020400 0001D340  80 8D 80 50 */ lwz r4, g_fopDwTg_Queue-_SDA_BASE_(r13)
+/* 80020404 0001D344  38 6D 80 50 */ la r3, g_fopDwTg_Queue(r13)
 /* 80020408 0001D348  80 A3 00 04 */ lwz r5, 4(r3)
 /* 8002040C 0001D34C  48 00 00 20 */ b lbl_8002042C
 lbl_80020410:
-/* 80020410 0001D350  80 6D 87 78 */ lwz r3, lbl_80450CF8-_SDA_BASE_(r13)
+/* 80020410 0001D350  80 6D 87 78 */ lwz r3, l_fopDwTg_id-_SDA_BASE_(r13)
 /* 80020414 0001D354  38 03 00 01 */ addi r0, r3, 1
-/* 80020418 0001D358  90 0D 87 78 */ stw r0, lbl_80450CF8-_SDA_BASE_(r13)
+/* 80020418 0001D358  90 0D 87 78 */ stw r0, l_fopDwTg_id-_SDA_BASE_(r13)
 /* 8002041C 0001D35C  1C 00 00 0C */ mulli r0, r0, 0xc
 /* 80020420 0001D360  7C 64 00 2E */ lwzx r3, r4, r0
 /* 80020424 0001D364  28 03 00 00 */ cmplwi r3, 0
 /* 80020428 0001D368  4C 82 00 20 */ bnelr
 lbl_8002042C:
-/* 8002042C 0001D36C  80 6D 87 78 */ lwz r3, lbl_80450CF8-_SDA_BASE_(r13)
+/* 8002042C 0001D36C  80 6D 87 78 */ lwz r3, l_fopDwTg_id-_SDA_BASE_(r13)
 /* 80020430 0001D370  38 03 00 01 */ addi r0, r3, 1
 /* 80020434 0001D374  7C 00 28 00 */ cmpw r0, r5
 /* 80020438 0001D378  41 80 FF D8 */ blt lbl_80020410
diff --git a/include/f/f_op/f_op_draw_iter/asm/func_80020444.s b/include/f/f_op/f_op_draw_iter/asm/func_80020444.s
index bc59f4ac5d..05cda3fd53 100644
--- a/include/f/f_op/f_op_draw_iter/asm/func_80020444.s
+++ b/include/f/f_op/f_op_draw_iter/asm/func_80020444.s
@@ -1,15 +1,15 @@
 /* 80020444 0001D384  94 21 FF F0 */ stwu r1, -0x10(r1)
 /* 80020448 0001D388  7C 08 02 A6 */ mflr r0
 /* 8002044C 0001D38C  90 01 00 14 */ stw r0, 0x14(r1)
-/* 80020450 0001D390  80 6D 80 50 */ lwz r3, lbl_804505D0-_SDA_BASE_(r13)
+/* 80020450 0001D390  80 6D 80 50 */ lwz r3, g_fopDwTg_Queue-_SDA_BASE_(r13)
 /* 80020454 0001D394  80 63 00 00 */ lwz r3, 0(r3)
 /* 80020458 0001D398  38 00 00 00 */ li r0, 0
-/* 8002045C 0001D39C  90 0D 87 78 */ stw r0, lbl_80450CF8-_SDA_BASE_(r13)
+/* 8002045C 0001D39C  90 0D 87 78 */ stw r0, l_fopDwTg_id-_SDA_BASE_(r13)
 /* 80020460 0001D3A0  28 03 00 00 */ cmplwi r3, 0
 /* 80020464 0001D3A4  41 82 00 08 */ beq lbl_8002046C
 /* 80020468 0001D3A8  48 00 00 08 */ b lbl_80020470
 lbl_8002046C:
-/* 8002046C 0001D3AC  4B FF FF 95 */ bl fopDwIt_GetTag
+/* 8002046C 0001D3AC  4B FF FF 95 */ bl fopDwIt_GetTag__Fv
 lbl_80020470:
 /* 80020470 0001D3B0  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 80020474 0001D3B4  7C 08 03 A6 */ mtlr r0
diff --git a/include/f/f_op/f_op_draw_iter/asm/func_80020480.s b/include/f/f_op/f_op_draw_iter/asm/func_80020480.s
index 59ecf0c8f7..e7655ebe8c 100644
--- a/include/f/f_op/f_op_draw_iter/asm/func_80020480.s
+++ b/include/f/f_op/f_op_draw_iter/asm/func_80020480.s
@@ -4,7 +4,7 @@
 /* 8002048C 0001D3CC  80 63 00 08 */ lwz r3, 8(r3)
 /* 80020490 0001D3D0  28 03 00 00 */ cmplwi r3, 0
 /* 80020494 0001D3D4  40 82 00 08 */ bne lbl_8002049C
-/* 80020498 0001D3D8  4B FF FF 69 */ bl fopDwIt_GetTag
+/* 80020498 0001D3D8  4B FF FF 69 */ bl fopDwIt_GetTag__Fv
 lbl_8002049C:
 /* 8002049C 0001D3DC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 800204A0 0001D3E0  7C 08 03 A6 */ mtlr r0
diff --git a/include/f/f_op/f_op_draw_tag/asm/func_800204AC.s b/include/f/f_op/f_op_draw_tag/asm/func_800204AC.s
index e2fe579cd1..f5bd8b4433 100644
--- a/include/f/f_op/f_op_draw_tag/asm/func_800204AC.s
+++ b/include/f/f_op/f_op_draw_tag/asm/func_800204AC.s
@@ -2,7 +2,7 @@
 /* 800204B0 0001D3F0  7C 08 02 A6 */ mflr r0
 /* 800204B4 0001D3F4  90 01 00 14 */ stw r0, 0x14(r1)
 /* 800204B8 0001D3F8  7C 65 1B 78 */ mr r5, r3
-/* 800204BC 0001D3FC  38 6D 80 50 */ la r3, lbl_804505D0(r13)
+/* 800204BC 0001D3FC  38 6D 80 50 */ la r3, g_fopDwTg_Queue(r13)
 /* 800204C0 0001D400  48 24 64 0D */ bl cTg_AdditionToTree
 /* 800204C4 0001D404  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 800204C8 0001D408  7C 08 03 A6 */ mtlr r0
diff --git a/include/f/f_op/f_op_draw_tag/asm/func_80020518.s b/include/f/f_op/f_op_draw_tag/asm/func_80020518.s
index 18bb008cae..f8a705db71 100644
--- a/include/f/f_op/f_op_draw_tag/asm/func_80020518.s
+++ b/include/f/f_op/f_op_draw_tag/asm/func_80020518.s
@@ -1,7 +1,7 @@
 /* 80020518 0001D458  94 21 FF F0 */ stwu r1, -0x10(r1)
 /* 8002051C 0001D45C  7C 08 02 A6 */ mflr r0
 /* 80020520 0001D460  90 01 00 14 */ stw r0, 0x14(r1)
-/* 80020524 0001D464  38 6D 80 50 */ la r3, lbl_804505D0(r13)
+/* 80020524 0001D464  38 6D 80 50 */ la r3, g_fopDwTg_Queue(r13)
 /* 80020528 0001D468  3C 80 80 3F */ lis r4, lbl_803F1E10@ha
 /* 8002052C 0001D46C  38 84 1E 10 */ addi r4, r4, lbl_803F1E10@l
 /* 80020530 0001D470  38 A0 03 E8 */ li r5, 0x3e8
diff --git a/include/f/f_op/f_op_overlap.h b/include/f/f_op/f_op_overlap.h
new file mode 100644
index 0000000000..371a4cbcab
--- /dev/null
+++ b/include/f/f_op/f_op_overlap.h
@@ -0,0 +1,8 @@
+#ifndef F_F_OP_OVERLAP_H_
+#define F_F_OP_OVERLAP_H_
+
+#include "dolphin/types.h"
+
+void fopOvlp_Draw(void* param_1);
+
+#endif
\ No newline at end of file