diff --git a/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt index 8ee3b2f8570..b3c2f5c6f71 100644 --- a/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt @@ -1,8 +1,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 -checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:global -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:global +checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:local +doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:local initBaseMtx__13daObjThDoor_cFv = .text:0x00000198; // type:function size:0x3C scope:global setBaseMtx__13daObjThDoor_cFv = .text:0x000001D4; // type:function size:0x64 scope:global Create__13daObjThDoor_cFv = .text:0x00000238; // type:function size:0x140 scope:global @@ -20,15 +20,15 @@ demoProc__13daObjThDoor_cFv = .text:0x000009B4; // type:function size:0x238 scop checkArea__13daObjThDoor_cFv = .text:0x00000BEC; // type:function size:0xE4 scope:global Draw__13daObjThDoor_cFv = .text:0x00000CD0; // type:function size:0xA4 scope:global Delete__13daObjThDoor_cFv = .text:0x00000D74; // type:function size:0x34 scope:global -daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:global +daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:local __dt__8dCcD_CylFv = .text:0x00000E64; // type:function size:0xCC scope:global __ct__8dCcD_CylFv = .text:0x00000F30; // type:function size:0x84 scope:global __dt__8cM3dGCylFv = .text:0x00000FB4; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x00000FFC; // type:function size:0x48 scope:global __dt__10dCcD_GSttsFv = .text:0x00001044; // type:function size:0x5C scope:global -daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:global +daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:local __dt__10cCcD_GSttsFv = .text:0x0000110C; // type:function size:0x48 scope:global cLib_calcTimer__FPUc = .text:0x00001154; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -46,24 +46,23 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3991 = .rodata:0x00000024; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000028; // type:object size:0x35 scope:local data:string_table ...data.0 = .data:0x00000000; // type:label scope:local -cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global -@1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_658_data_10 = .data:0x00000010; // type:object size:0x10 -l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte -l_evName = .data:0x00000024; // type:object size:0x4 scope:global -l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte -l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global +cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local +@1787 = .data:0x0000000C; // type:object size:0x14 scope:local +l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte +l_evName = .data:0x00000024; // type:object size:0x4 scope:local +l_staffName = .data:0x00000028; // type:object size:0x4 scope:local data:4byte +l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local @3829 = .data:0x00000070; // type:object size:0xC scope:local @3830 = .data:0x0000007C; // type:object size:0xC scope:local @3831 = .data:0x00000088; // type:object size:0xC scope:local @3832 = .data:0x00000094; // type:object size:0xC scope:local l_func$3828 = .data:0x000000A0; // type:object size:0x30 scope:local action_table$3895 = .data:0x000000D0; // type:object size:0xC scope:local -daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:global +daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:local g_profile_Obj_TDoor = .data:0x000000FC; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x0000012C; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_658_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_zra_rock/symbols.txt b/config/GZ2E01/rels/d_a_obj_zra_rock/symbols.txt index 9d9e8bf6236..7184d8302af 100644 --- a/config/GZ2E01/rels/d_a_obj_zra_rock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_zra_rock/symbols.txt @@ -13,11 +13,11 @@ __dt__12J3DFrameCtrlFv = .text:0x00000694; // type:function size:0x48 scope:glob Execute__14daObjZraRock_cFPPA3_A4_f = .text:0x000006DC; // type:function size:0x58 scope:global Draw__14daObjZraRock_cFv = .text:0x00000734; // type:function size:0x138 scope:global Delete__14daObjZraRock_cFv = .text:0x0000086C; // type:function size:0x6C scope:global -daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:global -daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:global -daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:global -daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:global -daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:global +daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:local +daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:local +daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:local +daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:local +daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x0000096C; // type:function size:0x8 scope:local @20@__dt__12dBgS_ObjAcchFv = .text:0x00000974; // type:function size:0x8 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -28,8 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3816 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float @3903 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000010; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Obj_ZraRock = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_ObjAcch = .data:0x00000054; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000078; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt index 2d34b102da1..458820c3799 100644 --- a/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt @@ -1,8 +1,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 -checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:global -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:global +checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:local +doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:local initBaseMtx__13daObjThDoor_cFv = .text:0x00000198; // type:function size:0x3C scope:global setBaseMtx__13daObjThDoor_cFv = .text:0x000001D4; // type:function size:0x64 scope:global Create__13daObjThDoor_cFv = .text:0x00000238; // type:function size:0x140 scope:global @@ -20,15 +20,15 @@ demoProc__13daObjThDoor_cFv = .text:0x000009B4; // type:function size:0x238 scop checkArea__13daObjThDoor_cFv = .text:0x00000BEC; // type:function size:0xE4 scope:global Draw__13daObjThDoor_cFv = .text:0x00000CD0; // type:function size:0xA4 scope:global Delete__13daObjThDoor_cFv = .text:0x00000D74; // type:function size:0x34 scope:global -daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:global +daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:local __dt__8dCcD_CylFv = .text:0x00000E64; // type:function size:0xCC scope:global __ct__8dCcD_CylFv = .text:0x00000F30; // type:function size:0x84 scope:global __dt__8cM3dGCylFv = .text:0x00000FB4; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x00000FFC; // type:function size:0x48 scope:global __dt__10dCcD_GSttsFv = .text:0x00001044; // type:function size:0x5C scope:global -daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:global +daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:local __dt__10cCcD_GSttsFv = .text:0x0000110C; // type:function size:0x48 scope:global cLib_calcTimer__FPUc = .text:0x00001154; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -45,24 +45,23 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3990 = .rodata:0x00000020; // type:object size:0x4 scope:local @3991 = .rodata:0x00000024; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000028; // type:object size:0x35 scope:local data:string_table -cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global -@1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_658_data_10 = .data:0x00000010; // type:object size:0x10 -l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte -l_evName = .data:0x00000024; // type:object size:0x4 scope:global -l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte -l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global +cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local +@1787 = .data:0x0000000C; // type:object size:0x14 scope:local +l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte +l_evName = .data:0x00000024; // type:object size:0x4 scope:local +l_staffName = .data:0x00000028; // type:object size:0x4 scope:local data:4byte +l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local @3829 = .data:0x00000070; // type:object size:0xC scope:local @3830 = .data:0x0000007C; // type:object size:0xC scope:local @3831 = .data:0x00000088; // type:object size:0xC scope:local @3832 = .data:0x00000094; // type:object size:0xC scope:local l_func$3828 = .data:0x000000A0; // type:object size:0x30 scope:local action_table$3895 = .data:0x000000D0; // type:object size:0xC scope:local -daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:global +daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:local g_profile_Obj_TDoor = .data:0x000000FC; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x0000012C; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_658_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local diff --git a/config/GZ2J01/rels/d_a_obj_zra_rock/symbols.txt b/config/GZ2J01/rels/d_a_obj_zra_rock/symbols.txt index 9d9e8bf6236..7184d8302af 100644 --- a/config/GZ2J01/rels/d_a_obj_zra_rock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_zra_rock/symbols.txt @@ -13,11 +13,11 @@ __dt__12J3DFrameCtrlFv = .text:0x00000694; // type:function size:0x48 scope:glob Execute__14daObjZraRock_cFPPA3_A4_f = .text:0x000006DC; // type:function size:0x58 scope:global Draw__14daObjZraRock_cFv = .text:0x00000734; // type:function size:0x138 scope:global Delete__14daObjZraRock_cFv = .text:0x0000086C; // type:function size:0x6C scope:global -daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:global -daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:global -daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:global -daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:global -daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:global +daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:local +daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:local +daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:local +daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:local +daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x0000096C; // type:function size:0x8 scope:local @20@__dt__12dBgS_ObjAcchFv = .text:0x00000974; // type:function size:0x8 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -28,8 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3816 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float @3903 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000010; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Obj_ZraRock = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_ObjAcch = .data:0x00000054; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000078; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt index 2d34b102da1..458820c3799 100644 --- a/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt @@ -1,8 +1,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 -checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:global -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:global +checkPlayerPos__FP13daObjThDoor_c = .text:0x00000078; // type:function size:0xA4 scope:local +doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000011C; // type:function size:0x7C scope:local initBaseMtx__13daObjThDoor_cFv = .text:0x00000198; // type:function size:0x3C scope:global setBaseMtx__13daObjThDoor_cFv = .text:0x000001D4; // type:function size:0x64 scope:global Create__13daObjThDoor_cFv = .text:0x00000238; // type:function size:0x140 scope:global @@ -20,15 +20,15 @@ demoProc__13daObjThDoor_cFv = .text:0x000009B4; // type:function size:0x238 scop checkArea__13daObjThDoor_cFv = .text:0x00000BEC; // type:function size:0xE4 scope:global Draw__13daObjThDoor_cFv = .text:0x00000CD0; // type:function size:0xA4 scope:global Delete__13daObjThDoor_cFv = .text:0x00000D74; // type:function size:0x34 scope:global -daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:global +daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000DA8; // type:function size:0xBC scope:local __dt__8dCcD_CylFv = .text:0x00000E64; // type:function size:0xCC scope:global __ct__8dCcD_CylFv = .text:0x00000F30; // type:function size:0x84 scope:global __dt__8cM3dGCylFv = .text:0x00000FB4; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x00000FFC; // type:function size:0x48 scope:global __dt__10dCcD_GSttsFv = .text:0x00001044; // type:function size:0x5C scope:global -daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:global -daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:global +daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000010A0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x000010C0; // type:function size:0x20 scope:local +daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x2C scope:local __dt__10cCcD_GSttsFv = .text:0x0000110C; // type:function size:0x48 scope:global cLib_calcTimer__FPUc = .text:0x00001154; // type:function size:0x1C scope:global _ctors = .ctors:0x00000000; // type:label scope:global @@ -45,24 +45,23 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3990 = .rodata:0x00000020; // type:object size:0x4 scope:local @3991 = .rodata:0x00000024; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000028; // type:object size:0x35 scope:local data:string_table -cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global -@1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_658_data_10 = .data:0x00000010; // type:object size:0x10 -l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte -l_evName = .data:0x00000024; // type:object size:0x4 scope:global -l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte -l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:global +cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local +@1787 = .data:0x0000000C; // type:object size:0x14 scope:local +l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte +l_evName = .data:0x00000024; // type:object size:0x4 scope:local +l_staffName = .data:0x00000028; // type:object size:0x4 scope:local data:4byte +l_cyl_src = .data:0x0000002C; // type:object size:0x44 scope:local @3829 = .data:0x00000070; // type:object size:0xC scope:local @3830 = .data:0x0000007C; // type:object size:0xC scope:local @3831 = .data:0x00000088; // type:object size:0xC scope:local @3832 = .data:0x00000094; // type:object size:0xC scope:local l_func$3828 = .data:0x000000A0; // type:object size:0x30 scope:local action_table$3895 = .data:0x000000D0; // type:object size:0xC scope:local -daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:global +daObjThDoor_METHODS = .data:0x000000DC; // type:object size:0x20 scope:local g_profile_Obj_TDoor = .data:0x000000FC; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x0000012C; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_658_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local diff --git a/config/GZ2P01/rels/d_a_obj_zra_rock/symbols.txt b/config/GZ2P01/rels/d_a_obj_zra_rock/symbols.txt index 9d9e8bf6236..7184d8302af 100644 --- a/config/GZ2P01/rels/d_a_obj_zra_rock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_zra_rock/symbols.txt @@ -13,11 +13,11 @@ __dt__12J3DFrameCtrlFv = .text:0x00000694; // type:function size:0x48 scope:glob Execute__14daObjZraRock_cFPPA3_A4_f = .text:0x000006DC; // type:function size:0x58 scope:global Draw__14daObjZraRock_cFv = .text:0x00000734; // type:function size:0x138 scope:global Delete__14daObjZraRock_cFv = .text:0x0000086C; // type:function size:0x6C scope:global -daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:global -daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:global -daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:global -daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:global -daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:global +daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x000008D8; // type:function size:0x2C scope:local +daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000904; // type:function size:0x20 scope:local +daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000924; // type:function size:0x8 scope:local +daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000092C; // type:function size:0x20 scope:local +daObjZraRock_create__FP10fopAc_ac_c = .text:0x0000094C; // type:function size:0x20 scope:local @36@__dt__12dBgS_ObjAcchFv = .text:0x0000096C; // type:function size:0x8 scope:local @20@__dt__12dBgS_ObjAcchFv = .text:0x00000974; // type:function size:0x8 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -28,8 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3816 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float @3903 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000010; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global -l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local +l_daObjZraRock_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Obj_ZraRock = .data:0x00000024; // type:object size:0x30 scope:global __vt__12dBgS_ObjAcch = .data:0x00000054; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000078; // type:object size:0xC scope:global diff --git a/config/RZDE01_00/rels/d_a_obj_thashi/symbols.txt b/config/RZDE01_00/rels/d_a_obj_thashi/symbols.txt index d8bc3d61c2c..ae9b9e8caa7 100644 --- a/config/RZDE01_00/rels/d_a_obj_thashi/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_thashi/symbols.txt @@ -77,4 +77,4 @@ lbl_658_data_182 = .data:0x00000182; // type:object size:0xF data:string lbl_658_data_191 = .data:0x00000191; // type:object size:0xF data:string lbl_658_data_1A0 = .data:0x000001A0; // type:object size:0xF data:string lbl_658_data_1AF = .data:0x000001AF; // type:object size:0x11 -lbl_658_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 data:byte scope:local diff --git a/config/RZDE01_00/rels/d_a_obj_thdoor/symbols.txt b/config/RZDE01_00/rels/d_a_obj_thdoor/symbols.txt index 6220447c7ca..ff8346948f0 100644 --- a/config/RZDE01_00/rels/d_a_obj_thdoor/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_thdoor/symbols.txt @@ -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:0x4 scope:global -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000005C; // type:function size:0xDC scope:global +doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x0000005C; // type:function size:0xDC scope:local setBaseMtx__13daObjThDoor_cFv = .text:0x00000138; // type:function size:0x64 scope:global Create__13daObjThDoor_cFv = .text:0x0000019C; // type:function size:0x13C scope:global CreateHeap__13daObjThDoor_cFv = .text:0x000002D8; // type:function size:0x68 scope:global @@ -17,10 +17,10 @@ demoProc__13daObjThDoor_cFv = .text:0x00000810; // type:function size:0x260 scop checkArea__13daObjThDoor_cFv = .text:0x00000A70; // type:function size:0xDC scope:global Draw__13daObjThDoor_cFv = .text:0x00000B4C; // type:function size:0x98 scope:global Delete__13daObjThDoor_cFv = .text:0x00000BE4; // type:function size:0x30 scope:global -daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000C14; // type:function size:0xB0 scope:global -daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x00000CC4; // type:function size:0x4 scope:global -daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x00000CC8; // type:function size:0x4 scope:global -daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x00000CCC; // type:function size:0x10 scope:global +daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x00000C14; // type:function size:0xB0 scope:local +daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x00000CC4; // type:function size:0x4 scope:local +daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x00000CC8; // type:function size:0x4 scope:local +daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x00000CCC; // type:function size:0x10 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local @@ -35,19 +35,19 @@ _dtors = .dtors:0x00000000; // type:label scope:global @93658 = .rodata:0x00000020; // type:object size:0x4 scope:local @93659 = .rodata:0x00000024; // type:object size:0x4 scope:local lbl_659_data_0 = .data:0x00000000; // type:object size:0xC data:4byte -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte lbl_659_data_10 = .data:0x00000010; // type:object size:0x10 data:string -l_evName = .data:0x00000020; // type:object size:0x4 scope:global +l_evName = .data:0x00000020; // type:object size:0x4 scope:local lbl_659_data_24 = .data:0x00000024; // type:object size:0x8 -l_staffName = .data:0x0000002C; // type:object size:0x4 scope:global data:4byte -l_cyl_src = .data:0x00000030; // type:object size:0x44 scope:global +l_staffName = .data:0x0000002C; // type:object size:0x4 scope:local data:4byte +l_cyl_src = .data:0x00000030; // type:object size:0x44 scope:local l_func$92234 = .data:0x00000074; // type:object size:0x30 scope:local lbl_659_data_A4 = .data:0x000000A4; // type:object size:0x5 data:string lbl_659_data_A9 = .data:0x000000A9; // type:object size:0x4 data:string lbl_659_data_AD = .data:0x000000AD; // type:object size:0x7 action_table$92290 = .data:0x000000B4; // type:object size:0xC scope:local lbl_659_data_C0 = .data:0x000000C0; // type:object size:0x8 -daObjThDoor_METHODS = .data:0x000000C8; // type:object size:0x20 scope:global +daObjThDoor_METHODS = .data:0x000000C8; // type:object size:0x20 scope:local g_profile_Obj_TDoor = .data:0x000000E8; // type:object size:0x30 scope:global __vt__13daObjThDoor_c = .data:0x00000118; // type:object size:0x28 scope:global lbl_659_data_140 = .data:0x00000140; // type:object size:0x10 diff --git a/config/RZDE01_00/rels/d_a_obj_zra_rock/symbols.txt b/config/RZDE01_00/rels/d_a_obj_zra_rock/symbols.txt index 9bd97366bd8..922dba60d72 100644 --- a/config/RZDE01_00/rels/d_a_obj_zra_rock/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_zra_rock/symbols.txt @@ -11,11 +11,11 @@ create__14daObjZraRock_cFv = .text:0x0000045C; // type:function size:0x164 scope Execute__14daObjZraRock_cFPPA3_A4_f = .text:0x000005C0; // type:function size:0x58 scope:global Draw__14daObjZraRock_cFv = .text:0x00000618; // type:function size:0xD0 scope:global Delete__14daObjZraRock_cFv = .text:0x000006E8; // type:function size:0x68 scope:global -daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x00000750; // type:function size:0x10 scope:global -daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000760; // type:function size:0x4 scope:global -daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000764; // type:function size:0x8 scope:global -daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000076C; // type:function size:0x4 scope:global -daObjZraRock_create__FP10fopAc_ac_c = .text:0x00000770; // type:function size:0x4 scope:global +daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x00000750; // type:function size:0x10 scope:local +daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000760; // type:function size:0x4 scope:local +daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000764; // type:function size:0x8 scope:local +daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x0000076C; // type:function size:0x4 scope:local +daObjZraRock_create__FP10fopAc_ac_c = .text:0x00000770; // type:function size:0x4 scope:local dComIfGd_setListBG__Fv = .text:0x00000774; // type:function size:0x24 scope:global _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @@ -25,9 +25,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @95795 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float @95874 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float lbl_702_data_0 = .data:0x00000000; // type:object size:0xC -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte lbl_702_data_10 = .data:0x00000010; // type:object size:0x10 -l_daObjZraRock_Method = .data:0x00000020; // type:object size:0x20 scope:global +l_daObjZraRock_Method = .data:0x00000020; // type:object size:0x20 scope:local g_profile_Obj_ZraRock = .data:0x00000040; // type:object size:0x30 scope:global __vt__14daObjZraRock_c = .data:0x00000070; // type:object size:0x28 scope:global lbl_702_data_98 = .data:0x00000098; // type:object size:0x10 diff --git a/config/ShieldD/rels/d_a_obj_thdoorD/symbols.txt b/config/ShieldD/rels/d_a_obj_thdoorD/symbols.txt index 6f4d53621af..641ce8e76ee 100644 --- a/config/ShieldD/rels/d_a_obj_thdoorD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_thdoorD/symbols.txt @@ -5,8 +5,8 @@ __register_global_object = .text:0x00000080; // type:function size:0x20 scope:gl __destroy_global_chain = .text:0x000000A0; // type:function size:0x5C scope:global __ct__17daObjThDoor_HIO_cFv = .text:0x00000100; // type:function size:0x40 scope:global genMessage__17daObjThDoor_HIO_cFP11JORMContext = .text:0x00000140; // type:function size:0x68 scope:global -checkPlayerPos__FP13daObjThDoor_c = .text:0x000001B0; // type:function size:0x8C scope:global -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x00000240; // type:function size:0xA8 scope:global +checkPlayerPos__FP13daObjThDoor_c = .text:0x000001B0; // type:function size:0x8C scope:local +doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x00000240; // type:function size:0xA8 scope:local initBaseMtx__13daObjThDoor_cFv = .text:0x000002F0; // type:function size:0x3C scope:global setBaseMtx__13daObjThDoor_cFv = .text:0x00000330; // type:function size:0x54 scope:global Create__13daObjThDoor_cFv = .text:0x00000390; // type:function size:0x1A4 scope:global @@ -29,11 +29,11 @@ demoProc__13daObjThDoor_cFv = .text:0x00000D30; // type:function size:0x218 scop checkArea__13daObjThDoor_cFv = .text:0x00000F50; // type:function size:0xC8 scope:global Draw__13daObjThDoor_cFv = .text:0x00001020; // type:function size:0x68 scope:global Delete__13daObjThDoor_cFv = .text:0x00001090; // type:function size:0x44 scope:global -daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x7C scope:global +daObjThDoor_create1st__FP13daObjThDoor_c = .text:0x000010E0; // type:function size:0x7C scope:local __ct__13daObjThDoor_cFv = .text:0x00001160; // type:function size:0x70 scope:global -daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000011D0; // type:function size:0x28 scope:global -daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x00001200; // type:function size:0x28 scope:global -daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x00001230; // type:function size:0x28 scope:global +daObjThDoor_MoveBGDelete__FP13daObjThDoor_c = .text:0x000011D0; // type:function size:0x28 scope:local +daObjThDoor_MoveBGExecute__FP13daObjThDoor_c = .text:0x00001200; // type:function size:0x28 scope:local +daObjThDoor_MoveBGDraw__FP13daObjThDoor_c = .text:0x00001230; // type:function size:0x28 scope:local __dt__17daObjThDoor_HIO_cFv = .text:0x00001260; // type:function size:0x5C scope:global __sinit_\d_a_obj_thdoor_cpp = .text:0x000012C0; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -50,16 +50,16 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117452 = .rodata:0x0000001C; // type:object size:0x4 scope:local @117453 = .rodata:0x00000020; // type:object size:0x4 scope:local @117454 = .rodata:0x00000024; // type:object size:0x4 scope:local -cNullVec__6Z2Calc = .rodata:0x00000028; // type:object size:0xC scope:global +cNullVec__6Z2Calc = .rodata:0x00000028; // type:object size:0xC scope:local @46916 = .rodata:0x00000034; // type:object size:0x4 scope:local lbl_647_rodata_38 = .rodata:0x00000038; // type:object size:0x14 @117119 = .data:0x00000000; // type:object size:0x9 scope:local data:string -l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte +l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte @117120 = .data:0x00000010; // type:object size:0x10 scope:local data:string -l_evName = .data:0x00000020; // type:object size:0x4 scope:global +l_evName = .data:0x00000020; // type:object size:0x4 scope:local @117121 = .data:0x00000024; // type:object size:0x7 scope:local data:string -l_staffName = .data:0x0000002C; // type:object size:0x4 scope:global data:4byte -l_cyl_src = .data:0x00000030; // type:object size:0x44 scope:global +l_staffName = .data:0x0000002C; // type:object size:0x4 scope:local data:4byte +l_cyl_src = .data:0x00000030; // type:object size:0x44 scope:local @117143 = .data:0x00000074; // type:object size:0x11 scope:local @117225 = .data:0x00000088; // type:object size:0x24 scope:local @117254 = .data:0x000000AC; // type:object size:0x13 scope:local data:string @@ -73,7 +73,7 @@ l_cyl_src = .data:0x00000030; // type:object size:0x44 scope:global @117397 = .data:0x00000164; // type:object size:0x6 scope:local data:string @LOCAL@demoProc__13daObjThDoor_cFv@action_table = .data:0x0000016C; // type:object size:0xC scope:local @117425 = .data:0x00000178; // type:object size:0x6 scope:local data:string -daObjThDoor_METHODS = .data:0x00000180; // type:object size:0x20 scope:global +daObjThDoor_METHODS = .data:0x00000180; // type:object size:0x20 scope:local g_profile_Obj_TDoor = .data:0x000001A0; // type:object size:0x30 scope:global __vt__17daObjThDoor_HIO_c = .data:0x000001D0; // type:object size:0x20 scope:global @117575 = .data:0x000001F0; // type:object size:0x12 scope:local data:string @@ -96,4 +96,4 @@ __RTTI__13daObjThDoor_c = .data:0x00000278; // type:object size:0x8 scope:global lbl_647_data_369 = .data:0x00000369; // type:object size:0x7F __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @117130 = .bss:0x00000008; // type:object size:0xC scope:local -l_HIO = .bss:0x00000014; // type:object size:0xC scope:global +l_HIO = .bss:0x00000014; // type:object size:0xC scope:local diff --git a/config/ShieldD/rels/d_a_obj_zra_rockD/symbols.txt b/config/ShieldD/rels/d_a_obj_zra_rockD/symbols.txt index e8b2b02234c..6a25d3560cb 100644 --- a/config/ShieldD/rels/d_a_obj_zra_rockD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_zra_rockD/symbols.txt @@ -16,11 +16,11 @@ __ct__14daObjZraRock_cFv = .text:0x000007F0; // type:function size:0x60 scope:gl Execute__14daObjZraRock_cFPPA3_A4_f = .text:0x00000850; // type:function size:0x58 scope:global Draw__14daObjZraRock_cFv = .text:0x000008B0; // type:function size:0xC4 scope:global Delete__14daObjZraRock_cFv = .text:0x00000980; // type:function size:0xA8 scope:global -daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x00000A30; // type:function size:0x28 scope:global -daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000A60; // type:function size:0x28 scope:global -daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000A90; // type:function size:0x8 scope:global -daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x00000AA0; // type:function size:0x44 scope:global -daObjZraRock_create__FP10fopAc_ac_c = .text:0x00000AF0; // type:function size:0x50 scope:global +daObjZraRock_Draw__FP14daObjZraRock_c = .text:0x00000A30; // type:function size:0x28 scope:local +daObjZraRock_Execute__FP14daObjZraRock_c = .text:0x00000A60; // type:function size:0x28 scope:local +daObjZraRock_IsDelete__FP14daObjZraRock_c = .text:0x00000A90; // type:function size:0x8 scope:local +daObjZraRock_Delete__FP14daObjZraRock_c = .text:0x00000AA0; // type:function size:0x44 scope:local +daObjZraRock_create__FP10fopAc_ac_c = .text:0x00000AF0; // type:function size:0x50 scope:local __dt__18daObjZraRock_HIO_cFv = .text:0x00000B40; // type:function size:0x5C scope:global __sinit_\d_a_obj_zra_rock_cpp = .text:0x00000BA0; // type:function size:0x44 scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -36,7 +36,7 @@ cNullVec__6Z2Calc = .rodata:0x00000010; // type:object size:0xC scope:global lbl_690_rodata_20 = .rodata:0x00000020; // type:object size:0x14 @119734 = .data:0x00000000; // type:object size:0x11 scope:local @119735 = .data:0x00000014; // type:object size:0xA scope:local data:string -l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte +l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @119833 = .data:0x00000024; // type:object size:0x15 scope:local data:string @119834 = .data:0x0000003C; // type:object size:0xF scope:local data:string @119835 = .data:0x0000004C; // type:object size:0x5 scope:local data:string @@ -47,7 +47,7 @@ l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @119979 = .data:0x00000094; // type:object size:0xF scope:local data:string @120014 = .data:0x000000A4; // type:object size:0x1A scope:local data:string @120030 = .data:0x000000C0; // type:object size:0x1A scope:local data:string -l_daObjZraRock_Method = .data:0x000000E0; // type:object size:0x20 scope:global +l_daObjZraRock_Method = .data:0x000000E0; // type:object size:0x20 scope:local g_profile_Obj_ZraRock = .data:0x00000100; // type:object size:0x30 scope:global __vt__18daObjZraRock_HIO_c = .data:0x00000130; // type:object size:0x20 scope:global @120032 = .data:0x00000150; // type:object size:0x13 scope:local data:string diff --git a/configure.py b/configure.py index 9ac9cf66273..62676448b73 100755 --- a/configure.py +++ b/configure.py @@ -2135,7 +2135,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01"), "d_a_obj_testcube"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tgake"), ActorRel(NonMatching, "d_a_obj_thashi"), - ActorRel(NonMatching, "d_a_obj_thdoor"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_thdoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_timeFire"), ActorRel(NonMatching, "d_a_obj_tks"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_tmoon"), @@ -2178,7 +2178,7 @@ config.libs = [ ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zrTuraraRock"), ActorRel(Equivalent, "d_a_obj_zraMark"), # weak func order ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zra_freeze"), - ActorRel(NonMatching, "d_a_obj_zra_rock"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zra_rock"), ActorRel(NonMatching, "d_a_passer_mng"), ActorRel(Equivalent, "d_a_peru"), ActorRel(MatchingFor("GZ2E01"), "d_a_ppolamp"), diff --git a/include/d/actor/d_a_e_bs.h b/include/d/actor/d_a_e_bs.h index 5e009ed0b63..03f0e40d4f7 100644 --- a/include/d/actor/d_a_e_bs.h +++ b/include/d/actor/d_a_e_bs.h @@ -64,11 +64,13 @@ public: STATIC_ASSERT(sizeof(e_bs_class) == 0xcfc); -class daE_BS_HIO_c { +class daE_BS_HIO_c : public JORReflexible { public: /* 8068E12C */ daE_BS_HIO_c(); /* 8069091C */ virtual ~daE_BS_HIO_c() {} + void genMessage(JORMContext* ctx); + /* 0x04 */ s8 id; /* 0x08 */ f32 base_size; /* 0x0C */ f32 move_speed; diff --git a/include/d/actor/d_a_obj_thdoor.h b/include/d/actor/d_a_obj_thdoor.h index 25aacf79313..0585ea4acd4 100644 --- a/include/d/actor/d_a_obj_thdoor.h +++ b/include/d/actor/d_a_obj_thdoor.h @@ -1,6 +1,9 @@ #ifndef D_A_OBJ_THDOOR_H #define D_A_OBJ_THDOOR_H +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" +#include "d/d_msg_flow.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,14 +14,23 @@ * @details * */ -class daObjThDoor_c : public fopAc_ac_c { +class daObjThDoor_c : public dBgS_MoveBgActor { public: + typedef void (daObjThDoor_c::*actionFunc)(); + + enum Action { + ACTION_WAIT, + ACTION_ORDER_EVENT, + ACTION_EVENT, + ACTION_DEAD, + }; + /* 80D0D618 */ void initBaseMtx(); /* 80D0D654 */ void setBaseMtx(); - /* 80D0D6B8 */ void Create(); - /* 80D0D7F8 */ void CreateHeap(); - /* 80D0D868 */ void create1st(); - /* 80D0D8E8 */ void Execute(f32 (**)[3][4]); + /* 80D0D6B8 */ int Create(); + /* 80D0D7F8 */ int CreateHeap(); + /* 80D0D868 */ int create1st(); + /* 80D0D8E8 */ int Execute(Mtx**); /* 80D0D9B4 */ void set_cyl(); /* 80D0DAC8 */ void action(); /* 80D0DB90 */ void event_proc_call(); @@ -26,16 +38,41 @@ public: /* 80D0DCC8 */ void actionOrderEvent(); /* 80D0DD90 */ void actionEvent(); /* 80D0DE30 */ void actionDead(); - /* 80D0DE34 */ void demoProc(); - /* 80D0E06C */ void checkArea(); - /* 80D0E150 */ void Draw(); - /* 80D0E1F4 */ void Delete(); + /* 80D0DE34 */ int demoProc(); + /* 80D0E06C */ BOOL checkArea(); + /* 80D0E150 */ int Draw(); + /* 80D0E1F4 */ int Delete(); -private: - /* 0x568 */ u8 field_0x568[0x8c0 - 0x568]; + u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); } + int getMsg() { return fopAcM_GetParamBit(this, 8, 16); } + BOOL checkDemo() { return fopAcM_GetParamBit(this, 24, 1); } + void setAction(u8 action) { mAction = action; } + + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ u8 mAction; + /* 0x5AD */ u8 mMapToolId; + /* 0x5AE */ s16 mEventIdx; + /* 0x5B0 */ int mStaffId; + /* 0x5B4 */ u8 field_0x5b4; + /* 0x5B5 */ u8 field_0x5b5; + /* 0x5B6 */ u8 field_0x5b6; + /* 0x5B8 */ s16 field_0x5b8; + /* 0x5BC */ dMsgFlow_c mMsgFlow; + /* 0x608 */ s16 field_0x608; + /* 0x60A */ s16 field_0x60a; + /* 0x60C */ dCcD_Stts mStts; + /* 0x648 */ dCcD_Cyl mCyls[2]; }; STATIC_ASSERT(sizeof(daObjThDoor_c) == 0x8c0); +#ifdef DEBUG +class daObjThDoor_HIO_c : public mDoHIO_entry_c { +public: + daObjThDoor_HIO_c(); + void genMessage(JORMContext* ctx); +}; +#endif #endif /* D_A_OBJ_THDOOR_H */ diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 41bac4dc75f..df33ceba8b5 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -4,202 +4,80 @@ */ #include "d/actor/d_a_obj_thdoor.h" +#include "d/d_bg_w.h" #include "d/d_cc_d.h" -#include "dol2asm.h" +#include "d/actor/d_a_player.h" +#include "d/d_com_inf_game.h" +#ifdef DEBUG -// -// Forward References: -// +daObjThDoor_HIO_c::daObjThDoor_HIO_c() { +} -extern "C" static void checkPlayerPos__FP13daObjThDoor_c(); -extern "C" static void -doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); -extern "C" void initBaseMtx__13daObjThDoor_cFv(); -extern "C" void setBaseMtx__13daObjThDoor_cFv(); -extern "C" void Create__13daObjThDoor_cFv(); -extern "C" void CreateHeap__13daObjThDoor_cFv(); -extern "C" void create1st__13daObjThDoor_cFv(); -extern "C" void Execute__13daObjThDoor_cFPPA3_A4_f(); -extern "C" void set_cyl__13daObjThDoor_cFv(); -extern "C" void action__13daObjThDoor_cFv(); -extern "C" void event_proc_call__13daObjThDoor_cFv(); -extern "C" void actionWait__13daObjThDoor_cFv(); -extern "C" void actionOrderEvent__13daObjThDoor_cFv(); -extern "C" void actionEvent__13daObjThDoor_cFv(); -extern "C" void actionDead__13daObjThDoor_cFv(); -extern "C" void demoProc__13daObjThDoor_cFv(); -extern "C" void checkArea__13daObjThDoor_cFv(); -extern "C" void Draw__13daObjThDoor_cFv(); -extern "C" void Delete__13daObjThDoor_cFv(); -extern "C" static void daObjThDoor_create1st__FP13daObjThDoor_c(); -extern "C" void __dt__8dCcD_CylFv(); -extern "C" void __ct__8dCcD_CylFv(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" static void daObjThDoor_MoveBGDelete__FP13daObjThDoor_c(); -extern "C" static void daObjThDoor_MoveBGExecute__FP13daObjThDoor_c(); -extern "C" static void daObjThDoor_MoveBGDraw__FP13daObjThDoor_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void func_80D0E5D4(void* _this, u8*); -extern "C" extern char const* const d_a_obj_thdoor__stringBase0; +void daObjThDoor_HIO_c::genMessage(JORMContext* ctx) { + // Telma's door + ctx->genLabel("テルマの家のドア", 0, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); +} -// -// External References: -// - -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void reset__14dEvt_control_cFv(); -extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(); -extern "C" void endCheck__16dEvent_manager_cFs(); -extern "C" void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(); -extern "C" void getIsAddvance__16dEvent_manager_cFi(); -extern "C" void getMyActIdx__16dEvent_manager_cFiPCPCciii(); -extern "C" void getMySubstanceP__16dEvent_manager_cFiPCci(); -extern "C" void cutEnd__16dEvent_manager_cFi(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __ct__10dMsgFlow_cFv(); -extern "C" void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(); -extern "C" void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(); -extern "C" void Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void cLib_addCalcAngleS__FPsssss(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __construct_array(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D0E7E0[4]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D0E5F8-80D0E5FC 000000 0004+00 4/4 0/0 0/0 .rodata @3663 */ -SECTION_RODATA static u8 const lit_3663[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D0E5F8, &lit_3663); +static daObjThDoor_HIO_c l_HIO; +#endif /* 80D0D4F8-80D0D59C 000078 00A4+00 1/1 0/0 0/0 .text checkPlayerPos__FP13daObjThDoor_c */ -static void checkPlayerPos(daObjThDoor_c* param_0) { - // NONMATCHING -} +static BOOL checkPlayerPos(daObjThDoor_c* i_this) { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz acStack_28 = player->current.pos - i_this->current.pos; + mDoMtx_stack_c::YrotS(-i_this->current.angle.y); + mDoMtx_stack_c::multVec(&acStack_28, &acStack_28); -/* ############################################################################################## */ -/* 80D0E5FC-80D0E600 000004 0004+00 1/1 0/0 0/0 .rodata @3681 */ -SECTION_RODATA static f32 const lit_3681 = 3.0f; -COMPILER_STRIP_GATE(0x80D0E5FC, &lit_3681); + BOOL rv = TRUE; + if (acStack_28.z > 0.0f) { + rv = FALSE; + } + + return rv; +} /* 80D0D59C-80D0D618 00011C 007C+00 1/1 0/0 0/0 .text * doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -static void doorCoHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2, - dCcD_GObjInf* param_3) { - // NONMATCHING +static void doorCoHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, + dCcD_GObjInf* param_4) { + daPy_py_c* player = dComIfGp_getLinkPlayer(); + if (param_1 != NULL && param_3 != NULL && param_3 == player && player->speedF > 3.0f) { + if (checkPlayerPos((daObjThDoor_c*)param_1)) { + ((daObjThDoor_c*)param_1)->field_0x60a = 250; + } else { + ((daObjThDoor_c*)param_1)->field_0x60a = -250; + } + } } /* 80D0D618-80D0D654 000198 003C+00 1/1 0/0 0/0 .text initBaseMtx__13daObjThDoor_cFv */ void daObjThDoor_c::initBaseMtx() { - // NONMATCHING + mModel->setBaseScale(scale); + setBaseMtx(); } /* 80D0D654-80D0D6B8 0001D4 0064+00 2/2 0/0 0/0 .text setBaseMtx__13daObjThDoor_cFv */ void daObjThDoor_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(current.angle.y); + mModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -/* ############################################################################################## */ -/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D0E620 = "V_CTDoor"; -SECTION_DEAD static char const* const stringBase_80D0E629 = "CHASE_AWAY_WOLF"; -SECTION_DEAD static char const* const stringBase_80D0E639 = "thdoor"; -#pragma pop - -/* 80D0E658-80D0E664 000000 000C+00 2/2 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80D0E664-80D0E678 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop +UNK_REL_DATA /* 80D0E678-80D0E67C -00001 0004+00 3/4 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_thdoor__stringBase0; +static char* l_arcName = "V_CTDoor"; /* 80D0E67C-80D0E680 -00001 0004+00 0/1 0/0 0/0 .data l_evName */ -#pragma push -#pragma force_active on -SECTION_DATA static void* l_evName = (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x9); -#pragma pop +static char* l_evName = "CHASE_AWAY_WOLF"; /* 80D0E680-80D0E684 -00001 0004+00 1/1 0/0 0/0 .data l_staffName */ -SECTION_DATA static void* l_staffName = (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x19); +static char* l_staffName = "thdoor"; /* 80D0E684-80D0E6C8 00002C 0044+00 0/1 0/0 0/0 .data l_cyl_src */ -#pragma push -#pragma force_active on static dCcD_SrcCyl l_cyl_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x10}, 0x19}}, // mObj @@ -213,215 +91,310 @@ static dCcD_SrcCyl l_cyl_src = { 250.0f // mHeight } // mCyl }; -#pragma pop /* 80D0D6B8-80D0D7F8 000238 0140+00 1/0 0/0 0/0 .text Create__13daObjThDoor_cFv */ -void daObjThDoor_c::Create() { - // NONMATCHING +int daObjThDoor_c::Create() { + if (fopAcM_isSwitch(this, getSwbit())) { + field_0x608 = 0; + setAction(ACTION_DEAD); + } else { + field_0x608 = 5500; + current.angle.y = home.angle.y - field_0x608; + old.angle.y = current.angle.y; + setAction(ACTION_WAIT); + } + + initBaseMtx(); + fopAcM_SetMtx(this, mModel->getBaseTRMtx()); + mStts.Init(0xff, 0xff, this); + + for (int i = 0; i < 2; i = i + 1) { + mCyls[i].Set(l_cyl_src); + mCyls[i].SetStts(&mStts); + mCyls[i].SetCoHitCallback(doorCoHitCallBack); + } + fopAcM_setCullSizeBox2(this, mModel->getModelData()); + mMapToolId = 0xff; + eventInfo.setArchiveName(l_arcName); + mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evName, 0xff); + + // Telma's house door + OS_REPORT("テルマの家のドア:evid<%d>tool<%d>\n", mEventIdx, mMapToolId); + return 1; } /* 80D0D7F8-80D0D868 000378 0070+00 1/0 0/0 0/0 .text CreateHeap__13daObjThDoor_cFv */ -void daObjThDoor_c::CreateHeap() { - // NONMATCHING +int daObjThDoor_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(319, modelData != 0); + mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + return mModel != NULL ? 1 : 0; } /* 80D0D868-80D0D8E8 0003E8 0080+00 1/1 0/0 0/0 .text create1st__13daObjThDoor_cFv */ -void daObjThDoor_c::create1st() { - // NONMATCHING +int daObjThDoor_c::create1st() { + int rv = dComIfG_resLoad(&mPhase, l_arcName); + if (rv == cPhs_COMPLEATE_e) { + rv = MoveBGCreate(l_arcName, 8, NULL, 0xc20, NULL); + if (rv == 5) { + return rv; + } + + #ifdef DEBUG + // Telma's door + OS_REPORT("テルマの家のドア:sw<%d>msg<%d>\n", getSwbit(), getMsg()); + + // Telma's door + l_HIO.entryHIO("テルマの家のドア"); + #endif + } + + return rv; } -/* ############################################################################################## */ -/* 80D0E600-80D0E604 000008 0004+00 1/2 0/0 0/0 .rodata @3765 */ -SECTION_RODATA static f32 const lit_3765 = 1.0f; -COMPILER_STRIP_GATE(0x80D0E600, &lit_3765); - -/* 80D0E604-80D0E608 00000C 0004+00 1/2 0/0 0/0 .rodata @3766 */ -SECTION_RODATA static f32 const lit_3766 = -1.0f; -COMPILER_STRIP_GATE(0x80D0E604, &lit_3766); - /* 80D0D8E8-80D0D9B4 000468 00CC+00 1/0 0/0 0/0 .text Execute__13daObjThDoor_cFPPA3_A4_f */ -void daObjThDoor_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING +int daObjThDoor_c::Execute(Mtx** i_mtx) { + event_proc_call(); + current.angle.y = home.angle.y - field_0x608; + if (field_0x5b5 == 0 && old.angle.y != current.angle.y) { + fopAcM_seStartLevel(this, Z2SE_OBJ_THE_DOOR_MV, 0); + } + *i_mtx = &mBgMtx; + setBaseMtx(); + return 1; } -/* ############################################################################################## */ -/* 80D0E608-80D0E60C 000010 0004+00 0/1 0/0 0/0 .rodata @3807 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3807 = 37.5f; -COMPILER_STRIP_GATE(0x80D0E608, &lit_3807); -#pragma pop - -/* 80D0E60C-80D0E610 000014 0004+00 0/1 0/0 0/0 .rodata @3808 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3808 = 112.5f; -COMPILER_STRIP_GATE(0x80D0E60C, &lit_3808); -#pragma pop - /* 80D0D9B4-80D0DAC8 000534 0114+00 1/1 0/0 0/0 .text set_cyl__13daObjThDoor_cFv */ void daObjThDoor_c::set_cyl() { - // NONMATCHING + cXyz acStack_28[2] = {cXyz(37.5f, 0.0f, 0.0f), cXyz(112.5f, 0.0f, 0.0f)}; + cXyz cStack_38; + for (int i = 0; i < 2; i++) { + cStack_38 = acStack_28[i]; + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y - field_0x608); + mDoMtx_stack_c::multVec(&cStack_38, &cStack_38); + mCyls[i].SetC(cStack_38); + dComIfG_Ccsp()->Set(&mCyls[i]); + } } /* 80D0DAC8-80D0DB90 000648 00C8+00 1/1 0/0 0/0 .text action__13daObjThDoor_cFv */ void daObjThDoor_c::action() { - // NONMATCHING + s16 sVar1 = field_0x608; + set_cyl(); + cLib_addCalcAngleS(&field_0x60a, 0, 0x1e, 0x60, 0x10); + field_0x608 = field_0x608 + field_0x60a; + if (field_0x608 > 0x4000) { + field_0x608 = 0x4000; + if (sVar1 == 0x4000) { + field_0x60a = 0; + } else { + field_0x60a = -field_0x60a; + } + } else { + if (field_0x608 < 5500) { + field_0x608 = 5500; + if (sVar1 == 5500) { + field_0x60a = 0; + } else { + field_0x60a = -field_0x60a; + } + } + } } -/* ############################################################################################## */ -/* 80D0E6C8-80D0E6D4 -00001 000C+00 0/1 0/0 0/0 .data @3829 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3829[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionWait__13daObjThDoor_cFv, -}; -#pragma pop - -/* 80D0E6D4-80D0E6E0 -00001 000C+00 0/1 0/0 0/0 .data @3830 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3830[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionOrderEvent__13daObjThDoor_cFv, -}; -#pragma pop - -/* 80D0E6E0-80D0E6EC -00001 000C+00 0/1 0/0 0/0 .data @3831 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3831[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionEvent__13daObjThDoor_cFv, -}; -#pragma pop - -/* 80D0E6EC-80D0E6F8 -00001 000C+00 0/1 0/0 0/0 .data @3832 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3832[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)actionDead__13daObjThDoor_cFv, -}; -#pragma pop - -/* 80D0E6F8-80D0E728 0000A0 0030+00 0/1 0/0 0/0 .data l_func$3828 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[48] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - /* 80D0DB90-80D0DC4C 000710 00BC+00 1/1 0/0 0/0 .text event_proc_call__13daObjThDoor_cFv */ void daObjThDoor_c::event_proc_call() { - // NONMATCHING + static daObjThDoor_c::actionFunc l_func[4] = { + &daObjThDoor_c::actionWait, + &daObjThDoor_c::actionOrderEvent, + &daObjThDoor_c::actionEvent, + &daObjThDoor_c::actionDead, + }; + + (this->*l_func[mAction])(); } /* 80D0DC4C-80D0DCC8 0007CC 007C+00 1/0 0/0 0/0 .text actionWait__13daObjThDoor_cFv */ void daObjThDoor_c::actionWait() { - // NONMATCHING + action(); + if (checkDemo() && checkArea()) { + setAction(ACTION_ORDER_EVENT); + fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); + } } /* 80D0DCC8-80D0DD90 000848 00C8+00 1/0 0/0 0/0 .text actionOrderEvent__13daObjThDoor_cFv */ void daObjThDoor_c::actionOrderEvent() { - // NONMATCHING + if (eventInfo.checkCommandDemoAccrpt()) { + setAction(ACTION_EVENT); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staffName, 0, 0); + demoProc(); + if (mpBgW != NULL && mpBgW->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgW); + } + } else { + fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); + } } /* 80D0DD90-80D0DE30 000910 00A0+00 1/0 0/0 0/0 .text actionEvent__13daObjThDoor_cFv */ void daObjThDoor_c::actionEvent() { - // NONMATCHING + if (dComIfGp_evmng_endCheck(mEventIdx)) { + setAction(ACTION_DEAD); + dComIfGp_event_reset(); + fopAcM_onSwitch(this, getSwbit()); + + // Telma's house door: SW<%d> turned on + OS_REPORT("テルマの家のドア:SW<%d>オンしました\n", getSwbit()); + if (mpBgW != NULL) { + dComIfG_Bgsp().Regist(mpBgW, this); + } + } else { + demoProc(); + } } /* 80D0DE30-80D0DE34 0009B0 0004+00 1/0 0/0 0/0 .text actionDead__13daObjThDoor_cFv */ -void daObjThDoor_c::actionDead() { - /* empty function */ -} +void daObjThDoor_c::actionDead() {} -/* ############################################################################################## */ -/* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D0E640 = "WAIT"; -SECTION_DEAD static char const* const stringBase_80D0E645 = "MSG"; -SECTION_DEAD static char const* const stringBase_80D0E649 = "CLOSE"; -SECTION_DEAD static char const* const stringBase_80D0E64F = "Timer"; -#pragma pop - -/* 80D0E728-80D0E734 -00001 000C+00 1/1 0/0 0/0 .data action_table$3895 */ -SECTION_DATA static void* action_table[3] = { - (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x20), - (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x25), - (void*)(((char*)&d_a_obj_thdoor__stringBase0) + 0x29), -}; /* 80D0DE34-80D0E06C 0009B4 0238+00 2/2 0/0 0/0 .text demoProc__13daObjThDoor_cFv */ -void daObjThDoor_c::demoProc() { - // NONMATCHING +int daObjThDoor_c::demoProc() { + static char* action_table[3] = { + "WAIT", + "MSG", + "CLOSE", + }; + + daPy_py_c* player = daPy_getPlayerActorClass(); + int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 3, 0, 0); + if (dComIfGp_evmng_getIsAddvance(mStaffId)) { + switch (actIdx) { + case 0: { + int* pTimer = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); + if (pTimer == NULL) { + field_0x5b4 = 1; + } else { + field_0x5b4 = *pTimer; + } + break; + } + case 1: + mMsgFlow.init(this, getMsg(), 0, NULL); + break; + case 2: + field_0x5b8 = 0; + fopAcM_seStart(this, Z2SE_OBJ_THE_DOOR_CL, 0); + field_0x5b5 = 1; + break; + } + } + + switch (actIdx) { + case 0: + if (cLib_calcTimer(&field_0x5b4)) { + break; + } + dComIfGp_evmng_cutEnd(mStaffId); + break; + case 1: + if (mMsgFlow.doFlow(this, NULL, 0)) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + case 2: + cLib_chaseS(&field_0x5b8, 0x6a4, 400); + if (cLib_chaseS(&field_0x608, 0, field_0x5b8) == 0) { + break; + } + dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + dComIfGp_evmng_cutEnd(mStaffId); + break; + default: + dComIfGp_evmng_cutEnd(mStaffId); + break; + } + + return 0; } -/* ############################################################################################## */ -/* 80D0E610-80D0E614 000018 0004+00 0/1 0/0 0/0 .rodata @3988 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3988 = -50.0f; -COMPILER_STRIP_GATE(0x80D0E610, &lit_3988); -#pragma pop - -/* 80D0E614-80D0E618 00001C 0004+00 0/1 0/0 0/0 .rodata @3989 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3989 = -300.0f; -COMPILER_STRIP_GATE(0x80D0E614, &lit_3989); -#pragma pop - -/* 80D0E618-80D0E61C 000020 0004+00 0/1 0/0 0/0 .rodata @3990 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3990 = -100.0f; -COMPILER_STRIP_GATE(0x80D0E618, &lit_3990); -#pragma pop - -/* 80D0E61C-80D0E620 000024 0004+00 0/1 0/0 0/0 .rodata @3991 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3991 = 100.0f; -COMPILER_STRIP_GATE(0x80D0E61C, &lit_3991); -#pragma pop - /* 80D0E06C-80D0E150 000BEC 00E4+00 1/1 0/0 0/0 .text checkArea__13daObjThDoor_cFv */ -void daObjThDoor_c::checkArea() { - // NONMATCHING +BOOL daObjThDoor_c::checkArea() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz local_28(player->current.pos); + mDoMtx_stack_c::transS(current.pos); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::inverse(); + mDoMtx_stack_c::multVec(&local_28, &local_28); + if (local_28.z > -50.0f || local_28.z < -300.0f) { + return 0; + } + + if (local_28.x < -100.0f || local_28.x > 100.0f) { + return 0; + } + + return 1; } /* 80D0E150-80D0E1F4 000CD0 00A4+00 1/0 0/0 0/0 .text Draw__13daObjThDoor_cFv */ -void daObjThDoor_c::Draw() { - // NONMATCHING +int daObjThDoor_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mModel); + dComIfGd_setList(); + return 1; } /* 80D0E1F4-80D0E228 000D74 0034+00 1/0 0/0 0/0 .text Delete__13daObjThDoor_cFv */ -void daObjThDoor_c::Delete() { - // NONMATCHING +int daObjThDoor_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + + #ifdef DEBUG + l_HIO.removeHIO(); + #endif + + return 1; +} + +/* 80D0E228-80D0E2E4 000DA8 00BC+00 1/0 0/0 0/0 .text daObjThDoor_create1st__FP13daObjThDoor_c */ +static int daObjThDoor_create1st(daObjThDoor_c* i_this) { + fopAcM_SetupActor(i_this, daObjThDoor_c); + return i_this->create1st(); +} + +/* 80D0E520-80D0E540 0010A0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDelete__FP13daObjThDoor_c + */ +static int daObjThDoor_MoveBGDelete(daObjThDoor_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80D0E540-80D0E560 0010C0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGExecute__FP13daObjThDoor_c + */ +static int daObjThDoor_MoveBGExecute(daObjThDoor_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80D0E560-80D0E58C 0010E0 002C+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDraw__FP13daObjThDoor_c */ +static int daObjThDoor_MoveBGDraw(daObjThDoor_c* i_this) { + return i_this->MoveBGDraw(); } /* ############################################################################################## */ /* 80D0E734-80D0E754 -00001 0020+00 1/0 0/0 0/0 .data daObjThDoor_METHODS */ static actor_method_class daObjThDoor_METHODS = { - (process_method_func)daObjThDoor_create1st__FP13daObjThDoor_c, - (process_method_func)daObjThDoor_MoveBGDelete__FP13daObjThDoor_c, - (process_method_func)daObjThDoor_MoveBGExecute__FP13daObjThDoor_c, - 0, - (process_method_func)daObjThDoor_MoveBGDraw__FP13daObjThDoor_c, + (process_method_func)daObjThDoor_create1st, + (process_method_func)daObjThDoor_MoveBGDelete, + (process_method_func)daObjThDoor_MoveBGExecute, + NULL, + (process_method_func)daObjThDoor_MoveBGDraw, }; /* 80D0E754-80D0E784 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TDoor */ @@ -442,109 +415,4 @@ extern actor_process_profile_definition g_profile_Obj_TDoor = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80D0E784-80D0E790 00012C 000C+00 2/2 0/0 0/0 .data __vt__10cCcD_GStts */ -SECTION_DATA extern void* __vt__10cCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10cCcD_GSttsFv, -}; - -/* 80D0E790-80D0E79C 000138 000C+00 1/1 0/0 0/0 .data __vt__10dCcD_GStts */ -SECTION_DATA extern void* __vt__10dCcD_GStts[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__10dCcD_GSttsFv, -}; - -/* 80D0E79C-80D0E7A8 000144 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D0E7A8-80D0E7B4 000150 000C+00 3/3 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80D0E7B4-80D0E7DC 00015C 0028+00 1/1 0/0 0/0 .data __vt__13daObjThDoor_c */ -SECTION_DATA extern void* __vt__13daObjThDoor_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daObjThDoor_cFv, - (void*)Create__13daObjThDoor_cFv, - (void*)Execute__13daObjThDoor_cFPPA3_A4_f, - (void*)Draw__13daObjThDoor_cFv, - (void*)Delete__13daObjThDoor_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80D0E228-80D0E2E4 000DA8 00BC+00 1/0 0/0 0/0 .text daObjThDoor_create1st__FP13daObjThDoor_c */ -static void daObjThDoor_create1st(daObjThDoor_c* param_0) { - // NONMATCHING -} - -/* 80D0E2E4-80D0E3B0 000E64 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */ -// dCcD_Cyl::~dCcD_Cyl() { -extern "C" void __dt__8dCcD_CylFv() { - // NONMATCHING -} - -/* 80D0E3B0-80D0E434 000F30 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */ -// dCcD_Cyl::dCcD_Cyl() { -extern "C" void __ct__8dCcD_CylFv() { - // NONMATCHING -} - -/* 80D0E434-80D0E47C 000FB4 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80D0E47C-80D0E4C4 000FFC 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80D0E4C4-80D0E520 001044 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80D0E520-80D0E540 0010A0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDelete__FP13daObjThDoor_c - */ -static void daObjThDoor_MoveBGDelete(daObjThDoor_c* param_0) { - // NONMATCHING -} - -/* 80D0E540-80D0E560 0010C0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGExecute__FP13daObjThDoor_c - */ -static void daObjThDoor_MoveBGExecute(daObjThDoor_c* param_0) { - // NONMATCHING -} - -/* 80D0E560-80D0E58C 0010E0 002C+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDraw__FP13daObjThDoor_c */ -static void daObjThDoor_MoveBGDraw(daObjThDoor_c* param_0) { - // NONMATCHING -} - -/* 80D0E58C-80D0E5D4 00110C 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* 80D0E5D4-80D0E5F0 001154 001C+00 1/1 0/0 0/0 .text cLib_calcTimer__FPUc */ -extern "C" void func_80D0E5D4(void* _this, u8* param_0) { - // NONMATCHING -} - /* 80D0E620-80D0E620 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */