From 6f9e65017537a7402d2a5ea747fd8db4c0cdfe7d Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Tue, 14 Feb 2023 15:47:34 -0700
Subject: [PATCH] daTagAssist_Execute

---
 .../d_a_tag_assistance/d_a_tag_assistance.h   |  6 +++++
 .../d_a_tag_assistance/d_a_tag_assistance.cpp | 23 ++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
index b0eba3af3d1..977192f2f6c 100644
--- a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
+++ b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
@@ -3,6 +3,7 @@
 
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
+#include "d/com/d_com_inf_game.h"
 
 class daTagAssist_c : public fopAc_ac_c {
 public:
@@ -20,6 +21,11 @@ public:
         return cPhs_COMPLEATE_e;
     }
 
+    int execute() {
+        fopAcM_searchPlayerDistanceXZ(this);
+        return 1;
+    }
+
     u8 field_0x568[8];
     s16 field_0x570;
 };
diff --git a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp
index 523a39bac3f..5ff14c37858 100644
--- a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp
+++ b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp
@@ -27,7 +27,7 @@ extern "C" void __dt__10fopAc_ac_cFv();
 extern "C" void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c();
 // extern "C" extern void* g_fopAc_Method[8];
 // extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
+// extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
 //
 // Declarations:
@@ -35,23 +35,17 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
 
 /* 80D55E38-80D55E98 000078 0060+00 1/0 0/0 0/0 .text            daTagAssist_Create__FP10fopAc_ac_c
  */
-#ifndef NONMATCHING
-static int daTagAssist_Create(fopAc_ac_c* i_actorP) {
-    daTagAssist_c* tag_assist = (daTagAssist_c*)i_actorP;
+static int daTagAssist_Create(fopAc_ac_c* i_this) {
+    daTagAssist_c* tag_assist = (daTagAssist_c*)i_this;
     return tag_assist->create();
 }
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagAssist_Create(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance/daTagAssist_Create__FP10fopAc_ac_c.s"
-}
-#pragma pop
-#endif
 
 /* 80D55E98-80D55EC8 0000D8 0030+00 1/0 0/0 0/0 .text daTagAssist_Execute__FP13daTagAssist_c */
+#ifndef NONMATCHING
+static int daTagAssist_Execute(daTagAssist_c* i_this) {
+    return i_this->execute();
+}
+#else
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
@@ -60,6 +54,7 @@ static asm void daTagAssist_Execute(daTagAssist_c* param_0) {
 #include "asm/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance/daTagAssist_Execute__FP13daTagAssist_c.s"
 }
 #pragma pop
+#endif
 
 /* 80D55EC8-80D55ED0 000108 0008+00 1/0 0/0 0/0 .text daTagAssist_IsDelete__FP13daTagAssist_c */
 static bool daTagAssist_IsDelete(daTagAssist_c* param_0) {