diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-08-27 04:40:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-27 01:40:48 -0700 |
| commit | 0579f4acefb5d4dcc84ff1e28b645ff82bc0008f (patch) | |
| tree | 21b989fb9c01b92c5a24f03a60861abeb8ff04c4 /include | |
| parent | a945ef4fb85ceb757788d6e9fc9bfd4e9da0c335 (diff) | |
Fix d_a_ykgr retail regalloc and mostly match on debug (#2608)
* d_a_ykgr OK
* Fix sqrtf for shield
* Fix pch caps
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JParticle/JPAEmitter.h | 1 | ||||
| -rw-r--r-- | include/d/actor/d_a_ykgr.h | 33 | ||||
| -rw-r--r-- | include/d/dolzel_base.pch | 2 |
3 files changed, 4 insertions, 32 deletions
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 30a7016503..fec8d3128c 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -120,6 +120,7 @@ public: u8 getResourceManagerID() const { return mResMgrID; } u8 getGroupID() const { return mGroupID; } u8 getDrawTimes() const { return mDrawTimes; } + f32 getRate() const { return mRate; } void setRate(f32 rate) { mRate = rate; } void setDirectionalSpeed(f32 i_speed) { mDirSpeed = i_speed; } void setRandomDirectionSpeed(f32 i_speed) { mRndmDirSpeed = i_speed; } diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index eb8b5dd706..43ff22d1da 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -8,23 +8,6 @@ #include "d/d_com_inf_game.h" #include "d/d_particle.h" -struct daYkgr_HIO_c : public mDoHIO_entry_c { - daYkgr_HIO_c(); - /* 805A8D98 */ virtual ~daYkgr_HIO_c(); - - void genMessage(JORMContext*); - - /* 0x04 */ u8 field_0x4; - /* 0x08 */ s32 field_0x8; - /* 0x0C */ s32 field_0xc; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; - /* 0x1C */ f32 field_0x1c; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 field_0x24; -}; - struct dPa_YkgrPcallBack : public JPAParticleCallBack { dPa_YkgrPcallBack(); /* 805A8E3C */ ~dPa_YkgrPcallBack() {} @@ -67,22 +50,10 @@ public: } } - void set_mtx() { - camera_class* iVar1 = dComIfGp_getCamera(0); - cXyz local_28; - current.pos = *fopCamM_GetEye_p(iVar1); - dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28); - current.angle.y = cM_atan2s(local_28.x, local_28.z); - current.angle.x = -cM_atan2s( - local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z))); - mDoMtx_stack_c::transS(current.pos.x, current.pos.y, - current.pos.z); - mDoMtx_stack_c::YrotM(current.angle.y); - mDoMtx_stack_c::XrotM(current.angle.x); - MTXCopy(mDoMtx_stack_c::get(), field_0x570); - } + inline void set_mtx(); int _create(); + int _delete(); int _execute(); int _draw(); diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 93a4d180ad..bac86e13a5 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -15,7 +15,7 @@ #include "d/d_com_inf_game.h" // IWYU pragma: export #include "d/d_bg_w.h" // IWYU pragma: export #include "m_Do/m_Do_graphic.h" // IWYU pragma: export -#include "JSystem/J2DGraph/J2DOrthograph.h" // IWYU pragma: export +#include "JSystem/J2DGraph/J2DOrthoGraph.h" // IWYU pragma: export #include "JSystem/J2DGraph/J2DPane.h" // IWYU pragma: export #include "JSystem/J2DGraph/J2DPictureEx.h" // IWYU pragma: export #include "JSystem/J2DGraph/J2DScreen.h" // IWYU pragma: export |