summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2025-09-28 17:40:58 -0700
committerGitHub <noreply@github.com>2025-09-28 18:40:58 -0600
commit40e61bf913152aafe3f2c728102e4d519887cca2 (patch)
treeec9ddb83d37296283fdb925c50dba820868164e9 /src
parent143f19636bdf5099836a6173eda1be3d0be52831 (diff)
rottrap / rotbridge done (#2713)
Diffstat (limited to 'src')
-rw-r--r--src/d/actor/d_a_obj_rotBridge.cpp526
-rw-r--r--src/d/actor/d_a_obj_rotTrap.cpp701
2 files changed, 507 insertions, 720 deletions
diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp
index a73bcb6693..b35d3489b5 100644
--- a/src/d/actor/d_a_obj_rotBridge.cpp
+++ b/src/d/actor/d_a_obj_rotBridge.cpp
@@ -6,367 +6,299 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_rotBridge.h"
-#include "dol2asm.h"
-
-
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__17daRotBridge_HIO_cFv();
-extern "C" void __dt__14mDoHIO_entry_cFv();
-extern "C" void setBaseMtx__13daRotBridge_cFv();
-extern "C" void CreateHeap__13daRotBridge_cFv();
-extern "C" void create__13daRotBridge_cFv();
-extern "C" void __dt__12J3DFrameCtrlFv();
-extern "C" void rideCallBack__13daRotBridge_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c();
-extern "C" void Execute__13daRotBridge_cFPPA3_A4_f();
-extern "C" void playerAreaCheck__13daRotBridge_cFv();
-extern "C" void moveBridge__13daRotBridge_cFv();
-extern "C" void Draw__13daRotBridge_cFv();
-extern "C" void Delete__13daRotBridge_cFv();
-extern "C" static void daRotBridge_Draw__FP13daRotBridge_c();
-extern "C" static void daRotBridge_Execute__FP13daRotBridge_c();
-extern "C" static void daRotBridge_Delete__FP13daRotBridge_c();
-extern "C" static void daRotBridge_Create__FP10fopAc_ac_c();
-extern "C" void __dt__17daRotBridge_HIO_cFv();
-extern "C" void __sinit_d_a_obj_rotBridge_cpp();
-extern "C" extern char const* const d_a_obj_rotBridge__stringBase0;
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_YrotM__FPA4_fs();
-extern "C" void mDoMtx_MtxToRot__FPA4_CfP5csXyz();
-extern "C" void play__14mDoExt_baseAnmFv();
-extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb();
-extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf();
-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 Release__4cBgSFP9dBgW_Base();
-extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
-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 Set__4cBgWFP6cBgD_tUlPA3_A4_f();
-extern "C" void __ct__4dBgWFv();
-extern "C" void Move__4dBgWFv();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void __mi__4cXyzCFRC3Vec();
-extern "C" void ChkUsed__9cBgW_BgIdCFv();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void calcAnmMtx__8J3DModelFv();
-extern "C" void init__12J3DFrameCtrlFs();
-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:
-//
-
-/* ############################################################################################## */
-/* 80CBF668-80CBF66C 000000 0004+00 4/4 0/0 0/0 .rodata @3626 */
-SECTION_RODATA static f32 const lit_3626 = 1500.0f;
-COMPILER_STRIP_GATE(0x80CBF668, &lit_3626);
-
-/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80CBF6C4 = "P_Mbridge";
-SECTION_DEAD static char const* const stringBase_80CBF6CE = "P_Mbrid9";
-#pragma pop
/* 80CBF6D8-80CBF6E4 -00001 000C+00 3/3 0/0 0/0 .data l_resNameIdx */
-SECTION_DATA static void* l_resNameIdx[3] = {
- (void*)&d_a_obj_rotBridge__stringBase0,
- (void*)&d_a_obj_rotBridge__stringBase0,
- (void*)(((char*)&d_a_obj_rotBridge__stringBase0) + 0xA),
-};
-
-/* 80CBF6E4-80CBF704 -00001 0020+00 1/0 0/0 0/0 .data l_daRotBridge_Method */
-static actor_method_class l_daRotBridge_Method = {
- (process_method_func)daRotBridge_Create__FP10fopAc_ac_c,
- (process_method_func)daRotBridge_Delete__FP13daRotBridge_c,
- (process_method_func)daRotBridge_Execute__FP13daRotBridge_c,
- 0,
- (process_method_func)daRotBridge_Draw__FP13daRotBridge_c,
-};
-
-/* 80CBF704-80CBF734 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotBridge */
-extern actor_process_profile_definition g_profile_Obj_RotBridge = {
- fpcLy_CURRENT_e, // mLayerID
- 3, // mListID
- fpcPi_CURRENT_e, // mListPrio
- PROC_Obj_RotBridge, // mProcName
- &g_fpcLf_Method.base, // sub_method
- sizeof(daRotBridge_c), // mSize
- 0, // mSizeOther
- 0, // mParameters
- &g_fopAc_Method.base, // sub_method
- 490, // mPriority
- &l_daRotBridge_Method, // sub_method
- 0x00040000, // mStatus
- fopAc_ACTOR_e, // mActorType
- fopAc_CULLBOX_CUSTOM_e, // cullType
-};
-
-/* 80CBF734-80CBF740 00005C 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,
-};
-
-/* 80CBF740-80CBF768 000068 0028+00 1/1 0/0 0/0 .data __vt__13daRotBridge_c */
-SECTION_DATA extern void* __vt__13daRotBridge_c[10] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)CreateHeap__13daRotBridge_cFv,
- (void*)Create__16dBgS_MoveBgActorFv,
- (void*)Execute__13daRotBridge_cFPPA3_A4_f,
- (void*)Draw__13daRotBridge_cFv,
- (void*)Delete__13daRotBridge_cFv,
- (void*)IsDelete__16dBgS_MoveBgActorFv,
- (void*)ToFore__16dBgS_MoveBgActorFv,
- (void*)ToBack__16dBgS_MoveBgActorFv,
-};
-
-/* 80CBF768-80CBF774 000090 000C+00 2/2 0/0 0/0 .data __vt__17daRotBridge_HIO_c */
-SECTION_DATA extern void* __vt__17daRotBridge_HIO_c[3] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)__dt__17daRotBridge_HIO_cFv,
-};
-
-/* 80CBF774-80CBF780 00009C 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,
+static char* l_resNameIdx[3] = {
+ "P_Mbridge",
+ "P_Mbridge",
+ "P_Mbrid9",
};
/* 80CBE98C-80CBE9DC 0000EC 0050+00 1/1 0/0 0/0 .text __ct__17daRotBridge_HIO_cFv */
daRotBridge_HIO_c::daRotBridge_HIO_c() {
- // NONMATCHING
-}
-
-/* 80CBE9DC-80CBEA24 00013C 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
+ field_0x5 = 60;
+ field_0x6 = 1;
+ shake_power = 3;
+ vibration_range[0] = 1500.0f;
+ vibration_range[1] = 1500.0f;
+ vibration_range[2] = 1500.0f;
+ draw_wall_collision = FALSE;
}
/* 80CBEA24-80CBEB38 000184 0114+00 2/2 0/0 0/0 .text setBaseMtx__13daRotBridge_cFv */
void daRotBridge_c::setBaseMtx() {
- // NONMATCHING
+
+ if (mpBgW2 != NULL) {
+ mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
+
+ if (home.angle.y == 0) {
+ mDoMtx_stack_c::YrotM(-0x4000);
+ } else {
+ mDoMtx_stack_c::YrotM(-0x8000);
+ }
+
+ mpModel->setBaseScale(scale);
+ mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+ MTXCopy(mDoMtx_stack_c::get(), mMtx);
+ }
+
+ mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
+ mDoMtx_stack_c::YrotM(shape_angle.y);
+
+ mpModel->setBaseScale(scale);
+ mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
-/* ############################################################################################## */
/* 80CBF66C-80CBF678 000004 000C+00 0/1 0/0 0/0 .rodata l_bmdIdx */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const l_bmdIdx[12] = {
- 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
+static const int l_bmdIdx[] = {
+ 8,
+ 8,
+ 8,
};
-COMPILER_STRIP_GATE(0x80CBF66C, &l_bmdIdx);
-#pragma pop
/* 80CBF678-80CBF684 000010 000C+00 1/1 0/0 0/0 .rodata l_dzbIdx */
-SECTION_RODATA static u8 const l_dzbIdx[12] = {
- 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0B,
+static const int l_dzbIdx[] = {
+ 12,
+ 12,
+ 11,
};
-COMPILER_STRIP_GATE(0x80CBF678, &l_dzbIdx);
/* 80CBF684-80CBF690 00001C 000C+00 0/1 0/0 0/0 .rodata l_bckIdx */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const l_bckIdx[12] = {
- 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05,
+static const int l_bckIdx[] = {
+ 5,
+ 5,
+ 5,
};
-COMPILER_STRIP_GATE(0x80CBF684, &l_bckIdx);
-#pragma pop
-
-/* 80CBF690-80CBF698 000028 0004+04 2/4 0/0 0/0 .rodata @3694 */
-SECTION_RODATA static f32 const lit_3694[1 + 1 /* padding */] = {
- 1.0f,
- /* padding */
- 0.0f,
-};
-COMPILER_STRIP_GATE(0x80CBF690, &lit_3694);
/* 80CBEB38-80CBECBC 000298 0184+00 1/0 0/0 0/0 .text CreateHeap__13daRotBridge_cFv */
-void daRotBridge_c::CreateHeap() {
- // NONMATCHING
+int daRotBridge_c::CreateHeap() {
+ J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bmdIdx[mType]);
+ JUT_ASSERT(216, modelData != 0);
+
+ mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS);
+ if (mpModel == NULL) {
+ return 0;
+ }
+
+ int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bckIdx[mType]), 1, 0, 1.0f, 0, -1, 0);
+ JUT_ASSERT(230, res == 1);
+
+ u8 temp_r25 = (fopAcM_GetParam(this) & 0xF000) >> 0xC;
+ if (mType == 1 && temp_r25 != 15) {
+ mpBgW2 = new dBgW();
+ if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_resNameIdx[mType], 0xB), 1, &mMtx)) {
+ mpBgW2 = NULL;
+ return 0;
+ }
+ } else {
+ mpBgW2 = NULL;
+ }
+
+ return 1;
}
-/* ############################################################################################## */
-/* 80CBF698-80CBF6A0 000030 0008+00 1/2 0/0 0/0 .rodata @3776 */
-SECTION_RODATA static u8 const lit_3776[8] = {
- 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80CBF698, &lit_3776);
-
/* 80CBECBC-80CBEED4 00041C 0218+00 1/1 0/0 0/0 .text create__13daRotBridge_cFv */
-void daRotBridge_c::create() {
- // NONMATCHING
-}
-
-/* 80CBEED4-80CBEF1C 000634 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */
-// J3DFrameCtrl::~J3DFrameCtrl() {
-extern "C" void __dt__12J3DFrameCtrlFv() {
- // NONMATCHING
+int daRotBridge_c::create() {
+ fopAcM_SetupActor(this, daRotBridge_c);
+
+ mType = (fopAcM_GetParam(this) & 0xF00) >> 8;
+
+ int phase_state = dComIfG_resLoad(&mPhase, l_resNameIdx[mType]);
+ if (phase_state == cPhs_COMPLEATE_e) {
+ if (MoveBGCreate(l_resNameIdx[mType], l_dzbIdx[mType], dBgS_MoveBGProc_TypicalRotY, 0x2C80, NULL) == cPhs_ERROR_e) {
+ return cPhs_ERROR_e;
+ }
+
+ bitSw = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
+ mBck.setEndFrame(mBck.getEndFrame() - 1.0f);
+ mBckSpeed = 1.0f;
+ mBridgeAngle = 0;
+
+ if (bitSw == 0) {
+ shape_angle.y += 0x4000;
+ mBridgeAngle = 1;
+ }
+
+ mBck.setPlaySpeed(mBckSpeed);
+ mpModel->calcAnmMtx();
+
+ mpBgW->SetRideCallback(rideCallBack);
+ if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
+ dComIfG_Bgsp().Release(mpBgW2);
+ mpBgW2->Move();
+ }
+
+ mDoMove = FALSE;
+ mIsPlayerRide = FALSE;
+ mIsPlayerInArea = FALSE;
+
+ fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
+ fopAcM_setCullSizeBox2(this, mpModel->getModelData());
+ setBaseMtx();
+ }
+
+ return phase_state;
}
/* 80CBEF1C-80CBEF34 00067C 0018+00 1/1 0/0 0/0 .text
* rideCallBack__13daRotBridge_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
-void daRotBridge_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
- // NONMATCHING
+void daRotBridge_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
+ if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
+ ((daRotBridge_c*)i_bgActor)->mIsPlayerRide = TRUE;
+ }
}
-/* ############################################################################################## */
-/* 80CBF6A0-80CBF6A4 000038 0004+00 1/2 0/0 0/0 .rodata @3833 */
-SECTION_RODATA static f32 const lit_3833 = -1.0f;
-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(Mtx** param_0) {
- // NONMATCHING
+int daRotBridge_c::Execute(Mtx** param_0) {
+ u8 isSw = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
+ if (bitSw != isSw) {
+ if (isSw) {
+ mDoMove = TRUE;
+ fopAcM_seStart(this, Z2SE_OBJ_ROLLBRG_MOVESTART, 0);
+
+ if (mpBgW2 != NULL) {
+ dComIfG_Bgsp().Regist(mpBgW2, this);
+ mpBgW2->Move();
+ }
+ }
+
+ bitSw = isSw;
+ }
+
+ playerAreaCheck();
+ moveBridge();
+ *param_0 = (Mtx*)mpModel->getAnmMtx(0);
+ mIsPlayerRide = FALSE;
+ return 1;
}
-/* ############################################################################################## */
-/* 80CBF6A4-80CBF6A8 00003C 0004+00 0/2 0/0 0/0 .rodata @3878 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3878[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-COMPILER_STRIP_GATE(0x80CBF6A4, &lit_3878);
-#pragma pop
-
-/* 80CBF6A8-80CBF6B0 000040 0008+00 0/1 0/0 0/0 .rodata @3879 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3879[8] = {
- 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80CBF6A8, &lit_3879);
-#pragma pop
-
-/* 80CBF6B0-80CBF6B8 000048 0008+00 0/1 0/0 0/0 .rodata @3880 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3880[8] = {
- 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80CBF6B0, &lit_3880);
-#pragma pop
-
-/* 80CBF6B8-80CBF6C0 000050 0008+00 0/1 0/0 0/0 .rodata @3881 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3881[8] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80CBF6B8, &lit_3881);
-#pragma pop
-
-/* 80CBF788-80CBF794 000008 000C+00 1/1 0/0 0/0 .bss @3620 */
-static u8 lit_3620[12];
-
/* 80CBF794-80CBF7AC 000014 0018+00 3/3 0/0 0/0 .bss l_HIO */
-static u8 l_HIO[24];
+static daRotBridge_HIO_c l_HIO;
/* 80CBF050-80CBF1EC 0007B0 019C+00 1/1 0/0 0/0 .text playerAreaCheck__13daRotBridge_cFv
*/
void daRotBridge_c::playerAreaCheck() {
- // NONMATCHING
-}
+ fopAc_ac_c* player = dComIfGp_getPlayer(0);
+
+ cXyz sp8 = current.pos - player->current.pos;
+ f32 pl_dist = sp8.absXZ();
-/* ############################################################################################## */
-/* 80CBF6C0-80CBF6C4 000058 0004+00 0/1 0/0 0/0 .rodata @3939 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3939 = 10.0f;
-COMPILER_STRIP_GATE(0x80CBF6C0, &lit_3939);
-#pragma pop
+ mIsPlayerInArea = FALSE;
+ if (pl_dist <= l_HIO.vibration_range[mType]) {
+ mIsPlayerInArea = TRUE;
+ }
+}
/* 80CBF1EC-80CBF404 00094C 0218+00 1/1 0/0 0/0 .text moveBridge__13daRotBridge_cFv */
void daRotBridge_c::moveBridge() {
- // NONMATCHING
+ if (mDoMove) {
+ mDoMtx_MtxToRot(mpModel->getAnmMtx(0), &mRotation);
+ shape_angle.y = mRotation.y;
+
+ if (mBck.play()) {
+ mBck.setPlaySpeed(mBckSpeed);
+ mBck.setFrame(mBck.getStartFrame());
+ mDoMove = FALSE;
+
+ if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
+ dComIfG_Bgsp().Release(mpBgW2);
+ mpBgW2->Move();
+ }
+
+ if (mIsPlayerRide || mIsPlayerInArea) {
+ dComIfGp_getVibration().StartShock(l_HIO.shake_power, 0xF, cXyz(0.0f, 1.0f, 0.0f));
+ }
+
+ shape_angle.y &= 0xF000;
+ setBaseMtx();
+ mBridgeAngle ^= 1;
+ } else {
+ if (mBck.getFrame() == mBck.getEndFrame() - 10.0f) {
+ fopAcM_seStart(this, Z2SE_OBJ_ROLLBRG_MOVEEND, 0);
+ }
+
+ fopAcM_seStartLevel(this, Z2SE_OBJ_ROLLBRG_MOVE, 0);
+ }
+ }
}
/* 80CBF404-80CBF4BC 000B64 00B8+00 1/0 0/0 0/0 .text Draw__13daRotBridge_cFv */
-void daRotBridge_c::Draw() {
- // NONMATCHING
+int daRotBridge_c::Draw() {
+#if DEBUG
+ if (l_HIO.draw_wall_collision && mpBgW2 != NULL) {
+ mpBgW2->CalcPlane();
+ }
+#endif
+
+ g_env_light.settingTevStruct(16, &current.pos, &tevStr);
+ g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
+
+ mBck.entry(mpModel->getModelData());
+
+ dComIfGd_setListBG();
+ mDoExt_modelUpdateDL(mpModel);
+ dComIfGd_setList();
+ return 1;
}
/* 80CBF4BC-80CBF530 000C1C 0074+00 1/0 0/0 0/0 .text Delete__13daRotBridge_cFv */
-void daRotBridge_c::Delete() {
- // NONMATCHING
+int daRotBridge_c::Delete() {
+ dComIfG_resDelete(&mPhase, l_resNameIdx[mType]);
+
+ if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
+ dComIfG_Bgsp().Release(mpBgW2);
+ }
+
+ return 1;
}
/* 80CBF530-80CBF55C 000C90 002C+00 1/0 0/0 0/0 .text daRotBridge_Draw__FP13daRotBridge_c
*/
-static void daRotBridge_Draw(daRotBridge_c* param_0) {
- // NONMATCHING
+static int daRotBridge_Draw(daRotBridge_c* i_this) {
+ return i_this->MoveBGDraw();
}
/* 80CBF55C-80CBF57C 000CBC 0020+00 1/0 0/0 0/0 .text daRotBridge_Execute__FP13daRotBridge_c */
-static void daRotBridge_Execute(daRotBridge_c* param_0) {
- // NONMATCHING
+static int daRotBridge_Execute(daRotBridge_c* i_this) {
+ return i_this->MoveBGExecute();
}
/* 80CBF57C-80CBF59C 000CDC 0020+00 1/0 0/0 0/0 .text daRotBridge_Delete__FP13daRotBridge_c */
-static void daRotBridge_Delete(daRotBridge_c* param_0) {
- // NONMATCHING
+static int daRotBridge_Delete(daRotBridge_c* i_this) {
+ return i_this->MoveBGDelete();
}
/* 80CBF59C-80CBF5BC 000CFC 0020+00 1/0 0/0 0/0 .text daRotBridge_Create__FP10fopAc_ac_c
*/
-static void daRotBridge_Create(fopAc_ac_c* param_0) {
- // NONMATCHING
+static int daRotBridge_Create(fopAc_ac_c* i_this) {
+ fpc_ProcID id = fopAcM_GetID(i_this);
+ return ((daRotBridge_c*)i_this)->create();
}
-/* 80CBF5BC-80CBF618 000D1C 005C+00 2/1 0/0 0/0 .text __dt__17daRotBridge_HIO_cFv */
-daRotBridge_HIO_c::~daRotBridge_HIO_c() {
- // NONMATCHING
-}
-
-/* 80CBF618-80CBF654 000D78 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_rotBridge_cpp */
-void __sinit_d_a_obj_rotBridge_cpp() {
- // NONMATCHING
-}
-
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80CBF618, __sinit_d_a_obj_rotBridge_cpp);
-#pragma pop
+/* 80CBF6E4-80CBF704 -00001 0020+00 1/0 0/0 0/0 .data l_daRotBridge_Method */
+static actor_method_class l_daRotBridge_Method = {
+ (process_method_func)daRotBridge_Create,
+ (process_method_func)daRotBridge_Delete,
+ (process_method_func)daRotBridge_Execute,
+ 0,
+ (process_method_func)daRotBridge_Draw,
+};
-/* 80CBF6C4-80CBF6C4 00005C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+/* 80CBF704-80CBF734 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotBridge */
+extern actor_process_profile_definition g_profile_Obj_RotBridge = {
+ fpcLy_CURRENT_e, // mLayerID
+ 3, // mListID
+ fpcPi_CURRENT_e, // mListPrio
+ PROC_Obj_RotBridge, // mProcName
+ &g_fpcLf_Method.base, // sub_method
+ sizeof(daRotBridge_c), // mSize
+ 0, // mSizeOther
+ 0, // mParameters
+ &g_fopAc_Method.base, // sub_method
+ 490, // mPriority
+ &l_daRotBridge_Method, // sub_method
+ 0x00040000, // mStatus
+ fopAc_ACTOR_e, // mActorType
+ fopAc_CULLBOX_CUSTOM_e, // cullType
+};
diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp
index bf9a8045cc..8e62723091 100644
--- a/src/d/actor/d_a_obj_rotTrap.cpp
+++ b/src/d/actor/d_a_obj_rotTrap.cpp
@@ -6,503 +6,358 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_obj_rotTrap.h"
-#include "dol2asm.h"
-
-
-
-//
-// Forward References:
-//
-
-extern "C" void __ct__15daRotTrap_HIO_cFv();
-extern "C" void __dt__14mDoHIO_entry_cFv();
-extern "C" void setBaseMtx__11daRotTrap_cFv();
-extern "C" void CreateHeap__11daRotTrap_cFv();
-extern "C" void create__11daRotTrap_cFv();
-extern "C" void __dt__8dCcD_CylFv();
-extern "C" void __ct__8dCcD_CylFv();
-extern "C" void __dt__8cM3dGCylFv();
-extern "C" void __dt__8cM3dGAabFv();
-extern "C" void __dt__10dCcD_GSttsFv();
-extern "C" void Execute__11daRotTrap_cFPPA3_A4_f();
-extern "C" void procMain__11daRotTrap_cFv();
-extern "C" void init_modeWait__11daRotTrap_cFv();
-extern "C" void modeWait__11daRotTrap_cFv();
-extern "C" void init_modeAcc__11daRotTrap_cFv();
-extern "C" void modeAcc__11daRotTrap_cFv();
-extern "C" void init_modeMove__11daRotTrap_cFv();
-extern "C" void modeMove__11daRotTrap_cFv();
-extern "C" void seSet__11daRotTrap_cFv();
-extern "C" void Draw__11daRotTrap_cFv();
-extern "C" void Delete__11daRotTrap_cFv();
-extern "C" static void daRotTrap_Draw__FP11daRotTrap_c();
-extern "C" static void daRotTrap_Execute__FP11daRotTrap_c();
-extern "C" static void daRotTrap_Delete__FP11daRotTrap_c();
-extern "C" static void daRotTrap_Create__FP10fopAc_ac_c();
-extern "C" void __dt__10cCcD_GSttsFv();
-extern "C" void __dt__15daRotTrap_HIO_cFv();
-extern "C" void __sinit_d_a_obj_rotTrap_cpp();
-extern "C" u8 const mCcDObjInfo__11daRotTrap_c[48];
-extern "C" extern char const* const d_a_obj_rotTrap__stringBase0;
-extern "C" u8 mCcDCyl__11daRotTrap_c[68];
-
-//
-// External References:
-//
-
-extern "C" void mDoMtx_ZXYrotS__FPA4_fsss();
-extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
-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 Release__4cBgSFP9dBgW_Base();
-extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
-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 Set__4cBgWFP6cBgD_tUlPA3_A4_f();
-extern "C" void __ct__4dBgWFv();
-extern "C" void Move__4dBgWFv();
-extern "C" void __ct__10dCcD_GSttsFv();
-extern "C" void Move__10dCcD_GSttsFv();
-extern "C" void Init__9dCcD_SttsFiiP10fopAc_ac_c();
-extern "C" void __ct__12dCcD_GObjInfFv();
-extern "C" void __dt__12dCcD_GObjInfFv();
-extern "C" void Set__8dCcD_CylFRC11dCcD_SrcCyl();
-extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c();
-extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c();
-extern "C" void Set__4cCcSFP8cCcD_Obj();
-extern "C" void ChkUsed__9cBgW_BgIdCFv();
-extern "C" void SetC__8cM3dGCylFRC4cXyz();
-extern "C" void SetH__8cM3dGCylFf();
-extern "C" void SetR__8cM3dGCylFf();
-extern "C" void cLib_chaseAngleS__FPsss();
-extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
-extern "C" void* __nw__FUl();
-extern "C" void __dl__FPv();
-extern "C" void __construct_array();
-extern "C" void __ptmf_scall();
-extern "C" void _savegpr_20();
-extern "C" void _savegpr_25();
-extern "C" void _restgpr_20();
-extern "C" void _restgpr_25();
-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" void __register_global_object();
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80CC0808-80CC080C 000000 0004+00 3/4 0/0 0/0 .rodata @3649 */
-SECTION_RODATA static f32 const lit_3649 = 4.5f;
-COMPILER_STRIP_GATE(0x80CC0808, &lit_3649);
+#include "d/d_s_play.h"
-/* 80CC0880-80CC08C4 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daRotTrap_c */
-SECTION_DATA u8 daRotTrap_c::mCcDCyl[68] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-
-/* 80CC08C4-80CC096C 000064 00A8+00 0/1 0/0 0/0 .data atPos */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 atPos[168] = {
- 0xC2, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0xC3, 0x48, 0x00, 0x00, 0xC2, 0x14, 0x00, 0x00,
- 0x43, 0x02, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0xC2, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00,
- 0xC3, 0xC8, 0x00, 0x00, 0xC2, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00,
- 0xC2, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0xC4, 0x16, 0x00, 0x00, 0xC2, 0x14, 0x00, 0x00,
- 0x43, 0x02, 0x00, 0x00, 0xC4, 0x2F, 0x00, 0x00, 0xC2, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00,
- 0xC4, 0x48, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00,
- 0x42, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00,
- 0x43, 0x02, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00,
- 0x43, 0xFA, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00,
- 0x42, 0x14, 0x00, 0x00, 0x43, 0x02, 0x00, 0x00, 0x44, 0x2F, 0x00, 0x00, 0x42, 0x14, 0x00, 0x00,
- 0x43, 0x02, 0x00, 0x00, 0x44, 0x48, 0x00, 0x00,
-};
-#pragma pop
-
-/* 80CC096C-80CC09A4 00010C 0038+00 0/1 0/0 0/0 .data atR */
-#pragma push
-#pragma force_active on
-SECTION_DATA static u8 atR[56] = {
- 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48,
- 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
- 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48,
- 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00, 0x42, 0x48, 0x00, 0x00,
-};
-#pragma pop
-
-/* 80CC09A4-80CC09B0 -00001 000C+00 0/1 0/0 0/0 .data @3851 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3851[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)modeWait__11daRotTrap_cFv,
-};
-#pragma pop
-
-/* 80CC09B0-80CC09BC -00001 000C+00 0/1 0/0 0/0 .data @3852 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3852[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)modeAcc__11daRotTrap_cFv,
-};
-#pragma pop
-
-/* 80CC09BC-80CC09C8 -00001 000C+00 0/1 0/0 0/0 .data @3853 */
-#pragma push
-#pragma force_active on
-SECTION_DATA static void* lit_3853[3] = {
- (void*)NULL,
- (void*)0xFFFFFFFF,
- (void*)modeMove__11daRotTrap_cFv,
-};
-#pragma pop
-
-/* 80CC09C8-80CC09EC 000168 0024+00 0/1 0/0 0/0 .data mode_proc$3850 */
-#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
-
-/* 80CC09EC-80CC0A0C -00001 0020+00 1/0 0/0 0/0 .data l_daRotTrap_Method */
-static actor_method_class l_daRotTrap_Method = {
- (process_method_func)daRotTrap_Create__FP10fopAc_ac_c,
- (process_method_func)daRotTrap_Delete__FP11daRotTrap_c,
- (process_method_func)daRotTrap_Execute__FP11daRotTrap_c,
- 0,
- (process_method_func)daRotTrap_Draw__FP11daRotTrap_c,
-};
-
-/* 80CC0A0C-80CC0A3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotTrap */
-extern actor_process_profile_definition g_profile_Obj_RotTrap = {
- fpcLy_CURRENT_e, // mLayerID
- 3, // mListID
- fpcPi_CURRENT_e, // mListPrio
- PROC_Obj_RotTrap, // mProcName
- &g_fpcLf_Method.base, // sub_method
- sizeof(daRotTrap_c), // mSize
- 0, // mSizeOther
- 0, // mParameters
- &g_fopAc_Method.base, // sub_method
- 525, // mPriority
- &l_daRotTrap_Method, // sub_method
- 0x00040100, // mStatus
- fopAc_ACTOR_e, // mActorType
- fopAc_CULLBOX_CUSTOM_e, // cullType
-};
-
-/* 80CC0A3C-80CC0A48 0001DC 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,
-};
-
-/* 80CC0A48-80CC0A54 0001E8 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,
-};
+/* 80CBF8AC-80CBF8F8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daRotTrap_HIO_cFv */
+daRotTrap_HIO_c::daRotTrap_HIO_c() {
+ vibration = 3;
+ rotate_time = 4.5f;
+ field_0x8 = 10;
+ AT_adjust_SW = 0;
+ index = 0;
+ acc = 150;
+}
-/* 80CC0A54-80CC0A60 0001F4 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,
-};
+/* 80CC0AC4-80CC0AD4 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */
+static daRotTrap_HIO_c l_HIO;
-/* 80CC0A60-80CC0A6C 000200 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,
+/* 80CC080C-80CC083C 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daRotTrap_c */
+dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = {
+ {0, {{AT_TYPE_800, 0x1, 0x1F}, {0x0, 0x0}, {0}}},
+ {dCcD_SE_SWORD, 0, 1, 0, 0},
+ {dCcD_SE_STONE, 0, 0, 0, 0},
+ {0}
};
-/* 80CC0A6C-80CC0A94 00020C 0028+00 1/1 0/0 0/0 .data __vt__11daRotTrap_c */
-SECTION_DATA extern void* __vt__11daRotTrap_c[10] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)CreateHeap__11daRotTrap_cFv,
- (void*)Create__16dBgS_MoveBgActorFv,
- (void*)Execute__11daRotTrap_cFPPA3_A4_f,
- (void*)Draw__11daRotTrap_cFv,
- (void*)Delete__11daRotTrap_cFv,
- (void*)IsDelete__16dBgS_MoveBgActorFv,
- (void*)ToFore__16dBgS_MoveBgActorFv,
- (void*)ToBack__16dBgS_MoveBgActorFv,
+/* 80CC0880-80CC08C4 000020 0044+00 2/2 0/0 0/0 .data mCcDCyl__11daRotTrap_c */
+dCcD_SrcCyl daRotTrap_c::mCcDCyl = {
+ mCcDObjInfo,
+ {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
};
-/* 80CC0A94-80CC0AA0 000234 000C+00 2/2 0/0 0/0 .data __vt__15daRotTrap_HIO_c */
-SECTION_DATA extern void* __vt__15daRotTrap_HIO_c[3] = {
- (void*)NULL /* RTTI */,
- (void*)NULL,
- (void*)__dt__15daRotTrap_HIO_cFv,
+/* 80CC08C4-80CC096C 000064 00A8+00 0/1 0/0 0/0 .data atPos */
+static Vec atPos[] = {
+ {-37.0f, 130.0f, -200.0f},
+ {-37.0f, 130.0f, -300.0f},
+ {-37.0f, 130.0f, -400.0f},
+ {-37.0f, 130.0f, -500.0f},
+ {-37.0f, 130.0f, -600.0f},
+ {-37.0f, 130.0f, -700.0f},
+ {-37.0f, 130.0f, -800.0f},
+ {37.0f, 130.0f, 200.0f},
+ {37.0f, 130.0f, 300.0f},
+ {37.0f, 130.0f, 400.0f},
+ {37.0f, 130.0f, 500.0f},
+ {37.0f, 130.0f, 600.0f},
+ {37.0f, 130.0f, 700.0f},
+ {37.0f, 130.0f, 800.0f},
};
-/* 80CC0AA0-80CC0AAC 000240 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,
+/* 80CC096C-80CC09A4 00010C 0038+00 0/1 0/0 0/0 .data atR */
+static f32 atR[] = {
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
+ 50.0f,
};
-/* 80CBF8AC-80CBF8F8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__15daRotTrap_HIO_cFv */
-daRotTrap_HIO_c::daRotTrap_HIO_c() {
- // NONMATCHING
-}
-
-/* 80CBF8F8-80CBF940 000138 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
-}
-
/* 80CBF940-80CBF9D8 000180 0098+00 2/2 0/0 0/0 .text setBaseMtx__11daRotTrap_cFv */
void daRotTrap_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);
-/* ############################################################################################## */
-/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_80CC0858 = "P_kama";
-#pragma pop
+ mpModel->setBaseScale(scale);
+ mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
+ MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
+}
/* 80CBF9D8-80CBFAC8 000218 00F0+00 1/0 0/0 0/0 .text CreateHeap__11daRotTrap_cFv */
-void daRotTrap_c::CreateHeap() {
- // NONMATCHING
+int daRotTrap_c::CreateHeap() {
+ J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_kama", 4);
+ JUT_ASSERT(214, modelData != NULL);
+
+ mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS);
+ if (mpModel == NULL) {
+ return 0;
+ }
+
+ mpBgW2 = new dBgW();
+ if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("P_kama", 8), 1, &mBgMtx)) {
+ mpBgW2 = NULL;
+ return 0;
+ }
+
+ return 1;
}
/* 80CBFAC8-80CBFC88 000308 01C0+00 1/1 0/0 0/0 .text create__11daRotTrap_cFv */
-void daRotTrap_c::create() {
- // NONMATCHING
-}
-
-/* 80CBFC88-80CBFD54 0004C8 00CC+00 1/1 0/0 0/0 .text __dt__8dCcD_CylFv */
-// dCcD_Cyl::~dCcD_Cyl() {
-extern "C" void __dt__8dCcD_CylFv() {
- // NONMATCHING
-}
-
-/* 80CBFD54-80CBFDD8 000594 0084+00 1/1 0/0 0/0 .text __ct__8dCcD_CylFv */
-// dCcD_Cyl::dCcD_Cyl() {
-extern "C" void __ct__8dCcD_CylFv() {
- // NONMATCHING
-}
-
-/* 80CBFDD8-80CBFE20 000618 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGCylFv */
-// cM3dGCyl::~cM3dGCyl() {
-extern "C" void __dt__8cM3dGCylFv() {
- // NONMATCHING
-}
-
-/* 80CBFE20-80CBFE68 000660 0048+00 1/0 0/0 0/0 .text __dt__8cM3dGAabFv */
-// cM3dGAab::~cM3dGAab() {
-extern "C" void __dt__8cM3dGAabFv() {
- // NONMATCHING
-}
-
-/* 80CBFE68-80CBFEC4 0006A8 005C+00 1/0 0/0 0/0 .text __dt__10dCcD_GSttsFv */
-// dCcD_GStts::~dCcD_GStts() {
-extern "C" void __dt__10dCcD_GSttsFv() {
- // NONMATCHING
+int daRotTrap_c::create() {
+ fopAcM_SetupActor(this, daRotTrap_c);
+
+ int phase_state = dComIfG_resLoad(&mPhase, "P_kama");
+ if (phase_state == cPhs_COMPLEATE_e) {
+ if (MoveBGCreate("P_kama", 7, dBgS_MoveBGProc_TypicalRotY, 0x7DF0, NULL) == cPhs_ERROR_e) {
+ return cPhs_ERROR_e;
+ }
+
+ fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
+ fopAcM_setCullSizeBox2(this, mpModel->getModelData());
+ mCcStts.Init(0xFF, 0xFF, this);
+
+ for (int i = 0; i < 14; i++) {
+ mCcCyl[i].Set(mCcDCyl);
+ mCcCyl[i].SetStts(&mCcStts);
+ }
+
+ mSwbit = getSw();
+
+ if (mSwbit == 0xFF) {
+ init_modeMove();
+ } else if (fopAcM_isSwitch(this, mSwbit)) {
+ init_modeMove();
+ } else {
+ init_modeWait();
+ }
+
+ setBaseMtx();
+ }
+
+ return phase_state;
}
/* 80CBFEC4-80CBFF1C 000704 0058+00 1/0 0/0 0/0 .text Execute__11daRotTrap_cFPPA3_A4_f */
-void daRotTrap_c::Execute(Mtx** param_0) {
- // NONMATCHING
+int daRotTrap_c::Execute(Mtx** param_0) {
+ procMain();
+ *param_0 = &mpModel->getBaseTRMtx();
+ setBaseMtx();
+ mCcStts.Move();
+ return 1;
}
-/* ############################################################################################## */
-/* 80CC080C-80CC083C 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__11daRotTrap_c */
-SECTION_RODATA u8 const daRotTrap_c::mCcDObjInfo[48] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-COMPILER_STRIP_GATE(0x80CC080C, &daRotTrap_c::mCcDObjInfo);
-
-/* 80CC083C-80CC0840 000034 0004+00 1/1 0/0 0/0 .rodata @3880 */
-SECTION_RODATA static f32 const lit_3880 = 45.0f;
-COMPILER_STRIP_GATE(0x80CC083C, &lit_3880);
-
-/* 80CC0AB8-80CC0AC4 000008 000C+00 1/1 0/0 0/0 .bss @3643 */
-static u8 lit_3643[12];
-
-/* 80CC0AC4-80CC0AD4 000014 0010+00 4/4 0/0 0/0 .bss l_HIO */
-static u8 l_HIO[16];
-
-/* 80CC0AD4-80CC0AD8 000024 0004+00 1/1 0/0 0/0 .bss None */
-static u8 data_80CC0AD4[4];
-
/* 80CBFF1C-80CC00AC 00075C 0190+00 1/1 0/0 0/0 .text procMain__11daRotTrap_cFv */
void daRotTrap_c::procMain() {
- // NONMATCHING
+ static void (daRotTrap_c::*mode_proc[])() = {
+ &daRotTrap_c::modeWait,
+ &daRotTrap_c::modeAcc,
+ &daRotTrap_c::modeMove,
+ };
+
+ (this->*mode_proc[mMode])();
+
+#if DEBUG
+ if (l_HIO.AT_adjust_SW == TRUE) {
+ shape_angle.y = 0;
+ }
+#endif
+
+ for (int i = 0; i < 14; i++) {
+#if DEBUG
+ if (l_HIO.AT_adjust_SW == TRUE && i == l_HIO.index) {
+ f32 adjust_value = 1.0f;
+
+ if (mDoCPd_c::getHoldR(PAD_2)) {
+ adjust_value = 10.0f;
+ }
+
+ if (mDoCPd_c::getTrigUp(PAD_2)) {
+ atPos[i].z -= adjust_value;
+ } else if (mDoCPd_c::getTrigDown(PAD_2)) {
+ atPos[i].z += adjust_value;
+ } else if (mDoCPd_c::getTrigLeft(PAD_2)) {
+ atPos[i].x -= adjust_value;
+ } else if (mDoCPd_c::getTrigRight(PAD_2)) {
+ atPos[i].x += adjust_value;
+ } else if (mDoCPd_c::getTrigA(PAD_2)) {
+ atPos[i].y += adjust_value;
+ } else if (mDoCPd_c::getTrigB(PAD_2)) {
+ atPos[i].y -= adjust_value;
+ } else if (mDoCPd_c::getTrigX(PAD_2)) {
+ atR[i] += adjust_value;
+ } else if (mDoCPd_c::getTrigY(PAD_2)) {
+ atR[i] -= adjust_value;
+ }
+
+ OS_REPORT("==%d x:%f y:%f z:%f s:%f ==\n", i, atPos[i].x, atPos[i].y, atPos[i].z, atR[i]);
+ }
+#endif
+
+ mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
+ cXyz sp14;
+ cXyz sp8(atPos[i]);
+ mDoMtx_stack_c::multVec(&sp8, &sp14);
+ sp14 += current.pos;
+
+ mCcCyl[i].SetR(atR[i]);
+ mCcCyl[i].SetH(45.0f + oREG_F(1));
+ mCcCyl[i].SetC(sp14);
+ dComIfG_Ccsp()->Set(&mCcCyl[i]);
+ }
}
/* 80CC00AC-80CC0120 0008EC 0074+00 1/1 0/0 0/0 .text init_modeWait__11daRotTrap_cFv */
void daRotTrap_c::init_modeWait() {
- // NONMATCHING
+ if (mpBgW != NULL) {
+ dComIfG_Bgsp().Release(mpBgW);
+ }
+
+ if (mpBgW2 != NULL) {
+ dComIfG_Bgsp().Regist(mpBgW2, this);
+ mpBgW2->Move();
+ }
+
+ mMode = 0;
}
/* 80CC0120-80CC0180 000960 0060+00 1/0 0/0 0/0 .text modeWait__11daRotTrap_cFv */
void daRotTrap_c::modeWait() {
- // NONMATCHING
-}
+ if (fopAcM_isSwitch(this, mSwbit)) {
+ init_modeAcc();
+ }
-/* ############################################################################################## */
-/* 80CC0840-80CC0844 000038 0004+00 0/2 0/0 0/0 .rodata @3921 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u8 const lit_3921[4] = {
- 0x00,
- 0x00,
- 0x00,
- 0x00,
-};
-COMPILER_STRIP_GATE(0x80CC0840, &lit_3921);
-#pragma pop
-
-/* 80CC0844-80CC0848 00003C 0004+00 2/4 0/0 0/0 .rodata @3922 */
-SECTION_RODATA static f32 const lit_3922 = 1.0f;
-COMPILER_STRIP_GATE(0x80CC0844, &lit_3922);
-
-/* 80CC0848-80CC084C 000040 0004+00 0/2 0/0 0/0 .rodata @3923 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static u32 const lit_3923 = 0x43360B61;
-COMPILER_STRIP_GATE(0x80CC0848, &lit_3923);
-#pragma pop
-
-/* 80CC084C-80CC0850 000044 0004+00 0/2 0/0 0/0 .rodata @3924 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3924 = 360.0f;
-COMPILER_STRIP_GATE(0x80CC084C, &lit_3924);
-#pragma pop
-
-/* 80CC0850-80CC0854 000048 0004+00 0/2 0/0 0/0 .rodata @3925 */
-#pragma push
-#pragma force_active on
-SECTION_RODATA static f32 const lit_3925 = 30.0f;
-COMPILER_STRIP_GATE(0x80CC0850, &lit_3925);
-#pragma pop
+ if (mpBgW2 != NULL) {
+ mpBgW2->Move();
+ }
+}
/* 80CC0180-80CC027C 0009C0 00FC+00 1/1 0/0 0/0 .text init_modeAcc__11daRotTrap_cFv */
void daRotTrap_c::init_modeAcc() {
- // NONMATCHING
+ if (mpBgW2 != NULL) {
+ dComIfG_Bgsp().Release(mpBgW2);
+ mpBgW2->Move();
+ }
+
+ if (mpBgW != NULL) {
+ dComIfG_Bgsp().Regist(mpBgW, this);
+ }
+
+ dComIfGp_getVibration().StartShock(l_HIO.vibration, 0xF, cXyz(0.0f, 1.0f, 0.0f));
+ field_0x5b0 = cM_deg2s(360.0f / (30.0f * l_HIO.rotate_time));
+ field_0x5b2 = 0;
+ field_0x5ae = 0;
+ mMode = 1;
}
-/* ############################################################################################## */
-/* 80CC0854-80CC0858 00004C 0004+00 2/3 0/0 0/0 .rodata @3940 */
-SECTION_RODATA static f32 const lit_3940 = -1.0f;
-COMPILER_STRIP_GATE(0x80CC0854, &lit_3940);
-
/* 80CC027C-80CC034C 000ABC 00D0+00 1/0 0/0 0/0 .text modeAcc__11daRotTrap_cFv */
void daRotTrap_c::modeAcc() {
- // NONMATCHING
+ mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+ BOOL temp_r30 = cLib_chaseAngleS(&field_0x5b2, field_0x5b0, field_0x5b0 / l_HIO.acc);
+ shape_angle.y += field_0x5b2;
+ seSet();
+
+ if (temp_r30 == TRUE) {
+ init_modeMove();
+ }
}
/* 80CC034C-80CC0360 000B8C 0014+00 2/2 0/0 0/0 .text init_modeMove__11daRotTrap_cFv */
void daRotTrap_c::init_modeMove() {
- // NONMATCHING
+ field_0x5ae = 0;
+ mMode = 2;
}
/* 80CC0360-80CC0440 000BA0 00E0+00 1/0 0/0 0/0 .text modeMove__11daRotTrap_cFv */
void daRotTrap_c::modeMove() {
- // NONMATCHING
+ mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+ field_0x5b0 = cM_deg2s(360.0f / (30.0f * l_HIO.rotate_time));
+
+ if (0.0f != l_HIO.rotate_time) {
+ shape_angle.y += field_0x5b0;
+ }
+
+ seSet();
}
/* 80CC0440-80CC0548 000C80 0108+00 2/2 0/0 0/0 .text seSet__11daRotTrap_cFv */
void daRotTrap_c::seSet() {
- // NONMATCHING
+ if (shape_angle.y & 0x8000) {
+ if (field_0x5ae == 0) {
+ mDoAud_seStart(Z2SE_OBJ_RL_SWD_TRG, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+ field_0x5ae = 1;
+ }
+ } else if (field_0x5ae != 0) {
+ mDoAud_seStart(Z2SE_OBJ_RL_SWD_TRG, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
+ field_0x5ae = 0;
+ }
}
/* 80CC0548-80CC05EC 000D88 00A4+00 1/0 0/0 0/0 .text Draw__11daRotTrap_cFv */
-void daRotTrap_c::Draw() {
- // NONMATCHING
+int daRotTrap_c::Draw() {
+ g_env_light.settingTevStruct(16, &current.pos, &tevStr);
+ g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
+
+ dComIfGd_setListBG();
+ mDoExt_modelUpdateDL(mpModel);
+ dComIfGd_setList();
+ return 1;
}
/* 80CC05EC-80CC0654 000E2C 0068+00 1/0 0/0 0/0 .text Delete__11daRotTrap_cFv */
-void daRotTrap_c::Delete() {
- // NONMATCHING
+int daRotTrap_c::Delete() {
+ dComIfG_resDelete(&mPhase, "P_kama");
+
+ if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
+ dComIfG_Bgsp().Release(mpBgW2);
+ }
+
+ return 1;
}
/* 80CC0654-80CC0680 000E94 002C+00 1/0 0/0 0/0 .text daRotTrap_Draw__FP11daRotTrap_c */
-static void daRotTrap_Draw(daRotTrap_c* param_0) {
- // NONMATCHING
+static int daRotTrap_Draw(daRotTrap_c* i_this) {
+ return i_this->MoveBGDraw();
}
/* 80CC0680-80CC06A0 000EC0 0020+00 1/0 0/0 0/0 .text daRotTrap_Execute__FP11daRotTrap_c
*/
-static void daRotTrap_Execute(daRotTrap_c* param_0) {
- // NONMATCHING
+static int daRotTrap_Execute(daRotTrap_c* i_this) {
+ return i_this->MoveBGExecute();
}
/* 80CC06A0-80CC06C0 000EE0 0020+00 1/0 0/0 0/0 .text daRotTrap_Delete__FP11daRotTrap_c
*/
-static void daRotTrap_Delete(daRotTrap_c* param_0) {
- // NONMATCHING
+static int daRotTrap_Delete(daRotTrap_c* i_this) {
+ return i_this->MoveBGDelete();
}
/* 80CC06C0-80CC06E0 000F00 0020+00 1/0 0/0 0/0 .text daRotTrap_Create__FP10fopAc_ac_c */
-static void daRotTrap_Create(fopAc_ac_c* param_0) {
- // NONMATCHING
-}
-
-/* 80CC06E0-80CC0728 000F20 0048+00 1/0 0/0 0/0 .text __dt__10cCcD_GSttsFv */
-// cCcD_GStts::~cCcD_GStts() {
-extern "C" void __dt__10cCcD_GSttsFv() {
- // NONMATCHING
-}
-
-/* 80CC0728-80CC0784 000F68 005C+00 2/1 0/0 0/0 .text __dt__15daRotTrap_HIO_cFv */
-daRotTrap_HIO_c::~daRotTrap_HIO_c() {
- // NONMATCHING
-}
-
-/* 80CC0784-80CC07F4 000FC4 0070+00 0/0 1/0 0/0 .text __sinit_d_a_obj_rotTrap_cpp */
-void __sinit_d_a_obj_rotTrap_cpp() {
- // NONMATCHING
+static int daRotTrap_Create(fopAc_ac_c* i_this) {
+ fpc_ProcID id = fopAcM_GetID(i_this);
+ return ((daRotTrap_c*)i_this)->create();
}
-#pragma push
-#pragma force_active on
-REGISTER_CTORS(0x80CC0784, __sinit_d_a_obj_rotTrap_cpp);
-#pragma pop
+/* 80CC09EC-80CC0A0C -00001 0020+00 1/0 0/0 0/0 .data l_daRotTrap_Method */
+static actor_method_class l_daRotTrap_Method = {
+ (process_method_func)daRotTrap_Create,
+ (process_method_func)daRotTrap_Delete,
+ (process_method_func)daRotTrap_Execute,
+ (process_method_func)NULL,
+ (process_method_func)daRotTrap_Draw,
+};
-/* 80CC0858-80CC0858 000050 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
+/* 80CC0A0C-80CC0A3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RotTrap */
+extern actor_process_profile_definition g_profile_Obj_RotTrap = {
+ fpcLy_CURRENT_e, // mLayerID
+ 3, // mListID
+ fpcPi_CURRENT_e, // mListPrio
+ PROC_Obj_RotTrap, // mProcName
+ &g_fpcLf_Method.base, // sub_method
+ sizeof(daRotTrap_c), // mSize
+ 0, // mSizeOther
+ 0, // mParameters
+ &g_fopAc_Method.base, // sub_method
+ 525, // mPriority
+ &l_daRotTrap_Method, // sub_method
+ 0x00040100, // mStatus
+ fopAc_ACTOR_e, // mActorType
+ fopAc_CULLBOX_CUSTOM_e, // cullType
+};