mirror of
https://github.com/zeldaret/tp
synced 2026-07-11 15:28:38 -04:00
d_a_e_yk 23/26 matched (#301)
* setup TU * daE_YK_HIO_c::daE_YK_HIO_c * anm_init * daE_YK_Draw * pl_check * damage_check * action * daE_YK_Delete * fly_move * e_yk_roof * useHeapInit * e_yk_wind * e_yk_chance * e_yk_return * e_yk_fly * e_yk_wolfbite * e_yk_fight * e_yk_attack * e_yk_path_fly * daE_YK_Execute and daE_YK_Create and float literal prep * pr cleanup * rm padding
This commit is contained in:
@@ -274,6 +274,7 @@ public:
|
||||
FLG2_UNK_200 = 0x200,
|
||||
FLG2_UNK_80 = 0x80,
|
||||
FLG2_UNK_40 = 0x40,
|
||||
FLG2_WOLF_ENEMY_LEFT_THROW = 0x20,
|
||||
FLG2_UNK_10 = 0x10,
|
||||
FLG2_UNK_8 = 8,
|
||||
FLG2_UNK_2 = 2,
|
||||
@@ -762,14 +763,18 @@ public:
|
||||
inline BOOL i_checkSwordGet();
|
||||
inline bool i_checkShieldGet() const;
|
||||
inline static BOOL checkNowWolf();
|
||||
inline static BOOL i_checkNowWolf() {
|
||||
return dComIfGp_getLinkPlayer()->i_checkWolf();
|
||||
}
|
||||
inline static BOOL i_checkNowWolf() { return dComIfGp_getLinkPlayer()->i_checkWolf(); }
|
||||
inline bool checkZoraWearFlg() const;
|
||||
inline bool checkMagicArmorWearFlg() const;
|
||||
|
||||
static daMidna_c* getMidnaActor() { return m_midnaActor; }
|
||||
|
||||
// not sure how to define this properly
|
||||
// static void onWolfEnemyCatch(fopAc_ac_c* i_actorP) { onWolfEnemyBiteAll(i_actorP,8);}
|
||||
|
||||
bool checkWolfEnemyCatchOwn(fopAc_ac_c* i_actorP) { return checkWolfEnemyBiteAllOwn(i_actorP); }
|
||||
bool checkWolfEnemyLeftThrow() const { return i_checkNoResetFlg2(FLG2_WOLF_ENEMY_LEFT_THROW); }
|
||||
|
||||
static daMidna_c* m_midnaActor;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
#ifndef D_CC_D_CC_D_H
|
||||
#define D_CC_D_CC_D_H
|
||||
|
||||
/**
|
||||
* d_cc_d.h
|
||||
* Actor Collision
|
||||
*/
|
||||
|
||||
#include "SSystem/SComponent/c_cc_d.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
@@ -134,6 +139,8 @@ public:
|
||||
class dCcD_GObjInf;
|
||||
typedef void (*dCcD_HitCallback)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
|
||||
|
||||
|
||||
// Attack/Defense/Correction Collider Common Base
|
||||
class dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
/* 0x00 */ u32 mGFlag;
|
||||
@@ -171,6 +178,8 @@ public:
|
||||
dCcD_HitCallback GetHitCallback() { return mHitCallback; }
|
||||
}; // Size = 0x1C
|
||||
|
||||
|
||||
// Attack (At) Collider
|
||||
class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
/* 80083944 */ void Set(dCcD_SrcGObjAt const&);
|
||||
@@ -199,6 +208,7 @@ public:
|
||||
/* 0x38 */ cXyz mRVec;
|
||||
}; // Size = 0x44
|
||||
|
||||
// Defense (Tg) Collider
|
||||
class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
/* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
|
||||
@@ -229,11 +239,13 @@ private:
|
||||
/* 0x48 */ s16 mShieldRange;
|
||||
}; // Size = 0x4A ?
|
||||
|
||||
// Correction (Co) Collider
|
||||
class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
/* 80083B8C */ virtual ~dCcD_GObjCo() {}
|
||||
}; // Size = 0x1C ?
|
||||
|
||||
// Object Info
|
||||
class dCcD_GObjInf : public cCcD_GObjInf {
|
||||
public:
|
||||
/* 80083A28 */ dCcD_GObjInf();
|
||||
@@ -343,6 +355,7 @@ protected:
|
||||
/* 0x0E8 */ dCcD_GObjCo mGObjCo;
|
||||
}; // Size = 0x104
|
||||
|
||||
// Cylinder
|
||||
class dCcD_Cyl : public dCcD_GObjInf, public cCcD_CylAttr {
|
||||
public:
|
||||
/* 800848B4 */ void Set(dCcD_SrcCyl const&);
|
||||
@@ -354,6 +367,7 @@ public:
|
||||
dCcD_Cyl() {}
|
||||
}; // Size = 0x13C
|
||||
|
||||
// Sphere
|
||||
class dCcD_Sph : public dCcD_GObjInf, public cCcD_SphAttr {
|
||||
public:
|
||||
dCcD_Sph() {}
|
||||
@@ -364,6 +378,8 @@ public:
|
||||
/* 80084BF4 */ virtual ~dCcD_Sph() {}
|
||||
}; // Size = 0x138
|
||||
|
||||
|
||||
// Capsule
|
||||
class dCcD_Cps : public dCcD_GObjInf, public cCcD_CpsAttr {
|
||||
public:
|
||||
/* 800847D0 */ void Set(dCcD_SrcCps const&);
|
||||
@@ -374,6 +390,7 @@ public:
|
||||
dCcD_Cps() {}
|
||||
}; // Size = 0x144
|
||||
|
||||
// Triangle
|
||||
class dCcD_Tri : public dCcD_GObjInf, public cCcD_TriAttr {
|
||||
public:
|
||||
/* 80084884 */ void Set(dCcD_SrcTri const&);
|
||||
|
||||
@@ -29,4 +29,6 @@ struct dCcU_AtInfo {
|
||||
/* 0x20 */ u8 mHitType;
|
||||
};
|
||||
|
||||
fopAc_ac_c* cc_at_check(fopAc_ac_c*,dCcU_AtInfo*);
|
||||
|
||||
#endif /* D_CC_D_CC_UTY_H */
|
||||
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
/* 80259BFC */ void offReset();
|
||||
|
||||
static bool isPause() { return pauseTimer == 0; }
|
||||
static void setPauseTimer(s8 time) { nextPauseTimer = time; }
|
||||
static void setPauseTimer(s8 time) { pauseTimer = time; }
|
||||
|
||||
static s8 pauseTimer;
|
||||
static s8 nextPauseTimer;
|
||||
|
||||
Reference in New Issue
Block a user