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

Minor cleanup

Browse Source 
Inlines, wrong indentation, enums, private fields, etc
This commit is contained in:
LagoLunatic
2026-07-23 17:48:51 -04:00
parent 2115d05965
commit 4efda6f355
57 changed files with 1696 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1655,7 +1655,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_auction"),
ActorRel(NonMatching, "d_a_npc_ba1"),
ActorRel(NonMatching, "d_a_npc_bj1"),
ActorRel(Matching, "d_a_npc_bm1"),
ActorRel(Matching, "d_a_npc_bm1"),
ActorRel(NonMatching, "d_a_npc_bmcon1"),
ActorRel(NonMatching, "d_a_npc_bms1"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_bmsw"),
include/d/actor/d_a_auction.h
+1 -1
View File
@@ -93,7 +93,7 @@ public:
void nextBet();
int getRand(int);
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ dNpc_EventCut_c mNpcEvtInfo;
/* 0x738 */ fpc_ProcID m738[8];
include/d/actor/d_a_dai.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
static const char m_arcname[];
static const char m_cloth_arcname[];
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhsFdai;
/* 0x6CC */ request_of_phase_process_class mPhsCloth;
/* 0x6D4 */ J3DModel* mpModel;
include/d/actor/d_a_npc_ah.h
+1 -1
View File
@@ -103,7 +103,7 @@ public:
static const char m_arcname[];
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ request_of_phase_process_class mPhsMethod;
/* 0x6D4 */ J3DAnmTexPattern* m_head_tex_pattern;
include/d/actor/d_a_npc_bm1.h
+32 -39
View File
@@ -4,10 +4,6 @@
#include "JSystem/JParticle/JPAEmitter.h"
#include "d/d_npc.h"
#include "f_op/f_op_actor.h"
#include "m_Do/m_Do_hostIO.h"
class J3DNode;
class daNpc_Bm1_c : public fopNpc_npc_c {
public:
@@ -33,7 +29,7 @@ public:
};
typedef s8 Type;
enum{
enum {
TYPE_Uninitialized_e,
TYPE_Quill_e,
TYPE_Akoot_e,
@@ -47,27 +43,27 @@ public:
TYPE_Kogoli_e,
TYPE_Invalid_e = 0xFF,
};
struct anm_prm_c{
s8 mAnmNum;
s8 mBtpNum;
f32 mMorf;
f32 mSpeed;
s32 mLoopMode;
BOOL mbHasArms;
struct anm_prm_c {
/* 0x00 */ s8 anmNum;
/* 0x01 */ s8 btpNum;
/* 0x04 */ f32 morf;
/* 0x08 */ f32 speed;
/* 0x0C */ int loopMode;
/* 0x10 */ BOOL hasArms;
};
typedef BOOL (daNpc_Bm1_c::*ActionFunc)(void*);
bool IamKakkuto() {return mSpecificType == SPECIFIC_TYPE_Akoot_e;}
bool IamSukketo() {return mSpecificType == SPECIFIC_TYPE_Skett_e;}
void clr_manzai() {mbManzai = false;}
bool getOdoroki() { return m880;}
s8 getStt() { return mStatus;}
u16 get_oldMsgStat() {return mOldMsgStat;}
void setFocus() {m882 = true;}
void setTelescopeDemo() {m881 = true;}
void set_manzai() {mbManzai = true;}
bool IamKakkuto() { return mSpecificType == SPECIFIC_TYPE_Akoot_e; }
bool IamSukketo() { return mSpecificType == SPECIFIC_TYPE_Skett_e; }
void clr_manzai() { mbManzai = false; }
bool getOdoroki() { return m880; }
s8 getStt() { return mStatus; }
u16 get_oldMsgStat() { return mOldMsgStat; }
void setFocus() { m882 = true; }
void setTelescopeDemo() { m881 = true; }
void set_manzai() { mbManzai = true; }
void nodeWngControl(J3DNode*, J3DModel*);
void nodeArmControl(J3DNode*, J3DModel*);
@@ -98,24 +94,24 @@ public:
bool setBtp(bool, int);
bool iniTexPttrnAnm(bool);
void plyTexPttrnAnm();
void setAnm_tex(signed char);
void setAnm_tex(s8);
BOOL setAnm_anm(anm_prm_c*);
void setAnm_NUM(int, int);
bool setAnm();
void setPlaySpd(float);
void chg_anmTag();
void control_anmTag();
void chg_anmAtr(unsigned char);
void chg_anmAtr(u8);
void control_anmAtr();
void setAnm_ATR(int);
void anmAtr(unsigned short);
void anmAtr(u16);
void eventOrder();
void checkOrder();
u8 chk_manzai();
bool chk_talk();
bool chk_partsNotMove();
BOOL lookBack();
u16 next_msgStatus(unsigned long*);
void lookBack();
u16 next_msgStatus(u32*);
s8 getBitMask();
u32 getMsg_PST_1();
u32 getMsg_PST_3();
@@ -178,9 +174,9 @@ public:
void endEvent();
BOOL isEventEntry();
void event_proc(int);
BOOL set_action(int (daNpc_Bm1_c::*)(void*), void*);
BOOL chk_action(int (daNpc_Bm1_c::*)(void*)); //Unused
void setStt(signed char);
BOOL set_action(ActionFunc, void*);
BOOL chk_action(ActionFunc); // Unused
void setStt(s8);
BOOL d_wait();
BOOL lookup();
BOOL orooro();
@@ -191,7 +187,7 @@ public:
BOOL wait_4();
BOOL flyawy();
BOOL wait_5();
BOOL wait_6(); //Unused
BOOL wait_6(); //Unused
BOOL h_wait();
BOOL wait_7();
BOOL wait_3();
@@ -240,7 +236,6 @@ private:
/* 0x6F0 */ J3DAnmTexPattern* m_hed_tex_pttrn;
/* 0x6F4 */ mDoExt_btpAnm mHeadBtpAnm;
/* 0x708 */ u8 mBlinkFrame;
/* 0x709 u8 pad709; */
/* 0x70A */ s16 mBlinkTimer;
/* 0x70C */ s16 pad70C;
/* 0x710 */ mDoExt_McaMorf* mpWingMorf;
@@ -248,7 +243,7 @@ private:
/* 0x715 */ s8 m_wngR1_jnt_num;
/* 0x716 */ s8 m_wngL3_jnt_num;
/* 0x717 */ s8 m_wngR3_jnt_num;
/* 0x718 */ u8 pad718[0x71C - 0x718]; //Possibly an unused mDoExt_McaMorf* ?
/* 0x718 */ u8 pad718[0x71C - 0x718]; //Possibly an unused mDoExt_McaMorf* ?
/* 0x71C */ mDoExt_McaMorf* mpArmMorf;
/* 0x720 */ s8 m_armL1_jnt_num;
/* 0x721 */ s8 m_armR1_jnt_num;
@@ -263,7 +258,6 @@ private:
/* 0x808 */ fpc_ProcID mPartnerProcID;
/* 0x80C */ cXyz mInitialPos;
/* 0x818 */ csXyz m818;
/* 0x81E u8 pad81E[0x820 - 0x81E]; */
/* 0x820 */ cXyz mEyePos;
/* 0x82C */ cXyz m82C;
/* 0x838 */ cXyz mTargetPos;
@@ -306,7 +300,7 @@ private:
/* 0x88C */ bool mbRanExecute;
/* 0x88D */ u8 m88D;
/* 0x88E */ u8 m88E;
/* 0x88F */ u8 m88F;
/* 0x88F */ u8 m88F;
/* 0x890 */ s32 mbSetEyePos;
/* 0x894 */ bool mbAttention;
/* 0x895 */ bool m895;
@@ -329,7 +323,7 @@ private:
/* 0x8EC */ JPABaseEmitter* mpFeather1EmitterL;
/* 0x8F0 */ JPABaseEmitter* mpFeather1EmitterR;
#if VERSION == VERSION_DEMO
/* 0x8F4 */ u32 mDemoUnused; //Possibly an unused emitter
/* 0x8F4 */ u8 mDemoUnused[4]; //Possibly an unused emitter
#endif
/* 0x8F4 */ s8 m8F4;
/* 0x8F5 */ s8 mActionIndex;
@@ -347,8 +341,7 @@ private:
/* 0x902 */ SpecificType mSpecificType;
/* 0x903 */ s8 mSpawnCondition;
/* 0x904 */ s8 m904;
/* 0x904 */ s8 m905;
};
STATIC_ASSERT(sizeof(daNpc_Bm1_c) == DEMO_SELECT(0x90C,0x908));
/* 0x904 */ s8 m905;
};
#endif /* D_A_NPC_BM1_H */
include/d/actor/d_a_npc_btsw2.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
static const char m_arc_name[];
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ u32 mShadowId;
/* 0x6D0 */ J3DModel* mpKabanModel; // Bag
include/d/actor/d_a_npc_fa1.h
+1 -1
View File
@@ -153,7 +153,7 @@ public:
int CreateHeap();
void setMtx();
public:
private:
/* 0x6C4 */ u8 m6C4[0x6CC - 0x6C4];
/* 0x6CC */ mDoExt_McaMorf* mpMorf;
/* 0x6D0 */ daNpc_Fa1_McaMorfCallBack1_c mMcaMorfCallback1;
include/d/actor/d_a_npc_hi1.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
BOOL bodyCreateHeap();
BOOL CreateHeap();
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ s8 m_hed_jnt_num;
/* 0x6CD */ s8 m_bbone_jnt_num;
include/d/actor/d_a_npc_ho.h
+1 -4
View File
@@ -114,7 +114,7 @@ public:
cPhs_State _create();
BOOL CreateHeap();
public:
private:
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ mDoExt_McaMorf* mpMorf;
/* 0x29C */ J3DModel* mpJoyPendentModel;
@@ -122,7 +122,6 @@ public:
/* 0x2A4 */ J3DAnmTexPattern* m_head_tex_pattern;
/* 0x2A8 */ mDoExt_btpAnm mBtpAnm;
/* 0x2BC */ u8 mBlinkFrame;
/* 0x2BD */ u8 field_0x2BD[0x2BE - 0x2BD];
/* 0x2BE */ s16 mBlinkTimer;
/* 0x2C0 */ dBgS_ObjAcch mObjAcch;
/* 0x484 */ dBgS_AcchCir mAcchCir;
@@ -142,7 +141,6 @@ public:
/* 0x68C */ u8 mMsgAnmIdx;
/* 0x68D */ u8 mAnmLoopCount;
/* 0x68E */ u8 mItemNum;
/* 0x68F */ u8 field_0x68F[0x690 - 0x68F];
/* 0x690 */ int mNextMessageId;
/* 0x694 */ f32 mCylCollisionRadius;
/* 0x698 */ ActionFunc mCurrActionFunc;
@@ -156,7 +154,6 @@ public:
/* 0x6AB */ s8 mTalkState;
/* 0x6AC */ u32 mtrlSndId;
/* 0x6B0 */ s8 mReverb;
/* 0x6B1 */ u8 field_0x6B1[0x6B4 - 0x6B1];
}; // Size: 0x6B4
#endif /* D_A_NPC_HO_H */
include/d/actor/d_a_npc_jb1.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
bool create_lgt();
BOOL CreateHeap();
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ s8 m_cse_jnt_num;
/* 0x6CD */ u8 field_0x6CD[0x6D0 - 0x6CD];
include/d/actor/d_a_npc_ls1.h
+1 -1
View File
@@ -184,7 +184,7 @@ public:
BOOL itemCreateHeap();
BOOL CreateHeap();
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ s8 m_hed_jnt_num;
/* 0x6CD */ s8 m_bbone_jnt_num;
include/d/actor/d_a_npc_people.h
+1 -1
View File
@@ -200,7 +200,7 @@ public:
cXyz getDirDistToPos(s16, f32);
void warp();
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhase;
/* 0x6CC */ request_of_phase_process_class mPhase2;
/* 0x6D4 */ J3DModel* mpHeadModel;
include/d/actor/d_a_npc_tc.h
+1 -1
View File
@@ -212,7 +212,7 @@ public:
void cutPayStart(int);
void cutPayProc(int);
public:
private:
/* 0x6C4 */ u8 field_0x6C4[0x6C8 - 0x6C4];
/* 0x6C8 */ BOOL field_0x6C8;
/* 0x6CC */ u8 mJtbtTimer;
include/d/actor/d_a_obj_doguu.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
int getFinishEventCount();
void setFinishMyEvent();
public:
private:
/* 0x6C4 */ request_of_phase_process_class mPhs;
/* 0x6CC */ J3DModel* field_0x6CC;
/* 0x6D0 */ J3DModel* field_0x6D0;
include/d/actor/d_a_tag_kk1.h
+1 -2
View File
@@ -2,7 +2,6 @@
#define D_A_TAG_KK1_H
#include "d/d_npc.h"
#include "m_Do/m_Do_hostIO.h"
class daTag_Kk1_c : public fopNpc_npc_c {
public:
@@ -12,7 +11,7 @@ public:
BOOL _delete();
cPhs_State _create();
public:
private:
/* 0x6C4 */ u8 padding_0x6C4;
/* 0x6C5 */ bool mTagSet;
/* 0x6C6 */ bool mNameIsWrong;
include/d/d_event.h
+8 -2
View File
@@ -130,7 +130,13 @@ public:
void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
void reset() { onEventFlag(8); }
BOOL runCheck() { return mMode != dEvtMode_NONE_e; }
BOOL runCheck() {
#if DEBUG
return mMode != dEvtMode_NONE_e || mDebugStb != 0;
#else
return mMode != dEvtMode_NONE_e;
#endif
}
u8 getMode() const { return mMode; }
void onHindFlag(u16 flag) { mHindFlag |= flag; }
@@ -158,7 +164,7 @@ public:
/* 0xDA */ u8 mEventEndSound;
/* 0xDB */ u8 field_0xdb;
/* 0xDC */ u8 field_0xdc;
/* 0xDD */ u8 field_0xdd;
/* 0xDD */ u8 mDebugStb;
/* 0xDE */ u8 field_0xde;
/* 0xDF */ u8 mEventInfoIdx;
/* 0xE0 */ u8 mTalkButton;
src/d/actor/d_a_bb.cpp
+30 -30
View File
@@ -2341,48 +2341,48 @@ static BOOL daBb_Execute(bb_class* i_this) {
break;
case 2: {
fopAc_ac_c* ac = fopAcM_SearchByID(i_this->unk_2E8);
if (ac != NULL) {
i_this->unk_2E4 = ac;
i_this->unk_2DF = 3;
}
fopAc_ac_c* ac = fopAcM_SearchByID(i_this->unk_2E8);
if (ac != NULL) {
i_this->unk_2E4 = ac;
i_this->unk_2DF = 3;
}
break;
}
case 3: {
fopAc_ac_c* ac = i_this->unk_2E4;
fopAc_ac_c* ac = i_this->unk_2E4;
sp10.x = (i_this->unk_A6C[1].x - i_this->unk_A6C[0].x) / 2.0f + i_this->unk_A6C[0].x;
sp10.y = (i_this->unk_A6C[1].y - i_this->unk_A6C[0].y) / 2.0f + i_this->unk_A6C[0].y;
sp10.z = (i_this->unk_A6C[1].z - i_this->unk_A6C[0].z) / 2.0f + i_this->unk_A6C[0].z;
sp10.x = (i_this->unk_A6C[1].x - i_this->unk_A6C[0].x) / 2.0f + i_this->unk_A6C[0].x;
sp10.y = (i_this->unk_A6C[1].y - i_this->unk_A6C[0].y) / 2.0f + i_this->unk_A6C[0].y;
sp10.z = (i_this->unk_A6C[1].z - i_this->unk_A6C[0].z) / 2.0f + i_this->unk_A6C[0].z;
ac->current.pos = sp10;
ac->current.angle = i_this->actor.current.angle;
ac->shape_angle = i_this->actor.current.angle;
ac->current.pos = sp10;
ac->current.angle = i_this->actor.current.angle;
ac->shape_angle = i_this->actor.current.angle;
if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) {
damagereaction* dr;
if (i_this->unk_2EC == fpcNm_MO2_e || i_this->unk_2EC == fpcNm_BK_e) {
damagereaction* dr;
if (i_this->unk_2EC == fpcNm_MO2_e) {
dr = &((mo2_class*)ac)->mDamageReaction;
dr->m468 = REG0_F(8) * 10.0f + -110.0f;
dr->m46C = REG0_F(9) * 10.0f + 10.0f;
} else if (i_this->unk_2EC == fpcNm_BK_e) {
dr = &((bk_class*)ac)->dr;
dr->m468 = REG0_F(8) * 10.0f + -100.0f;
dr->m46C = REG0_F(9) * 10.0f;
}
if (i_this->unk_2E0 != 0) {
i_this->unk_2DF = 0;
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
dr->mAction = 31;
ac->speedF = 40.0f;
}
if (i_this->unk_2EC == fpcNm_MO2_e) {
dr = &((mo2_class*)ac)->mDamageReaction;
dr->m468 = REG0_F(8) * 10.0f + -110.0f;
dr->m46C = REG0_F(9) * 10.0f + 10.0f;
} else if (i_this->unk_2EC == fpcNm_BK_e) {
dr = &((bk_class*)ac)->dr;
dr->m468 = REG0_F(8) * 10.0f + -100.0f;
dr->m46C = REG0_F(9) * 10.0f;
}
if (i_this->unk_2E0 != 0) {
i_this->unk_2DF = 0;
anm_init(i_this, dRes_INDEX_BB_BCK_FLY02_e, 12.0f, 2, 1.0f, dRes_INDEX_BB_BAS_FLY02_e);
dr->mAction = 31;
ac->speedF = 40.0f;
}
}
break;
}
}
}
src/d/actor/d_a_bgn.cpp
+9 -7
View File
@@ -2544,7 +2544,7 @@ static void hensin(bgn_class* i_this) {
i_this->mC728.y = REG0_F(2) + -1000.0f;
i_this->mC770 = REG0_S(0) + 0x14;
for (s32 i = 0; i < 8; i++) {
i_this->mAAA8[i].m2F8 = REG0_S(7) + 0x3c;
i_this->mAAA8[i].m2F8 = REG0_S(7) + 60;
i_this->mAAA8[i].m2F4 = REG0_F(15) + 6000.0f;
}
if (i_this->mC74A == 1) {
@@ -2592,7 +2592,7 @@ static void hensin(bgn_class* i_this) {
}
cLib_addCalc2(&i_this->mC728.y, REG0_F(9) + 1000.0f, 0.05f, actor->speed.y);
cLib_addCalc2(&actor->speed.y, 50.0f, 1.0f, 0.2f);
if (i_this->mC7AC[0] <= 0x64) {
if (i_this->mC7AC[0] <= 100) {
cLib_addCalc0(&i_this->mCC80, 1.0f, 0.02f);
if (i_this->mC7AC[0] == 100) {
mDoAud_seStart(JA_SE_CM_BGN_D_TO_T_1, NULL, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));
@@ -2811,6 +2811,7 @@ static void action_s(bgn_class* i_this, move_s* param_2, int param_3) {
param_2->m2E0.x = l_HIO.m0CE;
param_2->m2E0.y = l_HIO.m0D0;
param_2->m2E0.z = l_HIO.m0D2;
break;
}
}
if (param_2->m2D0 == 0) {
@@ -2867,7 +2868,7 @@ static void action_main(bgn_class* i_this) {
pcVar5 = i_this->mRedRopeMat.getSize(0);
for (s32 i = 0; i < 60; i++, pcVar7++, pcVar5++) {
dVar9 = i_this->mC774 * cM_ssin(cM_rad2s(0.053247336f * (f32)(i)));
dVar9 *= (0.01666667f * (f32)(0x3B - i));
dVar9 *= (0.01666667f * (f32)(59 - i));
local_90.x = dVar9 * cM_ssin(i_this->mC746 * (REG0_S(3) + 300) + i * (REG0_S(4) + 2000));
local_90.z = dVar9 * cM_ssin(i_this->mC746 * (REG0_S(5) + 0xfa) + i * (REG0_S(6) + 2000));
*pcVar7 = local_9c + local_90;
@@ -2908,6 +2909,7 @@ static void action_main(bgn_class* i_this) {
case 10:
i_this->mC754 = 1;
i_this->mCC80 = 1.0f;
break;
}
if (i_this->mC748 > 0) {
cLib_addCalcAngleS2(&i_this->mC750, 0, 10, 0x200);
@@ -3516,16 +3518,16 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mRedRopeMat.init(1, 0x3C, pBti, 1)) {
if (!i_this->mRedRopeMat.init(1, 60, pBti, 1)) {
return FALSE;
}
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_HIMO_e);
if (!i_this->mBlueRopeMat.init(8, 0x3C, pBti, 1)) {
if (!i_this->mBlueRopeMat.init(8, 60, pBti, 1)) {
return FALSE;
}
#if VERSION > VERSION_DEMO
pBti = (ResTIMG*)dComIfG_getObjectRes("Bgn", dRes_INDEX_BGN_BTI_NOT_CUT1_e);
if (!i_this->mDefeatCSRopeMat.init(1, 0x3C, pBti, 1)) {
if (!i_this->mDefeatCSRopeMat.init(1, 60, pBti, 1)) {
return FALSE;
}
#endif
@@ -3709,7 +3711,7 @@ static cPhs_State daBgn_Create(fopAc_ac_c* a_this) {
}
i_this->mCC80 = 1.0f;
i_this->mC748 = 7;
i_this->mC7AC[0] = 0x3c;
i_this->mC7AC[0] = 60;
#if VERSION > VERSION_DEMO
bg_tevstr = a_this->tevStr;
i_this->mWaterTevStr = a_this->tevStr;
src/d/actor/d_a_bk.cpp
-1
View File
@@ -1864,7 +1864,6 @@ static void fight_run(bk_class* i_this) {
}
break;
}
}
if (i_this->mPlayerDistance < l_bkHIO.m030) {
src/d/actor/d_a_bmdfoot.cpp
+1
View File
@@ -575,6 +575,7 @@ void move(bmdfoot_class* i_this) {
break;
case 0xb:
end(i_this);
break;
}
if (boss->m332 == 3) {
housi_off(i_this);
src/d/actor/d_a_boko.cpp
+2 -2
View File
@@ -174,13 +174,13 @@ BOOL daBoko_c::draw() {
if (checkNoDraw()) {
if (mParticleCallBack.getEmitter() != NULL) {
mParticleCallBack.getEmitter()->setStatus(4);
mParticleCallBack.getEmitter()->stopDrawParticle();
}
return TRUE;
}
if (mParticleCallBack.getEmitter() != NULL) {
mParticleCallBack.getEmitter()->clearStatus(4);
mParticleCallBack.getEmitter()->playDrawParticle();
}
if (mFlameTimer != 0) {
src/d/actor/d_a_bomb2.cpp
+3 -3
View File
@@ -783,15 +783,15 @@ namespace daBomb2 {
}
void Act_c::se_explode() {
fopAcM_seStart(this, JA_SE_OBJ_BOMB_EXPLODE, 0);
fopAcM_seStart(this, JA_SE_OBJ_BOMB_EXPLODE, 0);
}
void Act_c::se_explode_water() {
fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0);
fopAcM_seStart(this, JA_SE_OBJ_BOMB_WATER, 0);
}
void Act_c::se_ignition() {
fopAcM_seStart(this, JA_SE_OBJ_BOMB_IGNITION, 0);
fopAcM_seStart(this, JA_SE_OBJ_BOMB_IGNITION, 0);
}
void Act_c::set_sound_env(int param_1, int param_2) {
src/d/actor/d_a_bst.cpp
-2
View File
@@ -1080,7 +1080,6 @@ static void damage(bst_class* i_this) {
/* 00003DD8-00003EC4 .text bom_eat_check__FP9bst_class */
static BOOL bom_eat_check(bst_class* i_this) {
if (i_this->mHandHurtCyl.ChkCoHit()) {
cCcD_Obj* hit_obj = i_this->mHandHurtCyl.GetCoHitObj();
if (hit_obj != NULL) {
fopAc_ac_c* hit_actor = (fopAc_ac_c*)hit_obj->GetAc();
@@ -1496,7 +1495,6 @@ static void damage_check(bst_class* i_this) {
if (i_this->mHandHurtCyl.ChkTgHit()) {
i_this->mState = 10;
if (player_way_check(i_this)) {
atInfo.mpObj = i_this->mHandHurtCyl.GetTgHitObj();
atInfo.pParticlePos = i_this->mHandHurtCyl.GetTgHitPosP();
atInfo.mpActor = cc_at_check(actor, &atInfo);
src/d/actor/d_a_coming2.cpp
+18 -18
View File
@@ -291,8 +291,8 @@ BOOL daComing2::Act_c::request_all_flag_exit() {
daObjBarrel2::Act_c* buoy;
if (buoyProc != fpcM_ERROR_PROCESS_ID_e && fopAcM_SearchByID(buoyProc, (fopAc_ac_c**)&buoy) != NULL && buoy != NULL) {
buoy->exit_req();
mStartBuoy[i].unk_00 = fpcM_ERROR_PROCESS_ID_e;
buoy->exit_req();
mStartBuoy[i].unk_00 = fpcM_ERROR_PROCESS_ID_e;
}
}
@@ -309,28 +309,28 @@ void daComing2::Act_c::barrel_execute(int idx) {
if (barrelProc != fpcM_ERROR_PROCESS_ID_e) {
if ((BOOL)fopAcM_SearchByID(barrelProc, (fopAc_ac_c**)&barrel) == TRUE) {
if (barrel != NULL) {
if (barrel != NULL) {
mBarrelInfo[idx].unk_06 = barrel->chk_item_give();
}
}
if (mBarrelInfo[idx].unk_04 == 0) {
request_barrel_exitN(idx);
} else if (mBarrelInfo[idx].unk_04 > 0) {
mBarrelInfo[idx].unk_04--;
}
if (mBarrelInfo[idx].unk_04 == 0) {
request_barrel_exitN(idx);
} else if (mBarrelInfo[idx].unk_04 > 0) {
mBarrelInfo[idx].unk_04--;
}
} else if (mBarrelInfo[idx].unk_06 == 0) {
init_barrelN_info(idx);
coming_process_init(0);
init_barrelN_info(idx);
coming_process_init(0);
}
if (mBarrelInfo[idx].unk_06 == 1) {
if (unk_2A4 >= 15u) {
coming_process_init(0);
} else {
request_barrel_exitN(idx);
init_barrelN_info(idx);
unk_29A = 1;
}
if (unk_2A4 >= 15u) {
coming_process_init(0);
} else {
request_barrel_exitN(idx);
init_barrelN_info(idx);
unk_29A = 1;
}
}
}
}
src/d/actor/d_a_fganon.cpp
+2 -1
View File
@@ -1102,7 +1102,6 @@ void standby(fganon_class* i_this) {
}
}
}
}
/* 00004DB4-00005128 .text start__FP12fganon_class */
@@ -2008,6 +2007,7 @@ void demo_camera(fganon_class* i_this) {
if (DEMO_SELECT(REG17_S(3), REG0_S(3)) == 0) {
dComIfGs_onSwitch(i_this->mSwitchNo, fopAcM_GetRoomNo(a_this));
}
// Fall-through
}
case 150: {
case_150:
@@ -2016,6 +2016,7 @@ void demo_camera(fganon_class* i_this) {
dMeter_mtrShow();
dComIfGp_event_reset();
i_this->mB54 = 0;
break;
}
}
if (i_this->mB54 && bVar3) {
src/d/actor/d_a_fm.cpp
+12 -48
View File
@@ -365,7 +365,6 @@ BOOL daFm_c::_createHeap() {
/* 00000718-0000086C .text holeCreateHeap__6daFm_cFv */
bool daFm_c::holeCreateHeap() {
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(m_arc_name, dRes_INDEX_FM_BDL_YPIT00_e));
JUT_ASSERT(0x2C7, modelData != NULL);
@@ -516,7 +515,6 @@ bool daFm_c::jntHitCreateHeap() {
/* mRadius */ 4.0f,
/* mpOffsets */ yubi_cyl_offset,
},
};
mpJntHit = JntHit_create(mpMorf->getModel(), search_data, ARRAY_SIZE(search_data));
if (mpJntHit) {
@@ -582,17 +580,16 @@ fopAc_ac_c* daFm_c::searchNearOtherActor(fopAc_ac_c* i_actor) {
if(dist2 < l_HIO.field_0x0E8) {
if(dist3 > REG12_F(0) + 80.0f || fopAcM_GetID(i_actor) == pLink->getGrabActorID()) {
switch(((daTsubo::Act_c*)i_actor)->prm_get_type()) {
case 0:
case 1:
case 2:
case 4:
case 5:
case 6:
mpActorTarget = i_actor;
return i_actor;
}
switch(((daTsubo::Act_c*)i_actor)->prm_get_type()) {
case 0:
case 1:
case 2:
case 4:
case 5:
case 6:
mpActorTarget = i_actor;
return i_actor;
}
}
}
}
@@ -646,9 +643,8 @@ void daFm_c::moveRndBack() {
field_0x648 = l_HIO.field_0x0A0;
}
}
}
if(field_0xAE4 != 0 && !mObjAcch.ChkWallHit()) {
cLib_addCalcPosXZ2(&current.pos, field_0x660, 0.1f, l_HIO.field_0x0B0);
}
@@ -734,7 +730,6 @@ void daFm_c::bodySetMtx() {
mDoMtx_stack_c::YrotM(shape_angle.y);
mDoMtx_stack_c::transM(field_0x610);
pModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 00001864-00001920 .text holeSetMtx__6daFm_cFv */
@@ -745,7 +740,6 @@ void daFm_c::holeSetMtx() {
mDoMtx_stack_c::YrotM(current.angle.y);
mDoMtx_stack_c::transM(l_HIO.field_0x020);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 00001920-00001A50 .text setCollision__6daFm_cFv */
@@ -773,7 +767,6 @@ void daFm_c::setAttention() {
if(field_0x2E4 != 0) {
attention_info.position = current.pos;
eyePos = current.pos;
} else {
if(mMode == 0xe || mMode == 0x10 || mMode == 0xf || (mMode == 0 || mMode == 0x11)) {
attention_info.position = current.pos;
@@ -910,7 +903,6 @@ bool daFm_c::checkTgHit() {
mHitType = 0xD;
temp = false;
break;
}
CcAtInfo atInfo;
atInfo.pParticlePos = NULL;
@@ -992,7 +984,6 @@ cXyz daFm_c::getOffsetPos() {
if(isLink(mpActorTarget)) {
offset.set(0.0f, -10.0f, 0.0f);
} else {
s16 procName = fopAcM_GetName(mpActorTarget);
if(procName == fpcNm_NPC_CB1_e) {
if(fopAcM_checkCarryNow(mpActorTarget)) {
@@ -1000,19 +991,15 @@ cXyz daFm_c::getOffsetPos() {
} else {
offset.set(0.0f, 80.0f, 0.0f);
}
} else if(procName == fpcNm_NPC_MD_e) {
if(fopAcM_checkCarryNow(mpActorTarget)) {
offset.set(0.0f, 20.0f, 0.0f);
} else {
offset.set(0.0f, 140.0f, 0.0f);
}
} else if(procName == fpcNm_BOMB_e) {
offset.set(0.0f, 80.0f, 0.0f);
} else if(procName == fpcNm_TSUBO_e) {
switch(((daTsubo::Act_c*)mpActorTarget)->prm_get_type()) {
case 5:
case 0:
@@ -1307,7 +1294,6 @@ void daFm_c::modePathMove() {
if(isGrabFoot() && !dComIfGp_event_runCheck()) {
modeProc(PROC_INIT_e,0xf);
} else {
dLib_pathMove(&field_0x3B0, &field_0x3BC, mpPath, 3.0f, pathMove_CB, this);
cLib_addCalcPosXZ2(&current.pos, field_0x3B0, (l_HIO.field_0x0D0 + 1.0f) * 0.005f * field_0x394, 20.0f);
@@ -1326,7 +1312,6 @@ void daFm_c::modeGoalKeeperInit() {
/* 000036B4-000038DC .text modeGoalKeeper__6daFm_cFv */
void daFm_c::modeGoalKeeper() {
if(field_0x2E5 && dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) {
modeProc(PROC_INIT_e,6);
return;
@@ -1491,7 +1476,7 @@ void daFm_c::modeWait() {
}
}
if(field_0x2D0 == 2 && (mBaseTarget->current.pos - field_0x69C).absXZ() > field_0x2E0) {
modeProc(PROC_INIT_e, 6);
modeProc(PROC_INIT_e, 6);
} else {
moveRndBack();
}
@@ -1552,7 +1537,6 @@ void daFm_c::modeAttack() {
f32 oldGrabPosY = mGrabPos.y;
mGrabPos = daPy_getPlayerLinkActorClass()->current.pos;
mGrabPos.y = oldGrabPosY;
} else {
if (isGrabPos()) {
setGrabPos();
@@ -1613,7 +1597,6 @@ void daFm_c::modeAttack() {
!dComIfGp_event_runCheck()) {
modeProcInit(0x10);
} else {
modeProcInit(0xD);
}
}
@@ -1646,7 +1629,6 @@ void daFm_c::modeAttack() {
}
}
}
}
} else if (isLink(mpActorTarget) && mAnmPrmIdx == 4) {
dist = (mGrabPos - field_0x63C).absXZ();
@@ -1663,7 +1645,6 @@ void daFm_c::modeAttack() {
f32 temp5 = l_HIO.field_0x118 * (std::fabsf(dist - l_HIO.field_0x110) / dist3);
pLink->setOutPower(temp5, targetAngle, 0);
}
} else if (mpMorf->isStop() && cLib_calcTimer(&field_0x650) == 0) {
setAnm(5, false);
}
@@ -1925,7 +1906,6 @@ void daFm_c::modeGrab() {
if (cLib_distanceAngleS(shape_angle.y, angle) > l_HIO.field_0x09A) {
cLib_addCalcAngleS2(&shape_angle.y, angle, 4, l_HIO.field_0x096);
}
} else {
dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
if (field_0x2D0 == 2 && isNpc(mpActorTarget) && dist < l_HIO.field_0x0C4) {
@@ -1951,8 +1931,6 @@ void daFm_c::modeGrab() {
modeProcInit(0xE);
field_0x684 = 1;
} else {
// temp.absXZ() matches offsets but cant store mGrabPos - field_0x63C in temp first
// dist = temp.absXZ();
dist = (mGrabPos - field_0x63C).absXZ();
if (dist > l_HIO.field_0x110 && dist < l_HIO.field_0x114) {
daPy_lk_c* pLink = (daPy_lk_c*)daPy_getPlayerLinkActorClass();
@@ -1963,7 +1941,6 @@ void daFm_c::modeGrab() {
}
f32 temp5 = l_HIO.field_0x118 * (std::fabsf(dist - l_HIO.field_0x110) / temp4);
pLink->setOutPower(temp5, angle, 0);
} else {
if (!isGrab()) {
setAnm(5, false);
@@ -1975,7 +1952,6 @@ void daFm_c::modeGrab() {
}
}
}
} else {
if (isNpc(mpActorTarget) == true) {
mGrabPos = field_0x61C;
@@ -1983,7 +1959,6 @@ void daFm_c::modeGrab() {
if (!isLinkControl()) {
modeProcInit(0x10);
}
} else {
dist = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
if (dist < l_HIO.field_0x0B4 && field_0x2D0 == 2) {
@@ -2001,7 +1976,6 @@ void daFm_c::modeGrab() {
} else if (field_0x2DC == 1) {
modeProcInit(9);
}
}
} else {
s16 procName = fopAcM_GetName(mpActorTarget);
@@ -2189,7 +2163,6 @@ void daFm_c::modeGrabNpcDemo() {
setAnm(12, false);
if(mpMorf->isStop()) {
dComIfGp_evmng_cutEnd(staffIdx);
}
} else {
dComIfGp_evmng_cutEnd(staffIdx);
@@ -2228,7 +2201,6 @@ void daFm_c::modePlayerStartDemo() {
char* cutName = dComIfGp_getPEvtManager()->getMyNowCutName(staffIdx);
daPy_py_c* pLink = (daPy_py_c*)dComIfGp_getLinkPlayer();
pLink->changeOriginalDemo();
@@ -2238,7 +2210,6 @@ void daFm_c::modePlayerStartDemo() {
pLink->setPlayerPosAndAngle(&pos, &pLink->shape_angle);
pLink->onPlayerNoDraw();
dComIfGp_evmng_cutEnd(staffIdx);
} else if(strcmp(cutName, "OPEN") == 0) {
cXyz pos2 = current.pos;
pos2.y -= REG12_F(2);
@@ -2247,7 +2218,6 @@ void daFm_c::modePlayerStartDemo() {
if(setHoleScale(l_HIO.field_0x124, 0.1f, l_HIO.field_0x128)) {
dComIfGp_evmng_cutEnd(staffIdx);
}
} else if(strcmp(cutName, "PL_OUT") == 0) {
pLink->offPlayerNoDraw();
pLink->setThrowDamage(
@@ -2258,13 +2228,11 @@ void daFm_c::modePlayerStartDemo() {
0
);
dComIfGp_evmng_cutEnd(staffIdx);
} else if(strcmp(cutName, "CLOSE") == 0) {
pLink->offPlayerNoDraw();
if(setHoleScale(l_HIO.field_0x120, 0.1f, l_HIO.field_0x128)) {
dComIfGp_evmng_cutEnd(staffIdx);
}
} else if(strcmp(cutName, "DELETE") == 0) {
modeProc(PROC_INIT_e, 0x12);
}
@@ -2962,7 +2930,6 @@ bool daFm_c::areaCheck() {
if(!lineCheck(&temp2, &field_0xA48[i])) {
field_0xAD8[i] = false;
ret = false;
} else {
field_0xAD8[i] = true;
}
@@ -3091,7 +3058,6 @@ bool daFm_c::_execute() {
case 3:
grabTsubo();
break;
}
}
field_0x660.y = current.pos.y;
@@ -3197,7 +3163,6 @@ void daFm_c::debugDraw() {
temp5.y += 20.0f;
temp6.y += 20.0f;
}
if (l_HIO.field_0x009) {
@@ -3366,7 +3331,6 @@ void daFm_c::createInit() {
case FM_JNT_TE_e:
modelData->getJointNodePointer(i)->setCallBack(nodeControl_CB);
break;
}
}
src/d/actor/d_a_ki.cpp
-1
View File
@@ -922,7 +922,6 @@ void ki_path_move(ki_class* i_this) {
}
}
break;
}
i_this->mPosMoveTarget = l_kiHIO.m28;
src/d/actor/d_a_knob00.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ BOOL daKnob00_c::openProc(int arg1) {
} else if (mBckAnm.checkFrame(25.0f)) {
fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_OPEN, 0);
} else if (mBckAnm.checkFrame(49.0f)) {
fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_1, 0);
fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_1, 0);
} else if (mBckAnm.checkFrame(64.0f) && arg1 == 0xf) {
fopAcM_seStart(this, JA_SE_OBJ_DOOR_N_CLOSE_2, 0);
}
src/d/actor/d_a_kokiie.cpp
-1
View File
@@ -385,7 +385,6 @@ static cPhs_State daKokiie_Create(fopAc_ac_c* a_this) {
}
#endif
{
i_this->m2A0 = fopAcM_GetParam(a_this);
if (i_this->m2A0 == 0xff) {
i_this->m2A0 = 0;
src/d/actor/d_a_mo2.cpp
+1
View File
@@ -3238,6 +3238,7 @@ static u8 damage_check(mo2_class* i_this) {
tex_anm_set(i_this, 4);
i_this->mDamageReaction.m424 |= 0x10;
i_this->mDamageReaction.m428 = 26.0f;
break;
}
if (i_this->mDamageReaction.m424 != 0) {
local_54.x = 0.0f;
src/d/actor/d_a_movie_player.cpp
+46 -46
View File
@@ -1646,20 +1646,20 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block)
// clang-format off
#ifdef __MWERKS__
asm {
lwz cnt,info->cnt;
subfic code,cnt,33;
lwz cb,info->currByte;
lwz cnt,info->cnt;
subfic code,cnt,33;
lwz cb,info->currByte;
subfc. tmp, code, t;
subi cnt1,cnt,1;
subfc. tmp, code, t;
subi cnt1,cnt,1;
bgt _notEnoughBitsDIFF;
add v,cnt,t;
bgt _notEnoughBitsDIFF;
add v,cnt,t;
slw cnt,cb,cnt1;
stw v,info->cnt;
subfic v,t,32;
srw diff,cnt,v;
slw cnt,cb,cnt1;
stw v,info->cnt;
subfic v,t,32;
srw diff,cnt,v;
}
#endif
// clang-format on
@@ -1894,22 +1894,22 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block)
// clang-format off
#ifdef __MWERKS__
asm {
li cnt, sizeof(s32)*5;
add maxcodebase, maxcodebase, cnt;
li cnt, sizeof(s32)*5;
add maxcodebase, maxcodebase, cnt;
slwi tmp, code, 32-5;
li cnt,5;
rlwimi tmp, cb, 32-1, 1,31;
slwi tmp, code, 32-5;
li cnt,5;
rlwimi tmp, cb, 32-1, 1,31;
__DR4_WHILE_START:
__DR4_WHILE_START:
subfic ssss, cnt, 31;
lwzu tmp2, 4(maxcodebase);
srw code, tmp, ssss;
__DR4_WHILE_CHECK:
cmpw code, tmp2
addi cnt, cnt, 1
bgt __DR4_WHILE_START;
subfic ssss, cnt, 31;
lwzu tmp2, 4(maxcodebase);
srw code, tmp, ssss;
__DR4_WHILE_CHECK:
cmpw code, tmp2
addi cnt, cnt, 1
bgt __DR4_WHILE_START;
}
#endif
@@ -1930,31 +1930,31 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block)
// clang-format off
#ifdef __MWERKS__
asm {
lwz tmp, info->c;
subfic tmp2, cnt, 33;
addi tmp3, tmp2, 1;
slwi tmp2, tmp2, 2;
lwzu cb, 4(tmp);
add mask,mask, tmp2;
stw tmp, info->c;
slwi code, code, 1;
rlwimi code, cb, 1, 31, 31;
lwzu tmp2, 4(mask);
li cnt, 2;
b __FCNB1_WHILE_CHECK;
lwz tmp, info->c;
subfic tmp2, cnt, 33;
addi tmp3, tmp2, 1;
slwi tmp2, tmp2, 2;
lwzu cb, 4(tmp);
add mask,mask, tmp2;
stw tmp, info->c;
slwi code, code, 1;
rlwimi code, cb, 1, 31, 31;
lwzu tmp2, 4(mask);
li cnt, 2;
b __FCNB1_WHILE_CHECK;
__FCNB1_WHILE_START:
slwi code, code, 1;
__FCNB1_WHILE_START:
slwi code, code, 1;
addi tmp3, tmp3, 1;
lwzu tmp2, 4(mask);
add code, code, rrrr;
addi cnt, cnt, 1;
addi tmp3, tmp3, 1;
lwzu tmp2, 4(mask);
add code, code, rrrr;
addi cnt, cnt, 1;
__FCNB1_WHILE_CHECK:
cmpw code, tmp2;
rlwnm rrrr, cb, cnt, 31, 31;
bgt __FCNB1_WHILE_START;
__FCNB1_WHILE_CHECK:
cmpw code, tmp2;
rlwnm rrrr, cb, cnt, 31, 31;
bgt __FCNB1_WHILE_START;
}
#endif
src/d/actor/d_a_npc_bm1.cpp
+1473 -1539
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_npc_bs1.cpp
+3 -3
View File
@@ -1208,12 +1208,12 @@ void daNpc_Bs1_c::talkInit() {
BOOL daNpc_Bs1_c::shopMsgCheck(u32 msgNo) {
if(mType == 0) {
if((0xF42 <= msgNo && msgNo <= 0xF54) || (0xF67 <= msgNo && msgNo <= 0xF6E) || (0xF63 <= msgNo && msgNo <= 0xF66) || msgNo == 0xF3E) {
return true;
return true;
}
}
else {
if((0x2F4A <= msgNo && msgNo <= 0x2F53) || (0x2F6B <= msgNo && msgNo <= 0x2F78) || msgNo == 0x2F47) {
return true;
return true;
}
}
@@ -1267,7 +1267,7 @@ BOOL daNpc_Bs1_c::shopStickMoveMsgCheck(u32 msgNo) {
}
else {
if((0x2F4A <= msgNo && msgNo <= 0x2F4C) || ((0x2F72 <= msgNo && msgNo <= 0x2F76) && !(msgNo & 1)) || msgNo == 0x2F78 || msgNo == 0x2F6B || msgNo == 0x2F47) {
return true;
return true;
}
}
src/d/actor/d_a_npc_hi1.cpp
-1
View File
@@ -884,7 +884,6 @@ BOOL daNpc_Hi1_c::_delete() {
/* 00001F30-0000205C .text _create__11daNpc_Hi1_cFv */
cPhs_State daNpc_Hi1_c::_create() {
static int a_siz_tbl[] = {
0,
0
src/d/actor/d_a_npc_ho.cpp
+3 -6
View File
@@ -46,7 +46,6 @@ static BOOL nodeCallBack_Ho(J3DNode* node, int calcTiming) {
MtxPosition(&temp, &temp2);
i_this->setEyePos(temp2);
i_this->incAttnSetCount();
} else if (jntNo == i_this->getBackboneJntNum()) {
cMtx_XrotM(*calc_mtx, (s16)i_this->getBackbone_y());
}
@@ -294,7 +293,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) {
receivePendant(1);
break;
case 0x273E:
if (dComIfGs_getBeastNum(7) >= 0x14) {
if (dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e) >= 20) {
*pMsgNo = 0x2741;
} else {
*pMsgNo = 0x273F;
@@ -324,7 +323,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) {
break;
case 0x274D:
*pMsgNo = 0x274E;
receivePendant(dComIfGs_getBeastNum(7));
receivePendant(dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e));
break;
case 0x274E:
if (dComIfGs_getEventReg(dSv_event_flag_c::UNK_C0FF) >= 0x28 && !dComIfGs_isEventBit(dSv_event_flag_c::UNK_1C04)) {
@@ -335,7 +334,7 @@ u16 daNpc_Ho_c::next_msgStatus(u32* pMsgNo) {
break;
case 0x2754: {
*pMsgNo = 0x2755;
int numPendantsGiven = dComIfGs_getBeastNum(7);
int numPendantsGiven = dComIfGs_getBeastNum(dBeastIdx_JOY_PENDANT_e);
receivePendant(numPendantsGiven);
if (numPendantsGiven < 3) {
mItemNum = dItemNo_RED_RUPEE_e;
@@ -632,7 +631,6 @@ bool daNpc_Ho_c::talk01() {
mState = HO_STATE_PREACH;
fopAcM_orderChangeEvent(dComIfGp_getLinkPlayer(), this, "HO_PREACH", 0, 0xFFFF);
clrFlag(HO_FLAG_00000020);
} else {
mState = mPrevState;
setAnmStatus();
@@ -822,7 +820,6 @@ BOOL daNpc_Ho_c::_execute() {
setAnm(0);
}
break;
}
}
checkOrder();
src/d/actor/d_a_npc_ji1.cpp
+1
View File
@@ -1738,6 +1738,7 @@ u32 daNpc_Ji1_c::evn_sound_proc_init(int staffIdx) {
break;
case 3:
dComIfGp_getVibration().StartShock(5, -0x11, cXyz(0.0f, 1.0f, 0.0f));
break;
}
}
src/d/actor/d_a_npc_km1.cpp
-9
View File
@@ -107,7 +107,6 @@ bool daNpc_Km1_c::createInit() {
field_0x7BC = 1;
setMtx();
return true;
}
/* 0000043C-0000054C .text setMtx__11daNpc_Km1_cFv */
@@ -184,13 +183,11 @@ bool daNpc_Km1_c::init_btp(bool param_1, int param_2) {
/* 00000850-00000894 .text initTexPatternAnm__11daNpc_Km1_cFb */
bool daNpc_Km1_c::initTexPatternAnm(bool param_1) {
bool var_31 = false;
if(init_btp(param_1,field_0x7CD)){
var_31 = true;
}
return var_31;
}
/* 00000894-00000958 .text playTexPatternAnm__11daNpc_Km1_cFv */
@@ -211,7 +208,6 @@ void daNpc_Km1_c::playTexPatternAnm() {
if(field_0x7CD){
mBtpFrame = m_head_tex_pattern->getFrameMax();
return;
}else{
mBtpFrame = 0;
field_0x6F2 = cM_rndF(60.0) + 30.0f;
@@ -290,7 +286,6 @@ void daNpc_Km1_c::setAnm_ATR(int param_1) {
setAnm_tex(a_anm_prm_tbl[field_0x7CB].field_0x1);
}
setAnm_anm((&a_anm_prm_tbl[field_0x7CB]));
}
/* 00000B50-00000C0C .text anmAtr__11daNpc_Km1_cFUs */
@@ -493,7 +488,6 @@ void daNpc_Km1_c::privateCut() {
if(bVar1){
dComIfGp_evmng_cutEnd(staffIdx);
}
}
}
@@ -501,7 +495,6 @@ void daNpc_Km1_c::privateCut() {
void daNpc_Km1_c::endEvent() {
dComIfGp_event_reset();
field_0x7CB = 0xFF;
}
/* 00001164-000011C4 .text event_proc__11daNpc_Km1_cFv */
@@ -694,7 +687,6 @@ BOOL daNpc_Km1_c::_delete() {
}
}
return true;
}
/* 0000188C-000018AC .text CheckCreateHeap__FP10fopAc_ac_c */
@@ -739,7 +731,6 @@ cPhs_State daNpc_Km1_c::_create() {
resLoadResult = cPhs_ERROR_e;
}
return resLoadResult;
}
/* 00001E4C-00002158 .text CreateHeap__11daNpc_Km1_cFv */
src/d/actor/d_a_npc_mt.cpp
+3 -1
View File
@@ -966,7 +966,7 @@ u32 daNpcMt_c::getMsg() {
}
}
else if (dComIfGp_event_chkTalkXY()) {
} else if(dComIfGs_isEventBit(dSv_event_flag_c::UNK_3080)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_4080) == 0) {
if(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3A01)) {
@@ -1075,6 +1075,7 @@ void daNpcMt_c::setAnmFromMsgTag() {
break;
case 6:
setAnmTbl(l_npc_anm_tukuru);
break;
}
dComIfGp_setMesgAnimeAttrInfo(0xff);
}
@@ -1411,6 +1412,7 @@ u8 daNpcMt_c::changePhotoNo(u8 photoNo) {
break;
case DSNAP_TYPE_UNK06:
photoNo = DSNAP_TYPE_NPC_UB4;
break;
}
return photoNo;
}
src/d/actor/d_a_npc_people.cpp
-1
View File
@@ -6086,7 +6086,6 @@ void daNpcPeople_c::eventUb1TalkInit(int) {
if(!is1GetMap20()) {
m73C = l_msg_ub1_no_collect_map20;
dComIfGs_onEventBit(dSv_event_flag_c::UNK_2102);
}
else if(!is1DayGetMap20()) {
m73C = l_msg_ub1_collect_map20;
src/d/actor/d_a_npc_photo.cpp
+1 -8
View File
@@ -968,7 +968,6 @@ void daNpcPhoto_c::executeWait() {
if(pActor && fopAcM_GetProfName(pActor) == fpcNm_PLAYER_e) {
field_0x9BE = 2;
}
}
} else if(field_0x9C1 == 4 && ((field_0x9C6 & 0x10) == 0)){
daPy_py_c* link = (daPy_py_c*)dComIfGp_getLinkPlayer();
@@ -1028,13 +1027,11 @@ void daNpcPhoto_c::executeTalk() {
field_0x9C6 = temp & 254;
mItemNo = 31;
field_0x9BE = 4;
} else {
if((temp & 2) != 0){
field_0x9C6 = temp & ~0x02;
mItemNo = 38;
field_0x9BE = 5;
} else {
if((temp & 4) != 0){
field_0x9C6 = temp & ~0x04;
@@ -1085,7 +1082,6 @@ void daNpcPhoto_c::executeWalk() {
if (point2.y - point.y > 400.0f) {
field_0x984 = l_npc_dat.field_0x3C * l_npc_dat.field_0x40;
}
} else{
executeSetMode(0);
field_0x9C1 = 2;
@@ -1324,7 +1320,6 @@ void daNpcPhoto_c::eventMesSetInit(int i_staffId) {
field_0x980 = l_msg_1st_talk_photo;
field_0x9D0 = NULL;
dComIfGs_onEventBit(l_save_dat.field_0x04);
} else {
int temp = 0;
daTagPhoto_c* ac = (daTagPhoto_c*)dComIfGp_event_getPt2();
@@ -1781,7 +1776,6 @@ u32 daNpcPhoto_c::getMsg() {
if(dComIfGs_isTmpBit(dSv_event_tmp_flag_c::UNK_0302)) {
field_0x980 = l_msg_get_photo;
field_0x9D0 = 0;
} else {
if(isPhotoDxOk()) {
dComIfGs_onTmpBit(dSv_event_tmp_flag_c::UNK_0302);
@@ -1798,7 +1792,6 @@ u32 daNpcPhoto_c::getMsg() {
field_0x9D0 = (u8*)l_msg_color_c;
}
}
}
} else {
eventReg = dComIfGs_getEventReg(l_save_dat.field_0x06);
@@ -1902,6 +1895,7 @@ void daNpcPhoto_c::setAnmFromMsgTag() {
case 9:
setAnmTbl(l_npc_anm_spit);
field_0x9C9 &= 0x7f;
break;
}
dComIfGp_setMesgAnimeAttrInfo(0xFF);
}
@@ -1938,7 +1932,6 @@ void daNpcPhoto_c::chkAttention() {
if (!field_0x9BD) {
field_0x9BD = true;
}
} else {
fopAc_ac_c* link = dComIfGp_getLinkPlayer();
f32 temp = l_npc_dat.field_0x2C;
src/d/actor/d_a_npc_tc.cpp
-6
View File
@@ -1117,7 +1117,6 @@ void daNpc_Tc_c::lookBack() {
dstPos = &temp6;
temp3.set(current.pos);
temp3.y = eyePos.y;
} else if (mHasAttention){
temp6 = dNpc_playerEyePos(l_HIO.mNpc.m04);
dstPos = &temp6;
@@ -1232,7 +1231,6 @@ void daNpc_Tc_c::statusWalkToJail() {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B40);
mHasTalkedNearJail = true;
return;
}
mStatus = STATUS_TALK_NEAR_JAIL;
} else if (mHasAttention) {
@@ -1293,7 +1291,6 @@ void daNpc_Tc_c::statusWaitNearJail() {
dComIfGs_onEventBit(dSv_event_flag_c::UNK_0B40);
mHasTalkedNearJail = true;
return;
}
mStatus = STATUS_TALK_NEAR_JAIL;
} else if (mHasAttention) {
@@ -1323,7 +1320,6 @@ void daNpc_Tc_c::statusWalkToStool() {
if (speedF == 0.0f) {
mStatus = STATUS_WALK_TO_JAIL;
}
} else {
mStoolLookPos.set(mStoolPos);
cLib_targetAngleY(&current.pos, &mWalkToStoolPos);
@@ -1707,7 +1703,6 @@ void daNpc_Tc_c::setTower() {
temp = l_HIO.field_0x6C;
temp2 = l_HIO.field_0x78;
break;
}
switch(mType) {
@@ -1769,7 +1764,6 @@ BOOL daNpc_Tc_c::_execute() {
case 0:
mAnmPrmIdx = ANM_PRM_IDX_WAIT01;
break;
}
} else {
mAnmPrmIdx = ANM_PRM_IDX_WAIT01;
src/d/actor/d_a_npc_tc_msg_red.inc
-1
View File
@@ -167,7 +167,6 @@ u32 daNpc_Tc_c::getMsgRed() {
return 0xDEB;
case false:
return 0xDEA;
}
}
src/d/actor/d_a_npc_tc_msg_white.inc
+1 -1
View File
@@ -115,7 +115,7 @@ u32 daNpc_Tc_c::getMsgWhite() {
m_jnt.onHeadLock();
} else {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) {
if (dComIfGs_isEventBit(dSv_event_flag_c::UNK_0B80)) {
if (!field_0x80E) {
msg = 0xDC8;
m_jnt.onHeadLock();
src/d/actor/d_a_obj_doguu.cpp
-1
View File
@@ -348,7 +348,6 @@ void daObjDoguu_c::setQuake(int i_staffIdx) {
u32 pattern = 0x0010FFEE;
dComIfGp_getVibration().StartQuake((u8*)&pattern, 0, 63, cXyz(0.0f, 1.0f, 0.0f));
mTimer = *dComIfGp_evmng_getMyIntegerP(i_staffIdx, "Timer");
}
/* 00000FB8-0000100C .text setJDemo__12daObjDoguu_cFi */
src/d/actor/d_a_obj_hami4.cpp
-1
View File
@@ -183,7 +183,6 @@ bool daObjHami4_c::_execute() {
}
set_mtx();
return true;
}
/* 000009DC-00000A58 .text daObjHami4_Execute__FPv */
src/d/actor/d_a_obj_hha.cpp
+7 -9
View File
@@ -611,18 +611,16 @@ bool daObjHha_c::_execute() {
mState = State_SWITCHING;
}
}
else {
if(dComIfGp_evmng_startCheck(mEventIdx) != FALSE){
mWtrState = 2;
mWtrTimer = 35;
mPartTimer = 0;
mState = State_CLOSED;
}
else if(dComIfGp_evmng_startCheck(mEventIdx) != FALSE){
mWtrState = 2;
mWtrTimer = 35;
mPartTimer = 0;
mState = State_CLOSED;
}
} break;
case State_SWITCHING: if(dComIfGp_evmng_endCheck(mEventIdx)){
case State_SWITCHING:
if(dComIfGp_evmng_endCheck(mEventIdx)){
dComIfGp_event_reset();
mState = State_CLOSED;
}
src/d/actor/d_a_obj_volcano.cpp
+2 -2
View File
@@ -173,9 +173,9 @@ BOOL daObjVolcano::Act_c::Create() {
field_0x4F8 = 0.0f;
if (dComIfGs_getStartPoint() == 2
#if VERSION > VERSION_DEMO
&& current.roomNo == dComIfGs_getRestartRoomNo()
&& current.roomNo == dComIfGs_getRestartRoomNo()
#endif
) {
) {
field_0x500 = 6;
} else {
field_0x500 = 3;
src/d/actor/d_a_player_main.cpp
+1 -1
View File
@@ -13111,7 +13111,7 @@ void daPy_lk_c::endDemoMode() {
return;
}
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
daShip_c* ship = (daShip_c*)dComIfGp_getShipActor();
daShip_c* ship = (daShip_c*)dComIfGp_getShipActor();
if (ship == NULL) {
checkNextMode(0);
} else if (daPy_getPlayerActorClass() != this) {
src/d/actor/d_a_player_swim.inc
+1 -1
View File
@@ -609,7 +609,7 @@ BOOL daPy_lk_c::procSwimMove() {
procSwimWait_init(TRUE);
}
else if ((mDirection == DIR_FORWARD && frameCtrl.checkPass(20.0f)) || (mDirection != DIR_FORWARD && frameCtrl.checkPass(0.0f))) {
seStartOnlyReverb(JA_SE_LK_SWIM);
seStartOnlyReverb(JA_SE_LK_SWIM);
}
setSwimTimerStartStop();
src/d/actor/d_a_salvage.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ bool daSalvage_c::CreateInit() {
mEventIdx = dComIfGp_evmng_getEventIdx("SLVG_HAZURE_LEFT", 0xff);
mEmitter = dComIfGp_particle_set(dPa_name::ID_AK_JN_SALVAGELIGHT00, &current.pos);
if (mEmitter != NULL) {
mEmitter->setStatus(1);
mEmitter->stopCreateParticle();
}
return true;
}
src/d/actor/d_a_ship.cpp
+3 -10
View File
@@ -1262,7 +1262,6 @@ BOOL daShip_c::checkNextMode(int i_curMode) {
tgRVecP = mSph.GetTgRVecP();
tgHitPos = mSph.GetTgHitPosP();
tgHitObj = mSph.GetTgHitGObj();
}
else {
dCcD_Cyl* cyl = mCyl;
@@ -1781,7 +1780,6 @@ BOOL daShip_c::procCannon() {
cLib_addCalcAngleS(&m0396, cM_atan2s(-cannonPos.y, cannonPos.absXZ()) + 0x4000, 5, 0x180, 0x40);
cLib_addCalcAngleS(&m0394, cM_atan2s(cannonPos.x, cannonPos.z) - shape_angle.y, 5, 0x180, 0x40);
} else if (!mDoCPd_R_LOCK_BUTTON(0)) {
float adjust = mStickMVal * (m0404 * 4.0f + 1.0f);
m0396 += (adjust * 384.0f) * cM_scos(mStickMAng);
@@ -2986,7 +2984,6 @@ void daShip_c::setEffectData(float param_1, short param_2) {
mWaveL.stop();
mSplash.stop();
}
}
fVar3 = speedF + 150.0f;
mEffPos.set(current.pos.x + fVar3 * cM_ssin(shape_angle.y), param_1, current.pos.z + fVar3 * cM_scos(shape_angle.y));
@@ -3786,7 +3783,7 @@ BOOL daShip_c::execute() {
fVar4 = m0404 * 30.0f + 10.0f;
// Bug? This room check assumes we're on the sea without checking?
if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e) {
fVar4 *= 1.2f;
fVar4 *= 1.2f;
}
}
firstDecrementShipSpeed(fVar4);
@@ -3869,7 +3866,6 @@ BOOL daShip_c::execute() {
fopAcM_posMove(this, mStts.GetCCMoveP());
if (dComIfGp_event_runCheck()) {
m1044 = cXyz::Zero;
}
else {
cXyz sp108;
@@ -3881,7 +3877,6 @@ BOOL daShip_c::execute() {
}
else {
cLib_addCalcPosXZ(&m1044, cXyz::Zero, 0.05f, 0.1f, 0.02f);
}
current.pos += m1044;
}
@@ -4014,7 +4009,6 @@ BOOL daShip_c::execute() {
if (mProc != &daShip_c::procCannon) {
m0396 = getAnglePartRate() * 0x4000;
m0394 *= getAnglePartRate();
}
mpCannonModel->calc();
@@ -4134,8 +4128,8 @@ BOOL daShip_c::execute() {
r23_2 = TRUE;
}
else if ((mCurMode == 10 || mCurMode == 11) && m0434 && mRopeCnt > 0) {
spC0 = *m0434 - eyePos;
r23_2 = TRUE;
spC0 = *m0434 - eyePos;
r23_2 = TRUE;
}
else if (mCurMode == 8 || distXz > 125.0f) {
if (
@@ -4348,7 +4342,6 @@ BOOL daShip_c::execute() {
if (mPart == PART_STEER_e) {
dComIfGp_setPlayerStatus1(0, daPyStts1_SAIL_e);
mDoAud_setShipSailState(1);
}
else {
dComIfGp_clearPlayerStatus1(0, daPyStts1_SAIL_e);
src/d/actor/d_a_st.cpp
+2
View File
@@ -633,6 +633,7 @@ static void fight(st_class* i_this) {
switch (i_this->m02C4) {
case 0:
i_this->m02DC = 0.0f;
break;
}
i_this->m0ED1 = 0;
switch (i_this->mFightBehavior) {
@@ -1519,6 +1520,7 @@ static void St_move(st_class* i_this) {
break;
case 0x21:
sita_move(i_this);
break;
}
if (i_this->mActionState != 0x10) {
speed_pos_calc(i_this);
src/d/actor/d_a_tn.cpp
+1
View File
@@ -3107,6 +3107,7 @@ static u8 damage_check(tn_class* i_this) {
case 7:
i_this->mDamageReaction.m424 |= 0x10;
i_this->mDamageReaction.m428 = 26.0f;
break;
}
if (i_this->mDamageReaction.m424 != 0) {
cXyz local_8c(0.0f, 0.0f, -10.0f);
src/d/d_camera.cpp
+10 -10
View File
@@ -2221,7 +2221,7 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
curr_hit_type = 3;
}
else if (prev_hit_type != 3) {
curr_hit_type = 4;
curr_hit_type = 4;
}
else {
curr_hit_type = 5;
@@ -2645,11 +2645,11 @@ bool dCamera_c::followCamera2(s32 param_0) {
/* 8016A110-8016C4F8 .text followCamera__9dCamera_cFl */
bool dCamera_c::followCamera(s32 param_1) {
/* Nonmatching */
bool bVar1;
bool bVar2;
bool bVar3;
bool bVar4;
int iVar5;
float fVar37;
f32 fVar40 = 0.9f;
@@ -3050,7 +3050,7 @@ bool dCamera_c::followCamera(s32 param_1) {
cSGlobe local_484(mViewCache.mEye - mViewCache.mCenter);
if (mWork.follow.m392 <= 0 || iVar17 <= mWork.follow.m392) {
dVar20 = dCamMath::rationalBezierRatio((float) iVar5 / (float)iVar17, fVar38);
dVar20 = dCamMath::rationalBezierRatio((float)mWork.follow.m392 / (float)iVar17, fVar38);
mWork.follow.m3D8 = 1;
mWork.follow.m3B8 = (1.0f - mWork.follow.m3B8) * dVar20;
}
@@ -3131,7 +3131,7 @@ bool dCamera_c::followCamera(s32 param_1) {
mWork.follow.m38C = 1;
}
else if (mWork.follow.m38C < 0xf) {
mWork.follow.m3B8 = iVar5 * 0.033333335f;
mWork.follow.m3B8 = mWork.follow.m38C * 0.033333335f;
mWork.follow.m38C++;
}
else if (check_owner_action(mPadId, daPyStts0_UNK40_e | daPyStts0_UNK20_e)) {
@@ -3555,7 +3555,7 @@ bool dCamera_c::lockonCamera(s32 param_1) {
if (mpLockonTarget && mLockOnActorId != -1) {
cXyz local_120 = attentionPos(mpPlayerActor);
if (lineBGCheck(&local_120, &mViewCache.mCenter, 0x7f)) {
ForceLockOff(mLockOnActorId);
ForceLockOff(mLockOnActorId);
}
}
@@ -3789,11 +3789,11 @@ bool dCamera_c::CalcSubjectAngle(s16* param_1, s16* param_2) {
fVar4 = mCamSetup.m030;
if (!bVar9) {
cSAngle local_88(fVar2 * mWork.subject.m384);
cSAngle local_8c(fVar1 * mWork.subject.m388);
s16 local_98 = local_88.Val() + mWork.subject.m3BA;
*param_2 = local_98;
*param_1 = local_8c.Val();
cSAngle local_88(fVar2 * mWork.subject.m384);
cSAngle local_8c(fVar1 * mWork.subject.m388);
s16 local_98 = local_88.Val() + mWork.subject.m3BA;
*param_2 = local_98;
*param_1 = local_8c.Val();
}
fVar6 = g_mDoCPd_cpadInfo[mPadId].mMainStickPosX;
src/d/d_event.cpp
+1 -1
View File
@@ -683,7 +683,7 @@ void dEvt_control_c::remove() {
mMode = dEvtMode_NONE_e;
mbEndProc = 0;
mOrderCount = 0;
field_0xdd = 0;
mDebugStb = 0;
mEventEndSound = 0;
field_0xdb = 0;
mCullFarClipRatio = 0.0f;
src/d/d_file_select.cpp
+2 -2
View File
@@ -649,8 +649,8 @@ void dFile_select_c::makeRecInfo(u8 param_1) {
}
}
else {
((J2DPicture*)field_0x828[i].pane)->changeTexture("heart_04_2.bti", 0);
((J2DPicture*)field_0xc88[i].pane)->changeTexture("heart_04_2.bti", 0);
((J2DPicture*)field_0x828[i].pane)->changeTexture("heart_04_2.bti", 0);
((J2DPicture*)field_0xc88[i].pane)->changeTexture("heart_04_2.bti", 0);
}
}
else {
src/f_op/f_op_actor_mng.cpp
+1 -1
View File
@@ -1056,7 +1056,7 @@ fopAc_ac_c* fopAcM_createItemForKP2(cXyz* pos, int i_itemNo, int roomNo, csXyz*
daItem_c* fopAcM_createItemForSimpleDemo(cXyz* pos, int i_itemNo, int roomNo, csXyz* angle, cXyz* scale, f32 speedF, f32 speedY) {
daItem_c* item = (daItem_c*)fopAcM_fastCreateItem(pos, i_itemNo, roomNo, angle, scale, speedF, speedY, -7.0f);
if (item != NULL)
item->setStatus(5);
item->setStatus(daItem_c::STATUS_INIT_NORMAL);
return item;
}