diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-26 21:50:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-26 18:50:46 -0700 |
| commit | 6242aa6e8411cd6bbcfec5ee4f421950a62cae8d (patch) | |
| tree | b8fe4ac0f56c8afbbdb49c67dbe0063b09181a42 /include/JSystem | |
| parent | 30fafe135d20aaad8c9efc4c0a2de1e216822487 (diff) | |
Misc matches and fixes (#2703)
* Match mDoExt_morf_c::getPlayMode
* Misc cleanup
* Fix actor cull spheres
* Match daPy_py_c::getLastSceneSwordAtUpTime, JUTGamePad::testTrigger
* Fix improper demangling of dBgS_SphChk::SetCallback
* Fix d_camera rangef weak func order
* Match more alink_wolf funcs
Diffstat (limited to 'include/JSystem')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DDrawBuffer.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JGadget/linklist.h | 4 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPABaseShape.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAChildShape.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPADynamicsBlock.h | 3 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAExTexShape.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JParticle/JPAExtraShape.h | 2 | ||||
| -rw-r--r-- | include/JSystem/JUtility/JUTGamePad.h | 2 |
8 files changed, 10 insertions, 9 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h index 1cc88b4079..3a71f94b45 100644 --- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h +++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h @@ -11,6 +11,7 @@ inline f32 J3DCalcZValue(register MtxP m, register Vec v) { register f32 temp_f2; register f32 temp_f1 = 1.0f; +#ifdef __MWERKS__ // clang-format off asm { psq_l temp_f0, 0(v), 0, 0 /* qr0 */ @@ -23,6 +24,7 @@ inline f32 J3DCalcZValue(register MtxP m, register Vec v) { ps_sum0 out, out, out, out } // clang-format on +#endif return out; } diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 69e4db3ee5..864f2b6dd2 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -241,8 +241,8 @@ struct TLinkList_factory : public TLinkList<T, I> { } } - TLinkList<T, I>::iterator Erase_destroy(T* param_0) { - TLinkList<T, I>::iterator spC(Erase(param_0)); + typename TLinkList<T, I>::iterator Erase_destroy(T* param_0) { + typename TLinkList<T, I>::iterator spC(Erase(param_0)); Do_destroy(param_0); return spC; } diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h index 3ebff4528c..6d4dabf2d8 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/include/JSystem/JParticle/JPABaseShape.h @@ -38,7 +38,7 @@ struct JPABaseShapeData { /* 0x2E */ u8 mAnmRndm; /* 0x2F */ u8 mClrAnmRndmMask; /* 0x30 */ u8 mTexAnmRndmMask; -}; +}; // Size: 0x34 /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h index 2761a56759..fec4c08a55 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/include/JSystem/JParticle/JPAChildShape.h @@ -34,7 +34,7 @@ struct JPAChildShapeData { /* 0x44 */ u8 mStep; /* 0x45 */ u8 mTexIdx; /* 0x46 */ s16 mRotSpeed; -}; +}; // Size: 0x48 /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h index fc175ff69d..38805b3b07 100644 --- a/include/JSystem/JParticle/JPADynamicsBlock.h +++ b/include/JSystem/JParticle/JPADynamicsBlock.h @@ -41,8 +41,7 @@ struct JPADynamicsBlockData { /* 0x74 */ u16 mVolumeSize; /* 0x76 */ u16 mDivNumber; /* 0x78 */ u8 mRateStep; - /* 0x7C */ u32 field_0x7c; -}; +}; // Size: 0x7C typedef void (*JPADynamicsCalcVolumeFunc)(JPAEmitterWorkData*); diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/include/JSystem/JParticle/JPAExTexShape.h index b202cc9d9c..d1d6013dd1 100644 --- a/include/JSystem/JParticle/JPAExTexShape.h +++ b/include/JSystem/JParticle/JPAExTexShape.h @@ -19,7 +19,7 @@ struct JPAExTexShapeData { /* 0x24 */ s8 mExpScale; /* 0x25 */ s8 mIndTexIdx; /* 0x26 */ s8 mSecTexIdx; -}; +}; // Size: 0x28 /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/include/JSystem/JParticle/JPAExtraShape.h index dbf4636341..fac178eb6a 100644 --- a/include/JSystem/JParticle/JPAExtraShape.h +++ b/include/JSystem/JParticle/JPAExtraShape.h @@ -38,7 +38,7 @@ struct JPAExtraShapeData { /* 0x54 */ f32 mRotateSpeed; /* 0x58 */ f32 mRotateSpeedRandom; /* 0x5C */ f32 mRotateDirection; -}; +}; // Size: 0x60 /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 87a6b4d28d..bbb20c0865 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -100,7 +100,7 @@ public: JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; } JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; } - u32 testTrigger(u32 button) const { return mButton.mTrigger & button; } + bool testTrigger(u32 button) const { return mButton.mTrigger & button; } bool isPushing3ButtonReset() const { return mPortNum != EPortInvalid && mButtonReset.mReset != false; |
