d_a_e_dt and d_a_e_fk OK

config/GZ2E01/rels/d_a_e_dt/symbols.txt

@@ -10,7 +10,7 @@ ctrlJointTuba__8daE_DT_cFP8J3DJointP8J3DModel = .text:0x000003CC; // type:functi
 JointCallBackTuba__8daE_DT_cFP8J3DJointi = .text:0x00000510; // type:function size:0x4C scope:global
 draw__8daE_DT_cFv = .text:0x0000055C; // type:function size:0x7F0 scope:global
 __dt__4cXyzFv = .text:0x00000D4C; // type:function size:0x3C scope:global
-daE_DT_Draw__FP8daE_DT_c = .text:0x00000D88; // type:function size:0x20 scope:global
+daE_DT_Draw__FP8daE_DT_c = .text:0x00000D88; // type:function size:0x20 scope:local
 demo_skip__8daE_DT_cFi = .text:0x00000DA8; // type:function size:0x50 scope:global
 DemoSkipCallBack__8daE_DT_cFPvi = .text:0x00000DF8; // type:function size:0x34 scope:global
 setBck__8daE_DT_cFiUcff = .text:0x00000E2C; // type:function size:0xA4 scope:global
@@ -37,13 +37,13 @@ setDeadShibukiEffect__8daE_DT_cFv = .text:0x00002104; // type:function size:0xB4
 setDeadYodareEffect__8daE_DT_cFv = .text:0x000021B8; // type:function size:0x108 scope:global
 setBoxTubaEffect__8daE_DT_cFv = .text:0x000022C0; // type:function size:0xDC scope:global
 setBoxTubaLandEffect__8daE_DT_cFv = .text:0x0000239C; // type:function size:0xDC scope:global
-s_otama_todo__FPvPv = .text:0x00002478; // type:function size:0x98 scope:global
+s_otama_todo__FPvPv = .text:0x00002478; // type:function size:0x98 scope:local
 getNumberOfOtama__8daE_DT_cFv = .text:0x00002510; // type:function size:0x64 scope:global
-s_fall_otama__FPvPv = .text:0x00002574; // type:function size:0x90 scope:global
+s_fall_otama__FPvPv = .text:0x00002574; // type:function size:0x90 scope:local
 setStayOtamaFall__8daE_DT_cFv = .text:0x00002604; // type:function size:0x88 scope:global
 setStayOtamaDelete__8daE_DT_cFv = .text:0x0000268C; // type:function size:0x70 scope:global
-s_demo_otama__FPvPv = .text:0x000026FC; // type:function size:0x70 scope:global
-s_bomb_search__FPvPv = .text:0x0000276C; // type:function size:0x188 scope:global
+s_demo_otama__FPvPv = .text:0x000026FC; // type:function size:0x70 scope:local
+s_bomb_search__FPvPv = .text:0x0000276C; // type:function size:0x188 scope:local
 checkBombEat__8daE_DT_cFv = .text:0x000028F4; // type:function size:0xA0 scope:global
 isShutterOpen__8daE_DT_cFv = .text:0x00002994; // type:function size:0x4C scope:global
 executeWait__8daE_DT_cFv = .text:0x000029E0; // type:function size:0x168 scope:global
@@ -64,12 +64,12 @@ action__8daE_DT_cFv = .text:0x00006F04; // type:function size:0x2CC scope:global
 mtx_set__8daE_DT_cFv = .text:0x000071D0; // type:function size:0x134 scope:global
 cc_set__8daE_DT_cFv = .text:0x00007304; // type:function size:0x4B4 scope:global
 execute__8daE_DT_cFv = .text:0x000077B8; // type:function size:0x158 scope:global
-daE_DT_Execute__FP8daE_DT_c = .text:0x00007910; // type:function size:0x20 scope:global
-daE_DT_IsDelete__FP8daE_DT_c = .text:0x00007930; // type:function size:0x8 scope:global
+daE_DT_Execute__FP8daE_DT_c = .text:0x00007910; // type:function size:0x20 scope:local
+daE_DT_IsDelete__FP8daE_DT_c = .text:0x00007930; // type:function size:0x8 scope:local
 _delete__8daE_DT_cFv = .text:0x00007938; // type:function size:0x9C scope:global
