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

d_a_obj_wsStick, d_a_obj_onsenTaru OK (#2268)

Browse Source 
* d_a_obj_wsStick, d_a_obj_onsenTaru OK

* d_a_obj_pdtile OK

* d_a_obj_stone equivalent

* d_a_npc_lf OK

* Z2SoundMgr OK

* Remove fixed nonmatching comment

* d_a_obj_kantera OK

* Remove unneeded header

* daMyna_c::deleteItem matching

* d_a_obj_crvsteel OK
This commit is contained in:
hatal175
2024-12-24 02:36:01 -08:00
committed by GitHub
parent e0ea8495f7
commit d874f05f44
30 changed files with 1964 additions and 3000 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_npc_lf/symbols.txt
+10 -10
View File
@@ -4,15 +4,15 @@ _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__14daNPC_LF_HIO_cFv = .text:0x000000EC; // type:function size:0x48 scope:global
nodeCallBack__FP8J3DJointi = .text:0x00000134; // type:function size:0x124 scope:global
daNPC_LF_Draw__FP12npc_lf_class = .text:0x00000258; // type:function size:0xB8 scope:global
nodeCallBack__FP8J3DJointi = .text:0x00000134; // type:function size:0x124 scope:local
daNPC_LF_Draw__FP12npc_lf_class = .text:0x00000258; // type:function size:0xB8 scope:local
npc_lf_move__FP10fopAc_ac_cP4lf_s = .text:0x00000310; // type:function size:0x428 scope:global
action__FP10fopAc_ac_cP4lf_s = .text:0x00000738; // type:function size:0x268 scope:global
daNPC_LF_Execute__FP12npc_lf_class = .text:0x000009A0; // type:function size:0xF4 scope:global
daNPC_LF_IsDelete__FP12npc_lf_class = .text:0x00000A94; // type:function size:0x8 scope:global
daNPC_LF_Delete__FP12npc_lf_class = .text:0x00000A9C; // type:function size:0x54 scope:global
useHeapInit__FP10fopAc_ac_c = .text:0x00000AF0; // type:function size:0xE0 scope:global
daNPC_LF_Create__FP10fopAc_ac_c = .text:0x00000BD0; // type:function size:0x254 scope:global
daNPC_LF_Execute__FP12npc_lf_class = .text:0x000009A0; // type:function size:0xF4 scope:local
daNPC_LF_IsDelete__FP12npc_lf_class = .text:0x00000A94; // type:function size:0x8 scope:local
daNPC_LF_Delete__FP12npc_lf_class = .text:0x00000A9C; // type:function size:0x54 scope:local
useHeapInit__FP10fopAc_ac_c = .text:0x00000AF0; // type:function size:0xE0 scope:local
daNPC_LF_Create__FP10fopAc_ac_c = .text:0x00000BD0; // type:function size:0x254 scope:local
__dt__4lf_sFv = .text:0x00000E24; // type:function size:0x3C scope:global
__ct__4lf_sFv = .text:0x00000E60; // type:function size:0x4 scope:global
__dt__14daNPC_LF_HIO_cFv = .text:0x00000E64; // type:function size:0x48 scope:global
@@ -56,10 +56,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4176 = .rodata:0x00000094; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000098; // type:object size:0x7 scope:local data:string_table
wp$3976 = .data:0x00000000; // type:object size:0xC scope:local
l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:global
l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:local
g_profile_NPC_LF = .data:0x0000002C; // type:object size:0x30 scope:global
__vt__14daNPC_LF_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@3764 = .bss:0x0000000C; // type:object size:0xC scope:local
l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte
l_HIO = .bss:0x00000018; // type:object size:0x1C scope:local data:byte
config/GZ2E01/rels/d_a_obj_crvsteel/symbols.txt
+7 -7
View File
@@ -1,20 +1,20 @@
_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
daObjCRVSTEEL_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:global
daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c = .text:0x00000098; // type:function size:0x24 scope:global
daObjCRVSTEEL_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x20 scope:local
daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c = .text:0x00000098; // type:function size:0x24 scope:local
OpenSet__15daObjCRVSTEEL_cFff = .text:0x000000BC; // type:function size:0x1C scope:global
CloseSet__15daObjCRVSTEEL_cFf = .text:0x000000D8; // type:function size:0x10 scope:global
CloseExecute__15daObjCRVSTEEL_cFv = .text:0x000000E8; // type:function size:0x78 scope:global
OpenExecute__15daObjCRVSTEEL_cFv = .text:0x00000160; // type:function size:0x28 scope:global
Action__15daObjCRVSTEEL_cFv = .text:0x00000188; // type:function size:0x48 scope:global
setBaseMtx__15daObjCRVSTEEL_cFv = .text:0x000001D0; // type:function size:0x5C scope:global
daObjCRVSTEEL_Draw__FP15daObjCRVSTEEL_c = .text:0x0000022C; // type:function size:0x2C scope:global
daObjCRVSTEEL_Execute__FP15daObjCRVSTEEL_c = .text:0x00000258; // type:function size:0x20 scope:global
daObjCRVSTEEL_Draw__FP15daObjCRVSTEEL_c = .text:0x0000022C; // type:function size:0x2C scope:local
daObjCRVSTEEL_Execute__FP15daObjCRVSTEEL_c = .text:0x00000258; // type:function size:0x20 scope:local
CreateHeap__15daObjCRVSTEEL_cFv = .text:0x00000278; // type:function size:0x78 scope:global
create__15daObjCRVSTEEL_cFv = .text:0x000002F0; // type:function size:0x200 scope:global
__dt__12dBgS_ObjAcchFv = .text:0x000004F0; // type:function size:0x70 scope:global
daObjCRVSTEEL_IsDelete__FP15daObjCRVSTEEL_c = .text:0x00000560; // type:function size:0x8 scope:global
daObjCRVSTEEL_IsDelete__FP15daObjCRVSTEEL_c = .text:0x00000560; // type:function size:0x8 scope:local
Create__15daObjCRVSTEEL_cFv = .text:0x00000568; // type:function size:0x44 scope:global
Execute__15daObjCRVSTEEL_cFPPA3_A4_f = .text:0x000005AC; // type:function size:0x4C scope:global
Draw__15daObjCRVSTEEL_cFv = .text:0x000005F8; // type:function size:0x84 scope:global
@@ -38,8 +38,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@3949 = .rodata:0x0000002C; // type:object size:0x4 scope:local
@3950 = .rodata:0x00000030; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000034; // type:object size:0x2F scope:local data:string_table
l_arcName = .data:0x00000000; // type:object size:0x4 scope:global
l_daObjCRVSTEEL_Method = .data:0x00000004; // type:object size:0x20 scope:global
l_arcName = .data:0x00000000; // type:object size:0x4 scope:local
l_daObjCRVSTEEL_Method = .data:0x00000004; // type:object size:0x20 scope:local
g_profile_Obj_CRVSTEEL = .data:0x00000024; // type:object size:0x30 scope:global
__vt__12dBgS_ObjAcch = .data:0x00000054; // type:object size:0x24 scope:global
__vt__15daObjCRVSTEEL_c = .data:0x00000078; // type:object size:0x28 scope:global
config/GZ2E01/rels/d_a_obj_kantera/symbols.txt
+8 -8
View File
@@ -23,17 +23,17 @@ actionGetDemo__15daItemKantera_cFv = .text:0x00000D4C; // type:function size:0x6
execute__15daItemKantera_cFv = .text:0x00000DB0; // type:function size:0x12C scope:global
draw__15daItemKantera_cFv = .text:0x00000EDC; // type:function size:0x54 scope:global
_delete__15daItemKantera_cFv = .text:0x00000F30; // type:function size:0x38 scope:global
daItemKantera_Draw__FP15daItemKantera_c = .text:0x00000F68; // type:function size:0x20 scope:global
daItemKantera_Execute__FP15daItemKantera_c = .text:0x00000F88; // type:function size:0x20 scope:global
daItemKantera_Delete__FP15daItemKantera_c = .text:0x00000FA8; // type:function size:0x20 scope:global
daItemKantera_Create__FP10fopAc_ac_c = .text:0x00000FC8; // type:function size:0x20 scope:global
daItemKantera_Draw__FP15daItemKantera_c = .text:0x00000F68; // type:function size:0x20 scope:local
daItemKantera_Execute__FP15daItemKantera_c = .text:0x00000F88; // type:function size:0x20 scope:local
daItemKantera_Delete__FP15daItemKantera_c = .text:0x00000FA8; // type:function size:0x20 scope:local
daItemKantera_Create__FP10fopAc_ac_c = .text:0x00000FC8; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00000FE8; // type:function size:0x48 scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x00001030; // type:function size:0x8 scope:local
@20@__dt__12dBgS_ObjAcchFv = .text:0x00001038; // type:function size:0x8 scope:local
_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
@3856 = .rodata:0x00000048; // type:object size:0x8 scope:local
@3857 = .rodata:0x00000050; // type:object size:0x8 scope:local
@@ -48,14 +48,14 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global
@4145 = .rodata:0x00000080; // type:object size:0x4 scope:local data:string
@stringBase0 = .rodata:0x00000084; // type:object size:0x10 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
@4184 = .data:0x00000020; // type:object size:0xC scope:local
@4185 = .data:0x0000002C; // type:object size:0xC scope:local
@4186 = .data:0x00000038; // type:object size:0xC scope:local
@4187 = .data:0x00000044; // type:object size:0xC scope:local
l_demoFunc$4183 = .data:0x00000050; // type:object size:0x30 scope:local
l_daItemKantera_Method = .data:0x00000080; // type:object size:0x20 scope:global
l_daItemKantera_Method = .data:0x00000080; // type:object size:0x20 scope:local
g_profile_Obj_Kantera = .data:0x000000A0; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x000000D0; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x000000DC; // type:object size:0xC scope:global
@@ -65,4 +65,4 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global
__vt__15daItemKantera_c = .data:0x00000130; // type:object size:0x44 scope:global
__vt__8cM3dGPla = .data:0x00000174; // type:object size:0xC scope:global
lbl_494_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_494_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
config/GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt
+8 -8
View File
@@ -33,10 +33,10 @@ mode_proc_sink__11daOnsTaru_cFv = .text:0x00001050; // type:function size:0xF0 s
breakEffSet__11daOnsTaru_cFv = .text:0x00001140; // type:function size:0x298 scope:global
Draw__11daOnsTaru_cFv = .text:0x000013D8; // type:function size:0xA4 scope:global
Delete__11daOnsTaru_cFv = .text:0x0000147C; // type:function size:0x30 scope:global
daOnsTaru_Draw__FP11daOnsTaru_c = .text:0x000014AC; // type:function size:0x2C scope:global
daOnsTaru_Execute__FP11daOnsTaru_c = .text:0x000014D8; // type:function size:0x2C scope:global
daOnsTaru_Delete__FP11daOnsTaru_c = .text:0x00001504; // type:function size:0x2C scope:global
daOnsTaru_Create__FP10fopAc_ac_c = .text:0x00001530; // type:function size:0x20 scope:global
daOnsTaru_Draw__FP11daOnsTaru_c = .text:0x000014AC; // type:function size:0x2C scope:local
daOnsTaru_Execute__FP11daOnsTaru_c = .text:0x000014D8; // type:function size:0x2C scope:local
daOnsTaru_Delete__FP11daOnsTaru_c = .text:0x00001504; // type:function size:0x2C scope:local
daOnsTaru_Create__FP10fopAc_ac_c = .text:0x00001530; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00001550; // type:function size:0x48 scope:global
__dt__15daOnsTaru_HIO_cFv = .text:0x00001598; // type:function size:0x6C scope:global
__sinit_d_a_obj_onsenTaru_cpp = .text:0x00001604; // type:function size:0x70 scope:local
@@ -68,7 +68,7 @@ mCcDObjInfo__11daOnsTaru_c = .rodata:0x00000008; // type:object size:0x30 scope:
@4186 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
@stringBase0 = .rodata:0x0000007C; // type:object size:0x21 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
mCcDCyl__11daOnsTaru_c = .data:0x00000020; // type:object size:0x44 scope:global
@4002 = .data:0x00000064; // type:object size:0xC scope:local
@@ -77,7 +77,7 @@ mCcDCyl__11daOnsTaru_c = .data:0x00000020; // type:object size:0x44 scope:global
@4005 = .data:0x00000088; // type:object size:0xC scope:local
@4006 = .data:0x00000094; // type:object size:0xC scope:local
l_mode_func$4001 = .data:0x000000A0; // type:object size:0x3C scope:local
l_daOnsTaru_Method = .data:0x000000DC; // type:object size:0x20 scope:global
l_daOnsTaru_Method = .data:0x000000DC; // type:object size:0x20 scope:local
g_profile_Obj_OnsenTaru = .data:0x000000FC; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x0000012C; // type:object size:0xC scope:global
__vt__10cCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global
@@ -91,5 +91,5 @@ __vt__18fOpAcm_HIO_entry_c = .data:0x000001B0; // type:object size:0xC scope:glo
__vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3647 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte
lbl_588_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000014; // type:object size:0x10 scope:local data:byte
init$1920 = .bss:0x00000024; // type:object size:0x1 scope:local data:byte
config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt
+20 -20
View File
@@ -1,7 +1,7 @@
_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
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000078; // type:function size:0x28 scope:global
rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c = .text:0x00000078; // type:function size:0x28 scope:local
create1st__13daObjPDtile_cFv = .text:0x000000A0; // type:function size:0x1A0 scope:global
setMtx__13daObjPDtile_cFv = .text:0x00000240; // type:function size:0x110 scope:global
rideActor__13daObjPDtile_cFP10fopAc_ac_c = .text:0x00000350; // type:function size:0x260 scope:global
@@ -11,13 +11,13 @@ Execute__13daObjPDtile_cFPPA3_A4_f = .text:0x00000734; // type:function size:0xB
__dt__14dBgS_ObjGndChkFv = .text:0x00001298; // type:function size:0x78 scope:global
Draw__13daObjPDtile_cFv = .text:0x00001310; // type:function size:0x144 scope:global
Delete__13daObjPDtile_cFv = .text:0x00001454; // type:function size:0x44 scope:global
daObjPDtile_create1st__FP13daObjPDtile_c = .text:0x00001498; // type:function size:0xFC scope:global
daObjPDtile_create1st__FP13daObjPDtile_c = .text:0x00001498; // type:function size:0xFC scope:local
__dt__8cM3dGCylFv = .text:0x00001594; // type:function size:0x48 scope:global
__dt__8cM3dGAabFv = .text:0x000015DC; // type:function size:0x48 scope:global
__dt__10dCcD_GSttsFv = .text:0x00001624; // type:function size:0x5C scope:global
daObjPDtile_MoveBGDelete__FP13daObjPDtile_c = .text:0x00001680; // type:function size:0x20 scope:global
daObjPDtile_MoveBGExecute__FP13daObjPDtile_c = .text:0x000016A0; // type:function size:0x20 scope:global
daObjPDtile_MoveBGDraw__FP13daObjPDtile_c = .text:0x000016C0; // type:function size:0x2C scope:global
daObjPDtile_MoveBGDelete__FP13daObjPDtile_c = .text:0x00001680; // type:function size:0x20 scope:local
daObjPDtile_MoveBGExecute__FP13daObjPDtile_c = .text:0x000016A0; // type:function size:0x20 scope:local
daObjPDtile_MoveBGDraw__FP13daObjPDtile_c = .text:0x000016C0; // type:function size:0x2C scope:local
__dt__10cCcD_GSttsFv = .text:0x000016EC; // type:function size:0x48 scope:global
__dt__13daObjPDtile_cFv = .text:0x00001734; // type:function size:0x178 scope:global
@20@__dt__14dBgS_ObjGndChkFv = .text:0x000018AC; // type:function size:0x8 scope:local
@@ -56,22 +56,22 @@ _dtors = .dtors:0x00000000; // type:label scope:global
@4256 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
@stringBase0 = .rodata:0x00000074; // type:object size:0x1C 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
l_arcName4 = .data:0x00000020; // type:object size:0x4 scope:global
l_dzbidx4 = .data:0x00000024; // type:object size:0x8 scope:global
l_bmdidx4 = .data:0x0000002C; // type:object size:0x8 scope:global
l_cull_box4 = .data:0x00000034; // type:object size:0x30 scope:global
l_arcName7 = .data:0x00000064; // type:object size:0x4 scope:global
l_dzbidx7 = .data:0x00000068; // type:object size:0x4 scope:global
l_bmdidx7 = .data:0x0000006C; // type:object size:0x4 scope:global
l_cull_box7 = .data:0x00000070; // type:object size:0x18 scope:global
l_arcName9 = .data:0x00000088; // type:object size:0x4 scope:global
l_dzbidx9 = .data:0x0000008C; // type:object size:0x4 scope:global
l_bmdidx9 = .data:0x00000090; // type:object size:0x4 scope:global
l_cull_box9 = .data:0x00000094; // type:object size:0x18 scope:global
cc_cyl_src = .data:0x000000AC; // type:object size:0x44 scope:global
daObjPDtile_METHODS = .data:0x000000F0; // type:object size:0x20 scope:global
l_arcName4 = .data:0x00000020; // type:object size:0x4 scope:local
l_dzbidx4 = .data:0x00000024; // type:object size:0x8 scope:local
l_bmdidx4 = .data:0x0000002C; // type:object size:0x8 scope:local
l_cull_box4 = .data:0x00000034; // type:object size:0x30 scope:local
l_arcName7 = .data:0x00000064; // type:object size:0x4 scope:local
l_dzbidx7 = .data:0x00000068; // type:object size:0x4 scope:local
l_bmdidx7 = .data:0x0000006C; // type:object size:0x4 scope:local
l_cull_box7 = .data:0x00000070; // type:object size:0x18 scope:local
l_arcName9 = .data:0x00000088; // type:object size:0x4 scope:local
l_dzbidx9 = .data:0x0000008C; // type:object size:0x4 scope:local
l_bmdidx9 = .data:0x00000090; // type:object size:0x4 scope:local
l_cull_box9 = .data:0x00000094; // type:object size:0x18 scope:local
cc_cyl_src = .data:0x000000AC; // type:object size:0x44 scope:local
daObjPDtile_METHODS = .data:0x000000F0; // type:object size:0x20 scope:local
g_profile_Obj_PDtile = .data:0x00000110; // type:object size:0x30 scope:global
__vt__10cCcD_GStts = .data:0x00000140; // type:object size:0xC scope:global
__vt__10dCcD_GStts = .data:0x0000014C; // type:object size:0xC scope:global
config/GZ2E01/rels/d_a_obj_stone/symbols.txt
+32 -32
View File
@@ -3,7 +3,7 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global
_unresolved = .text:0x00000058; // type:function size:0x20 scope:global
bound__FP4cXyzRC13cBgS_PolyInfof = .text:0x00000078; // type:function size:0x2E4 scope:global
__dt__8cM3dGPlaFv = .text:0x0000035C; // type:function size:0x48 scope:global
CheckCreateHeap__FP10fopAc_ac_c = .text:0x000003A4; // type:function size:0x20 scope:global
CheckCreateHeap__FP10fopAc_ac_c = .text:0x000003A4; // type:function size:0x20 scope:local
initBaseMtx__12daObjStone_cFv = .text:0x000003C4; // type:function size:0xA4 scope:global
setBaseMtx__12daObjStone_cFv = .text:0x00000468; // type:function size:0xD8 scope:global
Create__12daObjStone_cFv = .text:0x00000540; // type:function size:0x280 scope:global
@@ -40,10 +40,10 @@ set_carry_eff__12daObjStone_cFv = .text:0x000036D8; // type:function size:0x104
effect_delete__12daObjStone_cFb = .text:0x000037DC; // type:function size:0xAC scope:global
draw__12daObjStone_cFv = .text:0x00003888; // type:function size:0xC0 scope:global
_delete__12daObjStone_cFv = .text:0x00003948; // type:function size:0x74 scope:global
daObjStone_Draw__FP12daObjStone_c = .text:0x000039BC; // type:function size:0x20 scope:global
daObjStone_Execute__FP12daObjStone_c = .text:0x000039DC; // type:function size:0x20 scope:global
daObjStone_Delete__FP12daObjStone_c = .text:0x000039FC; // type:function size:0x20 scope:global
daObjStone_Create__FP10fopAc_ac_c = .text:0x00003A1C; // type:function size:0x20 scope:global
daObjStone_Draw__FP12daObjStone_c = .text:0x000039BC; // type:function size:0x20 scope:local
daObjStone_Execute__FP12daObjStone_c = .text:0x000039DC; // type:function size:0x20 scope:local
daObjStone_Delete__FP12daObjStone_c = .text:0x000039FC; // type:function size:0x20 scope:local
daObjStone_Create__FP10fopAc_ac_c = .text:0x00003A1C; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00003A3C; // type:function size:0x48 scope:global
@36@__dt__12dBgS_ObjAcchFv = .text:0x00003A84; // type:function size:0x8 scope:local
@20@__dt__12dBgS_ObjAcchFv = .text:0x00003A8C; // type:function size:0x8 scope:local
@@ -53,29 +53,29 @@ __dt__10cCcD_GSttsFv = .text:0x00003A3C; // type:function size:0x48 scope:global
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
...rodata.0 = .rodata:0x00000000; // type:label scope:local
l_bmdIdx = .rodata:0x00000000; // type:object size:0x8 scope:global
l_sph_src = .rodata:0x00000008; // type:object size:0x40 scope:global
l_r = .rodata:0x00000048; // type:object size:0x8 scope:global
l_rolling_speedF = .rodata:0x00000050; // type:object size:0x8 scope:global
l_rolling_time = .rodata:0x00000058; // type:object size:0x8 scope:global
l_initial_offsetY = .rodata:0x00000060; // type:object size:0x8 scope:global
l_put_offsetY = .rodata:0x00000068; // type:object size:0x8 scope:global
l_weight = .rodata:0x00000070; // type:object size:0x2 scope:global
l_speedH = .rodata:0x00000074; // type:object size:0x8 scope:global
l_speedV = .rodata:0x0000007C; // type:object size:0x8 scope:global
l_water_speedH = .rodata:0x00000084; // type:object size:0x8 scope:global
l_water_speedV = .rodata:0x0000008C; // type:object size:0x8 scope:global
l_water_resist = .rodata:0x00000094; // type:object size:0x8 scope:global
l_water_walk_resist = .rodata:0x0000009C; // type:object size:0x8 scope:global
l_buoyancy = .rodata:0x000000A4; // type:object size:0x8 scope:global
l_shadow_size = .rodata:0x000000AC; // type:object size:0x8 scope:global
l_wpillar_scl = .rodata:0x000000B4; // type:object size:0x8 scope:global
l_hamon_scl = .rodata:0x000000BC; // type:object size:0x8 scope:global
l_yogan_eff_scl = .rodata:0x000000C4; // type:object size:0x8 scope:global
l_wall_h = .rodata:0x000000CC; // type:object size:0x8 scope:global
l_wall_r = .rodata:0x000000D4; // type:object size:0x8 scope:global
l_rot_angle = .rodata:0x000000DC; // type:object size:0x4 scope:global
l_walk_rot_angle = .rodata:0x000000E0; // type:object size:0x4 scope:global
l_bmdIdx = .rodata:0x00000000; // type:object size:0x8 scope:local
l_sph_src = .rodata:0x00000008; // type:object size:0x40 scope:local
l_r = .rodata:0x00000048; // type:object size:0x8 scope:local
l_rolling_speedF = .rodata:0x00000050; // type:object size:0x8 scope:local
l_rolling_time = .rodata:0x00000058; // type:object size:0x8 scope:local
l_initial_offsetY = .rodata:0x00000060; // type:object size:0x8 scope:local
l_put_offsetY = .rodata:0x00000068; // type:object size:0x8 scope:local
l_weight = .rodata:0x00000070; // type:object size:0x2 scope:local
l_speedH = .rodata:0x00000074; // type:object size:0x8 scope:local
l_speedV = .rodata:0x0000007C; // type:object size:0x8 scope:local
l_water_speedH = .rodata:0x00000084; // type:object size:0x8 scope:local
l_water_speedV = .rodata:0x0000008C; // type:object size:0x8 scope:local
l_water_resist = .rodata:0x00000094; // type:object size:0x8 scope:local
l_water_walk_resist = .rodata:0x0000009C; // type:object size:0x8 scope:local
l_buoyancy = .rodata:0x000000A4; // type:object size:0x8 scope:local
l_shadow_size = .rodata:0x000000AC; // type:object size:0x8 scope:local
l_wpillar_scl = .rodata:0x000000B4; // type:object size:0x8 scope:local
l_hamon_scl = .rodata:0x000000BC; // type:object size:0x8 scope:local
l_yogan_eff_scl = .rodata:0x000000C4; // type:object size:0x8 scope:local
l_wall_h = .rodata:0x000000CC; // type:object size:0x8 scope:local
l_wall_r = .rodata:0x000000D4; // type:object size:0x8 scope:local
l_rot_angle = .rodata:0x000000DC; // type:object size:0x4 scope:local
l_walk_rot_angle = .rodata:0x000000E0; // type:object size:0x4 scope:local
@3746 = .rodata:0x000000E4; // type:object size:0x4 scope:local
@3747 = .rodata:0x000000E8; // type:object size:0x8 scope:local
@3748 = .rodata:0x000000F0; // type:object size:0x8 scope:local
@@ -112,9 +112,9 @@ l_eff_id$5089 = .rodata:0x0000016C; // type:object size:0x6 scope:local
l_carry_eff_id$5307 = .rodata:0x00000180; // type:object size:0x6 scope:local
@stringBase0 = .rodata:0x00000188; // type:object size:0x17 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
l_arcName = .data:0x00000020; // type:object size:0x8 scope:global
l_arcName = .data:0x00000020; // type:object size:0x8 scope:local
@4015 = .data:0x00000028; // type:object size:0xC scope:local
@4016 = .data:0x00000034; // type:object size:0xC scope:local
@4017 = .data:0x00000040; // type:object size:0xC scope:local
@@ -123,7 +123,7 @@ l_arcName = .data:0x00000020; // type:object size:0x8 scope:global
@4020 = .data:0x00000064; // type:object size:0xC scope:local
@4021 = .data:0x00000070; // type:object size:0xC scope:local
l_func$4014 = .data:0x0000007C; // type:object size:0x54 scope:local
l_daObjStone_Method = .data:0x000000D0; // type:object size:0x20 scope:global
l_daObjStone_Method = .data:0x000000D0; // type:object size:0x20 scope:local
g_profile_Obj_Stone = .data:0x000000F0; // type:object size:0x30 scope:global
__vt__14dBgS_ObjGndChk = .data:0x00000120; // type:object size:0x30 scope:global
__vt__12dBgS_AcchCir = .data:0x00000150; // type:object size:0xC scope:global
@@ -133,4 +133,4 @@ __vt__8cM3dGSph = .data:0x00000174; // type:object size:0xC scope:global
__vt__8cM3dGAab = .data:0x00000180; // type:object size:0xC scope:global
__vt__12dBgS_ObjAcch = .data:0x0000018C; // type:object size:0x24 scope:global
__vt__8cM3dGPla = .data:0x000001B0; // type:object size:0xC scope:global
lbl_633_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
lbl_633_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte
config/GZ2E01/rels/d_a_obj_wdStick/symbols.txt
+8 -8
View File
@@ -37,10 +37,10 @@ mode_init_sink__11daWdStick_cFv = .text:0x00002308; // type:function size:0x24 s
mode_proc_sink__11daWdStick_cFv = .text:0x0000232C; // type:function size:0x124 scope:global
Draw__11daWdStick_cFv = .text:0x00002450; // type:function size:0x64 scope:global
Delete__11daWdStick_cFv = .text:0x000024B4; // type:function size:0x30 scope:global
daWdStick_Draw__FP11daWdStick_c = .text:0x000024E4; // type:function size:0x2C scope:global
daWdStick_Execute__FP11daWdStick_c = .text:0x00002510; // type:function size:0x2C scope:global
daWdStick_Delete__FP11daWdStick_c = .text:0x0000253C; // type:function size:0x2C scope:global
daWdStick_Create__FP10fopAc_ac_c = .text:0x00002568; // type:function size:0x20 scope:global
daWdStick_Draw__FP11daWdStick_c = .text:0x000024E4; // type:function size:0x2C scope:local
daWdStick_Execute__FP11daWdStick_c = .text:0x00002510; // type:function size:0x2C scope:local
daWdStick_Delete__FP11daWdStick_c = .text:0x0000253C; // type:function size:0x2C scope:local
daWdStick_Create__FP10fopAc_ac_c = .text:0x00002568; // type:function size:0x20 scope:local
__dt__10cCcD_GSttsFv = .text:0x00002588; // type:function size:0x48 scope:global
__dt__15daWdStick_HIO_cFv = .text:0x000025D0; // type:function size:0x5C scope:global
__sinit_d_a_obj_wdStick_cpp = .text:0x0000262C; // type:function size:0x70 scope:local
@@ -94,7 +94,7 @@ mCcDObjInfo__11daWdStick_c = .rodata:0x00000000; // type:object size:0x30 scope:
@4780 = .rodata:0x000000D4; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x000000D8; // type:object size:0xA 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
mCcDSph__11daWdStick_c = .data:0x00000020; // type:object size:0x40 scope:global
@4470 = .data:0x00000060; // type:object size:0xC scope:local
@@ -103,7 +103,7 @@ mCcDSph__11daWdStick_c = .data:0x00000020; // type:object size:0x40 scope:global
@4473 = .data:0x00000084; // type:object size:0xC scope:local
@4474 = .data:0x00000090; // type:object size:0xC scope:local
l_mode_func$4469 = .data:0x0000009C; // type:object size:0x3C scope:local
l_daWdStick_Method = .data:0x000000D8; // type:object size:0x20 scope:global
l_daWdStick_Method = .data:0x000000D8; // type:object size:0x20 scope:local
g_profile_Obj_WdStick = .data:0x000000F8; // type:object size:0x30 scope:global
__vt__14dBgS_ObjGndChk = .data:0x00000128; // type:object size:0x30 scope:global
__vt__8cM3dGPla = .data:0x00000158; // type:object size:0xC scope:global
@@ -118,5 +118,5 @@ __vt__15daWdStick_HIO_c = .data:0x000001DC; // type:object size:0xC scope:global
__vt__14mDoHIO_entry_c = .data:0x000001E8; // type:object size:0xC scope:global
__global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
@3643 = .bss:0x00000008; // type:object size:0xC scope:local
l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:2byte
lbl_683_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte
l_HIO = .bss:0x00000014; // type:object size:0xC scope:local data:2byte
lbl_683_bss_20 = .bss:0x00000020; // type:object size:0x1 scope:local data:byte
configure.py
+8 -8
View File
@@ -851,7 +851,7 @@ config.libs = [
Object(Matching, "Z2AudioLib/Z2Calc.cpp"),
Object(NonMatching, "Z2AudioLib/Z2AudioArcLoader.cpp"),
Object(Matching, "Z2AudioLib/Z2Param.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SoundMgr.cpp"),
Object(Matching, "Z2AudioLib/Z2SoundMgr.cpp"),
Object(Matching, "Z2AudioLib/Z2SoundStarter.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SoundHandles.cpp"),
Object(NonMatching, "Z2AudioLib/Z2SeMgr.cpp"),
@@ -1698,7 +1698,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_ks"),
ActorRel(NonMatching, "d_a_npc_kyury"),
ActorRel(NonMatching, "d_a_npc_len"),
ActorRel(NonMatching, "d_a_npc_lf"),
ActorRel(Matching, "d_a_npc_lf"),
ActorRel(NonMatching, "d_a_npc_lud"),
ActorRel(NonMatching, "d_a_npc_midp"),
ActorRel(Matching, "d_a_npc_mk"),
@@ -1796,7 +1796,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_crvhahen"),
ActorRel(NonMatching, "d_a_obj_crvlh_down"),
ActorRel(NonMatching, "d_a_obj_crvlh_up"),
ActorRel(NonMatching, "d_a_obj_crvsteel"),
ActorRel(Matching, "d_a_obj_crvsteel"),
ActorRel(Matching, "d_a_obj_crystal"),
ActorRel(NonMatching, "d_a_obj_cwall"),
ActorRel(Matching, "d_a_obj_damCps"),
@@ -1859,7 +1859,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_kago"),
ActorRel(NonMatching, "d_a_obj_kaisou"),
ActorRel(NonMatching, "d_a_obj_kamakiri"),
ActorRel(NonMatching, "d_a_obj_kantera"),
ActorRel(Matching, "d_a_obj_kantera"),
ActorRel(NonMatching, "d_a_obj_katatsumuri"),
ActorRel(Matching, "d_a_obj_kazeneko"),
ActorRel(NonMatching, "d_a_obj_kbox"),
@@ -1953,9 +1953,9 @@ config.libs = [
ActorRel(Matching, "d_a_obj_oiltubo"),
ActorRel(Matching, "d_a_obj_onsen"),
ActorRel(Matching, "d_a_obj_onsenFire"),
ActorRel(NonMatching, "d_a_obj_onsenTaru"),
ActorRel(Matching, "d_a_obj_onsenTaru"),
ActorRel(NonMatching, "d_a_obj_pdoor"),
ActorRel(NonMatching, "d_a_obj_pdtile"),
ActorRel(Matching, "d_a_obj_pdtile"),
ActorRel(NonMatching, "d_a_obj_pdwall"),
ActorRel(NonMatching, "d_a_obj_picture"),
ActorRel(Matching, "d_a_obj_pillar"),
@@ -1998,7 +1998,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_ss_drink"),
ActorRel(Matching, "d_a_obj_ss_item"),
ActorRel(NonMatching, "d_a_obj_stairBlock"),
ActorRel(NonMatching, "d_a_obj_stone"),
ActorRel(Equivalent, "d_a_obj_stone"),
ActorRel(NonMatching, "d_a_obj_stopper"),
ActorRel(NonMatching, "d_a_obj_stopper2"),
ActorRel(Matching, "d_a_obj_suisya"),
@@ -2048,7 +2048,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_waterPillar"),
ActorRel(Matching, "d_a_obj_waterfall"),
ActorRel(NonMatching, "d_a_obj_wchain"),
ActorRel(NonMatching, "d_a_obj_wdStick"),
ActorRel(Matching, "d_a_obj_wdStick"),
ActorRel(NonMatching, "d_a_obj_web0"),
ActorRel(Matching, "d_a_obj_web1"),
ActorRel(Matching, "d_a_obj_well_cover"),
include/JSystem/JAudio2/JAISound.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
JAISoundID() {}
bool isAnonymous() { return mId.mFullId == 0xffffffff; }
bool isAnonymous() const { return mId.mFullId == 0xffffffff; }
void setAnonymous() { mId.mFullId = -1; }
union {
include/SSystem/SComponent/c_cc_d.h
+1
View File
@@ -45,6 +45,7 @@ enum cCcD_ObjAtType {
/* 0x00004000 */ AT_TYPE_HOOKSHOT = (1 << 14),
/* 0x00008000 */ AT_TYPE_8000 = (1 << 15),
/* 0x00010000 */ AT_TYPE_BOOMERANG = (1 << 16),
/* 0x00020000 */ AT_TYPE_20000 = (1 << 17),
/* 0x00040000 */ AT_TYPE_40000 = (1 << 18),
/* 0x00080000 */ AT_TYPE_SPINNER = (1 << 19),
/* 0x00100000 */ AT_TYPE_CSTATUE_BOSS_SWING = (1 << 20),
include/Z2AudioLib/Z2Audience.h
+2 -2
View File
@@ -215,8 +215,8 @@ struct Z2Audience : public JAIAudience, public JASGlobalInstance<Z2Audience> {
/* 802BD71C */ virtual void mixChannelOut(JASSoundParams const&, JAIAudible*, int);
Z2SpotMic* getLinkMic() { return mLinkMic; }
JGeometry::TVec3<f32> getAudioCamPos() {
return *mAudioCamera[0].getPos();
JGeometry::TVec3<f32> getAudioCamPos(int idx) {
return *mAudioCamera[idx].getPos();
}
Z2Audience3DSetting* getSetting() { return &mSetting; }
include/d/actor/d_a_npc_lf.h
+2 -2
View File
@@ -8,8 +8,8 @@ struct lf_s {
/* 80A6A8E0 */ lf_s();
/* 0x00 */ J3DModel* mpModel;
/* 0x04 */ cXyz field_0x04;
/* 0x10 */ csXyz field_0x10;
/* 0x04 */ cXyz mPos;
/* 0x10 */ csXyz mAngle;
/* 0x16 */ s8 field_0x16;
/* 0x17 */ s8 field_0x17;
/* 0x18 */ s16 field_0x18;
include/d/actor/d_a_obj_crvsteel.h
+24 -8
View File
@@ -1,6 +1,9 @@
#ifndef D_A_OBJ_CRVSTEEL_H
#define D_A_OBJ_CRVSTEEL_H
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -11,7 +14,7 @@
* @details
*
*/
class daObjCRVSTEEL_c : public fopAc_ac_c {
class daObjCRVSTEEL_c : public dBgS_MoveBgActor {
public:
/* 80BD5BFC */ void OpenSet(f32, f32);
/* 80BD5C18 */ void CloseSet(f32);
@@ -19,15 +22,28 @@ public:
/* 80BD5CA0 */ void OpenExecute();
/* 80BD5CC8 */ void Action();
/* 80BD5D10 */ void setBaseMtx();
/* 80BD5DB8 */ void CreateHeap();
/* 80BD5E30 */ void create();
/* 80BD60A8 */ void Create();
/* 80BD60EC */ void Execute(f32 (**)[3][4]);
/* 80BD6138 */ void Draw();
/* 80BD61BC */ void Delete();
/* 80BD5DB8 */ int CreateHeap();
/* 80BD5E30 */ int create();
/* 80BD60A8 */ int Create();
/* 80BD60EC */ int Execute(Mtx**);
/* 80BD6138 */ int Draw();
/* 80BD61BC */ int Delete();
private:
/* 0x568 */ u8 field_0x568[0x848 - 0x568];
/* 0x5A0 */ u32 mSmokeParticle1;
/* 0x5A4 */ u32 mSmokeParticle2;
/* 0x5A8 */ s16 mAction;
/* 0x5AC */ f32 mMaxHeight;
/* 0x5B0 */ f32 mMinHeight;
/* 0x5B4 */ f32 field_0x5b4;
/* 0x5B8 */ f32 field_0x5b8;
/* 0x5BC */ f32 field_0x5bc;
/* 0x5C0 */ J3DModel* mModel;
/* 0x5C4 */ request_of_phase_process_class mPhase;
/* 0x5CC */ dBgS_AcchCir mAcchCir;
/* 0x60C */ dBgS_ObjAcch mAcch;
/* 0x7E4 */ dCcD_Stts mStts;
/* 0x820 */ u8 field_0x820[0x848 - 0x820];
};
STATIC_ASSERT(sizeof(daObjCRVSTEEL_c) == 0x848);
include/d/actor/d_a_obj_kantera.h
+2
View File
@@ -13,6 +13,8 @@
*/
class daItemKantera_c : public daItemBase_c {
public:
typedef int (daItemKantera_c::*actionFunc)();
/* 80C389BC */ void initBaseMtx();
/* 80C389F8 */ void setBaseMtx();
/* 80C38A64 */ int Create();
include/d/actor/d_a_obj_pdtile.h
+48 -9
View File
@@ -1,6 +1,8 @@
#ifndef D_A_OBJ_PDTILE_H
#define D_A_OBJ_PDTILE_H
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -11,20 +13,57 @@
* @details
*
*/
class daObjPDtile_c : public fopAc_ac_c {
class daObjPDtile_c : public dBgS_MoveBgActor, request_of_phase_process_class {
public:
/* 80CAACE0 */ void create1st();
enum Type {
TYPE_0,
TYPE_1,
TYPE_2,
TYPE_3,
TYPE_4,
};
/* 80CAACE0 */ int create1st();
/* 80CAAE80 */ void setMtx();
/* 80CAAF90 */ void rideActor(fopAc_ac_c*);
/* 80CAB1F0 */ void CreateHeap();
/* 80CAB258 */ void Create();
/* 80CAB374 */ void Execute(f32 (**)[3][4]);
/* 80CABF50 */ void Draw();
/* 80CAC094 */ void Delete();
/* 80CAC374 */ ~daObjPDtile_c();
/* 80CAB1F0 */ int CreateHeap();
/* 80CAB258 */ int Create();
/* 80CAB374 */ int Execute(Mtx**);
/* 80CABF50 */ int Draw();
/* 80CAC094 */ int Delete();
/* 80CAC374 */ virtual ~daObjPDtile_c() {}
u8 getType() { return fopAcM_GetParamBit(this, 0, 4); }
private:
/* 0x568 */ u8 field_0x568[0x7fc - 0x568];
/* 0x5A8 */ Mtx mBgMtx;
/* 0x5D8 */ Mtx field_0x5d8;
/* 0x608 */ J3DModel* mModel;
/* 0x60C */ Type mType;
/* 0x610 */ int field_0x610;
/* 0x614 */ u8 field_0x614;
/* 0x618 */ int field_0x618;
/* 0x61C */ f32 field_0x61c;
/* 0x620 */ cXyz field_0x620;
/* 0x62C */ f32 field_0x62c;
/* 0x630 */ u8 field_0x630;
/* 0x634 */ dCcD_Stts mStts;
/* 0x670 */ dCcD_Cyl mCyl;
/* 0x7AC */ int field_0x7ac;
/* 0x7B0 */ s16 field_0x7b0;
/* 0x7B2 */ s16 field_0x7b2;
/* 0x7B4 */ u8 field_0x7b4;
/* 0x7B5 */ u8 field_0x7b5;
/* 0x7B8 */ int field_0x7b8;
/* 0x7BC */ char* mArcName;
/* 0x7C0 */ u32 mDzbId;
/* 0x7C4 */ u32 mBmdId;
/* 0x7C8 */ Vec* mCullBox;
/* 0x7CC */ f32 field_0x7cc;
/* 0x7D0 */ u8 field_0x7d0;
/* 0x7D4 */ int field_0x7d4;
/* 0x7D8 */ int field_0x7d8;
/* 0x7DC */ Z2SoundObjSimple mSoundObj;
};
STATIC_ASSERT(sizeof(daObjPDtile_c) == 0x7fc);
include/d/actor/d_a_obj_stone.h
+8 -3
View File
@@ -18,6 +18,8 @@ enum {
*/
class daObjStone_c : public fopAc_ac_c {
public:
typedef void (daObjStone_c::*modeFunc)();
u8 getType() { return fopAcM_GetParamBit(this,0,4); }
u8 getItemType() { return fopAcM_GetParamBit(this,4,2); }
u8 getItemNo() { return fopAcM_GetParamBit(this,8,8); }
@@ -67,7 +69,7 @@ private:
/* 0x0908 */ u8 field_0x0908;
/* 0x090C */ u32 mMode; // maybe a better name for this
/* 0x0910 */ cXyz field_0x0910;
/* 0x091C */ u16 field_0x091c;
/* 0x091C */ s16 field_0x091c;
/* 0x091E */ u8 field_0x091E[0x0920 - 0x091E];
/* 0x0920 */ Quaternion field_0x0920;
/* 0x0930 */ Quaternion field_0x0930;
@@ -75,11 +77,14 @@ private:
/* 0x0944 */ f32 mLastPosY;
/* 0x0948 */ f32 mLastSpeedY; // maybe a better name for this
/* 0x094C */ u8 field_0x094c;
/* 0x094C */ u8 field_0x094d;
/* 0x094D */ u8 field_0x094d;
/* 0x094E */ bool mIsInWater;
/* 0x094F */ u8 field_0x094f;
/* 0x0950 */ u8 field_0x0950;
/* 0x0951 */ u8 field_0x0951[0x0960 - 0x0951];
/* 0x0951 */ u8 field_0x0951;
/* 0x0954 */ u32 field_0x0954;
/* 0x0954 */ u32 field_0x0958;
/* 0x0954 */ u32 field_0x095c;
/* 0x0960 */ u32 field_0x0960;
/* 0x0964 */ JPABaseEmitter* field_0x0964[3];
/* 0x0970 */ Z2SoundObjSimple mSound;
include/d/actor/d_a_obj_wdStick.h
+57 -12
View File
@@ -1,6 +1,8 @@
#ifndef D_A_OBJ_WDSTICK_H
#define D_A_OBJ_WDSTICK_H
#include "d/d_bg_s_acch.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
/**
@@ -13,14 +15,24 @@
*/
class daWdStick_c : public fopAc_ac_c {
public:
typedef void (daWdStick_c::*modeFunc)();
enum Mode {
MODE_WAIT,
MODE_CARRY,
MODE_DROP,
MODE_ROLL,
MODE_SINK,
};
/* 80D31BD0 */ void setBaseMtx();
/* 80D31C58 */ void CreateHeap();
/* 80D31CC4 */ void create();
/* 80D32168 */ void createHeapCallBack(fopAc_ac_c*);
/* 80D31C58 */ virtual int CreateHeap();
/* 80D31CC4 */ int create();
/* 80D32168 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80D32194 */ void lightInit();
/* 80D32198 */ void setLight();
/* 80D3219C */ void setFire();
/* 80D3269C */ void Execute();
/* 80D3269C */ virtual int Execute();
/* 80D32DB4 */ void bgCheck();
/* 80D33348 */ void setBoundSe();
/* 80D333F4 */ void mode_proc_call();
@@ -32,25 +44,58 @@ public:
/* 80D33890 */ void mode_proc_drop();
/* 80D338DC */ void mode_init_roll();
/* 80D338F4 */ void mode_proc_roll();
/* 80D33D44 */ void chkWaterLineIn();
/* 80D33D44 */ BOOL chkWaterLineIn();
/* 80D33D68 */ void mode_init_sink();
/* 80D33D8C */ void mode_proc_sink();
/* 80D33EB0 */ void Draw();
/* 80D33F14 */ void Delete();
/* 80D33EB0 */ virtual int Draw();
/* 80D33F14 */ virtual int Delete();
static u8 const mCcDObjInfo[48];
static u8 mCcDSph[64];
static dCcD_SrcGObjInf const mCcDObjInfo;
static dCcD_SrcSph mCcDSph;
private:
/* 0x568 */ u8 field_0x568[0xaf8 - 0x568];
/* 0x56C */ request_of_phase_process_class mPhase;
/* 0x574 */ J3DModel* mModel;
/* 0x578 */ u8 mMode;
/* 0x579 */ bool misCarrying;
/* 0x57C */ cXyz field_0x57c;
/* 0x588 */ u8 field_0x588[0x594 - 0x588];
/* 0x594 */ cXyz field_0x594;
/* 0x5A0 */ dBgS_ObjAcch mAcch;
/* 0x778 */ dBgS_AcchCir mAcchCir;
/* 0x7B8 */ dCcD_Stts mStts;
/* 0x7F4 */ dCcD_Sph mSph1;
/* 0x92C */ dCcD_Sph mSph2;
/* 0xA64 */ cXyz field_0xa64;
/* 0xA70 */ cXyz field_0xa70;
/* 0xA7C */ cXyz field_0xa7c;
/* 0xA88 */ cXyz field_0xa88;
/* 0xA94 */ cXyz field_0xa94;
/* 0xAA0 */ cXyz field_0xaa0;
/* 0xAAC */ u8 field_0xaac;
/* 0xAAD */ u8 field_0xaad;
/* 0xAAE */ u16 field_0xaae;
/* 0xAB0 */ u16 field_0xab0;
/* 0xAB4 */ cXyz field_0xab4;
/* 0xAC0 */ cXyz field_0xac0;
/* 0xACC */ cXyz field_0xacc;
/* 0xAD8 */ cXyz field_0xad8;
/* 0xAE4 */ u32 field_0xae4[2];
/* 0xAEC */ u32 field_0xaec[2];
/* 0xAF4 */ u8 field_0xaf4;
};
STATIC_ASSERT(sizeof(daWdStick_c) == 0xaf8);
class daWdStick_HIO_c {
class daWdStick_HIO_c : public mDoHIO_entry_c {
public:
/* 80D31B4C */ daWdStick_HIO_c();
/* 80D34030 */ ~daWdStick_HIO_c();
/* 80D34030 */ virtual ~daWdStick_HIO_c() {}
/* 0x04 */ u8 field_0x04;
/* 0x05 */ u8 field_0x05;
/* 0x06 */ s16 field_0x06;
/* 0x08 */ u8 field_0x08;
};
include/d/actor/d_a_player.h
+1
View File
@@ -894,6 +894,7 @@ public:
bool checkCargoCarry() const { return mSpecialMode == SMODE_CARGO_CARRY; }
bool getHeavyStateAndBoots() { return checkNoResetFlg0(FLG0_HVY_STATE); }
bool checkEnemyAttentionLock() const { return checkResetFlg0(RFLG0_ENEMY_ATTN_LOCK); }
bool getGrabUpStart() const { return checkResetFlg0(RFLG0_UNK_8000); }
bool checkCanoeSlider() const { return mSpecialMode == 0x2D; }
bool checkGoatStopGame() const { return mSpecialMode == 0x2A; }
u8 getCutType() const { return mCutType; }
src/Z2AudioLib/Z2SeMgr.cpp
+11 -8
View File
@@ -119,7 +119,7 @@ void Z2SeMgr::modHeightAtCamera(Vec const** param_0) {
}
}
field_0x340[idx] = **param_0;
Vec cam_pos = Z2GetAudience()->getAudioCamPos();
Vec cam_pos = Z2GetAudience()->getAudioCamPos(0);
if (field_0x340[idx].y > cam_pos.y) {
field_0x340[idx].y = cam_pos.y;
}
@@ -266,19 +266,19 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
break;
case Z2SE_SY_TALK_START:
case Z2SE_SY_TALK_END:
if (Z2GetSceneMgr()->getCurrentSceneNum() != 0) {
if (Z2GetStatusMgr()->getDemoStatus() != 0) {
return false;
}
break;
case Z2SE_SY_TALK_NEXT:
if (Z2GetSceneMgr()->isMovieDemo()) {
if (Z2GetStatusMgr()->isMovieDemo()) {
i_soundID = Z2SE_SY_DEMO_MESSAGE_NEXT;
}
break;
case Z2SE_SY_TALK_WIN_CLOSE:
if (Z2GetSceneMgr()->getCurrentSceneNum() == 1) {
if (Z2GetStatusMgr()->getDemoStatus() == 1) {
i_soundID = Z2SE_SY_TALK_END;
} else if (Z2GetSceneMgr()->isMovieDemo()) {
} else if (Z2GetStatusMgr()->isMovieDemo()) {
i_soundID = Z2SE_SY_DEMO_MESSAGE_END;
}
break;
@@ -287,11 +287,13 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
return false;
}
break;
case Z2SE_OBJ_CHANDELIER_SWING:
if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) {
case Z2SE_OBJ_CHANDELIER_SWING: {
Vec tmp = Z2GetAudience()->getAudioCamPos(0);
if (i_pos->y > tmp.y) {
return false;
}
break;
}
case Z2SE_OBJ_CHANDLV5_SWING:
i_volume = Z2Calc::getParamByExp(param_2, 35.0f, 261.0f, 0.4f, 0.05f, 1.0f,
Z2Calc::CURVE_SIGN_2);
@@ -313,7 +315,8 @@ bool Z2SeMgr::seStart(JAISoundID i_soundID, Vec const* i_pos, u32 param_2, s8 i_
Z2Calc::CURVE_SIGN_2);
break;
case Z2SE_OBJ_L8_B_FOG_FLY:
if (i_pos->y > Z2GetAudience()->getAudioCamPos().y) {
Vec tmp = Z2GetAudience()->getAudioCamPos(0);
if (i_pos->y > tmp.y) {
return false;
}
break;
src/Z2AudioLib/Z2SoundMgr.cpp
-4
View File
@@ -1,5 +1,4 @@
//
// Generated By: dol2asm
// Translation Unit: Z2SoundMgr
//
@@ -169,7 +168,6 @@ bool Z2SoundMgr::startSound(JAISoundID i_soundID, JAISoundHandle* i_handle,
/* 802AA1B0-802AA270 2A4AF0 00C0+00 2/2 0/0 0/0 .text calc__10Z2SoundMgrFv */
// NONMATCHING extra load
void Z2SoundMgr::calc() {
mSeMgr.calc();
if (!mSoundID.isAnonymous() && !isPlayingSoundID(mSoundID)) {
@@ -358,7 +356,6 @@ void Z2SoundMgr::initParams() {
/* 802AA9E8-802AAAC4 2A5328 00DC+00 0/0 1/1 0/0 .text
* multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf */
// NONMATCHING extra load
void Z2SoundMgr::multiVolumeSoundID(JAISoundID i_soundID, f32 i_multi) {
if (!i_soundID.isAnonymous() && Z2GetSoundInfo()->getSoundType(i_soundID) == 0) {
JSUList<JAISe>* list =
@@ -373,7 +370,6 @@ void Z2SoundMgr::multiVolumeSoundID(JAISoundID i_soundID, f32 i_multi) {
/* 802AAAC4-802AAB94 2A5404 00D0+00 1/1 0/0 0/0 .text isPlayingSoundID__10Z2SoundMgrF10JAISoundID
*/
// NONMATCHING extra load
bool Z2SoundMgr::isPlayingSoundID(JAISoundID i_soundID) {
if (i_soundID.isAnonymous()) {
return false;

Some files were not shown because too many files have changed in this diff Show More