summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/SSystem/SComponent/c_bg_s_lin_chk.h1
-rw-r--r--include/Z2AudioLib/Z2LinkMgr.h3
-rw-r--r--include/d/actor/d_a_alink.h6
-rw-r--r--include/d/actor/d_a_b_gnd.h229
-rw-r--r--include/d/actor/d_a_formation_mng.h2
-rw-r--r--include/d/actor/d_a_guard_mng.h2
-rw-r--r--include/d/actor/d_a_horse.h8
-rw-r--r--include/d/actor/d_a_midna.h3
-rw-r--r--include/d/actor/d_a_player.h19
-rw-r--r--include/d/d_meter2_info.h2
-rw-r--r--include/f_op/f_op_actor.h18
11 files changed, 137 insertions, 156 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h
index 0b5116f3cb..b7d116f2e2 100644
--- a/include/SSystem/SComponent/c_bg_s_lin_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h
@@ -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; }
diff --git a/include/Z2AudioLib/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr.h
index 21c0509c13..d86f81cf8d 100644
--- a/include/Z2AudioLib/Z2LinkMgr.h
+++ b/include/Z2AudioLib/Z2LinkMgr.h
@@ -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; }
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index c63418f9bd..d8cd3b1dff 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -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;
}
diff --git a/include/d/actor/d_a_b_gnd.h b/include/d/actor/d_a_b_gnd.h
index b39343f27a..603f9d44bc 100644
--- a/include/d/actor/d_a_b_gnd.h
+++ b/include/d/actor/d_a_b_gnd.h
@@ -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;
diff --git a/include/d/actor/d_a_formation_mng.h b/include/d/actor/d_a_formation_mng.h
index bcf73ba099..648ee4ffd8 100644
--- a/include/d/actor/d_a_formation_mng.h
+++ b/include/d/actor/d_a_formation_mng.h
@@ -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;
diff --git a/include/d/actor/d_a_guard_mng.h b/include/d/actor/d_a_guard_mng.h
index 7a0dbf25f0..4d7e2e6c52 100644
--- a/include/d/actor/d_a_guard_mng.h
+++ b/include/d/actor/d_a_guard_mng.h
@@ -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) {
diff --git a/include/d/actor/d_a_horse.h b/include/d/actor/d_a_horse.h
index fdf887030c..c02b5458f6 100644
--- a/include/d/actor/d_a_horse.h
+++ b/include/d/actor/d_a_horse.h
@@ -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); }
diff --git a/include/d/actor/d_a_midna.h b/include/d/actor/d_a_midna.h
index c1077de6f8..0be675bf8b 100644
--- a/include/d/actor/d_a_midna.h
+++ b/include/d/actor/d_a_midna.h
@@ -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);
}
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 6588ae8ba8..bf844b0b00 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -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; }
diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h
index 0f49063324..a11eade4d8 100644
--- a/include/d/d_meter2_info.h
+++ b/include/d/d_meter2_info.h
@@ -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);
}
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index e9ae3e1a4d..8c8eaba1d2 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -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) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-20 06:54:20 +0000