-daE_DT_Delete__FP8daE_DT_c = .text:0x000079D4; // type:function size:0x20 scope:global
+daE_DT_Delete__FP8daE_DT_c = .text:0x000079D4; // type:function size:0x20 scope:local
 CreateHeap__8daE_DT_cFv = .text:0x000079F4; // type:function size:0x22C scope:global
-useHeapInit__FP10fopAc_ac_c = .text:0x00007C20; // type:function size:0x20 scope:global
+useHeapInit__FP10fopAc_ac_c = .text:0x00007C20; // type:function size:0x20 scope:local
 create__8daE_DT_cFv = .text:0x00007C40; // type:function size:0x4CC scope:global
 __dt__8dCcD_SphFv = .text:0x0000810C; // type:function size:0xCC scope:global
 __ct__8dCcD_SphFv = .text:0x000081D8; // type:function size:0x84 scope:global
@@ -78,7 +78,7 @@ __dt__8cM3dGAabFv = .text:0x000082A4; // type:function size:0x48 scope:global
 __dt__12dBgS_ObjAcchFv = .text:0x000082EC; // type:function size:0x70 scope:global
 __ct__5csXyzFv = .text:0x0000835C; // type:function size:0x4 scope:global
 __dt__5csXyzFv = .text:0x00008360; // type:function size:0x3C scope:global
-daE_DT_Create__FP8daE_DT_c = .text:0x0000839C; // type:function size:0x20 scope:global
+daE_DT_Create__FP8daE_DT_c = .text:0x0000839C; // type:function size:0x20 scope:local
 __dt__12daE_DT_HIO_cFv = .text:0x000083BC; // type:function size:0x48 scope:global
 __sinit_d_a_e_dt_cpp = .text:0x00008404; // type:function size:0x58 scope:local
 @36@__dt__12dBgS_ObjAcchFv = .text:0x0000845C; // type:function size:0x8 scope:local
@@ -230,7 +230,7 @@ w_eff_id$4815 = .data:0x000001B4; // type:object size:0x4 scope:local
 @5965 = .data:0x000001F8; // type:object size:0x1C scope:local
 @6452 = .data:0x00000214; // type:object size:0x84 scope:local
 @6804 = .data:0x00000298; // type:object size:0x2C scope:local
-l_daE_DT_Method = .data:0x000002C4; // type:object size:0x20 scope:global
+l_daE_DT_Method = .data:0x000002C4; // type:object size:0x20 scope:local
 g_profile_E_DT = .data:0x000002E4; // type:object size:0x30 scope:global
 __vt__8cM3dGAab = .data:0x00000314; // type:object size:0xC scope:global
 __vt__8cM3dGSph = .data:0x00000320; // type:object size:0xC scope:global
@@ -255,9 +255,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
-lbl_187_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
+lbl_187_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
 @3787 = .bss:0x00000048; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte
+l_HIO = .bss:0x00000054; // type:object size:0x30 scope:local data:byte
 mDt_OtamaNum__6E_DT_n = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte
 mDt_OtamaNo__6E_DT_n = .bss:0x00000088; // type:object size:0x50 scope:global
 m_fall_no__6E_DT_n = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte

config/GZ2E01/rels/d_a_e_fk/symbols.txt

@@ -5,13 +5,13 @@ __register_global_object = .text:0x00000078; // type:function size:0x1C scope:gl
 __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
 __ct__12daE_FK_HIO_cFv = .text:0x000000EC; // type:function size:0x40 scope:global
 CreateHeap__8daE_FK_cFv = .text:0x0000012C; // type:function size:0x148 scope:global
