diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-09-09 07:30:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-09 17:30:32 +0300 |
| commit | e7477b50486e801e2c8781d4acee6aef7e8aebac (patch) | |
| tree | f37f2327f5d6af82198b59356b02b5a80652b6ee /src | |
| parent | abd44397c698ea47b5cae34ee9a447699f27c906 (diff) | |
Lv4railwall / lv4sand / lv4slidewall done. fix wii build (#2637)
* lv4railwall / lv4sand / lv4slidewall done and wii build fix
* fix Mtx** parameters
* add some notes about wii compiler version
* Remove dol2asm include
---------
Co-authored-by: hatal175 <hatal175@users.noreply.github.com>
Diffstat (limited to 'src')
62 files changed, 534 insertions, 1136 deletions
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 4221e7e191..c96e0b59fc 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -848,7 +848,7 @@ asm u32 __TRK_get_MSR() { } /* 8036F640-8036F648 -00001 0008+00 0/0 0/0 0/0 .text __TRK_set_MSR */ -asm void __TRK_set_MSR() { +asm void __TRK_set_MSR(register u32) { // clang-format off nofralloc mtmsr r3 diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 210c4509ec..087543ceaa 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -1318,7 +1318,7 @@ int daBgObj_c::ExecuteType1() { } /* 8045BFBC-8045C078 0029DC 00BC+00 1/0 0/0 0/0 .text Execute__9daBgObj_cFPPA3_A4_f */ -int daBgObj_c::Execute(f32 (**param_0)[3][4]) { +int daBgObj_c::Execute(Mtx** param_0) { (this->*mExecuteFunc[mSpecData.mSpecType])(); for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 93968764f0..3e502bf32a 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -491,7 +491,7 @@ void daCstaF_c::initStartBrkBtk() { } /* 804DF37C-804DF6C4 001A9C 0348+00 1/0 0/0 0/0 .text Execute__9daCstaF_cFPPA3_A4_f */ -int daCstaF_c::Execute(f32 (**param_0)[3][4]) { +int daCstaF_c::Execute(Mtx** param_0) { daAlink_c* player = daAlink_getAlinkActorClass(); setAnime(); diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index 3aa0d22a88..d1264cb908 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -50,7 +50,7 @@ int daDsh_c::Draw() { } /* 80467640-80467694 000220 0054+00 1/0 0/0 0/0 .text Execute__7daDsh_cFPPA3_A4_f */ -int daDsh_c::Execute(f32 (**param_0)[3][4]) { +int daDsh_c::Execute(Mtx** param_0) { callExecute(); setMtx(); *param_0 = &mBgMtx; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index f03358e1f1..da3fead668 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1006,7 +1006,7 @@ COMPILER_STRIP_GATE(0x80BB383C, &lit_4293); #pragma pop /* 80BAF09C-80BAF29C 000E1C 0200+00 1/0 0/0 0/0 .text Execute__9daObjBm_cFPPA3_A4_f */ -int daObjBm_c::Execute(f32 (**param_0)[3][4]) { +int daObjBm_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index ac3a462b32..bc63c33ecd 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -712,7 +712,7 @@ COMPILER_STRIP_GATE(0x80578BA4, &lit_4627); /* 805787CC-805788EC 001DEC 0120+00 1/0 0/0 0/0 .text Execute__13daObjBHASHI_cFPPA3_A4_f */ -void daObjBHASHI_c::Execute(f32 (**param_0)[3][4]) { +void daObjBHASHI_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 67a2cf2677..9527019840 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -115,7 +115,7 @@ int daObjBmSh_c::create() { } /* 80BB9DB4-80BB9F34 0003D4 0180+00 1/0 0/0 0/0 .text Execute__11daObjBmSh_cFPPA3_A4_f */ -int daObjBmSh_c::Execute(f32 (**param_0)[3][4]) { +int daObjBmSh_c::Execute(Mtx** param_0) { daPy_py_c* player = dComIfGp_getLinkPlayer(); if (player->checkFrontRollCrash()) { cXyz min = l_check_area[0]; diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index cd998ca702..3a7fd4c1ee 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -76,7 +76,7 @@ int daObjChandelier_c::Draw() { } /* 80BC8238-80BC82C0 000378 0088+00 1/0 0/0 0/0 .text Execute__17daObjChandelier_cFPPA3_A4_f */ -int daObjChandelier_c::Execute(f32 (**param_0)[3][4]) { +int daObjChandelier_c::Execute(Mtx** param_0) { if (s_exeProc[mMode] != NULL) { (this->*s_exeProc[mMode])(); } diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index eaa0ea3fd3..8654fa6196 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -57,7 +57,7 @@ int daCowdoor_c::create() { } /* 80BCCA1C-80BCCA48 00029C 002C+00 1/0 0/0 0/0 .text Execute__11daCowdoor_cFPPA3_A4_f */ -int daCowdoor_c::Execute(f32 (**param_0)[3][4]) { +int daCowdoor_c::Execute(Mtx** param_0) { *param_0 = &mBgMtx; setBaseMtx(); return 1; diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 37fa1272c4..e9c6f23acd 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -804,7 +804,7 @@ int daObjCRVGATE_c::Create() { /* 80BD2ECC-80BD2FB8 002BAC 00EC+00 1/0 0/0 0/0 .text Execute__14daObjCRVGATE_cFPPA3_A4_f */ -int daObjCRVGATE_c::Execute(f32 (**param_0)[3][4]) { +int daObjCRVGATE_c::Execute(Mtx** param_0) { s_CoCount = 0; if (mKeyParam == 0x01) { diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 2af5048eae..162d16fe0a 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -401,7 +401,7 @@ COMPILER_STRIP_GATE(0x80BD4D84, &lit_4044); #pragma pop /* 80BD4AC8-80BD4C44 000A08 017C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_DW_cFPPA3_A4_f */ -void daObjCRVLH_DW_c::Execute(f32 (**param_0)[3][4]) { +void daObjCRVLH_DW_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 7bc1369068..123b18ae1d 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -435,7 +435,7 @@ COMPILER_STRIP_GATE(0x80BD5A60, &lit_4002); #pragma pop /* 80BD5730-80BD593C 0008D0 020C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_UP_cFPPA3_A4_f */ -void daObjCRVLH_UP_c::Execute(f32 (**param_0)[3][4]) { +void daObjCRVLH_UP_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 04bc1e36d0..4e451bcb1e 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -229,7 +229,7 @@ extern "C" void __dt__12dBgS_ObjAcchFv() { /* 80C1514C-80C151A4 0005EC 0058+00 1/0 0/0 0/0 .text Execute__14daObjGrzRock_cFPPA3_A4_f */ -void daObjGrzRock_c::Execute(f32 (**param_0)[3][4]) { +void daObjGrzRock_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index 715741a817..83c41e899e 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -402,7 +402,7 @@ void daObjH_Saku_c::Create() { /* 80C162F4-80C16340 000EB4 004C+00 1/0 0/0 0/0 .text Execute__13daObjH_Saku_cFPPA3_A4_f */ -void daObjH_Saku_c::Execute(f32 (**param_0)[3][4]) { +void daObjH_Saku_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index 85cd0447fc..0ca74929ae 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -204,7 +204,7 @@ void nObjMHasu::daObjMHasu_c::Create() { /* 80C185A4-80C18600 000384 005C+00 1/0 0/0 0/0 .text * Execute__Q29nObjMHasu12daObjMHasu_cFPPA3_A4_f */ -void nObjMHasu::daObjMHasu_c::Execute(f32 (**param_0)[3][4]) { +void nObjMHasu::daObjMHasu_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index 7f16bc72fd..eaf656605b 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -62,7 +62,7 @@ int daHsTarget_c::create() { /* 80C1F6B0-80C1F6C4 000370 0014+00 1/0 0/0 0/0 .text Execute__12daHsTarget_cFPPA3_A4_f */ -int daHsTarget_c::Execute(f32 (**param_0)[3][4]) { +int daHsTarget_c::Execute(Mtx** param_0) { *param_0 = &mpModel->getBaseTRMtx(); return 1; } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 9803b70ecb..effcc20b5f 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -409,7 +409,7 @@ COMPILER_STRIP_GATE(0x80C27560, &lit_3918); /* 80C270E0-80C27400 0007A0 0320+00 1/0 0/0 0/0 .text Execute__12daObjIkada_cFPPA3_A4_f */ -void daObjIkada_c::Execute(f32 (**param_0)[3][4]) { +void daObjIkada_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index 58da39c521..44ebeb3696 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -586,7 +586,7 @@ COMPILER_STRIP_GATE(0x80C292E4, &lit_4023); #pragma pop /* 80C28C70-80C290AC 0009F0 043C+00 1/0 0/0 0/0 .text Execute__10daObjIta_cFPPA3_A4_f */ -void daObjIta_c::Execute(f32 (**param_0)[3][4]) { +void daObjIta_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index e58bd6dc25..a80dbc0bdf 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -591,7 +591,7 @@ void daObjKshtr_c::event_proc_call2() { /* 80C4852C-80C48590 000AEC 0064+00 1/0 0/0 0/0 .text Execute__12daObjKshtr_cFPPA3_A4_f */ -void daObjKshtr_c::Execute(f32 (**param_0)[3][4]) { +void daObjKshtr_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index f80415575e..92858302bb 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -134,7 +134,7 @@ void daLv1Cdl01_c::pointLightProc() { /* 80C57274-80C575F4 0006B4 0380+00 1/0 0/0 0/0 .text Execute__12daLv1Cdl01_cFPPA3_A4_f */ -int daLv1Cdl01_c::Execute(f32 (**param_0)[3][4]) { +int daLv1Cdl01_c::Execute(Mtx** param_0) { *param_0 = &mpModel->getBaseTRMtx(); if (mTimer != 0) { mTimer--; diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 9e61467f3b..0c461c2e99 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -259,7 +259,7 @@ void daLv4EdShutter_c::create() { } /* 80C5E0A4-80C5E0F4 0003E4 0050+00 1/0 0/0 0/0 .text Execute__16daLv4EdShutter_cFPPA3_A4_f */ -void daLv4EdShutter_c::Execute(f32 (**param_0)[3][4]) { +void daLv4EdShutter_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index 332d6e6b7e..bada3e4e48 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -78,7 +78,7 @@ int daLv4PoGate_c::create() { /* 80C5FEDC-80C5FF2C 0003DC 0050+00 1/0 0/0 0/0 .text Execute__13daLv4PoGate_cFPPA3_A4_f */ -int daLv4PoGate_c::Execute(f32 (**param_0)[3][4]) { +int daLv4PoGate_c::Execute(Mtx** param_0) { moveGate(); *param_0 = &mpModel->getBaseTRMtx(); setBaseMtx(); diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index c18f0ad6e6..f674e2e5c2 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -6,348 +6,278 @@ #include "d/dolzel_rel.h" #include "d/actor/d_a_obj_lv4RailWall.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" static void s_BossSearch__FPvPv(); -extern "C" void initBaseMtx__14daObjLv4Wall_cFv(); -extern "C" void setBaseMtx__14daObjLv4Wall_cFv(); -extern "C" void Create__14daObjLv4Wall_cFv(); -extern "C" void CreateHeap__14daObjLv4Wall_cFv(); -extern "C" void create1st__14daObjLv4Wall_cFv(); -extern "C" void Execute__14daObjLv4Wall_cFPPA3_A4_f(); -extern "C" void action__14daObjLv4Wall_cFv(); -extern "C" void mode_init_wait__14daObjLv4Wall_cFv(); -extern "C" void mode_wait__14daObjLv4Wall_cFv(); -extern "C" void mode_init_move__14daObjLv4Wall_cFv(); -extern "C" void mode_move__14daObjLv4Wall_cFv(); -extern "C" void mode_init_dead__14daObjLv4Wall_cFv(); -extern "C" void mode_dead__14daObjLv4Wall_cFv(); -extern "C" void eventStart__14daObjLv4Wall_cFv(); -extern "C" void Draw__14daObjLv4Wall_cFv(); -extern "C" void Delete__14daObjLv4Wall_cFv(); -extern "C" static void daObjLv4Wall_create1st__FP14daObjLv4Wall_c(); -extern "C" void __dt__8cM3dGCylFv(); -extern "C" void __dt__8cM3dGAabFv(); -extern "C" void __dt__10dCcD_GSttsFv(); -extern "C" void __dt__12dBgS_AcchCirFv(); -extern "C" void __dt__12dBgS_ObjAcchFv(); -extern "C" static void daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c(); -extern "C" static void daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c(); -extern "C" static void daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c(); -extern "C" void __dt__10cCcD_GSttsFv(); -extern "C" void __dt__17dEvLib_callback_cFv(); -extern "C" bool eventStart__17dEvLib_callback_cFv(); -extern "C" bool eventRun__17dEvLib_callback_cFv(); -extern "C" bool eventEnd__17dEvLib_callback_cFv(); -extern "C" void __dt__14daObjLv4Wall_cFv(); -extern "C" static void func_80C61B10(); -extern "C" static void func_80C61B18(); -extern "C" static void func_80C61B20(); -extern "C" static void func_80C61B28(); -extern "C" extern char const* const d_a_obj_lv4RailWall__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAc_IsActor__FPv(); -extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); -extern "C" void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void fpcEx_Search__FPFPvPv_PvPv(); -extern "C" void fpcSch_JudgeForPName__FPvPv(); -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 isDungeonItem__12dSv_memBit_cCFi(); -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 eventUpdate__17dEvLib_callback_cFv(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void StartQuake__12dVibration_cFii4cXyz(); -extern "C" void StopQuake__12dVibration_cFi(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__12dBgS_AcchCirFv(); -extern "C" void __dt__9dBgS_AcchFv(); -extern "C" void __ct__9dBgS_AcchFv(); -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 SetObj__16dBgS_PolyPassChkFv(); -extern "C" void __ct__10dCcD_GSttsFv(); -extern "C" void __ct__12dCcD_GObjInfFv(); -extern "C" void __dt__12dCcD_GObjInfFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __dt__13cBgS_PolyInfoFv(); -extern "C" void __dt__8cM3dGCirFv(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -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" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C61D38[4]; - -// -// Declarations: -// +#include "d/actor/d_a_obj_swspinner.h" +#include "d/actor/d_a_b_ds.h" +#include "d/d_s_play.h" + +/* 80C61BDC-80C61BE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ +static char* l_arcName = "P_L4Rwall"; /* 80C60A78-80C60AC4 000078 004C+00 2/2 0/0 0/0 .text s_BossSearch__FPvPv */ -static void s_BossSearch(void* param_0, void* param_1) { - // NONMATCHING +static void* s_BossSearch(void* i_actor, void* i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_B_DS) { + return i_actor; + } + + return NULL; } /* 80C60AC4-80C60B00 0000C4 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::initBaseMtx() { - // NONMATCHING + mpModel->setBaseScale(scale); + setBaseMtx(); } /* 80C60B00-80C60B7C 000100 007C+00 2/2 0/0 0/0 .text setBaseMtx__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mHeight, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -/* ############################################################################################## */ -/* 80C61B38-80C61B3C 000000 0004+00 2/2 0/0 0/0 .rodata @3709 */ -SECTION_RODATA static f32 const lit_3709 = 3375.0f; -COMPILER_STRIP_GATE(0x80C61B38, &lit_3709); - -/* 80C61B3C-80C61B40 000004 0004+00 2/4 0/0 0/0 .rodata @3710 */ -SECTION_RODATA static u8 const lit_3710[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C61B3C, &lit_3710); - -/* 80C61B40-80C61B44 000008 0004+00 1/2 0/0 0/0 .rodata @3711 */ -SECTION_RODATA static f32 const lit_3711 = 1700.0f; -COMPILER_STRIP_GATE(0x80C61B40, &lit_3711); - /* 80C60B7C-80C60CD0 00017C 0154+00 1/0 0/0 0/0 .text Create__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::Create() { - // NONMATCHING -} +int daObjLv4Wall_c::Create() { + if (fopAcM_isSwitch(this, getSwbit()) || dComIfGs_isStageBossEnemy() || BREG_S(9) != 0) { + mHeight = 3375.0f; + mode_init_dead(); + fopAcM_onSwitch(this, getSwbit()); + } else { + mHeight = 0.0f; + mode_init_wait(); + } -/* ############################################################################################## */ -/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C61BB0 = "P_L4Rwall"; -#pragma pop + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); -/* 80C61BDC-80C61BE0 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4RailWall__stringBase0; + cXyz swpos(current.pos); + swpos.y -= 1700.0f; + + fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwbit() << 8, &swpos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + mpSwSpinner = NULL; + return 1; +} /* 80C60CD0-80C60D40 0002D0 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::CreateHeap() { - // NONMATCHING +int daObjLv4Wall_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + JUT_ASSERT(217, modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); + if (mpModel == NULL) { + return 0; + } + + return 1; } /* 80C60D40-80C60DC4 000340 0084+00 1/1 0/0 0/0 .text create1st__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::create1st() { - // NONMATCHING +int daObjLv4Wall_c::create1st() { + int phase_state = dComIfG_resLoad(&mPhase, l_arcName); + if (phase_state == cPhs_COMPLEATE_e) { + phase_state = MoveBGCreate(l_arcName, 7, dBgS_MoveBGProc_TypicalRotY, 0x7350, NULL); + if (phase_state == cPhs_ERROR_e) { + return phase_state; + } + } + + return phase_state; } /* 80C60DC4-80C60E90 0003C4 00CC+00 1/0 0/0 0/0 .text Execute__14daObjLv4Wall_cFPPA3_A4_f */ -void daObjLv4Wall_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING -} +int daObjLv4Wall_c::Execute(Mtx** param_0) { + if (mpSwSpinner == NULL) { + mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(PROC_Obj_SwSpinner); + } -/* ############################################################################################## */ -/* 80C61BE0-80C61BEC -00001 000C+00 0/1 0/0 0/0 .data @3758 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3758[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_wait__14daObjLv4Wall_cFv, -}; -#pragma pop - -/* 80C61BEC-80C61BF8 -00001 000C+00 0/1 0/0 0/0 .data @3759 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3759[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_move__14daObjLv4Wall_cFv, -}; -#pragma pop - -/* 80C61BF8-80C61C04 -00001 000C+00 0/1 0/0 0/0 .data @3760 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3760[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_dead__14daObjLv4Wall_cFv, -}; -#pragma pop - -/* 80C61C04-80C61C28 000048 0024+00 0/1 0/0 0/0 .data l_func$3757 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 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 + if (mpSwSpinner == NULL) { + return 1; + } + + action(); + + cXyz swpos(current.pos); + swpos.y += mHeight - 1700.0f; + + fopAcM_SetPosition(mpSwSpinner, swpos.x, swpos.y, swpos.z); + *param_0 = &mBgMtx; + setBaseMtx(); + return 1; +} /* 80C60E90-80C60F4C 000490 00BC+00 1/1 0/0 0/0 .text action__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::action() { - // NONMATCHING + static void (daObjLv4Wall_c::*l_func[])() = { + &daObjLv4Wall_c::mode_wait, + &daObjLv4Wall_c::mode_move, + &daObjLv4Wall_c::mode_dead, + }; + + (this->*l_func[mMode])(); + eventUpdate(); } /* 80C60F4C-80C60F58 00054C 000C+00 1/1 0/0 0/0 .text mode_init_wait__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::mode_init_wait() { - // NONMATCHING + mMode = MODE_WAIT; } -/* ############################################################################################## */ -/* 80C61B44-80C61B48 00000C 0004+00 1/1 0/0 0/0 .rodata @3782 */ -SECTION_RODATA static f32 const lit_3782 = 4096.0f; -COMPILER_STRIP_GATE(0x80C61B44, &lit_3782); - -/* 80C61B48-80C61B50 000010 0004+04 1/1 0/0 0/0 .rodata @3783 */ -SECTION_RODATA static f32 const lit_3783[1 + 1 /* padding */] = { - 7.0f / 10.0f, - /* padding */ - 0.0f, -}; -COMPILER_STRIP_GATE(0x80C61B48, &lit_3783); - -/* 80C61B50-80C61B58 000018 0008+00 1/1 0/0 0/0 .rodata @3785 */ -SECTION_RODATA static u8 const lit_3785[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C61B50, &lit_3785); - /* 80C60F58-80C61004 000558 00AC+00 1/0 0/0 0/0 .text mode_wait__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::mode_wait() { - // NONMATCHING + if ((mpSwSpinner->GetRotSpeedY() / 4096.0f) > 0.7f) { + mRotCounter++; + if (mRotCounter > 100) { + mode_init_move(); + + daB_DS_c* boss = (daB_DS_c*)fpcM_Search(s_BossSearch, this); + boss->onDemo(); + return; + } + } else { + mRotCounter = 0; + } } /* 80C61004-80C61068 000604 0064+00 2/2 0/0 0/0 .text mode_init_move__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::mode_init_move() { - // NONMATCHING + fopAcM_onSwitch(this, getSwbit()); + speed.y = 0.0f; + gravity = 0.0f; + mMoveCounter = 0; + mMode = MODE_MOVE; } -/* ############################################################################################## */ -/* 80C61B58-80C61B9C 000020 0044+00 0/1 0/0 0/0 .rodata l_spd_tbl$3801 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const l_spd_tbl[68] = { - 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x40, 0x0C, - 0xCC, 0xCD, 0x40, 0x6C, 0xCC, 0xCD, 0x40, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, - 0x41, 0x60, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0x88, 0x00, 0x00, 0x41, 0x70, - 0x00, 0x00, 0x41, 0x48, 0x00, 0x00, 0x41, 0x18, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80C61B58, &l_spd_tbl); -#pragma pop - -/* 80C61B9C-80C61BA0 000064 0004+00 0/1 0/0 0/0 .rodata @3881 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3881 = 30.0f; -COMPILER_STRIP_GATE(0x80C61B9C, &lit_3881); -#pragma pop - -/* 80C61BA0-80C61BA4 000068 0004+00 1/2 0/0 0/0 .rodata @3882 */ -SECTION_RODATA static f32 const lit_3882 = 1.0f; -COMPILER_STRIP_GATE(0x80C61BA0, &lit_3882); - -/* 80C61BA4-80C61BA8 00006C 0004+00 0/1 0/0 0/0 .rodata @3883 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3883 = 4.0f; -COMPILER_STRIP_GATE(0x80C61BA4, &lit_3883); -#pragma pop - -/* 80C61BA8-80C61BAC 000070 0004+00 0/1 0/0 0/0 .rodata @3884 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3884 = 10.0f; -COMPILER_STRIP_GATE(0x80C61BA8, &lit_3884); -#pragma pop - -/* 80C61BAC-80C61BB0 000074 0004+00 0/1 0/0 0/0 .rodata @3885 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3885 = -1.0f; -COMPILER_STRIP_GATE(0x80C61BAC, &lit_3885); -#pragma pop - /* 80C61068-80C613C0 000668 0358+00 1/0 0/0 0/0 .text mode_move__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::mode_move() { - // NONMATCHING + static const f32 l_spd_tbl[] = { + 0.0f, + 1.0f, + 1.5f, + 2.2f, + 3.7f, + 6.0f, + 10.0f, + 14.0f, + 17.0f, + 17.0f, + 15.0f, + 12.5f, + 9.5f, + 6.0f, + 3.0f, + 3.0f, + 3.0f + }; + + mMoveCounter++; + f32 prev_speed = speed.y; + + u32 spd_chkpoint = mMoveCounter / 30; + if (spd_chkpoint > 15) { + spd_chkpoint = 15; + } + + cLib_chaseF(&speed.y, l_spd_tbl[spd_chkpoint + 1], (l_spd_tbl[spd_chkpoint + 1] - l_spd_tbl[spd_chkpoint]) / 30.0f); + BOOL is_target_height = cLib_chaseF(&mHeight, 3375.0f, speed.y); + + if (mMoveCounter == 5) { + dComIfGp_getVibration().StartQuake(2, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } else if (mMoveCounter > 5) { + if (prev_speed < 4.0f && speed.y >= 4.0f) { + dComIfGp_getVibration().StartQuake(4, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } else if (prev_speed < 10.0f && speed.y >= 10.0f) { + dComIfGp_getVibration().StartQuake(8, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } else if (prev_speed > 10.0f && speed.y <= 10.0f) { + dComIfGp_getVibration().StartQuake(4, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } else if (prev_speed > 4.0f && speed.y <= 4.0f) { + dComIfGp_getVibration().StartQuake(2, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + } + } + + if (is_target_height) { + daB_DS_c* boss = (daB_DS_c*)fpcM_Search(s_BossSearch, this); + boss->offDemo(); + + fopAcM_seStart(this, Z2SE_OBJ_DS_CLMN_UP_ST, 0); + dComIfGp_getVibration().StopQuake(0x1F); + dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); + mode_init_dead(); + return; + } + + eyePos = current.pos; + eyePos.y += mHeight; + fopAcM_seStartLevel(this, Z2SE_OBJ_DS_CLMN_UP, 0); } /* 80C613C0-80C613CC 0009C0 000C+00 2/2 0/0 0/0 .text mode_init_dead__14daObjLv4Wall_cFv */ void daObjLv4Wall_c::mode_init_dead() { - // NONMATCHING + mMode = MODE_DEAD; } /* 80C613CC-80C613D0 0009CC 0004+00 1/0 0/0 0/0 .text mode_dead__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::mode_dead() { - /* empty function */ -} +void daObjLv4Wall_c::mode_dead() {} /* 80C613D0-80C6143C 0009D0 006C+00 2/1 0/0 0/0 .text eventStart__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::eventStart() { - // NONMATCHING +bool daObjLv4Wall_c::eventStart() { + dComIfGp_getVibration().StartQuake(4, 0xF, cXyz(0.0f, 1.0f, 0.0f)); + mode_init_move(); + return 1; } /* 80C6143C-80C614E0 000A3C 00A4+00 1/0 0/0 0/0 .text Draw__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::Draw() { - // NONMATCHING +int daObjLv4Wall_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } /* 80C614E0-80C61514 000AE0 0034+00 1/0 0/0 0/0 .text Delete__14daObjLv4Wall_cFv */ -void daObjLv4Wall_c::Delete() { - // NONMATCHING +int daObjLv4Wall_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; +} + +/* 80C61514-80C61660 000B14 014C+00 1/0 0/0 0/0 .text daObjLv4Wall_create1st__FP14daObjLv4Wall_c + */ +static int daObjLv4Wall_create1st(daObjLv4Wall_c* i_this) { + fopAcM_SetupActor(i_this, daObjLv4Wall_c); + return i_this->create1st(); +} + +/* 80C6182C-80C6184C 000E2C 0020+00 1/0 0/0 0/0 .text + * daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c */ +static int daObjLv4Wall_MoveBGDelete(daObjLv4Wall_c* i_this) { + return i_this->MoveBGDelete(); +} + +/* 80C6184C-80C6186C 000E4C 0020+00 1/0 0/0 0/0 .text + * daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c */ +static int daObjLv4Wall_MoveBGExecute(daObjLv4Wall_c* i_this) { + return i_this->MoveBGExecute(); +} + +/* 80C6186C-80C61898 000E6C 002C+00 1/0 0/0 0/0 .text daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c + */ +static int daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c* i_this) { + return i_this->MoveBGDraw(); } -/* ############################################################################################## */ /* 80C61C28-80C61C48 -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Wall_METHODS */ static actor_method_class daObjLv4Wall_METHODS = { - (process_method_func)daObjLv4Wall_create1st__FP14daObjLv4Wall_c, - (process_method_func)daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c, - (process_method_func)daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c, + (process_method_func)daObjLv4Wall_create1st, + (process_method_func)daObjLv4Wall_MoveBGDelete, + (process_method_func)daObjLv4Wall_MoveBGExecute, 0, - (process_method_func)daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c, + (process_method_func)daObjLv4Wall_MoveBGDraw, }; /* 80C61C48-80C61C78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4RailWall */ @@ -367,195 +297,3 @@ extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = { fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType }; - -/* 80C61C78-80C61C84 0000BC 000C+00 2/2 0/0 0/0 .data __vt__12dBgS_AcchCir */ -SECTION_DATA extern void* __vt__12dBgS_AcchCir[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_AcchCirFv, -}; - -/* 80C61C84-80C61C90 0000C8 000C+00 3/3 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, -}; - -/* 80C61C90-80C61C9C 0000D4 000C+00 2/2 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, -}; - -/* 80C61C9C-80C61CA8 0000E0 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, -}; - -/* 80C61CA8-80C61CB4 0000EC 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, -}; - -/* 80C61CB4-80C61CD8 0000F8 0024+00 3/3 0/0 0/0 .data __vt__12dBgS_ObjAcch */ -SECTION_DATA extern void* __vt__12dBgS_ObjAcch[9] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12dBgS_ObjAcchFv, - (void*)NULL, - (void*)NULL, - (void*)func_80C61B28, - (void*)NULL, - (void*)NULL, - (void*)func_80C61B20, -}; - -/* 80C61CD8-80C61CF0 00011C 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ -SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17dEvLib_callback_cFv, - (void*)eventStart__17dEvLib_callback_cFv, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, -}; - -/* 80C61CF0-80C61D38 000134 0048+00 2/2 0/0 0/0 .data __vt__14daObjLv4Wall_c */ -SECTION_DATA extern void* __vt__14daObjLv4Wall_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjLv4Wall_cFv, - (void*)Create__14daObjLv4Wall_cFv, - (void*)Execute__14daObjLv4Wall_cFPPA3_A4_f, - (void*)Draw__14daObjLv4Wall_cFv, - (void*)Delete__14daObjLv4Wall_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)NULL, - (void*)NULL, - (void*)func_80C61B18, - (void*)func_80C61B10, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, - (void*)__dt__14daObjLv4Wall_cFv, - (void*)eventStart__14daObjLv4Wall_cFv, -}; - -/* 80C61514-80C61660 000B14 014C+00 1/0 0/0 0/0 .text daObjLv4Wall_create1st__FP14daObjLv4Wall_c - */ -static void daObjLv4Wall_create1st(daObjLv4Wall_c* param_0) { - // NONMATCHING -} - -/* 80C61660-80C616A8 000C60 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */ -// cM3dGCyl::~cM3dGCyl() { -extern "C" void __dt__8cM3dGCylFv() { - // NONMATCHING -} - -/* 80C616A8-80C616F0 000CA8 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */ -// cM3dGAab::~cM3dGAab() { -extern "C" void __dt__8cM3dGAabFv() { - // NONMATCHING -} - -/* 80C616F0-80C6174C 000CF0 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */ -// dCcD_GStts::~dCcD_GStts() { -extern "C" void __dt__10dCcD_GSttsFv() { - // NONMATCHING -} - -/* 80C6174C-80C617BC 000D4C 0070+00 1/0 0/0 0/0 .text __dt__12dBgS_AcchCirFv */ -// dBgS_AcchCir::~dBgS_AcchCir() { -extern "C" void __dt__12dBgS_AcchCirFv() { - // NONMATCHING -} - -/* 80C617BC-80C6182C 000DBC 0070+00 3/2 0/0 0/0 .text __dt__12dBgS_ObjAcchFv */ -// dBgS_ObjAcch::~dBgS_ObjAcch() { -extern "C" void __dt__12dBgS_ObjAcchFv() { - // NONMATCHING -} - -/* 80C6182C-80C6184C 000E2C 0020+00 1/0 0/0 0/0 .text - * daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c */ -static void daObjLv4Wall_MoveBGDelete(daObjLv4Wall_c* param_0) { - // NONMATCHING -} - -/* 80C6184C-80C6186C 000E4C 0020+00 1/0 0/0 0/0 .text - * daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c */ -static void daObjLv4Wall_MoveBGExecute(daObjLv4Wall_c* param_0) { - // NONMATCHING -} - -/* 80C6186C-80C61898 000E6C 002C+00 1/0 0/0 0/0 .text daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c - */ -static void daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c* param_0) { - // NONMATCHING -} - -/* 80C61898-80C618E0 000E98 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */ -// cCcD_GStts::~cCcD_GStts() { -extern "C" void __dt__10cCcD_GSttsFv() { - // NONMATCHING -} - -/* 80C618E0-80C61928 000EE0 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */ -// dEvLib_callback_c::~dEvLib_callback_c() { -extern "C" void __dt__17dEvLib_callback_cFv() { - // NONMATCHING -} - -/* 80C61928-80C61930 000F28 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv - */ -// bool dEvLib_callback_c::eventStart() { -extern "C" bool eventStart__17dEvLib_callback_cFv() { - return true; -} - -/* 80C61930-80C61938 000F30 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventRun() { -extern "C" bool eventRun__17dEvLib_callback_cFv() { - return true; -} - -/* 80C61938-80C61940 000F38 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventEnd() { -extern "C" bool eventEnd__17dEvLib_callback_cFv() { - return true; -} - -/* 80C61940-80C61B10 000F40 01D0+00 2/1 0/0 0/0 .text __dt__14daObjLv4Wall_cFv */ -daObjLv4Wall_c::~daObjLv4Wall_c() { - // NONMATCHING -} - -/* 80C61B10-80C61B18 001110 0008+00 1/0 0/0 0/0 .text @1440@eventStart__14daObjLv4Wall_cFv */ -static void func_80C61B10() { - // NONMATCHING -} - -/* 80C61B18-80C61B20 001118 0008+00 1/0 0/0 0/0 .text @1440@__dt__14daObjLv4Wall_cFv */ -static void func_80C61B18() { - // NONMATCHING -} - -/* 80C61B20-80C61B28 001120 0008+00 1/0 0/0 0/0 .text @36@__dt__12dBgS_ObjAcchFv */ -static void func_80C61B20() { - // NONMATCHING -} - -/* 80C61B28-80C61B30 001128 0008+00 1/0 0/0 0/0 .text @20@__dt__12dBgS_ObjAcchFv */ -static void func_80C61B28() { - // NONMATCHING -} - -/* 80C61BB0-80C61BB0 000078 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 33e5aa6d4d..0ba0c52971 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -6,359 +6,214 @@ #include "d/dolzel_rel.h" #include "d/actor/d_a_obj_lv4SlideWall.h" -#include "dol2asm.h" - - - -// -// Forward References: -// - -extern "C" void __ct__15daSldWall_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__11daSldWall_cFv(); -extern "C" void CreateHeap__11daSldWall_cFv(); -extern "C" void create__11daSldWall_cFv(); -extern "C" void Execute__11daSldWall_cFPPA3_A4_f(); -extern "C" void moveWall__11daSldWall_cFv(); -extern "C" void init_modeWait__11daSldWall_cFv(); -extern "C" void modeWait__11daSldWall_cFv(); -extern "C" void init_modeMoveOpen__11daSldWall_cFv(); -extern "C" void modeMoveOpen__11daSldWall_cFv(); -extern "C" void init_modeMoveClose__11daSldWall_cFv(); -extern "C" void modeMoveClose__11daSldWall_cFv(); -extern "C" void setSe__11daSldWall_cFv(); -extern "C" void Draw__11daSldWall_cFv(); -extern "C" void Delete__11daSldWall_cFv(); -extern "C" static void daSldWall_Draw__FP11daSldWall_c(); -extern "C" static void daSldWall_Execute__FP11daSldWall_c(); -extern "C" static void daSldWall_Delete__FP11daSldWall_c(); -extern "C" static void daSldWall_Create__FP10fopAc_ac_c(); -extern "C" void __dt__15daSldWall_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv4SlideWall_cpp(); -extern "C" extern char const* const d_a_obj_lv4SlideWall__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 StartShock__12dVibration_cFii4cXyz(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C626A8-80C626AC 000000 0004+00 4/4 0/0 0/0 .rodata @3627 */ -SECTION_RODATA static f32 const lit_3627 = 900.0f; -COMPILER_STRIP_GATE(0x80C626A8, &lit_3627); - -/* 80C626AC-80C626B0 000004 0004+00 1/1 0/0 0/0 .rodata @3628 */ -SECTION_RODATA static f32 const lit_3628 = 4.0f; -COMPILER_STRIP_GATE(0x80C626AC, &lit_3628); - -/* 80C626F0-80C626FC -00001 000C+00 0/1 0/0 0/0 .data @3720 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3720[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__11daSldWall_cFv, -}; -#pragma pop - -/* 80C626FC-80C62708 -00001 000C+00 0/1 0/0 0/0 .data @3721 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3721[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMoveOpen__11daSldWall_cFv, -}; -#pragma pop - -/* 80C62708-80C62714 -00001 000C+00 0/1 0/0 0/0 .data @3722 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3722[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeMoveClose__11daSldWall_cFv, -}; -#pragma pop - -/* 80C62714-80C62738 000044 0024+00 0/1 0/0 0/0 .data mode_proc$3719 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[36] = { - 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 - -/* 80C62738-80C62758 -00001 0020+00 1/0 0/0 0/0 .data l_daSldWall_Method */ -static actor_method_class l_daSldWall_Method = { - (process_method_func)daSldWall_Create__FP10fopAc_ac_c, - (process_method_func)daSldWall_Delete__FP11daSldWall_c, - (process_method_func)daSldWall_Execute__FP11daSldWall_c, - 0, - (process_method_func)daSldWall_Draw__FP11daSldWall_c, -}; - -/* 80C62758-80C62788 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4SlideWall */ -extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4SlideWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSldWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 639, // mPriority - &l_daSldWall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C62788-80C627B0 0000B8 0028+00 1/1 0/0 0/0 .data __vt__11daSldWall_c */ -SECTION_DATA extern void* __vt__11daSldWall_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__11daSldWall_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__11daSldWall_cFPPA3_A4_f, - (void*)Draw__11daSldWall_cFv, - (void*)Delete__11daSldWall_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C627B0-80C627BC 0000E0 000C+00 2/2 0/0 0/0 .data __vt__15daSldWall_HIO_c */ -SECTION_DATA extern void* __vt__15daSldWall_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__15daSldWall_HIO_cFv, -}; - -/* 80C627BC-80C627C8 0000EC 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; /* 80C61E2C-80C61E68 0000EC 003C+00 1/1 0/0 0/0 .text __ct__15daSldWall_HIO_cFv */ daSldWall_HIO_c::daSldWall_HIO_c() { - // NONMATCHING + move_amount = 900.0f; + speed = 4.0f; + vibration = 3; } -/* 80C61E68-80C61EB0 000128 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C626B0-80C626B4 000008 0004+00 2/5 0/0 0/0 .rodata @3649 */ -SECTION_RODATA static u8 const lit_3649[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C626B0, &lit_3649); - /* 80C61EB0-80C61F4C 000170 009C+00 2/2 0/0 0/0 .text setBaseMtx__11daSldWall_cFv */ void daSldWall_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transM(field_0x5b0, 0.0f, 0.0f); + mpModel->setBaseScale(scale); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -/* ############################################################################################## */ -/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C626C4 = "L4SldWall"; -#pragma pop - /* 80C61F4C-80C61FB8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__11daSldWall_cFv */ -void daSldWall_c::CreateHeap() { - // NONMATCHING -} +int daSldWall_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4SldWall", 4); + JUT_ASSERT(160, modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); + if (mpModel == NULL) { + return 0; + } -/* ############################################################################################## */ -/* 80C627D0-80C627DC 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ -static u8 lit_3621[12]; + return 1; +} /* 80C627DC-80C627EC 000014 0010+00 5/5 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[16]; +static daSldWall_HIO_c l_HIO; /* 80C61FB8-80C620E4 000278 012C+00 1/1 0/0 0/0 .text create__11daSldWall_cFv */ -void daSldWall_c::create() { - // NONMATCHING +int daSldWall_c::create() { + fopAcM_SetupActor(this, daSldWall_c); + + int phase_state = dComIfG_resLoad(&mPhase, "L4SldWall"); + if (phase_state == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L4SldWall", 7, dBgS_MoveBGProc_TypicalRotY, 0x1300, NULL) == cPhs_ERROR_e) { + return cPhs_ERROR_e; + } + + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + mSwbit = getSw(); + mIsSwitch = fopAcM_isSwitch(this, mSwbit); + field_0x5b0 = 0.0f; + + if (mIsSwitch) { + field_0x5b0 = l_HIO.move_amount; + } + + init_modeWait(); + setBaseMtx(); + + #if DEBUG + l_HIO.entryHIO("スライド壁(Lv4)"); + #endif + } + + return phase_state; } /* 80C620E4-80C62134 0003A4 0050+00 1/0 0/0 0/0 .text Execute__11daSldWall_cFPPA3_A4_f */ -void daSldWall_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING +int daSldWall_c::Execute(Mtx** param_0) { + moveWall(); + *param_0 = &mpModel->getBaseTRMtx(); + setBaseMtx(); + return 1; } -/* ############################################################################################## */ -/* 80C627EC-80C627F0 000024 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C627EC[4]; - /* 80C62134-80C62238 0003F4 0104+00 1/1 0/0 0/0 .text moveWall__11daSldWall_cFv */ void daSldWall_c::moveWall() { - // NONMATCHING + static void (daSldWall_c::*mode_proc[])() = { + &daSldWall_c::modeWait, + &daSldWall_c::modeMoveOpen, + &daSldWall_c::modeMoveClose, + }; + + u8 var_r30 = mIsSwitch; + mIsSwitch = fopAcM_isSwitch(this, mSwbit); + + if (mIsSwitch != var_r30) { + if (mIsSwitch) { + init_modeMoveOpen(); + } else { + init_modeMoveClose(); + } + } + + (this->*mode_proc[mMode])(); } /* 80C62238-80C62244 0004F8 000C+00 3/3 0/0 0/0 .text init_modeWait__11daSldWall_cFv */ void daSldWall_c::init_modeWait() { - // NONMATCHING + mMode = 0; } /* 80C62244-80C62248 000504 0004+00 1/0 0/0 0/0 .text modeWait__11daSldWall_cFv */ -void daSldWall_c::modeWait() { - /* empty function */ -} +void daSldWall_c::modeWait() {} /* 80C62248-80C62254 000508 000C+00 1/1 0/0 0/0 .text init_modeMoveOpen__11daSldWall_cFv */ void daSldWall_c::init_modeMoveOpen() { - // NONMATCHING + mMode = 1; } -/* ############################################################################################## */ -/* 80C626B4-80C626B8 00000C 0004+00 0/3 0/0 0/0 .rodata @3763 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3763 = 1.0f; -COMPILER_STRIP_GATE(0x80C626B4, &lit_3763); -#pragma pop - -/* 80C626B8-80C626BC 000010 0004+00 0/3 0/0 0/0 .rodata @3764 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3764 = -1.0f; -COMPILER_STRIP_GATE(0x80C626B8, &lit_3764); -#pragma pop - -/* 80C626BC-80C626C0 000014 0004+00 0/2 0/0 0/0 .rodata @3765 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3765 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80C626BC, &lit_3765); -#pragma pop - -/* 80C626C0-80C626C4 000018 0004+00 0/2 0/0 0/0 .rodata @3766 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3766 = 0.5f; -COMPILER_STRIP_GATE(0x80C626C0, &lit_3766); -#pragma pop - /* 80C62254-80C62314 000514 00C0+00 1/0 0/0 0/0 .text modeMoveOpen__11daSldWall_cFv */ void daSldWall_c::modeMoveOpen() { - // NONMATCHING + mDoAud_seStartLevel(0x801b1, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + f32 var_f31 = cLib_addCalc(&field_0x5b0, l_HIO.move_amount, 0.2f, l_HIO.speed, 0.5f); + if (var_f31 == 0.0f) { + setSe(); + init_modeWait(); + } } /* 80C62314-80C62320 0005D4 000C+00 1/1 0/0 0/0 .text init_modeMoveClose__11daSldWall_cFv */ void daSldWall_c::init_modeMoveClose() { - // NONMATCHING + mMode = 2; } /* 80C62320-80C623E0 0005E0 00C0+00 1/0 0/0 0/0 .text modeMoveClose__11daSldWall_cFv */ void daSldWall_c::modeMoveClose() { - // NONMATCHING + mDoAud_seStartLevel(0x801b1, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + + f32 var_f31 = cLib_addCalc(&field_0x5b0, 0.0f, 0.2f, l_HIO.speed, 0.5f); + if (var_f31 == 0.0f) { + setSe(); + init_modeWait(); + } } /* 80C623E0-80C6249C 0006A0 00BC+00 2/2 0/0 0/0 .text setSe__11daSldWall_cFv */ void daSldWall_c::setSe() { - // NONMATCHING + mDoAud_seStart(0x801b2, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + dComIfGp_getVibration().StartShock(l_HIO.vibration, 0xF, cXyz(0.0f, 1.0f, 0.0f)); } /* 80C6249C-80C62540 00075C 00A4+00 1/0 0/0 0/0 .text Draw__11daSldWall_cFv */ -void daSldWall_c::Draw() { - // NONMATCHING +int daSldWall_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } /* 80C62540-80C62570 000800 0030+00 1/0 0/0 0/0 .text Delete__11daSldWall_cFv */ -void daSldWall_c::Delete() { - // NONMATCHING +int daSldWall_c::Delete() { + dComIfG_resDelete(&mPhase, "L4SldWall"); + + #if DEBUG + l_HIO.removeHIO(); + #endif + return 1; } /* 80C62570-80C6259C 000830 002C+00 1/0 0/0 0/0 .text daSldWall_Draw__FP11daSldWall_c */ -static void daSldWall_Draw(daSldWall_c* param_0) { - // NONMATCHING +static int daSldWall_Draw(daSldWall_c* i_this) { + return i_this->MoveBGDraw(); } /* 80C6259C-80C625BC 00085C 0020+00 1/0 0/0 0/0 .text daSldWall_Execute__FP11daSldWall_c */ -static void daSldWall_Execute(daSldWall_c* param_0) { - // NONMATCHING +static int daSldWall_Execute(daSldWall_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C625BC-80C625DC 00087C 0020+00 1/0 0/0 0/0 .text daSldWall_Delete__FP11daSldWall_c */ -static void daSldWall_Delete(daSldWall_c* param_0) { - // NONMATCHING +static int daSldWall_Delete(daSldWall_c* i_this) { + return i_this->MoveBGDelete(); } /* 80C625DC-80C625FC 00089C 0020+00 1/0 0/0 0/0 .text daSldWall_Create__FP10fopAc_ac_c */ -static void daSldWall_Create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daSldWall_Create(fopAc_ac_c* i_this) { + return ((daSldWall_c*)i_this)->create(); } -/* 80C625FC-80C62658 0008BC 005C+00 2/1 0/0 0/0 .text __dt__15daSldWall_HIO_cFv */ -daSldWall_HIO_c::~daSldWall_HIO_c() { - // NONMATCHING -} - -/* 80C62658-80C62694 000918 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv4SlideWall_cpp */ -void __sinit_d_a_obj_lv4SlideWall_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C62658, __sinit_d_a_obj_lv4SlideWall_cpp); -#pragma pop +/* 80C62738-80C62758 -00001 0020+00 1/0 0/0 0/0 .data l_daSldWall_Method */ +static actor_method_class l_daSldWall_Method = { + (process_method_func)daSldWall_Create, + (process_method_func)daSldWall_Delete, + (process_method_func)daSldWall_Execute, + 0, + (process_method_func)daSldWall_Draw, +}; -/* 80C626C4-80C626C4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C62758-80C62788 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4SlideWall */ +extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4SlideWall, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daSldWall_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 639, // mPriority + &l_daSldWall_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 0349de9f0e..3daf53511f 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -155,7 +155,7 @@ void daObjLv4Brg_c::create1st() { /* 80C62B20-80C62B6C 000320 004C+00 1/0 0/0 0/0 .text Execute__13daObjLv4Brg_cFPPA3_A4_f */ -void daObjLv4Brg_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv4Brg_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 0a180b573f..35b76c2a40 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -71,7 +71,7 @@ int daObjL4DigSand_c::create1st() { } /* 80C66D40-80C66DD0 0002A0 0090+00 1/0 0/0 0/0 .text Execute__16daObjL4DigSand_cFPPA3_A4_f */ -int daObjL4DigSand_c::Execute(f32 (**param_0)[3][4]) { +int daObjL4DigSand_c::Execute(Mtx** param_0) { if (daPy_py_c::checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) { attention_info.flags = fopAc_AttnFlag_ETC_e; } else { diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 79f79abddb..35be6fa8af 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -206,7 +206,7 @@ COMPILER_STRIP_GATE(0x80C69970, &lit_3964); #pragma pop /* 80C690D8-80C696BC 0004B8 05E4+00 1/0 0/0 0/0 .text Execute__16daObjLv4PRwall_cFPPA3_A4_f */ -void daObjLv4PRwall_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv4PRwall_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 1f3ad97885..d09500656c 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -6,409 +6,214 @@ #include "d/dolzel_rel.h" #include "d/actor/d_a_obj_lv4sand.h" -#include "dol2asm.h" - - -// -// Forward References: -// - -extern "C" void initBaseMtx__14daObjLv4Sand_cFv(); -extern "C" void setBaseMtx__14daObjLv4Sand_cFv(); -extern "C" void Create__14daObjLv4Sand_cFv(); -extern "C" void CreateHeap__14daObjLv4Sand_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void create1st__14daObjLv4Sand_cFv(); -extern "C" void Execute__14daObjLv4Sand_cFPPA3_A4_f(); -extern "C" void action__14daObjLv4Sand_cFv(); -extern "C" void mode_init_wait__14daObjLv4Sand_cFv(); -extern "C" void mode_wait__14daObjLv4Sand_cFv(); -extern "C" void mode_init_move__14daObjLv4Sand_cFv(); -extern "C" void mode_move__14daObjLv4Sand_cFv(); -extern "C" void mode_init_dead__14daObjLv4Sand_cFv(); -extern "C" void mode_dead__14daObjLv4Sand_cFv(); -extern "C" void eventStart__14daObjLv4Sand_cFv(); -extern "C" void Draw__14daObjLv4Sand_cFv(); -extern "C" void Delete__14daObjLv4Sand_cFv(); -extern "C" static void daObjLv4Sand_create1st__FP14daObjLv4Sand_c(); -extern "C" static void daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c(); -extern "C" static void daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c(); -extern "C" static void daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c(); -extern "C" void __dt__17dEvLib_callback_cFv(); -extern "C" bool eventStart__17dEvLib_callback_cFv(); -extern "C" bool eventRun__17dEvLib_callback_cFv(); -extern "C" bool eventEnd__17dEvLib_callback_cFv(); -extern "C" void __dt__14daObjLv4Sand_cFv(); -extern "C" static void func_80C6A3A0(); -extern "C" static void func_80C6A3A8(); -extern "C" extern char const* const d_a_obj_lv4sand__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -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 isDungeonItem__12dSv_memBit_cCFi(); -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 dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -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 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C6A508[4]; - -// -// Declarations: -// +#include "d/d_s_play.h" + +/* 80C6A400-80C6A404 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ +static char* l_arcName = "P_L4Sand"; /* 80C69A98-80C69AD4 000078 003C+00 1/1 0/0 0/0 .text initBaseMtx__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::initBaseMtx() { - // NONMATCHING + mpModel->setBaseScale(scale); + setBaseMtx(); } /* 80C69AD4-80C69B50 0000B4 007C+00 2/2 0/0 0/0 .text setBaseMtx__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mHeight, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } -/* ############################################################################################## */ -/* 80C6A3B8-80C6A3BC 000000 0004+00 3/3 0/0 0/0 .rodata @3679 */ -SECTION_RODATA static f32 const lit_3679 = -3500.0f; -COMPILER_STRIP_GATE(0x80C6A3B8, &lit_3679); - -/* 80C6A3BC-80C6A3C0 000004 0004+00 2/2 0/0 0/0 .rodata @3680 */ -SECTION_RODATA static u8 const lit_3680[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C6A3BC, &lit_3680); - /* 80C69B50-80C69C28 000130 00D8+00 1/0 0/0 0/0 .text Create__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::Create() { - // NONMATCHING +int daObjLv4Sand_c::Create() { + if (fopAcM_isSwitch(this, getSwbit()) || dComIfGs_isStageBossEnemy() || BREG_S(9) != 0) { + mHeight = -3500.0f; + mode_init_dead(); + fopAcM_onSwitch(this, getSwbit()); + } else { + mHeight = 0.0f; + mode_init_wait(); + } + + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + return 1; } -/* ############################################################################################## */ -/* 80C6A3C0-80C6A3C4 000008 0004+00 1/2 0/0 0/0 .rodata @3710 */ -SECTION_RODATA static f32 const lit_3710 = 1.0f; -COMPILER_STRIP_GATE(0x80C6A3C0, &lit_3710); - -/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C6A3D4 = "P_L4Sand"; -#pragma pop - -/* 80C6A400-80C6A404 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ -SECTION_DATA static void* l_arcName = (void*)&d_a_obj_lv4sand__stringBase0; - -/* 80C6A404-80C6A410 -00001 000C+00 0/1 0/0 0/0 .data @3754 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3754[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_wait__14daObjLv4Sand_cFv, -}; -#pragma pop - -/* 80C6A410-80C6A41C -00001 000C+00 0/1 0/0 0/0 .data @3755 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3755[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_move__14daObjLv4Sand_cFv, -}; -#pragma pop - -/* 80C6A41C-80C6A428 -00001 000C+00 0/1 0/0 0/0 .data @3756 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3756[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)mode_dead__14daObjLv4Sand_cFv, -}; -#pragma pop - -/* 80C6A428-80C6A44C 000048 0024+00 0/1 0/0 0/0 .data l_func$3753 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_func[36] = { - 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 - -/* 80C6A44C-80C6A46C -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Sand_METHODS */ -static actor_method_class daObjLv4Sand_METHODS = { - (process_method_func)daObjLv4Sand_create1st__FP14daObjLv4Sand_c, - (process_method_func)daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c, - (process_method_func)daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c, - 0, - (process_method_func)daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c, -}; - -/* 80C6A46C-80C6A49C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Sand */ -extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Sand, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Sand_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 573, // mPriority - &daObjLv4Sand_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C6A49C-80C6A4B4 0000BC 0018+00 3/3 0/0 0/0 .data __vt__17dEvLib_callback_c */ -SECTION_DATA extern void* __vt__17dEvLib_callback_c[6] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17dEvLib_callback_cFv, - (void*)eventStart__17dEvLib_callback_cFv, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, -}; +/* 80C69C28-80C69D44 000208 011C+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Sand_cFv */ +int daObjLv4Sand_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(167, modelData != 0); + mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); + if (mpModel == NULL) { + return 0; + } -/* 80C6A4B4-80C6A4C0 0000D4 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, -}; + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 8); + JUT_ASSERT(181, pbtk != 0); -/* 80C69C28-80C69D44 000208 011C+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::CreateHeap() { - // NONMATCHING -} + mpBtk = new mDoExt_btkAnm(); + if (mpBtk == NULL || !mpBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { + return 0; + } -/* 80C69D44-80C69D8C 000324 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING + return 1; } /* 80C69D8C-80C69E10 00036C 0084+00 1/1 0/0 0/0 .text create1st__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::create1st() { - // NONMATCHING -} +int daObjLv4Sand_c::create1st() { + int phase_state = dComIfG_resLoad(&mPhase, l_arcName); + if (phase_state == cPhs_COMPLEATE_e) { + phase_state = MoveBGCreate(l_arcName, 11, dBgS_MoveBGProc_TypicalRotY, 0x4000, NULL); + if (phase_state == cPhs_ERROR_e) { + return phase_state; + } + } -/* ############################################################################################## */ -/* 80C6A3C4-80C6A3C8 00000C 0004+00 0/1 0/0 0/0 .rodata @3748 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3748 = 3300.0f; -COMPILER_STRIP_GATE(0x80C6A3C4, &lit_3748); -#pragma pop - -/* 80C6A3C8-80C6A3CC 000010 0004+00 0/1 0/0 0/0 .rodata @3749 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3749 = -1.0f; -COMPILER_STRIP_GATE(0x80C6A3C8, &lit_3749); -#pragma pop + return phase_state; +} /* 80C69E10-80C69F18 0003F0 0108+00 1/0 0/0 0/0 .text Execute__14daObjLv4Sand_cFPPA3_A4_f */ -void daObjLv4Sand_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING +int daObjLv4Sand_c::Execute(Mtx** param_0) { + action(); + *param_0 = &mBgMtx; + + if (fopAcM_isSwitch(this, 234)) { + mpBtk->play(); + if (std::fabs(mHeight) < 3300.0f) { + eyePos = current.pos; + eyePos.y += mHeight; + fopAcM_seStartLevel(this, Z2SE_ENV_DS_SAND, 0); + } + } + + setBaseMtx(); + return 1; } /* 80C69F18-80C69FBC 0004F8 00A4+00 1/1 0/0 0/0 .text action__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::action() { - // NONMATCHING + static void (daObjLv4Sand_c::*l_func[])() = { + &daObjLv4Sand_c::mode_wait, + &daObjLv4Sand_c::mode_move, + &daObjLv4Sand_c::mode_dead, + }; + + (this->*l_func[mMode])(); } /* 80C69FBC-80C69FC8 00059C 000C+00 1/1 0/0 0/0 .text mode_init_wait__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::mode_init_wait() { - // NONMATCHING + mMode = MODE_WAIT; } /* 80C69FC8-80C6A01C 0005A8 0054+00 1/0 0/0 0/0 .text mode_wait__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::mode_wait() { - // NONMATCHING + if (fopAcM_isSwitch(this, getSwbit())) { + mode_init_move(); + } } /* 80C6A01C-80C6A034 0005FC 0018+00 2/2 0/0 0/0 .text mode_init_move__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::mode_init_move() { - // NONMATCHING + speed.y = 0.0f; + mMode = MODE_MOVE; } -/* ############################################################################################## */ -/* 80C6A3CC-80C6A3D0 000014 0004+00 0/1 0/0 0/0 .rodata @3786 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3786 = 8.5f; -COMPILER_STRIP_GATE(0x80C6A3CC, &lit_3786); -#pragma pop - -/* 80C6A3D0-80C6A3D4 000018 0004+00 0/1 0/0 0/0 .rodata @3787 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3787 = 3.0f / 10.0f; -COMPILER_STRIP_GATE(0x80C6A3D0, &lit_3787); -#pragma pop - /* 80C6A034-80C6A09C 000614 0068+00 1/0 0/0 0/0 .text mode_move__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::mode_move() { - // NONMATCHING + cLib_chaseF(&speed.y, 8.5f + KREG_F(1), 0.3f + KREG_F(2)); + if (cLib_chaseF(&mHeight, -3500.0f, speed.y)) { + mode_init_dead(); + } } /* 80C6A09C-80C6A0A8 00067C 000C+00 2/2 0/0 0/0 .text mode_init_dead__14daObjLv4Sand_cFv */ void daObjLv4Sand_c::mode_init_dead() { - // NONMATCHING + mMode = MODE_DEAD; } /* 80C6A0A8-80C6A0AC 000688 0004+00 1/0 0/0 0/0 .text mode_dead__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::mode_dead() { - /* empty function */ -} +void daObjLv4Sand_c::mode_dead() {} /* 80C6A0AC-80C6A0D0 00068C 0024+00 2/1 0/0 0/0 .text eventStart__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::eventStart() { - // NONMATCHING +bool daObjLv4Sand_c::eventStart() { + mode_init_move(); + return true; } /* 80C6A0D0-80C6A18C 0006B0 00BC+00 1/0 0/0 0/0 .text Draw__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::Draw() { - // NONMATCHING +int daObjLv4Sand_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + mpBtk->entry(mpModel->getModelData()); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + return 1; } /* 80C6A18C-80C6A1C0 00076C 0034+00 1/0 0/0 0/0 .text Delete__14daObjLv4Sand_cFv */ -void daObjLv4Sand_c::Delete() { - // NONMATCHING +int daObjLv4Sand_c::Delete() { + dComIfG_resDelete(&mPhase, l_arcName); + return 1; } -/* ############################################################################################## */ -/* 80C6A4C0-80C6A508 0000E0 0048+00 2/2 0/0 0/0 .data __vt__14daObjLv4Sand_c */ -SECTION_DATA extern void* __vt__14daObjLv4Sand_c[18] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__14daObjLv4Sand_cFv, - (void*)Create__14daObjLv4Sand_cFv, - (void*)Execute__14daObjLv4Sand_cFPPA3_A4_f, - (void*)Draw__14daObjLv4Sand_cFv, - (void*)Delete__14daObjLv4Sand_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, - (void*)NULL, - (void*)NULL, - (void*)func_80C6A3A8, - (void*)func_80C6A3A0, - (void*)eventRun__17dEvLib_callback_cFv, - (void*)eventEnd__17dEvLib_callback_cFv, - (void*)__dt__14daObjLv4Sand_cFv, - (void*)eventStart__14daObjLv4Sand_cFv, -}; - /* 80C6A1C0-80C6A240 0007A0 0080+00 1/0 0/0 0/0 .text daObjLv4Sand_create1st__FP14daObjLv4Sand_c */ -static void daObjLv4Sand_create1st(daObjLv4Sand_c* param_0) { - // NONMATCHING +static int daObjLv4Sand_create1st(daObjLv4Sand_c* i_this) { + fopAcM_SetupActor(i_this, daObjLv4Sand_c); + return i_this->create1st(); } /* 80C6A240-80C6A260 000820 0020+00 1/0 0/0 0/0 .text * daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c */ -static void daObjLv4Sand_MoveBGDelete(daObjLv4Sand_c* param_0) { - // NONMATCHING +static int daObjLv4Sand_MoveBGDelete(daObjLv4Sand_c* i_this) { + return i_this->MoveBGDelete(); } /* 80C6A260-80C6A280 000840 0020+00 1/0 0/0 0/0 .text * daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c */ -static void daObjLv4Sand_MoveBGExecute(daObjLv4Sand_c* param_0) { - // NONMATCHING +static int daObjLv4Sand_MoveBGExecute(daObjLv4Sand_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C6A280-80C6A2AC 000860 002C+00 1/0 0/0 0/0 .text daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c */ -static void daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c* param_0) { - // NONMATCHING -} - -/* 80C6A2AC-80C6A2F4 00088C 0048+00 1/0 0/0 0/0 .text __dt__17dEvLib_callback_cFv */ -// dEvLib_callback_c::~dEvLib_callback_c() { -extern "C" void __dt__17dEvLib_callback_cFv() { - // NONMATCHING -} - -/* 80C6A2F4-80C6A2FC 0008D4 0008+00 1/0 0/0 0/0 .text eventStart__17dEvLib_callback_cFv - */ -// bool dEvLib_callback_c::eventStart() { -extern "C" bool eventStart__17dEvLib_callback_cFv() { - return true; -} - -/* 80C6A2FC-80C6A304 0008DC 0008+00 2/0 0/0 0/0 .text eventRun__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventRun() { -extern "C" bool eventRun__17dEvLib_callback_cFv() { - return true; -} - -/* 80C6A304-80C6A30C 0008E4 0008+00 2/0 0/0 0/0 .text eventEnd__17dEvLib_callback_cFv */ -// bool dEvLib_callback_c::eventEnd() { -extern "C" bool eventEnd__17dEvLib_callback_cFv() { - return true; -} - -/* 80C6A30C-80C6A3A0 0008EC 0094+00 2/1 0/0 0/0 .text __dt__14daObjLv4Sand_cFv */ -daObjLv4Sand_c::~daObjLv4Sand_c() { - // NONMATCHING -} - -/* 80C6A3A0-80C6A3A8 000980 0008+00 1/0 0/0 0/0 .text @1440@eventStart__14daObjLv4Sand_cFv */ -static void func_80C6A3A0() { - // NONMATCHING +static int daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c* i_this) { + return i_this->MoveBGDraw(); } -/* 80C6A3A8-80C6A3B0 000988 0008+00 1/0 0/0 0/0 .text @1440@__dt__14daObjLv4Sand_cFv */ -static void func_80C6A3A8() { - // NONMATCHING -} +/* 80C6A44C-80C6A46C -00001 0020+00 1/0 0/0 0/0 .data daObjLv4Sand_METHODS */ +static actor_method_class daObjLv4Sand_METHODS = { + (process_method_func)daObjLv4Sand_create1st, + (process_method_func)daObjLv4Sand_MoveBGDelete, + (process_method_func)daObjLv4Sand_MoveBGExecute, + 0, + (process_method_func)daObjLv4Sand_MoveBGDraw, +}; -/* 80C6A3D4-80C6A3D4 00001C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C6A46C-80C6A49C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv4Sand */ +extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv4Sand, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daObjLv4Sand_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 573, // mPriority + &daObjLv4Sand_METHODS, // sub_method + 0x00044100, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +}; diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index 0d23e4a1df..4d97146db6 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -436,7 +436,7 @@ COMPILER_STRIP_GATE(0x80C72194, &lit_3869); #pragma pop /* 80C712F4-80C71494 000794 01A0+00 1/0 0/0 0/0 .text Execute__17daLv6ChangeGate_cFPPA3_A4_f */ -void daLv6ChangeGate_c::Execute(f32 (**param_0)[3][4]) { +void daLv6ChangeGate_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index 81e3144710..790f0cba67 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -333,7 +333,7 @@ COMPILER_STRIP_GATE(0x80C73180, &lit_3878); #pragma pop /* 80C729B4-80C72CA8 000614 02F4+00 1/0 0/0 0/0 .text Execute__17daLv6FurikoTrap_cFPPA3_A4_f */ -void daLv6FurikoTrap_c::Execute(f32 (**param_0)[3][4]) { +void daLv6FurikoTrap_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 44e0a54b30..4e2e7a6cd4 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -228,7 +228,7 @@ void daLv6Lblock_c::isSwitch() { /* 80C7370C-80C7375C 00040C 0050+00 1/0 0/0 0/0 .text Execute__13daLv6Lblock_cFPPA3_A4_f */ -void daLv6Lblock_c::Execute(f32 (**param_0)[3][4]) { +void daLv6Lblock_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index 837613d8b8..06756305f9 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -434,7 +434,7 @@ COMPILER_STRIP_GATE(0x80C75574, &lit_3943); /* 80C7476C-80C74A3C 00094C 02D0+00 1/0 0/0 0/0 .text Execute__13daLv6SwGate_cFPPA3_A4_f */ -void daLv6SwGate_c::Execute(f32 (**param_0)[3][4]) { +void daLv6SwGate_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index d4f2c96c23..5a3e77ff89 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -313,7 +313,7 @@ SECTION_RODATA static f32 const lit_3908 = 0.5f; COMPILER_STRIP_GATE(0x80C779E8, &lit_3908); /* 80C77200-80C772BC 000A00 00BC+00 1/0 0/0 0/0 .text Execute__10daTenbin_cFPPA3_A4_f */ -void daTenbin_c::Execute(f32 (**param_0)[3][4]) { +void daTenbin_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 3213daf0bc..b8f1e77153 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -692,7 +692,7 @@ static u8 lit_3625[12]; static u8 l_HIO[40]; /* 80C7A700-80C7A97C 0009A0 027C+00 1/0 0/0 0/0 .text Execute__15daLv6TogeTrap_cFPPA3_A4_f */ -void daLv6TogeTrap_c::Execute(f32 (**param_0)[3][4]) { +void daLv6TogeTrap_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 16693ec531..b61402617e 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -207,7 +207,7 @@ COMPILER_STRIP_GATE(0x80C82BA0, &lit_3804); #pragma pop /* 80C82388-80C82690 000388 0308+00 1/0 0/0 0/0 .text Execute__15daObjLv6EGate_cFPPA3_A4_f */ -void daObjLv6EGate_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv6EGate_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 88df70ad5c..c8556ef465 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -174,7 +174,7 @@ void daObjLv6ElevtA_c::moveAngle(void* param_0) { } /* 80C8321C-80C83538 00055C 031C+00 1/0 0/0 0/0 .text Execute__16daObjLv6ElevtA_cFPPA3_A4_f */ -void daObjLv6ElevtA_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv6ElevtA_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index 04c0f07a51..e59ce5e222 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -136,7 +136,7 @@ void daObjLv6SwTurn_c::create1st() { } /* 80C83D04-80C83D94 0003E4 0090+00 1/0 0/0 0/0 .text Execute__16daObjLv6SwTurn_cFPPA3_A4_f */ -void daObjLv6SwTurn_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv6SwTurn_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index 73ca228dd1..032fa7c144 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -249,7 +249,7 @@ void daLv7BsGate_c::create() { /* 80C84BCC-80C84C1C 00040C 0050+00 1/0 0/0 0/0 .text Execute__13daLv7BsGate_cFPPA3_A4_f */ -void daLv7BsGate_c::Execute(f32 (**param_0)[3][4]) { +void daLv7BsGate_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index 74f85c4652..c718cd2225 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -295,7 +295,7 @@ void daPropY_c::create() { } /* 80C85810-80C85860 000490 0050+00 1/0 0/0 0/0 .text Execute__9daPropY_cFPPA3_A4_f */ -void daPropY_c::Execute(f32 (**param_0)[3][4]) { +void daPropY_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 5a9b06cb6e..11888dd73f 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -419,7 +419,7 @@ COMPILER_STRIP_GATE(0x80C879F0, &lit_3936); /* 80C86B40-80C86E68 000840 0328+00 1/0 0/0 0/0 .text Execute__13daObjLv7Brg_cFPPA3_A4_f */ -void daObjLv7Brg_c::Execute(f32 (**param_0)[3][4]) { +void daObjLv7Brg_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index fd01e36d42..d5b0b89881 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -228,7 +228,7 @@ void daKekaiTrap_c::create() { /* 80C87FB0-80C88000 0003F0 0050+00 1/0 0/0 0/0 .text Execute__13daKekaiTrap_cFPPA3_A4_f */ -void daKekaiTrap_c::Execute(f32 (**param_0)[3][4]) { +void daKekaiTrap_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index b2d07776f1..8317a897c5 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -140,7 +140,7 @@ void daOptiLift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_r /* 80C8A7E8-80C8A848 0005C8 0060+00 1/0 0/0 0/0 .text Execute__12daOptiLift_cFPPA3_A4_f */ -int daOptiLift_c::Execute(f32 (**param_0)[3][4]) { +int daOptiLift_c::Execute(Mtx** param_0) { moveLift(); lightSet(); diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 33db258e84..8a4db324d1 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -304,7 +304,7 @@ void daUdFloor_c::create() { } /* 80C8C0DC-80C8C12C 0004BC 0050+00 1/0 0/0 0/0 .text Execute__11daUdFloor_cFPPA3_A4_f */ -void daUdFloor_c::Execute(f32 (**param_0)[3][4]) { +void daUdFloor_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 0f74912e9f..4d430cad7e 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -243,7 +243,7 @@ void daLv9SwShutter_c::create() { } /* 80C8D168-80C8D1B8 0003A8 0050+00 1/0 0/0 0/0 .text Execute__16daLv9SwShutter_cFPPA3_A4_f */ -void daLv9SwShutter_c::Execute(f32 (**param_0)[3][4]) { +void daLv9SwShutter_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 3edf8473bf..1787e80c35 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -65,7 +65,7 @@ int daObjMBox_c::create() { } /* 805932C4-805932F0 0004A4 002C+00 1/0 0/0 0/0 .text Execute__11daObjMBox_cFPPA3_A4_f */ -int daObjMBox_c::Execute(f32 (**param_0)[3][4]) { +int daObjMBox_c::Execute(Mtx** param_0) { *param_0 = &mBgMtx; setBaseMtx(); diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 2b6d5095e4..f18f750106 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -147,7 +147,7 @@ void daObjStair_c::mode_proc_call() { /* 80C9D594-80C9D710 000574 017C+00 1/0 0/0 0/0 .text Execute__12daObjStair_cFPPA3_A4_f */ -int daObjStair_c::Execute(f32 (**param_0)[3][4]) { +int daObjStair_c::Execute(Mtx** param_0) { event_proc_call(); mode_proc_call(); diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 4664ed216b..4ec82de694 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -174,7 +174,7 @@ COMPILER_STRIP_GATE(0x80CAD1F0, &lit_3790); /* 80CACCE0-80CACF14 000560 0234+00 1/0 0/0 0/0 .text Execute__13daObjPDwall_cFPPA3_A4_f */ -void daObjPDwall_c::Execute(f32 (**param_0)[3][4]) { +void daObjPDwall_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 0bd1d75c88..56c8c530de 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -368,7 +368,7 @@ static u8 data_80CB2858[4]; /* 80CB1F10-80CB2140 000590 0230+00 1/0 0/0 0/0 .text Execute__12daPoCandle_cFPPA3_A4_f */ -void daPoCandle_c::Execute(f32 (**param_0)[3][4]) { +void daPoCandle_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index f5e51fb48a..c9fd51ac94 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -295,7 +295,7 @@ static u8 l_HIO[12]; static u8 data_80CB5140[4]; /* 80CB499C-80CB4AA8 00083C 010C+00 1/0 0/0 0/0 .text Execute__10daPoTbox_cFPPA3_A4_f */ -void daPoTbox_c::Execute(f32 (**param_0)[3][4]) { +void daPoTbox_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 8fc563220e..7c460d5902 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -450,7 +450,7 @@ int daObjRBridge_c::create1st() { /* 80596EBC-80596FA8 0010FC 00EC+00 1/0 0/0 0/0 .text Execute__14daObjRBridge_cFPPA3_A4_f */ -int daObjRBridge_c::Execute(f32 (**param_0)[3][4]) { +int daObjRBridge_c::Execute(Mtx** param_0) { action(); setLinePos(); diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index 608bc642c2..2dd0ce6245 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -253,7 +253,7 @@ COMPILER_STRIP_GATE(0x80CBF6A0, &lit_3833); /* 80CBEF34-80CBF050 000694 011C+00 1/0 0/0 0/0 .text Execute__13daRotBridge_cFPPA3_A4_f */ -void daRotBridge_c::Execute(f32 (**param_0)[3][4]) { +void daRotBridge_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 285ecd03b6..1b7bbad0f0 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -343,7 +343,7 @@ extern "C" void __dt__10dCcD_GSttsFv() { } /* 80CBFEC4-80CBFF1C 000704 0058+00 1/0 0/0 0/0 .text Execute__11daRotTrap_cFPPA3_A4_f */ -void daRotTrap_c::Execute(f32 (**param_0)[3][4]) { +void daRotTrap_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index ce4b168bac..3c519d6d9e 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -206,7 +206,7 @@ void daObjSmgDoor_c::create1st() { /* 80CDBFA4-80CDBFF0 0004E4 004C+00 1/0 0/0 0/0 .text Execute__14daObjSmgDoor_cFPPA3_A4_f */ -void daObjSmgDoor_c::Execute(f32 (**param_0)[3][4]) { +void daObjSmgDoor_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 4188ded5be..7f0baee9e0 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -287,7 +287,7 @@ void daSpinLift_c::create() { /* 80CE40FC-80CE414C 00043C 0050+00 1/0 0/0 0/0 .text Execute__12daSpinLift_cFPPA3_A4_f */ -void daSpinLift_c::Execute(f32 (**param_0)[3][4]) { +void daSpinLift_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index a681e7bae7..75c77696f4 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -92,7 +92,7 @@ int daObjStopper_c::create() { /* 80CED6BC-80CED708 00089C 004C+00 1/0 0/0 0/0 .text Execute__14daObjStopper_cFPPA3_A4_f */ -int daObjStopper_c::Execute(f32 (**param_0)[3][4]) { +int daObjStopper_c::Execute(Mtx** param_0) { action(); *param_0 = &mBgMtx; setBaseMtx(); diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 653af5f715..619ec4c768 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -235,7 +235,7 @@ void daObjSwLight_c::create1st() { /* 80CF7320-80CF73E0 000400 00C0+00 1/0 0/0 0/0 .text Execute__14daObjSwLight_cFPPA3_A4_f */ -void daObjSwLight_c::Execute(f32 (**param_0)[3][4]) { +void daObjSwLight_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 2db572701f..c94dcb11cb 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -385,7 +385,7 @@ void daObjSw5_c::create() { } /* 8059BBD4-8059BC70 0007D4 009C+00 1/0 0/0 0/0 .text Execute__10daObjSw5_cFPPA3_A4_f */ -void daObjSw5_c::Execute(f32 (**param_0)[3][4]) { +void daObjSw5_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index 35fa4dbb9b..2db487b7d0 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -297,7 +297,7 @@ void daObjSZbridge_c::Create() { } /* 80D04974-80D049E4 0006B4 0070+00 1/0 0/0 0/0 .text Execute__15daObjSZbridge_cFPPA3_A4_f */ -void daObjSZbridge_c::Execute(f32 (**param_0)[3][4]) { +void daObjSZbridge_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 2c9ab69ecc..14b353ab59 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -414,7 +414,7 @@ extern "C" void __dt__10dCcD_GSttsFv() { } /* 80D05550-80D055A0 0007D0 0050+00 1/0 0/0 0/0 .text Execute__11daTaFence_cFPPA3_A4_f */ -void daTaFence_c::Execute(f32 (**param_0)[3][4]) { +void daTaFence_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 3e19f4c94e..e80624d516 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -676,7 +676,7 @@ void daObjTHASHI_c::Create() { /* 80D0CEB4-80D0CEE0 000CF4 002C+00 1/0 0/0 0/0 .text Execute__13daObjTHASHI_cFPPA3_A4_f */ -void daObjTHASHI_c::Execute(f32 (**param_0)[3][4]) { +void daObjTHASHI_c::Execute(Mtx** param_0) { // NONMATCHING } diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 106084e8eb..3e7d7564fd 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -277,7 +277,7 @@ int daObjWarpKBrg_c::create1st() { } /* 80D2781C-80D27890 00095C 0074+00 1/0 0/0 0/0 .text Execute__15daObjWarpKBrg_cFPPA3_A4_f */ -int daObjWarpKBrg_c::Execute(f32 (**param_0)[3][4]) { +int daObjWarpKBrg_c::Execute(Mtx** param_0) { #if VERSION == VERSION_SHIELD_DEBUG calcMidnaWaitPos(); #endif diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 33c3952dde..18c2caab50 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -193,7 +193,7 @@ int daObjWarpOBrg_c::create1st() { } /* 80D2A008-80D2A04C 0006C8 0044+00 1/0 0/0 0/0 .text Execute__15daObjWarpOBrg_cFPPA3_A4_f */ -int daObjWarpOBrg_c::Execute(f32 (**param_0)[3][4]) { +int daObjWarpOBrg_c::Execute(Mtx** param_0) { #if VERSION == VERSION_SHIELD_DEBUG calcMidnaWaitPos(); #endif |