mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 14:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

alink horse mostly done (#2229)

Browse Source 
* d_a_horse work

* more work on alink horse

* finish alink horse

* little work on d_a_alink_link
This commit is contained in:
TakaRikka
2024-10-30 15:41:08 -07:00
committed by GitHub
parent 7f2e42ba19
commit 36519ddf15
10 changed files with 1702 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J3DGraphBase/J3DTransform.h
+2
View File
@@ -23,6 +23,7 @@ struct J3DTransformInfo {
return *this;
} */
#ifdef __MWERKS__
inline J3DTransformInfo& operator=(const register J3DTransformInfo& b) {
register const J3DTransformInfo& var_r31 = b;
register J3DTransformInfo& var_r30 = *this;
@@ -46,6 +47,7 @@ struct J3DTransformInfo {
}
return *this;
}
#endif
}; // Size: 0x20
extern J3DTransformInfo const j3dDefaultTransformInfo;
include/d/actor/d_a_alink.h
+24 -44
View File
@@ -676,6 +676,10 @@ public:
FTANM_UNK_9 = 9,
FTANM_UNK_13 = 0x13,
FTANM_UNK_14 = 0x14,
FTANM_UNK_20 = 0x20,
FTANM_UNK_21 = 0x21,
FTANM_UNK_22 = 0x22,
FTANM_UNK_23 = 0x23,
FTANM_UNK_27 = 0x27,
FTANM_UNK_2D = 0x2D,
FTANM_UNK_48 = 0x48,
@@ -1677,8 +1681,8 @@ public:
/* 800CB480 */ bool checkSwordDraw();
/* 800CB53C */ bool checkShieldDraw();
/* 800CB5F8 */ bool checkItemDraw();
/* 800CB694 */ void initShadowScaleLight();
/* 800CBA38 */ void moveShadowScaleLight();
/* 800CB694 */ int initShadowScaleLight();
/* 800CBA38 */ int moveShadowScaleLight();
/* 800CBC18 */ void shadowDraw();
/* 800CC25C */ void modelCalc(J3DModel*);
/* 800CC298 */ void basicModelDraw(J3DModel*);
@@ -1709,7 +1713,7 @@ public:
/* 800D014C */ void setMidnaTalkStatus(u8 status) {
dComIfGp_setZStatus(status, 0);
}
/* 800D0164 */ void set3DStatus(u8, u8);
/* 800D0164 */ void set3DStatus(u8 status, u8 direction) { dComIfGp_set3DStatus(status, direction, 0); }
/* 800D2684 */ void checkCutTurnCharge();
/* 800D0E08 */ void checkLightSwordMtrl();
/* 800D0E98 */ BOOL checkSwordEquipAnime() const;
@@ -2093,14 +2097,14 @@ public:
/* 800ECD90 */ BOOL checkHorseNotDamageReaction() const;
/* 800ECDC4 */ BOOL checkHorseWaitLashAnime() const;
/* 800ECDEC */ BOOL checkHorseReinLeftOnly() const;
/* 800ECE10 */ void getReinHandType() const;
/* 800ECE10 */ int getReinHandType() const;
/* 800ECF04 */ BOOL checkHorseLieAnime() const;
/* 800ECF5C */ BOOL checkHorseSubjectivity() const;
/* 800ECF9C */ void setHorseSwordUpAnime();
/* 800ECFF4 */ void setHorseTurnUpperAnime(int);
/* 800ED074 */ BOOL checkHorseNoUpperAnime() const;
/* 800ED0D4 */ void getHorseReinHandPos(cXyz*, cXyz*);
/* 800ED1F0 */ void checkHorseNotGrab() const;
/* 800ED1F0 */ BOOL checkHorseNotGrab() const;
/* 800ED310 */ void setHorseStirrup();
/* 800ED4B8 */ void changeBoarRunRide();
/* 800ED4DC */ int setSyncHorsePos();
@@ -2127,7 +2131,7 @@ public:
/* 800EF394 */ void horseGetOffEnd();
/* 800EF450 */ int checkNextActionHorse();
/* 800EF598 */ BOOL checkHorseGetOff();
/* 800EF6B0 */ void checkHorseGetOffAndSetDoStatus();
/* 800EF6B0 */ int checkHorseGetOffAndSetDoStatus();
/* 800EF884 */ int setHorseGetOff(int);
/* 800EF95C */ int procHorseRideInit();
/* 800EFDC4 */ int procHorseRide();
@@ -4115,12 +4119,12 @@ struct daAlink_cutParamTbl {
}; // Size: 0x10
struct daAlink_cutHorseParamTbl {
/* 0x0 */ int field_0x0;
/* 0x4 */ u16 field_0x4;
/* 0x6 */ u16 field_0x6;
/* 0x0 */ daAlink_c::daAlink_FTANM m_faceanm;
/* 0x4 */ u16 m_upperAnm;
/* 0x6 */ u16 m_faceBtk;
/* 0x8 */ u8 field_0x8;
/* 0x9 */ u8 field_0x9;
/* 0xA */ u8 field_0xa;
/* 0xA */ u8 m_cutType;
}; // Size: 0xC
struct daAlinkHIO_anm_c {
@@ -4446,56 +4450,32 @@ public:
static daAlinkHIO_cutTurn_c1 const m;
};
class daAlinkHIO_hoCutLA_c1 {
class daAlinkHIO_hoCut_c1 {
public:
/* 0x00 */ daAlinkHIO_anm_c field_0x0;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1C;
}; // Size: 0x20
/* 0x00 */ daAlinkHIO_anm_c mCutAnm;
/* 0x14 */ f32 mAttackStartFrame;
/* 0x18 */ f32 mAttackEndFrame;
/* 0x1C */ f32 mAfterCutMorf;
};
class daAlinkHIO_hoCutLA_c0 {
public:
static daAlinkHIO_hoCutLA_c1 const m;
static daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutLB_c1 {
public:
/* 0x00 */ daAlinkHIO_anm_c field_0x0;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1C;
}; // Size: 0x20
class daAlinkHIO_hoCutLB_c0 {
public:
static daAlinkHIO_hoCutLB_c1 const m;
static daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutRA_c1 {
public:
/* 0x00 */ daAlinkHIO_anm_c field_0x0;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1C;
}; // Size: 0x20
class daAlinkHIO_hoCutRA_c0 {
public:
static daAlinkHIO_hoCutRA_c1 const m;
static daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutRB_c1 {
public:
/* 0x00 */ daAlinkHIO_anm_c field_0x0;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1C;
}; // Size: 0x20
class daAlinkHIO_hoCutRB_c0 {
public:
static daAlinkHIO_hoCutRB_c1 const m;
static daAlinkHIO_hoCut_c1 const m;
};
class daAlinkHIO_hoCutCharge_c1 {
include/d/actor/d_a_e_wb.h
+4 -1
View File
@@ -35,6 +35,9 @@ public:
f32 nowAnimeFrame() const { return field_0x5e0->getFrame(); }
s16 getWaitRollAngle() const { return mWaitRollAngle; }
bool checkGetOff() const { return speedF < 3.0f; }
f32 rideSpeedRate() const { return speedF / mSpeedRate; }
f32 getAnimeFrameRate() { return field_0x5e0->getFrame() / field_0x5e0->getEndFrame(); }
BOOL checkAnmLoopFrame() { return field_0x5e0->checkFrame(0.0f); }
J3DModel* getModel() {
if (field_0x5e0 != NULL) {
@@ -188,4 +191,4 @@ class daE_WB_HIO_c {
};
#endif /* D_A_E_WB_H */
#endif /* D_A_E_WB_H */
include/d/actor/d_a_horse.h
+63 -27
View File
@@ -7,6 +7,7 @@
#include "d/d_bg_s_lin_chk.h"
#include "d/d_cc_d.h"
#include "d/d_msg_flow.h"
#include "m_Do/m_Do_audio.h"
class daHorseRein_c {
public:
@@ -47,31 +48,37 @@ class daHorse_c : public fopAc_ac_c {
public:
enum daHorse_ERFLG0 {
/* 0x001 */ ERFLG0_UNK_1 = 0x1,
/* 0x010 */ MOVE_ACCEPT = 0x10,
/* 0x080 */ RIDE_RUN_FLG = 0x80,
/* 0x100 */ CUT_TURN_CANCEL = 0x100,
/* 0x010 */ ERFLG0_MOVE_ACCEPT = 0x10,
/* 0x080 */ ERFLG0_RIDE_RUN_FLG = 0x80,
/* 0x100 */ ERFLG0_CUT_TURN_CANCEL = 0x100,
ERFLG0_UNK_18 = 0x18,
};
enum daHorse_RFLG0 {
/* 0x02 */ ENEMY_SEARCH = 2,
/* 0x08 */ LASH_DASH_START = 8,
/* 0x10 */ TURN_STAND = 0x10,
/* 0x40 */ TURN_STAND_CAMERA = 0x40,
/* 0x02 */ RFLG0_ENEMY_SEARCH = 2,
/* 0x08 */ RFLG0_LASH_DASH_START = 8,
/* 0x10 */ RFLG0_TURN_STAND = 0x10,
/* 0x40 */ RFLG0_TURN_STAND_CAMERA = 0x40,
};
enum daHorse_FLG0 {
/* 0x00000020 */ RODEO_LEFT = 0x20,
/* 0x00000040 */ RIDE_START_FLG = 0x40,
/* 0x00000080 */ NO_DRAW_WAIT = 0x80,
/* 0x00010000 */ PLAYER_BACK_RIDE_LASH = 0x10000,
/* 0x20000000 */ TURN_CANCEL_KEEP = 0x20000000,
/* 0x00000020 */ FLG0_RODEO_LEFT = 0x20,
/* 0x00000040 */ FLG0_RIDE_START_FLG = 0x40,
/* 0x00000080 */ FLG0_NO_DRAW_WAIT = 0x80,
/* 0x00010000 */ FLG0_PLAYER_BACK_RIDE_LASH = 0x10000,
/* 0x00400000 */ FLG0_UNK_400000 = 0x400000,
/* 0x20000000 */ FLG0_TURN_CANCEL_KEEP = 0x20000000,
/* 0x80000000 */ FLG0_RODEO_MODE = 0x80000000
};
fopAc_ac_c* getZeldaActor();
/* 807E27BC */ void cancelOriginalDemo();
void cancelOriginalDemo() {
field_0x16b8 = 2;
field_0x1740 = 1;
}
/* 807E27F8 */ void onDemoJumpDistance(f32, f32);
/* 807E28B8 */ void changeDemoPos0(cXyz const*);
/* 807E28E0 */ void setHorsePosAndAngle(cXyz const*, s16);
@@ -166,7 +173,7 @@ public:
bool checkNoBombProc() const { return field_0x16b4 == 0 || field_0x16b4 == 1; }
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return mResetStateFlg0 & flag; }
bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) const { return mEndResetStateFlg0 & flag; }
bool checkStateFlg0(daHorse_FLG0 flag) const { return mStateFlg0 & flag; }
u32 checkStateFlg0(daHorse_FLG0 flag) const { return mStateFlg0 & flag; }
f32 getNormalMaxSpeedF() { return mNormalMaxSpeedF; }
f32 getLashMaxSpeedF() { return mLashMaxSpeedF; }
void changeDemoMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
@@ -179,7 +186,8 @@ public:
void onStateFlg0(daHorse_FLG0 flag) { mStateFlg0 |= flag; }
void offStateFlg0(daHorse_FLG0 flag) { mStateFlg0 &= ~flag; }
void onEndResetStateFlg0(daHorse_ERFLG0 i_flag) { mEndResetStateFlg0 |= i_flag;}
void offNoDrawWait() { offStateFlg0(NO_DRAW_WAIT); }
void offEndResetStateFlg0(daHorse_ERFLG0 i_flag) { mEndResetStateFlg0 &= ~i_flag;}
void offNoDrawWait() { offStateFlg0(FLG0_NO_DRAW_WAIT); }
bool checkSpecialWallHit(const cXyz& param_0) { return (this->*mpCheckSpecialWallHitFn)(param_0); }
MtxP getSaddleMtx() { return field_0x570->getAnmMtx(21); }
MtxP getRootMtx() { return field_0x570->getAnmMtx(0); }
@@ -193,21 +201,23 @@ public:
daHoZelda_c* i_getZeldaActor() { return (daHoZelda_c*)mZeldaActorKeep.getActor(); }
bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); }
bool checkRodeoMode() const { return checkStateFlg0(FLG0_RODEO_MODE); }
bool checkCutTurnCancel() const { return checkEndResetStateFlg0(CUT_TURN_CANCEL); }
bool checkTurnCancelKeep() const { return checkStateFlg0(TURN_CANCEL_KEEP); }
bool checkTurn() const { return field_0x16b4 == 3 && field_0x1720 == 0; }
bool checkStop() const { return field_0x16b4 == 2; }
bool checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
u32 checkRodeoMode() const { return checkStateFlg0(FLG0_RODEO_MODE); }
bool checkCutTurnCancel() const { return checkEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
bool checkTurnCancelKeep() const { return checkStateFlg0(FLG0_TURN_CANCEL_KEEP); }
BOOL checkRodeoLeft() const { return checkStateFlg0(FLG0_RODEO_LEFT); }
BOOL checkTurn() const { return field_0x16b4 == 3 && field_0x1720 == 0; }
BOOL checkStop() const { return field_0x16b4 == 2; }
bool checkJump() const { return field_0x16b4 == 4; }
bool checkWait() const { return field_0x16b4 == 0; }
bool checkLand() const { return field_0x16b4 == 5 && field_0x171a == 0; }
bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
bool checkEnemySearch() { return checkResetStateFlg0(ENEMY_SEARCH); }
bool checkEnemySearch() { return checkResetStateFlg0(RFLG0_ENEMY_SEARCH); }
bool checkOriginalDemo() const { return field_0x16b8 == 3; }
s16 checkCowHit() const { return mCowHit; }
s16 getCowHitAngle() const { return mCowHitAngle; }
u8 getRodeoPointCnt() const { return mRodeoPointCnt; }
void onTagJump(f32 param_0, f32 param_1, f32 param_2) {
field_0x1768 = param_0;
@@ -216,10 +226,20 @@ public:
onEndResetStateFlg0(ERFLG0_UNK_1);
}
void onMoveAccept() { onEndResetStateFlg0(MOVE_ACCEPT); }
void onMoveAccept() { onEndResetStateFlg0(ERFLG0_MOVE_ACCEPT); }
void onPlayerLash() { onEndResetStateFlg0(ERFLG0_UNK_18); }
void offPlayerBackRideLash() { offStateFlg0(PLAYER_BACK_RIDE_LASH); }
void offPlayerBackRideLash() { offStateFlg0(FLG0_PLAYER_BACK_RIDE_LASH); }
void onRodeoMode() { onStateFlg0(FLG0_RODEO_MODE); }
void onRideStartFlg() { onStateFlg0(FLG0_RIDE_START_FLG); }
void onRideRunFlg() { onEndResetStateFlg0(ERFLG0_RIDE_RUN_FLG); }
void onPlayerBackRideLash() { onStateFlg0(FLG0_PLAYER_BACK_RIDE_LASH); }
void onCutTurnCancel() { onEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
void offCutTurnCancel() { offEndResetStateFlg0(ERFLG0_CUT_TURN_CANCEL); }
void onTurnCancelKeep() { onStateFlg0(FLG0_TURN_CANCEL_KEEP); }
void offTurnCancelKeep() { offStateFlg0(FLG0_TURN_CANCEL_KEEP); }
BOOL checkTurnCancelFrame() const { return checkTurn() && field_0x177C < field_0x5b0[0].getFrame(); }
BOOL checkStopCancelFrame() const { return checkStop() && field_0x177C < field_0x5b0[0].getFrame(); }
void initHorseMtx() {
mDoMtx_stack_c::transS(current.pos);
@@ -228,9 +248,22 @@ public:
field_0x570->calc();
}
void offRodeoMode() {
offStateFlg0(daHorse_FLG0(FLG0_RODEO_MODE | FLG0_UNK_400000));
field_0x16bc = 0;
mDoAud_subBgmStop();
}
void setSpeedF(f32 i_speed) { speedF = i_speed; }
void setWalkSpeedF() { speedF = field_0x1764; }
MtxP getLeftStirrupMtx() { return field_0x570->getAnmMtx(0x17); }
MtxP getRightStirrupMtx() { return field_0x570->getAnmMtx(0x19); }
void calcWeightEnvMtx() { field_0x570->calcWeightEnvelopeMtx(); }
void setReinPosNormal() { (this->*mpSetReinPosNormalFn)(); }
void setReinPosHand(int param_0) { (this->*mpSetReinPosHandFn)(param_0); }
static u8 const m_footJointTable[8];
static f32 const m_callLimitDistance2;
@@ -266,7 +299,8 @@ public:
/* 0x16B8 */ u8 field_0x16b8;
/* 0x16B9 */ u8 field_0x16b9[2];
/* 0x16BB */ u8 mRodeoPointCnt;
/* 0x16BC */ u8 field_0x16bc[0x16C4 - 0x16BC];
/* 0x16BC */ u8 field_0x16bc;
/* 0x16BD */ u8 field_0x16bd[0x16C4 - 0x16BD];
/* 0x16C4 */ u16 mAnmIdx[3];
/* 0x16CA */ u8 field_0x16ca[0x16F2 - 0x16CA];
/* 0x16F2 */ s16 mAimNeckAngleY;
@@ -294,7 +328,9 @@ public:
/* 0x1768 */ f32 field_0x1768;
/* 0x176C */ f32 field_0x176c;
/* 0x1770 */ f32 field_0x1770;
/* 0x1774 */ u8 field_0x1774[0x14];
/* 0x1774 */ u8 field_0x1774[0x177C - 0x1774];
/* 0x177C */ f32 field_0x177C;
/* 0x1780 */ u8 field_0x1780[0x1788 - 0x1780];
/* 0x1788 */ f32 mDemoStickR;
/* 0x178C */ f32 mNormalMaxSpeedF;
/* 0x1790 */ f32 mLashMaxSpeedF;
include/d/actor/d_a_player.h
+7 -4
View File
@@ -291,10 +291,9 @@ public:
FLG2_UNK_4000000 = 0x4000000,
FLG2_UNK_2080000 = 0x2080000,
FLG2_UNK_2000000 = 0x2000000,
FLG2_BOAR_SINGLE_BATTLE = 0x1800000,
FLG2_UNK_8000000 = 0x8000000,
FLG2_UNK_1000000 = 0x1000000,
FLG2_UNK_800000 = 0x800000,
FLG2_BOAR_SINGLE_BATTLE = 0x800000,
FLG2_STATUS_WINDOW_DRAW = 0x400000,
FLG2_UNK_280000 = 0x280000,
FLG2_UNK_200000 = 0x200000,
@@ -307,8 +306,10 @@ public:
FLG2_UNK_4000 = 0x4000,
FLG2_UNK_2000 = 0x2000,
FLG2_UNK_1000 = 0x1000,
FLG2_UNK_800 = 0x800,
FLG2_PLAYER_SHADOW = 0x400,
FLG2_UNK_200 = 0x200,
FLG2_UNK_100 = 0x100,
FLG2_UNK_80 = 0x80,
FLG2_WOLF_ENEMY_HANG_BITE = 0x40,
FLG2_WOLF_ENEMY_LEFT_THROW = 0x20,
@@ -368,6 +369,7 @@ public:
ERFLG0_BEE_FOLLOW = 0x400000,
ERFLG0_UNK_200000 = 0x200000,
ERFLG0_UNK_100000 = 0x100000,
ERFLG0_UNK_80000 = 0x80000,
ERFLG0_UNK_40000 = 0x40000,
ERFLG0_UNK_20000 = 0x20000,
ERFLG0_UNK_10000 = 0x10000,
@@ -799,7 +801,7 @@ public:
bool getGrabPutStart() const { return checkResetFlg0(RFLG0_GRAB_PUT_START); }
bool checkSwimUp() const { return checkNoResetFlg0(FLG0_SWIM_UP); }
BOOL checkHorseZelda() const { return checkNoResetFlg2(FLG2_HORSE_ZELDA); }
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_UNK_800000)); }
BOOL checkSpecialHorseRide() { return checkNoResetFlg2(daPy_FLG2(FLG2_HORSE_ZELDA | FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
BOOL checkBoardNoFootAngle() const { return checkResetFlg1(RFLG1_UNK_40); }
bool checkGrabThrow() const { return checkResetFlg0(RFLG0_GRAB_THROW); }
@@ -813,6 +815,7 @@ public:
void onFogFade() { onNoResetFlg2(FLG2_UNK_4000); }
BOOL checkStickArrowReset() const { return checkResetFlg0(RFLG0_UNK_1); }
u32 getCutAtFlg() const { return checkNoResetFlg0(FLG0_UNK_40); }
u32 checkBoarSingleBattleFirst() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
void offWolfEnemyHangBite() { offNoResetFlg2(FLG2_WOLF_ENEMY_HANG_BITE); }
bool onWolfEnemyHangBite(fopAc_ac_c* param_0) { return onWolfEnemyBiteAll(param_0, FLG2_WOLF_ENEMY_HANG_BITE); }
@@ -907,7 +910,7 @@ public:
void onNsScream() { onEndResetFlg1(ERFLG1_UNK_1); }
void onNsScreamAnm() { onEndResetFlg1(daPy_ERFLG1(ERFLG1_UNK_1 | ERFLG1_UNK_2)); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
u32 checkBoarSingleBattle() const { return checkNoResetFlg2(daPy_FLG2(FLG2_UNK_1000000 | FLG2_BOAR_SINGLE_BATTLE)); }
u32 checkWolfDashAutoJump() const { return checkNoResetFlg2(FLG2_WOLF_DASH_AUTO_JUMP); }
void changeOriginalDemo() {
include/m_Do/m_Do_audio.h
+4
View File
@@ -48,6 +48,10 @@ inline void mDoAud_subBgmStart(u32 i_bgmID) {
Z2AudioMgr::getInterface()->subBgmStart(i_bgmID);
}
inline void mDoAud_subBgmStop() {
Z2AudioMgr::getInterface()->subBgmStop();
}
inline void mDoAud_bgmNowBattle(f32 param_0) {
Z2AudioMgr::getInterface()->bgmNowBattle(param_0);
}