Merge pull request #338 from robojumper/salvage_mgrHEADmain

Salvage mgr 99%

2 files changed, 32 insertions, 25 deletions

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 7d3f498f..eecc4a63 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -478,12 +478,19 @@ toBeSorted/d_event_director.cpp:
 toBeSorted/minigame_mgr.cpp:
 	.text       start:0x800A5060 end:0x800A5608 align:16
 	.ctors      start:0x804DB6C4 end:0x804DB6C8
+	.data       start:0x8050FF00 end:0x8050FF18
+	.sdata      start:0x80572250 end:0x80572260
 	.sbss       start:0x80575390 end:0x805753A0
 
 toBeSorted/salvage_mgr.cpp:
 	.text       start:0x800A5610 end:0x800A668C align:16
 	.ctors      start:0x804DB6C8 end:0x804DB6CC
+	.rodata     start:0x804E3718 end:0x804E3850
+	.data       start:0x8050FF18 end:0x8050FFB8
+	.sdata      start:0x80572260 end:0x80572288
 	.sbss       start:0x805753A0 end:0x805753A8
+	.sdata2     start:0x805796B8 end:0x80579748
+	.bss        start:0x805A60A8 end:0x805A6140
 
 toBeSorted/d_path.cpp:
 	.text       start:0x800A6690 end:0x800A9B00 align:16
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index d616b4be..e6a90828 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -3644,35 +3644,35 @@ fn_800A54E0 = .text:0x800A54E0; // type:function size:0x44
 startSpecialMinigameState = .text:0x800A5530; // type:function size:0x2C
 endSpecialMinigameState2 = .text:0x800A5560; // type:function size:0x54
 fn_800A55C0 = .text:0x800A55C0; // type:function size:0x48
-ScrapperPickupMgr__ctor = .text:0x800A5610; // type:function size:0x70
-ScrapperPickupMgr__dtor = .text:0x800A5680; // type:function size:0x74
-ScrapperPickupMgr__init = .text:0x800A5700; // type:function size:0xB4
-ScrapperPickupMgr__update = .text:0x800A57C0; // type:function size:0x34
-ScrapperPickupMgr__handlePickupIndex = .text:0x800A5800; // type:function size:0x11C
-ScrapperPickupMgr__setupDeliverToActorLink = .text:0x800A5920; // type:function size:0xC0
-fn_800A59E0 = .text:0x800A59E0; // type:function size:0x40
+create__13dSalvageMgr_cFv = .text:0x800A5610; // type:function size:0x70
+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
+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
-ScrapperPickupMgr__setPickupIndex = .text:0x800A5AB0; // type:function size:0x84
+setPickupIndex__13dSalvageMgr_cFRCl = .text:0x800A5AB0; // type:function size:0x84
 deleteObjAndSlb__13dSalvageMgr_cFv = .text:0x800A5B40; // type:function size:0x4C
-ScrapperPickupMgr__checkIsOnDeliveryStage2 = .text:0x800A5B90; // type:function size:0x1C
-startedQuestForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5BB0; // type:function size:0x5C
-ScrapperPickupMgr__checkQuestStartedStoryflag = .text:0x800A5C10; // type:function size:0x7C
+checkIsOnDeliveryStage2__13dSalvageMgr_cCFv = .text:0x800A5B90; // type:function size:0x1C
+hasStartedQuestForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5BB0; // type:function size:0x5C
+hasStartedQuestForId__13dSalvageMgr_cCFRCl = .text:0x800A5C10; // type:function size:0x7C
 hasDowsingForSalvageObj__13dSalvageMgr_cCFPC15dAcSalbageObj_c = .text:0x800A5C90; // type:function size:0x5C
