Porting over from previous repo

config/SOUE01/splits.txt

@@ -1,3 +1,19 @@
+toBeSorted/save_file.cpp:
+	.text       start:0x800099B0 end:0x80009D30
+
+toBeSorted/file_manager.cpp:
+	.text       start:0x80009D30 end:0x80011730
+	.ctors      start:0x804DB648 end:0x804DB64C
+
+toBeSorted/save_manager.cpp:
+	.text       start:0x80011730 end:0x80015310
+
+d/a/d_a_base.cpp:
+	.text       start:0x8002C3A0 end:0x8002DE40
+	.data       start:0x80501544 end:0x805015B8
+	.sdata      start:0x80571920 end:0x80571930
+	.sbss       start:0x80575080 end:0x80575098
+
 d/d_base.cpp:
 	.text       start:0x80050800 end:0x80050A14
 	.data       start:0x80503380 end:0x805033CC

configure.py

@@ -8,7 +8,11 @@ LIBS = [
         "objects": [
             ["Runtime/__init_cpp_exceptions.cpp", False],
             ["unk_flag_stuff.cpp", True],
-            ["d/d_base.cpp", False]
+            ["d/d_base.cpp", True],
+            ["d/a/d_a_base.cpp", True],
+            ["toBeSorted/save_file.cpp", True],
+            ["toBeSorted/file_manager.cpp", False],
+            ["toBeSorted/save_manager.cpp", False],
         ],
     },
 ]

include/d/a/d_a_base.h

@@ -18,23 +18,13 @@ public:
 protected:
     /* 80501544 */ // vtable
     /* 0x08 */ virtual int create();
-    /* 0x0C */ // virtual int preCreate(); // uses fBase_c::preCreate()
     /* 0x10 */ virtual void postCreate(MAIN_STATE_e state);
-    /* 0x14 */ // virtual int doDelete(); / uses fBase_c::doDelete
     /* 0x18 */ virtual int preDelete();
-    /* 0x1C */ // virtual void postDelete(MAIN_STATE_e state); // uses fBase_c::postDelete
     /* 0x20 */ virtual int execute(); // calls either actorExecute/executeInEvent
     /* 0x24 */ virtual int preExecute(); // looks at some actor properties
     /* 0x28 */ virtual void postExecute(MAIN_STATE_e state); // not fully understood
-    /* 0x2C */ // virtual int draw(); // uses fBase_c::draw
-    /* 0x30 */ // virtual int preDraw(); // uses dBase_c::preDraw
-    /* 0x34 */ // virtual void postDraw(MAIN_STATE_e state); // uses dBase_c::postDraw
-    /* 0x38 */ // virtual void deleteReady(); // uses fBase_c::deleteReady
-    /* 0x3C */ // virtual bool entryFrmHeap(unsigned long size, EGG::Heap *parentHeap); // uses fBase_c::entryFrmHeap
-    /* 0x40 */ // virtual bool entryFrmHeapNonAdjust(unsigned long size, EGG::Heap *parentHeap); // uses fBase_c::entryFrmHeapNonAdjust
     /* 0x44 */ virtual bool createHeap(); 
-    /* 0x48 */ virtual ~dAcBase_c(); 
-    // Start of dAcBase_c vtable additions (after dBase_c)
+    /* 0x48 */ virtual ~dAcBase_c();
     /* 0x4C */ virtual int actorCreate(); // name is assumed
     /* 0x50 */ virtual int actorReCreate(); // name is assumed
     /* 0x54 */ virtual int actorExecute(); // name is assumed
@@ -58,8 +48,8 @@ public:
         ObjInfoPtr* objInfo );
     
     void* FUN_8002c690();
-    int initAllocatorWork1Heap(int size, char* name);
-    int initAllocator(int size, char* name, EGG::Heap* heap);
+    int initAllocatorWork1Heap(int size, char* name, int align);
+    int initAllocator(int size, char* name, EGG::Heap* heap, int align);
     bool addActorToRoom(s32 roomId);
     void setBit_field_0xE8(s32);
     u32 itemDroppingAndGivingRelated(Vec3f* spawnPos, int subtype);

include/toBeSorted/save_file.h

@@ -120,11 +120,11 @@ public:
     // 0x80009AB0
     s16* getPlayerName(); // using Shift JIS i assume
     // 0x80009AC0
-    void setAreaT1();
+    void setAreaT1(char* name);
     // 0x80009BE0
     s8* getAreaT1();
     // 0x80009BF0
-    void setAreaT2();
+    void setAreaT2(char* name);
     // lbl_80009D10
     s8* getAreaT2();
     // lbl_80009D20

src/d/a/d_a_base.cpp

@@ -52,15 +52,15 @@ void dAcBase_c::setTempCreateParams( \
 void* dAcBase_c::FUN_8002c690() {}
 
 /* 8002c710 */
-int dAcBase_c::initAllocatorWork1Heap(int size, char* name) {
-    initAllocator(size, name, dHeap::work1Heap);
+int dAcBase_c::initAllocatorWork1Heap(int size, char* name, int align) {
+    initAllocator(size, name, dHeap::work1Heap, align);
 }
 
-extern "C" int FUN_802ee510(mAllocator*, int size, EGG::Heap* heap, char* name, int align, int unk);
+extern "C" int fn_802EE510(mAllocator*, int size, EGG::Heap* heap, char* name, int align, int unk);
 
 /* 8002c720 */
-int dAcBase_c::initAllocator(int size, char* name, EGG::Heap* heap) {
-    if (FUN_802ee510(&mHeapAllocator, size, heap, name, 0x20, 0) == 0){
+int dAcBase_c::initAllocator(int size, char* name, EGG::Heap* heap, int align) {
+    if (fn_802EE510(&mHeapAllocator, size, heap, name, 0x20, 0) == 0){
         return 0;
     }
     soundRelated = FUN_8002c690();

src/toBeSorted/save_file.cpp

@@ -67,15 +67,17 @@ u16* SaveFile::getUnkFlags1() {
 // 0x80009AB0   getPlayerName__8SaveFileFv
 s16* SaveFile::getPlayerName() {
     return player_name;
-} // using Shift JIS i assume
-// 0x80009AC0   setAreaT1__8SaveFileFv
-void SaveFile::setAreaT1() {}
+}
+// 0x80009AC0   setAreaT1__8SaveFileFPc
+void SaveFile::setAreaT1(char* name) {
+
+}
 // 0x80009BE0   getAreaT1__8SaveFileFv
 s8* SaveFile::getAreaT1() {
     return area_t1;
 }
-// 0x80009BF0   setAreaT2__8SaveFileFv
-void SaveFile::setAreaT2() {
+// 0x80009BF0   setAreaT2__8SaveFileFPc
+void SaveFile::setAreaT2(char* name) {
     
 }
 // 0x80009D10   getAreaT2__8SaveFileFv