Merge remote-tracking branch 'upstream/main'

18 files changed, 303 insertions, 268 deletions

diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h
index 4c638dbd..5f8d2841 100644
--- a/include/JSystem/JKernel/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive.h
@@ -27,8 +27,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ JKRAramBlock* mBlock;
     /* 0x68 */ JKRDvdFile* mDvdFile;
 };  // Size = 0x6C
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index 4211d3ed..8ef03c41 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -5,6 +5,7 @@
 #include "JSystem/JKernel/JKRFileLoader.h"
 #include "global.h"
 
+class JKRArcFinder;
 class JKRHeap;
 
 struct SArcHeader {
@@ -129,7 +130,8 @@ public:
     void* getResource(u16);
     u32 readIdxResource(void*, u32, u32);
     u32 readResource(void*, u32, u16);
-    u32 countResource(void) const;
+    u32 countResource(u32) const;
+    JKRArcFinder* getFirstResource(u32) const;
     u32 getFileAttribute(u32) const;
 
     SDIFileEntry* findNameResource(const char*) const;
@@ -182,13 +184,16 @@ public:
 
 protected:
     /* 0x58 */ u32 field_0x58;
+    /* 0x5C */ JKRCompression mCompression;
+    /* 0x60 */ EMountDirection mMountDirection;
 
 public:
-    static JKRArchive* check_mount_already(s32, JKRHeap*);
+    static JKRArchive* check_mount_already(s32);
     static JKRArchive* mount(const char*, EMountMode, JKRHeap*, EMountDirection);
     static JKRArchive* mount(void*, JKRHeap*, EMountDirection);
     static JKRArchive* mount(s32, EMountMode, JKRHeap*, EMountDirection);
     static void* getGlbResource(u32, const char*, JKRArchive*);
+    static void readTypeResource(void*, u32, u32, const char*, JKRArchive*);
 
     static JKRCompression convertAttrToCompressionType(u32 attr) {
 #define JKRARCHIVE_ATTR_COMPRESSION 0x04
diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h
index 98da6327..338332fb 100644
--- a/include/JSystem/JKernel/JKRCompArchive.h
+++ b/include/JSystem/JKernel/JKRCompArchive.h
@@ -24,8 +24,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ int mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ int field_0x64;
     /* 0x68 */ JKRAramBlock* mAramPart;
     /* 0x6C */ int field_0x6c;
diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive.h
index e2e6b408..fe72cd8f 100644
--- a/include/JSystem/JKernel/JKRDvdArchive.h
+++ b/include/JSystem/JKernel/JKRDvdArchive.h
@@ -23,8 +23,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ s32 field_0x64;
     /* 0x68 */ JKRDvdFile* mDvdFile;
 };
diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h
index 3d566c03..6a89271e 100644
--- a/include/JSystem/JKernel/JKRExpHeap.h
+++ b/include/JSystem/JKernel/JKRExpHeap.h
@@ -56,11 +56,12 @@ protected:
     void removeUsedBlock(CMemBlock* block);
     void recycleFreeBlock(CMemBlock* block);
     void joinTwoBlocks(CMemBlock* block);
+    bool dump_sort_by_address();
 
 public:
     s32 getUsedSize(u8 groupId) const;
     s32 getTotalUsedSize(void) const;
-    
+
     CMemBlock* getHeadUsedList() const { return mHeadUsedList; }
     void setAllocationMode(EAllocMode mode) {
         mAllocMode = mode;
@@ -76,7 +77,7 @@ public:
     /* vt[10] */ virtual void do_free(void* ptr);                               /* override */
     /* vt[11] */ virtual void do_freeAll();                                     /* override */
     /* vt[12] */ virtual void do_freeTail();                                    /* override */
-    /* vt[13] */ virtual void do_fillFreeArea();                                /* override */
+    /* vt[13] */ virtual void do_freeFill();                                    /* override */
     /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size);                    /* override */
     /* vt[15] */ virtual s32 do_getSize(void* ptr);                             /* override */
     /* vt[16] */ virtual s32 do_getFreeSize();                                  /* override */
@@ -84,7 +85,7 @@ public:
     /* vt[18] */ virtual s32 do_getTotalFreeSize();                             /* override */
     /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID);                   /* override */
     /* vt[20] */ virtual u8 do_getCurrentGroupId();                             /* override */
-    /* vt[21] */ virtual u32 state_register(JKRHeap::TState* p, u32 id) const; /* override */
+    /* vt[21] */ virtual void state_register(JKRHeap::TState* p, u32 id) const; /* override */
     /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1,
                                             JKRHeap::TState const& r2) const; /* override */
 
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index f8703af8..be6ea956 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -67,7 +67,7 @@ public:
     /* vt[10] */ virtual void do_free(void* ptr) = 0;
     /* vt[11] */ virtual void do_freeAll() = 0;
     /* vt[12] */ virtual void do_freeTail() = 0;
-    /* vt[13] */ virtual void do_fillFreeArea() = 0;
+    /* vt[13] */ virtual void do_freeFill() = 0;
     /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size) = 0;
     /* vt[15] */ virtual s32 do_getSize(void* ptr) = 0;
     /* vt[16] */ virtual s32 do_getFreeSize() = 0;
diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive.h
index ba76ab1e..eb09c0b2 100644
--- a/include/JSystem/JKernel/JKRMemArchive.h
+++ b/include/JSystem/JKernel/JKRMemArchive.h
@@ -31,8 +31,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ SArcHeader* mArcHeader;
     /* 0x68 */ u8* mArchiveData;
     /* 0x6C */ bool mIsOpen;
diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h
index 069b87ea..83a6e918 100644
--- a/include/JSystem/JKernel/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap.h
@@ -32,7 +32,7 @@ public:
     /* vt[10] */ virtual void do_free(void*);            /* override */
     /* vt[11] */ virtual void do_freeAll(void);          /* override */
     /* vt[12] */ virtual void do_freeTail(void);         /* override */
