mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-10-09 05:31:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match debug inlines for some npcs

Browse Source
This commit is contained in:
LagoLunatic
2026-09-30 11:22:19 -04:00
parent 13d0e58065
commit 0bfdf5b34c
18 changed files with 99 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1678,7 +1678,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_bms1"),
ActorRel(Matching, "d_a_npc_bmsw"),
ActorRel(Matching, "d_a_npc_bs1"),
ActorRel(Matching, "d_a_npc_btsw"),
ActorRel(Matching, "d_a_npc_btsw"),
ActorRel(Matching, "d_a_npc_btsw2"),
ActorRel(NonMatching, "d_a_npc_co1"),
ActorRel(NonMatching, "d_a_npc_de1"),
include/d/actor/d_a_npc_bmsw.h
+17 -15
View File
@@ -34,7 +34,9 @@ public:
void Throw();
void EndInit();
void End();
#if VERSION > VERSION_DEMO
void SeDelete();
#endif
void move();
void draw(dKy_tevstr_c*);
@@ -61,31 +63,31 @@ public:
class SwCam_c {
public:
SwCam_c() {
field_0x1E = 0;
mActive = false;
field_0x1C = 0;
field_0x1D = 0;
field_0x00 = SwCam_c::camera_center_data[0][1];
field_0x0C = camera_eye;
field_0x18 = 58.0f;
mCenter = SwCam_c::camera_center_data[0][1];
mEye = camera_eye;
mFovY = 58.0f;
}
void ActiveOff() {
field_0x1E = 0;
mActive = false;
}
void ActiveOn() {
field_0x1E = 1;
mActive = true;
field_0x00 = camera_center_data[0][1];
field_0x0C = camera_eye;
field_0x18 = 58.0f;
mCenter = camera_center_data[0][1];
mEye = camera_eye;
mFovY = 58.0f;
setAimIdx(0, 0);
}
cXyz* getCenterP() {
return &field_0x0C;
return &mCenter;
}
cXyz* getEyeP() {
return &field_0x00;
return &mEye;
}
void setAimIdx(s8 row, s8 col) {
field_0x1C = row;
@@ -98,12 +100,12 @@ public:
static cXyz camera_eye;
public:
/* 0x00 */ cXyz field_0x00;
/* 0x0C */ cXyz field_0x0C;
/* 0x18 */ f32 field_0x18;
/* 0x00 */ cXyz mCenter;
/* 0x0C */ cXyz mEye;
/* 0x18 */ f32 mFovY;
/* 0x1C */ s8 field_0x1C;
/* 0x1D */ s8 field_0x1D;
/* 0x1E */ u8 field_0x1E;
/* 0x1E */ bool mActive;
}; // Size: 0x1F
class daNpc_Bmsw_c : public fopNpc_npc_c {
include/d/actor/d_a_npc_btsw.h
+2
View File
@@ -33,7 +33,9 @@ public:
void Throw();
void EndInit();
void End();
#if VERSION > VERSION_DEMO
void SeDelete();
#endif
void move();
void draw(dKy_tevstr_c*);
include/d/actor/d_a_npc_km1.h
+12 -11
View File
@@ -29,18 +29,18 @@ public:
s8 getHeadJntNum() { return m_head_jnt_num; }
s8 getBackboneJntNum() {return m_backbone_jnt_num; }
s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
s16 getHead_x() { return m_jnt.getHead_x(); }
s16 getHead_y() { return m_jnt.getHead_y(); }
Vec* getAttPos() { return &mAttPos; }
Vec* getEyePos() { return &mEyePos; }
s16 getHead_x() { return m_jnt.mAngles[0][0]; }
s16 getHead_y() { return m_jnt.mAngles[0][1]; }
s16 getBackbone_x() { return m_jnt.mAngles[1][0]; }
s16 getBackbone_y() { return m_jnt.mAngles[1][1]; }
cXyz* getAttPos() { return &mAttPos; }
cXyz* getEyePos() { return &mEyePos; }
bool createInit();
void setMtx();
bool anmResID(int, int*, int*);
void BtpNum2ResID(int, int*);
void setAnm_tex(signed char);
void setAnm_tex(s8);
bool init_btp(bool, int);
bool initTexPatternAnm(bool);
void playTexPatternAnm();
@@ -48,12 +48,12 @@ public:
void setAnm();
void chngAnmTag();
void ctrlAnmTag();
void chngAnmAtr(unsigned char);
void chngAnmAtr(u8);
void ctrlAnmAtr();
void setAnm_ATR(int);
void anmAtr(unsigned short);
void setStt(signed char);
u16 next_msgStatus(unsigned long*);
void anmAtr(u16);
void setStt(s8);
u16 next_msgStatus(u32*);
u32 getMsg();
void eventOrder();
void checkOrder();
@@ -67,6 +67,7 @@ public:
void endEvent();
void event_proc();
bool set_action(ActionFunc, void*);
BOOL chk_action(ActionFunc); // Unused
BOOL wait01();
BOOL talk01();
int wait_action1(void*);
include/d/actor/d_a_npc_os.h
+4 -4
View File
@@ -42,12 +42,12 @@ public:
}
void clearStatus() { field_0x784 = 0; }
cXyz& getAttentionBasePos() { return field_0x754; }
s16 getBackbone_x() { return mJntCtrl.getBackbone_x(); }
s16 getBackbone_y() { return mJntCtrl.getBackbone_y(); }
s16 getHead_x() { return mJntCtrl.mAngles[0][0]; }
s16 getHead_y() { return mJntCtrl.mAngles[0][1]; }
s16 getBackbone_x() { return mJntCtrl.mAngles[1][0]; }
s16 getBackbone_y() { return mJntCtrl.mAngles[1][1]; }
cXyz& getEyePos() { return field_0x748; }
virtual f32 getGroundY() { return mAcch.GetGroundH(); }
s16 getHead_x() { return mJntCtrl.getHead_x(); }
s16 getHead_y() { return mJntCtrl.getHead_y(); }
virtual MtxP getLeftHandMatrix() { return cullMtx; }
virtual MtxP getRightHandMatrix() { return cullMtx; }
virtual f32 getBaseAnimeFrameRate() { return 1.0f; }
include/d/d_camera.h
+5 -5
View File
@@ -537,11 +537,11 @@ public:
bool eventCamera(s32);
bool demoCamera(s32);
bool letCamera(s32);
bool Set(cXyz, cXyz);
bool Set(cXyz, cXyz, f32, s16);
bool Set(cXyz, cXyz, s16, f32);
bool Reset(cXyz, cXyz, f32, s16);
bool Reset(cXyz, cXyz);
bool Set(cXyz center, cXyz eye);
bool Set(cXyz center, cXyz eye, f32 fovY, s16 bank);
bool Set(cXyz center, cXyz eye, s16 bank, f32 fovY);
bool Reset(cXyz center, cXyz eye, f32 fovY, s16 bank);
bool Reset(cXyz center, cXyz eye);
bool Reset();
void ResetView();
bool Chtyp(s32);
src/d/actor/d_a_daiocta.cpp
+3 -3
View File
@@ -1210,7 +1210,7 @@ void daDaiocta_c::modeDemo() {
}
}
} else {
fopAcM_orderOtherEvent2(this, "DAIOCTA_SUIKOMI", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DAIOCTA_SUIKOMI");
}
}
@@ -1276,9 +1276,9 @@ void daDaiocta_c::modeDelete() {
fopAcM_delete(this);
}
} else if (m057C == 1) {
fopAcM_orderOtherEvent2(this, "DAIOCTA_DEAD_ELF", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DAIOCTA_DEAD_ELF");
} else {
fopAcM_orderOtherEvent2(this, "DAIOCTA_DEAD", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DAIOCTA_DEAD");
}
}
src/d/actor/d_a_fm.cpp
+5 -5
View File
@@ -1798,7 +1798,7 @@ void daFm_c::modeGrabFootDemo() {
}
}
} else {
fopAcM_orderOtherEvent2(this,"DEFAULT_FM_GRAB_FOOT", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DEFAULT_FM_GRAB_FOOT");
}
}
}
@@ -2066,7 +2066,7 @@ void daFm_c::modeGrabDemo() {
}
} else {
if (isLink(mpActorTarget)) {
fopAcM_orderOtherEvent2(this, "DEFAULT_FM_GRAB", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DEFAULT_FM_GRAB");
}
else {
if (isNpc(mpActorTarget)) {
@@ -2074,10 +2074,10 @@ void daFm_c::modeGrabDemo() {
if (field_0x2E4 != 0) {
fopAcM_orderChangeEvent(this, "DEFAULT_FM_SUIKOMI_NPC", 0, 0xFFFF);
} else {
fopAcM_orderOtherEvent2(this, "DEFAULT_FM_SUIKOMI_NPC", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DEFAULT_FM_SUIKOMI_NPC");
}
#else
fopAcM_orderOtherEvent2(this, "DEFAULT_FM_SUIKOMI_NPC", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DEFAULT_FM_SUIKOMI_NPC");
#endif
}
}
@@ -2180,7 +2180,7 @@ void daFm_c::modeGrabNpcDemo() {
}
#endif
else {
fopAcM_orderOtherEvent2(this, "DEFAULT_FM_NPC_GRAB", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "DEFAULT_FM_NPC_GRAB");
}
}
src/d/actor/d_a_goal_flag.cpp
+1 -1
View File
@@ -857,7 +857,7 @@ BOOL daGoal_Flag_c::TimerExecute() {
"race_fail_cam",
};
char* event_name = event_name_tbl[mRaceEndState != 3 ? 1 : 0];
fopAcM_orderOtherEvent2(this, event_name, dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, event_name);
eventInfo.onCondition(dEvtCnd_UNK2_e);
}
}
src/d/actor/d_a_npc_bmsw.cpp
+16 -14
View File
@@ -322,7 +322,7 @@ bool daNpc_Bmsw_c::chkAttention(cXyz pos, s16 angle) {
s16 targetAngleY = cM_atan2s(delta.x, delta.z);
if (mHasAttention) {
maxAttnDistXZ += 40.0f;
maxAttnAngleY += cAngle::d2s(10.0f);
maxAttnAngleY += cM_deg2s(10.0f);
}
targetAngleY -= angle;
return maxAttnAngleY > abs(targetAngleY) && maxAttnDistXZ > distXZ;
@@ -576,7 +576,7 @@ void daNpc_Bmsw_c::anmAtr(u16 i_msgStatus) {
break;
}
dComIfGp_clearMesgAnimeAttrInfo();
dComIfGp_setMesgAnimeAttrInfo(0xFF);
}
/* 000010C0-00001340 .text CreateInit__12daNpc_Bmsw_cFv */
@@ -631,7 +631,7 @@ BOOL daNpc_Bmsw_c::CreateInit() {
void daNpc_Bmsw_c::set_mtx() {
J3DModel* model = mpMorf->getModel();
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(current.angle.y);
model->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -639,14 +639,14 @@ void daNpc_Bmsw_c::set_mtx() {
field_0x6D8->setBaseTRMtx(model->getAnmMtx(m_jnt.getBackboneJntNum()));
if (field_0x9D5 == 6 || field_0x9D5 == 5) {
if ((field_0x9D5 == 5 && mpMorfHand->getFrame() < DEMO_SELECT(18.0f + REG10_F(5), 18.0f)) || (field_0x9D5 == 6 && mpMorfHand->getFrame() < 18.0f)) {
if ((field_0x9D5 == 5 && mpMorfHand->getFrame() < 18.0f + DEMO_SELECT(REG10_F(5), 0.0f)) || (field_0x9D5 == 6 && mpMorfHand->getFrame() < 18.0f)) {
mDoMtx_stack_c::copy(mpMorfHand->getModel()->getAnmMtx(m_handR));
mDoMtx_stack_c::transM(24.77f, -3.73f, 22.69f);
mDoMtx_stack_c::XYZrotM(0x45B4, -0x2BE7, 0xE6C);
mDoMtx_stack_c::XYZrotM(cM_deg2s(98.02001654f), cM_deg2s(-61.737669014f), cM_deg2s(20.2807611f));
} else {
mDoMtx_stack_c::copy(mpMorfHand->getModel()->getAnmMtx(m_handL));
mDoMtx_stack_c::transM(26.18f, 8.72f, 18.55f);
mDoMtx_stack_c::XYZrotM(0x5065, 0x28A0, -0x7F80);
mDoMtx_stack_c::XYZrotM(cM_deg2s(113.05480612f), cM_deg2s(57.128904507f), cM_deg2s(-179.296869528f));
}
field_0x6DC->setBaseTRMtx(mDoMtx_stack_c::get());
}
@@ -1271,15 +1271,15 @@ BOOL daNpc_Bmsw_c::CreateHeap() {
field_0x930[2] = &mSwMail2;
field_0x93C = 0;
cXyz* eyeP = mSwCam.getEyeP();
cXyz* cameraCenter = mSwCam.getCenterP();
if (field_0x930[0]->MailCreateInit(eyeP, cameraCenter) == FALSE) {
cXyz* eyeP = mSwCam.getEyeP();
if (field_0x930[0]->MailCreateInit(cameraCenter, eyeP) == FALSE) {
return FALSE;
}
if (field_0x930[1]->MailCreateInit(eyeP, cameraCenter) == FALSE) {
if (field_0x930[1]->MailCreateInit(cameraCenter, eyeP) == FALSE) {
return FALSE;
}
if (field_0x930[2]->MailCreateInit(eyeP, cameraCenter) == FALSE) {
if (field_0x930[2]->MailCreateInit(cameraCenter, eyeP) == FALSE) {
return FALSE;
}
@@ -1493,7 +1493,7 @@ void SwMail_c::Appear() {
field_0x48.y = field_0x4E.y + new_y + DEMO_SELECT(REG10_S(1), 0);
cLib_addCalcAngleS2(&field_0x48.z, field_0x4E.z, 4, 0x1000);
if (std::abs(cLib_addCalcPos(&field_0x24, vec, 0.25f, 30.0f, 2.5f)) < 2.5f) {
if (std::fabsf(cLib_addCalcPos(&field_0x24, vec, 0.25f, 30.0f, 2.5f)) < 2.5f) {
WaitInit();
}
set_mtx();
@@ -1624,10 +1624,12 @@ void SwMail_c::End() {
set_mtx_throw();
}
#if VERSION > VERSION_DEMO
/* 00004B34-00004B68 .text SeDelete__8SwMail_cFv */
void SwMail_c::SeDelete() {
mDoAud_seDeleteObject((Vec*) &field_0x24);
}
#endif
/* 00004B68-00004B90 .text move__8SwMail_cFv */
void SwMail_c::move() {
@@ -1645,14 +1647,14 @@ void SwMail_c::draw(dKy_tevstr_c* tevStr) {
/* 00004C04-00004D0C .text Move__7SwCam_cFv */
void SwCam_c::Move() {
if (field_0x1E != 0) {
if (mActive) {
camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
cXyz center = camera_center_data[field_0x1D][field_0x1C + 1];
cLib_addCalcPos(&field_0x00, center, 0.25f, 10.0f, 1.0f);
cLib_addCalcPos(&mCenter, center, 0.25f, 10.0f, 1.0f);
camera->mCamera.Stay();
camera->mCamera.Set(*getEyeP(), *getCenterP(), field_0x18, 0);
camera->mCamera.Set(mCenter, mEye, mFovY, 0);
}
}
src/d/actor/d_a_npc_btsw.cpp
+13 -7
View File
@@ -169,7 +169,7 @@ static BOOL nodeCallBack(J3DNode* node, int calcTiming) {
}
/* 00000430-0000046C .text daNpc_Btsw_getGameEndMsg__Fs */
u32 daNpc_Btsw_getGameEndMsg(s16 rupees) {
static u32 daNpc_Btsw_getGameEndMsg(s16 rupees) {
u32 msgNo;
if (rupees == 0) {
msgNo = 0x1A9D;
@@ -269,7 +269,7 @@ bool daNpc_Btsw_c::chkAttention(cXyz pos, s16 angle) {
s16 targetAngleY = cM_atan2s(delta.x, delta.z);
if (mHasAttention) {
maxAttnDistXZ += 40.0f;
maxAttnAngleY += cAngle::d2s(10.0f);
maxAttnAngleY += cM_deg2s(10.0f);
}
targetAngleY -= angle;
return maxAttnAngleY > abs(targetAngleY) && maxAttnDistXZ > distXZ;
@@ -278,7 +278,7 @@ bool daNpc_Btsw_c::chkAttention(cXyz pos, s16 angle) {
/* 0000085C-00000908 .text eventOrder__12daNpc_Btsw_cFv */
void daNpc_Btsw_c::eventOrder() {
if (field_0x9C7 == 3) {
fopAcM_orderOtherEvent2(this, "GETMOTHERLETTER", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "GETMOTHERLETTER");
} else if (field_0x9C7 == 4) {
fopAcM_orderOtherEventId(this, field_0x9C8);
} else if (field_0x9C7 == 1 || field_0x9C7 == 2) {
@@ -449,7 +449,7 @@ void daNpc_Btsw_c::anmAtr(u16 i_msgStatus) {
setAnm(1);
}
dComIfGp_clearMesgAnimeAttrInfo();
dComIfGp_setMesgAnimeAttrInfo(0xFF);
}
/* 00000F0C-00000F30 .text daNpc_Btsw_XyCheckCB__FPvi */
@@ -529,7 +529,7 @@ void daNpc_Btsw_c::set_mtx() {
}
mDoMtx_stack_c::transM(vec);
mDoMtx_stack_c::XYZrotM(angle);
mDoMtx_stack_c::XYZrotM(angle.x, angle.y, angle.z);
field_0x6D0->setBaseTRMtx(mDoMtx_stack_c::get());
}
}
@@ -736,7 +736,7 @@ BOOL daNpc_Btsw_c::shiwake_game_action(void*) {
field_0x9A1 = 0;
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderOtherEvent2(this, "SHIWAKEGAME", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "SHIWAKEGAME");
eventInfo.onCondition(dEvtCnd_UNK2_e);
return FALSE;
}
@@ -956,6 +956,8 @@ BOOL daNpc_Btsw_c::_execute() {
/* 00002AF4-00002B90 .text _delete__12daNpc_Btsw_cFv */
BOOL daNpc_Btsw_c::_delete() {
fopAcM_RegisterDeleteID(this);
dComIfG_resDeleteDemo(&mPhs, "Btsw");
if (
@@ -985,6 +987,8 @@ static BOOL CallbackCreateHeap(fopAc_ac_c* i_this) {
/* 00002BB0-00002CAC .text _create__12daNpc_Btsw_cFv */
cPhs_State daNpc_Btsw_c::_create() {
fopAcM_RegisterCreateID(this);
fopAcM_ct(this, daNpc_Btsw_c);
cPhs_State res = dComIfG_resLoad(&mPhs, "Btsw");
@@ -1282,7 +1286,7 @@ void SwMail2_c::Appear() {
field_0x48.y = field_0x4E.y + new_y + DEMO_SELECT(REG10_S(1), 0);
cLib_addCalcAngleS2(&field_0x48.z, field_0x4E.z, 4, 0x1000);
if (std::abs(cLib_addCalcPos(&field_0x24, vec, 0.25f, 30.0f, 2.5f)) < 2.5f) {
if (std::fabsf(cLib_addCalcPos(&field_0x24, vec, 0.25f, 30.0f, 2.5f)) < 2.5f) {
WaitInit();
}
set_mtx();
@@ -1412,10 +1416,12 @@ void SwMail2_c::End() {
set_mtx_throw();
}
#if VERSION > VERSION_DEMO
/* 000045B0-000045E4 .text SeDelete__9SwMail2_cFv */
void SwMail2_c::SeDelete() {
mDoAud_seDeleteObject((Vec*) &field_0x24);
}
#endif
/* 000045E4-0000460C .text move__9SwMail2_cFv */
void SwMail2_c::move() {
src/d/actor/d_a_npc_km1.cpp
+11 -11
View File
@@ -74,12 +74,12 @@ static BOOL nodeCallBack_Km(J3DNode* i_node, int i_calcTiming) {
static cXyz a_eye_pos_offst(20.0f,20.0f,0.0f);
u16 jointIdx = ((J3DJoint*)(i_node))->getJntNo();
mDoMtx_stack_c::copy(model->getAnmMtx(jointIdx));
if(jointIdx == km1Actor->getHeadJntNum()){
MTXMultVec(mDoMtx_stack_c::get(),&a_att_pos_offst,km1Actor->getAttPos());
if (jointIdx == km1Actor->getHeadJntNum()){
mDoMtx_stack_c::multVec(&a_att_pos_offst, km1Actor->getAttPos());
mDoMtx_stack_c::XrotM(km1Actor->getHead_y());
mDoMtx_stack_c::ZrotM(km1Actor->getHead_x());
MTXMultVec(mDoMtx_stack_c::get(),&a_eye_pos_offst,km1Actor->getEyePos());
}else if(jointIdx == km1Actor->getBackboneJntNum()){
mDoMtx_stack_c::multVec(&a_eye_pos_offst, km1Actor->getEyePos());
} else if(jointIdx == km1Actor->getBackboneJntNum()){
mDoMtx_stack_c::XrotM(km1Actor->getBackbone_y());
mDoMtx_stack_c::ZrotM(km1Actor->getBackbone_x());
}
@@ -123,7 +123,7 @@ void daNpc_Km1_c::setMtx() {
tevStr.mRoomNo = dComIfG_Bgsp()->GetRoomId(mObjAcch.m_gnd);
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mObjAcch.m_gnd);
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(current.angle.y);
mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
mpMorf->calc();
@@ -151,7 +151,7 @@ void daNpc_Km1_c::BtpNum2ResID(int i_num, int* o_btp_num){
}
/* 000006F0-00000734 .text setAnm_tex__11daNpc_Km1_cFSc */
void daNpc_Km1_c::setAnm_tex(signed char i_param_1) {
void daNpc_Km1_c::setAnm_tex(s8 i_param_1) {
if(i_param_1 >= 0 && i_param_1 != field_0x7CD){
field_0x7CD = i_param_1;
initTexPatternAnm(true);
@@ -266,7 +266,7 @@ void daNpc_Km1_c::ctrlAnmTag() {
}
/* 00000AA4-00000AE4 .text chngAnmAtr__11daNpc_Km1_cFUc */
void daNpc_Km1_c::chngAnmAtr(unsigned char param_1) {
void daNpc_Km1_c::chngAnmAtr(u8 param_1) {
if(param_1 < 1 && param_1 != field_0x7CB){
field_0x7CB = param_1;
setAnm_ATR(1);
@@ -310,7 +310,7 @@ void daNpc_Km1_c::anmAtr(u16 i_msgStatus) {
}
/* 00000C0C-00000C64 .text setStt__11daNpc_Km1_cFSc */
void daNpc_Km1_c::setStt(signed char param_1) {
void daNpc_Km1_c::setStt(s8 param_1) {
s8 uVar1 = field_0x7D0;
field_0x7D0 = param_1;
switch((s8)field_0x7D0) {
@@ -327,7 +327,7 @@ void daNpc_Km1_c::setStt(signed char param_1) {
}
/* 00000C64-00000C6C .text next_msgStatus__11daNpc_Km1_cFPUl */
u16 daNpc_Km1_c::next_msgStatus(unsigned long*) {
u16 daNpc_Km1_c::next_msgStatus(u32*) {
return fopMsgStts_MSG_ENDS_e;
}
@@ -352,7 +352,7 @@ void daNpc_Km1_c::checkOrder() {
if(eventInfo.checkCommandDemoAccrpt()){
return;
}
if(!eventInfo.checkCommandTalk()){
if(eventInfo.getCommand()!= dEvtCmd_INTALK_e){
return;
}
if(field_0x7CF != 1 && field_0x7CF != 2){
@@ -369,7 +369,7 @@ void daNpc_Km1_c::lookBack() {
cXyz vec2 = current.pos;
vec2.y = eyePos.y;
vec1.setall(0.0);
vec1.set(0.0f, 0.0f, 0.0f);
cXyz* dstPos = NULL;
s16 targetY = current.angle.y;
src/d/actor/d_a_npc_os.cpp
+4 -4
View File
@@ -1117,7 +1117,7 @@ BOOL daNpc_Os_c::searchNpcAction(void*) {
}
else if(field_0x7A9 != -1) {
field_0x7A4 = 1;
daPy_py_c* player = daPy_getPlayerActorClass();
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
BOOL door = player->eventInfo.checkCommandDoor();
f32 dist_sq = fopAcM_searchPlayerDistanceXZ2(this);
@@ -1997,16 +1997,16 @@ void daNpc_Os_c::lookBack(int param_1, int param_2, int param_3) {
void daNpc_Os_c::setBaseMtx() {
J3DModel* pModel = mpMorf->getModel();
if(fopAcM_checkCarryNow(this)) {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::transM(field_0x7E4);
mDoMtx_stack_c::transM(field_0x7E4.x, field_0x7E4.y, field_0x7E4.z);
mDoMtx_stack_c::XrotM(shape_angle.x);
mDoMtx_stack_c::ZrotM(shape_angle.z);
}
else {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 95.0f, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::transM(field_0x7E4);
mDoMtx_stack_c::transM(field_0x7E4.x, field_0x7E4.y, field_0x7E4.z);
mDoMtx_stack_c::XrotM(shape_angle.x);
mDoMtx_stack_c::ZrotM(shape_angle.z);
mDoMtx_stack_c::transM(0.0f, -95.0f, 0.0f);
src/d/actor/d_a_npc_p1.cpp
+1 -1
View File
@@ -590,7 +590,7 @@ BOOL daNpc_P1_c::speakAction(void*) {
setAction(&daNpc_P1_c::normalAction, NULL, 0);
if (mPrevMesg == 0xFA4) {
dComIfGp_event_reset();
fopAcM_orderOtherEvent2(this, "sea_exp_cam", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "sea_exp_cam");
eventInfo.onCondition(dEvtCnd_UNK2_e);
setAction(&daNpc_P1_c::explainAction, NULL, 0);
} else {
src/d/actor/d_a_npc_rsh1.cpp
+1 -1
View File
@@ -464,7 +464,7 @@ void daNpc_Rsh1_c::eventOrder() {
if (m95B == 5) {
fopAcM_orderOtherEventId(this, mShopOutEventIdx);
} else if (m95B == 4) {
fopAcM_orderOtherEvent2(this, "RSH_GET_DEMO", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "RSH_GET_DEMO");
} else if (m95B == 1 || m95B == 2 || m95B == 3) {
if (m95B != 3 || mShopIdx != -1 || daNpc_Rsh1_checkRotenBaseTalkArea()) {
eventInfo.onCondition(dEvtCnd_CANTALK_e);
src/d/actor/d_a_obj_hami4.cpp
+2 -2
View File
@@ -81,7 +81,7 @@ void daObjHami4_c::set_mtx() {
void daObjHami4_c::daObjHami4_close_stop() {
int switchIndex = prm_get_swSave();
if (fopAcM_isSwitch(this, switchIndex)) {
fopAcM_orderOtherEvent2(this,"AMI4_OPEN",dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "AMI4_OPEN");
field_0x378 = 1;
}
}
@@ -93,7 +93,7 @@ void daObjHami4_c::daObjHami4_open_demo_wait() {
mDoAud_seStart(JA_SE_READ_RIDDLE_1);
fopAcM_seStartCurrent(this, JA_SE_OBJ_SLIDE_AMI_OPEN, 0);
} else {
fopAcM_orderOtherEvent2(this,"AMI4_OPEN",dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "AMI4_OPEN");
}
}
src/d/actor/d_a_oship.cpp
+1 -1
View File
@@ -735,7 +735,7 @@ void daOship_c::modeDelete() {
fopAcM_delete(this);
}
} else {
fopAcM_orderOtherEvent2(this, "GOLD_SHIP_DELETE", dEvtFlag_NOPARTNER_e);
fopAcM_orderOtherEvent(this, "GOLD_SHIP_DELETE");
}
} else {
s16 temp = cLib_addCalcAngleS(&shape_angle.x, -15000, 0x14, 0x1000, 0x100);
src/d/d_camera.cpp
-15
View File
@@ -4897,7 +4897,6 @@ bool dCamera_c::letCamera(s32) {
/* 8017B154-8017B18C .text Set__9dCamera_cF4cXyz4cXyz */
bool dCamera_c::Set(cXyz center, cXyz eye) {
mCenter = center;
mEye = eye;
return TRUE;
@@ -4906,11 +4905,8 @@ bool dCamera_c::Set(cXyz center, cXyz eye) {
/* 8017B18C-8017B1EC .text Set__9dCamera_cF4cXyz4cXyzfs */
bool dCamera_c::Set(cXyz center, cXyz eye, f32 fovY, s16 bank) {
mCenter = center;
mEye = eye;
mFovy = fovY;
mBank.Val(bank);
return TRUE;
@@ -4919,11 +4915,8 @@ bool dCamera_c::Set(cXyz center, cXyz eye, f32 fovY, s16 bank) {
/* 8017B1EC-8017B24C .text Set__9dCamera_cF4cXyz4cXyzsf */
bool dCamera_c::Set(cXyz center, cXyz eye, s16 bank, f32 fovY) {
mCenter = center;
mEye = eye;
mFovy = fovY;
mBank.Val(bank);
return TRUE;
@@ -4932,14 +4925,10 @@ bool dCamera_c::Set(cXyz center, cXyz eye, s16 bank, f32 fovY) {
/* 8017B24C-8017B31C .text Reset__9dCamera_cF4cXyz4cXyzfs */
bool dCamera_c::Reset(cXyz center, cXyz eye, f32 fovY, s16 bank) {
mViewCache.mCenter = mCenter = center;
mViewCache.mEye = mEye = eye;
mViewCache.mFovy = mFovy = fovY;
mBank = cSAngle(bank);
mViewCache.mBank = mBank;
mViewCache.mDirection.Val(mViewCache.mEye - mViewCache.mCenter);
return Reset();
@@ -4948,13 +4937,9 @@ bool dCamera_c::Reset(cXyz center, cXyz eye, f32 fovY, s16 bank) {
/* 8017B31C-8017B3D8 .text Reset__9dCamera_cF4cXyz4cXyz */
bool dCamera_c::Reset(cXyz center, cXyz eye) {
mViewCache.mCenter = mCenter = center;
mViewCache.mEye = mEye = eye;
mViewCache.mFovy = mFovy;
mViewCache.mBank = mBank;
mViewCache.mDirection.Val(mViewCache.mEye - mViewCache.mCenter);
return Reset();