-useHeapInit__FP10fopAc_ac_c = .text:0x00000274; // type:function size:0x20 scope:global
+useHeapInit__FP10fopAc_ac_c = .text:0x00000274; // type:function size:0x20 scope:local
 initBodySph__8daE_FK_cFv = .text:0x00000294; // type:function size:0x88 scope:global
 initSwordSph__8daE_FK_cFv = .text:0x0000031C; // type:function size:0xB4 scope:global
 SetBodySph__8daE_FK_cFv = .text:0x000003D0; // type:function size:0x134 scope:global
 SetSwordSph__8daE_FK_cFv = .text:0x00000504; // type:function size:0x120 scope:global
 ctrlJoint__8daE_FK_cFP8J3DJointP8J3DModel = .text:0x00000624; // type:function size:0x118 scope:global
-JointCallBack__FP8J3DJointi = .text:0x0000073C; // type:function size:0x4C scope:global
+JointCallBack__FP8J3DJointi = .text:0x0000073C; // type:function size:0x4C scope:local
 SetAnm__8daE_FK_cFiiff = .text:0x00000788; // type:function size:0xB0 scope:global
 Yazirushi__8daE_FK_cFv = .text:0x00000838; // type:function size:0x54 scope:global
 SpeedSet__8daE_FK_cFv = .text:0x0000088C; // type:function size:0x88 scope:global
@@ -38,18 +38,18 @@ Draw__8daE_FK_cFv = .text:0x00001A4C; // type:function size:0xC8 scope:global
 Delete__8daE_FK_cFv = .text:0x00001B14; // type:function size:0x68 scope:global
 setBaseMtx__8daE_FK_cFv = .text:0x00001B7C; // type:function size:0x94 scope:global
 setEfMtx__8daE_FK_cFv = .text:0x00001C10; // type:function size:0x5C scope:global
-daE_FK_Draw__FP8daE_FK_c = .text:0x00001C6C; // type:function size:0x20 scope:global
-daE_FK_Execute__FP8daE_FK_c = .text:0x00001C8C; // type:function size:0x20 scope:global
-daE_FK_IsDelete__FP8daE_FK_c = .text:0x00001CAC; // type:function size:0x8 scope:global
-daE_FK_Delete__FP8daE_FK_c = .text:0x00001CB4; // type:function size:0x20 scope:global
+daE_FK_Draw__FP8daE_FK_c = .text:0x00001C6C; // type:function size:0x20 scope:local
+daE_FK_Execute__FP8daE_FK_c = .text:0x00001C8C; // type:function size:0x20 scope:local
+daE_FK_IsDelete__FP8daE_FK_c = .text:0x00001CAC; // type:function size:0x8 scope:local
+daE_FK_Delete__FP8daE_FK_c = .text:0x00001CB4; // type:function size:0x20 scope:local
 CreateChk__8daE_FK_cFv = .text:0x00001CD4; // type:function size:0x90 scope:global
 Create__8daE_FK_cFv = .text:0x00001D64; // type:function size:0x320 scope:global
 __dt__12dBgS_ObjAcchFv = .text:0x00002084; // type:function size:0x70 scope:global
 __dt__8dCcD_SphFv = .text:0x000020F4; // type:function size:0xCC scope:global
 __ct__8dCcD_SphFv = .text:0x000021C0; // type:function size:0x84 scope:global
 __dt__8cM3dGSphFv = .text:0x00002244; // type:function size:0x48 scope:global
 __dt__8cM3dGAabFv = .text:0x0000228C; // type:function size:0x48 scope:global
-daE_FK_Create__FP10fopAc_ac_c = .text:0x000022D4; // type:function size:0x20 scope:global
+daE_FK_Create__FP10fopAc_ac_c = .text:0x000022D4; // type:function size:0x20 scope:local
 __dt__12daE_FK_HIO_cFv = .text:0x000022F4; // type:function size:0x48 scope:global
 __sinit_d_a_e_fk_cpp = .text:0x0000233C; // type:function size:0x94 scope:local
 @36@__dt__12dBgS_ObjAcchFv = .text:0x000023D0; // type:function size:0x8 scope:local
@@ -108,7 +108,7 @@ ccSphSrc$3898 = .rodata:0x00000074; // type:object size:0x40 scope:local
 @4930 = .rodata:0x00000144; // type:object size:0x4 scope:local
 @4931 = .rodata:0x00000148; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x0000014C; // type:object size:0xF scope:local data:string_table
-l_daE_FK_Method = .data:0x00000000; // type:object size:0x20 scope:global
+l_daE_FK_Method = .data:0x00000000; // type:object size:0x20 scope:local
 g_profile_E_FK = .data:0x00000020; // type:object size:0x30 scope:global
 __vt__8cM3dGAab = .data:0x00000050; // type:object size:0xC scope:global
 __vt__8cM3dGSph = .data:0x0000005C; // type:object size:0xC scope:global
@@ -132,18 +132,18 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
-lbl_189_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
+lbl_189_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
 @3843 = .bss:0x00000048; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte
+l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte
 s_dis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global
 s_LinkPos__22@unnamed@d_a_e_fk_cpp@ = .bss:0x0000006C; // type:object size:0x4 scope:global
-s_TargetAngle__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000070; // type:object size:0x2 scope:global data:2byte
+s_TargetAngle__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000070; // type:object size:0x2 scope:local data:2byte
 @3850 = .bss:0x00000074; // type:object size:0xC scope:local
 s_centerpos__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000080; // type:object size:0xC scope:global
 @3851 = .bss:0x0000008C; // type:object size:0xC scope:local
 s_TargetPos__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000098; // type:object size:0xC scope:global
-s_PointAngle__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000A4; // type:object size:0x2 scope:global data:2byte
-s_TargetDis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000A8; // type:object size:0x4 scope:global align:4 data:float
+s_PointAngle__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000A4; // type:object size:0x2 scope:local data:2byte
+s_TargetDis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000A8; // type:object size:0x4 scope:local align:4 data:float
 s_HorseAngle__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000AC; // type:object size:0x2 scope:global
 s_AttackChk__22@unnamed@d_a_e_fk_cpp@ = .bss:0x000000AE; // type:object size:0x2 scope:global
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global

config/GZ2E01/rels/d_a_obj_life_container/symbols.txt

@@ -3,8 +3,8 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
 Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x00000078; // type:function size:0x2FC scope:global
 __dt__8cM3dGPlaFv = .text:0x00000374; // type:function size:0x48 scope:global
-lifeGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x000003BC; // type:function size:0x5C scope:global
-lifeGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x00000418; // type:function size:0x6C scope:global
+lifeGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x000003BC; // type:function size:0x5C scope:local
+lifeGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x00000418; // type:function size:0x6C scope:local
 initBaseMtx__11daObjLife_cFv = .text:0x00000484; // type:function size:0x20 scope:global
 setBaseMtx__11daObjLife_cFv = .text:0x000004A4; // type:function size:0x68 scope:global
 Create__11daObjLife_cFv = .text:0x0000050C; // type:function size:0x194 scope:global
@@ -35,10 +35,10 @@ execute__11daObjLife_cFv = .text:0x00001710; // type:function size:0x32C scope:g
 draw__11daObjLife_cFv = .text:0x00001A3C; // type:function size:0x54 scope:global
 setListStart__11daObjLife_cFv = .text:0x00001A90; // type:function size:0x24 scope:global
 _delete__11daObjLife_cFv = .text:0x00001AB4; // type:function size:0x60 scope:global
-daObjLife_Draw__FP11daObjLife_c = .text:0x00001B14; // type:function size:0x20 scope:global
-daObjLife_Execute__FP11daObjLife_c = .text:0x00001B34; // type:function size:0x20 scope:global
-daObjLife_Delete__FP11daObjLife_c = .text:0x00001B54; // type:function size:0x20 scope:global
-daObjLife_Create__FP10fopAc_ac_c = .text:0x00001B74; // type:function size:0x20 scope:global
+daObjLife_Draw__FP11daObjLife_c = .text:0x00001B14; // type:function size:0x20 scope:local
+daObjLife_Execute__FP11daObjLife_c = .text:0x00001B34; // type:function size:0x20 scope:local
+daObjLife_Delete__FP11daObjLife_c = .text:0x00001B54; // type:function size:0x20 scope:local
+daObjLife_Create__FP10fopAc_ac_c = .text:0x00001B74; // type:function size:0x20 scope:local
 __dt__10cCcD_GSttsFv = .text:0x00001B94; // type:function size:0x48 scope:global
 __dt__18dPa_levelEcallBackFv = .text:0x00001BDC; // type:function size:0x74 scope:global
 execute__18JPAEmitterCallBackFP14JPABaseEmitter = .text:0x00001C50; // type:function size:0x4 scope:global
@@ -51,7 +51,7 @@ cLib_calcTimer<Uc>__FPUc = .text:0x00001C60; // type:function size:0x1C scope:gl
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
 ...rodata.0 = .rodata:0x00000000; // type:label scope:local
-l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global
+l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local
 @3855 = .rodata:0x00000044; // type:object size:0x4 scope:local align:4 data:float
 @3856 = .rodata:0x00000048; // type:object size:0x8 scope:local
 @3857 = .rodata:0x00000050; // type:object size:0x8 scope:local
@@ -76,7 +76,7 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global
 @4538 = .rodata:0x000000AC; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x000000B0; // type:object size:0x28 scope:local data:string_table
 ...data.0 = .data:0x00000000; // type:label scope:local
-cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
+cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
 lbl_53_data_10 = .data:0x00000010; // type:object size:0x10
 @4479 = .data:0x00000020; // type:object size:0xC scope:local
@@ -86,7 +86,7 @@ lbl_53_data_10 = .data:0x00000010; // type:object size:0x10
 @4483 = .data:0x00000050; // type:object size:0xC scope:local
 @4484 = .data:0x0000005C; // type:object size:0xC scope:local
 l_demoFunc$4478 = .data:0x00000068; // type:object size:0x48 scope:local
-l_daObjLife_Method = .data:0x000000B0; // type:object size:0x20 scope:global
+l_daObjLife_Method = .data:0x000000B0; // type:object size:0x20 scope:local
 g_profile_Obj_LifeContainer = .data:0x000000D0; // type:object size:0x30 scope:global
 __vt__12dBgS_AcchCir = .data:0x00000100; // type:object size:0xC scope:global
 __vt__10cCcD_GStts = .data:0x0000010C; // type:object size:0xC scope:global
@@ -97,4 +97,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global
 __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global
 __vt__11daObjLife_c = .data:0x00000184; // type:object size:0x44 scope:global
 __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global
-lbl_53_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
+lbl_53_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte

configure.py

@@ -1713,9 +1713,9 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dd"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_df"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dk"),
-    ActorRel(Equivalent, "d_a_e_dt"), # weak func order
+    ActorRel(MatchingFor("GZ2E01"), "d_a_e_dt"),
     ActorRel(NonMatching, "d_a_e_fb"),
-    ActorRel(Equivalent, "d_a_e_fk"), # weak func order
+    ActorRel(MatchingFor("GZ2E01"), "d_a_e_fk"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fs"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fz"),
     ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gb"),

src/d/actor/d_a_e_fk.cpp

@@ -10,6 +10,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_horse.h"
 #include "Z2AudioLib/Z2Instances.h"
+#include "f_op/f_op_actor_enemy.h"
 
 class daE_FK_HIO_c : public JORReflexible {
 public:
@@ -25,32 +26,6 @@ class daE_FK_HIO_c : public JORReflexible {
     /* 0x12 */ s16 generation_time;
 };
 
-static f32 dummyFloat(int _) {
-    switch (_) {
-    case 0:
-        return 100.0f;
-    case 1:
-        return 0.0f;
-    case 2:
-        return 1.0f;
-    }
-}
-
-static f64 dummyDouble(int _) {
-    switch (_) {
-    case 0:
-        return 0.5;
-    case 1:
-        return 3.0;
-    case 2:
-        return 0.0;
-    }
-}
-
-static f32 dummyFloat2() {
-    return 0.01f;
-}
-
 /* 806B938C-806B93CC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daE_FK_HIO_cFv */
 daE_FK_HIO_c::daE_FK_HIO_c() {
     id = -1;