-    /* vt[13] */ virtual void do_fillFreeArea(void);     /* override */
+    /* vt[13] */ virtual void do_freeFill(void);     /* override */
     /* vt[14] */ virtual s32 do_resize(void*, u32);      /* override */
     /* vt[15] */ virtual s32 do_getSize(void*);          /* override */
     /* vt[16] */ virtual s32 do_getFreeSize(void);       /* override */
diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h
index f56a9231..ca4e8567 100644
--- a/include/JSystem/JKernel/JKRThread.h
+++ b/include/JSystem/JKernel/JKRThread.h
@@ -14,53 +14,11 @@ struct JKRThreadName_ {
 class JUTConsole;
 class JKRThread : JKRDisposer {
 public:
-    class TLoad {
-    public:
-        TLoad() {
-            clear();
-            mValid = false;
-            mThreadId = 0;
-        }
-
-        bool isValid() const { return mValid; }
-        u32 getCost() const { return mCost; }
-        u32 getCount() const { return mSwitchCount; }
-        s32 getId() const { return mThreadId; }
-
-        void setValid(bool valid) { mValid = valid; }
-        void setId(s32 id) { mThreadId = id; }
-        void setCurrentTime() { mLastTick = OSGetTick(); }
-
-        void resetCost() { mCost = 0; }
-        void resetCount() { mSwitchCount = 0; }
-
-        void incCount() { mSwitchCount++; }
-        void addCurrentCost() { mCost = mCost + (OSGetTick() - mLastTick); }
-
-        void clear() {
-            resetCount();
-            resetCost();
-            mLastTick = 0;
-        }
-
-    private:
-        /* 0x00 */ bool mValid;
-        /* 0x01 */ u8 padding_0x61[3];
-        /* 0x04 */ u32 mCost;
-        /* 0x08 */ u32 mSwitchCount;
-        /* 0x0C */ OSTick mLastTick;
-        /* 0x10 */ s32 mThreadId;
-    };
-
     JKRThread(u32 stack_size, int message_count, int param_3);
-    JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4);
     JKRThread(OSThread* thread, int message_count);
     virtual ~JKRThread();
 
-    /* vt[03] */ virtual void* run();
-
-    void setCommon_mesgQueue(JKRHeap* heap, int message_count);
-    void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3);
+    /* vt[03] */ virtual void* run() { return NULL; }
 
     OSThread* getThreadRecord() const { return mThreadRecord; }
     void* getStack() const { return mStackMemory; }
