diff options
| author | robojumper <robojumper@gmail.com> | 2026-09-13 10:28:06 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2026-09-13 10:28:06 +0200 |
| commit | ae87d5a5b1f99fa73b3541f8d01dbdc51a99eb10 (patch) | |
| tree | 486b09ac0bb9da838dcb3b6cbbb1b1118118d00f | |
| parent | df9e406095d7f5d778b911a2e0e4beefac348142 (diff) | |
Review
| -rw-r--r-- | config/SOUE01/symbols.txt | 2 | ||||
| -rw-r--r-- | include/toBeSorted/salvage_mgr.h | 2 | ||||
| -rw-r--r-- | src/toBeSorted/salvage_mgr.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index a82abeab..e6a90828 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -3649,7 +3649,7 @@ remove__13dSalvageMgr_cFv = .text:0x800A5680; // type:function size:0x74 init__13dSalvageMgr_cFv = .text:0x800A5700; // type:function size:0xB4 execute__13dSalvageMgr_cFv = .text:0x800A57C0; // type:function size:0x34 handlePickupIndex__13dSalvageMgr_cFv = .text:0x800A5800; // type:function size:0x11C -setupDeliverToActorLink__13dSalvageMgr_cFv = .text:0x800A5920; // type:function size:0xC0 +setupDeliverToTarget__13dSalvageMgr_cFv = .text:0x800A5920; // type:function size:0xC0 __dt__22SalvageMgrObjTransformFv = .text:0x800A59E0; // type:function size:0x40 getCarryRotMtx__13dSalvageMgr_cCFRCl = .text:0x800A5A20; // type:function size:0x84 setPickupIndex__13dSalvageMgr_cFRCl = .text:0x800A5AB0; // type:function size:0x84 diff --git a/include/toBeSorted/salvage_mgr.h b/include/toBeSorted/salvage_mgr.h index a848ace9..a30633ff 100644 --- a/include/toBeSorted/salvage_mgr.h +++ b/include/toBeSorted/salvage_mgr.h @@ -40,7 +40,7 @@ public: void setPickupIndex(const s32 &id); void unsetPickupStoryflag(const s32 &id); void handlePickupIndex(); - void setupDeliverToActorLink(); + void setupDeliverToTarget(); bool checkIsOnDeliveryStage() const; bool checkIsOnDeliveryStage2() const; u16 getDeliverToActorId(s32 id); diff --git a/src/toBeSorted/salvage_mgr.cpp b/src/toBeSorted/salvage_mgr.cpp index 1f94edad..0a972c38 100644 --- a/src/toBeSorted/salvage_mgr.cpp +++ b/src/toBeSorted/salvage_mgr.cpp @@ -33,12 +33,12 @@ void dSalvageMgr_c::init() { } } field_0x2C = 10; - setupDeliverToActorLink(); + setupDeliverToTarget(); } void dSalvageMgr_c::execute() { handlePickupIndex(); - setupDeliverToActorLink(); + setupDeliverToTarget(); } void dSalvageMgr_c::handlePickupIndex() { @@ -65,7 +65,7 @@ void dSalvageMgr_c::handlePickupIndex() { } } -void dSalvageMgr_c::setupDeliverToActorLink() { +void dSalvageMgr_c::setupDeliverToTarget() { if (checkIsOnDeliveryStage2() && field_0x2C > 0) { // TODO wrong registers if (!mDeliverToRef.isLinked() || mDeliverToRef.get()->mProfileName != getDeliverToActorId(mCurrentPickupIdx)) { |