mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-11 11:33:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_alink work / bump dtk version (#2205)

Browse Source
This commit is contained in:
TakaRikka
2024-10-12 15:11:17 -07:00
committed by GitHub
parent 12eb254d76
commit 8514737d46
64 changed files with 1369 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_alink.h
+15 -12
View File
@@ -145,7 +145,7 @@ public:
/* 800D0B8C */ virtual ~daAlink_matAnm_c();
/* 8009D90C */ virtual void calc(J3DMaterial*) const;
static void decMorfFrame() {}
static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); }
static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; }
static u8 m_morf_frame;
@@ -681,6 +681,7 @@ public:
FTANM_UNK_9B = 0x9B,
FTANM_UNK_9C = 0x9C,
FTANM_UNK_9D = 0x9D,
FTANM_UNK_9E = 0x9E,
FTANM_UNK_9F = 0x9F,
FTANM_UNK_A0 = 0xA0,
FTANM_UNK_A1 = 0xA1,
@@ -1774,12 +1775,12 @@ public:
/* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int);
/* 800D7478 */ void setDamagePointNormal(int);
/* 800D74A4 */ void setLandDamagePoint(int);
/* 800D74F4 */ Vec* getDamageVec(dCcD_GObjInf*);
/* 800D74F4 */ cXyz* getDamageVec(dCcD_GObjInf*);
/* 800D76C4 */ void setDashDamage();
/* 800D7768 */ static BOOL checkIcePolygonDamage(cBgS_PolyInfo*);
/* 800D77C8 */ BOOL checkMagicArmorNoDamage();
/* 800D7820 */ void checkPolyDamage();
/* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7820 */ int checkPolyDamage();
/* 800D7A98 */ BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
/* 800D7B18 */ void damageTimerCount();
/* 800D7BE8 */ bool checkHugeAttack(int) const;
/* 800D7C14 */ bool checkLargeAttack(int) const;
@@ -1800,7 +1801,7 @@ public:
/* 800DB418 */ int procCoElecDamage();
/* 800DB5B0 */ int procStEscapeInit();
/* 800DB610 */ int procStEscape();
/* 800DB6A4 */ int procDkCaughtInit(unsigned int);
/* 800DB6A4 */ int procDkCaughtInit(fpc_ProcID);
/* 800DB860 */ int procDkCaught();
/* 800DBC98 */ void setScreamWaitAnime();
/* 800DBD1C */ int procScreamWaitInit();
@@ -3048,7 +3049,7 @@ public:
virtual void onFrollCrashFlg(u8, int);
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const;
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
@@ -3137,8 +3138,8 @@ public:
virtual BOOL checkCutJumpMode() const;
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
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
@@ -3199,8 +3200,9 @@ public:
BOOL checkCopyRodReadyAnime() const { return mEquipItem == COPY_ROD && checkUpperAnime(0x54); }
BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(0x5D) || checkUpperAnime(0x260); }
BOOL checkCopyRodControllAnime() const { return checkUpperAnime(0x202); }
BOOL checkWolfHeadDamageAnime() const { return checkUpperAnime(0x2A7); }
s16 checkWolfEyeUp() const { return mWolfEyeUp; }
int checkWolfEyeUp() const { return mWolfEyeUp; }
void onModeFlg(u32 flag) { mModeFlg |= flag; }
void offModeFlg(u32 flag) { mModeFlg &= ~flag; }
bool swordButton() { return itemButtonCheck(8); }
@@ -3249,7 +3251,7 @@ 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]; }
BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
u32 checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; }
int getGrassHowlEventActor() const { return field_0x3198; }
MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); }
MtxP getMagneBootsMtx() { return mMagneBootMtx; }
@@ -3582,8 +3584,8 @@ public:
/* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ unsigned int mShieldArrowIDs[16];
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028B0 */ fpc_ProcID mShieldArrowIDs[16];
/* 0x028F0 */ fpc_ProcID mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
/* 0x028FC */ int field_0x28fc;
@@ -3722,6 +3724,7 @@ public:
union {
s16 field_0x3008;
s16 mHowlExitID;
s16 mIceFreezeTimer;
} /* 0x03008 */ mProcVar0;
union {
s16 field_0x300a;
include/d/actor/d_a_b_bq.h
+2 -2
View File
@@ -39,8 +39,8 @@ public:
/* 0x06D0 */ f32 mDistToPlayer;
/* 0x06D4 */ s16 mTimers[5];
/* 0x06DE */ s16 field_0x6de;
/* 0x06E0 */ unsigned int mTentacleIDs[2];
/* 0x06E8 */ unsigned int mMonkeyBombID;
/* 0x06E0 */ fpc_ProcID mTentacleIDs[2];
/* 0x06E8 */ fpc_ProcID mMonkeyBombID;
/* 0x06EC */ u8 field_0x6ec;
/* 0x06ED */ s8 mColpatType;
/* 0x06F0 */ f32 mColpatBlend;
include/d/actor/d_a_canoe.h
+1 -1
View File
@@ -37,7 +37,7 @@ public:
bool checkJumpRideFlg() { return mJumpRideFlg; }
void incShapeOffsetY(f32 offset) { mShapeOffsetY += offset; }
void incShapeAngleZ(s16 incZ) { shape_angle.z += incZ; }
void onRodID(unsigned int i_rodID) { mRodID = i_rodID; }
void onRodID(fpc_ProcID i_rodID) { mRodID = i_rodID; }
void setWaterFallDownSe() { field_0x141c.startSound(Z2SE_AL_CANOE_FALL_DW, 0, -1); }
void setPosAndAngle(cXyz const* i_pos, s16 i_angle) {
include/d/actor/d_a_horse.h
+2
View File
@@ -206,6 +206,8 @@ public:
bool checkGetOff() const { return fabsf(speedF) < 3.0f; }
bool checkEnemySearch() { return checkResetStateFlg0(ENEMY_SEARCH); }
bool checkOriginalDemo() const { return field_0x16b8 == 3; }
s16 checkCowHit() const { return mCowHit; }
s16 getCowHitAngle() const { return mCowHitAngle; }
void onTagJump(f32 param_0, f32 param_1, f32 param_2) {
field_0x1768 = param_0;
include/d/actor/d_a_midna.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
void onForcePanic();
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
bool checkMidnaTired();
static bool checkMidnaTired();
void onNoServiceWait();
/* 804BC3E0 */ void modelCallBack(int);
include/d/actor/d_a_myna.h
+2 -2
View File
@@ -87,7 +87,7 @@ public:
/* 80948644 */ void attack2_move();
/* 809486F8 */ void attack2_talk_init();
/* 80948734 */ void attack2_talk_move();
/* 809487EC */ void soldoutItem(unsigned int);
/* 809487EC */ void soldoutItem(fpc_ProcID);
/* 80948828 */ bool fly_attack_move();
/* 80948ADC */ bool fly_return_move();
/* 80948DFC */ void fly_body_wave();
@@ -95,7 +95,7 @@ public:
/* 80948FAC */ int chkEvent();
/* 809490B8 */ int orderEvent();
/* 80949128 */ void deleteItem(int);
/* 80949144 */ void deleteItem(unsigned int);
/* 80949144 */ void deleteItem(fpc_ProcID);
/* 80949190 */ void initiate();
/* 80949408 */ void setItemInfo();
/* 80949544 */ void setRoomNo();
include/d/actor/d_a_player.h
+12 -8
View File
@@ -255,7 +255,7 @@ public:
};
enum daPy_FLG1 {
FLG1_UNK_40000000 = 0x40000000,
FLG1_ICE_FREEZE = 0x40000000,
FLG1_UNK_20000000 = 0x20000000,
FLG1_UNK_10000000 = 0x10000000,
FLG1_UNK_4000000 = 0x4000000,
@@ -387,6 +387,8 @@ public:
ERFLG1_UNK_100000 = 0x100000,
ERFLG1_UNK_40000 = 0x40000,
ERFLG1_UNK_10000 = 0x10000,
ERFLG1_UNK_8000 = 0x8000,
ERFLG1_UNK_4000 = 0x4000,
ERFLG1_UNK_2000 = 0x2000,
ERFLG1_UNK_1000 = 0x1000,
ERFLG1_UNK_800 = 0x800,
@@ -437,6 +439,7 @@ public:
};
enum daPy_RFLG1 {
RFLG1_UNK_400 = 0x400,
RFLG1_UNK_200 = 0x200,
RFLG1_UNK_100 = 0x100,
RFLG1_UNK_80 = 0x80,
@@ -551,8 +554,8 @@ public:
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
BOOL checkShieldGet();
BOOL checkSwordGet();
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
cXyz getHeadTopPos() const;
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
@@ -641,7 +644,7 @@ public:
virtual void onFrollCrashFlg(u8, int); // weak
virtual MtxP getModelJointMtx(u16);
virtual MtxP getHeadMtx();
virtual bool setHookshotCarryOffset(unsigned int, cXyz const*);
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const { return FALSE; }
virtual bool checkIronBallReturn() const;
virtual bool checkIronBallGroundStop() const;
@@ -766,12 +769,13 @@ public:
bool checkSceneChangeAreaStart() const { return checkNoResetFlg2(FLG2_SCN_CHG_START); }
bool checkFrontRollCrash() const { return checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
bool checkWolfAttackReverse() const { return checkResetFlg1(RFLG1_WOLF_ATTACK_REVERSE); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_UNK_40000000); }
bool checkFreezeDamage() const { return checkNoResetFlg1(FLG1_ICE_FREEZE); }
bool checkWolfTagLockJumpReady() const { return checkResetFlg0(RFLG0_UNK_20000); }
bool getGrabUpEnd() const { return checkResetFlg0(RFLG0_GRAB_UP_END); }
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)); }
void onBossRoomWait() { onEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT); }
void onBeeFollow() { onEndResetFlg0(ERFLG0_BEE_FOLLOW); }
@@ -852,10 +856,10 @@ public:
cXyz* getRightHandPosP() { return &mRightHandPos; }
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
BOOL checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
BOOL checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
u32 checkMagneBootsOn() const { return checkNoResetFlg0(FLG0_MAGNE_BOOTS_ON); }
BOOL checkFastSwordCut() const { return checkNoResetFlg0(FLG0_UNK_80000); }
bool checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
u32 checkMidnaRide() const { return checkNoResetFlg0(FLG0_MIDNA_RIDE); }
void onPlayerNoDraw() { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void offPlayerNoDraw() { offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void onPushPullKeep() { onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }