mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-29 02:48:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Review

Browse Source
This commit is contained in:
robojumper
2026-09-13 10:28:06 +02:00
parent df9e406095
commit ae87d5a5b1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+1 -1
View File
@@ -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
include/toBeSorted/salvage_mgr.h
+1 -1
View File
@@ -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);
src/toBeSorted/salvage_mgr.cpp
+3 -3
View File
@@ -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)) {