fopCam_Draw OK, fopCam_IsDelete OK, fopCam_Delete OK

4 files changed, 45 insertions, 36 deletions

diff --git a/src/f/f_op/f_op_camera.cpp b/src/f/f_op/f_op_camera.cpp
index f82fac3e5a..20f57db136 100644
--- a/src/f/f_op/f_op_camera.cpp
+++ b/src/f/f_op/f_op_camera.cpp
@@ -1,64 +1,70 @@
 /* f_op_camera.cpp autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027855 */
 
+#include "f/f_op/f_op_camera.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "f/f_op/f_op_draw_tag.h"
+#include "f/f_pc/f_pc_leaf.h"
 #include "global.h"
 
 // additional symbols needed for f_op_camera.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027886
 extern "C" {
-void fopCam_Draw(void);
 void fopDwTg_DrawQTo(void);
 void fopDwTg_Init(void);
 void fopDwTg_ToDrawQ(void);
-void fpcLf_DrawMethod(void);
-void fpcLf_GetPriority(void);
-void fpcMtd_Create(void);
-void fpcMtd_Delete(void);
-void fpcMtd_Execute(void);
-void fpcMtd_IsDelete(void);
 void func_8001E180(void);
 void func_8001E1C8(void);
 void func_8001E21C(void);
 void func_8001E270(void);
+void fopDwTg_DrawQTo__FP16create_tag_class(void);
 }
 
 // additional symbols needed for f_op_camera.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027892
-extern u8 lbl_80451124;
+extern s8 lbl_80451124;
 
-extern "C" {
-// fopCam_Draw__FP12camera_class
-// fopCam_Draw(camera_class*)
-asm void fopCam_Draw(void) {
-    nofralloc
-#include "f/f_op/f_op_camera/asm/func_8001E140.s"
+s32 fopCam_Draw(camera_class* pCamera) {
+    s32 tmp = 1;
+
+    if (g_dComIfG_gameInfo.getPlay().getField0x4f7d() == false) {
+        tmp = fpcLf_DrawMethod(pCamera->pMthd, pCamera);
+    }
+    return tmp;
 }
 
-// fopCam_Execute__FP12camera_class
-// fopCam_Execute(camera_class*)
-asm void func_8001E180(void) {
+// Matches, but wrong registers
+#ifdef NONMATCHING
+void fopCam_Execute(camera_class* pCamera) {
+    if (!g_dComIfG_gameInfo.getPlay().getField0x4f7d() && !lbl_80451124) {
+        fpcMtd_Execute((process_method_class*)pCamera->pMthd, pCamera);
+    }
+}
+#else
+asm void fopCam_Execute(camera_class* pCamera) {
     nofralloc
 #include "f/f_op/f_op_camera/asm/func_8001E180.s"
 }
+#endif
 
-// fopCam_IsDelete__FP12camera_class
-// fopCam_IsDelete(camera_class*)
-asm void func_8001E1C8(void) {
-    nofralloc
-#include "f/f_op/f_op_camera/asm/func_8001E1C8.s"
+int fopCam_IsDelete(camera_class* pCamera) {
+    int tmp = fpcMtd_IsDelete((process_method_class*)pCamera->pMthd, pCamera);
+    if (tmp == 1) {
+        fopDwTg_DrawQTo(&pCamera->pCreateTag);
+    }
+
+    return tmp;
 }
 
-// fopCam_Delete__FP12camera_class
-// fopCam_Delete(camera_class*)
-asm void func_8001E21C(void) {
-    nofralloc
-#include "f/f_op/f_op_camera/asm/func_8001E21C.s"
+int fopCam_Delete(camera_class* pCamera) {
+    int tmp = fpcMtd_Delete((process_method_class*)pCamera->pMthd, pCamera);
+    if (tmp == 1) {
+        fopDwTg_DrawQTo(&pCamera->pCreateTag);
+    }
+
+    return tmp;
 }
 
-// fopCam_Create__FPv
-// fopCam_Create(void*)
-asm void func_8001E270(void) {
+asm void fopCam_Create(void*) {
     nofralloc
 #include "f/f_op/f_op_camera/asm/func_8001E270.s"
 }
-};
diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp
index fadf9c7a1d..463e68211c 100644
--- a/src/f/f_op/f_op_draw_tag.cpp
+++ b/src/f/f_op/f_op_draw_tag.cpp
@@ -1,14 +1,11 @@
 /* f_op_draw_tag.cpp autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463012 */
 
+#include "f/f_op/f_op_draw_tag.h"
 #include "global.h"
 
 // additional symbols needed for f_op_draw_tag.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463040
 extern "C" {
-void cTg_AdditionToTree(void);
-void cTg_Create(void);
-void cTg_SingleCutFromTree(void);
-void cTr_Create(void);
 void fopDwTg_CreateQueue(void);
 void fopDwTg_DrawQTo(void);
 void fopDwTg_Init(void);
@@ -27,14 +24,16 @@ asm void fopDwTg_ToDrawQ(void) {
     nofralloc
 #include "f/f_op/f_op_draw_tag/asm/func_800204AC.s"
 }
+};
 
 // fopDwTg_DrawQTo__FP16create_tag_class
 // fopDwTg_DrawQTo(create_tag_class*)
-asm void fopDwTg_DrawQTo(void) {
+asm void fopDwTg_DrawQTo(create_tag_class*) {
     nofralloc
 #include "f/f_op/f_op_draw_tag/asm/func_800204D4.s"
 }
 
+extern "C" {
 // fopDwTg_Init__FP16create_tag_classPv
 // fopDwTg_Init(create_tag_class*, void*)
 asm void fopDwTg_Init(void) {
diff --git a/src/f/f_op/f_op_kankyo.cpp b/src/f/f_op/f_op_kankyo.cpp
index f3de28dceb..f492bab6a6 100644
--- a/src/f/f_op/f_op_kankyo.cpp
+++ b/src/f/f_op/f_op_kankyo.cpp
@@ -1,11 +1,13 @@
 /* f_op_kankyo.cpp autogenerated by split.py v0.4 at 2021-02-15 21:03:24.816040 */
 
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "f/f_op/f_op_draw_tag.h"
 #include "global.h"
 
 // additional symbols needed for f_op_kankyo.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 21:03:24.816064
 extern "C" {
+void fopDwTg_DrawQTo__FP16create_tag_class(void);
 void fopDwTg_DrawQTo(void);
 void fopDwTg_Init(void);
 void fopDwTg_ToDrawQ(void);
diff --git a/src/f/f_op/f_op_msg.cpp b/src/f/f_op/f_op_msg.cpp
index 0e414605aa..f2ade0b8ba 100644
--- a/src/f/f_op/f_op_msg.cpp
+++ b/src/f/f_op/f_op_msg.cpp
@@ -1,10 +1,12 @@
 /* f_op_msg.cpp autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071191 */
 
+#include "f/f_op/f_op_draw_tag.h"
 #include "global.h"
 
 // additional symbols needed for f_op_msg.cpp
 // autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071227
 extern "C" {
+void fopDwTg_DrawQTo__FP16create_tag_class(void);
 void fopDwTg_DrawQTo(void);
 void fopDwTg_Init(void);
 void fopDwTg_ToDrawQ(void);