Kytag3 done (#2149)

* kytag3 done

* remove asm

* fix d_envse
This commit is contained in:
TakaRikka
2024-05-06 10:56:03 -07:00
committed by GitHub
parent 7a528eb5b6
commit e1147cf047
20 changed files with 498 additions and 2411 deletions
+6
View File
@@ -45,6 +45,12 @@ template <>
struct TVec3<s16> {
s16 x, y, z;
TVec3() {}
TVec3(s16 x, s16 y, s16 z) {
set(x, y, z);
}
TVec3& operator=(const TVec3& b) {
// Force copies to use lwz/lha
*((s32*)this) = *((s32*)&b);
+2
View File
@@ -114,6 +114,7 @@ public:
u8 getDrawTimes() const { return mDrawTimes; }
void setRate(f32 rate) { mRate = rate; }
void setDirectionalSpeed(f32 i_speed) { mDirSpeed = i_speed; }
void setRandomDirectionSpeed(f32 i_speed) { mRndmDirSpeed = i_speed; }
void setEmitterCallBackPtr(JPAEmitterCallBack* ptr) { mpEmtrCallBack = ptr; }
void setGlobalRTMatrix(const Mtx m) { JPASetRMtxTVecfromMtx(m, mGlobalRot, &mGlobalTrs); }
void setGlobalSRTMatrix(const Mtx m) {
@@ -129,6 +130,7 @@ public:
void setGlobalRotation(const JGeometry::TVec3<s16>& rot) {
JPAGetXYZRotateMtx(rot.x, rot.y, rot.z, mGlobalRot);
}
void setGlobalDynamicsScale(const JGeometry::TVec3<f32>& i_scale) { mGlobalScl.set(i_scale); }
void setGlobalAlpha(u8 alpha) { mGlobalPrmClr.a = alpha; }
u8 getGlobalAlpha() { return mGlobalPrmClr.a; }
void getGlobalPrmColor(GXColor& color) { color = mGlobalPrmClr; }
+5 -2
View File
@@ -268,7 +268,9 @@ struct EF_ODOUR_EFF {
/* 0x00 */ u8 mStatus;
/* 0x04 */ cXyz mPosition;
/* 0x10 */ cXyz mBasePos;
/* 0x1C */ u8 field_0x1c[0x24 - 0x1C];
/* 0x1C */ s16 field_0x1c;
/* 0x1E */ s16 field_0x1e;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
/* 0x2C */ f32 field_0x2c;
@@ -281,7 +283,8 @@ public:
/* 0x00010 */ u8* mpResTex;
/* 0x00014 */ EF_ODOUR_EFF mOdourEff[2000];
/* 0x17714 */ u8 field_0x17714[0x14];
/* 0x17714 */ cXyz field_0x17714;
/* 0x17720 */ u8 field_0x17720[0x17728 - 0x17720];
}; // Size: 0x17728
struct EF_MUD_EFF {
+4
View File
@@ -218,6 +218,10 @@ inline void mDoAud_mEnvse_registWindowPos(const Vec* i_pos) {
g_mEnvSeMgr.registWindowPos((Vec*)i_pos);
}
inline void mDoAud_mEnvse_registWolfSmellSePos(const Vec* i_pos) {
g_mEnvSeMgr.registWolfSmellSePos((Vec*)i_pos);
}
inline void mDoAud_initLv3WaterSe(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
g_mEnvSeMgr.initLv3WaterSe(param_0, param_1, param_2, param_3);
}
@@ -2,6 +2,7 @@
#define D_A_KYTAG03_H
#include "f_op/f_op_actor_mng.h"
#include "d/d_path.h"
class kytag03_class : public fopAc_ac_c {
public: