From 7d10c4357a6e3fc211fe0cfc471f3f8608b4de82 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 3 Aug 2026 02:08:28 -0400 Subject: [PATCH] p1 cleanup --- include/d/d_camera.h | 6 +++++- src/d/actor/d_a_fm.cpp | 1 - src/d/actor/d_a_npc_p1.cpp | 40 ++++++++++++++++++------------------- src/d/actor/d_a_npc_zl1.cpp | 1 - 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 1b502e492..1a8c908db 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -615,7 +615,11 @@ public: void CStickUseless() { setFlag(0x800000); } void StickUse() { clrFlag(0x1000000); } void StickUseless() { setFlag(0x1000000); } - void SkipSmoother(){m102 = 1; m101 = 1; m100 = 1;} + void SkipSmoother(){ + m102 = 1; + m101 = 1; + m100 = 1; + } bool Active() { return mActive; } bool Pause() { return mPause; } diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index d37a7837c..69d493ae0 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -2300,7 +2300,6 @@ void daFm_c::modeBikubiku() { /* 000068D0-00006D8C .text modeProc__6daFm_cFQ26daFm_c6Proc_ei */ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) { - struct ModeEntry { ModeFunc init; ModeFunc run; diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 4627de83e..12c8f94c8 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -45,10 +45,12 @@ public: daNpc_P1_HIO_c(); virtual ~daNpc_P1_HIO_c() {} + void genMessage(JORMContext* ctx) {} + public: - s8 mNo; - s32 m8; - daNpc_P1_childHIO_c children[3]; + /* 0x04 */ s8 mNo; + /* 0x08 */ s32 m8; + /* 0x0C */ daNpc_P1_childHIO_c children[3]; }; static dCcD_SrcCyl l_cyl_src = { @@ -724,7 +726,7 @@ BOOL daNpc_P1_c::demo_move() { m670 = 1; J3DAnmTexPattern* btp = actor->getP_BtpData("P1"); if (btp) { - mBtp.init(mpHeadModel->getModelData(), btp, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); + mBtp.init(mpHeadModel->getModelData(), btp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, true, FALSE); mBlinkFrame = 0; } if (mBtp.getBtpAnm()) { @@ -820,7 +822,7 @@ BOOL daNpc_P1_c::evn_talk() { BOOL daNpc_P1_c::minigameExplainCut() { static char* ActionNames[] = {"4013_msg", "4014_msg"}; int staffId = dComIfGp_evmng_getMyStaffId(mEventCut6B0.getActorName(), NULL); - int actIdx = dComIfGp_evmng_getMyActIdx(staffId, ActionNames, ARRAY_SSIZE(ActionNames), 1, 0); + int actIdx = dComIfGp_evmng_getMyActIdx(staffId, ActionNames, ARRAY_SSIZE(ActionNames), TRUE, 0); if (staffId == -1) { mbAttentionFlag = 0; @@ -889,7 +891,7 @@ BOOL daNpc_P1_c::privateCut() { if (staffIdx == -1) { return FALSE; } - int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SSIZE(cut_name_tbl), true, 0); + int actIdx = dComIfGp_evmng_getMyActIdx(staffIdx, cut_name_tbl, ARRAY_SSIZE(cut_name_tbl), TRUE, 0); if (actIdx == -1) { dComIfGp_evmng_cutEnd(staffIdx); } else { @@ -1101,12 +1103,11 @@ BOOL daNpc_P1_c::CreateHeap() { 1.0f, 0, -1, - 1, + TRUE, NULL, 0x80000, 0x11020002 ); - ; if (!mpMorf || !mpMorf->getModel()) { return FALSE; } @@ -1153,8 +1154,7 @@ BOOL daNpc_P1_c::CreateHeap() { } else { mpDoraModel = NULL; } - J3DJointTree& tree = model_data_p->getJointTree(); - for (u16 i = 0; i < tree.getJointNum(); i += 1) { + for (u16 i = 0; i < model_data_p->getJointNum(); i += 1) { if ((i == m_jnt.getHeadJntNum()) || (i == m_jnt.getBackboneJntNum())) { model_data_p->getJointNodePointer(i)->setCallBack(nodeCallBack1); } @@ -1196,12 +1196,12 @@ BOOL daNpc_P1_c::_delete() { /* 00003DF8-00003E70 .text getKajiID__10daNpc_P1_cFv */ fpc_ProcID daNpc_P1_c::getKajiID() { - fpc_ProcID kaji_id = 0xFFFFFFFF; + fpc_ProcID kaji_id = fpcM_ERROR_PROCESS_ID_e; fpc_ProcID parent_id = parentActorID; if (parent_id != fpcM_ERROR_PROCESS_ID_e) { - daObjPirateship::Act_c* actor = (daObjPirateship::Act_c*)fopAcM_SearchByID(parent_id); + fopAc_ac_c* actor = fopAcM_SearchByID(parent_id); if (fopAc_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Pirateship_e) { - kaji_id = actor->getKajiID(); + kaji_id = ((daObjPirateship::Act_c*)actor)->getKajiID(); } } return kaji_id; @@ -1230,9 +1230,9 @@ BOOL daNpc_P1_c::kaji_anm() { } } if (mKajiId != fpcM_ERROR_PROCESS_ID_e) { - daKaji_c* wheel = (daKaji_c*)fopAcM_SearchByID(mKajiId); - if (fopAc_IsActor(wheel) && fopAcM_GetName(wheel) == fpcNm_Kaji_e) { - wheel->setAnm(mAnmNum - 9, mpMorf->getFrame()); + fopAc_ac_c* kaji = fopAcM_SearchByID(mKajiId); + if (fopAc_IsActor(kaji) && fopAcM_GetName(kaji) == fpcNm_Kaji_e) { + ((daKaji_c*)kaji)->setAnm(mAnmNum - 9, mpMorf->getFrame()); } } return TRUE; @@ -1265,11 +1265,9 @@ BOOL daNpc_P1_c::_execute() { if (!demo_move()) { playTexPatternAnm(); s8 room_no = fopAcM_GetRoomNo(this); - mpMorf->play( - ¤t.pos, - mObjAcch.ChkGroundHit() ? dComIfG_Bgsp()->GetMtrlSndId(mObjAcch.m_gnd) : 0, - (s16)dComIfGp_getReverb(room_no) - ); //TODO: cast to s16 needed? + int mtrlSndId = mObjAcch.ChkGroundHit() ? dComIfG_Bgsp()->GetMtrlSndId(mObjAcch.m_gnd) : 0; + int reverb = dComIfGp_getReverb(room_no); + mpMorf->play(¤t.pos, mtrlSndId, reverb); if (dComIfGp_event_getMode() == 0 || eventInfo.checkCommandTalk()) { (this->*mActionFunc)(NULL); diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 9eae2236a..3b4550341 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -1392,7 +1392,6 @@ void daNpc_Zl1_c::decEnvironment() { /* 00002BCC-00002CD0 .text darkProc__11daNpc_Zl1_cFv */ void daNpc_Zl1_c::darkProc() { - switch(field_0x7C2) { case 1: incEnvironment();