@@ -122,9 +80,6 @@ typedef void (*JKRThreadSwitch_PostCallback)(OSThread* current, OSThread* next);
 class JKRThreadSwitch {
 public:
     JKRThreadSwitch(JKRHeap*);
-    virtual void draw(JKRThreadName_* param_1, JUTConsole* param_2);
-    virtual void draw(JKRThreadName_* param_1);
-    virtual ~JKRThreadSwitch();
 
     static JKRThreadSwitch* createManager(JKRHeap* heap);
 
@@ -145,13 +100,9 @@ private:
     /* 0x00 */  // vtable
     /* 0x04 */ JKRHeap* mHeap;
     /* 0x08 */ bool mSetNextHeap;
-    /* 0x09 */ u8 field_0x9[3];
-    /* 0x0C */ u32 field_0xC;
-    /* 0x10 */ u32 field_0x10;
-    /* 0x14 */ u8 field_0x14[4];
-    /* 0x18 */ s64 field_0x18;
-    /* 0x20 */ u32 field_0x20;
-    /* 0x24 */ u32 field_0x24;
+
+public:
+    virtual ~JKRThreadSwitch() {}
 };
 
 struct JKRTask {
diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h
new file mode 100644
index 00000000..623d62e9
--- /dev/null
+++ b/include/d/actor/d_a_mgameboard.h
@@ -0,0 +1,69 @@
+#ifndef D_A_MGAMEBOARD_H
+#define D_A_MGAMEBOARD_H
+
+#include "f_op/f_op_actor_mng.h"
+#include "d/d_seafightgame.h"
+#include "d/d_lib.h"
+
+class dDlst_2DNumber_c;
+class dDlst_2DMinigame_c;
+class dDlst_2DObject_c;
+
+class daMgBoard_c : public fopAc_ac_c {
+public:
+    void checkClearGame();
+    void getScore();
+    void reqStartGame();
+    void checkEndGame();
+    void setGInfoDraw();
+    void clrGInfoDraw();
+    void CreateHeap();
+    void set_2dposition();
+    void CreateInit();
+    void MiniGameInit();
+    void set_mtx();
+    void _execute();
+    void execGameMain();
+    void execEndGame();
+    void MinigameMain();
+    void CursorMove();
+    void _draw();
+
+    /* 0x290 */ request_of_phase_process_class mPhase;
+    /* 0x298 */ J3DModel* mpBoardModel;
+    /* 0x29C */ J3DModel* mpCursorModel;
+    /* 0x2A0 */ J3DModel* mpHitModel[20];
+    /* 0x2F0 */ J3DModel* mpMissModel[32];
+    /* 0x370 */ J3DModel* mpShip2Model[2];
+    /* 0x378 */ J3DModel* mpShip3Model[2];
+    /* 0x380 */ J3DModel* mpShip4Model;
+    /* 0x384 */ u8 field_0x384[0x468 - 0x384];
+    /* 0x468 */ u8 mBoardPosX;
+    /* 0x469 */ u8 mBoardPosY;
+    /* 0x46A */ u8 field_0x46A[0x46C - 0x46A];
+    /* 0x46C */ int mLastFirePosX;
+    /* 0x470 */ int mLastFirePosY;
+    /* 0x474 */ u8 field_0x474[0x47C - 0x474];
+    /* 0x47C */ dSeaFightGame_info_c mSeaFightGame;
+    /* 0x57C */ u8 field_0x57C[0x580 - 0x57C];
+    /* 0x580 */ int mMissModelCount;
+    /* 0x584 */ int mHitModelCount;
+    /* 0x588 */ s16 mMinigameStartIdx;
+    /* 0x58A */ s16 mMinigameEndIdx;
+    /* 0x58C */ STControl mStickControl;
+    /* 0x5B4 */ cXyz mNPCPos;
+    /* 0x5C0 */ dDlst_2DNumber_c* mpNumber0;
+    /* 0x5C4 */ dDlst_2DNumber_c* mpNumber1;
+    /* 0x5C8 */ dDlst_2DMinigame_c* mpMinigameDList;
+    /* 0x5CC */ dDlst_2DObject_c* mpSquidIcon[3];
+    /* 0x5D8 */ u8 mpBombIcons;
+    /* 0x5D9 */ u8 field_0x5D9[0x638 - 0x5D9];
+    /* 0x638 */ int mState;
+    /* 0x63C */ u8 mbDraw;
+    /* 0x63D */ u8 mbStartGame;
+    /* 0x63E */ u8 mbEndGame;
+    /* 0x63F */ u8 mbForceEnd;
+    /* 0x640 */ u8 mTimer;
+};
+
+#endif /* D_A_MGAMEBOARD_H */
\ No newline at end of file
diff --git a/include/d/d_a_obj.h b/include/d/d_a_obj.h
index de62a190..468079e4 100644
--- a/include/d/d_a_obj.h
+++ b/include/d/d_a_obj.h
@@ -4,10 +4,13 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_cc_d.h"
 
+class dBgS_GndChk;
+class cBgS_PolyInfo;
+
 namespace daObj {
     template <typename T>
     int PrmAbstract(const fopAc_ac_c* actor, T width, T shift) {
-        u32 param = fopAcM_GetParam(actor);
+        u32 param = fopAcM_GetParam((fopAc_ac_c*)actor);
         return ((1 << width) - 1) & (param >> shift);
     }
     
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
new file mode 100644
index 00000000..99494710
--- /dev/null
+++ b/include/d/d_lib.h
@@ -0,0 +1,41 @@
+#ifndef D_LIB_H
+#define D_LIB_H
+
+#include "dolphin/types.h"
+
+class STControl {
+public:
+    void STControl(s16, s16, s16, s16, f32, f32, s16, s16);
+    void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
+    void init();
+    void Xinit();
+    void Yinit();
+    void getValueStick();
+    void getAngleStick();
+    void checkTrigger();
+    void checkLeftTrigger();
+    void checkRightTrigger();
+    void checkUpTrigger();
+    void checkDownTrigger();
+
+    /* 0x00 */ void* vtbl;
+    /* 0x04 */ f32 field_0x04;
+    /* 0x08 */ f32 field_0x08;
+    /* 0x0C */ u8 field_0x0c;
+    /* 0x0D */ u8 field_0x0d;
+    /* 0x0E */ u16 field_0x0e;
+    /* 0x10 */ u16 field_0x10;
+    /* 0x12 */ u16 field_0x12;
+    /* 0x14 */ s16 field_0x14;
+    /* 0x16 */ s16 field_0x16;
+    /* 0x18 */ u16 field_0x18;
+    /* 0x1A */ u16 field_0x1a;
+    /* 0x1C */ u16 field_0x1c;
+    /* 0x1E */ u16 field_0x1e;
+    /* 0x20 */ u16 field_0x20;
+    /* 0x22 */ u16 field_0x22;
+    /* 0x24 */ s16 field_0x24;
+    /* 0x26 */ s16 field_0x26;
+};
+
+#endif /* D_LIB_H */
\ No newline at end of file
diff --git a/include/d/d_seafightgame.h b/include/d/d_seafightgame.h
new file mode 100644
index 00000000..f141cb48
--- /dev/null
+++ b/include/d/d_seafightgame.h
@@ -0,0 +1,32 @@
+#ifndef D_SEAFIGHTGAME_H
+#define D_SEAFIGHTGAME_H
+
+#include "dolphin/types.h"
+
+struct dSeaFightGame_ship_data {
+    /* 0x0 */ u8 m_pos[4][2];
+    /* 0x8 */ u8 field_0x8;
+    /* 0x9 */ u8 field_0x9;
+    /* 0xA */ u8 field_0xa;
+    /* 0xB */ u8 field_0xb;
+    /* 0xC */ u8 field_0xc;
+    /* 0xD */ u8 field_0xd;
+    /* 0xE */ u8 field_0xe;
+};
+
+class dSeaFightGame_info_c {
+public:
+    int init(int, int);
+    int put_ship(u8, u8);
+    bool checkPutShip(int, int, int, int);
+    int attack(u8, u8);
+
+    /* 0x00 */ u8 mGrid[8][8];
+    /* 0x40 */ dSeaFightGame_ship_data mShips[4];
+    /* 0x7C */ u8 mAliveShipNum;
+    /* 0x7D */ u8 mBulletNum;
+    /* 0x7E */ u8 mScore;
+    /* 0x80 */ int mDeadShipNum;
+};
+
+#endif /* D_SEAFIGHTGAME_H */
\ No newline at end of file
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index ab264fba..4e6e7054 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -58,52 +58,7 @@ struct fopAcM_search_prm {
     /* 0x0A */ s8 mSubType;
 };
 
-class dBgS_LinChk;
-class fopAcM_lc_c {
-public:
-    static dBgS_LinChk* getLineCheck() { return (dBgS_LinChk*)&mLineCheck; }
-    static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*);
-    static u8 mLineCheck[112];
-};
-
-class dBgS_RoofChk;
-class fopAcM_rc_c {
-public:
-    static dBgS_RoofChk* getRoofCheck() { return (dBgS_RoofChk*)&mRoofCheck; }
-    static bool roofCheck(const cXyz*);
-    static u8 mRoofCheck[80];
-    static f32 mRoofY;
-};
-
-class dBgS_GndChk;
-class fopAcM_gc_c {
-public:
-    static dBgS_GndChk* getGroundCheck() { return (dBgS_GndChk*)&mGndCheck; }
-    static bool gndCheck(const cXyz*);
-    static u8 mGndCheck[84]; // this is dBgS_GndChk but all static data in the TU probably needs to be setup first (otherwise causes a reordering problem with the __sinit function)
-    static f32 mGroundY;
-
-    // strange issue where f_op_actor_mng.h can't find the dComIfG_Bgsp() inline even when you include the header
-    // static bool getTriPla(cM3dGPla* pPlane) {
-    //     return dComIfG_Bgsp().GetTriPla(mGndCheck,pPlane);
-    // }
-
-    static f32 getGroundY() { return mGroundY; }
-};
-
-class dBgS_WtrChk;
-class fopAcM_wt_c {
-public:
-    static dBgS_WtrChk* getWaterCheck() { return (dBgS_WtrChk*)&mWaterCheck; }
-    static f32 getWaterY() { return mWaterY[0]; }
-
-    static bool waterCheck(const cXyz*);
-    static u8 mWaterCheck[84 + 4 /* padding */];
-    static f32 mWaterY[1 + 1 /* padding */];
-};
-
 class dKy_tevstr_c;
-class cBgS_PolyInfo;
 typedef int (*heapCallbackFunc)(fopAc_ac_c*);
 typedef int (*createFunc)(void*);
 
@@ -111,11 +66,11 @@ struct DOUBLE_POS {
     double x, y, z;
 };
 
-inline const s8 fopAcM_GetRoomNo(const fopAc_ac_c* pActor) {
+inline s8 fopAcM_GetRoomNo(fopAc_ac_c* pActor) {
     return pActor->current.roomNo;
 }
 
-inline u32 fopAcM_GetID(const void* pActor) {
+inline u32 fopAcM_GetID(void* pActor) {
     return fpcM_GetID(pActor);
 }
 
@@ -123,7 +78,7 @@ inline s16 fopAcM_GetName(void* pActor) {
     return fpcM_GetName(pActor);
 }
 
-inline MtxP fopAcM_GetMtx(const fopAc_ac_c* pActor) {
+inline MtxP fopAcM_GetMtx(fopAc_ac_c* pActor) {
     return pActor->mCullMtx;
 }
 
@@ -152,7 +107,7 @@ inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
     return fopAcM_checkStatus(pActor, 0x100000);
 }
 
-inline u32 fopAcM_GetParam(const void* pActor) {
+inline u32 fopAcM_GetParam(void* pActor) {
     return fpcM_GetParam(pActor);
 }
 
@@ -168,11 +123,11 @@ inline void fopAcM_SetJntCol(fopAc_ac_c* i_actorP, dJntCol_c* i_jntColP) {
     i_actorP->mJntCol = i_jntColP;
 }
 
-inline s16 fopAcM_GetProfName(const void* pActor) {
+inline s16 fopAcM_GetProfName(void* pActor) {
     return fpcM_GetProfName(pActor);
 }
 
-inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
+inline u8 fopAcM_GetGroup(fopAc_ac_c* p_actor) {
     return p_actor->mGroup;
 }
 
@@ -244,7 +199,7 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
     fopAcM_OffStatus(actor, 0x100000);
 }
 
-inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) {
+inline s8 fopAcM_GetHomeRoomNo(fopAc_ac_c* pActor) {
     return pActor->orig.roomNo;
 }
 
@@ -284,26 +239,18 @@ inline BOOL fopAcM_IsExecuting(unsigned int id) {
     return fpcM_IsExecuting(id);
 }
 
-inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) {
+inline f32 fopAcM_GetSpeedF(fopAc_ac_c* p_actor) {
     return p_actor->speedF;
 }
 
-inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) {
+inline f32 fopAcM_GetGravity(fopAc_ac_c* p_actor) {
     return p_actor->mGravity;
 }
 
-inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) {
+inline f32 fopAcM_GetMaxFallSpeed(fopAc_ac_c* p_actor) {
     return p_actor->mMaxFallSpeed;
 }
 
-inline const cXyz& fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
-    return p_actor->speed;
-}
-
-inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {
-    return p_actor->current.pos;
-}
-
 inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) {
     return i_actor->mJntCol;
 }
@@ -312,11 +259,11 @@ inline void fopAcM_setCullSizeFar(fopAc_ac_c* i_actor, f32 i_far) {
     i_actor->mCullSizeFar = i_far;
 }
 
-inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) {
+inline f32 fopAcM_getCullSizeFar(fopAc_ac_c* i_actor) {
     return i_actor->mCullSizeFar;
 }
 
-inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
+inline int fopAcM_GetCullSize(fopAc_ac_c* i_actor) {
     return i_actor->mCullType;
 }
 
@@ -324,11 +271,11 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
     return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14;
 }
 
-inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
+inline Vec fopAcM_getCullSizeSphereCenter(fopAc_ac_c* i_actor) {
     return i_actor->mCull.mSphere.mCenter;
 }
 
-inline f32 fopAcM_getCullSizeSphereR(const fopAc_ac_c* i_actor) {
+inline f32 fopAcM_getCullSizeSphereR(fopAc_ac_c* i_actor) {
     return i_actor->mCull.mSphere.mRadius;
 }
 
@@ -337,43 +284,43 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
 inline BOOL dComIfGs_isSwitch(s32 i_no, s32 i_roomNo);
 inline void dComIfGs_offActor(int i_no, int i_roomNo);
 
-inline void fopAcM_onSwitch(const fopAc_ac_c* pActor, int sw) {
-    return dComIfGs_onSwitch(sw, pActor->orig.roomNo); // Should use fopAcM_GetHomeRoomNo, but that breaks regalloc?
+inline void fopAcM_onSwitch(fopAc_ac_c* pActor, int sw) {
+    return dComIfGs_onSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
 }
 
-inline void fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) {
-    return dComIfGs_offSwitch(sw, pActor->orig.roomNo); // Should use fopAcM_GetHomeRoomNo, but that breaks regalloc?
+inline void fopAcM_offSwitch(fopAc_ac_c* pActor, int sw) {
+    return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
 }
 
-inline BOOL fopAcM_isSwitch(const fopAc_ac_c* pActor, int sw) {
-    return dComIfGs_isSwitch(sw, pActor->orig.roomNo); // Should use fopAcM_GetHomeRoomNo, but that breaks regalloc?
+inline BOOL fopAcM_isSwitch(fopAc_ac_c* pActor, int sw) {
+    return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
 }
 
-inline fopAc_ac_c* i_fopAcM_SearchByName(s16 proc_id) {
+inline fopAc_ac_c* fopAcM_SearchByName(s16 proc_id) {
     return (fopAc_ac_c*)fopAcIt_Judge(fpcSch_JudgeForPName, &proc_id);
 }
 
 inline void dComIfGs_onItem(int bitNo, int roomNo);
-inline void fopAcM_onItem(const fopAc_ac_c* item, int bitNo) {
+inline void fopAcM_onItem(fopAc_ac_c* item, int bitNo) {
     dComIfGs_onItem(bitNo, fopAcM_GetHomeRoomNo(item));
 }
 
 inline bool dComIfGs_isItem(int bitNo, int roomNo);
-inline bool fopAcM_isItem(const fopAc_ac_c* item, int bitNo) {
+inline bool fopAcM_isItem(fopAc_ac_c* item, int bitNo) {
     return dComIfGs_isItem(bitNo, fopAcM_GetHomeRoomNo(item));
 }
 
-inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_c* actorB) {
+inline f32 fopAcM_searchActorDistanceY(fopAc_ac_c* actorA, fopAc_ac_c* actorB) {
     return actorB->current.pos.y - actorA->current.pos.y;
 }
 
-inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) {
+inline u16 fopAcM_GetSetId(fopAc_ac_c* p_actor) {
     return p_actor->mSetID;
 }
 
 inline void dComIfGs_onActor(int bitNo, int roomNo);
 
-inline void fopAcM_onActor(const fopAc_ac_c* p_actor) {
+inline void fopAcM_onActor(fopAc_ac_c* p_actor) {
     int setId = fopAcM_GetSetId(p_actor);
     dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(p_actor));
 }
@@ -392,37 +339,37 @@ s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor);
 
 fopAcM_prm_class* fopAcM_CreateAppend();
 
-fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, const cXyz* p_pos, int roomNo,
-                               const csXyz* p_angle, const cXyz* p_scale, s8 subType,
+fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, cXyz* p_pos, int roomNo,
+                               csXyz* p_angle, cXyz* p_scale, s8 subType,
                                unsigned int parentPId);
 
-void fopAcM_Log(fopAc_ac_c const* p_actor, char const* str);
+void fopAcM_Log(fopAc_ac_c* p_actor, char* str);
 
 void fopAcM_delete(fopAc_ac_c* p_actor);
 
 s32 fopAcM_delete(unsigned int actorID);
 
-s32 fopAcM_create(s16 procName, u16 enemyNo, u32 parameter, const cXyz* p_pos, int roomNo,
-                  const csXyz* p_angle, const cXyz* p_scale, s8 subType, createFunc p_createFunc);
+s32 fopAcM_create(s16 procName, u16 enemyNo, u32 parameter, cXyz* p_pos, int roomNo,
+                  csXyz* p_angle, cXyz* p_scale, s8 subType, createFunc p_createFunc);
 
-s32 fopAcM_create(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo, const csXyz* p_angle,
-                  const cXyz* p_scale, s8 subType);
+s32 fopAcM_create(s16 procName, u32 parameter, cXyz* p_pos, int roomNo, csXyz* p_angle,
+                  cXyz* p_scale, s8 subType);
 
-void* fopAcM_fastCreate(s16 procName, u32 parameter, const cXyz* p_pos, int roomNo,
-                        const csXyz* p_angle, const cXyz* p_scale, s8 subType,
+void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos, int roomNo,
+                        csXyz* p_angle, cXyz* p_scale, s8 subType,
                         createFunc p_createFunc, void* p_createFuncData);
 
-void* fopAcM_fastCreate(const char* p_actorName, u32 parameter, const cXyz* pActorPos, int roomNo,
-                        const csXyz* p_angle, const cXyz* p_scale, createFunc p_createFunc,
+void* fopAcM_fastCreate(char* p_actorName, u32 parameter, cXyz* pActorPos, int roomNo,
+                        csXyz* p_angle, cXyz* p_scale, createFunc p_createFunc,
                         void* p_createFuncData);
 
-s32 fopAcM_createChild(s16 procName, unsigned int parentPId, u32 parameters, const cXyz* p_pos,
-                       int roomNo, const csXyz* p_angle, const cXyz* p_scale, s8 subType,
+s32 fopAcM_createChild(s16 procName, unsigned int parentPId, u32 parameters, cXyz* p_pos,
+                       int roomNo, csXyz* p_angle, cXyz* p_scale, s8 subType,
                        createFunc p_createFunc);
 
 s32 fopAcM_createChildFromOffset(s16 procName, unsigned int parentProcID, u32 actorParams,
-                                 const cXyz* p_pos, int roomNo, const csXyz* p_angle,
-                                 const cXyz* p_scale, s8 subType, createFunc p_createFunc);
+                                 cXyz* p_pos, int roomNo, csXyz* p_angle,
+                                 cXyz* p_scale, s8 subType, createFunc p_createFunc);
 
 void fopAcM_DeleteHeap(fopAc_ac_c* p_actor);
 
@@ -451,31 +398,29 @@ void fopAcM_posMove(fopAc_ac_c* p_actor, const cXyz* p_movePos);
 
 void fopAcM_posMoveF(fopAc_ac_c* p_actor, const cXyz* p_movePos);
 
-s16 fopAcM_searchActorAngleY(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
+s16 fopAcM_searchActorAngleY(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
 
-s16 fopAcM_searchActorAngleX(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
+s32 fopAcM_seenActorAngleY(fopAc_ac_c*, fopAc_ac_c*);
 
-s32 fopAcM_seenActorAngleY(const fopAc_ac_c*, const fopAc_ac_c*);
+f32 fopAcM_searchActorDistance(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
 
-f32 fopAcM_searchActorDistance(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
+f32 fopAcM_searchActorDistance2(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
 
-f32 fopAcM_searchActorDistance2(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
+f32 fopAcM_searchActorDistanceXZ(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
 
-f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
+f32 fopAcM_searchActorDistanceXZ2(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
 
-f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* p_actorA, const fopAc_ac_c* p_actorB);
-
-s32 fopAcM_rollPlayerCrash(const fopAc_ac_c*, f32, u32, f32, f32, int, f32);
+s32 fopAcM_rollPlayerCrash(fopAc_ac_c*, f32, u32, f32, f32, int, f32);
 s32 fopAcM_checkCullingBox(f32[3][4], f32, f32, f32, f32, f32, f32);
-s32 fopAcM_cullingCheck(const fopAc_ac_c*);
+s32 fopAcM_cullingCheck(fopAc_ac_c*);
 void* event_second_actor(u16);
 s32 fopAcM_orderTalkEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
 s32 fopAcM_orderTalkItemBtnEvent(u16, fopAc_ac_c*, fopAc_ac_c*, u16, u16);
 s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag);
 s32 fopAcM_orderDoorEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
 s32 fopAcM_orderCatchEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
-s32 fopAcM_orderOtherEvent(fopAc_ac_c*, const char*, u16, u16, u16);
-s32 fopAcM_orderOtherEvent(fopAc_ac_c*, fopAc_ac_c*, const char*, u16, u16, u16);
+s32 fopAcM_orderOtherEvent(fopAc_ac_c*, char*, u16, u16, u16);
+s32 fopAcM_orderOtherEvent(fopAc_ac_c*, fopAc_ac_c*, char*, u16, u16, u16);
 s32 fopAcM_orderChangeEventId(fopAc_ac_c*, s16, u16, u16);
 s32 fopAcM_orderOtherEventId(fopAc_ac_c* actor, s16 eventID, u8 mapToolID, u16 param_3,
                              u16 priority, u16 flag);
@@ -484,88 +429,77 @@ s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c*, u8, s16, u16, u16, u16);
 s32 fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16);
 s32 fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16);
 s32 fopAcM_orderTreasureEvent(fopAc_ac_c*, fopAc_ac_c*, u16, u16);
-fopAc_ac_c* fopAcM_getTalkEventPartner(const fopAc_ac_c*);
-fopAc_ac_c* fopAcM_getItemEventPartner(const fopAc_ac_c*);
-fopAc_ac_c* fopAcM_getEventPartner(const fopAc_ac_c*);
+fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c*);
+fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c*);
+fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c*);
 
-s32 fopAcM_createItemForPresentDemo(cXyz const* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo,
-                                    int i_roomNo, csXyz const* p_angle, cXyz const* p_scale);
+s32 fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 param_2, int i_itemBitNo,
+                                    int i_roomNo, csXyz* p_angle, cXyz* p_scale);
 
-s32 fopAcM_createItemForTrBoxDemo(cXyz const* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
-                                  csXyz const* p_angle, cXyz const* p_scale);
+s32 fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
+                                  csXyz* p_angle, cXyz* p_scale);
 
 u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo);
 
-s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* p_pos, int i_itemBitNo, int i_roomNo,
-                                 csXyz const* p_angle, cXyz const* p_scale, f32* speedF,
+s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz* p_pos, int i_itemBitNo, int i_roomNo,
+                                 csXyz * p_angle, cXyz * p_scale, f32* speedF,
                                  f32* speedY);
 
-s32 fopAcM_createItemFromTable(cXyz const* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo,
-                               csXyz const* p_angle, int param_5, cXyz const* p_scale, f32* speedF,
+s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo,
+                               csXyz* p_angle, int param_5, cXyz * p_scale, f32* speedF,
                                f32* speedY, bool createDirect);
 
-s32 fopAcM_createDemoItem(const cXyz* p_pos, int itemNo, int itemBitNo, const csXyz* p_angle,
-                          int roomNo, const cXyz* scale, u8 param_7);
+s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle,
+                          int roomNo, cXyz* scale, u8 param_7);
 
 s32 fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle,
                              cXyz* p_scale, int param_8);
 
-s32 fopAcM_createItemForMidBoss(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle,
-                                const cXyz* p_scale, int param_6, int param_7);
+s32 fopAcM_createItemForMidBoss(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle,
+                                cXyz* p_scale, int param_6, int param_7);
 
-void* fopAcM_createItemForDirectGet(const cXyz* p_pos, int i_itemNo, int i_roomNo,
-                                    const csXyz* p_angle, const cXyz* p_scale, f32 speedF,
+void* fopAcM_createItemForDirectGet(cXyz* p_pos, int i_itemNo, int i_roomNo,
+                                    csXyz* p_angle, cXyz* p_scale, f32 speedF,
                                     f32 speedY);
 
-void* fopAcM_createItemForSimpleDemo(const cXyz* p_pos, int i_itemNo, int i_roomNo,
-                                     const csXyz* p_angle, const cXyz* p_scale, f32 speedF,
+void* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo,
+                                     csXyz* p_angle, cXyz* p_scale, f32 speedF,
                                      f32 speedY);
 
-s32 fopAcM_createItem(const cXyz* p_pos, int itemNo, int param_3, int roomNo, const csXyz* p_angle,
-                      const cXyz* p_scale, int param_7);
+s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, csXyz* p_angle,
+                      cXyz* p_scale, int param_7);
 
-void* fopAcM_fastCreateItem2(const cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5,
-                             const csXyz* p_angle, const cXyz* p_scale);
+void* fopAcM_fastCreateItem2(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5,
+                             csXyz* p_angle, cXyz* p_scale);
 
-void* fopAcM_fastCreateItem(const cXyz* p_pos, int i_itemNo, int i_roomNo, const csXyz* p_angle,
-                            const cXyz* p_scale, f32* p_speedF, f32* p_speedY, int param_8,
+void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle,
+                            cXyz* p_scale, f32* p_speedF, f32* p_speedY, int param_8,
                             int param_9, createFunc p_createFunc);
 
-s32 fopAcM_createBokkuri(u16, const cXyz*, int, int, int, const cXyz*, int, int);
-s32 fopAcM_createWarpHole(const cXyz*, const csXyz*, int, u8, u8, u8);
+s32 fopAcM_createBokkuri(u16, cXyz*, int, int, int, cXyz*, int, int);
+s32 fopAcM_createWarpHole(cXyz*, csXyz*, int, u8, u8, u8);
 
 fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);
 
