Action functions worked on

This commit is contained in:
Carter 2025-07-25 14:57:28 -04:00
parent e6a2729505
commit 8df5cf3293
2 changed files with 1214 additions and 455 deletions

View File

@ -11,80 +11,6 @@
* @details
*
*/
class daNpcShad_c : public daNpcF_c {
public:
/* 80AD820C */ daNpcShad_c() : daNpcF_c() {}
/* 80AD8420 */ ~daNpcShad_c();
/* 80AD8620 */ cPhs__Step Create();
/* 80AD8B60 */ void CreateHeap();
/* 80AD90E0 */ void Delete();
/* 80AD9114 */ void Execute();
/* 80AD9138 */ void Draw();
/* 80AD9280 */ void ctrlJoint(J3DJoint*, J3DModel*);
/* 80AD944C */ void createHeapCallBack(fopAc_ac_c*);
/* 80AD946C */ void ctrlJointCallBack(J3DJoint*, int);
/* 80AD94B8 */ bool setExpressionAnm(int, bool);
/* 80AD974C */ bool setExpressionBtp(int);
/* 80AD982C */ void setMotionAnm(int, f32);
/* 80AD99B4 */ void reset();
/* 80AD9C0C */ void setWaitAction();
/* 80AD9E04 */ bool getPathPoint(u8, int, Vec*);
/* 80AD9E90 */ void isSneaking();
/* 80AD9F00 */ void wait_type0(void*);
/* 80ADA630 */ void setMotion(int, f32, int);
/* 80ADA674 */ void setExpression(int, f32);
/* 80ADA6A0 */ void wait_type1(void*);
/* 80ADB428 */ void wait_type2(void*);
/* 80ADB628 */ void talk(void*);
/* 80ADBEA8 */ void demo(void*);
/* 80ADC3DC */ void leave(void*);
/* 80ADC700 */ void EvCut_Introduction(int);
/* 80ADC800 */ void EvCut_Meeting(int);
/* 80ADCAD8 */ void EvCut_ToChantSpell1(int);
/* 80ADD720 */ void EvCut_ToChantSpell2(int);
/* 80ADE47C */ void EvCut_ToChantSpell2Skip(int);
/* 80ADE5F8 */ void EvCut_DiscoveryCannon(int);
/* 80ADED68 */ void EvCut_DiscoveryCannonSkip(int);
/* 80ADEEE4 */ void EvCut_Disappear(int);
/* 80ADF810 */ void EvCut_DisappearSkip(int);
/* 80ADF8DC */ void EvCut_CallBack(int);
/* 80ADFB70 */ void EvCut_WiretapSponsor(int);
/* 80ADFE74 */ void EvCut_WiretapEntrant(int);
/* 80AE01BC */ void setParam();
/* 80AE0438 */ BOOL main();
/* 80AE04D8 */ void playMotion();
/* 80AE0B58 */ void playExpression();
/* 80AE0ED0 */ BOOL ctrlBtk();
/* 80AE0FAC */ void setAttnPos();
/* 80AE1320 */ void lookat();
/* 80AE153C */ BOOL drawDbgInfo();
static u8 mEvtSeqList[168];
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
s16 getMessageNo() { return shape_angle.x; }
private:
/* 0xB48 */ J3DModel* field_0xb48;
/* 0xB4C */ J3DModel* field_0xb4c;
/* 0xB50 */ Z2Creature mSound;
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookat;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[5];
/* 0xCA8 */ daPy_py_c* field_0xca8;
/* 0xCAC */ u8 field_0xcac[0xcb0 - 0xcac];
/* 0xCB0 */ dCcD_Cyl field_0xcb0;
/* 0xDEC */ u8 field_0xdec[0xe08 - 0xdec];
/* 0xE08 */ fpc_ProcID field_0xe08;
/* 0xE0C */ u8 field_0xe0c[0xe14 - 0xe0c];
/* 0xE14 */ s16 field_0xe14;
/* 0xE16 */ s16 field_0xe16;
/* 0xE18 */ s16 field_0xe18;
/* 0xE1A */ u8 field_0xe1a[0xe20 - 0xe1a];
/* 0xE20 */ u8 field_0xe20;
};
STATIC_ASSERT(sizeof(daNpcShad_c) == 0xe24);
struct daNpcShad_HIOParam {
/* 0x00 */ daNpcF_HIOParam common;
@ -98,5 +24,108 @@ public:
static const daNpcShad_HIOParam m;
};
class daNpcShad_c : public daNpcF_c {
public:
typedef bool (daNpcShad_c::*ActionFn)(void*);
typedef BOOL (daNpcShad_c::*EventFn)(int);
/* 80AD820C */ daNpcShad_c() : daNpcF_c() {}
/* 80AD8420 */ ~daNpcShad_c();
/* 80AD8620 */ cPhs__Step Create();
/* 80AD8B60 */ int CreateHeap();
/* 80AD90E0 */ int Delete();
/* 80AD9114 */ int Execute();
/* 80AD9138 */ int Draw();
/* 80AD9280 */ int ctrlJoint(J3DJoint*, J3DModel*);
/* 80AD944C */ static int createHeapCallBack(fopAc_ac_c*);
/* 80AD946C */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80AD94B8 */ bool setExpressionAnm(int, bool);
/* 80AD974C */ bool setExpressionBtp(int);
/* 80AD982C */ void setMotionAnm(int, f32);
/* 80AD99B4 */ void reset();
/* 80AD9C0C */ inline void setWaitAction();
/* 80AD9E04 */ bool getPathPoint(u8, int, Vec*);
/* 80AD9E90 */ inline bool isSneaking();
/* 80AD9F00 */ bool wait_type0(void*);
/* 80ADA630 */ void setMotion(int, f32, int);
/* 80ADA674 */ void setExpression(int, f32);
/* 80ADA6A0 */ bool wait_type1(void*);
/* 80ADB428 */ bool wait_type2(void*);
/* 80ADB628 */ bool talk(void*);
/* 80ADBEA8 */ bool demo(void*);
/* 80ADC3DC */ bool leave(void*);
/* 80ADC700 */ BOOL EvCut_Introduction(int);
/* 80ADC800 */ BOOL EvCut_Meeting(int);
/* 80ADCAD8 */ BOOL EvCut_ToChantSpell1(int);
/* 80ADD720 */ BOOL EvCut_ToChantSpell2(int);
/* 80ADE47C */ BOOL EvCut_ToChantSpell2Skip(int);
/* 80ADE5F8 */ BOOL EvCut_DiscoveryCannon(int);
/* 80ADED68 */ BOOL EvCut_DiscoveryCannonSkip(int);
/* 80ADEEE4 */ BOOL EvCut_Disappear(int);
/* 80ADF810 */ BOOL EvCut_DisappearSkip(int);
/* 80ADF8DC */ BOOL EvCut_CallBack(int);
/* 80ADFB70 */ BOOL EvCut_WiretapSponsor(int);
/* 80ADFE74 */ BOOL EvCut_WiretapEntrant(int);
/* 80AE01BC */ void setParam();
/* 80AE0438 */ BOOL main();
/* 80AE04D8 */ void playMotion();
/* 80AE0B58 */ void playExpression();
/* 80AE0ED0 */ BOOL ctrlBtk();
/* 80AE0FAC */ void setAttnPos();
/* 80AE1320 */ void lookat();
/* 80AE153C */ BOOL drawDbgInfo();
static EventFn mEvtSeqList[14];
u8 getPathID() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
s16 getMessageNo() { return shape_angle.x; }
inline void setAction(ActionFn action) {
field_0xe1a = 3;
if (mActionFn) {
(this->*mActionFn)(NULL);
}
field_0xe1a = 0;
mActionFn = action;
if (mActionFn) {
(this->*mActionFn)(NULL);
}
}
inline BOOL chkFindPlayer();
inline void setLookMode(int, daPy_py_c*, cXyz*);
inline BOOL step(s16, int, f32);
inline void setExpressionTalkAfter();
private:
/* 0xB48 */ J3DModel* field_0xb48;
/* 0xB4C */ J3DModel* field_0xb4c;
/* 0xB50 */ Z2Creature mSound;
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookat;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[5];
/* 0xCA8 */ daPy_py_c* field_0xca8;
/* 0xCAC */ u8 field_0xcac[0xcb0 - 0xcac];
/* 0xCB0 */ dCcD_Cyl field_0xcb0;
/* 0xDEC */ ActionFn mActionFn;
/* 0xDF8 */ request_of_phase_process_class mPhases[2];
/* 0xE08 */ fpc_ProcID field_0xe08;
/* 0xE0C */ int field_0xe0c;
/* 0xE10 */ int field_0xe10;
/* 0xE14 */ s16 field_0xe14;
/* 0xE16 */ s16 field_0xe16;
/* 0xE18 */ s16 field_0xe18;
/* 0xE1A */ u16 field_0xe1a;
/* 0xE1C */ s16 field_0xe1c;
/* 0xE1E */ u8 field_0xe1e;
/* 0xE1F */ u8 field_0xe1f;
/* 0xE20 */ u8 mMode;
};
STATIC_ASSERT(sizeof(daNpcShad_c) == 0xe24);
#endif /* D_A_NPC_SHAD_H */

File diff suppressed because it is too large Load Diff