mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-19 22:02:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #310 from robojumper/simple-remly-names

Browse Source 
Simple Remly field names
This commit is contained in:
robojumper
2026-05-04 21:54:51 +02:00
committed by GitHub
parent 434b1bef7f 24624a4fd2
commit ddb1161879
9 changed files with 539 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/a/e/d_a_e_remly.cpp
+437 -459
View File
File diff suppressed because it is too large Load Diff
src/REL/d/a/obj/d_a_obj_barrel.cpp
+3 -3
View File
@@ -536,7 +536,7 @@ void dAcOBarrel_c::executeState_GrabUp() {
dAcNpcCeFriend_c *pCeFriend = mCeFriend.get();
if (0 == sLib::calcTimer(&field_0xE15)) {
if ((pCeLady && pCeLady->fn_12_1C20(this)) || (pCeFriend && pCeFriend->fn_11_17C0(this))) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
quat_0xD80 = quat_0xD60;
mStateMgr.changeState(StateID_Wait);
return;
@@ -826,7 +826,7 @@ void dAcOBarrel_c::initializeState_Rebirth() {
mCyl.ClrCoSet();
mCyl.ClrTgSet();
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
mStts.SetRank(0);
setObjectProperty(OBJ_PROP_0x200);
@@ -1069,7 +1069,7 @@ void dAcOBarrel_c::fn_293_3DB0() {
extern "C" void fn_800307E0(const mVec3_c &, s32);
void dAcOBarrel_c::fn_293_4200() {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
if (field_0xE04 || field_0xE05) {
dAcNpcCeLady_c *pCeLady = mCeLady.get();
src/REL/d/a/obj/d_a_obj_tubo.cpp
+4 -4
View File
@@ -284,9 +284,9 @@ void dAcOtubo_c::executeState_Grab() {
dAcNpcCeLady_c *lady = mCeLady.get();
dAcNpcCeFriend_c *ceFriend = mCeFriend.get();
if (ceFriend && ceFriend->fn_11_17C0(this)) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
} else if (lady && lady->fn_12_1C20(this)) {
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
}
}
@@ -403,7 +403,7 @@ void dAcOtubo_c::initializeState_Rebirth() {
mSph.ClrCoSet();
mSph.ClrTgSet();
setObjectProperty(OBJ_PROP_0x200);
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
int item_drop_table = getParams2UpperByte();
switch (item_drop_table) {
@@ -452,7 +452,7 @@ void dAcOtubo_c::destroy() {
return;
}
fn_80022BE0(dLightEnv_c::GetPInstance(), mPosition);
getLinkage().fn_80050EA0(this);
getLinkage().forceRemove(this);
dEmitterBase_c *fx_thing = dJEffManager_c::spawnEffect(
PARTICLE_RESOURCE_ID_MAPPING_211_, mPositionCopy2, nullptr, nullptr, nullptr, nullptr, 0, 0
src/d/d_linkage.cpp
+3 -3
View File
@@ -115,7 +115,7 @@ void dLinkage_c::fn_80050E40(dAcObjBase_c *pActor, const f32 speed, const f32 ve
pActor->mAngle.y = rot;
}
void dLinkage_c::fn_80050EA0(dAcObjBase_c *pActor) {
void dLinkage_c::forceRemove(dAcObjBase_c *pActor) {
mState = STATE_DELETE;
fn_80050EB0(pActor);
}
@@ -178,7 +178,7 @@ void dLinkage_c::bushTpFunc(dBgS_Acch &acch) {
if (mType == CONNECTION_7 && mControllingActor.p_owner == player) {
if (!checkFlag(0x10000)) {
if (acch.ChkWallHit(nullptr)) {
fn_80050EA0(player->getWhippedItem());
forceRemove(player->getWhippedItem());
return;
}
field_0x1A = 3;
@@ -210,7 +210,7 @@ void dLinkage_c::fn_80051190(dAcObjBase_c *pActor) {
}
pLinkedActor = nullptr;
fn_80050EA0(pActor);
forceRemove(pActor);
}
void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {