d_a_obj_octhashi equivalent except for weak func ordering of cCcD_GStts dtor (#2287)

* Initial d_a_obj_octhashi work

* More d_a_obj_octhashi work

* d_a_obj_octhashi has 100% completion, but rodata doesn't match

* d_a_obj_octhashi equivalent. Would fully match except for cCcD_GStts dtor

* d_a_obj_octhashi update after feedback from Taka and hatal
This commit is contained in:
YunataSavior
2025-01-19 03:45:55 -08:00
committed by GitHub
parent 4996e91556
commit 7137f49bfc
6 changed files with 343 additions and 558 deletions
@@ -11,6 +11,6 @@ REL/executor.c:
d/actor/d_a_obj_octhashi.cpp:
.text start:0x00000078 end:0x00001938
.rodata start:0x00000000 end:0x00000104
.rodata start:0x00000000 end:0x00000103
.data start:0x00000000 end:0x000000FC
.bss start:0x00000000 end:0x00000004
.bss start:0x00000000 end:0x00000001
@@ -2,8 +2,8 @@ _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
initCcCylinder__15daObjOCTHASHI_cFv = .text:0x00000078; // type:function size:0x1E0 scope:global
daObjOCTHASHI_Create__FP10fopAc_ac_c = .text:0x00000258; // type:function size:0x20 scope:global
daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c = .text:0x00000278; // type:function size:0x44 scope:global
daObjOCTHASHI_Create__FP10fopAc_ac_c = .text:0x00000258; // type:function size:0x20 scope:local
daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c = .text:0x00000278; // type:function size:0x44 scope:local
SetCoSph__15daObjOCTHASHI_cFv = .text:0x000002BC; // type:function size:0xA8 scope:global
SetCoCyl__15daObjOCTHASHI_cFv = .text:0x00000364; // type:function size:0x80 scope:global
HakaiSet2__15daObjOCTHASHI_cFi = .text:0x000003E4; // type:function size:0x3CC scope:global
@@ -15,9 +15,9 @@ SphAction__15daObjOCTHASHI_cFv = .text:0x00000A84; // type:function size:0x280 s
SphAction2__15daObjOCTHASHI_cFv = .text:0x00000D04; // type:function size:0xB0 scope:global
Action__15daObjOCTHASHI_cFv = .text:0x00000DB4; // type:function size:0xC8 scope:global
setBaseMtx__15daObjOCTHASHI_cFv = .text:0x00000E7C; // type:function size:0xCC scope:global
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000F48; // type:function size:0xC scope:global
daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c = .text:0x00000F54; // type:function size:0x2C scope:global
daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c = .text:0x00000F80; // type:function size:0x20 scope:global
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000F48; // type:function size:0xC scope:local
daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c = .text:0x00000F54; // type:function size:0x2C scope:local
daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c = .text:0x00000F80; // type:function size:0x20 scope:local
CreateHeap__15daObjOCTHASHI_cFv = .text:0x00000FA0; // type:function size:0xB8 scope:global
create__15daObjOCTHASHI_cFv = .text:0x00001058; // type:function size:0x34C scope:global
__dt__8cM3dGCylFv = .text:0x000013A4; // type:function size:0x48 scope:global
@@ -30,7 +30,7 @@ __ct__9dCcD_SttsFv = .text:0x0000165C; // type:function size:0x54 scope:global
__dt__10dCcD_GSttsFv = .text:0x000016B0; // type:function size:0x5C scope:global
__ct__5csXyzFv = .text:0x0000170C; // type:function size:0x4 scope:global
__ct__4cXyzFv = .text:0x00001710; // type:function size:0x4 scope:global
daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c = .text:0x00001714; // type:function size:0x8 scope:global
daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c = .text:0x00001714; // type:function size:0x8 scope:local
__dt__10cCcD_GSttsFv = .text:0x0000171C; // type:function size:0x48 scope:global
Create__15daObjOCTHASHI_cFv = .text:0x00001764; // type:function size:0x54 scope:global
Execute__15daObjOCTHASHI_cFPPA3_A4_f = .text:0x000017B8; // type:function size:0x74 scope:global
@@ -72,9 +72,9 @@ ccSphSrc$3655 = .rodata:0x00000000; // type:object size:0x40 scope:local
@4166 = .rodata:0x000000C8; // type:object size:0x4 scope:local
@4167 = .rodata:0x000000CC; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000D0; // type:object size:0x33 scope:local data:string_table
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
ccCylSrc$3656 = .data:0x00000004; // type:object size:0x44 scope:local data:float
l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:global
l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:local
g_profile_OCTHASHI = .data:0x00000068; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x00000098; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x000000A4; // type:object size:0xC scope:global
@@ -82,4 +82,4 @@ __vt__8cM3dGSph = .data:0x000000B0; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000BC; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x000000C8; // type:object size:0xC scope:global
__vt__15daObjOCTHASHI_c = .data:0x000000D4; // type:object size:0x28 scope:global
lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte