Skip to content

Commit aeeaf91

Browse files
hatal175hatal175
authored
d_a_ppolamp OK (#2535)
* d_a_ppolamp OK * Remove include * d_a_tag_Lv6Gate OK
1 parent 07403fe commit aeeaf91

File tree

10 files changed

+326
-670
lines changed

10 files changed

+326
-670
lines changed

‎config/GZ2E01/rels/d_a_ppolamp/symbols.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
4-
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
4+
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
55
__dt__11daPPolamp_cFv = .text:0x00000098; // type:function size:0xA4 scope:global
66
create__11daPPolamp_cFv = .text:0x0000013C; // type:function size:0x128 scope:global
77
execute__11daPPolamp_cFv = .text:0x00000264; // type:function size:0x60 scope:global
@@ -12,11 +12,11 @@ setPclModelMtx__11daPPolamp_cFv = .text:0x000004E8; // type:function size:0xF4 s
1212
createHeap__11daPPolamp_cFv = .text:0x000005DC; // type:function size:0x114 scope:global
1313
moveSwing__11daPPolamp_cFv = .text:0x000006F0; // type:function size:0x15C scope:global
1414
initParam__11daPPolamp_cFv = .text:0x0000084C; // type:function size:0x34 scope:global
15-
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:global
15+
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:local
1616
__dt__12J3DFrameCtrlFv = .text:0x0000090C; // type:function size:0x48 scope:global
17-
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:global
18-
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:global
19-
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:global
17+
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:local
18+
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:local
19+
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:local
2020
_ctors = .ctors:0x00000000; // type:label scope:global
2121
_dtors = .dtors:0x00000000; // type:label scope:global
2222
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -33,8 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
3333
@3928 = .rodata:0x00000040; // type:object size:0x8 scope:local
3434
@3936 = .rodata:0x00000048; // type:object size:0x4 scope:local align:4 data:float
3535
@stringBase0 = .rodata:0x0000004C; // type:object size:0x8 scope:local data:string_table
36-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
37-
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:global
36+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
37+
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:local
3838
g_profile_PPolamp = .data:0x00000024; // type:object size:0x30 scope:global
3939
__vt__12J3DFrameCtrl = .data:0x00000054; // type:object size:0xC scope:global
4040
__vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
@@ -55,7 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
5555
@1012 = .bss:0x00000034; // type:object size:0x1 scope:local
5656
@1010 = .bss:0x00000038; // type:object size:0x1 scope:local
5757
@1009 = .bss:0x0000003C; // type:object size:0x1 scope:local
58+
init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local
5859
TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local
60+
init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local
5961
TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local
6062
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global
6163
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global

‎config/GZ2J01/rels/d_a_ppolamp/symbols.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
4-
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
4+
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
55
__dt__11daPPolamp_cFv = .text:0x00000098; // type:function size:0xA4 scope:global
66
create__11daPPolamp_cFv = .text:0x0000013C; // type:function size:0x128 scope:global
77
execute__11daPPolamp_cFv = .text:0x00000264; // type:function size:0x60 scope:global
@@ -12,11 +12,11 @@ setPclModelMtx__11daPPolamp_cFv = .text:0x000004E8; // type:function size:0xF4 s
1212
createHeap__11daPPolamp_cFv = .text:0x000005DC; // type:function size:0x114 scope:global
1313
moveSwing__11daPPolamp_cFv = .text:0x000006F0; // type:function size:0x15C scope:global
1414
initParam__11daPPolamp_cFv = .text:0x0000084C; // type:function size:0x34 scope:global
15-
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:global
15+
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:local
1616
__dt__12J3DFrameCtrlFv = .text:0x0000090C; // type:function size:0x48 scope:global
17-
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:global
18-
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:global
19-
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:global
17+
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:local
18+
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:local
19+
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:local
2020
_ctors = .ctors:0x00000000; // type:label scope:global
2121
_dtors = .dtors:0x00000000; // type:label scope:global
2222
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -33,8 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
3333
@3928 = .rodata:0x00000040; // type:object size:0x8 scope:local
3434
@3936 = .rodata:0x00000048; // type:object size:0x4 scope:local align:4 data:float
3535
@stringBase0 = .rodata:0x0000004C; // type:object size:0x8 scope:local data:string_table
36-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
37-
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:global
36+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
37+
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:local
3838
g_profile_PPolamp = .data:0x00000024; // type:object size:0x30 scope:global
3939
__vt__12J3DFrameCtrl = .data:0x00000054; // type:object size:0xC scope:global
4040
__vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
@@ -55,7 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
5555
@1012 = .bss:0x00000034; // type:object size:0x1 scope:local
5656
@1010 = .bss:0x00000038; // type:object size:0x1 scope:local
5757
@1009 = .bss:0x0000003C; // type:object size:0x1 scope:local
58+
init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local
5859
TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local
60+
init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local
5961
TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local
6062
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global
6163
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global

‎config/GZ2P01/rels/d_a_ppolamp/symbols.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
4-
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
4+
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
55
__dt__11daPPolamp_cFv = .text:0x00000098; // type:function size:0xA4 scope:global
66
create__11daPPolamp_cFv = .text:0x0000013C; // type:function size:0x128 scope:global
77
execute__11daPPolamp_cFv = .text:0x00000264; // type:function size:0x60 scope:global
@@ -12,11 +12,11 @@ setPclModelMtx__11daPPolamp_cFv = .text:0x000004E8; // type:function size:0xF4 s
1212
createHeap__11daPPolamp_cFv = .text:0x000005DC; // type:function size:0x114 scope:global
1313
moveSwing__11daPPolamp_cFv = .text:0x000006F0; // type:function size:0x15C scope:global
1414
initParam__11daPPolamp_cFv = .text:0x0000084C; // type:function size:0x34 scope:global
15-
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:global
15+
daPPolamp_create__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x8C scope:local
1616
__dt__12J3DFrameCtrlFv = .text:0x0000090C; // type:function size:0x48 scope:global
17-
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:global
18-
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:global
19-
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:global
17+
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000954; // type:function size:0x20 scope:local
18+
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000974; // type:function size:0x20 scope:local
19+
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000994; // type:function size:0x20 scope:local
2020
_ctors = .ctors:0x00000000; // type:label scope:global
2121
_dtors = .dtors:0x00000000; // type:label scope:global
2222
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -33,8 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
3333
@3928 = .rodata:0x00000040; // type:object size:0x8 scope:local
3434
@3936 = .rodata:0x00000048; // type:object size:0x4 scope:local align:4 data:float
3535
@stringBase0 = .rodata:0x0000004C; // type:object size:0x8 scope:local data:string_table
36-
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
37-
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:global
36+
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
37+
daPPolamp_METHODS = .data:0x00000004; // type:object size:0x20 scope:local
3838
g_profile_PPolamp = .data:0x00000024; // type:object size:0x30 scope:global
3939
__vt__12J3DFrameCtrl = .data:0x00000054; // type:object size:0xC scope:global
4040
__vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
@@ -55,7 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global
5555
@1012 = .bss:0x00000034; // type:object size:0x1 scope:local
5656
@1010 = .bss:0x00000038; // type:object size:0x1 scope:local
5757
@1009 = .bss:0x0000003C; // type:object size:0x1 scope:local
58+
init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local
5859
TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local
60+
init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local
5961
TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local
6062
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global
6163
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global

‎config/RZDE01_00/rels/d_a_ppolamp/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000058; // type:function size:0x4 scope:global
4-
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x0000005C; // type:function size:0x4 scope:global
4+
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x0000005C; // type:function size:0x4 scope:local
55
__dt__11daPPolamp_cFv = .text:0x00000060; // type:function size:0x90 scope:global
66
create__11daPPolamp_cFv = .text:0x000000F0; // type:function size:0x118 scope:global
77
execute__11daPPolamp_cFv = .text:0x00000208; // type:function size:0x60 scope:global
@@ -11,10 +11,10 @@ setPclModelMtx__11daPPolamp_cFv = .text:0x00000464; // type:function size:0xDC s
1111
createHeap__11daPPolamp_cFv = .text:0x00000540; // type:function size:0xF8 scope:global
1212
moveSwing__11daPPolamp_cFv = .text:0x00000638; // type:function size:0x154 scope:global
1313
initParam__11daPPolamp_cFv = .text:0x0000078C; // type:function size:0x34 scope:global
14-
daPPolamp_create__FP11daPPolamp_c = .text:0x000007C0; // type:function size:0x8C scope:global
15-
daPPolamp_Delete__FP11daPPolamp_c = .text:0x0000084C; // type:function size:0x34 scope:global
16-
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x4 scope:global
17-
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000884; // type:function size:0x4 scope:global
14+
daPPolamp_create__FP11daPPolamp_c = .text:0x000007C0; // type:function size:0x8C scope:local
15+
daPPolamp_Delete__FP11daPPolamp_c = .text:0x0000084C; // type:function size:0x34 scope:local
16+
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000880; // type:function size:0x4 scope:local
17+
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000884; // type:function size:0x4 scope:local
1818
_ctors = .ctors:0x00000000; // type:label scope:global
1919
_dtors = .dtors:0x00000000; // type:label scope:global
2020
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -33,8 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
3333
UP_VAL$90564 = .rodata:0x0000004C; // type:object size:0x4 scope:local
3434
MAX_ADD$90565 = .rodata:0x00000050; // type:object size:0x4 scope:local
3535
lbl_705_data_0 = .data:0x00000000; // type:object size:0x8 data:string
36-
l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte
37-
daPPolamp_METHODS = .data:0x0000000C; // type:object size:0x20 scope:global
36+
l_arcName = .data:0x00000008; // type:object size:0x4 scope:local data:4byte
37+
daPPolamp_METHODS = .data:0x0000000C; // type:object size:0x20 scope:local
3838
g_profile_PPolamp = .data:0x0000002C; // type:object size:0x30 scope:global
3939
__vt__11daPPolamp_c = .data:0x0000005C; // type:object size:0xC scope:global
4040
lbl_705_data_68 = .data:0x00000068; // type:object size:0xC data:string

‎config/ShieldD/rels/d_a_ppolampD/symbols.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
22
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
33
_unresolved = .text:0x00000060; // type:function size:0x20 scope:global
4-
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000080; // type:function size:0x28 scope:global
4+
daPPolamp_c_createHeap__FP10fopAc_ac_c = .text:0x00000080; // type:function size:0x28 scope:local
55
__dt__11daPPolamp_cFv = .text:0x000000B0; // type:function size:0xA0 scope:global
66
create__11daPPolamp_cFv = .text:0x00000150; // type:function size:0x130 scope:global
77
execute__11daPPolamp_cFv = .text:0x00000280; // type:function size:0x68 scope:global
@@ -12,11 +12,11 @@ setPclModelMtx__11daPPolamp_cFv = .text:0x00000530; // type:function size:0xDC s
1212
createHeap__11daPPolamp_cFv = .text:0x00000610; // type:function size:0x1A4 scope:global
1313
moveSwing__11daPPolamp_cFv = .text:0x000007C0; // type:function size:0x180 scope:global
1414
initParam__11daPPolamp_cFv = .text:0x00000940; // type:function size:0x3C scope:global
15-
daPPolamp_create__FP11daPPolamp_c = .text:0x00000980; // type:function size:0x7C scope:global
15+
daPPolamp_create__FP11daPPolamp_c = .text:0x00000980; // type:function size:0x7C scope:local
1616
__ct__11daPPolamp_cFv = .text:0x00000A00; // type:function size:0x48 scope:global
17-
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000A50; // type:function size:0x28 scope:global
18-
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000A80; // type:function size:0x28 scope:global
19-
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000AB0; // type:function size:0x28 scope:global
17+
daPPolamp_Delete__FP11daPPolamp_c = .text:0x00000A50; // type:function size:0x28 scope:local
18+
daPPolamp_execute__FP11daPPolamp_c = .text:0x00000A80; // type:function size:0x28 scope:local
19+
daPPolamp_draw__FP11daPPolamp_c = .text:0x00000AB0; // type:function size:0x28 scope:local
2020
_ctors = .ctors:0x00000000; // type:label scope:global
2121
_dtors = .dtors:0x00000000; // type:label scope:global
2222
...rodata.0 = .rodata:0x00000000; // type:label scope:local
@@ -38,12 +38,12 @@ cNullVec__6Z2Calc = .rodata:0x0000005C; // type:object size:0xC scope:global
3838
@46916 = .rodata:0x00000068; // type:object size:0x4 scope:local
3939
lbl_696_rodata_6C = .rodata:0x0000006C; // type:object size:0x18
4040
@115603 = .data:0x00000000; // type:object size:0x8 scope:local data:string
41-
l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte
41+
l_arcName = .data:0x00000008; // type:object size:0x4 scope:local data:4byte
4242
@115767 = .data:0x00000010; // type:object size:0x10 scope:local data:string
4343
@115768 = .data:0x00000020; // type:object size:0x14 scope:local data:string
4444
@115769 = .data:0x00000034; // type:object size:0x5 scope:local data:string
4545
@115770 = .data:0x0000003C; // type:object size:0xD scope:local data:string
46-
daPPolamp_METHODS = .data:0x00000050; // type:object size:0x20 scope:global
46+
daPPolamp_METHODS = .data:0x00000050; // type:object size:0x20 scope:local
4747
g_profile_PPolamp = .data:0x00000070; // type:object size:0x30 scope:global
4848
__vt__11daPPolamp_c = .data:0x000000A0; // type:object size:0xC scope:global
4949
@115842 = .data:0x000000AC; // type:object size:0xC scope:local data:string

‎configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,13 +2181,13 @@ def MatchingFor(*versions) -> bool:
21812181
ActorRel(NonMatching, "d_a_obj_zra_rock"),
21822182
ActorRel(NonMatching, "d_a_passer_mng"),
21832183
ActorRel(Equivalent, "d_a_peru"),
2184-
ActorRel(NonMatching, "d_a_ppolamp"),
2184+
ActorRel(MatchingFor("GZ2E01"), "d_a_ppolamp"),
21852185
ActorRel(MatchingFor("GZ2E01"), "d_a_skip_2D"),
21862186
ActorRel(MatchingFor("GZ2E01"), "d_a_startAndGoal", extra_cflags=['-pragma "nosyminline off"']),
21872187
ActorRel(MatchingFor("GZ2E01"), "d_a_swBall"),
21882188
ActorRel(MatchingFor("GZ2E01"), "d_a_swLBall"),
21892189
ActorRel(MatchingFor("GZ2E01"), "d_a_swTime"),
2190-
ActorRel(NonMatching, "d_a_tag_Lv6Gate"),
2190+
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_Lv6Gate"),
21912191
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_Lv7Gate"),
21922192
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_Lv8Gate"),
21932193
ActorRel(MatchingFor("GZ2E01"), "d_a_tag_TWgate"),

‎include/d/actor/d_a_ppolamp.h‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,29 @@
1212
* @details
1313
*
1414
*/
15-
class daPPolamp_c : public fopAc_ac_c {
15+
class daPPolamp_c : public fopAc_ac_c, public request_of_phase_process_class {
1616
public:
17-
/* 80D4C958 */ ~daPPolamp_c();
18-
/* 80D4C9FC */ void create();
19-
/* 80D4CB24 */ void execute();
20-
/* 80D4CB84 */ void draw();
21-
/* 80D4CCF0 */ void Delete();
17+
/* 80D4C958 */ virtual ~daPPolamp_c();
18+
/* 80D4C9FC */ int create();
19+
/* 80D4CB24 */ int execute();
20+
/* 80D4CB84 */ int draw();
21+
/* 80D4CCF0 */ int Delete();
2222
/* 80D4CD24 */ void setModelMtx();
2323
/* 80D4CDA8 */ void setPclModelMtx();
24-
/* 80D4CE9C */ void createHeap();
24+
/* 80D4CE9C */ int createHeap();
2525
/* 80D4CFB0 */ void moveSwing();
2626
/* 80D4D10C */ void initParam();
2727

2828
private:
29-
/* 0x568 */ u8 field_0x568[0x5ac - 0x568];
29+
/* 0x574 */ J3DModel* mModel1;
30+
/* 0x578 */ J3DModel* mModel2;
31+
/* 0x57C */ mDoExt_bckAnm mBck;
32+
/* 0x598 */ int field_0x598;
33+
/* 0x59C */ s8 field_0x59c;
34+
/* 0x59E */ s16 field_0x59e;
35+
/* 0x5A0 */ u8 mSwingTimer;
36+
/* 0x5A4 */ f32 field_0x5a4;
37+
/* 0x5A8 */ f32 field_0x5a8;
3038
};
3139

3240
STATIC_ASSERT(sizeof(daPPolamp_c) == 0x5ac);

‎include/d/actor/d_a_tag_Lv6Gate.h‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,17 @@ class daTagLv6Gate_c : public fopAc_ac_c {
88
public:
99
/* 80D4F8B8 */ int createHeap();
1010
/* 80D4FBD8 */ int create();
11-
/* 80D4FEDC */ int execute();
11+
/* 80D4FEDC */ inline int execute();
1212
/* 80D506AC */ int draw();
1313

1414
inline ~daTagLv6Gate_c();
1515

16-
inline void seStair();
17-
inline void seGlassOff();
18-
inline void seGlassOn();
1916
inline void initBaseMtx();
2017
inline void setBaseMtx();
2118
inline void create_init();
2219
inline bool checkOpenArea();
23-
inline void cut1();
24-
inline void cut2();
25-
inline void cut4();
2620

27-
void stabMasterSword() { field_0x76a = 1; }
21+
void stabMasterSword() { mIsMasterSwordStabbed = 1; }
2822
u8 getSwitchNo1() { return fopAcM_GetParam(this) & 0xFF; }
2923
u8 getSwitchNo2() { return fopAcM_GetParam(this) >> 0x8 & 0xFF; }
3024

@@ -35,7 +29,7 @@ class daTagLv6Gate_c : public fopAc_ac_c {
3529
/* 0x758 */ request_of_phase_process_class mPhase;
3630
/* 0x760 */ f32 field_0x760[2];
3731
/* 0x768 */ s16 mEvtId;
38-
/* 0x76A */ u8 field_0x76a;
32+
/* 0x76A */ bool mIsMasterSwordStabbed;
3933
}; // Size: 0x76C
4034

4135
#endif /* D_A_TAG_LV6GATE_H */

0 commit comments

Comments
 (0)