encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 21:55:28 +02:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_bg_s_lin_chk.h
-1
View File
@@ -36,7 +36,6 @@ public:
void SetHit() { mStts |= STTS_HIT; }
u32 ChkHit() const { return mStts & STTS_HIT; }
void SetCross(const cXyz& pos) { mLin.SetEnd(pos); }
cXyz& i_GetCross() { return mLin.GetEnd(); }
cXyz* GetCrossP() { return &mLin.GetEndP(); }
cM3dGLin* GetLinP() { return &mLin; }
bool ChkBackFlag() const { return mBackFlag; }
include/Z2AudioLib/Z2LinkMgr.h
+1 -2
View File
@@ -18,7 +18,6 @@ public:
Z2CreatureLink();
~Z2CreatureLink();
void setLinkState(u8);
void setLinkGroupInfo(u8);
void setLinkHp(s32, s32);
void setLinkSwordType(s32, s32);
@@ -48,7 +47,7 @@ public:
u8 getLinkState() const { return mLinkState; }
u8 getMoveSpeed() const { return mMoveSpeed; }
bool isRiding() const { return mRiding; }
void i_setLinkState(u8 i_state) { mLinkState = i_state; }
void setLinkState(u8 i_state) { mLinkState = i_state; }
Z2SoundObjSimple& getKantera() { return mKantera; }
u8 getLinkHp() const { return mLinkHp; }
u8 getMovingTime() { return mMovingTime; }
include/d/actor/d_a_alink.h
+3 -3
View File
@@ -3183,7 +3183,7 @@ public:
virtual f32 getSinkShapeOffset() const;
virtual BOOL checkSinkDead() const;
virtual BOOL checkHorseStart();
virtual Z2WolfHowlMgr* getWolfHowlMgrP();
virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
virtual BOOL checkWolfHowlSuccessAnime() const;
virtual BOOL checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
@@ -3192,7 +3192,7 @@ public:
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
#pragma optimization_level 2
@@ -3359,7 +3359,7 @@ public:
var_r5 = 0;
if (mItemAcKeep.getActor() != NULL &&
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
}
include/d/actor/d_a_b_gnd.h
+112 -117
View File
@@ -18,9 +18,6 @@
*/
struct g_himo_s {
/* 80601D40 */ ~g_himo_s();
/* 80601DA0 */ g_himo_s();
/* 0x0 */ cXyz field_0x0[16];
};
@@ -32,94 +29,85 @@ public:
/* 0x05AC */ request_of_phase_process_class mPhaseReq;
/* 0x05B4 */ request_of_phase_process_class mHorsePhaseReq;
/* 0x05BC */ s16 field_0x05bc;
/* 0x05BE */ u8 field_0x05be;
/* 0x05BF */ u8 field_0x05BF[0x05C0 - 0x05BF];
/* 0x05C0 */ cXyz field_0x05c0;
/* 0x05CC */ s16 field_0x05cc;
/* 0x05CE */ u8 field_0x05CE[0x05D0 - 0x05CE];
/* 0x05BC */ s16 mMoveMode;
/* 0x05BE */ u8 field_0x5be;
/* 0x05C0 */ cXyz field_0x5c0;
/* 0x05CC */ s16 field_0x5cc;
/* 0x05D0 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x05D4 */ mDoExt_McaMorfSO* mpHorseMorf;
/* 0x05D8 */ mDoExt_McaMorf* field_0x05d8;
/* 0x05DC */ Z2CreatureEnemy mZ2Creature;
/* 0x0680 */ Z2CreatureEnemy field_0x0680;
/* 0x0724 */ mDoExt_brkAnm* field_0x0724;
/* 0x0728 */ mDoExt_btkAnm* field_0x0728[6];
/* 0x0740 */ u8 field_0x0740[0x0744 - 0x0740];
/* 0x0744 */ mDoExt_btpAnm* field_0x0744;
/* 0x0748 */ int field_0x0748;
/* 0x074C */ mDoExt_btpAnm* field_0x074c;
/* 0x0750 */ mDoExt_btkAnm* field_0x0750;
/* 0x0754 */ u8 field_0x0754;
/* 0x0755 */ u8 field_0x0755[0x0758 - 0x0755];
/* 0x05D8 */ mDoExt_McaMorf* mpZeldaModel;
/* 0x05DC */ Z2CreatureEnemy mGndSound;
/* 0x0680 */ Z2CreatureEnemy mHorseSound;
/* 0x0724 */ mDoExt_brkAnm* mpGndCoreBrk;
/* 0x0728 */ mDoExt_btkAnm* mpGndEyeBtk[6];
/* 0x0740 */ u8 field_0x740[0x0744 - 0x0740];
/* 0x0744 */ mDoExt_btpAnm* mpGndEyeBtp;
/* 0x0748 */ int mGndEyeBtkNo;
/* 0x074C */ mDoExt_btpAnm* mpZeldaBtp;
/* 0x0750 */ mDoExt_btkAnm* mpZeldaBtk;
/* 0x0754 */ u8 mDrawZelda;
/* 0x0758 */ int mAnmID;
/* 0x075C */ int mHorseAnmID;
/* 0x0760 */ f32 mPlaySpeed;
/* 0x0764 */ u8 field_0x0764[0x0768 - 0x0764];
/* 0x0768 */ J3DModel* field_0x0768;
/* 0x076C */ J3DModel* field_0x076c;
/* 0x0770 */ u8 field_0x0770;
/* 0x0771 */ u8 field_0x0771;
/* 0x0772 */ s16 field_0x0772;
/* 0x0774 */ dKy_tevstr_c field_0x0774;
/* 0x0AFC */ s16 field_0x0afc;
/* 0x0AFE */ s16 mActionID;
/* 0x0B00 */ s16 field_0x0b00;
/* 0x0B02 */ u8 field_0x0B02[0x0B94 - 0x0B02];
/* 0x0B94 */ J3DModel* field_0x0b94[36];
/* 0x0C24 */ s16 field_0x0c24;
/* 0x0C26 */ s16 field_0x0c26;
/* 0x0C28 */ s16 field_0x0c28;
/* 0x0C2A */ u8 field_0x0C2A[0x0C2C - 0x0C2A];
/* 0x0C2C */ J3DModel* field_0x0c2c[2];
/* 0x0C34 */ u8 field_0x0C34[0x0C38 - 0x0C34];
/* 0x0C38 */ f32 field_0x0c38;
/* 0x0C3C */ s16 field_0x0c3c;
/* 0x0C3E */ u8 field_0x0C3E[0x0C40 - 0x0C3E];
/* 0x0764 */ u8 field_0x764[0x0768 - 0x0764];
/* 0x0768 */ J3DModel* mpSwordModel;
/* 0x076C */ J3DModel* mpSheathModel;
/* 0x0770 */ u8 field_0x770;
/* 0x0771 */ u8 mHideSheath;
/* 0x0772 */ s16 field_0x772;
/* 0x0774 */ dKy_tevstr_c mSwordTevstr;
/* 0x0AFC */ s16 mCounter;
/* 0x0AFE */ s16 mActionMode;
/* 0x0B00 */ s16 field_0xb00;
/* 0x0B02 */ u8 field_0xB02[0x0B94 - 0x0B02];
/* 0x0B94 */ J3DModel* mpMantShadowModel[36];
/* 0x0C24 */ s16 mSwordBlurAlpha;
/* 0x0C26 */ s16 mSwordBlurType;
/* 0x0C28 */ s16 field_0xc28;
/* 0x0C2C */ J3DModel* mpSwordBlurModel[2];
/* 0x0C34 */ u8 field_0xC34[0x0C38 - 0x0C34];
/* 0x0C38 */ f32 mPlayerDistXZ;
/* 0x0C3C */ s16 mPlayerAngleY;
/* 0x0C40 */ u32 mShadowID;
/* 0x0C44 */ s16 field_0x0c44[10];
/* 0x0C58 */ s16 field_0x0c58;
/* 0x0C5A */ s16 field_0x0c5a;
/* 0x0C5C */ s16 field_0x0c5c;
/* 0x0C5D */ u8 field_0x0C5E[0x0C60 - 0x0C5E];
/* 0x0C60 */ int field_0x0c60;
/* 0x0C64 */ int field_0x0c64;
/* 0x0C68 */ s16 field_0x0c68;
/* 0x0C6A */ s16 field_0x0c6a;
/* 0x0C6C */ f32 field_0x0c6c;
/* 0x0C70 */ s16 field_0x0c70;
/* 0x0C72 */ s16 field_0x0c72;
/* 0x0C74 */ s16 field_0x0c74;
/* 0x0C76 */ u8 field_0x0c76;
/* 0x0C77 */ u8 field_0x0c77;
/* 0x0C78 */ u8 field_0x0c78;
/* 0x0C79 */ u8 field_0x0c79;
/* 0x0C7A */ u8 field_0x0c7a;
/* 0x0C7B */ u8 field_0x0c7b;
/* 0x0C7C */ u8 field_0x0c7c;
/* 0x0C7D */ u8 field_0x0c7d;
/* 0x0C7E */ u8 field_0x0C7E[0x0C80 - 0x0C7E];
/* 0x0C80 */ cXyz field_0x0c80;
/* 0x0C8C */ s16 field_0x0c8c;
/* 0x0C8E */ s16 field_0x0c8e;
/* 0x0C90 */ s16 field_0x0c90;
/* 0x0C92 */ s16 field_0x0c92;
/* 0x0C94 */ dBgS_AcchCir mWall;
/* 0x0CD4 */ dBgS_ObjAcch field_0x0cd4;
/* 0x0EAC */ s16 field_0x0eac;
/* 0x0EAE */ u8 field_0x0EAE[0x0EB0 - 0x0EAE];
/* 0x0EB0 */ f32 field_0x0eb0;
/* 0x0EB4 */ cXyz field_0x0eb4;
/* 0x0EC0 */ csXyz field_0x0ec0;
/* 0x0EC6 */ u8 field_0x0EC6[0x0EC8 - 0x0EC6];
/* 0x0EC8 */ dCcD_Stts field_0x0ec8;
/* 0x0F04 */ dCcD_Sph mHorseSpheres1[2];
/* 0x1174 */ dCcD_Sph mHorseSpheres2[4];
/* 0x1654 */ dCcD_Stts field_0x1654;
/* 0x1690 */ dCcD_Sph field_0x1690[3];
/* 0x1A38 */ dCcD_Sph field_0x1a38;
/* 0x1B70 */ dCcD_Sph field_0x1b70;
/* 0x1CA8 */ dCcD_Cyl field_0x1ca8;
/* 0x0C44 */ s16 field_0xc44[10];
/* 0x0C58 */ s16 mDamageInvulnerabilityTimer;
/* 0x0C5A */ s16 field_0xc5a;
/* 0x0C5C */ s16 mHorseLegRot;
/* 0x0C60 */ int field_0xc60;
/* 0x0C64 */ int field_0xc64;
/* 0x0C68 */ s16 field_0xc68;
/* 0x0C6A */ s16 field_0xc6a;
/* 0x0C6C */ f32 field_0xc6c;
/* 0x0C70 */ s16 field_0xc70;
/* 0x0C72 */ s16 field_0xc72;
/* 0x0C74 */ s16 field_0xc74;
/* 0x0C76 */ u8 mGakeChkType;
/* 0x0C77 */ u8 field_0xc77;
/* 0x0C78 */ u8 field_0xc78;
/* 0x0C79 */ u8 field_0xc79;
/* 0x0C7A */ u8 field_0xc7a;
/* 0x0C7B */ u8 field_0xc7b;
/* 0x0C7C */ u8 field_0xc7c;
/* 0x0C7D */ s8 field_0xc7d;
/* 0x0C80 */ cXyz field_0xc80;
/* 0x0C8C */ s16 mGndBodyRotX;
/* 0x0C8E */ s16 mGndHeadRotZ;
/* 0x0C90 */ s16 field_0xc90;
/* 0x0C92 */ s16 field_0xc92;
/* 0x0C94 */ dBgS_AcchCir mAcchCir;
/* 0x0CD4 */ dBgS_ObjAcch mAcch;
/* 0x0EAC */ s16 field_0xeac;
/* 0x0EB0 */ f32 field_0xeb0;
/* 0x0EB4 */ cXyz field_0xeb4;
/* 0x0EC0 */ csXyz field_0xec0;
/* 0x0EC8 */ dCcD_Stts mHorseCcStts;
/* 0x0F04 */ dCcD_Sph mHorseBodySph[2];
/* 0x1174 */ dCcD_Sph mHorseFootSph[4];
/* 0x1654 */ dCcD_Stts mGndCcStts;
/* 0x1690 */ dCcD_Sph mGndSph[3];
/* 0x1A38 */ dCcD_Sph mAtSph;
/* 0x1B70 */ dCcD_Sph mDefSph;
/* 0x1CA8 */ dCcD_Cyl mCoCyl;
/* 0x1DE4 */ dCcU_AtInfo mAtInfo;
/* 0x1E08 */ u8 field_0x1e08;
/* 0x1E09 */ u8 field_0x1e09;
@@ -133,61 +121,69 @@ public:
/* 0x1E2C */ Z2SoundObjSimple field_0x1e2c;
/* 0x1E4C */ f32 field_0x1e4c;
/* 0x1E50 */ csXyz field_0x1e50;
/* 0x1E56 */ u8 field_0x1e56[5];
/* 0x1E5B */ u8 field_0x1E5B[0x1E5C - 0x1E5B];
/* 0x1E5C */ cXyz field_0x1e5c[5];
/* 0x1E56 */ s8 field_0x1e56[5];
/* 0x1E5C */ cXyz mLightBallPos[5];
/* 0x1E98 */ cXyz field_0x1e98[5];
/* 0x1ED4 */ cXyz field_0x1ed4[5];
/* 0x1F10 */ Z2SoundObjSimple field_0x1f10[5];
/* 0x1F10 */ Z2SoundObjSimple mLightBallSound[5];
/* 0x1FB0 */ u8 mInitHIO;
/* 0x1FB0 */ u8 field_0x1FB1[0x1FB4 - 0x1FB1];
/* 0x1FB4 */ fpc_ProcID mMantChildID;
/* 0x1FB8 */ cXyz field_0x1fb8;
/* 0x1FC4 */ int field_0x1fc4;
/* 0x1FC4 */ int mDrawHorse;
/* 0x1FC8 */ s16 field_0x1fc8;
/* 0x1FCA */ s16 field_0x1fca;
/* 0x1FCC */ s16 field_0x1fcc;
/* 0x1FCE */ u8 field_0x1FCE[0x1FD0 - 0x1FCE];
/* 0x1FCA */ s16 mGndArmRRotX;
/* 0x1FCC */ s16 mGndShoulderLRotY;
/* 0x1FD0 */ f32 field_0x1fd0;
/* 0x1FD4 */ s16 field_0x1fd4;
/* 0x1FD6 */ s16 field_0x1fd6;
/* 0x1FD8 */ cXyz field_0x1fd8[2];
/* 0x1FF0 */ g_himo_s field_0x1ff0[2];
/* 0x2170 */ mDoExt_3DlineMat1_c field_0x2170[2];
/* 0x2170 */ mDoExt_3DlineMat1_c mHorseReins[2];
/* 0x21E8 */ mDoExt_3DlineMat1_c field_0x21e8;
/* 0x2224 */ dKy_tevstr_c field_0x2224;
/* 0x25AC */ u32 field_0x25ac[17];
/* 0x25F0 */ u8 field_0x25F0[0x2688 - 0x25F0];
/* 0x25AC */ u32 field_0x25ac[2];
/* 0x25B4 */ u32 field_0x25b4;
/* 0x25B8 */ u32 field_0x25b8;
/* 0x25BC */ u32 field_0x25bc;
/* 0x25C0 */ u32 field_0x25c0;
/* 0x25C4 */ u32 field_0x25c4;
/* 0x25C8 */ u32 field_0x25c8;
/* 0x25CC */ u32 field_0x25cc;
/* 0x25D0 */ u32 field_0x25d0;
/* 0x25D4 */ u32 field_0x25d4;
/* 0x25D8 */ u32 field_0x25d8;
/* 0x25DC */ u32 field_0x25dc;
/* 0x25E0 */ u32 field_0x25e0;
/* 0x25E4 */ u32 field_0x25e4[3];
/* 0x25F0 */ u32 field_0x25f0[6];
/* 0x2608 */ u32 field_0x2608[5][6];
/* 0x2680 */ u32 field_0x2680[2];
/* 0x2688 */ u32 field_0x2688;
/* 0x268C */ u32 field_0x268c[3];
/* 0x2698 */ u8 field_0x2698;
/* 0x2699 */ u8 field_0x2699;
/* 0x269C */ cXyz field_0x269c;
/* 0x26A8 */ cXyz field_0x26a8[2];
/* 0x26C0 */ s16 field_0x26c0;
/* 0x26C0 */ s16 mGndLegRotX;
/* 0x26C2 */ s16 field_0x26c2;
/* 0x26C4 */ s16 field_0x26c4;
/* 0x26C6 */ s16 field_0x26c6;
/* 0x26C8 */ cXyz field_0x26c8;
/* 0x26D4 */ cXyz field_0x26d4;
/* 0x26E0 */ cXyz field_0x26e0;
/* 0x26EC */ cXyz field_0x26ec;
/* 0x26F8 */ cXyz field_0x26f8;
/* 0x2704 */ cXyz field_0x2704;
/* 0x26C4 */ s16 mDemoCamMode;
/* 0x26C6 */ s16 mDemoCamTimer;
/* 0x26C8 */ cXyz mDemoCamEye;
/* 0x26D4 */ cXyz mDemoCamCenter;
/* 0x26E0 */ cXyz mDemoCamEyeTarget;
/* 0x26EC */ cXyz mDemoCamCenterTarget;
/* 0x26F8 */ cXyz mDemoCamEyeSpd;
/* 0x2704 */ cXyz mDemoCamCenterSpd;
/* 0x2710 */ cXyz field_0x2710;
/* 0x271C */ s16 field_0x271c;
/* 0x271E */ u8 field_0x271E[0x2720 - 0x271E];
/* ox2720 */ cXyz field_0x2720;
/* 0x272C */ s16 field_0x272c;
/* 0x272E */ u8 field_0x272E[0x2730 - 0x272E];
/* 0x2730 */ f32 field_0x2730;
/* 0x2734 */ f32 field_0x2734;
/* 0x2738 */ u8 field_0x2738;
/* 0x2730 */ f32 mTubazeriPushValue;
/* 0x2734 */ f32 mTubazeriPushAmount;
/* 0x2738 */ u8 mNoDrawTimer;
/* 0x2739 */ u8 field_0x2739;
/* 0x273A */ u8 field_0x273A[0x273C - 0x273A];
/* 0x273C */ f32 field_0x273c;
/* 0x273C */ f32 mKankyoBlend;
/* 0x2740 */ u8 field_0x2740;
/* 0x2741 */ u8 field_0x2741[0x2744 - 0x2741];
/* 0x2744 */ dMsgFlow_c mMsgFlow;
};
@@ -196,10 +192,9 @@ STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
class daB_GND_HIO_c {
public:
/* 805F4A4C */ daB_GND_HIO_c();
/* 80602230 */ ~daB_GND_HIO_c();
/* 80602230 */ virtual ~daB_GND_HIO_c() {}
/* 0x00 */ f32 field_0x0;
/* 0x04 */ s8 field_0x4;
/* 0x04 */ s8 no;
/* 0x08 */ f32 model_size;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
include/d/actor/d_a_formation_mng.h
+1 -1
View File
@@ -185,7 +185,7 @@ struct daFmtMng_c : public fopAc_ac_c {
}
bool checkEmergency() {
if (dKy_darkworld_check() || !daPy_py_c::i_checkNowWolf()) {
if (dKy_darkworld_check() || !daPy_py_c::checkNowWolf()) {
return false;
}
FmtMember_c* member = mMember;
include/d/actor/d_a_guard_mng.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
0x00000200, 0x00000201,
};
if (!daPy_py_c::i_checkNowWolf() || field_0x573 >= mLimitNum) {
if (!daPy_py_c::checkNowWolf() || field_0x573 >= mLimitNum) {
return 1;
} else {
if (field_0x571 < mMerchantNum) {
include/d/actor/d_a_horse.h
+2 -6
View File
@@ -130,8 +130,6 @@ public:
PROC_NONE_e = 8,
};
fopAc_ac_c* getZeldaActor();
void cancelOriginalDemo() {
field_0x16b8 = 2;
m_demoMode = 1;
@@ -139,7 +137,6 @@ public:
/* 807E27F8 */ void onDemoJumpDistance(f32, f32);
/* 807E28B8 */ void changeDemoPos0(cXyz const*);
/* 807E28E0 */ void setHorsePosAndAngle(cXyz const*, s16);
/* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*);
/* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
/* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*);
@@ -225,7 +222,6 @@ public:
/* 8084478C */ ~daHorse_c();
/* 80182D04 */ void getLashDashStart() const;
bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
@@ -237,7 +233,7 @@ public:
void setDemoStickR(f32 stick) { m_demoStickR = stick; }
void changeDemoMode(u32 param_0, int param_1) { m_demoMode = param_0; field_0x1728 = param_1; }
void changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*m_setHorsePosAngle)(i_pos, i_angle); }
void setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*m_setHorsePosAngle)(i_pos, i_angle); }
void onRideFlg() { (this->*m_onRideFlg)(); }
void offRideFlg() { (this->*m_offRideFlg)(); }
void onStateFlg0(daHorse_FLG0 flag) { m_stateFlg0 |= flag; }
@@ -257,7 +253,7 @@ public:
u16 getAnmIdx(int i_idx) const { return m_anmIdx[i_idx]; }
int callHorse(const cXyz* param_0) { return (this->*m_callHorse)(param_0); }
daHoZelda_c* i_getZeldaActor() { return (daHoZelda_c*)m_zeldaActorKeep.getActor(); }
daHoZelda_c* getZeldaActor() { return (daHoZelda_c*)m_zeldaActorKeep.getActor(); }
bool checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
include/d/actor/d_a_midna.h
+1 -2
View File
@@ -215,7 +215,6 @@ public:
void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
static bool checkMidnaTired();
void onNoServiceWait();
/* 804BC3E0 */ int modelCallBack(int);
@@ -357,7 +356,7 @@ public:
return dKy_darkworld_check() == true || dComIfGs_isTransformLV(3);
}
static bool i_checkMidnaTired() {
static bool checkMidnaTired() {
return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08);
}
include/d/actor/d_a_player.h
+9 -10
View File
@@ -690,9 +690,9 @@ public:
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; }
inline static BOOL checkSwordGet();
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
@@ -1060,7 +1060,7 @@ public:
mDemo.setParam1(i_param1);
}
void i_changeDemoParam2(s16 i_param2) {
void changeDemoParam2(s16 i_param2) {
mDemo.setParam2(i_param2);
}
@@ -1070,6 +1070,8 @@ public:
void setItemPos(cXyz* i_itemPos) { mItemPos = *i_itemPos; }
cXyz* getViewerCurrentPosP() { return &field_0x5f8; }
static bool checkPeepEndSceneChange() { return getLastSceneMode() == 7; }
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
@@ -1077,19 +1079,16 @@ public:
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
}
inline static bool checkLightMasterSwordEquip();
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static u32 i_checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
inline static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); }
static daMidna_c* getMidnaActor() { return m_midnaActor; }
include/d/d_meter2_info.h
+1 -1
View File
@@ -417,7 +417,7 @@ inline void dMeter2Info_allUseButton() {
g_meter2_info.allUseButton();
}
inline void i_dMeter2Info_offUseButton(int flag) {
inline void dMeter2Info_offUseButton(int flag) {
g_meter2_info.offUseButton(flag);
}
include/f_op/f_op_actor.h
+6 -12
View File
@@ -129,11 +129,13 @@ public:
void setEventName(char*);
char* getEventName();
void beforeProc();
void onCondition(u16);
void offCondition(u16);
BOOL checkCommandCatch();
BOOL checkCommandDoor();
void onCondition(u16 cond) { mCondition |= cond; }
void offCondition(u16 cond) { mCondition &= ~cond; }
BOOL checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }
BOOL checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
void setCommand(u16 command) { mCommand = command; }
void setMapToolId(u8 id) { mMapToolId = id; }
@@ -147,14 +149,6 @@ public:
void setIdx(u8 i_idx) { mIndex = i_idx; }
char* getArchiveName() { return mArchiveName; }
BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; }
void i_onCondition(u16 cond) { mCondition |= cond; }
void i_offCondition(u16 cond) { mCondition &= ~cond; }
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
BOOL i_checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
bool i_checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool i_checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }
void suspendProc(void* actor) {
if (field_0x10 != NULL) {
src/d/actor/d_a_alink.cpp
+38 -44
View File
@@ -132,12 +132,6 @@ u8 daAlink_matAnm_c::m_morf_frame;
bool daAlink_c::checkWindSpeedOnXZ() const {
return field_0x35b8.abs2XZ() > 1.0f;
}
bool daPy_py_c::i_checkShieldGet() const {
return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE;
}
u32 daPy_py_c::getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
/* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text init__16daAlink_matAnm_cFv */
void daAlink_matAnm_c::init() {
@@ -5513,7 +5507,7 @@ bool daPy_py_c::checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
}
BOOL daPy_py_c::i_checkSwordGet() {
BOOL daPy_py_c::checkSwordGet() {
return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE;
}
@@ -5529,14 +5523,14 @@ void daAlink_c::setSelectEquipItem(int param_0) {
mSwordModel = mpSwMModel;
mSheathModel = mpSwMSheathModel;
} else {
if (!i_checkSwordGet()) {
if (!checkSwordGet()) {
mSwordChangeWaitTimer = 100;
}
mSwordModel = mpSwAModel;
mSheathModel = mpSwASheathModel;
}
if (!i_checkSwordGet() || checkWoodSwordEquip() || checkNoResetFlg3(FLG3_UNK_1000000)) {
if (!checkSwordGet() || checkWoodSwordEquip() || checkNoResetFlg3(FLG3_UNK_1000000)) {
if (field_0x06ec != NULL) {
field_0x06ec->hide();
}
@@ -5603,7 +5597,7 @@ BOOL daAlink_c::checkCanoeStart() {
return (checkStageName("F_SP115") && getStartRoomNo() == 0) && dComIfGs_getStartPoint() == 2;
}
u32 daPy_py_c::i_getLastSceneMode() {
u32 daPy_py_c::getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
@@ -5752,7 +5746,7 @@ void daAlink_c::playerInit() {
} else if (dComIfGp_getStartStagePoint() == -4) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD5);
} else {
if (i_getLastSceneMode() == 9) {
if (getLastSceneMode() == 9) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD3);
} else if (startMode == 10) {
if (startEvent != 0xFF) {
@@ -5778,9 +5772,9 @@ void daAlink_c::playerInit() {
}
} else if (startMode == 12) {
field_0x3188 = dComIfGp_evmng_startDemo(0xC9);
} else if (i_getLastSceneMode() == 11) {
} else if (getLastSceneMode() == 11) {
field_0x3188 = dComIfGp_evmng_startDemo(0xFF);
} else if (i_getLastSceneMode() == 12) {
} else if (getLastSceneMode() == 12) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD1);
} else {
field_0x3188 = dComIfGp_evmng_startDemo(startEvent);
@@ -5858,7 +5852,7 @@ int daAlink_c::setStartProcInit() {
}
if (horse_start) {
horsep->i_setHorsePosAndAngle(&current.pos, shape_angle.y);
horsep->setHorsePosAndAngle(&current.pos, shape_angle.y);
horsep->initHorseMtx();
initForceRideHorse();
}
@@ -6041,7 +6035,7 @@ int daAlink_c::create() {
static int bgWaitFlg = 0;
u32 sceneMode = i_getLastSceneMode();
u32 sceneMode = getLastSceneMode();
s32 startMode = getStartMode();
s16 startPoint = dComIfGp_getStartStagePoint();
BOOL horseStart = checkHorseStart(sceneMode, startMode);
@@ -6404,8 +6398,8 @@ void daAlink_c::iceSlipBgCheck() {
sp48.z += field_0x35c4.z * var_f31;
if (commonLineCheck(&sp3C, &sp48) && dBgS_CheckBWallPoly(mLinkLinChk)) {
current.pos.x = mLinkLinChk.i_GetCross().x - field_0x35c4.x * var_f31;
current.pos.z = mLinkLinChk.i_GetCross().z - field_0x35c4.z * var_f31;
current.pos.x = mLinkLinChk.GetCross().x - field_0x35c4.x * var_f31;
current.pos.z = mLinkLinChk.GetCross().z - field_0x35c4.z * var_f31;
}
}
}
@@ -6573,7 +6567,7 @@ f32 daAlink_c::checkWindWallRate(cXyz const& param_0) {
f32 var_f31;
if (commonLineCheck(&sp24, &sp18) && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 0xA) {
var_f31 = (1.0f / (daAlinkHIO_basic_c0::m.mMaxWindInfluenceDist - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist)) * (sp24.abs(mLinkLinChk.i_GetCross()) - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist);
var_f31 = (1.0f / (daAlinkHIO_basic_c0::m.mMaxWindInfluenceDist - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist)) * (sp24.abs(mLinkLinChk.GetCross()) - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist);
if (var_f31 < 0.0f) {
var_f31 = 0.0f;
}
@@ -7024,7 +7018,7 @@ void daAlink_c::setMatrix() {
} else if (checkReelAnime()) {
field_0x2fb6 = 4;
} else if (checkEquipAnime() && !checkModeFlg(1)) {
if (checkSwordEquipAnime() && !i_checkShieldGet()) {
if (checkSwordEquipAnime() && !checkShieldGet()) {
field_0x2fb6 = 5;
} else {
field_0x2fb6 = 1;
@@ -7037,7 +7031,7 @@ void daAlink_c::setMatrix() {
field_0x2fb6 = 7;
} else if (checkUpperAnime(0x96) || checkCutDashChargeAnime() || (checkReinRide() && (checkUpperReadyThrowAnime() || checkGrabAnime()))) {
field_0x2fb6 = 3;
} else if (checkSwordEquipAnime() && !i_checkShieldGet()) {
} else if (checkSwordEquipAnime() && !checkShieldGet()) {
field_0x2fb6 = 2;
} else if (checkIronBallWaitAnime()) {
if (checkUnderMove0BckNoArc(ANM_IRONBALL_WAIT)) {
@@ -7152,7 +7146,7 @@ void daAlink_c::setItemMatrix(int param_0) {
}
int var_r28;
if (!i_checkSwordGet()) {
if (!checkSwordGet()) {
var_r28 = 0;
} else if (checkLightMasterSwordEquip()) {
var_r28 = 3;
@@ -7168,7 +7162,7 @@ void daAlink_c::setItemMatrix(int param_0) {
if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) {
mShieldModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30c2));
if (i_checkShieldGet()) {
if (checkShieldGet()) {
field_0x2e44.offPassNum(0xF);
mDoAud_setLinkShieldType(1, 1);
} else {
@@ -7187,7 +7181,7 @@ void daAlink_c::setItemMatrix(int param_0) {
mDoMtx_stack_c::XYZrotM(cM_deg2s(91.0f), cM_deg2s(57.0f), cM_deg2s(180.0f));
mShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
if (!i_checkShieldGet()) {
if (!checkShieldGet()) {
mDoAud_setLinkShieldType(0, 2);
field_0x2e44.onPassNum(0x10);
} else {
@@ -7469,7 +7463,7 @@ BOOL daAlink_c::checkNoCollisionCorret() {
(!strcmp(dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") ||
(fopAcM_getTalkEventPartner(this) &&
fopAcM_getTalkEventPartner(this) == getMidnaActor()))) ||
eventInfo.i_checkCommandDoor())
eventInfo.checkCommandDoor())
{
return true;
}
@@ -7710,7 +7704,7 @@ void daAlink_c::setAtCollision() {
mRopeLinChk.Set(&spBC, &spB0, this);
if (dComIfG_Bgsp().LineCross(&mRopeLinChk)) {
spB0 = mRopeLinChk.i_GetCross();
spB0 = mRopeLinChk.GetCross();
}
mAtCps[0].SetStartEnd(spBC, spB0);
@@ -9923,7 +9917,7 @@ void daAlink_c::setFrontWallType() {
f32 sp40;
if (checkModeFlg(2)) {
field_0x34ec = mLinkLinChk.i_GetCross();
field_0x34ec = mLinkLinChk.GetCross();
} else {
sp40 = linchk_tri.getSignedLenPos(&current.pos);
field_0x34ec.set(current.pos.x - (sp40 * linchk_tri.mNormal.x), current.pos.y, current.pos.z - (sp40 * linchk_tri.mNormal.z));
@@ -10102,7 +10096,7 @@ void daAlink_c::setFrontWallType() {
BOOL sp24 = commonLineCheck(&chk_start_pos, &chk_end_pos);
if (sp24) {
chk_start_pos = mLinkLinChk.i_GetCross();
chk_start_pos = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &spCC);
chk_start_pos.x = (chk_start_pos.x + (25.0f * spCC.mNormal.x));
chk_start_pos.z = (chk_start_pos.z + (25.0f * spCC.mNormal.z));
@@ -10571,7 +10565,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2
}
if (checkHorseRide()) {
dComIfGp_getHorseActor()->i_setHorsePosAndAngle(&current.pos, shape_angle.y);
dComIfGp_getHorseActor()->setHorsePosAndAngle(&current.pos, shape_angle.y);
} else if (checkSpinnerRide()) {
fopAc_ac_c* rideAc = mRideAcKeep.getActor();
rideAc->current.pos = current.pos;
@@ -12181,8 +12175,8 @@ BOOL daAlink_c::checkAutoJumpAction() {
if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) {
if (sp14 >= sp10 && (!checkBootsOrArmorHeavy() || checkIronBallWaitAnime()) && (field_0x33a8 > 0.85f || (checkIronBallWaitAnime() && field_0x33ac > 0.85f) || mProcID == PROC_WOLF_GIANT_PUZZLE || checkEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP)) && cLib_distanceAngleS(temp_r26, shape_angle.y) < 0x800) {
if (var_r29) {
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
}
if (checkWolf()) {
@@ -12197,9 +12191,9 @@ BOOL daAlink_c::checkAutoJumpAction() {
}
}
if (!checkEndResetFlg0(ERFLG0_NOT_HANG) && mSpecialMode != 0x2B && var_r29 && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 2 && sp28 < -daAlinkHIO_wallHang_c0::m.hang_foot_pos_height && current.pos.y - mWaterY > sp18 && (fabsf(sp44.mNormal.y) <= 0.05f || (sp44.mNormal.y < 0.05f && var_r27 && getWallEdgePos(mLinkLinChk.i_GetCross(), &sp44, &sp58, mLinkLinChk.GetCrossP(), 0)))) {
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
if (!checkEndResetFlg0(ERFLG0_NOT_HANG) && mSpecialMode != 0x2B && var_r29 && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 2 && sp28 < -daAlinkHIO_wallHang_c0::m.hang_foot_pos_height && current.pos.y - mWaterY > sp18 && (fabsf(sp44.mNormal.y) <= 0.05f || (sp44.mNormal.y < 0.05f && var_r27 && getWallEdgePos(mLinkLinChk.GetCross(), &sp44, &sp58, mLinkLinChk.GetCrossP(), 0)))) {
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
if (!checkWolf() && checkClimbCode(mLinkLinChk)) {
mPolyInfo1.SetPolyInfo(mLinkLinChk);
@@ -13141,7 +13135,7 @@ BOOL daAlink_c::checkItemAction() {
}
}
if (((dComIfGs_isEventBit(0x2908) || checkNoResetFlg3(FLG3_UNK_8)) && checkGuardActionChange() && !checkUpperReadyThrowAnime() && !checkModeFlg(0x70C52) && i_checkShieldGet() && !checkNotBattleStage()) && ((mLinkAcch.ChkGroundHit() || checkMagneBootsOn()) && dComIfGp_getRStatus() == 0)) {
if (((dComIfGs_isEventBit(0x2908) || checkNoResetFlg3(FLG3_UNK_8)) && checkGuardActionChange() && !checkUpperReadyThrowAnime() && !checkModeFlg(0x70C52) && checkShieldGet() && !checkNotBattleStage()) && ((mLinkAcch.ChkGroundHit() || checkMagneBootsOn()) && dComIfGp_getRStatus() == 0)) {
setRStatus(0x3A);
if (spActionTrigger()) {
@@ -13249,7 +13243,7 @@ BOOL daAlink_c::checkSwordTwirlAnime() const {
/* 800B93F4-800B9580 0B3D34 018C+00 7/7 0/0 0/0 .text swordEquip__9daAlink_cFi */
void daAlink_c::swordEquip(int param_0) {
if (i_checkSwordGet()) {
if (checkSwordGet()) {
field_0x2fde = 0x103;
if (checkReinRide()) {
@@ -14593,7 +14587,7 @@ void daAlink_c::posMove() {
if (commonLineCheck(&spC0, &spB4)) {
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &plane);
f32 temp_f31 = spB4.abs(mLinkLinChk.i_GetCross());
f32 temp_f31 = spB4.abs(mLinkLinChk.GetCross());
mDoMtx_multVecSR(mMagneBootInvMtx, &plane.mNormal, &spCC);
if (cBgW_CheckBWall(spCC.y)) {
@@ -14639,7 +14633,7 @@ void daAlink_c::autoGroundHit() {
sp5C = current.pos + (sp50 * 100.0f);
if (commonMagneLineCheck(&sp68, &sp5C)) {
current.pos = mMagneLineChk.i_GetCross();
current.pos = mMagneLineChk.GetCross();
onNoResetFlg0(FLG0_UNK_2000);
if (checkNoResetFlg1(FLG1_UNK_20000000)) {
@@ -15112,7 +15106,7 @@ int daAlink_c::checkSceneChange(int exitID) {
exit_mode = 0;
}
if (eventInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG ||
if (eventInfo.checkCommandDoor() || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG ||
mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 ||
dComIfGp_event_compulsory(this, NULL, -1))
{
@@ -15146,7 +15140,7 @@ int daAlink_c::checkSceneChange(int exitID) {
if (scn_changed) {
onNoResetFlg0(FLG0_UNK_4000);
if (!eventInfo.i_checkCommandDoor()) {
if (!eventInfo.checkCommandDoor()) {
mDemo.setOriginalDemoType();
if (checkUpperReadyThrowAnime()) {
@@ -15327,7 +15321,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
mRopeLinChk.Set(&field_0x3834, &mHeldItemRootPos, this);
if (dComIfG_Bgsp().LineCross(&mRopeLinChk)) {
*param_1 = mRopeLinChk.i_GetCross();
*param_1 = mRopeLinChk.GetCross();
onResetFlg0(RFLG0_UNK_2000000);
return 1;
}
@@ -15352,7 +15346,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
BOOL temp_r3 = dComIfG_Bgsp().LineCross(var_r30);
if (temp_r3) {
*param_1 = var_r30->i_GetCross();
*param_1 = var_r30->GetCross();
onResetFlg0(RFLG0_UNK_2000000);
}
@@ -15913,10 +15907,10 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
if (commonLineCheck(&sp38, &sp2C)) {
sp2C.x = (sp38.x * 2.0f) - sp2C.x;
sp2C.z = (sp38.z * 2.0f) - sp2C.z;
sp20 = mLinkLinChk.i_GetCross();
sp20 = mLinkLinChk.GetCross();
if (commonLineCheck(&sp38, &sp2C)) {
if (mLinkLinChk.i_GetCross().abs2XZ(sp20) < 14400.0f) {
if (mLinkLinChk.GetCross().abs2XZ(sp20) < 14400.0f) {
return ITEM_PROC_NONE;
}
}
@@ -16438,7 +16432,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
if (prev_proc_fishcast &&
(mItemAcKeep.getActor() == NULL ||
!mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt()) &&
!mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt()) &&
!checkEndResetFlg0(ERFLG0_UNK_1000))
{
deleteEquipItem(0, 0);
src/d/actor/d_a_alink_bottle.inc
+1 -1
View File
@@ -641,7 +641,7 @@ int daAlink_c::procBottleSwing() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
if (mProcVar2.field_0x300c == 0) {
if (eventInfo.i_checkCommandCatch()) {
if (eventInfo.checkCommandCatch()) {
if (mProcVar3.field_0x300e == 0) {
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
mProcVar3.field_0x300e = 1;
src/d/actor/d_a_alink_crawl.inc
+4 -4
View File
@@ -167,7 +167,7 @@ int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int
int temp_r27 = dComIfG_Bgsp().GetSpecialCode(mLinkLinChk);
if (cBgW_CheckBWall(sp3C.mNormal.y) || (param_3 == 2 && cBgW_CheckBGround(sp3C.mNormal.y))) {
cXyz sp1C = *param_1 - mLinkLinChk.i_GetCross();
cXyz sp1C = *param_1 - mLinkLinChk.GetCross();
s16 temp_r26 = sp3C.mNormal.atan2sX_Z();
s16 temp_r3 = sp1C.atan2sX_Z();
@@ -205,7 +205,7 @@ int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int
}
if (param_3 == 1 && (temp_r27 == 1 || (sp3C.mNormal.y < field_0x3470 && temp_r27 == 2))) {
*param_2 = *param_1 - mLinkLinChk.i_GetCross();
*param_2 = *param_1 - mLinkLinChk.GetCross();
return 1;
}
}
@@ -247,7 +247,7 @@ BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2,
if (commonLineCheck(param_0, param_1)) {
cM3dGPla sp64;
*param_2 = mLinkLinChk.i_GetCross();
*param_2 = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp64);
*param_4 = sp64.mNormal.atan2sX_Z();
@@ -255,7 +255,7 @@ BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2,
sp4C = *param_2 + (sp64.mNormal * 95.0f);
sp58 = (sp4C + *param_2) * 0.5f;
if (commonLineCheck(&sp58, &sp4C)) {
*param_3 = mLinkLinChk.i_GetCross();
*param_3 = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp64);
*param_5 = sp64.mNormal.atan2sX_Z();
src/d/actor/d_a_alink_cut.inc
+1 -1
View File
@@ -119,7 +119,7 @@ bool daAlink_c::checkCutFastReady() {
if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80)))
{
if (checkModeFlg(1) && !checkRideOn() && i_checkSwordGet() && checkModeFlg(4) &&
if (checkModeFlg(1) && !checkRideOn() && checkSwordGet() && checkModeFlg(4) &&
!checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
{
f32 xz_dist = target_p->eyePos.abs2XZ(current.pos);
src/d/actor/d_a_alink_damage.inc
+3 -3
View File
@@ -106,7 +106,7 @@ void daAlink_c::checkCutLandDamage() {
/* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */
BOOL daAlink_c::checkCaughtEscapeCutTurn() {
if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || checkWolf()) &&
if (mLinkAcch.ChkGroundHit() && (checkSwordGet() || checkWolf()) &&
checkCutTurnInputTrigger())
{
if (checkWolf()) {
@@ -1458,8 +1458,8 @@ int daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2,
s16 temp_r29 = cM_atan2s(sp18.mNormal.y, sp18.mNormal.absXZ());
current.angle.y = temp_r26;
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
setOldRootQuaternion(param_2, 0, param_3);
src/d/actor/d_a_alink_demo.inc
+1 -1
View File
@@ -199,7 +199,7 @@ int daAlink_c::checkDemoAction() {
if (mDemo.getParam0() != 0) {
freeGrabItem();
if (mDemo.getParam0() == 1 && i_checkSwordGet()) {
if (mDemo.getParam0() == 1 && checkSwordGet()) {
if (mEquipItem != 0x103) {
deleteEquipItem(FALSE, TRUE);
if (checkEquipAnime()) {
src/d/actor/d_a_alink_grab.inc
+3 -3
View File
@@ -362,7 +362,7 @@ void daAlink_c::setGrabItemPos() {
if (grabLineCheck(&sp110, &sp104)) {
if (temp_r3->current.pos.abs(sp110) > mObjLinChk.GetCrossP()->abs(sp110)) {
temp_r3->speedF = 0.0f;
temp_r3->current.pos = mObjLinChk.i_GetCross();
temp_r3->current.pos = mObjLinChk.GetCross();
freeGrabItem();
return;
}
@@ -431,7 +431,7 @@ void daAlink_c::freeGrabItem() {
cXyz sp14(current.pos.x, field_0x34e0.y, current.pos.z);
if (grabLineCheck(&sp14, &temp_r3->current.pos)) {
temp_r3->current.pos = mObjLinChk.i_GetCross();
temp_r3->current.pos = mObjLinChk.GetCross();
cM3dGPla sp20;
dComIfG_Bgsp().GetTriPla(mObjLinChk, &sp20);
@@ -659,7 +659,7 @@ void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c*
param_0.Set(&field_0x37c8, param_1, param_2);
if (dComIfG_Bgsp().LineCross(&param_0) && dBgS_CheckBWallPoly(param_0)) {
cXyz sp8 = *param_1 - param_0.i_GetCross();
cXyz sp8 = *param_1 - param_0.GetCross();
f32 temp_f31 = sp8.abs();
f32 temp_f1 = sp8.absXZ();
src/d/actor/d_a_alink_guard.inc
+3 -3
View File
@@ -63,7 +63,7 @@ void daAlink_c::stickArrowIncrement(int param_0) {
}
if (arrow_num != 0) {
if (i_checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) {
if (checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) {
int arrow_type = arrow_num == 1 ? fpcNm_ITEM_ARROW_1 : fpcNm_ITEM_ARROW_10;
dComIfGp_setItemArrowNumCount(arrow_num);
@@ -175,7 +175,7 @@ BOOL daAlink_c::checkUpperGuardAnime() const {
/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */
BOOL daAlink_c::checkPlayerGuard() const {
return (checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) ||
return (checkSmallUpperGuardAnime() || (checkShieldGet() && checkHorseLieAnime())) ||
checkUpperGuardAnime();
}
@@ -186,7 +186,7 @@ BOOL daAlink_c::checkPlayerGuardAndAttack() const {
/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */
BOOL daAlink_c::checkGuardAccept() {
return checkModeFlg(0x80) && i_checkShieldGet() && !checkFmChainGrabAnime() &&
return checkModeFlg(0x80) && checkShieldGet() && !checkFmChainGrabAnime() &&
!checkNotBattleStage();
}
src/d/actor/d_a_alink_hang.inc
+9 -9
View File
@@ -83,7 +83,7 @@ BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) {
return true;
}
sp9C = mLinkLinChk.i_GetCross() - sp90;
sp9C = mLinkLinChk.GetCross() - sp90;
if (sp9C.abs2XZ() > param_1->abs2XZ()) {
*param_1 = sp9C;
rt = true;
@@ -664,7 +664,7 @@ int daAlink_c::procHangMove() {
if (abs(temp_r25) < 100) {
field_0x308c = 0;
} else {
cXyz spC8(mLinkLinChk.i_GetCross());
cXyz spC8(mLinkLinChk.GetCross());
spC8.x -= spA4.mNormal.x * 1.5f;
spC8.y += 25.0f;
spC8.z -= spA4.mNormal.z * 1.5f;
@@ -1743,7 +1743,7 @@ void daAlink_c::setClimbShapeOffset() {
sp60.z += var_f30;
if (commonLineCheck(&sp54, &sp60) && (!checkModeFlg(0x10000) || checkClimbCode(mLinkLinChk))) {
sp78 = mLinkLinChk.i_GetCross();
sp78 = mLinkLinChk.GetCross();
} else {
field_0x308c = 0;
return;
@@ -1757,7 +1757,7 @@ void daAlink_c::setClimbShapeOffset() {
if (!commonLineCheck(&sp54, &sp60) || (checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk))) {
field_0x308c = 0;
} else {
sp78 -= mLinkLinChk.i_GetCross();
sp78 -= mLinkLinChk.GetCross();
cLib_addCalcAngleS(&field_0x308c, (s16)((sp78.atan2sX_Z() - 0x4000) - shape_angle.y), 5,
2000, 400);
}
@@ -1928,8 +1928,8 @@ int daAlink_c::setMoveBGClimbCorrect() {
s16 temp_r28 = shape_angle.y;
shape_angle.y = temp_r29 + 0x8000;
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
current.angle.y += (s16)(shape_angle.y - temp_r28);
field_0x308c += (s16)(temp_r28 - shape_angle.y);
@@ -1948,7 +1948,7 @@ int daAlink_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) {
if (cLib_distanceAngleS(tri_plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x549F ||
(checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk)))
{
current.pos += mLinkLinChk.i_GetCross() - *i_endPos;
current.pos += mLinkLinChk.GetCross() - *i_endPos;
return 1;
}
}
@@ -2911,8 +2911,8 @@ int daAlink_c::procRoofHangFrontMove() {
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp70);
if (cLib_distanceAngleS(sp70.mNormal.atan2sX_Z(), shape_angle.y) > 0x6000) {
current.pos.x = sp70.mNormal.x * 15.0f + mLinkLinChk.i_GetCross().x;
current.pos.z = sp70.mNormal.z * 15.0f + mLinkLinChk.i_GetCross().z;
current.pos.x = sp70.mNormal.x * 15.0f + mLinkLinChk.GetCross().x;
current.pos.z = sp70.mNormal.z * 15.0f + mLinkLinChk.GetCross().z;
return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation);
}
}

Some files were not shown because too many files have changed in this diff Show More