d_a_hookshot 33%

This commit is contained in:
LagoLunatic
2023-11-08 04:02:20 -05:00
parent 47303cd4b7
commit 5b7cd2e1b2
16 changed files with 384 additions and 92 deletions
+67
View File
@@ -0,0 +1,67 @@
#ifndef D_A_HOOKSHOT_H
#define D_A_HOOKSHOT_H
#include "f_op/f_op_actor_mng.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "d/d_cc_d.h"
#include "d/d_bg_s_lin_chk.h"
#include "d/d_bg_s_gnd_chk.h"
class daHookshot_shape : public J3DPacket {
public:
void draw();
daHookshot_shape() {}
~daHookshot_shape() {}
};
class daHookshot_c : public fopAc_ac_c {
public:
typedef BOOL (daHookshot_c::*ProcFunc)();
int getChainCnt() { return mChainCnt; }
void onObjHookFlg() {}
void offObjHookFlg() {}
void setObjSightCrossPos(const cXyz*) {}
void getObjSightCrossPos() {}
daHookshot_c() {}
BOOL draw();
BOOL procWait_init(int);
BOOL procWait();
BOOL procShot();
BOOL procPlayerPull();
BOOL procReturn();
BOOL execute();
BOOL hookshot_delete();
s32 create();
public:
/* 0x290 */ daHookshot_shape mShape;
/* 0x2A0 */ bool m2A0;
/* 0x2A1 */ u8 m2A1;
/* 0x2A2 */ u8 m2A2;
/* 0x2A3 */ u8 m2A3;
/* 0x2A4 */ s16 m2A4;
/* 0x2A6 */ u16 m2A6;
/* 0x2A8 */ int mChainCnt;
/* 0x2AC */ u32 mMtrlSndId;
/* 0x2B0 */ int m2B0;
/* 0x2B4 */ s16 m2B4;
/* 0x2B6 */ s16 m2B6;
/* 0x2B8 */ s16 m2B8;
/* 0x2BA */ csXyz m2BA;
/* 0x2C0 */ cXyz m2C0;
/* 0x2CC */ cXyz m2CC;
/* 0x2D8 */ dBgS_RopeLinChk mLinChk;
/* 0x344 */ dBgS_ObjGndChk mGndChk;
/* 0x398 */ dCcD_Stts mStts;
/* 0x3D4 */ dCcD_Cps mCps;
/* 0x50C */ cXyz m50C;
/* 0x518 */ u32 m518;
/* 0x51C */ Mtx m51C;
/* 0x54C */ ProcFunc mCurrProcFunc;
};
// dBgS_RopeLinChk
#endif /* D_A_HOOKSHOT_H */
+3 -3
View File
@@ -1222,7 +1222,7 @@ public:
void getBoomerangCatchPos() const;
void getLineTopPos();
void getHookshotRootPos() const;
cXyz getHookshotRootPos() const { return mHookshotRootPos; }
void seStartOnlyReverb(u32);
void seStartMapInfo(u32);
void seStartSwordCut(u32);
@@ -2087,7 +2087,7 @@ public:
virtual void voiceStart(u32);
virtual void setOutPower(f32, s16, int);
virtual void onFrollCrashFlg(u32);
virtual MtxP getModelJointMtx(u16);
virtual MtxP getModelJointMtx(u16 idx) { return mpCLModel->getAnmMtx(idx); }
virtual f32 getOldSpeedY();
virtual BOOL setHookshotCarryOffset(unsigned int, const cXyz*);
virtual void setPlayerPosAndAngle(cXyz*, s16);
@@ -2404,7 +2404,7 @@ public:
/* 0x36C4 */ cXyz m36C4;
/* 0x36D0 */ cXyz m36D0;
/* 0x36DC */ cXyz m36DC;
/* 0x36E8 */ cXyz m36E8;
/* 0x36E8 */ cXyz mHookshotRootPos;
/* 0x36F4 */ u8 m36F4[0x3700 - 0x36F4];
/* 0x3700 */ cXyz m3700;
/* 0x370C */ cXyz m370C;