diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-08 17:07:52 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-08 17:07:52 -0400 |
| commit | eb3b4ea2b6868ef8aa2ac6ce57fbbaec44cadf22 (patch) | |
| tree | 1745b3dcdde3ea9c0a641ae11127d739a5072f8e /include | |
| parent | c1b30df5b911af99f638b7296ede72a27e352036 (diff) | |
bomb nearly matching on demo, one regswap left
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JParticle/JPAEmitter.h | 4 | ||||
| -rw-r--r-- | include/d/actor/d_a_bomb.h | 6 | ||||
| -rw-r--r-- | include/d/d_bg_s_acch.h | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 04199952..2828d490 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -234,6 +234,9 @@ public: void setGlobalParticleScale(const JGeometry::TVec3<f32>& scale) { mGlobalParticleScale.set(scale); } + void setGlobalParticleScale(f32 scaleX, f32 scaleY) { + mGlobalParticleScale.set(scaleX, scaleY, 1.0f); + } void setGlobalDynamicsScale(const JGeometry::TVec3<f32>& scale) { mGlobalDynamicsScale.set(scale); } @@ -323,7 +326,6 @@ public: void loadTexture(u8, GXTexMapID) {} void setEmitterRotation(const JGeometry::TVec3<s16>&) {} void setGlobalParticleHeightScale(f32 y) { mGlobalParticleScale.y = y; } - void setGlobalParticleScale(f32, f32) {} void setGlobalParticleWidthScale(f32) {} static JPAEmitterInfo emtrInfo; diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index 024b4600..0f5b3a73 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -68,7 +68,9 @@ public: bool checkExplodeBg_nut(); bool checkExplodeBg_cannon(); bool checkExplodeBg(); +#if VERSION > VERSION_DEMO void water_tention(); +#endif void posMoveF(); void bgCrrPos(); void bgCrrPos_lava(); @@ -171,13 +173,15 @@ private: /* 0x2B8 */ mDoExt_bckAnm mBck1; /* 0x2C8 */ mDoExt_brkAnm mBrk0; /* 0x2E0 */ mDoExt_brkAnm mBrk1; - /* 0x2F8 */ s32 mType; + /* 0x2F8 */ int mType; /* 0x2FC */ dBgS_BombAcch mAcch; /* 0x4C0 */ dBgS_AcchCir mCir; /* 0x500 */ dBgS_ObjGndChk_Yogan mGndChk; /* 0x554 */ f32 field_0x554; /* 0x558 */ f32 field_0x558; +#if VERSION > VERSION_DEMO /* 0x55C */ f32 field_0x55C; +#endif /* 0x560 */ bool field_0x560; /* 0x561 */ bool mbWaterIn; /* 0x562 */ u8 field_0x562; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index f79dc73d..cb257ec1 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -148,14 +148,14 @@ public: void SetRoofNone() { m_flags |= ROOF_NONE; } void SetRoofHit() { m_flags |= ROOF_HIT; } void SetWaterNone() { m_flags |= WATER_NONE; } - bool ChkWallHit() { return m_flags & WALL_HIT; } + u32 ChkWallHit() { return m_flags & WALL_HIT; } void OffLineCheckHit() { m_flags &= ~LINE_CHECK_HIT; } void OnLineCheckHit() { m_flags |= LINE_CHECK_HIT; } void OffLineCheck() { m_flags &= ~LINE_CHECK; } void OffLineCheckNone() { m_flags &= ~LINE_CHECK_NONE; } void OnLineCheckNone() { m_flags |= LINE_CHECK_NONE; } - bool ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; } - bool ChkLineCheck() { return m_flags & LINE_CHECK; } + u32 ChkLineCheckNone() { return m_flags & LINE_CHECK_NONE; } + u32 ChkLineCheck() { return m_flags & LINE_CHECK; } void ClrRoofHit() { m_flags &= ~ROOF_HIT; } void ClrWaterHit() { m_flags &= ~WATER_HIT; } void SetWaterHit() { m_flags |= WATER_HIT; } |