Merge remote-tracking branch 'upstream/HEAD' into d_a_obj_bomb

4 files changed, 661 insertions, 5 deletions

diff --git a/src/d/a/d_a_salbage_obj.cpp b/src/d/a/d_a_salbage_obj.cpp
index 73232f06..6fef71f6 100644
--- a/src/d/a/d_a_salbage_obj.cpp
+++ b/src/d/a/d_a_salbage_obj.cpp
@@ -97,9 +97,9 @@ int dAcSalbageObj_c::preExecute() {
         }
     }
 
-    getDowsingUnusedF32();
-    field_0x95C.set(0.0f, getDowsingTargetYOffset(), 0.0f);
-    mDowsingTarget.setOffset(field_0x95C);
+    (void)getDowsingUnusedF32();
+    mDowsingOffset.set(0.0f, getDowsingTargetYOffset(), 0.0f);
+    mDowsingTarget.setOffset(mDowsingOffset);
 
     return result;
 }
@@ -312,7 +312,7 @@ void dAcSalbageObj_c::loadBehaviorFromParams() {
 }
 
 void dAcSalbageObj_c::initializeState_Wait() {
-    mDowsingTarget.initialize(getDowsingSlot(), 0, &field_0x95C, getDowsingUnusedF32());
+    mDowsingTarget.initialize(getDowsingSlot(), 0, &mDowsingOffset, getDowsingUnusedF32());
     mDowsingTarget.doRegister();
     mIsDowsingRegistered = true;
 }
@@ -323,7 +323,7 @@ void dAcSalbageObj_c::executeState_Wait() {
             dAcObjBase_c::create(fProfile::NPC_SLB, mRoomID, 0xFFFFFD01, &pos, nullptr, nullptr, -1);
         }
 
-        if (dSalvageMgr_c::sInstance->startedQuestForSalvageObj(this)) {
+        if (dSalvageMgr_c::sInstance->hasStartedQuestForSalvageObj(this)) {
             addAttentionTargetIfNeeded();
         }
     }
