diff options
| author | Pheenoh <pheenoh@gmail.com> | 2022-12-27 16:30:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-27 16:30:25 -0700 |
| commit | 7cac806b68026956bc4e6d143b8c6c7e182ea58a (patch) | |
| tree | f9e0c839ffa3dd6d76ff260bf668b9d816a7f9ea /include | |
| parent | 8244d9a6e1aed5fb3cd96a1cbbd0f72401f2baa7 (diff) | |
f_op_actor matches (#224)
* fopEn_enemy_c::checkBallModelDraw
* fopEn_enemy_c::initBallModel
* fopEn_enemy_c::setBallModelEffect
* fopEn_enemy_c::drawBallModel
* dStage_roomDt_c::getFileListInfo
* fopAc_Delete
* remove asm
* convert getBall* to static functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/d_a_alink.h | 4 | ||||
| -rw-r--r-- | include/d/com/d_com_inf_game.h | 4 | ||||
| -rw-r--r-- | include/dolphin/types.h | 3 | ||||
| -rw-r--r-- | include/f_op/f_op_actor.h | 4 | ||||
| -rw-r--r-- | include/m_Do/m_Do_mtx.h | 4 |
5 files changed, 17 insertions, 2 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index f381434c6b..be42e28f57 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -3278,6 +3278,10 @@ public: return getDirectionFromAngle(field_0x2fe2 - current.angle.y); } + static int getBallModelIdx() { return 0x25; } + static int getBallBtkIdx() { return 0x49; } + static int getBallBrkIdx() { return 0x41; } + bool checkRootTransClearMode() { return field_0x2f99 & 7; } bool checkRootTransZClearMode() { return field_0x2f99 & 4; } bool checkRootTransXClearMode() { return field_0x2f99 & 1; } diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index b7e094eb84..c38edee974 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -2587,6 +2587,10 @@ inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, param_9, param_10, 1.0f); } +inline u32 dComIfGp_particle_set(u32 param_0, u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3) { + return dComIfGp_particle_set(param_0,param_1,param_2,param_3,0,0,0xFF,0,0xFFFFFFFF,0,0,0); +} + inline JPABaseEmitter* dComIfGp_particle_set(u16 param_1, const cXyz* param_2, const dKy_tevstr_c* param_3, const csXyz* param_4, const cXyz* param_5, u8 param_6, dPa_levelEcallBack* param_7, s8 param_8, const GXColor* param_9, diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 0144f699a6..072a4dac12 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -36,4 +36,7 @@ typedef unsigned long size_t; #define INT32_MAX (0x7fffffff) #define UINT32_MAX (0xffffffff) +#define FLOAT_MIN (-1e31f) +#define FLOAT_MAX (3.40282346638528860e+38f) + #endif
\ No newline at end of file diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 9c2f1a1da8..421cca1f99 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -140,8 +140,8 @@ STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568); class fopEn_enemy_c : public fopAc_ac_c { public: - /* 80019404 */ void initBallModel(); - /* 800194FC */ void checkBallModelDraw(); + /* 80019404 */ bool initBallModel(); + /* 800194FC */ int checkBallModelDraw(); /* 80019520 */ void setBallModelEffect(dKy_tevstr_c*); /* 800196A0 */ void drawBallModel(dKy_tevstr_c*); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index f2103edf58..9d344948f8 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -33,6 +33,10 @@ inline void mDoMtx_copy(const Mtx src, Mtx dst) { PSMTXCopy(src, dst); } +inline void mDoMtx_trans(Mtx m, f32 x, f32 y, f32 z) { + PSMTXTrans(m,x,y,z); +} + class mDoMtx_stack_c { public: /* 8000CCC8 */ static bool push(); |
