mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-08 12:17:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

use sPushRelatedConstant instead of extern

Browse Source
This commit is contained in:
swekka
2025-11-02 23:28:30 +01:00
parent ad8c37369a
commit e911d7ce67
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+1 -1
View File
@@ -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
src/REL/d/a/obj/d_a_obj_grave.cpp
+2 -4
View File
@@ -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);