mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
m_Do cleanup, d_resource, drawlist stuff (#145)
* d_resource / some d_stage * setup dDlst_list_c / d_select_icon OK * JUTXfb / some JUTVideo + various * some J2D classes / JUTVideo/Fader attempts * bunch of m_Do cleanup + matches / f_ap_game OK * mDoLib_clipper::setup OK * most of d_meter_HIO OK * pane_class / kantera_icon_meter
This commit is contained in:
TakaRikka
+32
-31
@@ -29,7 +29,7 @@ class J2DScreen;
|
||||
class J2DPane;
|
||||
class J2DAnmBase;
|
||||
|
||||
class daAlink_lockCursor_c : public dDlst_base_c {
|
||||
class daAlink_lockCursor_c {
|
||||
public:
|
||||
/* 80125F14 */ void create();
|
||||
/* 80126358 */ void update();
|
||||
@@ -2172,6 +2172,7 @@ public:
|
||||
u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
|
||||
bool checkUpperAnime(u16 pIdx) const { return mUpperAnime[UPPER_NOW].getIdx() == pIdx; }
|
||||
bool checkIronBallWaitAnime() const { return checkUpperAnime(0x19C); }
|
||||
s16 checkWolfEyeUp() const { return mWolfEyeUp; }
|
||||
|
||||
static u8 const m_mainBckShield[80];
|
||||
static u8 const m_mainBckSword[20];
|
||||
@@ -2299,7 +2300,7 @@ private:
|
||||
/* 0x02170 */ u8 field_0x2170[0x18];
|
||||
/* 0x02188 */ dEyeHL_c mEyeHL1;
|
||||
/* 0x0219C */ dEyeHL_c mEyeHL2;
|
||||
/* 0x021B0 */ daPy_anmHeap_c mAnmHeap8[2];
|
||||
/* 0x021B0 */ daPy_anmHeap_c mItemHeap[2];
|
||||
/* 0x021D8 */ daPy_anmHeap_c mAnmHeap9;
|
||||
/* 0x021EC */ u8 field_0x21ec[4];
|
||||
/* 0x021F0 */ daAlink_blur_c mBlur;
|
||||
@@ -2541,7 +2542,7 @@ private:
|
||||
/* 0x030A6 */ s16 field_0x30a6;
|
||||
/* 0x030A8 */ u16 field_0x30a8;
|
||||
/* 0x030AA */ u16 field_0x30aa;
|
||||
/* 0x030AC */ s16 field_0x30ac;
|
||||
/* 0x030AC */ s16 mWolfEyeUp;
|
||||
/* 0x030AE */ u16 field_0x30ae;
|
||||
/* 0x030B0 */ s16 field_0x30b0;
|
||||
/* 0x030B2 */ s16 field_0x30b2;
|
||||
@@ -2801,32 +2802,32 @@ struct daAlinkHIO_anm_c {
|
||||
}; // size = 0x14
|
||||
|
||||
struct daAlinkHIO_basic_c1 {
|
||||
/* 0x00 */ s16 field_0x00;
|
||||
/* 0x02 */ s16 mNeckAimAngleX;
|
||||
/* 0x04 */ s16 mNeckAimAngleY;
|
||||
/* 0x06 */ s16 mNeckAimAngleZ;
|
||||
/* 0x00 */ bool mOneHitKill;
|
||||
/* 0x02 */ s16 mNeckMaxHorizontal;
|
||||
/* 0x04 */ s16 mNeckMaxUp;
|
||||
/* 0x06 */ s16 mNeckMaxDown;
|
||||
/* 0x08 */ s16 field_0x08;
|
||||
/* 0x0A */ s16 field_0x0a;
|
||||
/* 0x0C */ s16 field_0x0c;
|
||||
/* 0x0E */ s16 field_0x0e;
|
||||
/* 0x10 */ s16 mMetamorphoseFarAngle;
|
||||
/* 0x0A */ s16 mHotspringRecoverTime;
|
||||
/* 0x0C */ s16 mWiiCamSpeedV;
|
||||
/* 0x0E */ s16 mWiiCamSpeedH;
|
||||
/* 0x10 */ s16 mTransformBlockFarAngle;
|
||||
/* 0x14 */ f32 field_0x14;
|
||||
/* 0x18 */ f32 mAnmBlendFactor;
|
||||
/* 0x1C */ f32 mWaitTurnSpeed;
|
||||
/* 0x20 */ f32 field_0x20;
|
||||
/* 0x24 */ f32 field_0x24;
|
||||
/* 0x28 */ f32 field_0x28;
|
||||
/* 0x2C */ f32 field_0x2c;
|
||||
/* 0x30 */ f32 field_0x30;
|
||||
/* 0x34 */ f32 field_0x34;
|
||||
/* 0x38 */ f32 field_0x38;
|
||||
/* 0x3C */ f32 field_0x3c;
|
||||
/* 0x40 */ f32 field_0x40;
|
||||
/* 0x44 */ f32 field_0x44;
|
||||
/* 0x48 */ f32 field_0x48;
|
||||
/* 0x4C */ f32 field_0x4c;
|
||||
/* 0x50 */ f32 mMetamorphoseNearDis;
|
||||
/* 0x54 */ f32 mMetamorphoseFarDis;
|
||||
/* 0x20 */ f32 mStandDefenseBlend;
|
||||
/* 0x24 */ f32 mWaterSurfaceEffectHeight;
|
||||
/* 0x28 */ f32 mWolfWaterSurfaceEffectHeight;
|
||||
/* 0x2C */ f32 mMaxWindInfluenceDist;
|
||||
/* 0x30 */ f32 mNoWindInfluenceDist;
|
||||
/* 0x34 */ f32 mMaxWindSpeed;
|
||||
/* 0x38 */ f32 mLavaDeathDepth;
|
||||
/* 0x3C */ f32 mLinkWolfTransformSpeed;
|
||||
/* 0x40 */ f32 mWolfLinkTransformSpeed;
|
||||
/* 0x44 */ f32 mIndoorSpeedFactor;
|
||||
/* 0x48 */ f32 mSandSinkSpeed;
|
||||
/* 0x4C */ f32 mSandSurfaceSpeed;
|
||||
/* 0x50 */ f32 mTransformBlockNearDis;
|
||||
/* 0x54 */ f32 mTransformBlockFarDis;
|
||||
};
|
||||
|
||||
class daAlinkHIO_basic_c0 {
|
||||
@@ -2836,10 +2837,10 @@ public:
|
||||
|
||||
class daAlinkHIO_autoJump_c1 {
|
||||
public:
|
||||
/* 0x00 */ daAlinkHIO_anm_c field_0x00;
|
||||
/* 0x14 */ daAlinkHIO_anm_c field_0x14;
|
||||
/* 0x28 */ daAlinkHIO_anm_c field_0x28;
|
||||
/* 0x3C */ daAlinkHIO_anm_c field_0x3c;
|
||||
/* 0x00 */ daAlinkHIO_anm_c mJump;
|
||||
/* 0x14 */ daAlinkHIO_anm_c mLand;
|
||||
/* 0x28 */ daAlinkHIO_anm_c mDive;
|
||||
/* 0x3C */ daAlinkHIO_anm_c mDiveUnk;
|
||||
/* 0x50 */ u8 field_0x50;
|
||||
/* 0x52 */ s16 field_0x52;
|
||||
/* 0x54 */ s16 field_0x54;
|
||||
@@ -2851,8 +2852,8 @@ public:
|
||||
/* 0x68 */ f32 field_0x68;
|
||||
/* 0x6C */ f32 field_0x6c;
|
||||
/* 0x70 */ f32 field_0x70;
|
||||
/* 0x74 */ f32 field_0x74;
|
||||
/* 0x78 */ f32 field_0x78;
|
||||
/* 0x74 */ f32 mGravity;
|
||||
/* 0x78 */ f32 mMaxFallSpeed;
|
||||
/* 0x7C */ f32 field_0x7c;
|
||||
/* 0x80 */ f32 field_0x80;
|
||||
/* 0x84 */ f32 field_0x84;
|
||||
|
||||
+14
-13
@@ -41,7 +41,7 @@ public:
|
||||
daPy_anmHeap_c(u32);
|
||||
~daPy_anmHeap_c();
|
||||
void initData();
|
||||
void mallocBuffer();
|
||||
void* mallocBuffer();
|
||||
void createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE);
|
||||
J3DAnmBase* loadData(u16);
|
||||
J3DAnmBase* loadDataIdx(u16);
|
||||
@@ -59,9 +59,9 @@ private:
|
||||
/* 0x02 */ u16 mPriIdx;
|
||||
/* 0x04 */ u16 mArcNo;
|
||||
/* 0x06 */ u16 field_0x06;
|
||||
/* 0x08 */ int mBufferSize;
|
||||
/* 0x08 */ u32 mBufferSize;
|
||||
/* 0x0C */ void* mBuffer;
|
||||
/* 0x10 */ JKRHeap* mAnimeHeap;
|
||||
/* 0x10 */ JKRSolidHeap* mAnimeHeap;
|
||||
}; // Size = 0x14
|
||||
|
||||
class daPy_actorKeep_c {
|
||||
@@ -167,16 +167,16 @@ public:
|
||||
void checkBombItem(int);
|
||||
void checkBottleItem(int);
|
||||
void checkDrinkBottleItem(int);
|
||||
int checkOilBottleItem(int);
|
||||
void checkOpenBottleItem(int);
|
||||
void checkBowItem(int);
|
||||
void checkHookshotItem(int);
|
||||
void checkTradeItem(int);
|
||||
BOOL checkDungeonWarpItem(int);
|
||||
void checkMasterSwordEquip();
|
||||
static BOOL checkOilBottleItem(int);
|
||||
static BOOL checkOpenBottleItem(int);
|
||||
static BOOL checkBowItem(int);
|
||||
static BOOL checkHookshotItem(int);
|
||||
static BOOL checkTradeItem(int);
|
||||
static BOOL checkDungeonWarpItem(int);
|
||||
BOOL checkMasterSwordEquip();
|
||||
void checkWoodShieldEquip();
|
||||
void getAttentionOffsetY();
|
||||
void checkNowWolfEyeUp();
|
||||
f32 getAttentionOffsetY();
|
||||
s16 checkNowWolfEyeUp();
|
||||
void forceRestartRoom(int, u32, int);
|
||||
void setFmChainPos(fopAc_ac_c*, cXyz*, int);
|
||||
void cancelFmChainGrab();
|
||||
@@ -386,7 +386,7 @@ public:
|
||||
virtual bool checkCopyRodEquip(void) const;
|
||||
virtual bool checkCutJumpMode(void) const;
|
||||
|
||||
inline bool getSumouCameraMode() const {
|
||||
bool getSumouCameraMode() const {
|
||||
bool sumouCameraMode = false;
|
||||
if (field_0x560[0xA] != 0 && field_0x560[0xA] < 0x26) {
|
||||
sumouCameraMode = true;
|
||||
@@ -405,6 +405,7 @@ public:
|
||||
void i_onEndResetFlg1(daPy_ERFLG1 pFlg) { mEndResetFlg1 |= pFlg; }
|
||||
int i_checkWolf() { return i_checkNoResetFlg1(Wolf); }
|
||||
BOOL i_checkEquipHeavyBoots() const { return i_checkNoResetFlg0(EquipHeavyBoots); }
|
||||
inline BOOL checkNowWolf();
|
||||
|
||||
static u8 m_midnaActor[4];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user