d_a_tag_attention & d_a_tag_spring OK (#297)

2026-07-11 06:18:46 -07:00 · 2023-02-19 21:39:09 -07:00
parent d58a6f5b35
commit 8471d1d6cc
24 changed files with 324 additions and 975 deletions
@@ -1,74 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_attention
-//
+/**
+ * d_a_tag_attention.cpp
+ *
+ */

 #include "rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.h"
-#include "dol2asm.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct daAttp_c {
-    /* 804D5318 */ void Create();
-    /* 804D5354 */ void create();
-    /* 804D53AC */ void execute();
-    /* 804D568C */ bool draw();
-    /* 804D5694 */ bool _delete();
-};
-
-struct dSv_info_c {
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-struct Vec {};
-
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
-};
-
-//
-// Forward References:
-//
-
-extern "C" void Create__8daAttp_cFv();
-extern "C" void create__8daAttp_cFv();
-extern "C" void execute__8daAttp_cFv();
-extern "C" bool draw__8daAttp_cFv();
-extern "C" bool _delete__8daAttp_cFv();
-extern "C" static void daAttp_Draw__FP8daAttp_c();
-extern "C" static void daAttp_Execute__FP8daAttp_c();
-extern "C" static void daAttp_Delete__FP8daAttp_c();
-extern "C" static void daAttp_Create__FP10fopAc_ac_c();
-extern "C" extern void* g_profile_Tag_Attp[12];
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_YrotS__FPA4_fs();
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void isSwitch__10dSv_info_cCFii();
-extern "C" void __mi__4cXyzCFRC3Vec();
-extern "C" void PSMTXMultVec();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-
-//
-// Declarations:
-//

 /* ############################################################################################## */
 /* 804D5724-804D5728 000000 0002+02 1/1 0/0 0/0 .rodata          l_dist_tbl$3641 */
@@ -82,122 +17,175 @@ SECTION_RODATA static u8 const l_dist_tbl[2 + 2 /* padding */] = {
 COMPILER_STRIP_GATE(0x804D5724, &l_dist_tbl);

 /* 804D5318-804D5354 000078 003C+00 1/1 0/0 0/0 .text            Create__8daAttp_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daAttp_c::Create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/Create__8daAttp_cFv.s"
+int daAttp_c::Create() {
+    mAttentionInfo.field_0x0[0] = l_dist_tbl[daAttp_prm::getArg4(this)];
+
+    execute();
+    return 1;
 }
-#pragma pop

 /* 804D5354-804D53AC 0000B4 0058+00 1/1 0/0 0/0 .text            create__8daAttp_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daAttp_c::create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/func_804D5354.s"
+int daAttp_c::create() {
+    if (!fopAcM_CheckCondition(this, 8)) {
+        new (this) daAttp_c();
+        fopAcM_OnCondition(this, 8);
+    }
+    Create();
+    return cPhs_COMPLEATE_e;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 804D5728-804D572C 000004 0004+00 1/1 0/0 0/0 .rodata          @3772 */
-SECTION_RODATA static u8 const lit_3772[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x804D5728, &lit_3772);
-
-/* 804D572C-804D574C -00001 0020+00 1/1 0/0 0/0 .data            @3773 */
-SECTION_DATA static void* lit_3773[8] = {
-    (void*)(((char*)execute__8daAttp_cFv) + 0xA4),  (void*)(((char*)execute__8daAttp_cFv) + 0xC0),
-    (void*)(((char*)execute__8daAttp_cFv) + 0xDC),  (void*)(((char*)execute__8daAttp_cFv) + 0xF8),
-    (void*)(((char*)execute__8daAttp_cFv) + 0x120), (void*)(((char*)execute__8daAttp_cFv) + 0x144),
-    (void*)(((char*)execute__8daAttp_cFv) + 0x144), (void*)(((char*)execute__8daAttp_cFv) + 0x144),
-};

 /* 804D53AC-804D568C 00010C 02E0+00 3/2 0/0 0/0 .text            execute__8daAttp_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daAttp_c::execute() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/execute__8daAttp_cFv.s"
+int daAttp_c::execute() {
+    bool bVar1 = true;
+    fopAc_ac_c& link = *daPy_getPlayerActorClass();
+
+    cXyz pos = link.current.pos - current.pos;
+    mDoMtx_stack_c::YrotS(-shape_angle.y);
+    mDoMtx_stack_c::multVec(&pos, &pos);
+
+    switch (daAttp_prm::getArg2(this)) {
+    case 0:
+        if (pos.z < 0) {
+            bVar1 = false;
+        }
+        break;
+    case 1:
+        if (pos.y > 0) {
+            bVar1 = false;
+        }
+        break;
+    case 2:
+        if (pos.y < 0) {
+            bVar1 = false;
+        }
+        break;
+    case 3:
+        if (pos.y > 0 || pos.z < 0) {
+            bVar1 = false;
+        }
+        break;
+    case 4:
+        if (pos.y < 0 || pos.z < 0) {
+            bVar1 = false;
+        }
+        break;
+    default:
+        break;
+    case 7:
+        break;
+    }
+
+    if (i_fopAcM_isSwitch(this, daAttp_prm::getSw1(this))) {
+        switch (daAttp_prm::getArg1(this)) {
+        case 0:
+            break;
+        case 1:
+            if (daPy_py_c::i_checkNowWolf()) {
+                bVar1 = false;
+            }
+            break;
+        case 2:
+            if (!daPy_py_c::i_checkNowWolf()) {
+                bVar1 = false;
+            }
+            break;
+        case 3:
+            bVar1 = false;
+            break;
+        }
+    } else {
+        switch (daAttp_prm::getArg0(this)) {
+        case 0:
+            break;
+        case 1:
+            if (daPy_py_c::i_checkNowWolf()) {
+                bVar1 = false;
+            }
+            break;
+        case 2:
+            if (!daPy_py_c::i_checkNowWolf()) {
+                bVar1 = false;
+            }
+            break;
+        case 3:
+            bVar1 = false;
+        }
+
+        if (daAttp_prm::getSw2(this) != 0xff) {
+            if (i_fopAcM_isSwitch(this, daAttp_prm::getSw2(this))) {
+                if (daAttp_prm::getArg3(this) == 0) {
+                    bVar1 = false;
+                }
+            } else if (daAttp_prm::getArg3(this) == 1) {
+                bVar1 = false;
+            }
+        }
+    }
+
+    if (bVar1) {
+        mAttentionInfo.mFlags = mAttentionInfo.mFlags | 1;
+    } else {
+        mAttentionInfo.mFlags = mAttentionInfo.mFlags & 0xfffffffe;
+    }
+
+    return 1;
 }
-#pragma pop

 /* 804D568C-804D5694 0003EC 0008+00 1/1 0/0 0/0 .text            draw__8daAttp_cFv */
-bool daAttp_c::draw() {
-    return true;
+int daAttp_c::draw() {
+    return 1;
 }

 /* 804D5694-804D569C 0003F4 0008+00 1/1 0/0 0/0 .text            _delete__8daAttp_cFv */
-bool daAttp_c::_delete() {
-    return true;
+int daAttp_c::_delete() {
+    return 1;
 }

 /* 804D569C-804D56BC 0003FC 0020+00 1/0 0/0 0/0 .text            daAttp_Draw__FP8daAttp_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daAttp_Draw(daAttp_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/daAttp_Draw__FP8daAttp_c.s"
+static int daAttp_Draw(daAttp_c* i_this) {
+    return i_this->draw();
 }
-#pragma pop

 /* 804D56BC-804D56DC 00041C 0020+00 1/0 0/0 0/0 .text            daAttp_Execute__FP8daAttp_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daAttp_Execute(daAttp_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/daAttp_Execute__FP8daAttp_c.s"
+
+static int daAttp_Execute(daAttp_c* i_this) {
+    return i_this->execute();
 }
-#pragma pop

 /* 804D56DC-804D56FC 00043C 0020+00 1/0 0/0 0/0 .text            daAttp_Delete__FP8daAttp_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daAttp_Delete(daAttp_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/daAttp_Delete__FP8daAttp_c.s"
+static int daAttp_Delete(daAttp_c* i_this) {
+    return i_this->_delete();
 }
-#pragma pop

 /* 804D56FC-804D571C 00045C 0020+00 1/0 0/0 0/0 .text            daAttp_Create__FP10fopAc_ac_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daAttp_Create(fopAc_ac_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention/daAttp_Create__FP10fopAc_ac_c.s"
+static int daAttp_Create(fopAc_ac_c* i_this) {
+    return static_cast<daAttp_c*>(i_this)->create();
 }
-#pragma pop

 /* ############################################################################################## */
 /* 804D574C-804D576C -00001 0020+00 1/0 0/0 0/0 .data            l_daAttp_Method */
-SECTION_DATA static void* l_daAttp_Method[8] = {
-    (void*)daAttp_Create__FP10fopAc_ac_c,
-    (void*)daAttp_Delete__FP8daAttp_c,
-    (void*)daAttp_Execute__FP8daAttp_c,
-    (void*)NULL,
-    (void*)daAttp_Draw__FP8daAttp_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daAttp_Method = {
+    (process_method_func)daAttp_Create,  (process_method_func)daAttp_Delete,
+    (process_method_func)daAttp_Execute, (process_method_func)NULL,
+    (process_method_func)daAttp_Draw,
 };

 /* 804D576C-804D579C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Attp */
-SECTION_DATA extern void* g_profile_Tag_Attp[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x015A0000, (void*)&g_fpcLf_Method,
-    (void*)0x00000568, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01B80000, (void*)&l_daAttp_Method,
-    (void*)0x00040100, (void*)NULL,
+extern actor_process_profile_definition g_profile_Tag_Attp = {
+    -3,                     // mLayerID
+    7,                      // mListID
+    -3,                     // mListPrio
+    PROC_Tag_Attp,          // mProcName
+    0,                      // padding
+    &g_fpcLf_Method.mBase,  // mSubMtd
+    sizeof(daAttp_c),       // mSize
+    0,                      // mSizeOther
+    0,                      // mParameter
+    &g_fopAc_Method.base,   // mSubMtd
+    0x01B8,                 // mPriority
+    0,                      // padding
+    0,                      // padding
+    &l_daAttp_Method,       // mSubMtd
+    0x00040100,             // mStatus
+    0,                      // mActorType
 };
@@ -4,19 +4,6 @@
 */

 #include "rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.h"
-#include "d/com/d_com_inf_game.h"
-#include "dol2asm.h"
-#include "rel/d/a/d_a_horse/d_a_horse.h"
-
-//
-// Forward References:
-//
-
-extern "C" extern void* g_profile_Tag_Hinit[12];
-
-//
-// Declarations:
-//

 /* 805A3758-805A3800 000078 00A8+00 1/1 0/0 0/0 .text            create__12daTagHinit_cFv */
 int daTagHinit_c::create() {
@@ -60,7 +47,8 @@ int daTagHinit_c::execute() {
         i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56c])) &&
        (field_0x56e == 0xFFFF ||
         !i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56e])) &&
-        (field_0x568 == 0xFF || i_fopAcM_isSwitch(this, field_0x568))) {
+        (field_0x568 == 0xFF || i_fopAcM_isSwitch(this, field_0x568)))
+    {
        if (field_0x569 != 0xFF) {
            i_fopAcM_onSwitch(this, field_0x569);
        }
@@ -87,23 +75,32 @@ static int daTagHinit_Draw(daTagHinit_c*) {

 /* ############################################################################################## */
 /* 805A39E8-805A3A08 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagHinit_Method */
-SECTION_DATA static void* l_daTagHinit_Method[8] = {
-    (void*)daTagHinit_Create,
-    (void*)daTagHinit_Delete,
-    (void*)daTagHinit_Execute,
-    (void*)NULL,
-    (void*)daTagHinit_Draw,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daTagHinit_Method = {
+    (process_method_func)daTagHinit_Create,  (process_method_func)daTagHinit_Delete,
+    (process_method_func)daTagHinit_Execute, (process_method_func)NULL,
+    (process_method_func)daTagHinit_Draw,
+
 };

 /* 805A3A08-805A3A38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Hinit */
-SECTION_DATA extern void* g_profile_Tag_Hinit[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0003FFFD,
-    (void*)0x00E90000, (void*)&g_fpcLf_Method,
-    (void*)0x00000570, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x01B10000, (void*)&l_daTagHinit_Method,
-    (void*)0x00060000, (void*)0x030E0000,
+extern actor_process_profile_definition g_profile_Tag_Hinit = {
+    -3,
+    3,
+    -3,
+    PROC_Tag_Hinit,
+    0,
+    &g_fpcLf_Method.mBase,
+    sizeof(daTagHinit_c),
+    0,
+    0,
+    &g_fopAc_Method.base,
+    0x01B1,
+    0,
+    0,
+    &l_daTagHinit_Method,
+    0x00060000,
+    3,
+    0x0E,
+    0,
+    0,
 };
@@ -1,249 +1,129 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_spring
-//
+/**
+ * d_a_tag_spring.cpp
+ *
+ */

 #include "rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-
-//
-// Types:
-//
-
-struct mDoMtx_stack_c {
-    static u8 now[48];
-};
-
-struct fopAc_ac_c {
-    /* 80018B64 */ fopAc_ac_c();
-};
-
-struct cXyz {};
-
-struct fopAcM_wt_c {
-    /* 8001DD84 */ void waterCheck(cXyz const*);
-
-    static f32 mWaterY[1 + 1 /* padding */];
-};
-
-struct daTagSpring_c {
-    /* 805A6A58 */ void initBaseMtx();
-    /* 805A6A78 */ void setBaseMtx();
-    /* 805A6AD0 */ void Create();
-    /* 805A6AF4 */ void create();
-    /* 805A6B5C */ void execute();
-    /* 805A6C84 */ void checkArea();
-    /* 805A6DFC */ bool _delete();
-};
-
-struct dSv_info_c {
-    /* 80035360 */ void isSwitch(int, int) const;
-};
-
-//
-// Forward References:
-//
-
-extern "C" void initBaseMtx__13daTagSpring_cFv();
-extern "C" void setBaseMtx__13daTagSpring_cFv();
-extern "C" void Create__13daTagSpring_cFv();
-extern "C" void create__13daTagSpring_cFv();
-extern "C" void execute__13daTagSpring_cFv();
-extern "C" void checkArea__13daTagSpring_cFv();
-extern "C" bool _delete__13daTagSpring_cFv();
-extern "C" static void daTagSpring_Execute__FP13daTagSpring_c();
-extern "C" static void daTagSpring_Delete__FP13daTagSpring_c();
-extern "C" static void daTagSpring_Create__FP13daTagSpring_c();
-extern "C" extern void* g_profile_Tag_Spring[12];
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
-extern "C" void __ct__10fopAc_ac_cFv();
-extern "C" void waterCheck__11fopAcM_wt_cFPC4cXyz();
-extern "C" void isSwitch__10dSv_info_cCFii();
-extern "C" void PSMTXTrans();
-extern "C" void PSVECSquareDistance();
-extern "C" extern void* g_fopAc_Method[8];
-extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" u8 now__14mDoMtx_stack_c[48];
-extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u32 __float_nan;
-extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */];
-
-//
-// Declarations:
-//

 /* 805A6A58-805A6A78 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::initBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/initBaseMtx__13daTagSpring_cFv.s"
+void daTagSpring_c::initBaseMtx() {
+    setBaseMtx();
 }
-#pragma pop

 /* 805A6A78-805A6AD0 000098 0058+00 1/1 0/0 0/0 .text            setBaseMtx__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::setBaseMtx() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/setBaseMtx__13daTagSpring_cFv.s"
+void daTagSpring_c::setBaseMtx() {
+    PSMTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
+    mDoMtx_ZXYrotM(mDoMtx_stack_c::now, shape_angle.x, shape_angle.y, shape_angle.z);
 }
-#pragma pop

 /* 805A6AD0-805A6AF4 0000F0 0024+00 1/1 0/0 0/0 .text            Create__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::Create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/Create__13daTagSpring_cFv.s"
+int daTagSpring_c::Create() {
+    initBaseMtx();
+    return 1;
 }
-#pragma pop

 /* 805A6AF4-805A6B5C 000114 0068+00 1/1 0/0 0/0 .text            create__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::create() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/func_805A6AF4.s"
-}
-#pragma pop
+int daTagSpring_c::create() {
+    if (!fopAcM_CheckCondition(this, 8)) {
+        new (this) daTagSpring_c();
+        fopAcM_OnCondition(this, 8);
+    }

-/* ############################################################################################## */
-/* 805A6E6C-805A6E70 000000 0004+00 2/2 0/0 0/0 .rodata          @3728 */
-SECTION_RODATA static f32 const lit_3728 = 1.0f;
-COMPILER_STRIP_GATE(0x805A6E6C, &lit_3728);
+    if (Create() == NULL) {
+        return cPhs_ERROR_e;
+    } else {
+        fopAcM_GetParam(this);
+        return cPhs_COMPLEATE_e;
+    }
+}

 /* 805A6B5C-805A6C84 00017C 0128+00 1/1 0/0 0/0 .text            execute__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::execute() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/execute__13daTagSpring_cFv.s"
+int daTagSpring_c::execute() {
+    if (getSwbit() != 0xff) {
+        if (!i_fopAcM_isSwitch(this, getSwbit())) {
+            return 1;
+        }
+    }
+    if (i_dComIfGp_event_runCheck()) {
+        return 1;
+
+    } else {
+        fopAc_ac_c& link = *daPy_getPlayerActorClass();
+        if ((checkArea()) && ((fopAcM_wt_c::waterCheck(&link.current.pos) & 0xff) != NULL) &&
+            (!(i_dComIfGp_checkPlayerStatus0(0, daPy_py_c::FLG0_UNK_100000)) &&
+                 (fopAcM_wt_c::mWaterY[0] > link.current.pos.y) ||
+             (i_dComIfGp_checkPlayerStatus0(0, daPy_py_c::FLG0_UNK_100000)) != NULL))
+        {
+            if (mTimer != NULL) {
+                mTimer--;
+
+            } else {
+                mTimer = 0x1e;
+                g_dComIfG_gameInfo.play.mItemLifeCount++;
+                g_dComIfG_gameInfo.play.mItemLifeCountType = 1;
+            }
+        } else {
+            mTimer = 0x1e;
+        }
+    }
+    return 1;
 }
-#pragma pop
-
-/* ############################################################################################## */
-/* 805A6E70-805A6E74 000004 0004+00 0/1 0/0 0/0 .rodata          @3773 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3773[4] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-COMPILER_STRIP_GATE(0x805A6E70, &lit_3773);
-#pragma pop
-
-/* 805A6E74-805A6E7C 000008 0008+00 0/1 0/0 0/0 .rodata          @3774 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3774[8] = {
-    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x805A6E74, &lit_3774);
-#pragma pop
-
-/* 805A6E7C-805A6E84 000010 0008+00 0/1 0/0 0/0 .rodata          @3775 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3775[8] = {
-    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x805A6E7C, &lit_3775);
-#pragma pop
-
-/* 805A6E84-805A6E8C 000018 0008+00 0/1 0/0 0/0 .rodata          @3776 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3776[8] = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x805A6E84, &lit_3776);
-#pragma pop
-
-/* 805A6E8C-805A6E90 000020 0004+00 0/1 0/0 0/0 .rodata          @3777 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3777 = 1000.0f;
-COMPILER_STRIP_GATE(0x805A6E8C, &lit_3777);
-#pragma pop

 /* 805A6C84-805A6DFC 0002A4 0178+00 1/1 0/0 0/0 .text            checkArea__13daTagSpring_cFv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void daTagSpring_c::checkArea() {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/checkArea__13daTagSpring_cFv.s"
+u8 daTagSpring_c::checkArea() {
+    fopAc_ac_c& player = *daPy_getPlayerActorClass();
+    return player.current.pos.absXZ(current.pos) < (mScale.x * 1000);
 }
-#pragma pop

 /* 805A6DFC-805A6E04 00041C 0008+00 1/1 0/0 0/0 .text            _delete__13daTagSpring_cFv */
-bool daTagSpring_c::_delete() {
-    return true;
+int daTagSpring_c::_delete() {
+    return 1;
 }

 /* 805A6E04-805A6E24 000424 0020+00 1/0 0/0 0/0 .text daTagSpring_Execute__FP13daTagSpring_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSpring_Execute(daTagSpring_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/daTagSpring_Execute__FP13daTagSpring_c.s"
+static int daTagSpring_Execute(daTagSpring_c* i_this) {
+    return i_this->execute();
 }
-#pragma pop

 /* 805A6E24-805A6E44 000444 0020+00 1/0 0/0 0/0 .text daTagSpring_Delete__FP13daTagSpring_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSpring_Delete(daTagSpring_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/daTagSpring_Delete__FP13daTagSpring_c.s"
+static int daTagSpring_Delete(daTagSpring_c* i_this) {
+    return i_this->_delete();
 }
-#pragma pop

 /* 805A6E44-805A6E64 000464 0020+00 1/0 0/0 0/0 .text daTagSpring_Create__FP13daTagSpring_c */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void daTagSpring_Create(daTagSpring_c* param_0) {
-    nofralloc
-#include "asm/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring/daTagSpring_Create__FP13daTagSpring_c.s"
+static int daTagSpring_Create(daTagSpring_c* i_this) {
+    return i_this->create();
 }
-#pragma pop

 /* ############################################################################################## */
 /* 805A6E90-805A6EB0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSpring_Method */
-SECTION_DATA static void* l_daTagSpring_Method[8] = {
-    (void*)daTagSpring_Create__FP13daTagSpring_c,
-    (void*)daTagSpring_Delete__FP13daTagSpring_c,
-    (void*)daTagSpring_Execute__FP13daTagSpring_c,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class l_daTagSpring_Method = {
+    (process_method_func)daTagSpring_Create,
+    (process_method_func)daTagSpring_Delete,
+    (process_method_func)daTagSpring_Execute,
+    (process_method_func)NULL,
 };

 /* 805A6EB0-805A6EE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Spring */
-SECTION_DATA extern void* g_profile_Tag_Spring[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01AD0000, (void*)&g_fpcLf_Method,
-    (void*)0x0000056C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x024B0000, (void*)&l_daTagSpring_Method,
-    (void*)0x00040000, (void*)0x000E0000,
+extern actor_process_profile_definition g_profile_Tag_Spring = {
+    -3,                     // mLayerID
+    7,                      // mListID
+    -3,                     // mListPrio
+    PROC_Tag_Spring,        // mProcName
+    0,                      // padding
+    &g_fpcLf_Method.mBase,  // mSubMtd
+    sizeof(daTagSpring_c),  // mSize
+    0,                      // mSizeOther
+    0,                      // mParameters
+    &g_fopAc_Method.base,   // mSubMtd
+    0x024B,                 // mPriority
+    0,                      // padding
+    0,                      // padding
+    &l_daTagSpring_Method,  // mSubMtd
+    0x00040000,             // mStatus
+    0,                      // mActorType
+    0x0E,                   // mCullType
+    0,                      // padding
+    0,                      // padding
 };