Fix a bunch of splits and implement LayoutArc/ObjectArcControl

2 files changed, 27 insertions, 26 deletions

diff --git a/include/toBeSorted/arc_managers/layout_arc_manager.h b/include/toBeSorted/arc_managers/layout_arc_manager.h
index ad43f903..48b38789 100644
--- a/include/toBeSorted/arc_managers/layout_arc_manager.h
+++ b/include/toBeSorted/arc_managers/layout_arc_manager.h
@@ -5,6 +5,20 @@
 #include "d/d_rawarchive.h"
 #include "egg/core/eggHeap.h"
 
+class LayoutArcControl {
+public:
+    LayoutArcControl() : mLayoutArcs(nullptr), mNumArcs(0) {}
+    virtual ~LayoutArcControl();
+    void set(const char *const *layoutArcs, s32 numArcs);
+    bool load(EGG::Heap *heap) const;
+    bool allLoaded() const;
+    bool release();
+
+private:
+    const char *const *mLayoutArcs;
+    s32 mNumArcs;
+};
+
 class LayoutArcManager {
 public:
     LayoutArcManager();
@@ -35,17 +49,4 @@ private:
     dRawArcTable_c mArcTable;
 };
 
-class LayoutArcControl {
-public:
-    LayoutArcControl() : mLayoutArcs(nullptr), mNumArcs(0) {}
-    virtual ~LayoutArcControl();
-    void set(const char *const *layoutArcs, s32 numArcs);
-    void load(EGG::Heap *heap);
-    void release();
-
-private:
-    const char **mLayoutArcs;
-    s32 mNumArcs;
-};
-
 #endif
diff --git a/include/toBeSorted/arc_managers/oarc_manager.h b/include/toBeSorted/arc_managers/oarc_manager.h
index 52f2ab2c..ec127221 100644
--- a/include/toBeSorted/arc_managers/oarc_manager.h
+++ b/include/toBeSorted/arc_managers/oarc_manager.h
@@ -4,6 +4,19 @@
 #include "d/d_rawarchive.h"
 #include "egg/core/eggHeap.h"
 
+class ObjectArcControl {
+public:
+    ObjectArcControl() : mObjectArcs(nullptr), mNumArcs(0) {}
+    virtual ~ObjectArcControl();
+    void set(const char *const *objectArcs, s32 numArcs);
+    bool load(EGG::Heap *heap) const;
+    bool release();
+
+private:
+    const char *const *mObjectArcs;
+    s32 mNumArcs;
+};
+
 class OarcManager {
 public:
     OarcManager();
@@ -41,17 +54,4 @@ private:
     dRawArcTable_c mArcTable;
 };
 
-class ObjectArcControl {
-public:
-    ObjectArcControl() : mObjectArcs(nullptr), mNumArcs(0) {}
-    virtual ~ObjectArcControl();
-    void set(const char *const *objectArcs, s32 numArcs);
-    void load(EGG::Heap *heap);
-    void release();
-
-private:
-    const char **mObjectArcs;
-    s32 mNumArcs;
-};
-
 #endif