From 0c1cecbdc2f267b9745e8d90d93d2de66616c0d0 Mon Sep 17 00:00:00 2001 From: swekka Date: Sun, 7 Dec 2025 12:11:17 +0100 Subject: [PATCH 1/4] d_a_obj_grass_coil OK --- .../rels/d_a_obj_grass_coilNP/symbols.txt | 32 ++-- include/d/a/obj/d_a_obj_grass_coil.h | 32 +++- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 146 ++++++++++++++++++ 3 files changed, 193 insertions(+), 17 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_grass_coilNP/symbols.txt b/config/SOUE01/rels/d_a_obj_grass_coilNP/symbols.txt index 8f8169e8..9eb162a6 100644 --- a/config/SOUE01/rels/d_a_obj_grass_coilNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_grass_coilNP/symbols.txt @@ -8,12 +8,12 @@ __dt__28sFState_c<15dAcOgrassCoil_c>Fv = .text:0x000001D0; // type:function size __dt__31sFStateFct_c<15dAcOgrassCoil_c>Fv = .text:0x00000230; // type:function size:0x6C __dt__84sStateMgr_c<15dAcOgrassCoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002A0; // type:function size:0xA0 __dt__54sFStateMgr_c<15dAcOgrassCoil_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000340; // type:function size:0xA4 -fn_268_3F0 = .text:0x000003F0; // type:function size:0xBC -fn_268_4B0 = .text:0x000004B0; // type:function size:0x140 +createHeap__15dAcOgrassCoil_cFv = .text:0x000003F0; // type:function size:0xBC +create__15dAcOgrassCoil_cFv = .text:0x000004B0; // type:function size:0x140 changeState__84sStateMgr_c<15dAcOgrassCoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000005F0; // type:function size:0x10 -fn_268_600 = .text:0x00000600; // type:function size:0x8 -fn_268_610 = .text:0x00000610; // type:function size:0x3F4 -fn_268_A10 = .text:0x00000A10; // type:function size:0x34 +doDelete__15dAcOgrassCoil_cFv = .text:0x00000600; // type:function size:0x8 +actorExecute__15dAcOgrassCoil_cFv = .text:0x00000610; // type:function size:0x3F4 +draw__15dAcOgrassCoil_cFv = .text:0x00000A10; // type:function size:0x34 initializeState_Wait__15dAcOgrassCoil_cFv = .text:0x00000A50; // type:function size:0x4 executeState_Wait__15dAcOgrassCoil_cFv = .text:0x00000A60; // type:function size:0x4 finalizeState_Wait__15dAcOgrassCoil_cFv = .text:0x00000A70; // type:function size:0x4 @@ -40,16 +40,16 @@ isSameName__30sFStateID_c<15dAcOgrassCoil_c>CFPCc = .text:0x00000EC0; // type:fu _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_268_rodata_0 = .rodata:0x00000000; // type:object size:0x50 data:float +lbl_268_rodata_0 = .rodata:0x00000000; // type:object size:0x50 scope:local data:float g_profile_OBJ_GRASS_COIL = .data:0x00000000; // type:object size:0x40 data:4byte -lbl_268_data_40 = .data:0x00000040; // type:object size:0x10 data:string -lbl_268_data_50 = .data:0x00000050; // type:object size:0x38 -lbl_268_data_88 = .data:0x00000088; // type:object size:0x80 -lbl_268_data_108 = .data:0x00000108; // type:object size:0x30 -lbl_268_data_138 = .data:0x00000138; // type:object size:0x30 -lbl_268_data_168 = .data:0x00000168; // type:object size:0x18 -lbl_268_data_180 = .data:0x00000180; // type:object size:0x5C -lbl_268_data_1DC = .data:0x000001DC; // type:object size:0x34 +lbl_268_data_40 = .data:0x00000040; // type:object size:0x10 scope:local data:string +lbl_268_data_50 = .data:0x00000050; // type:object size:0x38 scope:local +__vt__15dAcOgrassCoil_c = .data:0x00000088; // type:object size:0x80 +__vt__54sFStateMgr_c<15dAcOgrassCoil_c,20sStateMethodUsr_FI_c> = .data:0x00000108; // type:object size:0x30 +__vt__84sStateMgr_c<15dAcOgrassCoil_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000138; // type:object size:0x30 +lbl_268_data_168 = .data:0x00000168; // type:object size:0x18 scope:local +lbl_268_data_180 = .data:0x00000180; // type:object size:0x5C scope:local +__vt__30sFStateID_c<15dAcOgrassCoil_c> = .data:0x000001DC; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_268_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_268_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +lbl_268_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local +lbl_268_bss_18 = .bss:0x00000018; // type:object size:0x30 scope:local data:4byte diff --git a/include/d/a/obj/d_a_obj_grass_coil.h b/include/d/a/obj/d_a_obj_grass_coil.h index b557c3e0..6fcce3fd 100644 --- a/include/d/a/obj/d_a_obj_grass_coil.h +++ b/include/d/a/obj/d_a_obj_grass_coil.h @@ -2,6 +2,11 @@ #define D_A_OBJ_GRASS_COIL_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/cc/d_cc_d.h" +#include "m/m3d/m_smdl.h" +#include "m/m_angle.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" #include "s/s_StateMgr.hpp" @@ -10,10 +15,35 @@ public: dAcOgrassCoil_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcOgrassCoil_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int draw() override; + STATE_FUNC_DECLARE(dAcOgrassCoil_c, Wait); + STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dAcOgrassCoil_c); + private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOgrassCoil_c); + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl[2]; + /* 0x36C */ STATE_MGR_DECLARE(dAcOgrassCoil_c); + /* 0x3A8 */ dCcD_Cyl mCollider; + /* 0x4F8 */ mVec3_c mSpawnPos; + /* 0x504 */ mAng3_c mEffectRot; + /* 0x50A */ mAng field_0x50A; + /* 0x50C */ mAng field_0x50C; + /* 0x50E */ s16 field_0x50E; + /* 0x510 */ mAng field_0x510; + /* 0x512 */ u8 pad_0x512; + /* 0x513 */ bool mCut; + + static dCcD_SrcCyl sCylSrc; + static const u32 sCalcAngleRatio; + static const s16 sEffectRotIncrement; + static const float sSqDistThreshold; + static const u32 lbl_268_rodata_4C; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index 18a2aba4..edb4dac2 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -1,9 +1,155 @@ #include "d/a/obj/d_a_obj_grass_coil.h" +#include "c/c_lib.h" +#include "common.h" +#include "d/a/d_a_player.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/c/c_cc_d.h" +#include "d/col/cc/d_cc_s.h" +#include "d/snd/d_snd_wzsound.h" +#include "f/f_base.h" +#include "m/m_angle.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resmdl.h" +#include "s/s_Math.h" +#include "toBeSorted/attention.h" +#include "toBeSorted/d_emitter.h" + SPECIAL_ACTOR_PROFILE(OBJ_GRASS_COIL, dAcOgrassCoil_c, fProfile::OBJ_GRASS_COIL, 0x263, 0, 2); STATE_DEFINE(dAcOgrassCoil_c, Wait); +dCcD_SrcCyl dAcOgrassCoil_c::sCylSrc = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {AT_TYPE_SWORD | AT_TYPE_BOMB | AT_TYPE_0x40 | AT_TYPE_SLINGSHOT | AT_TYPE_WHIP | AT_TYPE_ARROW | + AT_TYPE_CLAWSHOT | AT_TYPE_0x800000, + 0x200111, + {0, 0xb, 0x407}, + 0x0, + 0x0}, + /* mObjCo */ {0x29}}, + /* mCylInf */ + {50.f, 130.f} +}; + +const u32 dAcOgrassCoil_c::sCalcAngleRatio = 5; + +bool dAcOgrassCoil_c::createHeap() { + void *data = getOarcResFile("GrassCoilNormal"); + mResFile = nw4r::g3d::ResFile(data); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("GrassCoilNormal"); + TRY_CREATE(mMdl[0].create(mdl, &mAllocator, 0x120, 1, nullptr)); + nw4r::g3d::ResMdl mdlCut = mResFile.GetResMdl("GrassCoilNormalCut"); + TRY_CREATE(mMdl[1].create(mdlCut, &mAllocator, 0x120, 1, nullptr)); + return SUCCEEDED; +} + +int dAcOgrassCoil_c::create() { + field_0x510 = mRotation.y; + mRotation.y = 0; + CREATE_ALLOCATOR(dAcOgrassCoil_c); + mStts.SetRank(8); + mCollider.Set(sCylSrc); + mCollider.SetStts(mStts); + updateMatrix(); + mWorldMtx.YrotM(field_0x510 - mRotation.y); + mMdl[mCut].setLocalMtx(mWorldMtx); + mStateMgr.changeState(StateID_Wait); + mCullingDistance = 9000.0f; + mBoundingBox.Set(mVec3_c(-100.0f, -50.0f, -100.0f), mVec3_c(100.0f, 200.0f, 100.0f)); + field_0x1A8 = 0.0f; + return SUCCEEDED; +} + +int dAcOgrassCoil_c::doDelete() { + return SUCCEEDED; +} + +const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; + +int dAcOgrassCoil_c::actorExecute() { + if (checkObjectProperty(OBJ_PROP_0x1)) { + if (dAcPy_c::GetLink()->mPosition.squareDistanceToXZ(mPosition) > 1000000.f) { + return SUCCEEDED; + } + } + if (!mCut) { + AttentionManager::GetInstance()->addUnk3Target(*this, 1, 250.0f, -100.0f, 100.0f); + } + if (!mCut) { + bool hit = false; + if (mCollider.ChkTgHit()) { + if (mCollider.ChkTgAtHitType(AT_TYPE_SLINGSHOT)) { + hit = true; + } else { + mEffectRot.y = field_0x510; + u16 effectIndex = PARTICLE_RESOURCE_ID_MAPPING_485_; + s32 i = 0; + for (s32 i = 0; i < 2; i++) { + if (i == 1) { + mEffectRot.y += mAng(sEffectRotIncrement); + } + dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( + effectIndex, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 + ); + if (emitter != nullptr) { + emitter->bindShpEmitter(dJEffManager_c::GrassCoil, true); + } + } + mCollider.ClrTgSet(); + mCut = true; + field_0x50E = mAng(-0xccd); + startSound(SE_Gcoil_CUT); + mCollider.SetR(25.0f); + mCollider.SetH(70.0f); + mSpawnPos = mPosition; + mSpawnPos.y += 30.0f; + itemDroppingAndGivingRelated(&mSpawnPos, 0); + } + } + if (hit || !(field_0x50E || !mCollider.ChkCoHit() || !(dAcPy_c::GetLink()->mSpeed > 0.0f))) { + if (!mCut) { + field_0x50E = mAng(-0x93f); + } else { + field_0x50E = mAng(-0x16c); + } + field_0x50C = mAng(cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000); + } + } + + if (field_0x50E != 0) { + s32 _a = 0; + + field_0x50E += mAng(-field_0x50A.mVal * (0.35f + (0.01f * _a))).mVal; + field_0x50E *= 0.85f + (0.01f * _a); + field_0x50A += field_0x50E; + } + if (field_0x50A != mRotation.x) { + sLib::addCalcAngle(mRotation.x.ref(), field_0x50A, 5, 0x4fa, 0xb6); + } + if (field_0x50C != mRotation.y) { + sLib::addCalcAngle(mRotation.y.ref(), field_0x50C, 5, 0x4fa, 0xb6); + } + updateMatrix(); + mWorldMtx.YrotM(field_0x510 - mRotation.y); + mMdl[mCut].setLocalMtx(mWorldMtx); + if (!mCut) { + mCollider.SetC(mPosition); + dCcS::GetInstance()->Set(&mCollider); + } + return SUCCEEDED; +} + +const float dAcOgrassCoil_c::sSqDistThreshold = 1000000.f; +const u32 dAcOgrassCoil_c::lbl_268_rodata_4C = 2; + +int dAcOgrassCoil_c::draw() { + drawModelType1(&mMdl[mCut]); + return SUCCEEDED; +} + void dAcOgrassCoil_c::initializeState_Wait() {} void dAcOgrassCoil_c::executeState_Wait() {} void dAcOgrassCoil_c::finalizeState_Wait() {} From 4aab6303f1622bda8af5bcbb0150bba84b413c25 Mon Sep 17 00:00:00 2001 From: swekka Date: Sun, 7 Dec 2025 12:29:50 +0100 Subject: [PATCH 2/4] mark as matching in configure.py --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 03e61e06..c9083a70 100644 --- a/configure.py +++ b/configure.py @@ -2521,7 +2521,7 @@ config.libs = [ NonMatching, "d_a_obj_goddess_statue", "REL/d/a/obj/d_a_obj_goddess_statue.cpp" ), Rel(NonMatching, "d_a_obj_god_mark", "REL/d/a/obj/d_a_obj_god_mark.cpp"), - Rel(NonMatching, "d_a_obj_grass_coil", "REL/d/a/obj/d_a_obj_grass_coil.cpp"), + Rel(Matching, "d_a_obj_grass_coil", "REL/d/a/obj/d_a_obj_grass_coil.cpp"), Rel(Matching, "d_a_obj_grave", "REL/d/a/obj/d_a_obj_grave.cpp"), Rel(NonMatching, "d_a_obj_ground_cover", "REL/d/a/obj/d_a_obj_ground_cover.cpp"), Rel(NonMatching, "d_a_obj_guard_log", "REL/d/a/obj/d_a_obj_guard_log.cpp"), From 0f335a5429c67917f8460c57bab7fd2421b24b86 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 7 Dec 2025 15:07:18 -0500 Subject: [PATCH 3/4] Member naming and typing --- include/d/a/obj/d_a_obj_grass_coil.h | 15 +++++---- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 46 ++++++++++++-------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/include/d/a/obj/d_a_obj_grass_coil.h b/include/d/a/obj/d_a_obj_grass_coil.h index 6fcce3fd..db611207 100644 --- a/include/d/a/obj/d_a_obj_grass_coil.h +++ b/include/d/a/obj/d_a_obj_grass_coil.h @@ -27,16 +27,17 @@ public: private: /* 0x330 */ nw4r::g3d::ResFile mResFile; - /* 0x334 */ m3d::smdl_c mMdl[2]; + /* 0x334 */ m3d::smdl_c mMdl[2]; ///< Indexed by `mCut` to differentiate between noncut/cut models /* 0x36C */ STATE_MGR_DECLARE(dAcOgrassCoil_c); /* 0x3A8 */ dCcD_Cyl mCollider; - /* 0x4F8 */ mVec3_c mSpawnPos; + /* 0x4F8 */ mVec3_c mSpawnPos; ///< Spawn Position used for when an item is dropped /* 0x504 */ mAng3_c mEffectRot; - /* 0x50A */ mAng field_0x50A; - /* 0x50C */ mAng field_0x50C; - /* 0x50E */ s16 field_0x50E; - /* 0x510 */ mAng field_0x510; - /* 0x512 */ u8 pad_0x512; + /* 0x50A */ s16 mTargetRotX; ///< Used as target for swaying when disturbed + /* 0x50C */ s16 mTargetRotY; ///< Used as target for swaying when disturbed + /* 0x50E */ s16 mSwayAmt; ///< Used to assist with the swaying when disturbed. Adjusts mTargetRotX + /* 0x510 */ mAng mSpawnRotY; ///< A copy of the spawned rotation so mRotation.y is free to adjust. + ///< The final Y-rotation is represented by `mSpawnRotY - mRotation.y` + /* 0x512 */ u8 _0x512; /* 0x513 */ bool mCut; static dCcD_SrcCyl sCylSrc; diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index edb4dac2..7f974664 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -47,14 +47,14 @@ bool dAcOgrassCoil_c::createHeap() { } int dAcOgrassCoil_c::create() { - field_0x510 = mRotation.y; + mSpawnRotY = mRotation.y; mRotation.y = 0; CREATE_ALLOCATOR(dAcOgrassCoil_c); mStts.SetRank(8); mCollider.Set(sCylSrc); mCollider.SetStts(mStts); updateMatrix(); - mWorldMtx.YrotM(field_0x510 - mRotation.y); + mWorldMtx.YrotM(mSpawnRotY - mRotation.y); mMdl[mCut].setLocalMtx(mWorldMtx); mStateMgr.changeState(StateID_Wait); mCullingDistance = 9000.0f; @@ -67,7 +67,7 @@ int dAcOgrassCoil_c::doDelete() { return SUCCEEDED; } -const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; +const s16 dAcOgrassCoil_c::sEffectRotIncrement = 0xe39; // ~20 degrees int dAcOgrassCoil_c::actorExecute() { if (checkObjectProperty(OBJ_PROP_0x1)) { @@ -79,20 +79,18 @@ int dAcOgrassCoil_c::actorExecute() { AttentionManager::GetInstance()->addUnk3Target(*this, 1, 250.0f, -100.0f, 100.0f); } if (!mCut) { - bool hit = false; + bool hitBySlingshot = false; if (mCollider.ChkTgHit()) { if (mCollider.ChkTgAtHitType(AT_TYPE_SLINGSHOT)) { - hit = true; + hitBySlingshot = true; } else { - mEffectRot.y = field_0x510; - u16 effectIndex = PARTICLE_RESOURCE_ID_MAPPING_485_; - s32 i = 0; + mEffectRot.y = mSpawnRotY; for (s32 i = 0; i < 2; i++) { if (i == 1) { - mEffectRot.y += mAng(sEffectRotIncrement); + mEffectRot.y += mAng(0xe39); } dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( - effectIndex, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 + PARTICLE_RESOURCE_ID_MAPPING_485_, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0 ); if (emitter != nullptr) { emitter->bindShpEmitter(dJEffManager_c::GrassCoil, true); @@ -100,7 +98,7 @@ int dAcOgrassCoil_c::actorExecute() { } mCollider.ClrTgSet(); mCut = true; - field_0x50E = mAng(-0xccd); + mSwayAmt = -mAng::d2s(18.0011); startSound(SE_Gcoil_CUT); mCollider.SetR(25.0f); mCollider.SetH(70.0f); @@ -109,31 +107,31 @@ int dAcOgrassCoil_c::actorExecute() { itemDroppingAndGivingRelated(&mSpawnPos, 0); } } - if (hit || !(field_0x50E || !mCollider.ChkCoHit() || !(dAcPy_c::GetLink()->mSpeed > 0.0f))) { + if (hitBySlingshot || (mSwayAmt == 0 && mCollider.ChkCoHit() && dAcPy_c::GetLink()->mSpeed > 0.0f)) { if (!mCut) { - field_0x50E = mAng(-0x93f); + mSwayAmt = -mAng::d2s(13.0025); } else { - field_0x50E = mAng(-0x16c); + mSwayAmt = -mAng::d2s(2); } - field_0x50C = mAng(cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000); + mTargetRotY = cLib::targetAngleY(dAcPy_c::GetLink()->mPosition, mPosition) - 0x8000; } } - if (field_0x50E != 0) { + if (mSwayAmt != 0) { s32 _a = 0; - field_0x50E += mAng(-field_0x50A.mVal * (0.35f + (0.01f * _a))).mVal; - field_0x50E *= 0.85f + (0.01f * _a); - field_0x50A += field_0x50E; + mSwayAmt += s16(-mTargetRotX * (0.35f + (0.01f * _a))); + mSwayAmt *= 0.85f + (0.01f * _a); + mTargetRotX += mSwayAmt; } - if (field_0x50A != mRotation.x) { - sLib::addCalcAngle(mRotation.x.ref(), field_0x50A, 5, 0x4fa, 0xb6); + if (mTargetRotX != mRotation.x) { + sLib::addCalcAngle(mRotation.x.ref(), mTargetRotX, 5, mAng::d2s(7), mAng::d2s(1)); } - if (field_0x50C != mRotation.y) { - sLib::addCalcAngle(mRotation.y.ref(), field_0x50C, 5, 0x4fa, 0xb6); + if (mTargetRotY != mRotation.y) { + sLib::addCalcAngle(mRotation.y.ref(), mTargetRotY, 5, mAng::d2s(7), mAng::d2s(1)); } updateMatrix(); - mWorldMtx.YrotM(field_0x510 - mRotation.y); + mWorldMtx.YrotM(mSpawnRotY - mRotation.y); mMdl[mCut].setLocalMtx(mWorldMtx); if (!mCut) { mCollider.SetC(mPosition); From 1bd24d205575aeefcf022d5563b01ff31da58762 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Sun, 7 Dec 2025 16:48:01 -0500 Subject: [PATCH 4/4] revert constant replacment --- src/REL/d/a/obj/d_a_obj_grass_coil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp index 7f974664..1ece5d83 100644 --- a/src/REL/d/a/obj/d_a_obj_grass_coil.cpp +++ b/src/REL/d/a/obj/d_a_obj_grass_coil.cpp @@ -87,7 +87,7 @@ int dAcOgrassCoil_c::actorExecute() { mEffectRot.y = mSpawnRotY; for (s32 i = 0; i < 2; i++) { if (i == 1) { - mEffectRot.y += mAng(0xe39); + mEffectRot.y += mAng(sEffectRotIncrement); } dEmitterBase_c *emitter = dJEffManager_c::spawnEffect( PARTICLE_RESOURCE_ID_MAPPING_485_, mPosition, &mEffectRot, nullptr, nullptr, nullptr, 0, 0