From e1e081f37b218b1250188939a14c79c33bb36860 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 13 Aug 2026 14:23:30 -0400 Subject: [PATCH] d_a_obj_ikada OK --- configure.py | 2 +- include/d/actor/d_a_obj_ikada.h | 51 ------------- src/d/actor/d_a_daiocta_eye.cpp | 2 +- src/d/actor/d_a_fallrock.cpp | 2 +- src/d/actor/d_a_fm.cpp | 4 +- src/d/actor/d_a_gy_ctrl.cpp | 2 +- src/d/actor/d_a_npc_aj1.cpp | 2 +- src/d/actor/d_a_npc_so.cpp | 6 +- src/d/actor/d_a_obj_ikada.cpp | 125 +++++++++++++++++++++++--------- src/d/actor/d_a_obj_warpt.cpp | 2 +- src/d/actor/d_a_oship.cpp | 2 +- src/d/actor/d_a_tag_ba1.cpp | 4 +- src/f_op/f_op_actor_mng.cpp | 2 +- src/f_op/f_op_msg_mng.cpp | 3 +- 14 files changed, 106 insertions(+), 103 deletions(-) diff --git a/configure.py b/configure.py index 102689bb5..4ae30cbcc 100755 --- a/configure.py +++ b/configure.py @@ -1471,7 +1471,7 @@ config.libs = [ ActorRel(Matching, "d_a_obj_hfuck1"), ActorRel(Matching, "d_a_obj_hole"), ActorRel(Matching, "d_a_obj_ice"), - ActorRel(NonMatching, "d_a_obj_ikada"), + ActorRel(Matching, "d_a_obj_ikada"), ActorRel(Matching, "d_a_obj_kanat"), ActorRel(Matching, "d_a_obj_leaves"), ActorRel(Matching, "d_a_obj_lpalm"), diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 7b1b556cb..5a4cc600e 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -10,7 +10,6 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_path.h" #include "d/d_lib.h" -#include "m_Do/m_Do_hostIO.h" class daObj_Ikada_c : public fopAc_ac_c { public: @@ -185,54 +184,4 @@ public: /* 0x1328 */ cXyz mInitPos; }; -class daObj_Ikada_HIO_c : public mDoHIO_entry_c { -public: - daObj_Ikada_HIO_c(); - virtual ~daObj_Ikada_HIO_c() {} - - void genMessage(JORMContext* ctx) {} - -public: - /* 0x04 */ u8 mbDebugDraw; - /* 0x05 */ u8 m05; - /* 0x06 */ u8 m06; - /* 0x07 */ u8 mbNoRotAnim; - /* 0x08 */ u8 m08; - /* 0x09 */ u8 m09[0x0C - 0x09]; - /* 0x0C */ Vec mFlagOffset; - /* 0x18 */ f32 mFlagScale; - /* 0x1C */ s16 m1C; - /* 0x1E */ s16 m1E; - /* 0x20 */ f32 m20; - /* 0x24 */ s16 m24; - /* 0x26 */ u8 m26[0x28 - 0x26]; - /* 0x28 */ f32 m28; - /* 0x2C */ f32 mShipOffsY_Attention; - /* 0x30 */ f32 mShipOffsY_Eye; - /* 0x34 */ f32 mTerryWaveOffsZ; - /* 0x38 */ f32 mTerryWaveOffsY; - /* 0x3C */ f32 mTerryTrackOffsZ; - /* 0x40 */ f32 mSvWaveOffsX; - /* 0x44 */ f32 mSvTrackOffsX; - /* 0x48 */ f32 mSvOffsX[4]; - /* 0x58 */ f32 mTrackIndTransY; - /* 0x5C */ f32 mTrackIndScaleY; - /* 0x60 */ f32 mSplashScaleMax; - /* 0x64 */ f32 mSplashMaxScaleTimer; - /* 0x68 */ f32 mWaveVelFade; - /* 0x6C */ f32 mTrackVel; - /* 0x70 */ f32 mWaveVelSpeed; - /* 0x74 */ f32 mWaveVelOffs; - /* 0x78 */ f32 mWaveMaxVelocity; - /* 0x7C */ Vec mWaveCollapsePos[2]; - /* 0x94 */ s16 m94; - /* 0x96 */ s16 mPlayerStopDistance; - /* 0x98 */ s16 m98; - /* 0x9A */ s16 m9A; - /* 0x9C */ f32 m9C; - /* 0xA0 */ f32 mVelocityTargetTerry1; - /* 0xA4 */ f32 mVelocityTargetTerry3; - /* 0xA8 */ f32 mA8; -}; // size = 0xAC - #endif /* D_A_OBJ_IKADA_H */ diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index b7cb9b9ab..2db7c1400 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -174,7 +174,7 @@ BOOL daDaiocta_Eye_c::_createHeap() { } /* 000004E4-00000510 .text coHit_CB__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjInf*) { +static void coHit_CB(fopAc_ac_c* i_this, dCcD_GObjInf*, fopAc_ac_c* i_actor, dCcD_GObjInf*) { if(i_actor) { ((daDaiocta_Eye_c *)i_this)->_coHit(i_actor); } diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index 204339402..b99304c3d 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -105,7 +105,7 @@ BOOL daFallRock_c::execute() { fopAcM_posMoveF(this, mStts.GetCCMoveP()); field_0x29C.CrrPos(*dComIfG_Bgsp()); - field_0x610 = fabs(speed.y) + (f64)field_0x610; + field_0x610 = fabs(speed.y) + field_0x610; if (field_0x610 > m_falllen) { if (deleted == FALSE) { deleted = fopAcM_delete(this); diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 69d493ae0..aa5e9e6af 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -526,7 +526,7 @@ bool daFm_c::jntHitCreateHeap() { } /* 00000A30-00000A6C .text pathMove_CB__FP4cXyzP4cXyzP4cXyzPv */ -BOOL pathMove_CB(cXyz* param_1, cXyz* param_2, cXyz* param_3, void* i_this) { +static BOOL pathMove_CB(cXyz* param_1, cXyz* param_2, cXyz* param_3, void* i_this) { return ((daFm_c*)i_this)->_pathMove(param_1, param_2, param_3 ); } @@ -551,7 +551,7 @@ BOOL daFm_c::_pathMove(cXyz* param_1, cXyz* param_2, cXyz* param_3) { } /* 00000D40-00000D6C .text searchNearOtherActor_CB__FPvPv */ -void* searchNearOtherActor_CB(void* param_1, void* param_2) { +static void* searchNearOtherActor_CB(void* param_1, void* param_2) { return ((daFm_c*)param_2)->searchNearOtherActor((fopAc_ac_c*)param_1); } diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index e39778795..bac95efa8 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -62,7 +62,7 @@ daGy_Ctrl_HIO_c::daGy_Ctrl_HIO_c() { } /* 000001B8-000001E4 .text searchNearActor_CB__FPvPv */ -void* searchNearActor_CB(void* arg0, void* arg1) { +static void* searchNearActor_CB(void* arg0, void* arg1) { return ((daGy_Ctrl_c*)arg1)->searchNearActor((fopAc_ac_c*)arg0); } diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index 43d6c9f29..8eacaaac7 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -37,7 +37,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000044C-0000046C .text daNpc_Aj1_XyCheck_CB__FPvi */ -void daNpc_Aj1_XyCheck_CB(void*, int) { +static void daNpc_Aj1_XyCheck_CB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index a8c244bf8..81077e0e6 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -12,7 +12,7 @@ daNpc_So_HIO_c::daNpc_So_HIO_c() { } /* 000002A4-000002D0 .text searchEsa_CB__FPvPv */ -void searchEsa_CB(void*, void*) { +static void searchEsa_CB(void*, void*) { /* Nonmatching */ } @@ -32,7 +32,7 @@ void daNpc_So_c::_nodeControl(J3DNode*, J3DModel*) { } /* 000004B0-000004DC .text searchTagSo_CB__FPvPv */ -void searchTagSo_CB(void*, void*) { +static void searchTagSo_CB(void*, void*) { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daNpc_So_c::_searchTagSo(fopAc_ac_c*) { } /* 0000054C-00000578 .text searchMinigameTagSo_CB__FPvPv */ -void searchMinigameTagSo_CB(void*, void*) { +static void searchMinigameTagSo_CB(void*, void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 37332c36f..75b4480b8 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -20,6 +20,57 @@ #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_kankyo_mng.h" +class daObj_Ikada_HIO_c : public mDoHIO_entry_c { +public: + daObj_Ikada_HIO_c(); + virtual ~daObj_Ikada_HIO_c() {} + + void genMessage(JORMContext* ctx) {} + +public: + /* 0x04 */ u8 mbDebugDraw; + /* 0x05 */ u8 m05; + /* 0x06 */ u8 m06; + /* 0x07 */ u8 mbNoRotAnim; + /* 0x08 */ u8 m08; + /* 0x09 */ u8 m09[0x0C - 0x09]; + /* 0x0C */ cXyz mFlagOffset; + /* 0x18 */ f32 mFlagScale; + /* 0x1C */ s16 m1C; + /* 0x1E */ s16 m1E; + /* 0x20 */ f32 m20; + /* 0x24 */ s16 m24; + /* 0x26 */ u8 m26[0x28 - 0x26]; + /* 0x28 */ f32 m28; + /* 0x2C */ f32 mShipOffsY_Attention; + /* 0x30 */ f32 mShipOffsY_Eye; + /* 0x34 */ f32 mTerryWaveOffsZ; + /* 0x38 */ f32 mTerryWaveOffsY; + /* 0x3C */ f32 mTerryTrackOffsZ; + /* 0x40 */ f32 mSvWaveOffsX; + /* 0x44 */ f32 mSvTrackOffsX; + /* 0x48 */ f32 mSvOffsX[4]; + /* 0x58 */ f32 mTrackIndTransY; + /* 0x5C */ f32 mTrackIndScaleY; + /* 0x60 */ f32 mSplashScaleMax; + /* 0x64 */ f32 mSplashMaxScaleTimer; + /* 0x68 */ f32 mWaveVelFade; + /* 0x6C */ f32 mTrackVel; + /* 0x70 */ f32 mWaveVelSpeed; + /* 0x74 */ f32 mWaveVelOffs; + /* 0x78 */ f32 mWaveMaxVelocity; + /* 0x7C */ cXyz mWaveCollapsePos0; + /* 0x88 */ cXyz mWaveCollapsePos1; + /* 0x94 */ s16 m94; + /* 0x96 */ s16 mPlayerStopDistance; + /* 0x98 */ s16 m98; + /* 0x9A */ s16 m9A; + /* 0x9C */ f32 m9C; + /* 0xA0 */ f32 mVelocityTargetTerry1; + /* 0xA4 */ f32 mVelocityTargetTerry3; + /* 0xA8 */ f32 mA8; +}; // size = 0xAC + cXyz daObj_Ikada_c::m_rope_base_vec(0.0f, -10.0f, 0.0f); cXyz daObj_Ikada_c::m_crane_offset(200.0f, -340.0f, 0.0f); static daObj_Ikada_HIO_c l_HIO; @@ -94,12 +145,12 @@ daObj_Ikada_HIO_c::daObj_Ikada_HIO_c() { mWaveVelSpeed = 2.0f; mWaveMaxVelocity = 15.0f; mWaveVelOffs = 0.0f; - mWaveCollapsePos[0].x = -80.0f; - mWaveCollapsePos[0].y = -50.0f; - mWaveCollapsePos[0].z = -150.0f; - mWaveCollapsePos[1].x = -40.0f; - mWaveCollapsePos[1].y = -100.0f; - mWaveCollapsePos[1].z = -350.0f; + mWaveCollapsePos0.x = -80.0f; + mWaveCollapsePos0.y = -50.0f; + mWaveCollapsePos0.z = -150.0f; + mWaveCollapsePos1.x = -40.0f; + mWaveCollapsePos1.y = -100.0f; + mWaveCollapsePos1.z = -350.0f; m94 = 3000; mPlayerStopDistance = 6000; m98 = 1000; @@ -127,7 +178,7 @@ void daObj_Ikada_c::_nodeControl(J3DNode* node, J3DModel* model) { J3DJoint* joint = (J3DJoint*)node; s32 jntNo = joint->getJntNo(); mDoMtx_stack_c::copy(model->getAnmMtx(jntNo)); - mDoMtx_stack_c::ZXYrotM(mJointRot[jntNo].x, mJointRot[jntNo].y, mJointRot[jntNo].z); + mDoMtx_stack_c::ZXYrotM(mJointRot[jntNo]); if (jntNo == VSVSP_JNT_SV_CREAN_e) { mDoMtx_stack_c::XrotM(m115A + m115E * (REG12_S(5) + 5) * cM_ssin(m115C)); } @@ -136,7 +187,7 @@ void daObj_Ikada_c::_nodeControl(J3DNode* node, J3DModel* model) { } /* 00000458-00000494 .text pathMove_CB__FP4cXyzP4cXyzP4cXyzPv */ -BOOL pathMove_CB(cXyz* arg1, cXyz* arg2, cXyz* arg3, void* v_this) { +static BOOL pathMove_CB(cXyz* arg1, cXyz* arg2, cXyz* arg3, void* v_this) { return ((daObj_Ikada_c*)v_this)->_pathMove(arg1, arg2, arg3); } @@ -179,7 +230,7 @@ BOOL daObj_Ikada_c::_pathMove(cXyz* arg1, cXyz* arg2, cXyz* arg3) { } /* 000007A0-000007C8 .text ride_CB__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -void ride_CB(dBgW*, fopAc_ac_c* ac1, fopAc_ac_c* ac2) { +static void ride_CB(dBgW*, fopAc_ac_c* ac1, fopAc_ac_c* ac2) { ((daObj_Ikada_c*)ac1)->_ride(ac2); } @@ -347,8 +398,7 @@ void daObj_Ikada_c::createWave() { JPABaseEmitter* emitter = mTrackCallBack.getEmitter(); if (emitter != NULL) { JGeometry::TVec3 scale = (Vec){1.0f, 1.0f, 1.0f}; - emitter->setGlobalDynamicsScale(scale); - emitter->setGlobalParticleScale(scale); + emitter->setGlobalScale(scale); } } } @@ -391,14 +441,14 @@ void daObj_Ikada_c::setWave() { mWaveRCallback.setPitch(l_HIO.mWaveVelOffs + 1.0f); mWaveLCallback.setPitch(1.0f - l_HIO.mWaveVelOffs); - cXyz sp2C = l_HIO.mWaveCollapsePos[0]; - cXyz sp20 = l_HIO.mWaveCollapsePos[1]; - cXyz sp14 = l_HIO.mWaveCollapsePos[0]; - cXyz sp08 = l_HIO.mWaveCollapsePos[1]; + cXyz sp2C = l_HIO.mWaveCollapsePos0; + cXyz sp20 = l_HIO.mWaveCollapsePos1; + cXyz sp14 = sp2C; + cXyz sp08 = sp20; mWaveRCallback.setAnchor(&sp2C, &sp20); - sp14.x = (f32)(f64)sp14.x * -1.0f; - sp08.x = (f32)(f64)sp08.x * -1.0f; + sp14.x *= -1.0f; + sp08.x *= -1.0f; mWaveLCallback.setAnchor(&sp14, &sp08); mWaveRCallback.setMaxDisSpeed(l_HIO.mWaveVelSpeed); @@ -464,7 +514,7 @@ void daObj_Ikada_c::setRopePos() { spBC = *pcVar6; mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e)); - mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z); + mDoMtx_stack_c::transM(m_crane_offset); mDoMtx_stack_c::multVecZero(pcVar6); if (mCurMode == 1) { @@ -514,7 +564,7 @@ void daObj_Ikada_c::setRopePos() { iVar4 = 0; } else { mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e)); - mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z); + mDoMtx_stack_c::transM(m_crane_offset); cMtx_copy(mDoMtx_stack_c::get(), ropeEndMtx); spA4.set(pcVar7->x - ropeEndMtx[0][3], pcVar7->y - ropeEndMtx[1][3], pcVar7->z - ropeEndMtx[2][3]); iVar3 = 0; @@ -632,7 +682,7 @@ void daObj_Ikada_c::setMtx() { mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); mDoMtx_stack_c::multVec(&sp24, &mFirePos); - mDoMtx_stack_c::transM(sp24.x, sp24.y, sp24.z); + mDoMtx_stack_c::transM(sp24); mDoMtx_stack_c::YrotM(mLightRotY); mDoMtx_stack_c::XrotM(mLightRotX); mDoMtx_stack_c::scaleM(mLightPower, mLightPower, mLightPower); @@ -1203,22 +1253,25 @@ bool daObj_Ikada_c::_execute() { return false; } -const u32 unused_5617[] = { - 0xFFFF0080, - 0xFF80, - 0xFF80, - 0xFF000080, - 0xFF000080, - 0xFF80, - 0xFF000080, - 0xFF000080, - 0xFF000080, -}; - /* 00003CA0-00003CD4 .text debugDraw__13daObj_Ikada_cFv */ void daObj_Ikada_c::debugDraw() { cXyz sp08 = current.pos; sp08.y += 20.0f; + // Unused colors, needed for the .rodata section to match. + GXColor unused_5617 = {0xFF, 0xFF, 0x00, 0x80}; + GXColor unused_5621 = {0x00, 0x00, 0xFF, 0x80}; + GXColor unused_5623 = {0x00, 0x00, 0xFF, 0x80}; + GXColor unused_5625 = {0xFF, 0x00, 0x00, 0x80}; + GXColor unused_5629 = {0xFF, 0x00, 0x00, 0x80}; + GXColor unused_5631 = {0x00, 0x00, 0xFF, 0x80}; + GXColor unused_5636 = {0xFF, 0x00, 0x00, 0x80}; + GXColor unused_5640 = {0xFF, 0x00, 0x00, 0x80}; + GXColor unused_5646 = {0xFF, 0x00, 0x00, 0x80}; + // dDbVw_drawSphereOpa__FR4cXyzfRC8_GXColorUc + // dDbVw_drawCircleOpa__FR4cXyzfRC8_GXColorUcUc + if (isWave()) { + // ? + } } /* 00003CD4-00003EE0 .text _draw__13daObj_Ikada_cFv */ @@ -1246,7 +1299,7 @@ bool daObj_Ikada_c::_draw() { J3DModelData* modelData = mpModel->getModelData(); mBckAnm.entry(modelData); mDoExt_modelUpdateDL(mpModel); - mpModel->getModelData()->getJointNodePointer(VSVSP_JNT_SV_SHIP_ROOT_e)->setMtxCalc(NULL); + mBckAnm.remove(mpModel->getModelData()); } else { mDoExt_modelUpdateDL(mpModel); } @@ -1366,10 +1419,10 @@ void daObj_Ikada_c::createInit() { cXyz(0.0f, 0.0f, 0.0f), cXyz(100.0f, 530.0f, 0.0f), }; - static const u32 params[] = {4, 4, 4, 4, 0x2000000}; + static const u32 param[] = {4, 4, 4, 4, 0x2000000}; static const f32 flag_scale[] = {0.2f, 0.0f, 0.0f, 0.0f, 0.12f}; - mFlagPcId = fopAcM_create(fpcNm_MAJUU_FLAG_e, params[mType], ¤t.pos, tevStr.mRoomNo, ¤t.angle); + mFlagPcId = fopAcM_create(fpcNm_MAJUU_FLAG_e, param[mType], ¤t.pos, tevStr.mRoomNo, ¤t.angle); mFlagOffset = flag_offset[mType]; mFlagScale = flag_scale[mType]; } @@ -1385,7 +1438,7 @@ void daObj_Ikada_c::createInit() { cXyz* pcVar7 = &m07DC[m07D8 - 1]; mDoMtx_stack_c::copy(mpModel->getAnmMtx(VSVSP_JNT_SV_CREAN_e)); - mDoMtx_stack_c::transM(m_crane_offset.x, m_crane_offset.y, m_crane_offset.z); + mDoMtx_stack_c::transM(m_crane_offset); mDoMtx_stack_c::multVecZero(pcVar8); cXyz sp80(0.0f, -1.0f, 0.0f); diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index 06f6311a0..c1751e6fd 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -226,7 +226,7 @@ bool daObj_Warpt_c::createBodyHeap() { } /* 00000620-00000648 .text ride_CB__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */ -void ride_CB(dBgW*, fopAc_ac_c* a_this, fopAc_ac_c* arg2) { +static void ride_CB(dBgW*, fopAc_ac_c* a_this, fopAc_ac_c* arg2) { ((daObj_Warpt_c*)a_this)->_ride(arg2); } diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index 20859536e..482f61743 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -132,7 +132,7 @@ void daOship_c::_nodeControl(J3DNode* i_nodeP, J3DModel* i_modelP) { } /* 0000044C-00000488 .text pathMove_CB__FP4cXyzP4cXyzP4cXyzPv */ -int pathMove_CB(cXyz* param_1, cXyz* param_2, cXyz* param_3, void* i_this) { +static int pathMove_CB(cXyz* param_1, cXyz* param_2, cXyz* param_3, void* i_this) { return ((daOship_c *)i_this)->_pathMove(param_1, param_2, param_3); } diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index 399864003..9263c4e03 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -12,7 +12,7 @@ daTag_Ba1_HIO_c::daTag_Ba1_HIO_c() { } /* 00000144-00000164 .text daTag_Ba1_XyCheck_cB__FPvi */ -void daTag_Ba1_XyCheck_cB(void*, int) { +static void daTag_Ba1_XyCheck_cB(void*, int) { /* Nonmatching */ } @@ -22,7 +22,7 @@ void daTag_Ba1_c::XyCheck_cB(int) { } /* 00000184-000001A4 .text daTag_Ba1_XyEvent_cB__FPvi */ -void daTag_Ba1_XyEvent_cB(void*, int) { +static void daTag_Ba1_XyEvent_cB(void*, int) { /* Nonmatching */ } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index fcccd253c..730c82a5d 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1127,7 +1127,7 @@ void* fopAcM_fastCreateItem(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, c #if VERSION > VERSION_DEMO /* 80027254-80027280 .text stealItem_CB__FPv */ -BOOL stealItem_CB(void* actor) { +static BOOL stealItem_CB(void* actor) { if (actor) { daItem_c* item = (daItem_c*)actor; item->scale.setall(1.0f); diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index b2ce7f1d5..7e4429706 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -3202,8 +3202,9 @@ u32 fopMsgM_msgDataProc_c::stringLength() { int r7 = sp18[sp14]; #if VERSION <= VERSION_JPN - sp18[sp14] = (int)((f32)sp0C + 0.5f); + sp18[sp14] = (int)(sp0C + 0.5f); #else + // Fakematch? Why the (f64) cast? sp18[sp14] = (int)((f32)(f64)sp0C + 0.5f); #endif if (!r27) {