encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on d_a_obj_toby (#2552)

Browse Source 
* Work on d_a_obj_toby

* d_a_obj_tatigi matching

* Deleted automatic ctor and dtor
This commit is contained in:
hatal175
2025-07-24 12:19:48 -07:00
committed by GitHub
parent aeed67dcf5
commit aae19575bf
17 changed files with 1057 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_obj_tatigi/symbols.txt
+8 -8
View File
@@ -1,13 +1,13 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:global
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:global
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:global
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:global
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:local
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:local
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:local
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:local
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:local
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:local
__dt__5tg_ssFv = .text:0x00000A60; // type:function size:0xD4 scope:global
__ct__5tg_ssFv = .text:0x00000B34; // type:function size:0x94 scope:global
__dt__8cM3dGCylFv = .text:0x00000BC8; // type:function size:0x48 scope:global
@@ -34,7 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4076 = .rodata:0x00000058; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x00000060; // type:object size:0x7 scope:local data:string_table
cc_cyl_src$3986 = .data:0x00000000; // type:object size:0x44 scope:local
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:global
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:local
g_profile_OBJ_TATIGI = .data:0x00000064; // type:object size:0x30 scope:global
__vt__8cM3dGAab = .data:0x00000094; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global
config/GZ2E01/rels/d_a_obj_toby/symbols.txt
+22 -22
View File
@@ -4,22 +4,22 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Toby_HIO_cFv = .text:0x000000EC; // type:function size:0x24 scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:global
s_bomb_sub__FPvPv = .text:0x000001D0; // type:function size:0x18C scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:local
s_bomb_sub__FPvPv = .text:0x000001D0; // type:function size:0x18C scope:local
__dt__4cXyzFv = .text:0x0000035C; // type:function size:0x3C scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:global
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:global
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:global
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:global
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:global
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:global
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:global
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:global
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:global
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:global
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:global
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:local
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:local
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:local
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:local
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:local
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:local
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:local
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:local
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:local
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:local
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:local
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:local
__dt__6yuka_sFv = .text:0x00001E54; // type:function size:0x3C scope:global
__ct__6yuka_sFv = .text:0x00001E90; // type:function size:0x4 scope:global
__dt__16daObj_Toby_HIO_cFv = .text:0x00001E94; // type:function size:0x48 scope:global
@@ -75,9 +75,9 @@ l_bmdidx$4530 = .rodata:0x00000094; // type:object size:0x8 scope:local
@4761 = .rodata:0x000000C0; // type:object size:0x8 scope:local
@4764 = .rodata:0x000000C8; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x000000D0; // type:object size:0x19 scope:local data:string_table
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:global
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:global data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:global
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:local
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:local data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:local
g_profile_OBJ_TOBY = .data:0x000001A0; // type:object size:0x30 scope:global
__vt__16daObj_Toby_HIO_c = .data:0x000001D0; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@@ -98,11 +98,11 @@ __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_663_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte
@3801 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:global align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:global align:4 data:float
l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:local align:4 data:float
@3946 = .bss:0x00000068; // type:object size:0xC scope:local
sc$3945 = .bss:0x00000078; // type:object size:0xC scope:local
@4167 = .bss:0x00000084; // type:object size:0xC scope:local
config/GZ2J01/rels/d_a_obj_tatigi/symbols.txt
+8 -8
View File
@@ -1,13 +1,13 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:global
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:global
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:global
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:global
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:local
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:local
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:local
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:local
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:local
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:local
__dt__5tg_ssFv = .text:0x00000A60; // type:function size:0xD4 scope:global
__ct__5tg_ssFv = .text:0x00000B34; // type:function size:0x94 scope:global
__dt__8cM3dGCylFv = .text:0x00000BC8; // type:function size:0x48 scope:global
@@ -34,7 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4076 = .rodata:0x00000058; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x00000060; // type:object size:0x7 scope:local data:string_table
cc_cyl_src$3986 = .data:0x00000000; // type:object size:0x44 scope:local
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:global
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:local
g_profile_OBJ_TATIGI = .data:0x00000064; // type:object size:0x30 scope:global
__vt__8cM3dGAab = .data:0x00000094; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global
config/GZ2J01/rels/d_a_obj_toby/symbols.txt
+21 -21
View File
@@ -4,22 +4,22 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Toby_HIO_cFv = .text:0x000000EC; // type:function size:0x24 scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:local
s_bomb_sub__FPvPv = .text:0x000001D0; // type:function size:0x18C scope:global
__dt__4cXyzFv = .text:0x0000035C; // type:function size:0x3C scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:global
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:global
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:global
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:global
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:global
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:global
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:global
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:global
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:global
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:global
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:global
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:local
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:local
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:local
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:local
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:local
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:local
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:local
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:local
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:local
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:local
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:local
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:local
__dt__6yuka_sFv = .text:0x00001E54; // type:function size:0x3C scope:global
__ct__6yuka_sFv = .text:0x00001E90; // type:function size:0x4 scope:global
__dt__16daObj_Toby_HIO_cFv = .text:0x00001E94; // type:function size:0x48 scope:global
@@ -75,9 +75,9 @@ l_bmdidx$4530 = .rodata:0x00000094; // type:object size:0x8 scope:local
@4761 = .rodata:0x000000C0; // type:object size:0x8 scope:local
@4764 = .rodata:0x000000C8; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x000000D0; // type:object size:0x19 scope:local data:string_table
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:global
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:global data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:global
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:local
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:local data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:local
g_profile_OBJ_TOBY = .data:0x000001A0; // type:object size:0x30 scope:global
__vt__16daObj_Toby_HIO_c = .data:0x000001D0; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@@ -98,11 +98,11 @@ __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_663_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
@3801 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:global align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:global align:4 data:float
l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:local align:4 data:float
@3946 = .bss:0x00000068; // type:object size:0xC scope:local
sc$3945 = .bss:0x00000078; // type:object size:0xC scope:local
@4167 = .bss:0x00000084; // type:object size:0xC scope:local
config/GZ2P01/rels/d_a_obj_tatigi/symbols.txt
+8 -8
View File
@@ -1,13 +1,13 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:global
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:global
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:global
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:global
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000078; // type:function size:0x88 scope:local
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000100; // type:function size:0x288 scope:local
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000388; // type:function size:0x8 scope:local
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000390; // type:function size:0x88 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000418; // type:function size:0xAC scope:local
set_pos_check__FP16obj_tatigi_classi = .text:0x000004C4; // type:function size:0x1B4 scope:local
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000678; // type:function size:0x3E8 scope:local
__dt__5tg_ssFv = .text:0x00000A60; // type:function size:0xD4 scope:global
__ct__5tg_ssFv = .text:0x00000B34; // type:function size:0x94 scope:global
__dt__8cM3dGCylFv = .text:0x00000BC8; // type:function size:0x48 scope:global
@@ -34,7 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4076 = .rodata:0x00000058; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x00000060; // type:object size:0x7 scope:local data:string_table
cc_cyl_src$3986 = .data:0x00000000; // type:object size:0x44 scope:local
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:global
l_daObj_Tatigi_Method = .data:0x00000044; // type:object size:0x20 scope:local
g_profile_OBJ_TATIGI = .data:0x00000064; // type:object size:0x30 scope:global
__vt__8cM3dGAab = .data:0x00000094; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global
config/GZ2P01/rels/d_a_obj_toby/symbols.txt
+22 -22
View File
@@ -4,22 +4,22 @@ _unresolved = .text:0x00000058; // type:function size:0x20 scope:global
__register_global_object = .text:0x00000078; // type:function size:0x1C scope:global
__destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global
__ct__16daObj_Toby_HIO_cFv = .text:0x000000EC; // type:function size:0x24 scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:global
s_bomb_sub__FPvPv = .text:0x000001D0; // type:function size:0x18C scope:global
daObj_Toby_Draw__FP14obj_toby_class = .text:0x00000110; // type:function size:0xC0 scope:local
s_bomb_sub__FPvPv = .text:0x000001D0; // type:function size:0x18C scope:local
__dt__4cXyzFv = .text:0x0000035C; // type:function size:0x3C scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:global
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:global
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:global
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:global
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:global
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:global
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:global
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:global
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:global
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:global
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:global
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:global
shot_b_sub__FPvPv = .text:0x00000398; // type:function size:0x84 scope:local
s_hz_sub__FPvPv = .text:0x0000041C; // type:function size:0x9C scope:local
yuka_ground__FP14obj_toby_classP6yuka_s = .text:0x000004B8; // type:function size:0x624 scope:local
yuka_fly__FP14obj_toby_classP6yuka_s = .text:0x00000ADC; // type:function size:0xE8 scope:local
yuka_mtxset__FP14obj_toby_classP6yuka_s = .text:0x00000BC4; // type:function size:0x120 scope:local
yuka_control__FP14obj_toby_class = .text:0x00000CE4; // type:function size:0x200 scope:local
demo_camera__FP14obj_toby_class = .text:0x00000EE4; // type:function size:0x28C scope:local
daObj_Toby_Execute__FP14obj_toby_class = .text:0x00001170; // type:function size:0x74 scope:local
daObj_Toby_IsDelete__FP14obj_toby_class = .text:0x000011E4; // type:function size:0x8 scope:local
daObj_Toby_Delete__FP14obj_toby_class = .text:0x000011EC; // type:function size:0x150 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x0000133C; // type:function size:0x1F8 scope:local
set_pos_check__FP14obj_toby_classi = .text:0x00001534; // type:function size:0x128 scope:local
daObj_Toby_Create__FP10fopAc_ac_c = .text:0x0000165C; // type:function size:0x7F8 scope:local
__dt__6yuka_sFv = .text:0x00001E54; // type:function size:0x3C scope:global
__ct__6yuka_sFv = .text:0x00001E90; // type:function size:0x4 scope:global
__dt__16daObj_Toby_HIO_cFv = .text:0x00001E94; // type:function size:0x48 scope:global
@@ -75,9 +75,9 @@ l_bmdidx$4530 = .rodata:0x00000094; // type:object size:0x8 scope:local
@4761 = .rodata:0x000000C0; // type:object size:0x8 scope:local
@4764 = .rodata:0x000000C8; // type:object size:0x8 scope:local
@stringBase0 = .rodata:0x000000D0; // type:object size:0x19 scope:local data:string_table
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:global
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:global data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:global
r05yuka_image = .data:0x00000000; // type:object size:0xC0 scope:local
r11yuka_image = .data:0x000000C0; // type:object size:0xC0 scope:local data:byte
l_daObj_Toby_Method = .data:0x00000180; // type:object size:0x20 scope:local
g_profile_OBJ_TOBY = .data:0x000001A0; // type:object size:0x30 scope:global
__vt__16daObj_Toby_HIO_c = .data:0x000001D0; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@@ -98,11 +98,11 @@ __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_663_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte
l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte scope:local
@3801 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:global align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:global align:4 data:float
l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte
hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float
hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:local align:4 data:float
@3946 = .bss:0x00000068; // type:object size:0xC scope:local
sc$3945 = .bss:0x00000078; // type:object size:0xC scope:local
@4167 = .bss:0x00000084; // type:object size:0xC scope:local
config/RZDE01_00/rels/d_a_obj_tatigi/symbols.txt
+7 -7
View File
@@ -1,12 +1,12 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x4 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x0000005C; // type:function size:0x80 scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x000000DC; // type:function size:0x2CC scope:global
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x000003A8; // type:function size:0x8 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x000003B0; // type:function size:0xA8 scope:global
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000458; // type:function size:0x480 scope:global
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x000008D8; // type:function size:0x88 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x0000005C; // type:function size:0x80 scope:local
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x000000DC; // type:function size:0x2CC scope:local
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x000003A8; // type:function size:0x8 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x000003B0; // type:function size:0xA8 scope:local
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000458; // type:function size:0x480 scope:local
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x000008D8; // type:function size:0x88 scope:local
__ct__5tg_ssFv = .text:0x00000960; // type:function size:0x68 scope:global
__dt__5tg_ssFv = .text:0x000009C8; // type:function size:0x5C scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
@@ -28,5 +28,5 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@94608 = .rodata:0x00000038; // type:object size:0x8 scope:local
lbl_654_data_0 = .data:0x00000000; // type:object size:0x8
cc_cyl_src$93474 = .data:0x00000008; // type:object size:0x44 scope:local
l_daObj_Tatigi_Method = .data:0x0000004C; // type:object size:0x20 scope:global
l_daObj_Tatigi_Method = .data:0x0000004C; // type:object size:0x20 scope:local
g_profile_OBJ_TATIGI = .data:0x0000006C; // type:object size:0x30 scope:global
config/ShieldD/rels/d_a_obj_tatigiD/symbols.txt
+8 -8
View File
@@ -1,15 +1,15 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x20 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000080; // type:function size:0x90 scope:global
daObj_Tatigi_Draw__FP16obj_tatigi_class = .text:0x00000080; // type:function size:0x90 scope:local
dComIfGp_entrySimpleModel__FP8J3DModeli = .text:0x00000110; // type:function size:0x3C scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000150; // type:function size:0x314 scope:global
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000470; // type:function size:0x8 scope:global
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000480; // type:function size:0x94 scope:global
daObj_Tatigi_Execute__FP16obj_tatigi_class = .text:0x00000150; // type:function size:0x314 scope:local
daObj_Tatigi_IsDelete__FP16obj_tatigi_class = .text:0x00000470; // type:function size:0x8 scope:local
daObj_Tatigi_Delete__FP16obj_tatigi_class = .text:0x00000480; // type:function size:0x94 scope:local
dComIfGp_removeSimpleModel__FP12J3DModelDatai = .text:0x00000520; // type:function size:0x3C scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000560; // type:function size:0xE4 scope:global
set_pos_check__FP16obj_tatigi_classi = .text:0x00000650; // type:function size:0xF0 scope:global
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000740; // type:function size:0x550 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000560; // type:function size:0xE4 scope:local
set_pos_check__FP16obj_tatigi_classi = .text:0x00000650; // type:function size:0xF0 scope:local
daObj_Tatigi_Create__FP10fopAc_ac_c = .text:0x00000740; // type:function size:0x550 scope:local
dComIfGp_addSimpleModel__FP12J3DModelDataiUc = .text:0x00000C90; // type:function size:0x44 scope:global
__ct__16obj_tatigi_classFv = .text:0x00000CE0; // type:function size:0x5C scope:global
__dt__5tg_ssFv = .text:0x00000D40; // type:function size:0x7C scope:global
@@ -46,7 +46,7 @@ lbl_642_rodata_50 = .rodata:0x00000050; // type:object size:0x14
@118546 = .data:0x00000108; // type:object size:0x23 scope:local data:string
@118552 = .data:0x0000012C; // type:object size:0x34 scope:local
@118555 = .data:0x00000160; // type:object size:0x35 scope:local
l_daObj_Tatigi_Method = .data:0x00000198; // type:object size:0x20 scope:global
l_daObj_Tatigi_Method = .data:0x00000198; // type:object size:0x20 scope:local
g_profile_OBJ_TATIGI = .data:0x000001B8; // type:object size:0x30 scope:global
@118618 = .data:0x000001F4; // type:object size:0x9 scope:local data:string
@118619 = .data:0x00000214; // type:object size:0x9 scope:local data:string
configure.py
+1 -1
View File
@@ -2130,7 +2130,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_taFence"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_table"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_takaraDai"),
ActorRel(NonMatching, "d_a_obj_tatigi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tatigi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ten"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_testcube"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tgake"),
include/d/actor/d_a_e_hz.h
+2 -1
View File
@@ -11,6 +11,7 @@
*
*/
class daE_HZ_c : public fopEn_enemy_c {
public:
/* 806EA690 */ void setBck(int, u8, f32, f32);
/* 806EA734 */ void checkBck(int);
/* 806EA790 */ void draw();
@@ -19,7 +20,7 @@ class daE_HZ_c : public fopEn_enemy_c {
/* 806EAEDC */ void checkAttackStart();
/* 806EB05C */ void checkArrowCharge();
/* 806EB0A4 */ void setTgSetBit(int);
/* 806EB0FC */ void isWait();
/* 806EB0FC */ bool isWait();
/* 806EB13C */ void checkFall();
/* 806EB2E8 */ void setCloseSmokeEffect();
/* 806EB3EC */ void executeWait();
include/d/actor/d_a_obj_tatigi.h
+23 -5
View File
@@ -1,12 +1,18 @@
#ifndef D_A_OBJ_TATIGI_H
#define D_A_OBJ_TATIGI_H
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
struct tg_ss {
public:
/* 80D083C0 */ ~tg_ss();
/* 80D08494 */ tg_ss();
/* 0x000 */ J3DModel* mModel;
/* 0x004 */ cXyz mPos;
/* 0x010 */ cXyz mScale;
/* 0x01C */ s16 mAngle;
/* 0x01E */ s16 field_0x1e;
/* 0x020 */ dCcD_Cyl mCyl;
/* 0x15C */ s8 mActive;
};
/**
@@ -17,9 +23,21 @@ public:
* @details
*
*/
class obj_tatigi_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x1bc0 - 0x568];
class obj_tatigi_class{
public:
/* 0x0000 */ fopAc_ac_c mBase;
/* 0x0568 */ request_of_phase_process_class mPhase;
/* 0x0570 */ u8 field_0x570;
/* 0x0571 */ u8 field_0x571;
/* 0x0572 */ u8 field_0x572;
/* 0x0574 */ s16 field_0x574;
/* 0x0576 */ s16 field_0x576;
/* 0x0578 */ int field_0x578;
/* 0x057C */ tg_ss mTgs[16];
/* 0x1B7C */ int mTgNum;
/* 0x1B80 */ dCcD_Stts mStts;
/* 0x1BBC */ u8 field_0x1bbc;
/* 0x1BBD */ bool mModelLoaded;
};
STATIC_ASSERT(sizeof(obj_tatigi_class) == 0x1bc0);
include/d/actor/d_a_obj_toby.h
+54 -10
View File
@@ -3,6 +3,29 @@
#include "f_op/f_op_actor_mng.h"
struct yuka_s {
public:
/* 0x00 */ J3DModel* mModel1;
/* 0x04 */ J3DModel* mModel2;
/* 0x08 */ cXyz mPos;
/* 0x14 */ cXyz mSpeed;
/* 0x20 */ csXyz mAngle;
/* 0x26 */ csXyz mAngleSpeed;
/* 0x2C */ int field_0x2c;
/* 0x30 */ f32 mScale;
/* 0x34 */ s8 field_0x34;
/* 0x36 */ s16 field_0x36;
/* 0x38 */ u8 field_0x38;
/* 0x39 */ s8 field_0x39;
/* 0x3A */ s8 field_0x3a;
/* 0x3C */ int field_0x3c;
/* 0x40 */ Mtx mMtx;
/* 0x70 */ dBgW* mBgW;
/* 0x74 */ int mParticle;
};
STATIC_ASSERT(sizeof(yuka_s) == 0x78);
/**
* @ingroup actors-objects
* @class obj_toby_class
@@ -11,23 +34,44 @@
* @details
*
*/
class obj_toby_class : public fopAc_ac_c {
private:
/* 0x568 */ u8 field_0x568[0x6374 - 0x568];
class obj_toby_class {
public:
/* 0x0000 */ fopAc_ac_c mBase;
/* 0x0568 */ request_of_phase_process_class mPhase;
/* 0x0570 */ char* mArcName;
/* 0x0574 */ u8 field_0x574;
/* 0x0575 */ u8 field_0x575;
/* 0x0576 */ u8 field_0x576;
/* 0x0577 */ u8 field_0x577;
/* 0x0578 */ u8 mSwBit;
/* 0x0579 */ u8 field_0x579[0x57c - 0x579];
/* 0x057C */ f32 field_0x57c;
/* 0x0580 */ s16 field_0x580;
/* 0x0582 */ s16 field_0x582;
/* 0x0584 */ s16 field_0x584;
/* 0x0586 */ s16 field_0x586[2];
/* 0x058C */ yuka_s mYukas[200];
/* 0x634C */ int mYukaNum;
/* 0x6350 */ s16 field_0x6350;
/* 0x6352 */ s16 field_0x6352;
/* 0x6354 */ cXyz field_0x6354;
/* 0x6360 */ cXyz field_0x6360;
/* 0x636C */ f32 field_0x636c;
/* 0x6370 */ u8 field_0x6370;
/* 0x6371 */ u8 field_0x6371;
};
STATIC_ASSERT(sizeof(obj_toby_class) == 0x6374);
class daObj_Toby_HIO_c {
class daObj_Toby_HIO_c : public JORReflexible{
public:
/* 80D1378C */ daObj_Toby_HIO_c();
/* 80D15534 */ ~daObj_Toby_HIO_c();
};
/* 80D15534 */ virtual ~daObj_Toby_HIO_c() {}
struct yuka_s {
public:
/* 80D154F4 */ ~yuka_s();
/* 80D15530 */ yuka_s();
void genMessage(JORMContext*);
/* 0x4 */ s8 field_0x4;
/* 0x8 */ f32 field_0x8;
};
#endif /* D_A_OBJ_TOBY_H */
include/d/actor/d_a_player.h
+1
View File
@@ -934,6 +934,7 @@ public:
void onForceAutoJump() { onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); }
void onNotAutoJump() { onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); }
void onNotHang() { onEndResetFlg0(ERFLG0_NOT_HANG); }
void onLeafSe() { onEndResetFlg0(ERFLG0_UNK_200000); }
void onWolfFchainPull() { onEndResetFlg0(ERFLG0_WOLF_FCHAIN_PULL); }
void onFishingRodGetFish() { onEndResetFlg0(ERFLG0_FISHING_ROD_GET_FISH); }
void onShieldBackBone() { onEndResetFlg1(ERFLG1_GANON_FINISH); }
src/d/actor/d_a_e_hz.cpp
+1 -1
View File
@@ -649,7 +649,7 @@ void daE_HZ_c::setTgSetBit(int param_0) {
}
/* 806EB0FC-806EB13C 000BDC 0040+00 0/0 0/0 1/1 .text isWait__8daE_HZ_cFv */
void daE_HZ_c::isWait() {
bool daE_HZ_c::isWait() {
// NONMATCHING
}
src/d/actor/d_a_obj_tatigi.cpp
+187 -304
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_obj_toby.cpp
+682 -878
View File
File diff suppressed because it is too large Load Diff
tools/utilities/greg_calc.py
+2
View File
@@ -1,3 +1,5 @@
#!/usr/bin/env python3
import sys
REG_F = {