d_meter2 wip / d_s_play / d_file_sel_info (#179)

* d_meter2 wip

* d_s_play

* d_file_sel_info

* format

* tag_lv5soup / tag_setBall / fix dKyeff

* d_cc_uty

10 files changed, 110 insertions, 276 deletions

diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
index cd4fb3689b..513fc80247 100644
--- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
+++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp
@@ -343,7 +343,6 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
 extern "C" extern void* __vt__8dCcD_Cps[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp
index f748ef4e37..cce15278d6 100644
--- a/rel/d/a/d_a_crod/d_a_crod.cpp
+++ b/rel/d/a/d_a_crod/d_a_crod.cpp
@@ -128,7 +128,6 @@ extern "C" void _savegpr_29();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_29();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern void* __vt__8dCcD_Cps[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
 extern "C" extern void* __vt__12cCcD_CpsAttr[25];
diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp
index 22c9a94e35..26f87659cc 100644
--- a/rel/d/a/d_a_horse/d_a_horse.cpp
+++ b/rel/d/a/d_a_horse/d_a_horse.cpp
@@ -501,7 +501,6 @@ extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
 extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11];
 extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11];
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 m_typeFourData__8dPaPoF_c[60];
 extern "C" u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp
index d85423461f..40a29a625f 100644
--- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp
+++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp
@@ -470,7 +470,6 @@ extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__9dCcD_Stts[11];
diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp
index ba6a472226..943f340f6b 100644
--- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp
+++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp
@@ -6,6 +6,7 @@
 #include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
 
 //
 // Forward References:
@@ -24,7 +25,6 @@ extern "C" extern void* g_profile_KYTAG05[12];
 
 extern "C" void __ct__10fopAc_ac_cFv();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 
 //
 // Declarations:
@@ -32,40 +32,44 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 
 /* 80528A58-80528A60 000078 0008+00 1/0 0/0 0/0 .text            daKytag05_Draw__FP13kytag05_class
  */
-static bool daKytag05_Draw(kytag05_class* param_0) {
-    return true;
+static int daKytag05_Draw(kytag05_class* ac) {
+    return 1;
 }
 
 /* 80528A60-80528A68 000080 0008+00 1/0 0/0 0/0 .text daKytag05_Execute__FP13kytag05_class */
-static bool daKytag05_Execute(kytag05_class* param_0) {
-    return true;
+static int daKytag05_Execute(kytag05_class* ac) {
+    return 1;
 }
 
 /* 80528A68-80528A70 000088 0008+00 1/0 0/0 0/0 .text daKytag05_IsDelete__FP13kytag05_class */
-static bool daKytag05_IsDelete(kytag05_class* param_0) {
-    return true;
+static int daKytag05_IsDelete(kytag05_class* ac) {
+    return 1;
 }
 
 /* 80528A70-80528A78 000090 0008+00 1/0 0/0 0/0 .text            daKytag05_Delete__FP13kytag05_class
  */
-static bool daKytag05_Delete(kytag05_class* param_0) {
-    return true;
+static int daKytag05_Delete(kytag05_class* ac) {
+    return 1;
 }
 
-/* ############################################################################################## */
-/* 80528B18-80528B1C 000000 0004+00 1/1 0/0 0/0 .rodata          @3665 */
-SECTION_RODATA static f32 const lit_3665 = 100.0f;
-COMPILER_STRIP_GATE(0x80528B18, &lit_3665);
-
 /* 80528A78-80528B10 000098 0098+00 1/0 0/0 0/0 .text            daKytag05_Create__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daKytag05_Create(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/kytag/d_a_kytag05/d_a_kytag05/daKytag05_Create__FP10fopAc_ac_c.s"
+static int daKytag05_Create(fopAc_ac_c* ac) {
+    if (!fopAcM_CheckCondition(ac, 8)) {
+        new (ac) kytag05_class();
+        fopAcM_OnCondition(ac, 8);
+    }
+    kytag05_class* tag = static_cast<kytag05_class*>(ac);
+
+    tag->field_0x56c = fopAcM_GetParam(tag) >> 8;
+    tag->mSceneListID = fopAcM_GetParam(tag);
+    tag->field_0x568 = 100.0f * tag->mScale.x;
+
+    if (!tag->field_0x56c) {
+        *(char*)((char*)&tag->mAttentionInfo.mDistance2 + 3) = 0x21;
+        tag->mAttentionInfo.setFlag(0x80);
+    }
+    return 4;
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 80528B1C-80528B3C -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag05_Method */
diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp
index 4b40263df9..276bb6c1d8 100644
--- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp
+++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp
@@ -438,7 +438,6 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" extern u8 ZeroQuat[16];
 extern "C" extern void* __vt__8dCcD_Sph[36];
 extern "C" extern void* __vt__8dCcD_Cyl[36];
diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp
index 361164e2da..b810e10add 100644
--- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp
+++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp
@@ -4,39 +4,11 @@
 //
 
 #include "rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.h"
+#include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
 //
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-    /* 80018C8C */ ~fopAc_ac_c();
-};
-
-struct daTag_Lv5Soup_c {
-    /* 80D5AD58 */ void create();
-    /* 80D5ADEC */ bool Delete();
-    /* 80D5ADF4 */ void Execute();
-    /* 80D5AE9C */ bool Draw();
-    /* 80D5AEA4 */ void isAreaCheck();
-    /* 80D5B0F4 */ ~daTag_Lv5Soup_c();
-};
-
-struct dSv_event_c {
-    /* 8003498C */ void onEventBit(u16);
-    /* 800349BC */ void isEventBit(u16) const;
-};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-};
-
-//
 // Forward References:
 //
 
@@ -63,41 +35,15 @@ extern "C" void onEventBit__11dSv_event_cFUs();
 extern "C" void isEventBit__11dSv_event_cCFUs();
 extern "C" void __mi__4cXyzCFRC3Vec();
 extern "C" void __dl__FPv();
-extern "C" void PSVECSquareMag();
 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 u32 __float_nan;
 
 //
 // Declarations:
 //
 
-/* ############################################################################################## */
-/* 80D5B15C-80D5B160 000000 0004+00 2/2 0/0 0/0 .rodata          @3655 */
-SECTION_RODATA static f32 const lit_3655 = -30.0f;
-COMPILER_STRIP_GATE(0x80D5B15C, &lit_3655);
-
-/* 80D5B160-80D5B164 000004 0004+00 0/1 0/0 0/0 .rodata          @3656 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3656 = -15.0f;
-COMPILER_STRIP_GATE(0x80D5B160, &lit_3656);
-#pragma pop
-
-/* 80D5B164-80D5B168 000008 0004+00 0/1 0/0 0/0 .rodata          @3657 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3657 = 30.0f;
-COMPILER_STRIP_GATE(0x80D5B164, &lit_3657);
-#pragma pop
-
-/* 80D5B168-80D5B16C 00000C 0004+00 0/1 0/0 0/0 .rodata          @3658 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3658 = 45.0f;
-COMPILER_STRIP_GATE(0x80D5B168, &lit_3658);
-#pragma pop
+inline int dComIfGs_isEventBit(u16 event) {
+    return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event);
+}
 
 /* 80D5B18C-80D5B1AC -00001 0020+00 1/0 0/0 0/0 .data            daTag_Lv5Soup_MethodTable */
 SECTION_DATA static void* daTag_Lv5Soup_MethodTable[8] = {
@@ -129,143 +75,82 @@ SECTION_DATA extern void* __vt__15daTag_Lv5Soup_c[3] = {
 };
 
 /* 80D5AD58-80D5ADEC 000078 0094+00 1/1 0/0 0/0 .text            create__15daTag_Lv5Soup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTag_Lv5Soup_c::create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/create__15daTag_Lv5Soup_cFv.s"
+int daTag_Lv5Soup_c::create() {
+    if (!fopAcM_CheckCondition(this, 8)) {
+        new (this) daTag_Lv5Soup_c();
+        fopAcM_OnCondition(this, 8);
+    }
+
+    fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f);
+    mAttentionInfo.mFlags = 0;
+    return 4;
 }
-#pragma pop
 
 /* 80D5ADEC-80D5ADF4 00010C 0008+00 1/1 0/0 0/0 .text            Delete__15daTag_Lv5Soup_cFv */
-bool daTag_Lv5Soup_c::Delete() {
-    return true;
+int daTag_Lv5Soup_c::Delete() {
+    return 1;
 }
 
 /* 80D5ADF4-80D5AE9C 000114 00A8+00 1/1 0/0 0/0 .text            Execute__15daTag_Lv5Soup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTag_Lv5Soup_c::Execute() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/Execute__15daTag_Lv5Soup_cFv.s"
+int daTag_Lv5Soup_c::Execute() {
+    if (isAreaCheck()) {
+        // Yeto took pumpkin and pumpkin not in soup
+        if (dComIfGs_isEventBit(0x0020) && !dComIfGs_isEventBit(0x0002)) {
+            // Pumpkin in soup
+            dComIfGs_onEventBit(0x0002);
+        }
+
+        // Yeto took cheese and cheese not in soup
+        if (dComIfGs_isEventBit(0x0010) && !dComIfGs_isEventBit(0x0001)) {
+            // Cheese in soup
+            dComIfGs_onEventBit(0x0001);
+        }
+    }
+    return 1;
 }
-#pragma pop
 
 /* 80D5AE9C-80D5AEA4 0001BC 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_Lv5Soup_cFv */
-bool daTag_Lv5Soup_c::Draw() {
-    return true;
+int daTag_Lv5Soup_c::Draw() {
+    return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5B16C-80D5B170 000010 0004+00 0/1 0/0 0/0 .rodata          @3743 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3743 = 100.0f;
-COMPILER_STRIP_GATE(0x80D5B16C, &lit_3743);
-#pragma pop
-
-/* 80D5B170-80D5B174 000014 0004+00 0/1 0/0 0/0 .rodata          @3744 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3744[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x80D5B170, &lit_3744);
-#pragma pop
-
-/* 80D5B174-80D5B17C 000018 0008+00 0/1 0/0 0/0 .rodata          @3745 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3745[8] = {
-    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D5B174, &lit_3745);
-#pragma pop
-
-/* 80D5B17C-80D5B184 000020 0008+00 0/1 0/0 0/0 .rodata          @3746 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3746[8] = {
-    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D5B17C, &lit_3746);
-#pragma pop
-
-/* 80D5B184-80D5B18C 000028 0008+00 0/1 0/0 0/0 .rodata          @3747 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3747[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80D5B184, &lit_3747);
-#pragma pop
-
 /* 80D5AEA4-80D5B06C 0001C4 01C8+00 1/1 0/0 0/0 .text            isAreaCheck__15daTag_Lv5Soup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTag_Lv5Soup_c::isAreaCheck() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/isAreaCheck__15daTag_Lv5Soup_cFv.s"
+bool daTag_Lv5Soup_c::isAreaCheck() {
+    cXyz dist = dComIfGp_getLinkPlayer()->mCurrent.mPosition - mCurrent.mPosition;
+    f32 boundX = mScale.x * 100.0f;
+    f32 boundY = mScale.y * 100.0f;
+
+    if (sqrtf(dist.abs2XZ()) < boundX && -boundY < dist.y && dist.y < boundY) {
+        return true;
+    } else {
+        return false;
+    }
 }
-#pragma pop
 
 /* 80D5B06C-80D5B08C 00038C 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Create__FPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTag_Lv5Soup_Create(void* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/daTag_Lv5Soup_Create__FPv.s"
+static int daTag_Lv5Soup_Create(void* tag) {
+    return static_cast<daTag_Lv5Soup_c*>(tag)->create();
 }
-#pragma pop
 
 /* 80D5B08C-80D5B0AC 0003AC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Delete__FPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTag_Lv5Soup_Delete(void* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/daTag_Lv5Soup_Delete__FPv.s"
+static int daTag_Lv5Soup_Delete(void* tag) {
+    return static_cast<daTag_Lv5Soup_c*>(tag)->Delete();
 }
-#pragma pop
 
 /* 80D5B0AC-80D5B0CC 0003CC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Execute__FPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTag_Lv5Soup_Execute(void* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/daTag_Lv5Soup_Execute__FPv.s"
+static int daTag_Lv5Soup_Execute(void* tag) {
+    return static_cast<daTag_Lv5Soup_c*>(tag)->Execute();
 }
-#pragma pop
 
 /* 80D5B0CC-80D5B0EC 0003EC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Draw__FPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTag_Lv5Soup_Draw(void* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/daTag_Lv5Soup_Draw__FPv.s"
+static int daTag_Lv5Soup_Draw(void* tag) {
+    return static_cast<daTag_Lv5Soup_c*>(tag)->Draw();
 }
-#pragma pop
 
 /* 80D5B0EC-80D5B0F4 00040C 0008+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_IsDelete__FPv */
-static bool daTag_Lv5Soup_IsDelete(void* param_0) {
-    return true;
+static int daTag_Lv5Soup_IsDelete(void* tag) {
+    return 1;
 }
 
 /* 80D5B0F4-80D5B154 000414 0060+00 1/0 0/0 0/0 .text            __dt__15daTag_Lv5Soup_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm daTag_Lv5Soup_c::~daTag_Lv5Soup_c() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup/__dt__15daTag_Lv5Soup_cFv.s"
-}
-#pragma pop
+daTag_Lv5Soup_c::~daTag_Lv5Soup_c() {}
diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp
index 1cbe7b23be..21a626ebf7 100644
--- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp
+++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp
@@ -38,7 +38,6 @@ extern "C" void __dl__FPv();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_29();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" u8 m_midnaActor__9daPy_py_c[4];
diff --git a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp
index 39fc89f6d5..b1ebc46eaf 100644
--- a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp
+++ b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp
@@ -8,130 +8,81 @@
 #include "dolphin/types.h"
 
 //
-// Types:
-//
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daTagSetBall_c {
-    /* 80D601F8 */ void initBaseMtx();
-    /* 80D60218 */ void setBaseMtx();
-    /* 80D6021C */ void Create();
-    /* 80D6024C */ void create();
-    /* 80D602B4 */ bool execute();
-    /* 80D602BC */ bool _delete();
-};
-
-//
 // Forward References:
 //
 
-extern "C" void initBaseMtx__14daTagSetBall_cFv();
-extern "C" void setBaseMtx__14daTagSetBall_cFv();
-extern "C" void Create__14daTagSetBall_cFv();
-extern "C" void create__14daTagSetBall_cFv();
-extern "C" bool execute__14daTagSetBall_cFv();
-extern "C" bool _delete__14daTagSetBall_cFv();
-extern "C" static void daTagSetBall_Execute__FP14daTagSetBall_c();
-extern "C" static void daTagSetBall_Delete__FP14daTagSetBall_c();
-extern "C" static void daTagSetBall_Create__FP14daTagSetBall_c();
 extern "C" extern void* g_profile_Tag_SetBall[12];
 
 //
 // External References:
 //
 
-extern "C" void __ct__10fopAc_ac_cFv();
 extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
 
 //
 // Declarations:
 //
 
 /* 80D601F8-80D60218 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daTagSetBall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSetBall_c::initBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/initBaseMtx__14daTagSetBall_cFv.s"
+void daTagSetBall_c::initBaseMtx() {
+    setBaseMtx();
 }
-#pragma pop
 
 /* 80D60218-80D6021C 000098 0004+00 1/1 0/0 0/0 .text            setBaseMtx__14daTagSetBall_cFv */
-void daTagSetBall_c::setBaseMtx() {
-    /* empty function */
-}
+void daTagSetBall_c::setBaseMtx() {}
 
 /* 80D6021C-80D6024C 00009C 0030+00 1/1 0/0 0/0 .text            Create__14daTagSetBall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSetBall_c::Create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/Create__14daTagSetBall_cFv.s"
+int daTagSetBall_c::Create() {
+    mType = getType_private();
+    initBaseMtx();
+    return 1;
 }
-#pragma pop
 
 /* 80D6024C-80D602B4 0000CC 0068+00 1/1 0/0 0/0 .text            create__14daTagSetBall_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSetBall_c::create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/func_80D6024C.s"
+int daTagSetBall_c::create() {
+    if (!fopAcM_CheckCondition(this, 8)) {
+        new (this) daTagSetBall_c();
+        fopAcM_OnCondition(this, 8);
+    }
+
+    if (!Create()) {
+        return 5;
+    } else {
+        return 4;
+    }
 }
-#pragma pop
 
 /* 80D602B4-80D602BC 000134 0008+00 1/1 0/0 0/0 .text            execute__14daTagSetBall_cFv */
-bool daTagSetBall_c::execute() {
-    return true;
+int daTagSetBall_c::execute() {
+    return 1;
 }
 
 /* 80D602BC-80D602C4 00013C 0008+00 1/1 0/0 0/0 .text            _delete__14daTagSetBall_cFv */
-bool daTagSetBall_c::_delete() {
-    return true;
+int daTagSetBall_c::_delete() {
+    return 1;
 }
 
 /* 80D602C4-80D602E4 000144 0020+00 1/0 0/0 0/0 .text daTagSetBall_Execute__FP14daTagSetBall_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSetBall_Execute(daTagSetBall_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/daTagSetBall_Execute__FP14daTagSetBall_c.s"
+static int daTagSetBall_Execute(daTagSetBall_c* tag) {
+    return tag->execute();
 }
-#pragma pop
 
 /* 80D602E4-80D60304 000164 0020+00 1/0 0/0 0/0 .text daTagSetBall_Delete__FP14daTagSetBall_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSetBall_Delete(daTagSetBall_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/daTagSetBall_Delete__FP14daTagSetBall_c.s"
+static int daTagSetBall_Delete(daTagSetBall_c* tag) {
+    return tag->_delete();
 }
-#pragma pop
 
 /* 80D60304-80D60324 000184 0020+00 1/0 0/0 0/0 .text daTagSetBall_Create__FP14daTagSetBall_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSetBall_Create(daTagSetBall_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall/daTagSetBall_Create__FP14daTagSetBall_c.s"
+static int daTagSetBall_Create(daTagSetBall_c* tag) {
+    return tag->create();
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 80D6032C-80D6034C -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSetBall_Method */
 SECTION_DATA static void* l_daTagSetBall_Method[8] = {
-    (void*)daTagSetBall_Create__FP14daTagSetBall_c,
-    (void*)daTagSetBall_Delete__FP14daTagSetBall_c,
-    (void*)daTagSetBall_Execute__FP14daTagSetBall_c,
+    (void*)daTagSetBall_Create,
+    (void*)daTagSetBall_Delete,
+    (void*)daTagSetBall_Execute,
     (void*)NULL,
     (void*)NULL,
     (void*)NULL,
diff --git a/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp b/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp
index b8a0e7dc7b..90b6bfe367 100644
--- a/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp
+++ b/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp
@@ -6,6 +6,7 @@
 #include "rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_pc/f_pc_leaf.h"
 
 //
 // Forward References:
@@ -54,7 +55,6 @@ extern "C" extern void* g_profile_WARNING2_SCENE[10];
 extern "C" extern void* g_profile_TIMER[10];
 extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */];
 extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */];
-extern "C" extern u8 g_fpcPf_ProfileList_p[4 + 4 /* padding */];
 extern "C" extern void* g_profile_ANDSW[12];
 extern "C" extern void* g_profile_BG[13];
 extern "C" extern void* g_profile_BG_OBJ[12];