-ScrapperPickupMgr__checkHasDowsing = .text:0x800A5CF0; // type:function size:0xB8
-ScrapperPickupMgr__getActorId = .text:0x800A5DB0; // type:function size:0x18
-fn_800A5DD0 = .text:0x800A5DD0; // type:function size:0x4
+hasDowsingForId__13dSalvageMgr_cCFRCl = .text:0x800A5CF0; // type:function size:0xB8
+getDeliverToActorId__13dSalvageMgr_cFl = .text:0x800A5DB0; // type:function size:0x18
+noop__13dSalvageMgr_cFv = .text:0x800A5DD0; // type:function size:0x4
 getCurrentSalvageObjId__13dSalvageMgr_cCFv = .text:0x800A5DE0; // type:function size:0x8
 checkDeliveredStoryflag__13dSalvageMgr_cCFRCl = .text:0x800A5DF0; // type:function size:0x7C
-ScrapperPickupMgr__unsetPickupStoryflag = .text:0x800A5E70; // type:function size:0xBC
-ScrapperPickupMgr__checkPickupStoryflag = .text:0x800A5F30; // type:function size:0x7C
-ScrapperPickupMgr__checkIsOnDeliveryStage = .text:0x800A5FB0; // type:function size:0x5C
-ScrapperPickupMgr__findDeliverToActor = .text:0x800A6010; // type:function size:0x48
-fn_800A6060 = .text:0x800A6060; // type:function size:0xBC
-fn_800A6120 = .text:0x800A6120; // type:function size:0x98
-fn_800A61C0 = .text:0x800A61C0; // type:function size:0x9C
-fn_800A6260 = .text:0x800A6260; // type:function size:0x9C
-fn_800A6300 = .text:0x800A6300; // type:function size:0x368
-fn_800A6670 = .text:0x800A6670; // type:function size:0x1C
+unsetPickupStoryflag__13dSalvageMgr_cFRCl = .text:0x800A5E70; // type:function size:0xBC
+checkPickupStoryflag__13dSalvageMgr_cCFRCl = .text:0x800A5F30; // type:function size:0x7C
+checkIsOnDeliveryStage__13dSalvageMgr_cCFv = .text:0x800A5FB0; // type:function size:0x5C
+findDeliveryTarget__13dSalvageMgr_cFv = .text:0x800A6010; // type:function size:0x48
+triggerDeliveryEvent__13dSalvageMgr_cFv = .text:0x800A6060; // type:function size:0xBC
+getTalkEntryPoint1ForPickup__13dSalvageMgr_cFP12dAcObjBase_c = .text:0x800A6120; // type:function size:0x98
+getTalkEntryPoint2ForPickup__13dSalvageMgr_cFP12dAcObjBase_c = .text:0x800A61C0; // type:function size:0x9C
+getTalkEntryPoint3ForPickup__13dSalvageMgr_cFP12dAcObjBase_c = .text:0x800A6260; // type:function size:0x9C
+__sinit_\salvage_mgr_cpp = .text:0x800A6300; // type:function size:0x368
+__arraydtor$21000 = .text:0x800A6670; // type:function size:0x1C
 __ct__7dPath_cFv = .text:0x800A6690; // type:function size:0x3C
 __dt__7dPath_cFv = .text:0x800A66D0; // type:function size:0x40
 clear__7dPath_cFv = .text:0x800A6710; // type:function size:0x18
@@ -28213,7 +28213,7 @@ lbl_804E36B8 = .rodata:0x804E36B8; // type:object size:0x10 data:4byte
 lbl_804E36C8 = .rodata:0x804E36C8; // type:object size:0x24 data:4byte
 lbl_804E36EC = .rodata:0x804E36EC; // type:object size:0xC data:4byte
 lbl_804E36F8 = .rodata:0x804E36F8; // type:object size:0x20 data:4byte
-AcSalbageObj__DEFINITIONS = .rodata:0x804E3718; // type:object size:0x100
+sDefs = .rodata:0x804E3718; // type:object size:0x100
 lbl_804E3818 = .rodata:0x804E3818; // type:object size:0x38
 @LOCAL@initializeState_Complete__14dLytDrawMark_cFv@sFlags = .rodata:0x804E3850; // type:object size:0xC scope:local
 brlanMapVariant01 = .rodata:0x804E3860; // type:object size:0x80 scope:local data:4byte