m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits

8 files changed, 38 insertions, 6 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 141ec0296e..b819dd0793 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -162,7 +162,7 @@ struct J3DSys {
     Mtx& getModelDrawMtx(u16 no) { return mModelDrawMtx[no]; }
     J3DShapePacket* getShapePacket() { return mShapePacket; }
 
-    void setViewMtx(Mtx m) { MTXCopy(m, mViewMtx); }
+    void setViewMtx(const Mtx m) { MTXCopy(m, mViewMtx); }
 
     J3DModel* getModel() { return mModel; }
 
diff --git a/include/JSystem/J3DGraphLoader/J3DModelSaver.h b/include/JSystem/J3DGraphLoader/J3DModelSaver.h
new file mode 100644
index 0000000000..239a43fc52
--- /dev/null
+++ b/include/JSystem/J3DGraphLoader/J3DModelSaver.h
@@ -0,0 +1,14 @@
+#ifndef J3DMODELSAVER_H
+#define J3DMODELSAVER_H
+
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
+
+enum J3DBinaryDisplayListSaverFlag {
+    J3DBinaryDisplayListSaverFlag_UNK_1 = 1,
+};
+
+namespace J3DModelSaverDataBase {
+    void* saveBinaryDisplayList(const J3DModel*, J3DBinaryDisplayListSaverFlag, u32);
+};
+
+#endif
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index cb43d8e07e..79a115046c 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -101,6 +101,9 @@ public:
     void resetFader() { setFader(NULL); }
     JUTFader* getFader() const { return mFader; }
     void setClearColor(JUtility::TColor color) { mClearColor = color; }
+    int getEfbWidth() const { return JUTVideo::getManager()->getFbWidth(); }
+    int getEfbHeight() const { return JUTVideo::getManager()->getEfbHeight(); }
+    JUTXfb* getXfbManager() const { return mXfbManager; }
 
     static JFWDisplay* sManager;
 
diff --git a/include/JSystem/JHostIO/JORServer.h b/include/JSystem/JHostIO/JORServer.h
index 99fdf51f9d..acec1227bb 100644
--- a/include/JSystem/JHostIO/JORServer.h
+++ b/include/JSystem/JHostIO/JORServer.h
@@ -7,6 +7,9 @@
 #include "JSystem/JUtility/JUTAssert.h"
 
 void JOR_MESSAGELOOP();
+void JOR_INIT();
+void JOR_SETROOTNODE(const char*, JORReflexible*, u32, u32);
+
 u32 JORMessageBox(const char* message, const char* title, u32 style);
 
 struct JOREventCallbackListNode {
diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h
index ef935112ee..2d992749ce 100644
--- a/include/JSystem/JKernel/JKRAram.h
+++ b/include/JSystem/JKernel/JKRAram.h
@@ -89,6 +89,18 @@ inline JKRAramBlock *JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKR
     return JKRAram::mainRamToAram(buf, bufSize, alignedSize, expandSwitch, fileSize, heap, id, pSize);
 }
 
+inline u32 JKRGetAramTotalFreeSize() {
+    return JKRAram::getAramHeap()->getTotalFreeSize();
+}
+
+inline u32 JKRGetAramFreeSize() {
+    return JKRAram::getAramHeap()->getFreeSize();
+}
+
+inline u32 JKRGetAramUsedSize(u8 param_0) {
+    return JKRAram::getAramHeap()->getUsedSize(param_0);
+}
+
 // void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
 
 #endif /* JKRARAM_H */
diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h
index 2ea5f2863b..131dccbaa8 100644
--- a/include/JSystem/JKernel/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive.h
@@ -27,7 +27,6 @@ public:
     static u32 fetchResource_subroutine(u32, u32, u8*, u32, int);
     static u32 fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**);
 
-private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
     /* 0x64 */ JKRAramBlock* mBlock;
diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h
index 14f786a21f..3dd0bbd741 100644
--- a/include/JSystem/JKernel/JKRAramHeap.h
+++ b/include/JSystem/JKernel/JKRAramHeap.h
@@ -26,10 +26,10 @@ public:
     JKRAramBlock* alloc(u32, EAllocMode);
     JKRAramBlock* allocFromHead(u32);
     JKRAramBlock* allocFromTail(u32);
-    u32 getFreeSize(void);
-    u32 getTotalFreeSize(void);
-    // u32 getUsedSize(void);
-    void dump(void);
+    u32 getFreeSize();
+    u32 getTotalFreeSize();
+    u32 getUsedSize(u8);
+    void dump();
     void free(JKRAramBlock *block) {
         delete block;
     }
diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h
index 42111ee765..f5099956d4 100644
--- a/include/JSystem/JUtility/JUTProcBar.h
+++ b/include/JSystem/JUtility/JUTProcBar.h
@@ -96,6 +96,7 @@ public:
     void setCostFrame(int frame) { mCostFrame = frame; }
     void setVisible(bool visible) { mVisible = visible; }
     void setVisibleHeapBar(bool visible) { mHeapBarVisible = visible; }
+    void setWatchHeap(JKRHeap* pHeap) { mWatchHeap = pHeap; }
 
     static JUTProcBar* getManager() { return sManager; }