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
This commit is contained in:
Pheenoh
2022-12-27 16:30:25 -07:00
committed by GitHub
parent 8244d9a6e1
commit 7cac806b68
11 changed files with 105 additions and 244 deletions
+4
View File
@@ -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; }
+4
View File
@@ -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,
+3
View File
@@ -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
+2 -2
View File
@@ -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*);
+4
View File
@@ -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();