mirror of
https://github.com/zeldaret/tp
synced 2026-08-13 20:24:57 -04:00
clean up dolphin files / work on some rels (#212)
* d_a_alldie / d_a_tboxSw / d_a_tag_gstart / d_a_tag_hstop * dolphin OS work / cleanup * dolphin GX work / cleanup * finish changing dolphin files to C * more files into C * match rest of MSL_C math functions * more dolphin files converted to C * remove asm * d_bg_w work * remove asm * d_a_alink work / kytag14
This commit is contained in:
@@ -1,6 +1,36 @@
|
||||
#ifndef D_A_ALLDIE_H
|
||||
#define D_A_ALLDIE_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
class daAlldie_c : public fopAc_ac_c {
|
||||
public:
|
||||
enum EAction {
|
||||
/* 0x0 */ ACT_WAIT,
|
||||
/* 0x1 */ ACT_CHECK,
|
||||
/* 0x2 */ ACT_TIMER,
|
||||
/* 0x3 */ ACT_ORDER,
|
||||
/* 0x4 */ ACT_NEXT,
|
||||
/* 0x5 */ ACT_EVENT,
|
||||
};
|
||||
|
||||
/* 804D5818 */ u8 getEventNo();
|
||||
/* 804D5824 */ u8 getSwbit();
|
||||
/* 804D5830 */ int actionWait();
|
||||
/* 804D5838 */ int actionCheck();
|
||||
/* 804D5888 */ int actionTimer();
|
||||
/* 804D5938 */ int actionOrder();
|
||||
/* 804D59A0 */ int actionEvent();
|
||||
/* 804D5A44 */ int actionNext();
|
||||
/* 804D5B10 */ int execute();
|
||||
|
||||
inline int create();
|
||||
|
||||
/* 0x568 */ u8 mAction;
|
||||
/* 0x56A */ s16 mTimer;
|
||||
/* 0x56C */ s16 mEventIdx;
|
||||
/* 0x56E */ s16 mNextEventIdx;
|
||||
/* 0x570 */ s16 mMapToolID;
|
||||
}; // Size: 0x574
|
||||
|
||||
#endif /* D_A_ALLDIE_H */
|
||||
|
||||
@@ -149,7 +149,7 @@ public:
|
||||
/* 80844CB0 */ daHorse_c();
|
||||
|
||||
bool checkNoBombProc() const { return field_0x16b4 == 0 || field_0x16b4 == 1; }
|
||||
bool checkResetStateFlg0(daHorse_RFLG0 flag) { return mResetStateFlg0 & flag; }
|
||||
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return mResetStateFlg0 & flag; }
|
||||
bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) { return mEndResetStateFlg0 & flag; }
|
||||
bool checkStateFlg0(daHorse_FLG0 flag) { return mStateFlg0 & flag; }
|
||||
f32 getNormalMaxSpeedF() { return mNormalMaxSpeedF; }
|
||||
@@ -157,6 +157,10 @@ public:
|
||||
void setDemoStickR(f32 stick) { mDemoStickR = stick; }
|
||||
void i_changeDemoMode(u32 param_0, int param_1) { field_0x1740 = param_0; field_0x1728 = param_1; }
|
||||
void i_changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
|
||||
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*mpSetHorsePosAngleFn)(i_pos, i_angle); }
|
||||
|
||||
bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); }
|
||||
bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); }
|
||||
|
||||
static u8 const m_footJointTable[8];
|
||||
static f32 const m_callLimitDistance2;
|
||||
@@ -220,6 +224,15 @@ public:
|
||||
/* 0x1790 */ f32 mLashMaxSpeedF;
|
||||
/* 0x1794 */ u8 field_0x1794[0x30];
|
||||
/* 0x17C4 */ cXyz mDemoPos0;
|
||||
/* 0x17D0 */ u8 field_0x17d0[0x18A4 - 0x17D0];
|
||||
/* 0x18A4 */ int (daHorse_c::*mpProcFn)();
|
||||
/* 0x18A4 */ int (daHorse_c::*mpCheckSpecialWallHitFn)(const cXyz&);
|
||||
/* 0x18A4 */ void (daHorse_c::*mpSetReinPosHandFn)(int);
|
||||
/* 0x18A4 */ void (daHorse_c::*mpSetReinPosNormalFn)();
|
||||
/* 0x18A4 */ int (daHorse_c::*mpCallHorseFn)(const cXyz*);
|
||||
/* 0x18A4 */ int (daHorse_c::*mpSetHorsePosAngleFn)(const cXyz* i_pos, s16 i_angle);
|
||||
/* 0x18A4 */ void (daHorse_c::*mpOnRideFlgFn)();
|
||||
/* 0x18A4 */ void (daHorse_c::*mpOffRideFlgFn)();
|
||||
};
|
||||
|
||||
#endif /* D_A_HORSE_H */
|
||||
|
||||
@@ -1,6 +1,20 @@
|
||||
#ifndef D_A_TBOXSW_H
|
||||
#define D_A_TBOXSW_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daTboxSw_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 80D66858 */ int Create();
|
||||
/* 80D66860 */ int create();
|
||||
/* 80D668C8 */ int execute();
|
||||
/* 80D66938 */ int draw();
|
||||
/* 80D66940 */ int _delete();
|
||||
};
|
||||
|
||||
namespace daTboxSw_prm {
|
||||
inline u8 getTboxNo(daTboxSw_c* p_tbox) { return fopAcM_GetParam(p_tbox) & 0x3F; }
|
||||
inline u8 getSwNo(daTboxSw_c* p_tbox) { return fopAcM_GetParam(p_tbox) >> 8; }
|
||||
};
|
||||
|
||||
#endif /* D_A_TBOXSW_H */
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
#ifndef D_A_KYTAG14_H
|
||||
#define D_A_KYTAG14_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
class kytag14_class : public fopAc_ac_c {
|
||||
public:
|
||||
/* 0x568 */ s8 mSaveRoomNo;
|
||||
/* 0x569 */ u8 mSavePoint;
|
||||
/* 0x56A */ u16 mEventID1;
|
||||
/* 0x56C */ u16 mEventID2;
|
||||
/* 0x56E */ u8 mSwitchNo1;
|
||||
/* 0x56F */ u8 mSwitchNo2;
|
||||
};
|
||||
|
||||
|
||||
#endif /* D_A_KYTAG14_H */
|
||||
|
||||
@@ -1,6 +1,18 @@
|
||||
#ifndef D_A_TAG_GSTART_H
|
||||
#define D_A_TAG_GSTART_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
|
||||
class daTagGstart_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 805A3478 */ int create();
|
||||
/* 805A3514 */ ~daTagGstart_c();
|
||||
/* 805A3590 */ int execute();
|
||||
|
||||
/* 0x568 */ u8 mSwNo;
|
||||
/* 0x569 */ u8 mSwNo2;
|
||||
/* 0x56A */ u8 field_0x56a;
|
||||
/* 0x56B */ u8 mType;
|
||||
};
|
||||
|
||||
#endif /* D_A_TAG_GSTART_H */
|
||||
|
||||
@@ -1,6 +1,26 @@
|
||||
#ifndef D_A_TAG_HSTOP_H
|
||||
#define D_A_TAG_HSTOP_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor.h"
|
||||
#include "d/msg/d_msg_flow.h"
|
||||
|
||||
class daTagHstop_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 805A43EC */ int create();
|
||||
/* 805A45F8 */ ~daTagHstop_c();
|
||||
/* 805A46B8 */ void setActive();
|
||||
/* 805A475C */ int execute();
|
||||
|
||||
static daTagHstop_c* m_top;
|
||||
static dMsgFlow_c m_msgFlow;
|
||||
|
||||
/* 0x568 */ daTagHstop_c* mNext;
|
||||
/* 0x568 */ daTagHstop_c* mPrev;
|
||||
/* 0x570 */ u8 mPrm0;
|
||||
/* 0x571 */ bool mActive;
|
||||
/* 0x572 */ u8 mPrm1;
|
||||
/* 0x573 */ u8 field_0x573;
|
||||
/* 0x574 */ int field_0x574;
|
||||
};
|
||||
|
||||
#endif /* D_A_TAG_HSTOP_H */
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#ifndef D_A_TAG_INSTRUCTION_H
|
||||
#define D_A_TAG_INSTRUCTION_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daTagInst_c : public fopAc_ac_c {};
|
||||
|
||||
#endif /* D_A_TAG_INSTRUCTION_H */
|
||||
|
||||
Reference in New Issue
Block a user