mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-08 10:35:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_camera work (#2369)

Browse Source 
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
This commit is contained in:
Caroline Madsen
2025-04-01 22:05:30 -04:00
committed by GitHub
parent 2976066aa6
commit 03fafe3e15
56 changed files with 5623 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+10 -2
View File
@@ -3088,7 +3088,7 @@ public:
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const;
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const;
virtual u32 getGrabActorID() const;
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
@@ -3346,10 +3346,16 @@ public:
const daAlink_AnmData* getAnmData(daAlink_ANM anmID) const { return &m_anmDataTable[anmID]; }
const daAlink_FaceTexData* getFaceTexData(daAlink_FTANM i_anmID) const { return &m_faceTexDataTable[i_anmID]; }
s16 getCameraAngleX() const { return field_0x310a; }
s16 getCameraAngleY() const { return field_0x310c; }
cXyz* getSubjectEyePos() { return &field_0x3768; }
u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
MtxP getMagneBootsMtx() { return mMagneBootMtx; }
MtxP getMagneBootsInvMtx() { return mMagneBootInvMtx; }
s16 getMagneBootsModelShapeAngle() const { return field_0x3118; }
bool checkFishingCastMode() const {
bool var_r5;
@@ -3439,6 +3445,7 @@ public:
bool checkSpinnerRideWait() const {
return mProcID == PROC_SPINNER_WAIT && mProcVar2.field_0x300c == 0;
}
bool checkRoofSwitchHang() const { return mProcID == PROC_ROOF_SWITCH_HANG; }
fopAc_ac_c* getCopyRodActor() { return mCopyRodAcKeep.getActor(); }
fopAc_ac_c* getHookshotRoofWaitActor() { return mCargoCarryAcKeep.getActor(); }
@@ -3507,10 +3514,11 @@ public:
const cXyz& getWindSpeed() const { return mWindSpeed; }
const cXyz& getHsChainTopPos() const { return mHookshotTopPos; }
const cXyz& getHsChainRootPos() const { return mHeldItemRootPos; }
const cXyz& getHsSubChainRootPos() const { return field_0x3810; }
const csXyz& getHsAngle() const { return field_0x316c; }
s16 getHookshotStopTime() const { return field_0x3026; }
bool getHookshotLeft() const { return field_0x3020 == 0; }
static int getBallModelIdx() { return 0x25; }
static int getBallBtkIdx() { return 0x49; }
include/d/actor/d_a_horse.h
+2 -1
View File
@@ -221,7 +221,8 @@ public:
/* 80844590 */ int draw();
/* 8084478C */ ~daHorse_c();
/* 80182D04 */ void getLashDashStart() const;
/* 80182D04 */ bool getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
include/d/actor/d_a_player.h
+4 -4
View File
@@ -694,12 +694,12 @@ public:
inline static BOOL checkSwordGet();
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
bool checkGoronSideMove() const { return mSpecialMode == 0x2B; }
cXyz* getRightFootPosP() { return &mRightFootPos; }
cXyz* getLeftFootPosP() { return &mLeftFootPos; }
BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
u32 checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
cXyz getRightHandPos() const { return mRightHandPos; }
const cXyz getLeftHandPos() const { return mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
@@ -765,7 +765,7 @@ public:
virtual bool cancelWolfLock(fopAc_ac_c*);
virtual s32 getAtnActorID() const { return -1; }
virtual s32 getItemID() const;
virtual s32 getGrabActorID() const { return -1; }
virtual u32 getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
virtual void setForcePutPos(cXyz const&);
include/d/actor/d_a_tag_mwait.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
/* 80D5C01C */ ~daTagMwait_c();
/* 80D5C0A8 */ int execute();
bool checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
BOOL checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
/* 0x568 */ u8 mOnSw;
/* 0x569 */ u8 mEnterSw;