From e911d7ce67b7877768ef5fcd43f60c065f2fe52e Mon Sep 17 00:00:00 2001 From: swekka Date: Sun, 2 Nov 2025 23:28:30 +0100 Subject: [PATCH] use sPushRelatedConstant instead of extern --- config/SOUE01/symbols.txt | 2 +- src/REL/d/a/obj/d_a_obj_grave.cpp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 7fe0fed7..54fadc77 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -43413,7 +43413,7 @@ lbl_80576FFC = .sdata2:0x80576FFC; // type:object size:0x4 align:4 data:float lbl_80577000 = .sdata2:0x80577000; // type:object size:0x4 align:4 data:float lbl_80577004 = .sdata2:0x80577004; // type:object size:0x4 align:4 data:float @11566 = .sdata2:0x80577008; // type:object size:0x4 scope:local align:4 data:float -lbl_80577010 = .sdata2:0x80577010; // type:object size:0x4 align:4 data:float +sPushRelatedConstant__17daPlayerActBase_c = .sdata2:0x80577010; // type:object size:0x4 align:4 data:float lbl_80577014 = .sdata2:0x80577014; // type:object size:0x4 align:4 data:float lbl_80577018 = .sdata2:0x80577018; // type:object size:0x4 align:4 data:float @26291 = .sdata2:0x80577020; // type:object size:0x8 scope:local data:string diff --git a/src/REL/d/a/obj/d_a_obj_grave.cpp b/src/REL/d/a/obj/d_a_obj_grave.cpp index 6ceed2b5..8c6bb452 100644 --- a/src/REL/d/a/obj/d_a_obj_grave.cpp +++ b/src/REL/d/a/obj/d_a_obj_grave.cpp @@ -82,8 +82,6 @@ inline static void vecCylCalc(mVec3_c &target, const mAng &rot, f32 factor) { target.z += factor * rot.cos(); } -extern const f32 lbl_80577010; - int dAcOGrave_c::create() { mShouldGlow = getFromParams(0, 3) == 0; mSceneflag = getFromParams(2, 0xFF); @@ -105,7 +103,7 @@ int dAcOGrave_c::create() { } field_0x7F6 = false; mOrigPos2 = mPosition; - vecCylCalc(mOrigPos2, mRotation.y.mVal + 0x8000, lbl_80577010); + vecCylCalc(mOrigPos2, mRotation.y.mVal + 0x8000, dAcPy_c::sPushRelatedConstant); mPosition.set(mOrigPos2.x, mOrigPos2.y, mOrigPos2.z); mOldPosition.set(mOrigPos2.x, mOrigPos2.y, mOrigPos2.z); } @@ -170,7 +168,7 @@ void dAcOGrave_c::executeState_Wait() { s32 diff = sLib::absDiff(ang, mRotation.y); if (field_0x7F6) { mOrigPos2 = mPosition; - vecCylCalc(mOrigPos2, mAngle.y, lbl_80577010); + vecCylCalc(mOrigPos2, mAngle.y, dAcPy_c::sPushRelatedConstant); if ((mPush && (s16)diff < 0x2000) || (mPull && (s16)diff > 0x6000)) { field_0x7F6 = false; mStateMgr.changeState(StateID_Move);