From 3dadc80c5e314907020b033131f8f9dadbbce684 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Sat, 19 Oct 2024 12:01:46 +0300 Subject: [PATCH] d_a_obj_tp OK + other rels that matched almost as is (#2218) * d_a_tag_yami OK * d_a_tag_watchge matched as is * d_a_tag_wara_howl matched as is * d_a_tag_waterfall matched as is * daTagTheBHint_c matched as is * daZraFreeze_c Matched as is * Revert nosyminline argument * d_a_obj_tp OK --- config/GZ2E01/rels/d_a_obj_tp/symbols.txt | 18 +- .../rels/d_a_obj_zra_freeze/symbols.txt | 18 +- .../GZ2E01/rels/d_a_tag_theB_hint/symbols.txt | 8 +- .../GZ2E01/rels/d_a_tag_wara_howl/symbols.txt | 10 +- .../GZ2E01/rels/d_a_tag_watchge/symbols.txt | 16 +- .../GZ2E01/rels/d_a_tag_waterfall/symbols.txt | 20 +- config/GZ2E01/rels/d_a_tag_yami/symbols.txt | 4 +- configure.py | 18 +- include/d/actor/d_a_obj_tp.h | 36 +- include/d/d_com_inf_game.h | 5 + include/d/d_drawlist.h | 2 + include/m_Do/m_Do_graphic.h | 1 + src/d/actor/d_a_obj_tp.cpp | 866 +++++++++--------- src/d/actor/d_a_obj_zra_freeze.cpp | 2 +- src/d/actor/d_a_tag_theB_hint.cpp | 2 +- src/d/actor/d_a_tag_wara_howl.cpp | 2 +- src/d/actor/d_a_tag_watchge.cpp | 2 +- src/d/actor/d_a_tag_waterfall.cpp | 63 +- src/d/actor/d_a_tag_yami.cpp | 2 +- 19 files changed, 573 insertions(+), 522 deletions(-) diff --git a/config/GZ2E01/rels/d_a_obj_tp/symbols.txt b/config/GZ2E01/rels/d_a_obj_tp/symbols.txt index 7f72b8d0030..33f29416e15 100644 --- a/config/GZ2E01/rels/d_a_obj_tp/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tp/symbols.txt @@ -1,15 +1,15 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global _epilog = .text:0x0000002C; // type:function size:0x2C scope:global _unresolved = .text:0x00000058; // type:function size:0x20 scope:global -daObj_Tp_Draw__FP12obj_tp_class = .text:0x00000078; // type:function size:0x1EC scope:global +daObj_Tp_Draw__FP12obj_tp_class = .text:0x00000078; // type:function size:0x1EC scope:local anm_init__FP12obj_tp_classifUcf = .text:0x00000264; // type:function size:0xEC scope:global -s_tp_sub__FPvPv = .text:0x00000350; // type:function size:0x78 scope:global -daObj_Tp_Execute__FP12obj_tp_class = .text:0x000003C8; // type:function size:0xB98 scope:global -daObj_Tp_IsDelete__FP12obj_tp_class = .text:0x00000F60; // type:function size:0x8 scope:global -daObj_Tp_Delete__FP12obj_tp_class = .text:0x00000F68; // type:function size:0x58 scope:global -useHeapInit__FP10fopAc_ac_c = .text:0x00000FC0; // type:function size:0x448 scope:global +s_tp_sub__FPvPv = .text:0x00000350; // type:function size:0x78 scope:local +daObj_Tp_Execute__FP12obj_tp_class = .text:0x000003C8; // type:function size:0xB98 scope:local +daObj_Tp_IsDelete__FP12obj_tp_class = .text:0x00000F60; // type:function size:0x8 scope:local +daObj_Tp_Delete__FP12obj_tp_class = .text:0x00000F68; // type:function size:0x58 scope:local +useHeapInit__FP10fopAc_ac_c = .text:0x00000FC0; // type:function size:0x448 scope:local __dt__12J3DFrameCtrlFv = .text:0x00001408; // type:function size:0x48 scope:global -daObj_Tp_Create__FP10fopAc_ac_c = .text:0x00001450; // type:function size:0x3A0 scope:global +daObj_Tp_Create__FP10fopAc_ac_c = .text:0x00001450; // type:function size:0x3A0 scope:local __dt__8cM3dGCylFv = .text:0x000017F0; // type:function size:0x48 scope:global __dt__8cM3dGAabFv = .text:0x00001838; // type:function size:0x48 scope:global __dt__10dCcD_GSttsFv = .text:0x00001880; // type:function size:0x5C scope:global @@ -43,7 +43,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4583 = .rodata:0x00000068; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000006C; // type:object size:0x7 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 @4263 = .data:0x00000020; // type:object size:0x20 scope:local bmd$4283 = .data:0x00000040; // type:object size:0x8 scope:local @@ -52,7 +52,7 @@ eff_bmd$4296 = .data:0x00000050; // type:object size:0x8 scope:local eff_btk$4297 = .data:0x00000058; // type:object size:0x8 scope:local eff_brk$4298 = .data:0x00000060; // type:object size:0x8 scope:local cc_cyl_src$4468 = .data:0x00000068; // type:object size:0x44 scope:local -l_daObj_Tp_Method = .data:0x000000AC; // type:object size:0x20 scope:global +l_daObj_Tp_Method = .data:0x000000AC; // type:object size:0x20 scope:local g_profile_OBJ_TP = .data:0x000000CC; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x000000FC; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000108; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_obj_zra_freeze/symbols.txt b/config/GZ2E01/rels/d_a_obj_zra_freeze/symbols.txt index 2842b1a4650..ddd3adf7314 100644 --- a/config/GZ2E01/rels/d_a_obj_zra_freeze/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_zra_freeze/symbols.txt @@ -3,22 +3,22 @@ _epilog = .text:0x0000002C; // type:function size:0x2C scope:global _unresolved = .text:0x00000058; // type:function size:0x20 scope:global setBaseMtx__13daZraFreeze_cFv = .text:0x00000078; // type:function size:0x6C scope:global chkActorInScreen__13daZraFreeze_cFv = .text:0x000000E4; // type:function size:0x178 scope:global -createSolidHeap__FP10fopAc_ac_c = .text:0x0000025C; // type:function size:0x20 scope:global +createSolidHeap__FP10fopAc_ac_c = .text:0x0000025C; // type:function size:0x20 scope:local Create__13daZraFreeze_cFv = .text:0x0000027C; // type:function size:0x180 scope:global CreateHeap__13daZraFreeze_cFv = .text:0x000003FC; // type:function size:0x84 scope:global setHitodamaPrtcl__13daZraFreeze_cFv = .text:0x00000480; // type:function size:0x1D8 scope:global Execute__13daZraFreeze_cFv = .text:0x00000658; // type:function size:0x348 scope:global Draw__13daZraFreeze_cFv = .text:0x000009A0; // type:function size:0xA4 scope:global Delete__13daZraFreeze_cFv = .text:0x00000A44; // type:function size:0x34 scope:global -daZraFreeze_Draw__FP13daZraFreeze_c = .text:0x00000A78; // type:function size:0x20 scope:global -daZraFreeze_Execute__FP13daZraFreeze_c = .text:0x00000A98; // type:function size:0x20 scope:global -daZraFreeze_IsDelete__FP13daZraFreeze_c = .text:0x00000AB8; // type:function size:0x8 scope:global -daZraFreeze_Delete__FP13daZraFreeze_c = .text:0x00000AC0; // type:function size:0x20 scope:global -daZraFreeze_create__FP10fopAc_ac_c = .text:0x00000AE0; // type:function size:0x20 scope:global +daZraFreeze_Draw__FP13daZraFreeze_c = .text:0x00000A78; // type:function size:0x20 scope:local +daZraFreeze_Execute__FP13daZraFreeze_c = .text:0x00000A98; // type:function size:0x20 scope:local +daZraFreeze_IsDelete__FP13daZraFreeze_c = .text:0x00000AB8; // type:function size:0x8 scope:local +daZraFreeze_Delete__FP13daZraFreeze_c = .text:0x00000AC0; // type:function size:0x20 scope:local +daZraFreeze_create__FP10fopAc_ac_c = .text:0x00000AE0; // type:function size:0x20 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_DATA = .rodata:0x00000000; // type:object size:0x8 scope:global +l_DATA = .rodata:0x00000000; // type:object size:0x8 scope:local @3763 = .rodata:0x00000008; // type:object size:0x4 scope:local @3764 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3765 = .rodata:0x00000010; // type:object size:0x4 scope:local @@ -31,7 +31,7 @@ id$3856 = .rodata:0x00000018; // type:object size:0x4 scope:local @4051 = .rodata:0x00000030; // type:object size:0x8 scope:local @4052 = .rodata:0x00000038; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000040; // type:object size:0x3B scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local l_bmdName$3845 = .data:0x00000004; // type:object size:0xC scope:local -l_daZraFreeze_Method = .data:0x00000010; // type:object size:0x20 scope:global +l_daZraFreeze_Method = .data:0x00000010; // type:object size:0x20 scope:local g_profile_OBJ_ZRAFREEZE = .data:0x00000030; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_tag_theB_hint/symbols.txt b/config/GZ2E01/rels/d_a_tag_theB_hint/symbols.txt index ff35fc27f8f..108a75793e1 100644 --- a/config/GZ2E01/rels/d_a_tag_theB_hint/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_theB_hint/symbols.txt @@ -1,12 +1,12 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global _epilog = .text:0x0000002C; // type:function size:0x2C scope:global _unresolved = .text:0x00000058; // type:function size:0x20 scope:global -daTagTheBHint_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x74 scope:global -daTagTheBHint_Delete__FP15daTagTheBHint_c = .text:0x000000EC; // type:function size:0x30 scope:global -daTagTheBHint_Execute__FP15daTagTheBHint_c = .text:0x0000011C; // type:function size:0xD0 scope:global +daTagTheBHint_Create__FP10fopAc_ac_c = .text:0x00000078; // type:function size:0x74 scope:local +daTagTheBHint_Delete__FP15daTagTheBHint_c = .text:0x000000EC; // type:function size:0x30 scope:local +daTagTheBHint_Execute__FP15daTagTheBHint_c = .text:0x0000011C; // type:function size:0xD0 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @3831 = .rodata:0x00000000; // type:object size:0x4 scope:local @3832 = .rodata:0x00000008; // type:object size:0x8 scope:local data:double -l_daTagTheBHint_Method = .data:0x00000000; // type:object size:0x20 scope:global +l_daTagTheBHint_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_Tag_TheBHint = .data:0x00000020; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_tag_wara_howl/symbols.txt b/config/GZ2E01/rels/d_a_tag_wara_howl/symbols.txt index d55b6979e64..78bf746e437 100644 --- a/config/GZ2E01/rels/d_a_tag_wara_howl/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_wara_howl/symbols.txt @@ -9,13 +9,13 @@ draw__13daTagWrHowl_cFv = .text:0x00000174; // type:function size:0x8 scope:glob execute__13daTagWrHowl_cFv = .text:0x0000017C; // type:function size:0x54 scope:global init__13daTagWrHowl_cFv = .text:0x000001D0; // type:function size:0x24 scope:global chkWlfInTag__13daTagWrHowl_cFv = .text:0x000001F4; // type:function size:0x90 scope:global -daTagWrHowl_create__FP13daTagWrHowl_c = .text:0x00000284; // type:function size:0x54 scope:global -daTagWrHowl_Delete__FP13daTagWrHowl_c = .text:0x000002D8; // type:function size:0x20 scope:global -daTagWrHowl_execute__FP13daTagWrHowl_c = .text:0x000002F8; // type:function size:0x20 scope:global -daTagWrHowl_draw__FP13daTagWrHowl_c = .text:0x00000318; // type:function size:0x20 scope:global +daTagWrHowl_create__FP13daTagWrHowl_c = .text:0x00000284; // type:function size:0x54 scope:local +daTagWrHowl_Delete__FP13daTagWrHowl_c = .text:0x000002D8; // type:function size:0x20 scope:local +daTagWrHowl_execute__FP13daTagWrHowl_c = .text:0x000002F8; // type:function size:0x20 scope:local +daTagWrHowl_draw__FP13daTagWrHowl_c = .text:0x00000318; // type:function size:0x20 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @3680 = .rodata:0x00000000; // type:object size:0x4 scope:local -daTagWrHowl_METHODS = .data:0x00000000; // type:object size:0x20 scope:global +daTagWrHowl_METHODS = .data:0x00000000; // type:object size:0x20 scope:local g_profile_Tag_WaraHowl = .data:0x00000020; // type:object size:0x30 scope:global __vt__13daTagWrHowl_c = .data:0x00000050; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_tag_watchge/symbols.txt b/config/GZ2E01/rels/d_a_tag_watchge/symbols.txt index f10382c3cc9..a106bfbf715 100644 --- a/config/GZ2E01/rels/d_a_tag_watchge/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_watchge/symbols.txt @@ -2,16 +2,16 @@ _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 draw__14daTagWatchGe_cFv = .text:0x00000078; // type:function size:0x8 scope:global -daTagWatchGe_Draw__FP14daTagWatchGe_c = .text:0x00000080; // type:function size:0x20 scope:global -s_watchge__FPvPv = .text:0x000000A0; // type:function size:0x38 scope:global +daTagWatchGe_Draw__FP14daTagWatchGe_c = .text:0x00000080; // type:function size:0x20 scope:local +s_watchge__FPvPv = .text:0x000000A0; // type:function size:0x38 scope:local execute__14daTagWatchGe_cFv = .text:0x000000D8; // type:function size:0x90 scope:global -daTagWatchGe_Execute__FP14daTagWatchGe_c = .text:0x00000168; // type:function size:0x20 scope:global -daTagWatchGe_IsDelete__FP14daTagWatchGe_c = .text:0x00000188; // type:function size:0x8 scope:global -daTagWatchGe_Delete__FP14daTagWatchGe_c = .text:0x00000190; // type:function size:0x8 scope:global +daTagWatchGe_Execute__FP14daTagWatchGe_c = .text:0x00000168; // type:function size:0x20 scope:local +daTagWatchGe_IsDelete__FP14daTagWatchGe_c = .text:0x00000188; // type:function size:0x8 scope:local +daTagWatchGe_Delete__FP14daTagWatchGe_c = .text:0x00000190; // type:function size:0x8 scope:local create__14daTagWatchGe_cFv = .text:0x00000198; // type:function size:0xB8 scope:global -daTagWatchGe_Create__FP14daTagWatchGe_c = .text:0x00000250; // type:function size:0x20 scope:global +daTagWatchGe_Create__FP14daTagWatchGe_c = .text:0x00000250; // type:function size:0x20 scope:local _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -l_daTagWatchGe_Method = .data:0x00000000; // type:object size:0x20 scope:global +l_daTagWatchGe_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_Tag_WatchGe = .data:0x00000020; // type:object size:0x30 scope:global -m_group_count = .bss:0x00000000; // type:object size:0x4 scope:global +m_group_count = .bss:0x00000000; // type:object size:0x4 scope:local diff --git a/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt b/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt index 7405f1a4beb..7a8af36734c 100644 --- a/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt @@ -5,18 +5,18 @@ __register_global_object = .text:0x00000078; // type:function size:0x1C scope:gl __destroy_global_chain = .text:0x00000094; // type:function size:0x58 scope:global __ct__20daTagWaterFall_HIO_cFv = .text:0x000000EC; // type:function size:0x54 scope:global draw__16daTagWaterFall_cFv = .text:0x00000140; // type:function size:0x8 scope:global -daTagWaterFall_Draw__FP16daTagWaterFall_c = .text:0x00000148; // type:function size:0x20 scope:global -s_waterfall__FPvPv = .text:0x00000168; // type:function size:0x7C scope:global +daTagWaterFall_Draw__FP16daTagWaterFall_c = .text:0x00000148; // type:function size:0x20 scope:local +s_waterfall__FPvPv = .text:0x00000168; // type:function size:0x7C scope:local getEllipseY__16daTagWaterFall_cFf = .text:0x000001E4; // type:function size:0x44 scope:global checkHitWaterFall__16daTagWaterFall_cF4cXyz = .text:0x00000228; // type:function size:0x104 scope:global checkHitWaterFallCamera__16daTagWaterFall_cFv = .text:0x0000032C; // type:function size:0x48 scope:global execute__16daTagWaterFall_cFv = .text:0x00000374; // type:function size:0x204 scope:global -daTagWaterFall_Execute__FP16daTagWaterFall_c = .text:0x00000578; // type:function size:0x20 scope:global -daTagWaterFall_IsDelete__FP16daTagWaterFall_c = .text:0x00000598; // type:function size:0x8 scope:global +daTagWaterFall_Execute__FP16daTagWaterFall_c = .text:0x00000578; // type:function size:0x20 scope:local +daTagWaterFall_IsDelete__FP16daTagWaterFall_c = .text:0x00000598; // type:function size:0x8 scope:local _delete__16daTagWaterFall_cFv = .text:0x000005A0; // type:function size:0x20 scope:global -daTagWaterFall_Delete__FP16daTagWaterFall_c = .text:0x000005C0; // type:function size:0x20 scope:global +daTagWaterFall_Delete__FP16daTagWaterFall_c = .text:0x000005C0; // type:function size:0x20 scope:local create__16daTagWaterFall_cFv = .text:0x000005E0; // type:function size:0x19C scope:global -daTagWaterFall_Create__FP16daTagWaterFall_c = .text:0x0000077C; // type:function size:0x20 scope:global +daTagWaterFall_Create__FP16daTagWaterFall_c = .text:0x0000077C; // type:function size:0x20 scope:local __dt__20daTagWaterFall_HIO_cFv = .text:0x0000079C; // type:function size:0x48 scope:global __sinit_d_a_tag_waterfall_cpp = .text:0x000007E4; // type:function size:0x3C scope:local _ctors = .ctors:0x00000000; // type:label scope:global @@ -29,11 +29,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3803 = .rodata:0x0000000C; // type:object size:0x4 scope:local data:float @3959 = .rodata:0x00000010; // type:object size:0x8 scope:local data:double @3960 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double -m_master_id = .data:0x00000000; // type:object size:0x4 scope:global -l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:global +m_master_id = .data:0x00000000; // type:object size:0x4 scope:local +l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Tag_WaterFall = .data:0x00000024; // type:object size:0x30 scope:global __vt__20daTagWaterFall_HIO_c = .data:0x00000054; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3753 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x24 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_tag_yami/symbols.txt b/config/GZ2E01/rels/d_a_tag_yami/symbols.txt index f69f6cda8f7..ccaa584c477 100644 --- a/config/GZ2E01/rels/d_a_tag_yami/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_yami/symbols.txt @@ -20,7 +20,7 @@ __dt__8cM3dGAabFv = .text:0x00000840; // 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_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:global +l_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:local @3726 = .rodata:0x00000044; // type:object size:0x4 scope:local @3727 = .rodata:0x00000048; // type:object size:0x4 scope:local @3820 = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float @@ -28,7 +28,7 @@ l_sph_src = .rodata:0x00000000; // type:object size:0x44 scope:global @3889 = .rodata:0x00000058; // type:object size:0x8 scope:local @3890 = .rodata:0x00000060; // type:object size:0x8 scope:local @3891 = .rodata:0x00000068; // type:object size:0x8 scope:local -l_daTagYami_Method = .data:0x00000000; // type:object size:0x20 scope:global +l_daTagYami_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_TAG_YAMI = .data:0x00000020; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000050; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x0000005C; // type:object size:0xC scope:global diff --git a/configure.py b/configure.py index 8b574466dd4..c0f5ca27e62 100644 --- a/configure.py +++ b/configure.py @@ -301,12 +301,12 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]: } # Helper function for actor RELs -def ActorRel(status, rel_name, extra_cflags=[]): +def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]: return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags)]) # Helper function for JSystem libraries -def JSystemLib(lib_name, objects, progress_category="third_party"): +def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="third_party") -> Dict[str, Any]: return { "lib": lib_name, "mw_version": "GC/2.7", @@ -2017,7 +2017,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_tombo"), ActorRel(Matching, "d_a_obj_tornado"), ActorRel(Matching, "d_a_obj_tornado2"), - ActorRel(NonMatching, "d_a_obj_tp"), + ActorRel(Matching, "d_a_obj_tp"), ActorRel(NonMatching, "d_a_obj_treesh"), ActorRel(NonMatching, "d_a_obj_twGate"), ActorRel(NonMatching, "d_a_obj_udoor"), @@ -2048,7 +2048,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_zrTurara"), ActorRel(Matching, "d_a_obj_zrTuraraRock"), ActorRel(NonMatching, "d_a_obj_zraMark"), - ActorRel(NonMatching, "d_a_obj_zra_freeze"), + ActorRel(Matching, "d_a_obj_zra_freeze"), ActorRel(NonMatching, "d_a_obj_zra_rock"), ActorRel(NonMatching, "d_a_passer_mng"), ActorRel(NonMatching, "d_a_peru"), @@ -2096,12 +2096,12 @@ config.libs = [ ActorRel(Matching, "d_a_tag_sppath"), ActorRel(Matching, "d_a_tag_ss_drink"), ActorRel(Matching, "d_a_tag_stream"), - ActorRel(NonMatching, "d_a_tag_theB_hint"), - ActorRel(NonMatching, "d_a_tag_wara_howl"), - ActorRel(NonMatching, "d_a_tag_watchge"), - ActorRel(NonMatching, "d_a_tag_waterfall"), + ActorRel(Matching, "d_a_tag_theB_hint"), + ActorRel(Matching, "d_a_tag_wara_howl"), + ActorRel(Matching, "d_a_tag_watchge"), + ActorRel(Matching, "d_a_tag_waterfall"), ActorRel(NonMatching, "d_a_tag_wljump"), - ActorRel(NonMatching, "d_a_tag_yami"), + ActorRel(Matching, "d_a_tag_yami", extra_cflags=['-pragma "nosyminline off"']), ActorRel(Matching, "d_a_talk"), ActorRel(Matching, "d_a_tboxSw"), ActorRel(NonMatching, "d_a_title"), diff --git a/include/d/actor/d_a_obj_tp.h b/include/d/actor/d_a_obj_tp.h index 6261920d0c6..f7bd52df591 100644 --- a/include/d/actor/d_a_obj_tp.h +++ b/include/d/actor/d_a_obj_tp.h @@ -1,6 +1,10 @@ #ifndef D_A_OBJ_TP_H #define D_A_OBJ_TP_H +#include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/d_bg_w.h" +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -12,8 +16,36 @@ * */ class obj_tp_class : public fopAc_ac_c { -private: - /* 0x568 */ u8 field_0x568[0x784 - 0x568]; +public: + /* 0x568 */ request_of_phase_process_class mPhase; + /* 0x570 */ mDoExt_McaMorf* mMorf; + /* 0x574 */ int field_0x574; + /* 0x578 */ mDoExt_brkAnm* mBrk; + /* 0x57C */ J3DModel* mModels[2]; + /* 0x584 */ mDoExt_btkAnm* mBtks[2]; + /* 0x58C */ mDoExt_brkAnm* mBrks[2]; + /* 0x594 */ u8 field_0x594; + /* 0x595 */ u8 field_0x595; + /* 0x596 */ u8 field_0x596; + /* 0x597 */ u8 field_0x597; + /* 0x598 */ u8 field_0x598; + /* 0x59C */ int field_0x59c; + /* 0x5A0 */ int field_0x5a0; + /* 0x5A4 */ u8 field_0x5a4; + /* 0x5A5 */ u8 field_0x5a5; + /* 0x5A6 */ s16 field_0x5a6; + /* 0x5A8 */ s16 field_0x5a8; + /* 0x5AC */ cXyz field_0x5ac; + /* 0x5B8 */ s16 field_0x5b8[2]; + /* 0x5BC */ s16 field_0x5bc; + /* 0x5C0 */ cXyz field_0x5c0; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5D0 */ int field_0x5d0; + /* 0x5D4 */ Mtx field_0x5d4; + /* 0x604 */ dBgW* mBgw; + /* 0x608 */ dCcD_Stts mStts; + /* 0x644 */ dCcD_Cyl mCyl; + /* 0x780 */ int field_0x780; }; STATIC_ASSERT(sizeof(obj_tp_class) == 0x784); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 80a8b3a4703..4b3781cb0d8 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3980,6 +3980,11 @@ inline J3DDrawBuffer* dComIfGd_getXluListBG() { return g_dComIfG_gameInfo.drawlist.getXluListBG(); } +inline void dComIfGd_setListFilter() { + g_dComIfG_gameInfo.drawlist.setOpaListFilter(); + g_dComIfG_gameInfo.drawlist.setXluListFilter(); +} + inline void dComIfGd_init() { g_dComIfG_gameInfo.drawlist.init(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index a916ea6d9c8..0ef98b382d7 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -342,6 +342,8 @@ public: void setOpaListMiddle() { setOpaDrawList(mDrawBuffers[DB_LIST_MIDDLE]); } void setOpaListZxlu() { setOpaDrawList(mDrawBuffers[DB_LIST_Z_XLU]); } void setXluListZxlu() { setXluDrawList(mDrawBuffers[DB_LIST_Z_XLU]); } + void setOpaListFilter() { setOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); } + void setXluListFilter() { setXluDrawList(mDrawBuffers[DB_LIST_FILTER]); } void set3DlineMat(mDoExt_3DlineMat_c *param_1) { #ifndef NON_VIRTUAL_3DLINEMAT m3DLineMatSortPacket[param_1->getMaterialID()].setMat(param_1); diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h index 0ab2c6136a6..221be23319c 100644 --- a/include/m_Do/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic.h @@ -102,6 +102,7 @@ public: static GXTexObj* getFrameBufferTexObj() { return &mFrameBufferTexObj; } static f32 getInvScale() { return 1.0f; } static f32 getScale() { return 1.0f; } + static void setWideZoomLightProjection(Mtx m) {} static GXTexObj mFrameBufferTexObj; static GXTexObj mZbufferTexObj; diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index f2a2083d402..9f8db476fe6 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -4,176 +4,92 @@ */ #include "d/actor/d_a_obj_tp.h" +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "JSystem/J3DGraphAnimator/J3DModelData.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "SSystem/SComponent/c_math.h" #include "d/d_cc_d.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" static void daObj_Tp_Draw__FP12obj_tp_class(); -extern "C" static void anm_init__FP12obj_tp_classifUcf(); -extern "C" static void s_tp_sub__FPvPv(); -extern "C" static void daObj_Tp_Execute__FP12obj_tp_class(); -extern "C" static bool daObj_Tp_IsDelete__FP12obj_tp_class(); -extern "C" static void daObj_Tp_Delete__FP12obj_tp_class(); -extern "C" static void useHeapInit__FP10fopAc_ac_c(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" static void daObj_Tp_Create__FP10fopAc_ac_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" extern char const* const d_a_obj_tp__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_XrotM__FPA4_fs(); -extern "C" void mDoMtx_YrotS__FPA4_fs(); -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void scaleM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void -__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl(); -extern "C" void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(); -extern "C" void play__14mDoExt_McaMorfFP3VecUlSc(); -extern "C" void entryDL__14mDoExt_McaMorfFv(); -extern "C" void modelCalc__14mDoExt_McaMorfFv(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void fopAcM_SetMin__FP10fopAc_ac_cfff(); -extern "C" void fopAcM_SetMax__FP10fopAc_ac_cfff(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -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 isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void dPath_GetRoomPath__Fii(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c(); -extern "C" void __ct__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 Set__4cCcSFP8cCcD_Obj(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void __ct__5csXyzFsss(); -extern "C" void cM_atan2s__Fff(); -extern "C" void cM_rndF__Ff(); -extern "C" void SetC__8cM3dGCylFRC4cXyz(); -extern "C" void MtxPosition__FP4cXyzP4cXyz(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void setEffectMtx__13J3DTexMtxInfoFPA4_f(); -extern "C" void simpleCalcMaterial__12J3DModelDataFUsPA4_f(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void checkPass__12J3DFrameCtrlFf(); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -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" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80D1EE2C-80D1EE30 000000 0004+00 4/4 0/0 0/0 .rodata @3879 */ -SECTION_RODATA static f32 const lit_3879 = 1.0f; -COMPILER_STRIP_GATE(0x80D1EE2C, &lit_3879); - -/* 80D1EE30-80D1EE34 000004 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = -1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80D1EE30, &lit_3880); -#pragma pop - -/* 80D1EE34-80D1EE38 000008 0004+00 1/3 0/0 0/0 .rodata @3881 */ -SECTION_RODATA static u8 const lit_3881[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80D1EE34, &lit_3881); +#include "d/d_com_inf_game.h" +#include "d/d_path.h" +#include "f_op/f_op_actor.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_graphic.h" /* 80D1D578-80D1D764 000078 01EC+00 1/0 0/0 0/0 .text daObj_Tp_Draw__FP12obj_tp_class */ -static void daObj_Tp_Draw(obj_tp_class* param_0) { - // NONMATCHING +static int daObj_Tp_Draw(obj_tp_class* i_this) { + g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mMorf->getModel(), &i_this->tevStr); + dComIfGd_setListDark(); + J3DModelData* modelData = i_this->mMorf->getModel()->getModelData(); + i_this->mBrk->entry(modelData); + i_this->mMorf->entryDL(); + dComIfGd_setList(); + if (i_this->field_0x5a8 != 0) { + dComIfGd_setListFilter(); + for (int i = 1; i >= 0; i--) { + J3DModelData* modelData = i_this->mModels[i]->getModelData(); + if (i == 0) { + J3DMaterial* material = (J3DMaterial*)modelData->getMaterialNodePointer(0); + if (material->getTexGenBlock()->getTexMtx(0) != 0) { + J3DTexMtxInfo* texMtxInfo = + &material->getTexGenBlock()->getTexMtx(0)->getTexMtxInfo(); + if (texMtxInfo != NULL) { + Mtx lightProjMtx; + C_MTXLightPerspective(lightProjMtx, dComIfGd_getView()->mFovy, + dComIfGd_getView()->mAspect, 1.0f, 1.0f, -0.01f, 0); + mDoGph_gInf_c::setWideZoomLightProjection(lightProjMtx); + texMtxInfo->setEffectMtx(lightProjMtx); + modelData->simpleCalcMaterial(0, (MtxP)j3dDefaultMtx); + } + } + } + g_env_light.setLightTevColorType_MAJI(i_this->mModels[i], &i_this->tevStr); + i_this->mBtks[i]->entry(modelData); + i_this->mBrks[i]->entry(modelData); + mDoExt_modelUpdateDL(i_this->mModels[i]); + } + dComIfGd_setList(); + } + return 1; } -/* ############################################################################################## */ -/* 80D1EE38-80D1EE3C 00000C 0004+00 1/1 0/0 0/0 .rodata @3898 */ -SECTION_RODATA static f32 const lit_3898 = -1.0f; -COMPILER_STRIP_GATE(0x80D1EE38, &lit_3898); - -/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80D1EE98 = "Obj_tp"; -#pragma pop - /* 80D1D764-80D1D850 000264 00EC+00 1/1 0/0 0/0 .text anm_init__FP12obj_tp_classifUcf */ -static void anm_init(obj_tp_class* param_0, int param_1, f32 param_2, u8 param_3, f32 param_4) { - // NONMATCHING +static void anm_init(obj_tp_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) { + if (i_this->field_0x594 != 0) { + if (param_2 == 7) { + param_2 = 10; + } else if (param_2 == 9) { + param_2 = 12; + } else if (param_2 == 8) { + param_2 = 11; + } + } + J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("Obj_tp", param_2); + i_this->mMorf->setAnm(anmTransform, (int)param_4, param_3, param_5, 0.0f, -1.0f, NULL); + i_this->field_0x574 = param_2; } /* 80D1D850-80D1D8C8 000350 0078+00 1/1 0/0 0/0 .text s_tp_sub__FPvPv */ -static void s_tp_sub(void* param_0, void* param_1) { - // NONMATCHING +static void* s_tp_sub(void* param_1, void* param_2) { + if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_TP) && + ((fopAc_ac_c*)param_1)->parentActorID == ((fopAc_ac_c*)param_2)->parentActorID && + ((obj_tp_class*)param_2)->field_0x5a0 == ((obj_tp_class*)param_1)->field_0x59c) + { + return param_1; + } + return NULL; } /* ############################################################################################## */ /* 80D1EEA0-80D1EEAC 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { +static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; /* 80D1EEAC-80D1EEC0 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 */] = { +static u32 lit_1787[1 + 4 /* padding */] = { 0x02000201, /* padding */ 0x40080000, @@ -183,76 +99,244 @@ SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { }; #pragma pop -/* 80D1EEC0-80D1EEE0 -00001 0020+00 1/1 0/0 0/0 .data @4263 */ -SECTION_DATA static void* lit_4263[8] = { - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x12C), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x190), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x204), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x244), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x2A0), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x3B8), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x460), - (void*)(((char*)daObj_Tp_Execute__FP12obj_tp_class) + 0x60C), -}; - /* 80D1D8C8-80D1E460 0003C8 0B98+00 3/1 0/0 0/0 .text daObj_Tp_Execute__FP12obj_tp_class */ -static void daObj_Tp_Execute(obj_tp_class* param_0) { - // NONMATCHING +static int daObj_Tp_Execute(obj_tp_class* i_this) { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + if (i_this->field_0x5a4 != 0) { + fopAcM_delete(i_this); + return 1; + } + J3DModel* model = i_this->mMorf->getModel(); + cXyz local_50; + cXyz local_5c; + i_this->field_0x5cc++; + for (int i = 0; i < 2; i++) { + if (i_this->field_0x5b8[i] != 0) { + i_this->field_0x5b8[i]--; + } + } + if (i_this->field_0x5bc != 0) { + i_this->field_0x5bc--; + } + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z); + mDoMtx_stack_c::YrotM(i_this->shape_angle.y); + model->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(i_this)), 0); + i_this->mMorf->modelCalc(); + u8 local_97 = 0; + bool bVar5 = false; + switch (i_this->field_0x5a6) { + case 0: + anm_init(i_this, 7, 0.0f, 0, 0.0f); + i_this->field_0x5a6++; + i_this->mBrk->setFrame(0.0f); + if (i_this->mModels[0] != NULL) { + i_this->mBrks[0]->setFrame(0.0f); + i_this->mBrks[1]->setFrame(0.0f); + i_this->mBrks[0]->setPlaySpeed(1.0f); + i_this->mBrks[1]->setPlaySpeed(1.0f); + } + break; + case 1: + if (i_this->field_0x597 != 0xff) { + if (dComIfGs_isSwitch(i_this->field_0x597, fopAcM_GetRoomNo(i_this))) { + break; + } + } + if (dComIfGs_isSwitch(i_this->field_0x596, fopAcM_GetRoomNo(i_this))) { + i_this->field_0x5b8[0] = cM_rndF(10.0f); + i_this->field_0x5b8[1] = 35; + i_this->field_0x5a6 = 2; + } + break; + case 2: + bVar5 = true; + if (i_this->field_0x5b8[0] == 0) { + anm_init(i_this, 9, 0.0f, 0, 1.0f); + i_this->mMorf->setFrame(9.0f); + i_this->field_0x5a6 = 4; + } + break; + case 3: + bVar5 = true; + if (i_this->mMorf->isStop()) { + anm_init(i_this, 9, 0.0f, 0, 1.0f); + i_this->field_0x5a6++; + } + break; + case 4: + bVar5 = true; + if (i_this->mMorf->checkFrame(17.0f)) { + mDoAud_seStart(Z2SE_OBJ_BARRIER_STN_STICK, &i_this->current.pos, 0, 0); + dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f)); + } + if (i_this->field_0x5b8[1] == 0 && i_this->mMorf->isStop()) { + i_this->field_0x5a6++; + mDoAud_seStart(Z2SE_OBJ_BARRIER_STN_TURN_ON, &i_this->current.pos, 0, 0); + } + break; + case 5: + bVar5 = true; + local_97 = 1; + if (i_this->mBrk->getFrame() < 38.0f) { + i_this->mBrk->play(); + } + if ((i_this->field_0x597 != 0xff && dComIfGs_isSwitch(i_this->field_0x597, fopAcM_GetRoomNo(i_this))) + || !dComIfGs_isSwitch(i_this->field_0x596, fopAcM_GetRoomNo(i_this))) { + i_this->field_0x5a6++; + if (i_this->field_0x5a8 != 0) { + i_this->mBrks[0]->setFrame(36.0f); + i_this->mBrks[0]->setPlaySpeed(-2.0f); + } else { + i_this->field_0x5b8[0] = 0x12; + } + } + break; + case 6: + local_97 = 2; + bVar5 = true; + if (i_this->field_0x5a8 != 0) { + if (i_this->mBrks[0]->getFrame() <= 1.0f) { + i_this->field_0x5a8 = 0; + local_97 = 0; + i_this->field_0x5a6++; + anm_init(i_this, 8, 0.0f, 0, 1.0f); + dComIfGp_particle_set(0x8392, &i_this->current.pos, 0, 0); + mDoAud_seStart(Z2SE_OBJ_BARRIER_STN_DISAPPEAR, &i_this->current.pos, 0, 0); + } + } else { + if (i_this->field_0x5b8[0] == 0) { + i_this->field_0x5a6++; + anm_init(i_this, 8, 0.0f, 0, 1.0f); + dComIfGp_particle_set(0x8392, &i_this->current.pos, 0, 0); + mDoAud_seStart(Z2SE_OBJ_BARRIER_STN_DISAPPEAR, &i_this->current.pos, 0, 0); + } + } + break; + case 7: + if (i_this->mMorf->isStop()) { + i_this->field_0x5a6 = 0; + } + } + fopAc_ac_c* tpActor = (fopAc_ac_c*)fpcM_Search(s_tp_sub, i_this); + if (tpActor != NULL) { + i_this->field_0x5ac = tpActor->current.pos; + } + local_50 = i_this->field_0x5ac - i_this->current.pos; + f32 dVar14 = local_50.abs() * 0.01f; + s16 yRotation = cM_atan2s(local_50.x, local_50.z); + s16 xRotation = -cM_atan2s(local_50.y, JMAFastSqrt(local_50.x * local_50.x + local_50.z * local_50.z)); + if (local_97 != 0 && i_this->mModels[0] != NULL) { + switch(i_this->field_0x5a8) { + case 0: + i_this->field_0x5a8++; + case 1: + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, + i_this->current.pos.z); + mDoMtx_stack_c::YrotM(yRotation); + mDoMtx_stack_c::XrotM(xRotation); + mDoMtx_stack_c::scaleM(1.0f, 1.0f, dVar14); + mDoMtx_stack_c::YrotM(-0x4000); + mDoMtx_stack_c::transM(50.0f, 150.0f, 0.0f); + i_this->mModels[0]->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mModels[1]->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->mBtks[0]->play(); + i_this->mBtks[1]->play(); + if (i_this->mBrks[0]->getFrame() < 38.0f) { + i_this->mBrks[0]->play(); + } + local_50 = i_this->field_0x5c0 - player->current.pos; + cMtx_YrotS((MtxP)calc_mtx, -yRotation); + MtxPosition(&local_50, &local_5c); + if (local_97 == 1 && fabsf(local_5c.x) < 300.0f) { + if (i_this->mBrks[1]->getFrame() >= 19.0f) { + i_this->mBrks[1]->setFrame(19.0f - (i_this->mBrks[1]->getFrame() - 19.0f)); + } + if (i_this->mBrks[1]->getFrame() < 19.0f) { + i_this->mBrks[1]->play(); + } + mDoAud_seStartLevel(Z2SE_OBJ_BARRIER_EMERGENCE, &i_this->field_0x5c0, 0, 0); + } else { + if (i_this->mBrks[1]->getFrame() < 38.0f) { + i_this->mBrks[1]->play(); + mDoAud_seStartLevel(Z2SE_OBJ_BARRIER_EMERGENCE, &i_this->field_0x5c0, 0, 0); + } + if (local_97 == 2 && i_this->mBrks[1]->getFrame() < 38.0f) { + i_this->mBrks[1]->play(); + } + } + break; + } + } + if (bVar5 && i_this->mModels[0] != NULL) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, + i_this->current.pos.z); + mDoMtx_stack_c::YrotM(yRotation); + mDoMtx_stack_c::XrotM(xRotation); + mDoMtx_stack_c::scaleM(1.0f, 1.0f, dVar14); + mDoMtx_stack_c::YrotM(-0x4000); + mDoMtx_stack_c::transM(50.0f, 150.0f, 0.0f); + mDoMtx_stack_c::multVecZero(&i_this->field_0x5c0); + MTXCopy(mDoMtx_stack_c::get(), i_this->field_0x5d4); + i_this->mBgw->Move(); + } else if (i_this->mBgw != NULL) { + mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y + 3000.0f, + i_this->current.pos.z); + MTXCopy(mDoMtx_stack_c::get(), i_this->field_0x5d4); + i_this->mBgw->Move(); + } + local_5c = i_this->current.pos; + if (!bVar5) { + local_5c.y += 5000.0f; + } + i_this->mCyl.cM3dGCyl::SetC(local_5c); + dComIfG_Ccsp()->Set(&i_this->mCyl); + return 1; } /* 80D1E460-80D1E468 000F60 0008+00 1/0 0/0 0/0 .text daObj_Tp_IsDelete__FP12obj_tp_class */ -static bool daObj_Tp_IsDelete(obj_tp_class* param_0) { - return true; +static int daObj_Tp_IsDelete(obj_tp_class* param_0) { + return 1; } /* 80D1E468-80D1E4C0 000F68 0058+00 1/0 0/0 0/0 .text daObj_Tp_Delete__FP12obj_tp_class */ -static void daObj_Tp_Delete(obj_tp_class* param_0) { - // NONMATCHING +static int daObj_Tp_Delete(obj_tp_class* i_this) { + fopAcM_GetID(i_this); + dComIfG_resDelete(&i_this->mPhase, "Obj_tp"); + if (i_this->mBgw != NULL) { + dComIfG_Bgsp().Release(i_this->mBgw); + } + return 1; } /* ############################################################################################## */ /* 80D1EEE0-80D1EEE8 000040 0008+00 0/1 0/0 0/0 .data bmd$4283 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 bmd[8] = { - 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, +static int bmd[2] = { + 0x11, 0x12, }; -#pragma pop /* 80D1EEE8-80D1EEF0 000048 0008+00 0/1 0/0 0/0 .data brk$4284 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 brk[8] = { - 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, +static int brk[2] = { + 0x17, 0x18, }; -#pragma pop /* 80D1EEF0-80D1EEF8 000050 0008+00 0/1 0/0 0/0 .data eff_bmd$4296 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 eff_bmd[8] = { - 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x10, +static int eff_bmd[2] = { + 0x0F, 0x10, }; -#pragma pop /* 80D1EEF8-80D1EF00 000058 0008+00 0/1 0/0 0/0 .data eff_btk$4297 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 eff_btk[8] = { - 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x1C, +static int eff_btk[2] = { + 0x1B, 0x1C, }; -#pragma pop /* 80D1EF00-80D1EF08 000060 0008+00 0/1 0/0 0/0 .data eff_brk$4298 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 eff_brk[8] = { - 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16, +static int eff_brk[2] = { + 0x15, 0x16, }; -#pragma pop /* 80D1EF08-80D1EF4C 000068 0044+00 1/1 0/0 0/0 .data cc_cyl_src$4468 */ static dCcD_SrcCyl cc_cyl_src = { @@ -269,13 +353,173 @@ static dCcD_SrcCyl cc_cyl_src = { } // mCyl }; +/* 80D1E4C0-80D1E908 000FC0 0448+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ +static int useHeapInit(fopAc_ac_c* i_this) { + obj_tp_class* tp = static_cast(i_this); + tp->mMorf = + new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_tp", bmd[tp->field_0x594]), + NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Obj_tp", 7), 0, 1.0f, + 0, -1, 1, NULL, 0x80000, 0x11000084); + if (tp->mMorf == NULL || tp->mMorf->getModel() == NULL) { + return 0; + } + tp->mBrk = new mDoExt_brkAnm(); + if (tp->mBrk == NULL) { + return 0; + } + J3DAnmTevRegKey* regKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_tp", brk[tp->field_0x594]); + J3DModelData* modelData = tp->mMorf->getModel()->getModelData(); + if (!tp->mBrk->init( + modelData, + regKey, 1, 2, 1.0f, 0, + -1)) + { + return 0; + } + if (tp->field_0x5a0 != 0xf) { + for (int i = 0; i < 2; i++) { + J3DModelData* modelData = ( J3DModelData*)dComIfG_getObjectRes("Obj_tp", eff_bmd[i]); + JUT_ASSERT(809, modelData != 0); + tp->mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (tp->mModels[i] == NULL) { + return 0; + } + tp->mBtks[i] = new mDoExt_btkAnm(); + if (tp->mBtks[i] == NULL) { + return 0; + }; + J3DAnmTextureSRTKey* key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Obj_tp", eff_btk[i]); + modelData = tp->mModels[i]->getModelData(); + if (!tp->mBtks[i]->init( + modelData, + key, 1, 2, 1.0f, 0, + -1)) + { + return 0; + } + tp->mBrks[i] = new mDoExt_brkAnm(); + if (tp->mBrks[i] == NULL) { + return 0; + } + regKey = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Obj_tp", eff_brk[i]); + modelData = tp->mModels[i]->getModelData(); + if (!tp->mBrks[i]->init(modelData, + regKey, 1, + 2, 1.0f, 0, -1)) + { + return 0; + } + } + tp->mBgw = new dBgW(); + if (tp->mBgw == NULL) { + return 0; + } + if (tp->field_0x598 == 0) { + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes("Obj_tp", 0x1f); + if (tp->mBgw->Set(bgd, 1, &tp->field_0x5d4) == + 1) + { + return 0; + } + } else { + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes("Obj_tp", 0x20); + if (tp->mBgw->Set(bgd, 1, &tp->field_0x5d4) == + 1) + { + return 0; + } + } + tp->mBgw->SetCrrFunc(dBgS_MoveBGProc_Typical); + } + return 1; +} + +/* 80D1E950-80D1ECF0 001450 03A0+00 1/0 0/0 0/0 .text daObj_Tp_Create__FP10fopAc_ac_c */ +static int daObj_Tp_Create(fopAc_ac_c* i_this) { + fopAcM_SetupActor(i_this, obj_tp_class); + obj_tp_class* tp = (obj_tp_class*)i_this; + int rv = dComIfG_resLoad(&tp->mPhase, "Obj_tp"); + if (rv == cPhs_COMPLEATE_e) { + OS_REPORT("OBJ_TP bitSW2 %x\n", fopAcM_GetParam(tp)); + tp->field_0x594 = fopAcM_GetParam(tp) & 0xf; + tp->field_0x5a0 = (fopAcM_GetParam(tp) & 0xf0) >> 4; + tp->field_0x59c = (fopAcM_GetParam(tp) & 0xff00) >> 8; + tp->field_0x595 = (fopAcM_GetParam(tp) & 0xff0000) >> 16; + tp->field_0x596 = fopAcM_GetParam(tp) >> 24; + u8 bitSW2 = (tp->current.angle.z & 0xff); + if (bitSW2 != 0) { + OS_REPORT("OBJ_TP bitSW2 %x\n", bitSW2); + tp->field_0x597 = bitSW2; + } else { + tp->field_0x597 = 0xff; + } + OS_REPORT("OBJ_TP angle z %x \n", tp->current.angle.z); + tp->field_0x598 = (tp->current.angle.z >> 8) & 0xff; + if (tp->field_0x598 == 0xff) { + tp->field_0x598 = 0; + } + OS_REPORT("OBJ_TP arg2 %x %x \n", tp->field_0x598, tp->current.angle.z); + if (tp->field_0x595 != 0xff) { + dPath* path = dPath_GetRoomPath(tp->field_0x595, fopAcM_GetRoomNo(tp)); + if (path == NULL) { + return cPhs_ERROR_e; + } + dStage_dPnt_c* pPoint = path->m_points; + cXyz cStack_28; + csXyz cStack_30(0, 0, 0); + for (int i = 0; i < path->m_num; i++, pPoint++) { + int local_40 = (pPoint->mArg0 & 0xf); + int parameters = local_40 | ((fopAcM_GetParam(tp) & 0xff000000) | 0xff0000 | (i << 8)); + cStack_28 = pPoint->m_position; + cStack_30.y = pPoint->field_0x0 * 364; + cStack_30.z = tp->field_0x597 | (tp->field_0x598 << 8); + if (i == path->m_num - 1) { + if (!dPath_ChkClose(path)) { + parameters |= 0xf0; + } + } else { + parameters |= (i + 1) << 4; + } + fopAcM_createChild(PROC_OBJ_TP, fopAcM_GetID(tp), parameters, &cStack_28, + fopAcM_GetRoomNo(tp), &cStack_30, 0, -1, 0); + } + tp->field_0x5a4 = 1; + return cPhs_ERROR_e; + } + OS_REPORT("OBJ_TP ANGY %x\n", (int)*(short*)(tp + 0x4ea)); + OS_REPORT("OBJ_TP//////////////OBJ_TP SET 1 !!\n"); + if (!fopAcM_entrySolidHeap(tp, useHeapInit, tp->field_0x5a0 != 15 ? 0x24b0 : 0xfc0)) { + OS_REPORT("//////////////OBJ_TP SET NON !!\n"); + return cPhs_ERROR_e; + } + OS_REPORT("//////////////OBJ_TP SET 2 !!\n"); + if (tp->mBgw != NULL) { + if (dComIfG_Bgsp().Regist(tp->mBgw, tp) != 0) { + return cPhs_ERROR_e; + } + } + tp->current.angle.z = 0; + fopAcM_SetMtx(tp, tp->mMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMin(tp, -300.0f, -20000.0f, + -300.0f); + fopAcM_SetMax(tp, 300.0f, 20000.0f, + 300.0f); + tp->field_0x5cc = cM_rndF(65536.0f); + tp->mStts.Init(0xff, 0, tp); + tp->mCyl.Set(cc_cyl_src); + tp->mCyl.SetStts(&tp->mStts); + daObj_Tp_Execute(tp); + } + return rv; +} + /* 80D1EF4C-80D1EF6C -00001 0020+00 1/0 0/0 0/0 .data l_daObj_Tp_Method */ static actor_method_class l_daObj_Tp_Method = { - (process_method_func)daObj_Tp_Create__FP10fopAc_ac_c, - (process_method_func)daObj_Tp_Delete__FP12obj_tp_class, - (process_method_func)daObj_Tp_Execute__FP12obj_tp_class, - (process_method_func)daObj_Tp_IsDelete__FP12obj_tp_class, - (process_method_func)daObj_Tp_Draw__FP12obj_tp_class, + (process_method_func)daObj_Tp_Create, + (process_method_func)daObj_Tp_Delete, + (process_method_func)daObj_Tp_Execute, + (process_method_func)daObj_Tp_IsDelete, + (process_method_func)daObj_Tp_Draw, }; /* 80D1EF6C-80D1EF9C -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_TP */ @@ -296,226 +540,4 @@ extern actor_process_profile_definition g_profile_OBJ_TP = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -/* 80D1EF9C-80D1EFA8 0000FC 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, -}; - -/* 80D1EFA8-80D1EFB4 000108 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, -}; - -/* 80D1EFB4-80D1EFC0 000114 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGCyl */ -SECTION_DATA extern void* __vt__8cM3dGCyl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGCylFv, -}; - -/* 80D1EFC0-80D1EFCC 000120 000C+00 2/2 0/0 0/0 .data __vt__8cM3dGAab */ -SECTION_DATA extern void* __vt__8cM3dGAab[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__8cM3dGAabFv, -}; - -/* 80D1EFCC-80D1EFD8 00012C 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80D1E4C0-80D1E908 000FC0 0448+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */ -static void useHeapInit(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80D1E908-80D1E950 001408 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80D1EE3C-80D1EE40 000010 0004+00 0/0 0/0 0/0 .rodata @4247 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4247 = 10.0f; -COMPILER_STRIP_GATE(0x80D1EE3C, &lit_4247); -#pragma pop - -/* 80D1EE40-80D1EE44 000014 0004+00 0/0 0/0 0/0 .rodata @4248 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4248 = 9.0f; -COMPILER_STRIP_GATE(0x80D1EE40, &lit_4248); -#pragma pop - -/* 80D1EE44-80D1EE48 000018 0004+00 0/0 0/0 0/0 .rodata @4249 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4249 = 17.0f; -COMPILER_STRIP_GATE(0x80D1EE44, &lit_4249); -#pragma pop - -/* 80D1EE48-80D1EE4C 00001C 0004+00 0/0 0/0 0/0 .rodata @4250 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4250 = 38.0f; -COMPILER_STRIP_GATE(0x80D1EE48, &lit_4250); -#pragma pop - -/* 80D1EE4C-80D1EE50 000020 0004+00 0/0 0/0 0/0 .rodata @4251 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4251 = 36.0f; -COMPILER_STRIP_GATE(0x80D1EE4C, &lit_4251); -#pragma pop - -/* 80D1EE50-80D1EE54 000024 0004+00 0/0 0/0 0/0 .rodata @4252 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4252 = -2.0f; -COMPILER_STRIP_GATE(0x80D1EE50, &lit_4252); -#pragma pop - -/* 80D1EE54-80D1EE5C 000028 0008+00 0/0 0/0 0/0 .rodata @4253 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4253[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1EE54, &lit_4253); -#pragma pop - -/* 80D1EE5C-80D1EE64 000030 0008+00 0/0 0/0 0/0 .rodata @4254 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4254[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1EE5C, &lit_4254); -#pragma pop - -/* 80D1EE64-80D1EE6C 000038 0008+00 0/0 0/0 0/0 .rodata @4255 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_4255[8] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80D1EE64, &lit_4255); -#pragma pop - -/* 80D1EE6C-80D1EE70 000040 0004+00 0/0 0/0 0/0 .rodata @4256 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4256 = 1.0f / 100.0f; -COMPILER_STRIP_GATE(0x80D1EE6C, &lit_4256); -#pragma pop - -/* 80D1EE70-80D1EE74 000044 0004+00 0/0 0/0 0/0 .rodata @4257 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4257 = 50.0f; -COMPILER_STRIP_GATE(0x80D1EE70, &lit_4257); -#pragma pop - -/* 80D1EE74-80D1EE78 000048 0004+00 0/0 0/0 0/0 .rodata @4258 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4258 = 150.0f; -COMPILER_STRIP_GATE(0x80D1EE74, &lit_4258); -#pragma pop - -/* 80D1EE78-80D1EE7C 00004C 0004+00 0/1 0/0 0/0 .rodata @4259 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4259 = 300.0f; -COMPILER_STRIP_GATE(0x80D1EE78, &lit_4259); -#pragma pop - -/* 80D1EE7C-80D1EE80 000050 0004+00 0/0 0/0 0/0 .rodata @4260 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4260 = 19.0f; -COMPILER_STRIP_GATE(0x80D1EE7C, &lit_4260); -#pragma pop - -/* 80D1EE80-80D1EE84 000054 0004+00 0/0 0/0 0/0 .rodata @4261 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4261 = 3000.0f; -COMPILER_STRIP_GATE(0x80D1EE80, &lit_4261); -#pragma pop - -/* 80D1EE84-80D1EE88 000058 0004+00 0/0 0/0 0/0 .rodata @4262 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4262 = 5000.0f; -COMPILER_STRIP_GATE(0x80D1EE84, &lit_4262); -#pragma pop - -/* 80D1EE88-80D1EE8C 00005C 0004+00 0/1 0/0 0/0 .rodata @4580 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4580 = -300.0f; -COMPILER_STRIP_GATE(0x80D1EE88, &lit_4580); -#pragma pop - -/* 80D1EE8C-80D1EE90 000060 0004+00 0/1 0/0 0/0 .rodata @4581 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4581 = -20000.0f; -COMPILER_STRIP_GATE(0x80D1EE8C, &lit_4581); -#pragma pop - -/* 80D1EE90-80D1EE94 000064 0004+00 0/1 0/0 0/0 .rodata @4582 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4582 = 20000.0f; -COMPILER_STRIP_GATE(0x80D1EE90, &lit_4582); -#pragma pop - -/* 80D1EE94-80D1EE98 000068 0004+00 0/1 0/0 0/0 .rodata @4583 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_4583 = 65536.0f; -COMPILER_STRIP_GATE(0x80D1EE94, &lit_4583); -#pragma pop - -/* 80D1E950-80D1ECF0 001450 03A0+00 1/0 0/0 0/0 .text daObj_Tp_Create__FP10fopAc_ac_c */ -static void daObj_Tp_Create(fopAc_ac_c* param_0) { - // NONMATCHING -} - -/* 80D1ECF0-80D1ED38 0017F0 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80D1ED38-80D1ED80 001838 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80D1ED80-80D1EDDC 001880 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80D1EDDC-80D1EE24 0018DC 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file +/* 80D1EE98-80D1EE98 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 66de3d7903d..91774a93b39 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -235,4 +235,4 @@ extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { 0x44100, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index dad4c0ed05e..888044f828b 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -46,4 +46,4 @@ extern actor_process_profile_definition g_profile_Tag_TheBHint = { 0x40000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index abd8fe68bbc..4cc21eaa4c7 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -111,4 +111,4 @@ extern actor_process_profile_definition g_profile_Tag_WaraHowl = { 0x40000, fopAc_ACTOR_e, fopAc_CULLBOX_CUSTOM_e, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index a8c4fdcfeb3..210a60aa849 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -117,4 +117,4 @@ extern actor_process_profile_definition g_profile_Tag_WatchGe = { 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_0_e, // cullType -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index a391359ef00..49c04b28244 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -7,45 +7,9 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" -// -// Forward References: -// - -static int daTagWaterFall_Draw(daTagWaterFall_c*); -static void* s_waterfall(void*, void*); -static int daTagWaterFall_Execute(daTagWaterFall_c*); -static int daTagWaterFall_IsDelete(daTagWaterFall_c*); -static int daTagWaterFall_Delete(daTagWaterFall_c*); -static int daTagWaterFall_Create(daTagWaterFall_c*); - /* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data m_master_id */ static u32 m_master_id = static_cast(0xFFFFFFFF); -/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWaterFall_Method */ -static actor_method_class l_daTagWaterFall_Method = { - (process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete, - (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete, - (process_method_func)daTagWaterFall_Draw, -}; - -/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */ -extern actor_process_profile_definition g_profile_Tag_WaterFall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_WaterFall, - &g_fpcLf_Method.mBase, - sizeof(daTagWaterFall_c), - 0, - 0, - &g_fopAc_Method.base, - 198, - &l_daTagWaterFall_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, -}; - /* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text __ct__20daTagWaterFall_HIO_cFv */ daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() { field_0x04 = -1; @@ -290,4 +254,29 @@ static int daTagWaterFall_Create(daTagWaterFall_c* i_this) { } /* 80D64CDC-80D64D24 00079C 0048+00 2/1 0/0 0/0 .text __dt__20daTagWaterFall_HIO_cFv */ -daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {} \ No newline at end of file +daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {} + +/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagWaterFall_Method */ +static actor_method_class l_daTagWaterFall_Method = { + (process_method_func)daTagWaterFall_Create, (process_method_func)daTagWaterFall_Delete, + (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete, + (process_method_func)daTagWaterFall_Draw, +}; + +/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaterFall */ +extern actor_process_profile_definition g_profile_Tag_WaterFall = { + fpcLy_CURRENT_e, + 7, + fpcPi_CURRENT_e, + PROC_Tag_WaterFall, + &g_fpcLf_Method.mBase, + sizeof(daTagWaterFall_c), + 0, + 0, + &g_fopAc_Method.base, + 198, + &l_daTagWaterFall_Method, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +}; diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index e88748bed04..0927973783b 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -158,4 +158,4 @@ extern actor_process_profile_definition g_profile_TAG_YAMI = { fopAc_CULLBOX_CUSTOM_e, // cullType }; -#pragma nosyminline on \ No newline at end of file +#pragma nosyminline on