Skip to content

Commit 2a8e8eb

Browse files
authored
d_a_obj_magLiftRot matching (#2519)
* beautify_anm_data v2.0 * d_a_obj_magLiftRot matching
1 parent 45e969e commit 2a8e8eb

File tree

4 files changed

+77
-426
lines changed

4 files changed

+77
-426
lines changed

config/GZ2E01/rels/d_a_obj_magLiftRot/symbols.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ init_modeMoveWait__14daMagLiftRot_cFv = .text:0x00000FA4; // type:function size:
1919
modeMoveWait__14daMagLiftRot_cFv = .text:0x00000FB0; // type:function size:0x5C scope:global
2020
Draw__14daMagLiftRot_cFv = .text:0x0000100C; // type:function size:0x104 scope:global
2121
Delete__14daMagLiftRot_cFv = .text:0x00001110; // type:function size:0x40 scope:global
22-
daMagLiftRot_Draw__FP14daMagLiftRot_c = .text:0x00001150; // type:function size:0x2C scope:global
23-
daMagLiftRot_Execute__FP14daMagLiftRot_c = .text:0x0000117C; // type:function size:0x20 scope:global
24-
daMagLiftRot_Delete__FP14daMagLiftRot_c = .text:0x0000119C; // type:function size:0x20 scope:global
25-
daMagLiftRot_Create__FP10fopAc_ac_c = .text:0x000011BC; // type:function size:0x20 scope:global
22+
daMagLiftRot_Draw__FP14daMagLiftRot_c = .text:0x00001150; // type:function size:0x2C scope:local
23+
daMagLiftRot_Execute__FP14daMagLiftRot_c = .text:0x0000117C; // type:function size:0x20 scope:local
24+
daMagLiftRot_Delete__FP14daMagLiftRot_c = .text:0x0000119C; // type:function size:0x20 scope:local
25+
daMagLiftRot_Create__FP10fopAc_ac_c = .text:0x000011BC; // type:function size:0x20 scope:local
2626
__dt__18daMagLiftRot_HIO_cFv = .text:0x000011DC; // type:function size:0x5C scope:global
2727
__sinit_d_a_obj_magLiftRot_cpp = .text:0x00001238; // type:function size:0x3C scope:local
2828
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -41,10 +41,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global
4141
@3636 = .rodata:0x00000024; // type:object size:0x4 scope:local
4242
@3637 = .rodata:0x00000028; // type:object size:0x4 scope:local
4343
@3638 = .rodata:0x0000002C; // type:object size:0x4 scope:local
44-
l_bmdIdx = .rodata:0x00000030; // type:object size:0xC scope:global
45-
l_dzbIdx = .rodata:0x0000003C; // type:object size:0xC scope:global
46-
l_btkIdx = .rodata:0x00000048; // type:object size:0xC scope:global
47-
l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:global
44+
l_bmdIdx = .rodata:0x00000030; // type:object size:0xC scope:local
45+
l_dzbIdx = .rodata:0x0000003C; // type:object size:0xC scope:local
46+
l_btkIdx = .rodata:0x00000048; // type:object size:0xC scope:local
47+
l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:local
4848
@3816 = .rodata:0x00000060; // type:object size:0x4 scope:local
4949
@3818 = .rodata:0x00000068; // type:object size:0x8 scope:local
5050
@3882 = .rodata:0x00000070; // type:object size:0x4 scope:local align:4 data:float
@@ -54,23 +54,23 @@ l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:global
5454
@3951 = .rodata:0x00000088; // type:object size:0x4 scope:local
5555
@stringBase0 = .rodata:0x0000008C; // type:object size:0x1B scope:local data:string_table
5656
...data.0 = .data:0x00000000; // type:label scope:local
57-
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
57+
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
5858
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
5959
lbl_566_data_10 = .data:0x00000010; // type:object size:0x10
60-
l_arcName = .data:0x00000020; // type:object size:0xC scope:global
60+
l_arcName = .data:0x00000020; // type:object size:0xC scope:local
6161
@3856 = .data:0x0000002C; // type:object size:0xC scope:local
6262
@3857 = .data:0x00000038; // type:object size:0xC scope:local
6363
@3858 = .data:0x00000044; // type:object size:0xC scope:local
6464
mode_proc$3855 = .data:0x00000050; // type:object size:0x24 scope:local
6565
selLabel$3897 = .data:0x00000074; // type:object size:0xC scope:local
6666
selLabel$3963 = .data:0x00000080; // type:object size:0xC scope:local
67-
l_daMagLiftRot_Method = .data:0x0000008C; // type:object size:0x20 scope:global
67+
l_daMagLiftRot_Method = .data:0x0000008C; // type:object size:0x20 scope:local
6868
g_profile_Obj_MagLiftRot = .data:0x000000AC; // type:object size:0x30 scope:global
6969
__vt__12J3DFrameCtrl = .data:0x000000DC; // type:object size:0xC scope:global
7070
__vt__14daMagLiftRot_c = .data:0x000000E8; // type:object size:0x28 scope:global
7171
__vt__18daMagLiftRot_HIO_c = .data:0x00000110; // type:object size:0xC scope:global
7272
__vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
7373
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
7474
@3621 = .bss:0x00000008; // type:object size:0xC scope:local
75-
l_HIO = .bss:0x00000014; // type:object size:0x40 scope:global align:4 data:float
76-
lbl_566_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte
75+
l_HIO = .bss:0x00000014; // type:object size:0x40 scope:local align:4 data:float
76+
lbl_566_bss_54 = .bss:0x00000054; // type:object size:0x1 scope:local data:byte

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@ def MatchingFor(*versions) -> bool:
20382038
ActorRel(NonMatching, "d_a_obj_lv8UdFloor"),
20392039
ActorRel(NonMatching, "d_a_obj_lv9SwShutter"),
20402040
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLift"),
2041-
ActorRel(NonMatching, "d_a_obj_magLiftRot"),
2041+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLiftRot"),
20422042
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"),
20432043
ActorRel(NonMatching, "d_a_obj_master_sword"),
20442044
ActorRel(NonMatching, "d_a_obj_mato"),

include/d/actor/d_a_obj_magLiftRot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ STATIC_ASSERT(sizeof(daMagLiftRot_c) == 0x634);
6464
class daMagLiftRot_HIO_c : public mDoHIO_entry_c {
6565
public:
6666
/* 80C8E94C */ daMagLiftRot_HIO_c();
67-
/* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c();
67+
/* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c() {}
6868

6969
void genMessage(JORMContext*);
7070

0 commit comments

Comments
 (0)