diff options
| author | Jeff Padgham <jeff.ookami@gmail.com> | 2024-04-26 19:12:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-26 19:12:56 -0700 |
| commit | c163dc9ed31c69eb791be1dcdcd7ab8b296e95a1 (patch) | |
| tree | 569d09bb0c51bde94264b8faeb83cee6b4ae1278 /include/d/a | |
| parent | 9e80bf0d84c150b07ca14cea53ee6d2f82b073c2 (diff) | |
d_a_arrow work (#2139)
* WIP commit, about halfway done
* More progress, fixed up some issues
* Most functions match, minor issues in draw/create, dtor needs particle work
* Forgot to remove NONMATCHING define
---------
Co-authored-by: GinNoOokami <noreply>
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_alink.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 5914b1077d..7c06fa2c6f 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -1762,7 +1762,7 @@ public: /* 800D74A4 */ void setLandDamagePoint(int); /* 800D74F4 */ Vec* getDamageVec(dCcD_GObjInf*); /* 800D76C4 */ void setDashDamage(); - /* 800D7768 */ static bool checkIcePolygonDamage(cBgS_PolyInfo*); + /* 800D7768 */ static BOOL checkIcePolygonDamage(cBgS_PolyInfo*); /* 800D77C8 */ BOOL checkMagicArmorNoDamage(); /* 800D7820 */ void checkPolyDamage(); /* 800D7A98 */ bool checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**); @@ -3237,6 +3237,7 @@ public: BOOL checkReinRide() const { return mRideStatus == 1 || mRideStatus == 2; } int getGrassHowlEventActor() const { return field_0x3198; } MtxP getShieldMtx() const { return mShieldModel->getBaseTRMtx(); } + MtxP getMagneBootsMtx() { return mMagneBootMtx; } bool checkFishingCastMode() const { bool var_r5; @@ -3360,6 +3361,8 @@ public: s8 getOnLineNum() { return mZ2WolfHowlMgr.getOnLineNum(); } SongNote getCorrectLine(u8 param_0) { return mZ2WolfHowlMgr.getCorrectLine(param_0); } + void itemHitSE(u32 param_1, u32 param_2, Z2SoundObjBase* param_3) { mZ2Link.startHitItemSE(param_1, param_2, param_3, -1.0f); } + inline bool checkWindSpeedOnXZ() const; inline void startRestartRoomFromOut(int, u32, int); inline u16 getReadyItem(); |