diff --git a/src/d/tg/d_t_alldie.cpp b/src/d/tg/d_t_alldie.cpp
new file mode 100644
index 00000000..a205ce09
--- /dev/null
+++ b/src/d/tg/d_t_alldie.cpp
@@ -0,0 +1,112 @@
+#include "d/t/d_t_alldie.h"
+
+#include "common.h"
+#include "d/a/d_a_player.h"
+#include "d/a/e/d_a_en_base.h"
+#include "d/a/obj/d_a_obj_base.h"
+#include "d/d_stage.h"
+#include "d/flag/sceneflag_manager.h"
+#include "f/f_base.h"
+#include "f/f_manager.h"
+#include "f/f_profile_name.h"
+#include "s/s_Math.h"
+#include "toBeSorted/area_math.h"
+#include "toBeSorted/event_manager.h"
+
+SPECIAL_ACTOR_PROFILE(ALLDIE_TAG, dTgAllDie_c, fProfile::ALLDIE_TAG, 0x23, 0, 4);
+
+int dTgAllDie_c::create() {
+    mSceneflag = getFromParams(4, 0xFF);
+    mType = getFromParams(12, 0x3);
+    mTimer0x140 = getFromParams(22, 0xFF);
+    field_0x148 = 0;
+    field_0x144 = getFromParams(30, 0xFF);
+    mRotation.x.set(0);
+    matrixCreateFromPosRotYScale(mArea, mPosition, mRotation.y, mScale, nullptr, 0.0f);
+    return SUCCEEDED;
+}
+
+int dTgAllDie_c::doDelete() {
+    return SUCCEEDED;
+}
+
+int dTgAllDie_c::actorExecute() {
+    if (!dStage_c::GetInstance()->isRoomID(mRoomID)) {
+        return SUCCEEDED;
+    }
+
+    if (mType <= 1) {
+        if (dTimeAreaMgr_c::fn_800BBD40()) {
+            return SUCCEEDED;
+        }
+
+        mTimeArea.check(mRoomID, mPosition, 0, 10.0f, 0.1f);
+        f32 f = mTimeArea.getDistMaybe();
+        if (mType == 0 && f < 1.0f) {
+            return SUCCEEDED;
+        }
+        if (mType == 1 && 0.0f < f) {
+            return SUCCEEDED;
+        }
+    }
+
+    mNumEnemiesInArea = 0;
+    dAcEnBase_c *pEnemy = nullptr;
+    while ((pEnemy = dAcEnBase_c::GetNextEnemy(pEnemy))) {
+        if (pEnemy->mRoomID == mRoomID && !pEnemy->checkInteractionFlags(0x2)) {
+            if (pEnemy->checkProcControl(DISABLE_EXECUTE) == 0 && pEnemy->mLifecycleState != TO_BE_DELETED) {
+                if (checkAreaBox(mArea, pEnemy->mPosition)) {
+                    mNumEnemiesInArea++;
+                }
+            }
+        }
+    }
+
+    if (mNumEnemiesInArea == 0) {
+        if (field_0x148 != 0 && EventManager::isInEvent()) {
+            return SUCCEEDED;
+        }
+
+        if (sLib::calcTimer(&mTimer0x13C) == 0) {
+            if (mSceneflag < 0xFF && !SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
+                SceneflagManager::sInstance->setFlag(mRoomID, mSceneflag);
+            }
+        }
+    } else {
+        mTimer0x13C = (mTimer0x140 <= 128 ? mTimer0x140 + 40 : 40 - (256 - mTimer0x140));
+        if (mSceneflag < 0xFF && SceneflagManager::sInstance->checkBoolFlag(mRoomID, mSceneflag)) {
+            SceneflagManager::sInstance->unsetFlag(mRoomID, mSceneflag);
+        }
+    }
+    return SUCCEEDED;
+}
+
+int dTgAllDie_c::draw() {
+    return SUCCEEDED;
+}
+
+dTgAllDie_c *dTgAllDie_c::getNearestToPlayer(s32 roomId) {
+    fBase_c *pPrev = nullptr;
+    dTgAllDie_c *pReturn = nullptr;
+    const dAcPy_c *pPlayer = dAcPy_c::GetLink();
+    f32 minDist = 1e10f;
+
+    while (true) {
+        dTgAllDie_c *pTgAllDie =
+            static_cast<dTgAllDie_c *>(fManager_c::searchBaseByProfName(fProfile::ALLDIE_TAG, pPrev));
+        pPrev = pTgAllDie;
+
+        if (pTgAllDie == nullptr) {
+            break;
+        }
+
+        if (roomId == pTgAllDie->mRoomID) {
+            f32 dist = pPlayer->getPosition().squareDistanceToXZ(pTgAllDie->getPosition());
+            if (dist < minDist) {
+                pReturn = pTgAllDie;
+                minDist = dist;
+            }
+        }
+    }
+    return pReturn;
+}
diff --git a/src/d/tg/d_t_view_clip.cpp b/src/d/tg/d_t_view_clip.cpp
new file mode 100644
index 00000000..30ef9cba
--- /dev/null
+++ b/src/d/tg/d_t_view_clip.cpp
@@ -0,0 +1,93 @@
+#include "d/t/d_t_view_clip.h"
+
+#include "common.h"
+#include "d/d_camera.h"
+#include "d/d_sc_game.h"
+#include "f/f_base.h"
+#include "toBeSorted/area_math.h"
+#include "toBeSorted/area_utils.h"
+
+SPECIAL_ACTOR_PROFILE(VIEW_CLIP_TAG, dTgViewClip_c, fProfile::VIEW_CLIP_TAG, 0xB, 0, 0);
+
+u8 dTgViewClip_c::sViewClips[dTgViewClip_c::sNumEntries] = {};
+
+int dTgViewClip_c::create() {
+    mIndex = getFromParams(0, 0x3F);
+    mType = getFromParams(8, 0xF);
+    if (mType == 0xF) {
+        mType = TYPE_FORCE_OFF;
+    }
+
+    mAreaIndex = getFromParams(12, 0xFF);
+    matrixCreateFromPosRotYScale(mArea, mPosition, mRotation.y, mScale, nullptr, 0.0f);
+
+    return SUCCEEDED;
+}
+
+int dTgViewClip_c::doDelete() {
+    return SUCCEEDED;
+}
+
+int dTgViewClip_c::actorExecute() {
+    return SUCCEEDED;
+}
+
+int dTgViewClip_c::draw() {
+    dCamera_c *pCamera = dScGame_c::getCamera();
+    if (!checkAreaBox(mArea, pCamera->getPosition())) {
+        if (mAreaIndex == 0xFF) {
+            return SUCCEEDED;
+        }
+        if (!checkPosInArea(mAreaIndex, mRoomID, pCamera->getPosition(), nullptr)) {
+            return SUCCEEDED;
+        }
+    }
+
+    switch (mType) {
+        case TYPE_FORCE_ON:  setViewClip(FLAG_FORCE_ON); break;
+        case TYPE_FORCE_OFF: setViewClip(FLAG_FORCE_OFF); break;
+    }
+
+    return SUCCEEDED;
+}
+
+void dTgViewClip_c::setViewClip(u8 setBit) {
+    setViewClipBit(mIndex, setBit);
+}
+
+void dTgViewClip_c::resetViewClip() {
+    for (int i = 0; i < sNumEntries - 1; ++i) {
+        setViewClip(i, 0);
+    }
+}
+
+f32 dTgViewClip_c::getCull(s32 idx, f32 cullDistance) {
+    if (idx > ARRAY_LENGTH(sViewClips) - 2) {
+        return cullDistance;
+    }
+
+    if (getViewClipBit(idx, FLAG_FORCE_ON)) {
+        return FLOAT_MAX;
+    } else if (getViewClipBit(idx, FLAG_FORCE_OFF)) {
+        return -1.0f;
+    }
+
+    return cullDistance;
+}
+bool dTgViewClip_c::checkForceOn(s32 idx) {
+    if (idx <= ARRAY_LENGTH(sViewClips) - 2) {
+        return getViewClipBit(idx, FLAG_FORCE_ON);
+    }
+    return false;
+}
+
+u8 dTgViewClip_c::getViewClipBit(s32 idx, u8 setBit) {
+    return sViewClips[idx] & setBit;
+}
+void dTgViewClip_c::setViewClipBit(s32 idx, u8 setBit) {
+    sViewClips[idx] |= setBit;
+}
+
+void dTgViewClip_c::setViewClip(s32 idx, u8 value) {
+    sViewClips[idx] = value;
+}
diff --git a/src/toBeSorted/salvage_mgr.cpp b/src/toBeSorted/salvage_mgr.cpp
new file mode 100644
index 00000000..0a972c38
--- /dev/null
+++ b/src/toBeSorted/salvage_mgr.cpp
@@ -0,0 +1,451 @@
+
+#include "toBeSorted/salvage_mgr.h"
+
+#include "common.h"
+#include "d/d_sc_game.h"
+#include "d/flag/storyflag_manager.h"
+#include "toBeSorted/event_manager.h"
+
+dSalvageMgr_c *dSalvageMgr_c::sInstance;
+
+void dSalvageMgr_c::create() {
+    if (sInstance == nullptr) {
+        sInstance = new dSalvageMgr_c();
+        if (sInstance != nullptr) {
+            sInstance->init();
+        }
+    }
+}
+
+void dSalvageMgr_c::remove() {
+    delete sInstance;
+    sInstance = nullptr;
+}
+
+void dSalvageMgr_c::init() {
+    mCurrentPickupIdx = -1;
+    mCurrentPickupMaskBit = 0;
+    for (int i = 0; i < SALVAGE_OBJ_MAX; i++) {
+        s32 it = i;
+        if (!checkDeliveredStoryflag(it) && checkPickupStoryflag(it)) {
+            mCurrentPickupIdx = it;
+            mCurrentPickupMaskBit |= 1 << it;
+        }
+    }
+    field_0x2C = 10;
+    setupDeliverToTarget();
+}
+
+void dSalvageMgr_c::execute() {
+    handlePickupIndex();
+    setupDeliverToTarget();
+}
+
+void dSalvageMgr_c::handlePickupIndex() {
+    if (mCurrentPickupIdx != -1 && checkDeliveredStoryflag(mCurrentPickupIdx)) {
+        mCurrentPickupIdx = -1;
+    }
+
+    s32 target = -1;
+    for (int i = 0; i < SALVAGE_OBJ_MAX; i++) {
+        s32 it = i;
+        if (!checkDeliveredStoryflag(it) && checkPickupStoryflag(it)) {
+            // TODO instruction swap
+            if (target == -1 && it != mCurrentPickupIdx && !checkPickupMask(it)) {
+                target = it;
+            }
+            mCurrentPickupMaskBit |= 1 << it;
+        } else {
+            mCurrentPickupMaskBit &= ~(1 << it);
+        }
+    }
+
+    if (target != -1) {
+        setPickupIndex(target);
+    }
+}
+
+void dSalvageMgr_c::setupDeliverToTarget() {
+    if (checkIsOnDeliveryStage2() && field_0x2C > 0) {
+        // TODO wrong registers
+        if (!mDeliverToRef.isLinked() || mDeliverToRef.get()->mProfileName != getDeliverToActorId(mCurrentPickupIdx)) {
+            dAcObjBase_c *deliverTo = findDeliveryTarget();
+            if (deliverTo == nullptr) {
+                mDeliverToRef.unlink();
+                field_0x2C = field_0x2C - 1 < 0 ? 0 : field_0x2C - 1;
+            } else {
+                mDeliverToRef.link(deliverTo);
+                field_0x2C = 10;
+            }
+        }
+    } else {
+        mDeliverToRef.unlink();
+    }
+}
+
+struct SalvageMgrObjTransform {
+    ~SalvageMgrObjTransform() {}
+
+    /* 0x00 */ mVec3_c offset;
+    /* 0x0C */ mAng3_c rotation;
+};
+
+#define deg_ang(x, y, z) mAng3_c(mAng::fromDeg(x), mAng::fromDeg(y), mAng::fromDeg(z))
+
+static const SalvageMgrObjTransform sTransforms[SALVAGE_OBJ_MAX] = {
+    { mVec3_c(29.22f,    4.51f, -46.36f),  deg_ang(81.83f,  56.65f, -12.683f)},
+    { mVec3_c(37.05f,  -65.41f, -10.07f),  deg_ang(4.149f, 21.983f, 134.444f)},
+    {mVec3_c(-28.28f,  -27.73f,  -5.12f), deg_ang(16.224f,  5.528f, -73.192f)},
+    { mVec3_c(-44.5f,  -37.32f,  -7.17f),  deg_ang(4.237f,  15.61f, -90.026f)},
+    {mVec3_c(-26.64f,   -8.95f, -95.21f), deg_ang(83.418f, 19.082f, -73.081f)},
+    {mVec3_c(-97.98f, -194.72f,  0.119f), deg_ang(-1.184f,   1.26f, -52.992f)},
+    {mVec3_c(-97.98f, -194.72f,  0.119f), deg_ang(-1.184f,   1.26f, -52.992f)},
+};
+
+#undef deg_ang
+
+struct SalvageMgrObjDef {
+    /* 0x00 */ u16 profileId;
+    /* 0x02 */ u16 deliverToProfileId;
+    /* 0x04 */ const char *fayCallEvnt;
+    /* 0x08 */ const char *deliveryEvnt;
+    /* 0x0C */ const char *postDeliveryEvnt;
+    /* 0x10 */ const char *stage;
+    /* 0x14 */ s32 questStartedStoryflag;
+    /* 0x18 */ s32 pickedUpStoryFlag;
+    /* 0x1C */ s32 additionalPickupUnsetFlag;
+    /* 0x20 */ s32 deliveredStoryflag;
+};
+
+// TODO - the docs for the plant species flags might be wrong
+// clang-format off
+static const SalvageMgrObjDef sDefs[SALVAGE_OBJ_MAX] = {
+    {        fProfile::OBJ_PROPERA, fProfile::NPC_SORAJIMA_FATHER, "SalbageFayCall",  "DelivaryPropera", "RepearPropera",  "F000",           STORYFLAG_SCRAPPER_UNLOCKED,            STORYFLAG_PROPERA_PICKUP,  -1,       STORYFLAG_WINDMILL_REPAIRED },
+    {       fProfile::OBJ_ROULETTE, fProfile::NPC_DIVE_GAME_JUDGE, "SalbageFayCall", "DelivaryRoulette",   "DefaultTalk",  "F020",   STORYFLAG_PARTY_WHEEL_QUEST_STARTED,        STORYFLAG_PARTY_WHEEL_PICKUP,  -1,   STORYFLAG_PARTY_WHEEL_DELIVERED },
+    {fProfile::OBJ_DIVINER_CRYSTAL,             fProfile::NPC_SHA, "SalbageFayCall",   "DelivarySuisho",   "DefaultTalk", "F013r",       STORYFLAG_CRYSTAL_QUEST_STARTED,            STORYFLAG_CRYSTAL_PICKUP,  -1,       STORYFLAG_CRYSTAL_DELIVERED },
+    {  fProfile::NPC_SALBAGE_MORRY,             fProfile::NPC_SKN, "SalbageFayCall",     "DelivaryKyui", "RepearPropera", "F001r", STORYFLAG_PLANT_SPECIES_QUEST_STARTED,                       STORYFLAG_480,  -1,                     STORYFLAG_481 },
+    {     fProfile::NPC_MOLE_ELDER,             fProfile::NPC_PDU, "SalbageFayCall",     "DelivaryMole",   "DefaultTalk",  "F020",    STORYFLAG_MOLE_ELDER_QUEST_STARTED,         STORYFLAG_MOLE_ELDER_PICKUP,  -1,    STORYFLAG_MOLE_ELDER_DELIVERED },
+    {      fProfile::OBJ_WATER_JAR, fProfile::NPC_SORAJIMA_FATHER, "SalbageFayCall",      "DelivaryPot",   "DefaultTalk",  "F000",   STORYFLAG_WATER_BASIN_QUEST_STARTED,  STORYFLAG_SCRAPPER_HAS_WATER_BASIN,  -1, STORYFLAG_SUMMIT_BIG_FROG_WATERED },
+    {        fProfile::OBJ_POT_SAL, fProfile::NPC_SORAJIMA_FATHER, "SalbageFayCall",  "DelivaryPumpPot",   "DefaultTalk",  "F023",      STORYFLAG_SPIRAL_CHARGE_UNLOCKED,       STORYFLAG_PUMPKIN_SOUP_PICKUP,  -1,    STORYFLAG_LEVIAS_FIGHT_STARTED },
+};
+// clang-format on
+
+struct SalvageMgrObjEntrypoints {
+    /* 0x00 */ u16 talkEntrypoint1;
+    /* 0x02 */ u16 talkEntrypoint2;
+    /* 0x04 */ u16 talkEntrypoint3;
+    /* 0x06 */ u16 talkEntrypoint4; // unused
+};
+
+// clang-format off
+static const SalvageMgrObjEntrypoints sEntrypoints[SALVAGE_OBJ_MAX] = {
+    {
+        51001, // 510_01: This is the Windmill Propeller...
+        51004, // 510_04: Master, I suggest that we also return...
+        51005, // 510_05: Hey! Master Shortpants! You're in my may...
+        11818, // 118_18: Here's that windmill propeller, zzzazt!
+    },
+    {
+        45101, // 451_01: I have identified the item that the... highly unusual man...
+        45104, // 451_04: Master, I suggest that we also return...
+        45105, // 451_05: OK, OK, zrrft... You just sit tight there
+        11005, // 110_05: Here's your wheel thing, bzzzrrrt!
+    },
+    {
+        35101, // 351_01: I have located a substance that closely resembles...
+        35104, // 351_04: Master, I suggest we also return...
+        35105, // 351_05: Hey, Master Shortpants! How come...
+        11820, // 118_20: Here's that bright and shiny crystal ball, BZZAT!
+    },
+    {
+        25106, // 251_06: I can verify with only 40% accuracy that this person is a plant...
+        25104, // 251_04: Master, I suggest we also return...
+        25105, // 251_05: Move it! Move it! Zrrppt! Forcing me...
+        11821, // 118_21: I have come bearing the unusual Kikwi...
+    },
+    {
+        51001, // (?) 510_01: This is the Windmill Propeller...
+        35111, // 351_11: Master, I suggest that we also return...
+        35112, // 351_12: You don't have to tell me twice, zrrbt!
+        11820, // (?) 118_20: Here's that bright and shiny crystal ball, BZZAT!
+    },
+    {
+        51001, // (?) 510_01: This is the Windmill Propeller...
+        -1,    // <nothing>
+        -1,    // <nothing>
+        11790, // Does not exist?
+    },
+    {
+        51001, // (?) 510_01: This is the Windmill Propeller...
+        -1,    // <nothing>
+        -1,    // <nothing>
+        12020, // 120_20: I'm unloading this cargo of pumpkin soup...
+    },
+};
+// clang-format off
+
+mMtx_c dSalvageMgr_c::getCarryRotMtx(const s32 &id) const {
+    SalvageMgrObjTransform tf = sTransforms[id];
+    mMtx_c result;
+    result.transS(tf.offset);
+    result.ZYXrotM(tf.rotation);
+    return result;
+}
+
+void dSalvageMgr_c::setPickupIndex(const s32 &id) {
+    for (int i = 0; i < SALVAGE_OBJ_MAX; i++) {
+        if (i != id) {
+            unsetPickupStoryflag(i);
+        }
+    }
+
+    if (!checkDeliveredStoryflag(id)) {
+        mCurrentPickupIdx = id;
+    }
+}
+
+void dSalvageMgr_c::deleteObjAndSlb() {
+    dAcObjBase_c *slb = mSlbRef.get();
+    dAcObjBase_c *obj = mObjRef.get();
+
+    if (obj != nullptr) {
+        obj->deleteRequest();
+    }
+    if (slb != nullptr) {
+        slb->deleteRequest();
+    }
+}
+
+bool dSalvageMgr_c::checkIsOnDeliveryStage2() const {
+    if (mCurrentPickupIdx == -1) {
+        return false;
+    }
+    return checkIsOnDeliveryStage();
+}
+
+bool dSalvageMgr_c::hasStartedQuestForSalvageObj(const dAcSalbageObj_c *obj) const {
+    s32 id = obj->getSalvageIf()->getSalvageObjId();
+    if (id < 0) {
+        return false;
+    }
+    s32 it = id;
+    return hasStartedQuestForId(it);
+}
+
+bool dSalvageMgr_c::hasStartedQuestForId(const s32 &id) const {
+    if (id == -1) {
+        return false;
+    } else if (sDefs[id].questStartedStoryflag == -1) {
+        return false;
+    } else {
+        return StoryflagManager::sInstance->getFlag(sDefs[id].questStartedStoryflag) != 0;
+    }
+}
+
+bool dSalvageMgr_c::hasDowsingForSalvageObj(const dAcSalbageObj_c *obj) const {
+    s32 id = obj->getSalvageIf()->getSalvageObjId();
+    if (id < 0) {
+        return false;
+    }
+    s32 it = id;
+    return hasDowsingForId(it);
+}
+
+bool dSalvageMgr_c::hasDowsingForId(const s32 &id) const {
+    if (id == -1) {
+        return false;
+    } else if (checkDeliveredStoryflag(id)) {
+        return false;
+    } else {
+        bool ret = false;
+        switch (id) {
+            case SALVAGE_OBJ_PROPERA: {
+                ret = DowsingTarget::hasPropellerDowsing();
+                break;
+            }
+            case SALVAGE_OBJ_ROULETTE: {
+                ret = DowsingTarget::hasPartyWheelDowsing();
+                break;
+            }
+            case SALVAGE_OBJ_DIVINER_CRYSTAL: {
+                ret = DowsingTarget::hasCrystalBallDowsing();
+                break;
+            }
+            case SALVAGE_OBJ_SALVAGE_MORRY: {
+                ret = DowsingTarget::hasNewPlantSpeciesDowsing();
+                break;
+            }
+            case SALVAGE_OBJ_MOLE_ELDER: {
+                ret = DowsingTarget::hasPumpkinDowsing();
+                break;
+            }
+            case SALVAGE_OBJ_WATER_JAR: {
+                ret = DowsingTarget::hasWaterBasinDowsing();
+                break;
+            }
+        }
+        return ret;
+    }
+}
+
+u16 dSalvageMgr_c::getDeliverToActorId(s32 id) {
+    return sDefs[id].deliverToProfileId;
+}
+
+void dSalvageMgr_c::noop() {}
+
+s32 dSalvageMgr_c::getCurrentSalvageObjId() const {
+    return mCurrentPickupIdx;
+}
+
+bool dSalvageMgr_c::checkDeliveredStoryflag(const s32 &id) const {
+    if (id == -1) {
+        return false;
+    } else if (sDefs[id].deliveredStoryflag == -1) {
+        return false;
+    } else {
+        return StoryflagManager::sInstance->getFlag(sDefs[id].deliveredStoryflag) != 0;
+    }
+}
+
+void dSalvageMgr_c::unsetPickupStoryflag(const s32 &id) {
+    if (id == -1) {
+        return;
+    } else if (checkDeliveredStoryflag(id)) {
+        return;
+    } else {
+        // TODO - ???
+        s32 alsoUnsetFlag = sDefs[id].additionalPickupUnsetFlag;
+        if (sDefs[id].pickedUpStoryFlag != -1) {
+            StoryflagManager::sInstance->unsetFlag(sDefs[id].pickedUpStoryFlag);
+        }
+        if (alsoUnsetFlag != -1) {
+            StoryflagManager::sInstance->unsetFlag(sDefs[id].additionalPickupUnsetFlag);
+        }
+    }
+}
+
+bool dSalvageMgr_c::checkPickupStoryflag(const s32 &id) const {
+    if (id == -1) {
+        return false;
+    } else if (sDefs[id].pickedUpStoryFlag == -1) {
+        return false;
+    } else {
+        return StoryflagManager::sInstance->getFlag(sDefs[id].pickedUpStoryFlag) != 0;
+    }
+}
+
+bool dSalvageMgr_c::checkIsOnDeliveryStage() const {
+    if (mCurrentPickupIdx >= 0 && dScGame_c::currentSpawnInfo.stageName == sDefs[mCurrentPickupIdx].stage) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+dAcObjBase_c *dSalvageMgr_c::findDeliveryTarget() {
+    if (mDeliverToRef.isLinked()) {
+        return mDeliverToRef.get();
+    } else if (mCurrentPickupIdx == -1) {
+        return nullptr;
+    } else {
+        return (dAcObjBase_c *)fManager_c::searchBaseByProfName(
+            (ProfileName)sDefs[mCurrentPickupIdx].deliverToProfileId, nullptr
+        );
+    }
+}
+
+bool dSalvageMgr_c::triggerDeliveryEvent() {
+    if (mCurrentPickupIdx == -1) {
+        return false;
+    } else {
+        dAcNpcSlb_c *slb = mSlbRef.get();
+        dAcSalbageObj_c *obj = mObjRef.get();
+        dAcObjBase_c *deliverTo = mDeliverToRef.get();
+        if (slb == nullptr || obj == nullptr || deliverTo == nullptr) {
+            return false;
+        } else {
+            Event ev(sDefs[mCurrentPickupIdx].deliveryEvnt, 100, 0x100001, nullptr, nullptr);
+            EventManager::alsoSetAsCurrentEvent(slb, &ev, deliverTo);
+            return true;
+        }
+    }
+}
+
+u16 dSalvageMgr_c::getTalkEntryPoint1ForPickup(dAcObjBase_c *obj) {
+    SalvageObj_e id = SALVAGE_OBJ_NONE;
+    if (obj != nullptr) {
+        if (obj->mProfileName == fProfile::OBJ_PROPERA) {
+            id = SALVAGE_OBJ_PROPERA;
+        } else if (obj->mProfileName == fProfile::OBJ_ROULETTE) {
+            id = SALVAGE_OBJ_ROULETTE;
+        } else if (obj->mProfileName == fProfile::OBJ_DIVINER_CRYSTAL) {
+            id = SALVAGE_OBJ_DIVINER_CRYSTAL;
+        } else if (obj->mProfileName == fProfile::NPC_SALBAGE_MORRY) {
+            id = SALVAGE_OBJ_SALVAGE_MORRY;
+        } else if (obj->mProfileName == fProfile::NPC_MOLE_ELDER) {
+            id = SALVAGE_OBJ_MOLE_ELDER;
+        } else if (obj->mProfileName == fProfile::OBJ_WATER_JAR) {
+            id = SALVAGE_OBJ_WATER_JAR;
+        } else {
+            id = SALVAGE_OBJ_PROPERA;
+        }
+    }
+
+    if (id == SALVAGE_OBJ_NONE) {
+        return -1;
+    }
+    return sEntrypoints[id].talkEntrypoint1;
+}
+
+u16 dSalvageMgr_c::getTalkEntryPoint2ForPickup(dAcObjBase_c *obj) {
+    SalvageObj_e id = SALVAGE_OBJ_NONE;
+    if (obj != nullptr) {
+        if (obj->mProfileName == fProfile::OBJ_PROPERA) {
+            id = SALVAGE_OBJ_PROPERA;
+        } else if (obj->mProfileName == fProfile::OBJ_ROULETTE) {
+            id = SALVAGE_OBJ_ROULETTE;
+        } else if (obj->mProfileName == fProfile::OBJ_DIVINER_CRYSTAL) {
+            id = SALVAGE_OBJ_DIVINER_CRYSTAL;
+        } else if (obj->mProfileName == fProfile::NPC_SALBAGE_MORRY) {
+            id = SALVAGE_OBJ_SALVAGE_MORRY;
+        } else if (obj->mProfileName == fProfile::NPC_MOLE_ELDER) {
+            id = SALVAGE_OBJ_MOLE_ELDER;
+        } else if (obj->mProfileName == fProfile::OBJ_WATER_JAR) {
+            id = SALVAGE_OBJ_WATER_JAR;
+        } else {
+            id = SALVAGE_OBJ_PROPERA;
+        }
+    }
+
+    if (id == SALVAGE_OBJ_NONE) {
+        return -1;
+    }
+    return sEntrypoints[id].talkEntrypoint2;
+}
+
+u16 dSalvageMgr_c::getTalkEntryPoint3ForPickup(dAcObjBase_c *obj) {
+    SalvageObj_e id = SALVAGE_OBJ_NONE;
+    if (obj != nullptr) {
+        if (obj->mProfileName == fProfile::OBJ_PROPERA) {
+            id = SALVAGE_OBJ_PROPERA;
+        } else if (obj->mProfileName == fProfile::OBJ_ROULETTE) {
+            id = SALVAGE_OBJ_ROULETTE;
+        } else if (obj->mProfileName == fProfile::OBJ_DIVINER_CRYSTAL) {
+            id = SALVAGE_OBJ_DIVINER_CRYSTAL;
+        } else if (obj->mProfileName == fProfile::NPC_SALBAGE_MORRY) {
+            id = SALVAGE_OBJ_SALVAGE_MORRY;
+        } else if (obj->mProfileName == fProfile::NPC_MOLE_ELDER) {
+            id = SALVAGE_OBJ_MOLE_ELDER;
+        } else if (obj->mProfileName == fProfile::OBJ_WATER_JAR) {
+            id = SALVAGE_OBJ_WATER_JAR;
+        } else {
+            id = SALVAGE_OBJ_PROPERA;
+        }
+    }
+
+    if (id == SALVAGE_OBJ_NONE) {
+        return -1;
+    }
+    return sEntrypoints[id].talkEntrypoint3;
+}