mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-08 05:40:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

bomb nearly matching on demo, one regswap left

Browse Source
This commit is contained in:
LagoLunatic
2025-09-08 17:07:52 -04:00
parent c1b30df5b9
commit eb3b4ea2b6
8 changed files with 110 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAEmitter.h
+3 -1
View File
@@ -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;
include/d/actor/d_a_bomb.h
+5 -1
View File
@@ -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;
include/d/d_bg_s_acch.h
+3 -3
View File
@@ -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; }