-s32 fopAcM_createDisappear(const fopAc_ac_c*, const cXyz*, u8, u8, u8);
+s32 fopAcM_createDisappear(fopAc_ac_c*, cXyz*, u8, u8, u8);
 void fopAcM_setCarryNow(fopAc_ac_c*, int);
 void fopAcM_cancelCarryNow(fopAc_ac_c*);
-s32 fopAcM_otoCheck(const fopAc_ac_c*, f32);
-s32 fopAcM_otherBgCheck(const fopAc_ac_c*, const fopAc_ac_c*);
-s32 fopAcM_wayBgCheck(const fopAc_ac_c*, f32, f32);
-s32 fopAcM_plAngleCheck(const fopAc_ac_c*, s16);
-void fopAcM_effSmokeSet1(u32*, u32*, const cXyz*, const csXyz*, f32, const dKy_tevstr_c*, int);
-void fopAcM_effHamonSet(u32*, const cXyz*, f32, f32);
-s32 fopAcM_riverStream(cXyz*, s16*, f32*, f32);
-s32 fopAcM_carryOffRevise(fopAc_ac_c*);
-// void vectle_calc(const DOUBLE_POS*, cXyz*);
-// void get_vectle_calc(const cXyz*, const cXyz*, cXyz*);
-void fopAcM_setEffectMtx(const fopAc_ac_c*, const J3DModelData*);
+s32 fopAcM_otoCheck(fopAc_ac_c*, f32);
+// void vectle_calc(DOUBLE_POS*, cXyz*);
+// void get_vectle_calc(cXyz*, cXyz*, cXyz*);
 
