mirror of
https://github.com/zeldaret/tp
synced 2026-07-09 06:53:23 -04:00
d_a_obj_snowEffTag / d_a_obj_digplace / d_a_tag_lv2prchk OK (#390)
* d_a_obj_snowEffTag OK * d_a_obj_digplace OK * d_a_tag_lv2prchk OK * remove asm / fix tag_waterfall warnings
This commit is contained in:
@@ -1,6 +1,27 @@
|
||||
#ifndef D_A_OBJ_DIGPLACE_H
|
||||
#define D_A_OBJ_DIGPLACE_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_path.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daObjDigpl_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 8057BF98 */ int create();
|
||||
/* 8057C1EC */ int execute();
|
||||
|
||||
/* 0x568 */ u8 mType;
|
||||
/* 0x569 */ u8 mSwitch;
|
||||
/* 0x56A */ u8 mDigFlg;
|
||||
/* 0x56B */ u8 field_0x56b;
|
||||
/* 0x56C */ u8 mCurrentDigPoint;
|
||||
/* 0x570 */ Mtx field_0x570;
|
||||
/* 0x5A0 */ int mUsedDigFlags[6];
|
||||
/* 0x5B8 */ dPath* mpDigPoints;
|
||||
|
||||
/* 8057C158 */ virtual ~daObjDigpl_c();
|
||||
|
||||
u8 getSceneNum() { return (fopAcM_GetParam(this) >> 0xC) & 0xFF; }
|
||||
int getItemNum() { return getSceneNum(); }
|
||||
};
|
||||
|
||||
#endif /* D_A_OBJ_DIGPLACE_H */
|
||||
|
||||
@@ -1,6 +1,37 @@
|
||||
#ifndef D_A_OBJ_SNOWEFFTAG_H
|
||||
#define D_A_OBJ_SNOWEFFTAG_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "m_Do/m_Do_hostIO.h"
|
||||
|
||||
class daSnowEffTag_c : public fopAc_ac_c {
|
||||
public:
|
||||
/* 80CDF12C */ void setBaseMtx();
|
||||
/* 80CDF184 */ int create();
|
||||
/* 80CDF2B8 */ bool playerAreaCheck();
|
||||
/* 80CDF498 */ int Execute();
|
||||
/* 80CDF5E4 */ int Draw();
|
||||
/* 80CDF5EC */ int Delete();
|
||||
|
||||
int getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
|
||||
/* 0x568 */ u8 field_0x568;
|
||||
/* 0x569 */ bool mPlayedSound;
|
||||
/* 0x56C */ f32 mMaxSize;
|
||||
/* 0x570 */ f32 mSize;
|
||||
/* 0x574 */ f32 field_0x574;
|
||||
/* 0x578 */ u32 mEmitterID;
|
||||
};
|
||||
|
||||
class daSnowEffTag_HIO_c : public mDoHIO_entry_c {
|
||||
public:
|
||||
/* 80CDF0AC */ daSnowEffTag_HIO_c();
|
||||
/* 80CDF674 */ virtual ~daSnowEffTag_HIO_c();
|
||||
|
||||
/* 0x4 */ u8 field_0x4;
|
||||
/* 0x5 */ u8 mDisplayRange;
|
||||
/* 0x6 */ u8 mTop;
|
||||
/* 0x7 */ u8 mBottom;
|
||||
};
|
||||
|
||||
#endif /* D_A_OBJ_SNOWEFFTAG_H */
|
||||
|
||||
@@ -1,6 +1,44 @@
|
||||
#ifndef D_A_TAG_LV2PRCHK_H
|
||||
#define D_A_TAG_LV2PRCHK_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
class daTagLv2PrChk_c : public fopAc_ac_c {
|
||||
public:
|
||||
enum Action_e {
|
||||
ACTION_CHECK_e,
|
||||
ACTION_END_e,
|
||||
};
|
||||
|
||||
enum Mode_e {
|
||||
MODE_CHECK_FIRST_SW,
|
||||
MODE_CHECK_SECOND_SW,
|
||||
MODE_CHECK_THIRD_SW,
|
||||
MODE_CHECK_FOURTH_SW,
|
||||
MODE_PUZZLE_CLEAR,
|
||||
MODE_CHECK_RESET = 200,
|
||||
MODE_CHECK_WRONG_ORDER = 100,
|
||||
};
|
||||
|
||||
/* 805A4C58 */ int Create();
|
||||
/* 805A4CDC */ int create();
|
||||
/* 805A4D44 */ int execute();
|
||||
/* 805A4D68 */ void action();
|
||||
/* 805A4DF4 */ void actionCheck();
|
||||
/* 805A5290 */ void actionEnd();
|
||||
/* 805A5294 */ void seStartWrong();
|
||||
/* 805A52F4 */ int _delete();
|
||||
|
||||
u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
|
||||
u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
|
||||
u8 getSwbit3() { return fopAcM_GetParamBit(this, 16, 8); }
|
||||
|
||||
/* 0x568 */ u8 mMode;
|
||||
/* 0x569 */ u8 mAction;
|
||||
/* 0x56A */ s8 mDirection; // Signifies starting at either the first (1) or last (-1) switch
|
||||
/* 0x56B */ u8 mSwbit2;
|
||||
/* 0x56C */ u8 mPlayedSound;
|
||||
/* 0x56D */ u8 field_0x56d;
|
||||
};
|
||||
|
||||
#endif /* D_A_TAG_LV2PRCHK_H */
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
#ifndef STD_CMATH_H_
|
||||
#define STD_CMATH_H_
|
||||
|
||||
#include "MSL_C/math.h"
|
||||
|
||||
namespace std {
|
||||
float fabs(float num) {
|
||||
return fabsf(num);
|
||||
}
|
||||
} // namespace std
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user