-static const char* fopAcM_getProcNameString(const fopAc_ac_c* p_actor);
+static const char* fopAcM_getProcNameString(fopAc_ac_c* p_actor);
 
-static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* p_actor, void* p_data);
+static fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c* p_actor, void* p_data);
 
-fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1);
+fopAc_ac_c* fopAcM_searchFromName(char* name, u32 param0, u32 param1);
 
 fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* p_actor, void* p_data);
 
-fopAc_ac_c* fopAcM_searchFromName4Event(char const* name, s16 eventID);
+fopAc_ac_c* fopAcM_searchFromName4Event(char* name, s16 eventID);
 
 s32 fopAcM_getWaterY(const cXyz*, f32*);
-void fpoAcM_relativePos(fopAc_ac_c const* actor, cXyz const* p_inPos, cXyz* p_outPos);
-s32 fopAcM_getWaterStream(const cXyz*, const cBgS_PolyInfo&, cXyz*, int*, int);
-s16 fopAcM_getPolygonAngle(const cBgS_PolyInfo&, s16);
-s16 fopAcM_getPolygonAngle(cM3dGPla const* param_0, s16 param_1);
+void fpoAcM_relativePos(fopAc_ac_c* actor, cXyz* p_inPos, cXyz* p_outPos);
 
 inline void make_prm_warp_hole(u32* actorParams, u8 p1, u8 p2, u8 p3) {
     u32 pp1 = (p3 << 0x8);
@@ -582,23 +516,23 @@ inline void make_prm_bokkuri(u32* pActorParams, csXyz* p_angle, u8 param_2, u8 p
 
 inline fopAc_ac_c* dComIfGp_getPlayer(int);
 
-inline s16 fopAcM_searchPlayerAngleY(const fopAc_ac_c* actor) {
+inline s16 fopAcM_searchPlayerAngleY(fopAc_ac_c* actor) {
     return fopAcM_searchActorAngleY(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0));
 }
 
-inline f32 fopAcM_searchPlayerDistanceY(const fopAc_ac_c* actor) {
+inline f32 fopAcM_searchPlayerDistanceY(fopAc_ac_c* actor) {
     return fopAcM_searchActorDistanceY(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0));
 }
 
-inline f32 fopAcM_searchPlayerDistanceXZ2(const fopAc_ac_c* actor) {
+inline f32 fopAcM_searchPlayerDistanceXZ2(fopAc_ac_c* actor) {
     return fopAcM_searchActorDistanceXZ2(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0));
 }
 
-inline f32 fopAcM_searchPlayerDistanceXZ(const fopAc_ac_c* actor) {
+inline f32 fopAcM_searchPlayerDistanceXZ(fopAc_ac_c* actor) {
     return fopAcM_searchActorDistanceXZ(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0));
 }
 
-inline f32 fopAcM_searchPlayerDistance(const fopAc_ac_c* actor) {
+inline f32 fopAcM_searchPlayerDistance(fopAc_ac_c* actor) {
     return fopAcM_searchActorDistance(actor, (fopAc_ac_c*)dComIfGp_getPlayer(0));
 }
 
@@ -609,29 +543,11 @@ inline void fopAcM_seStartCurrent(fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
     mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
 }
 
-inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
+inline void fopAcM_seStart(fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
     s8 roomNo = fopAcM_GetRoomNo(actor);
     // mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
 }
 
-inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
-    s8 roomNo = fopAcM_GetRoomNo(actor);
-    // i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
-}
-
-inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
-    s8 roomNo = fopAcM_GetRoomNo(actor);
-    // i_mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo));
-}
-
-inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) {
-    dComIfGs_offActor(flag,fopAcM_GetHomeRoomNo(pActor));
-}
-
-inline void fopAcM_OnCarryType(fopAc_ac_c* pActor, fopAcM_CARRY param_2) {
-    pActor->mCarryType |= param_2;
-}
-
 extern "C" {
 void fopAcM_initManager__Fv(void);
 void fopAcM_CreateAppend__Fv(void);
diff --git a/include/m_Do/m_Do_DVDError.h b/include/m_Do/m_Do_DVDError.h
new file mode 100644
index 00000000..784ab1f3
--- /dev/null
+++ b/include/m_Do/m_Do_DVDError.h
@@ -0,0 +1,8 @@
+#ifndef M_DO_M_DO_DVD_ERROR_H
+#define M_DO_M_DO_DVD_ERROR_H
+
+#include "dolphin/types.h"
+
+void mDoDvdErr_ThdCleanup();
+
+#endif /* M_DO_M_DO_DVD_ERROR_H */
diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h
index 325982ee..905fdb8f 100644
--- a/include/m_Do/m_Do_Reset.h
+++ b/include/m_Do/m_Do_Reset.h
@@ -13,22 +13,11 @@ struct mDoRstData {
     /* 0x04 */ int mResetPrepare;
     /* 0x08 */ int m3ButtonReset;
     /* 0x0C */ int m3ButtonResetPort;
-    /* 0x10 */ bool mShutdown;
-    /* 0x11 */ bool mReturnToMenu;
-    /* 0x12 */ u8 mLogoScnFlag;
-    /* 0x13 */ u8 mProgSeqFlag;
-    /* 0x14 */ u8 mProgChgFlag;
-    /* 0x15 */ u8 mWarningDispFlag;
-};  // Size = 0x18
+};  // Size = 0x10
 
 class mDoRst {
 public:
-    static void offReturnToMenu() { mResetData->mReturnToMenu = false; }
-    static void offShutdown() { mResetData->mShutdown = false; }
-    static void setWarningDispFlag(u8 flag) { mResetData->mWarningDispFlag = flag; }
-    static void setProgChgFlag(u8 flag) { mResetData->mProgChgFlag = flag; }
-    static void setProgSeqFlag(u8 flag) { mResetData->mProgSeqFlag = flag; }
-    static void setLogoScnFlag(u8 flag) { mResetData->mLogoScnFlag = flag; }
+#if VERSION != VERSION_JP
     static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; }
     static void off3ButtonReset() { mResetData->m3ButtonReset = 0; }
     static void offResetPrepare() { mResetData->mResetPrepare = 0; }
@@ -36,24 +25,35 @@ public:
         mResetData->mReset = 0;
         mResetData->mResetPrepare = 0;
     }
-    static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; }
-    static u8 getProgSeqFlag() { return mResetData->mProgSeqFlag; }
-    static u8 getWarningDispFlag() { return mResetData->mWarningDispFlag; }
-    static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; }
-    static BOOL isShutdown() { return mResetData->mShutdown; }
     static int isReset() { return mResetData->mReset; }
     static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; }
     static int is3ButtonReset() { return mResetData->m3ButtonReset; }
     static void onReset() { mResetData->mReset = 1; }
-    static void onReturnToMenu() { mResetData->mReturnToMenu = true; }
     static void on3ButtonReset() { mResetData->m3ButtonReset = 1; }
-    static void onShutdown() { mResetData->mShutdown = true; }
 
-    static mDoRstData* getResetData();
-    static mDoRstData* i_getResetData() { return mResetData; }
+    static mDoRstData* getResetData() { return mResetData; }
     static void setResetData(mDoRstData* rstData) { mResetData = rstData; }
 
     static mDoRstData* mResetData;
+#else
+    static void set3ButtonResetPort(int port) { m3ButtonResetPort = port; }
+    static void off3ButtonReset() { m3ButtonResetFlag = 0; }
+    static void offResetPrepare() { mResetPrepare = 0; }
+    static void offReset() {
+        mResetFlag = 0;
+        mResetPrepare = 0;
+    }
+    static int isReset() { return mResetFlag; }
+    static int get3ButtonResetPort() { return m3ButtonResetPort; }
+    static int is3ButtonReset() { return m3ButtonResetFlag; }
+    static void onReset() { mResetFlag = 1; }
+    static void on3ButtonReset() { m3ButtonResetFlag = 1; }
+
+    static int mResetPrepare;
+    static int mResetFlag;
+    static int m3ButtonResetFlag;
+    static int m3ButtonResetPort;
+#endif
 };
 
 extern bool mDoDvdErr_initialized;
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index 1b6445b5..ffdfdde2 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -16,6 +16,7 @@ public:
     static void offResetFlag() { mResetFlag = false; }
 
     static bool isInitFlag() { return mInitFlag; }
+    static void offInitFlag() { mInitFlag = false; }
 
     static bool isBgmSet() { return mBgmSet; }
     static void offBgmSet() { mBgmSet = false; }
diff --git a/include/m_Do/m_Do_machine_exception.h b/include/m_Do/m_Do_machine_exception.h
new file mode 100644
index 00000000..f3a69357
--- /dev/null
+++ b/include/m_Do/m_Do_machine_exception.h
@@ -0,0 +1,16 @@
+#ifndef M_DO_M_DO_MACHINE_EXCEPTION_H
+#define M_DO_M_DO_MACHINE_EXCEPTION_H
+
+#include "dolphin/types.h"
+
+class JUTConsole;
+
+void print_f(char const*, ...);
+void print(char const*);
+void dispHeapInfo();
+void dispGameInfo();
+void dispDateInfo();
+void dispConsoleToTerminal();
+void exception_addition(JUTConsole* pConsole);
+
+#endif /* M_DO_M_DO_MACHINE_EXCEPTION_H */
\ No newline at end of file