d_com_inf_game debug (#3075)

* d_com_inf_game debug * inline sorting
2026-06-05 02:37:50 -04:00 · 2026-01-29 18:58:59 -08:00
parent 46b0f095c5
commit dbee7c8f1f
20 changed files with 4425 additions and 4123 deletions
@@ -35204,11 +35204,15 @@ __vt__10flagFile_c = .data:0x80674A2C; // type:object size:0x1C scope:global has
@122316 = .data:0x80674A68; // type:object size:0xE scope:local data:string hash:0xACC953E0
@122317 = .data:0x80674A78; // type:object size:0xC scope:local hash:0xACC953E1
@122318 = .data:0x80674A90; // type:object size:0x11 scope:local data:string hash:0xACC953EE
-lbl_80674AA1 = .data:0x80674AA1; // type:object size:0x43
+lbl_80674AA4 = .data:0x80674AA4; // type:object size:0x9 scope:local data:string
+lbl_80674AB0 = .data:0x80674AB0; // type:object size:0x28 scope:local data:string
+lbl_80674AD8 = .data:0x80674AD8; // type:object size:0x9 scope:local data:string
@STRING@putSave__10dSv_save_cFi12dSv_memory_c@1 = .data:0x80674AE4; // type:object size:0x9 scope:local data:string hash:0xA380799C dhash:0x726F5992
@STRING@putSave__10dSv_save_cFi12dSv_memory_c@0 = .data:0x80674AF0; // type:object size:0x28 scope:local data:string hash:0xA380799D dhash:0x726F5992
@STRING@putSave__10dSv_save_cFi12dSv_memory_c = .data:0x80674B18; // type:object size:0x9 scope:local data:string hash:0x03AD22AD dhash:0xA3B82A9E
-lbl_80674B21 = .data:0x80674B21; // type:object size:0x3F
+lbl_80674B24 = .data:0x80674B24; // type:object size:0xA scope:local data:string
+lbl_80674B30 = .data:0x80674B30; // type:object size:0x1F scope:local data:string
+lbl_80674B50 = .data:0x80674B50; // type:object size:0xA scope:local data:string
 l_debugTmpPos = .data:0x80674B60; // type:object size:0x300 scope:global hash:0x18D2D4E2
 ...data.0 = .data:0x80674B60; // type:label scope:local
 l_debugColData = .data:0x80674E60; // type:object size:0x180 scope:global hash:0x12B143B7
@@ -64328,7 +64332,7 @@ m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8074C5A8; // type:object size:0x4 scop
 m_mySelfPointer__6dMap_c = .sbss:0x8074C5AC; // type:object size:0x4 scope:global data:4byte hash:0x00D80556 dhash:0x48648480
 m_baseCsr__13dComIfG_inf_c = .sbss:0x8074C5B0; // type:object size:0x4 scope:global data:4byte hash:0x093AF68D dhash:0xD012C68F
 m_navi__Q213dComIfG_inf_c9baseCsr_c = .sbss:0x8074C5B4; // type:object size:0x4 scope:global data:4byte hash:0x28E4777B dhash:0x4D046943
-lbl_8074C5B8 = .sbss:0x8074C5B8; // type:object size:0x1 data:byte hash:0x0E1E9EA7 dhash:0x13EA8A85
+@GUARD@draw__Q213dComIfG_inf_c9baseCsr_cFff@effScale = .sbss:0x8074C5B8; // type:object size:0x1 data:byte hash:0x0E1E9EA7 dhash:0x13EA8A85
 g_clearColor = .sbss:0x8074C5BC; // type:object size:0x4 scope:global data:4byte hash:0x30ABBCF9
 g_dComIfAc_gameInfo = .sbss:0x8074C5C0; // type:object size:0x8 scope:global hash:0x6BEC77EA
 g_dComIfGoat_gameInfo = .sbss:0x8074C5C8; // type:object size:0x4 scope:global data:4byte hash:0xB039AA75
@@ -59,15 +59,13 @@ inline T cLib_minMaxLimit(T val, T min, T max) {
 template <typename T>
 inline T cLib_maxLimit(T val, T max) {
    T ret;
-    T var_r30;

    if (val > max) {
-        var_r30 = max;
+        ret = max;
    } else {
-        var_r30 = val;
+        ret = val;
    }

-    ret = var_r30;
    return (T)ret;
 }

@@ -240,55 +240,51 @@ public:
    fopAc_ac_c* CheckObjectTarget(s32);
    bool LockonTruth();
    int checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
-    bool LockEdge() { return chkFlag(8) || chkFlag(0x20); }
-    int GetCheckObjectCount() { return mCheckObjectCount; }
-    void keepLock(int timer) { mAttnBlockTimer = timer; }
+
    static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }

 #if DEBUG
    void runDebugDisp0();
 #endif

+    void Init(fopAc_ac_c* param_0, u32 i_padNo) {
+        mpPlayer = param_0;
+        mPadNo = i_padNo;
+    }
    JKRSolidHeap* getHeap() { return heap; }
-    fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
-    fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
-    u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }
+    void offAttnDraw() {
+        draw[0].field_0x173 = 3;
+        draw[1].field_0x173 = 3;
+    }
    BOOL chkFlag(u32 flag) { return (mFlags & flag) ? TRUE : FALSE; }
    void setFlag(u32 flag) { mFlags |= flag; }
    void clrFlag(u32 flag) { mFlags &= ~flag; }
-    int GetActionCount() { return mActionCount; }
-    int GetLockonCount() { return mLockonCount; }
+    bool LockEdge() { return chkFlag(8) || chkFlag(0x20); }
    void LockSoundOn() { clrFlag(0x400000); }
    void LockSoundOff() { setFlag(0x400000); }
-    bool Lockon() { return LockonTruth() || chkFlag(0x20000000); }  // only matches with -O2?
+    int GetLockonCount() { return mLockonCount; }
+    int GetActionCount() { return mActionCount; }
+    int GetCheckObjectCount() { return mCheckObjectCount; }
+    fopAc_ac_c* getZHintTarget() { return mZHintTarget.getZHintTarget(); }
    int ZHintRequest(fopAc_ac_c* param_1, int param_2) {
        return mZHintTarget.request(param_1, param_2);
    }
-
-    void LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist,
-                     s16 i_angle, int param_5) {
-        mLookTarget.request(param_0, i_horizontalDist, i_upDist, i_downDist, i_angle, param_5);
-    }
-
+    fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); }
+    u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); }
    void CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist,
                      f32 i_downDist, s16 i_angle, int param_5) {
        mCatghTarget.request(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, i_angle,
                             param_5);
    }
-
    fopAc_ac_c* getLookTarget() {
        return mLookTarget.getLookTarget();
    }
-
-    void Init(fopAc_ac_c* param_0, u32 i_padNo) {
-        mpPlayer = param_0;
-        mPadNo = i_padNo;
-    }
-
-    void offAttnDraw() {
-        draw[0].field_0x173 = 3;
-        draw[1].field_0x173 = 3;
+    void LookRequest(fopAc_ac_c* param_0, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist,
+                     s16 i_angle, int param_5) {
+        mLookTarget.request(param_0, i_horizontalDist, i_upDist, i_downDist, i_angle, param_5);
    }
+    void keepLock(int timer) { mAttnBlockTimer = timer; }
+    bool Lockon() { return LockonTruth() || chkFlag(0x20000000); }  // only matches with -O2?

    static type_tbl_entry loc_type_tbl[3];
    static type_tbl_entry act_type_tbl[5];
@@ -39,6 +39,10 @@ public:

 class dDlst_blo_c : public dDlst_base_c {
 public:
+    dDlst_blo_c() {
+        field_0x120 = 0.0f;
+        field_0x124 = 0.0f;
+    }
    virtual void draw();
    bool create(JKRArchive* param_1, const char* param_2) {
        return mScreen.setPriority(param_2, 0x20000, param_1) != 0;
@@ -66,26 +70,21 @@ public:
    class anm_c {
    public:
        inline anm_c() {
-            field_0x4 = 0;
+            field_0x4 = NULL;
            field_0x8 = 1.0f;
        }
-        ~anm_c() { remove(); }
+        virtual ~anm_c() { remove(); }

-        void remove() {
-            if (field_0x4 != 0.0f) {
+        void remove();

-            }
-
-            field_0x4 = 0.0f;
-        }
-
-        f32 field_0x4;
+        void* field_0x4;
        f32 field_0x8;
    };

    /* 0x004 */ int field_0x4;
    /* 0x008 */ J2DScreen mScreen;
-    /* 0x120 */ anm_c anm;
+    /* 0x120 */ f32 field_0x120;
+    /* 0x124 */ f32 field_0x124;
 };

 class dDlst_snapShot_c : public dDlst_base_c {
@@ -108,8 +108,26 @@ public:
    void setPtD(void* actor);
    void setGtItm(u8 itemNo);

+    fopAc_ac_c* getPt1() { return convPId(mPt1); }
+    fopAc_ac_c* getPt2() { return convPId(mPt2); }
+    fopAc_ac_c* getPtT() { return convPId(mPtT); }
+    fopAc_ac_c* getPtI() { return convPId(mPtI); }
+    fopAc_ac_c* getPtD() { return convPId(mPtd); }
+    u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
+    void onEventFlag(u16 flag) { mEventFlag |= flag; }
+    void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
    u16 chkFlag2(u16 flag) { return flag & mFlag2; }
-
+    void onFlag2(u16 flag) { mFlag2 |= flag; }
+    void offFlag2(u16 flag) { mFlag2 &= ~flag; }
+    bool checkSkipEdge() { return chkFlag2(8) != false; }
+    u16 checkHind(u16 flag) { return flag & mHindFlag; }
+    void onHindFlag(u16 flag) { mHindFlag |= flag; }
+    #if DEBUG
+    void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; }
+    #else
+    void offHindFlag(u16 flag) { mHindFlag &= ~flag; }
+    #endif
+    u8 getMode() const { return mMode; }
    BOOL runCheck() {
        #if DEBUG
        return mEventStatus != 0 || mDebugStb != 0;
@@ -117,39 +135,6 @@ public:
        return mEventStatus != 0;
        #endif
    }
-
-    f32 getCullRate() { return mCullRate; }
-    void setCullRate(f32 rate) { mCullRate = rate; }
-
-    u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
-    void onEventFlag(u16 flag) { mEventFlag |= flag; }
-    void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
-
-    u8 getMode() const { return mMode; }
-
-    void onHindFlag(u16 flag) { mHindFlag |= flag; }
-    #if DEBUG
-    void offHindFlag(u16 flag) { mHindFlag &= (u16)~flag; }
-    #else
-    void offHindFlag(u16 flag) { mHindFlag &= ~flag; }
-    #endif
-
-    u16 checkHind(u16 flag) { return flag & mHindFlag; }
-    u8 checkCompulsory() { return mCompulsory; }
-    u8 getMapToolId() { return mMapToolId; }
-
-    void onFlag2(u16 flag) { mFlag2 |= flag; }
-    void offFlag2(u16 flag) { mFlag2 &= ~flag; }
-
-    BOOL chkTalkXY() 
-    {
-#if PLATFORM_WII || PLATFORM_SHIELD
-        return mTalkXyType == 1 || mTalkXyType == 2 || mTalkXyType == 3 || mTalkXyType == 4;
-#else
-        return mTalkXyType == 1 || mTalkXyType == 2;
-#endif
-    }
-
    BOOL isOrderOK() {
 #if DEBUG
        return (mEventStatus == 0 || mEventStatus == 2) && !mDebugStb;
@@ -157,19 +142,23 @@ public:
        return mEventStatus == 0 || mEventStatus == 2;
 #endif
    }
-
-    fopAc_ac_c* getPt1() { return convPId(mPt1); }
-    fopAc_ac_c* getPt2() { return convPId(mPt2); }
-    fopAc_ac_c* getPtT() { return convPId(mPtT); }
-    fopAc_ac_c* getPtI() { return convPId(mPtI); }
-    fopAc_ac_c* getPtD() { return convPId(mPtd); }
-
-    bool isChangeOK(void* actor) { return mChangeActor == actor; }
+    void setDebugStb(u8 stb) { mDebugStb = stb; }
+    u8 getMapToolId() { return mMapToolId; }
+    BOOL chkTalkXY() {
+#if PLATFORM_WII || PLATFORM_SHIELD
+        return mTalkXyType == 1 || mTalkXyType == 2 || mTalkXyType == 3 || mTalkXyType == 4;
+#else
+        return mTalkXyType == 1 || mTalkXyType == 2;
+#endif
+    }
    u8 getPreItemNo() { return mPreItemNo; }
    u8 getGtItm() { return mGtItm; }
+    f32 getCullRate() { return mCullRate; }
+    void setCullRate(f32 rate) { mCullRate = rate; }
+    bool isChangeOK(void* actor) { return mChangeActor == actor; }
+    u8 checkCompulsory() { return mCompulsory; }
+
    void startCheckSkipEdge(void* actor) { setSkipProc(actor, dEv_noFinishSkipProc, 0); }
-    bool checkSkipEdge() { return chkFlag2(8) != false; }
-    void setDebugStb(u8 stb) { mDebugStb = stb; }

 public:
    /* 0x000 */ u8 unk_0x0[4];
@@ -96,18 +96,16 @@ public:

    void debugBfProc();

-    int setStartDemo(int mapToolId) { return mException.setStartDemo(mapToolId); }
-    void setCameraPlay(int status) { mCameraPlay = status; }
    dEvDtBase_c& getBase() { return mEventList[mCurrentEvType]; }
-    void setFlag(int flag) { mFlags.flagSet(flag); }
-    bool dataLoaded() { return mDataLoaded; }
-    int flagCheck(int flag) { return mFlags.flagCheck(flag); }
-    int cameraPlay() { return mCameraPlay; }
-
    event_binary_data_header* getHeader(u8 type) {return mEventList[type].getHeaderP(); }
    dEvDtEvent_c* getEventList(u8 type) { return mEventList[type].getEventP(); }
-
+    int cameraPlay() { return mCameraPlay; }
+    void setCameraPlay(int status) { mCameraPlay = status; }
+    int setStartDemo(int mapToolId) { return mException.setStartDemo(mapToolId); }
    dEvDtFlag_c& getFlags() { return mFlags; }
+    int flagCheck(int flag) { return mFlags.flagCheck(flag); }
+    void setFlag(int flag) { mFlags.flagSet(flag); }
+    bool dataLoaded() { return mDataLoaded; }

    #if DEBUG
    dEvM_HIO_c& getEventHIO();
@@ -38,7 +38,7 @@ public:
    u8 openExplainTx(u32, u32);
    f32 getAlphaRatio();
    void setNumber();
-    bool getWarpMarkFlag();
+    u8 getWarpMarkFlag();
    void setScale();

    u8 getStatus() { return mStatus; }
@@ -188,7 +188,7 @@ public:
    u16 getFloatingMessageID() { return mFloatingMessageID; }
    s16 getHorseLifeCount() { return mHorseLifeCount; }
    void setMeterItemPanePtr(int i_no, CPaneMgr* i_pane) { mMeterItemPanePtr[i_no] = i_pane; }
-    bool isShopTalkFlag() { return mShopTalkFlag != false; }
+    bool isShopTalkFlag() { return mShopTalkFlag ? true : false; }
    u8 getCollectCursorPosX() { return mCollectCursorPosX; }
    u8 getCollectCursorPosY() { return mCollectCursorPosY; }
    void setCollectCursorPosXY(u8 x, u8 y) {
@@ -402,18 +402,18 @@ public:
                   param_9, param_10, param_11, param_12);
    }

-    void drawFogPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 7); }
+    void drawNormal(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 0); }
+    void drawNormalFog(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 1); }
+    void drawNormalP1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 2); }
+    void drawProjection(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 3); }
+    void drawNormalPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 4); }
    void drawNormalPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 5); }
    void drawFogPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 6); }
-    void drawNormalPri0_A(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 4); }
-    void drawFogPri4(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 11); }
-    void drawProjection(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 3); }
+    void drawFogPri0_B(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 7); }
    void drawFogPri1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 8); }
-    void drawNormal(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 0); }
    void drawFogPri2(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 9); }
-    void drawNormalFog(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 1); }
    void drawFogPri3(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 10); }
-    void drawNormalP1(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 2); }
+    void drawFogPri4(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 11); }
    void drawDarkworld(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 12); }
    void drawFogScreen(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 13); }
    void draw2Dgame(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 14); }
@@ -423,8 +423,8 @@ public:
    void draw2DmenuBack(JPADrawInfo* i_drawInfo) { draw(i_drawInfo, 18); }

    JKRSolidHeap* getHeap() { return mHeap; }
-    JKRSolidHeap* getSceneHeap() { return mSceneHeap; }
    JKRExpHeap* getResHeap() { return m_resHeap; }
+    JKRSolidHeap* getSceneHeap() { return mSceneHeap; }

    void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); }

@@ -143,24 +143,24 @@ public:
    int isMagicFlag(u8 i_magic) const;

    u16 getMaxLife() const { return mMaxLife; }
+    void setMaxLife(u16 i_maxLife) { mMaxLife = i_maxLife; }
    u16 getLife() const { return mLife; }
-    u16 getRupee() const { return mRupee; }
-    u16 getOil() const { return mOil; }
-    u16 getMaxOil() const { return mMaxOil; }
-    u8 getMagic() const { return mMagic; }
-    u8 getMaxMagic() const { return mMaxMagic; }
-    u8 getSelectEquip(int item) const { return mSelectEquip[item]; }
-    u8 getTransformStatus() const { return mTransformStatus; }
-    u8 getWalletSize() const { return mWalletSize; }
-    void setOil(u16 i_oil) { mOil = i_oil; }
-    void setMaxOil(u16 i_maxOil) { mMaxOil = i_maxOil; }
-    void setWalletSize(u8 i_size) { mWalletSize = i_size; }
-    void setMagic(u8 i_magic) { mMagic = i_magic; }
-    void setMaxMagic(u8 i_maxMagic) { mMaxMagic = i_maxMagic; }
-    void setRupee(u16 i_rupees) { mRupee = i_rupees; }
    void setLife(u16 i_life) { mLife = i_life; }
-    void setMaxLife(u8 i_maxLife) { mMaxLife = i_maxLife; }
+    u16 getRupee() const { return mRupee; }
+    void setRupee(u16 i_rupees) { mRupee = i_rupees; }
+    u16 getMaxOil() const { return mMaxOil; }
+    void setMaxOil(u16 i_maxOil) { mMaxOil = i_maxOil; }
+    u16 getOil() const { return mOil; }
+    void setOil(u16 i_oil) { mOil = i_oil; }
+    u8 getSelectEquip(int item) const { return mSelectEquip[item]; }
    void setSelectEquip(int i_equipId, u8 i_itemNo) { mSelectEquip[i_equipId] = i_itemNo; }
+    u8 getWalletSize() const { return mWalletSize; }
+    void setWalletSize(u8 i_size) { mWalletSize = i_size; }
+    u8 getMaxMagic() const { return mMaxMagic; }
+    void setMaxMagic(u8 i_maxMagic) { mMaxMagic = i_maxMagic; }
+    u8 getMagic() const { return mMagic; }
+    void setMagic(u8 i_magic) { mMagic = i_magic; }
+    u8 getTransformStatus() const { return mTransformStatus; }
    void setTransformStatus(u8 i_status) { mTransformStatus = i_status; }

 private:
@@ -194,12 +194,12 @@ public:
    void offTransformLV(int i_no);
    BOOL isTransformLV(int i_no) const;

-    void setDateIpl(s64 i_time) { mDateIpl = i_time; }
-    u16 getDate() const { return mDate; }
-    f32 getTime() const { return mTime; }
-    void setDate(u16 i_date) { mDate = i_date; }
-    void setTime(f32 i_time) { mTime = i_time; }
    OSTime getDateIpl() const { return mDateIpl; }
+    void setDateIpl(OSTime i_time) { mDateIpl = i_time; }
+    f32 getTime() const { return mTime; }
+    void setTime(f32 i_time) { mTime = i_time; }
+    u16 getDate() const { return mDate; }
+    void setDate(u16 i_date) { mDate = i_date; }

 private:
    /* 0x00 */ OSTime mDateIpl;
@@ -236,9 +236,9 @@ class dSv_player_return_place_c {
 public:
    void init();
    void set(const char* i_name, s8 i_roomNo, u8 i_status);
-    s8 getRoomNo() const { return mRoomNo; }
-    u8 getPlayerStatus() const { return mPlayerStatus; }
    char* getName() { return mName; }
+    u8 getPlayerStatus() const { return mPlayerStatus; }
+    s8 getRoomNo() const { return mRoomNo; }

 private:
    /* 0x00 */ char mName[8];
@@ -257,13 +257,14 @@ public:
    void onRegionBit(int i_region);
    void set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_spawn, u8 i_regionNo);

-    bool isFieldDataExistFlag() const { return mFieldDataExistFlag; }
+    cXyz& getPos() { return mPos; }
+    s16 getAngleY() { return mAngleY; }
+    char* getName() { return mName; }
+    u8 getRegionNo() const { return mRegionNo; }
+    bool isFieldDataExistFlag() const { return mFieldDataExistFlag ? true : false; }
    void offFieldDataExistFlag() { mFieldDataExistFlag = false; }
    void onFieldDataExistFlag() { mFieldDataExistFlag = true; }
-    cXyz& getPos() { return mPos; }
-    u8 getRegionNo() const { return mRegionNo; }
-    char* getName() { return mName; }
-    s16 getAngleY() { return mAngleY; }
+

 private:
    /* 0x00 */ cXyz mPos;
@@ -283,13 +284,13 @@ public:
    void init();
    void setWarpItemData(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo, u8, u8);

-    const char* getName() { return mName; }
    cXyz& getPos() { return mPos; }
-    s16 getAngleY() { return mAngleY; }
-    s8 getRoomNo() { return mRoomNo; }
-    s8 getWarpAcceptStage() { return mWarpAcceptStage; }
-    void resetWarpAcceptStage() { mWarpAcceptStage = -1; }
+    s16 getAngleY() const { return mAngleY; }
+    const char* getName() { return mName; }
+    s8 getRoomNo() const { return mRoomNo; }
+    s8 getWarpAcceptStage() const { return mWarpAcceptStage; }
    void setWarpAcceptStage(s8 accept) { mWarpAcceptStage = accept; }
+    void resetWarpAcceptStage() { mWarpAcceptStage = -1; }

 private:
    /* 0x00 */ cXyz mPos;
@@ -375,8 +376,8 @@ public:
    void setBombNum(u8 i_bombType, u8 i_maxNum);
    u8 getBombNum(u8 i_bombType) const;

-    void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; }
    u8 getArrowNum() const { return mItemMax[ARROW_MAX]; }
+    void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; }

 private:
    /* 0x0 */ u8 mItemMax[8];
@@ -468,20 +469,18 @@ private:
 class dSv_player_info_c {
 public:
    void init();
-    char* getLinkName() { return mPlayerName; }
-    const char* getPlayerName() const { return mPlayerName; }
-    char* getHorseName() { return mHorseName; }
-    void setPlayerName(const char* i_name) { strcpy((char*)mPlayerName, i_name); }
-    void setHorseName(const char* i_name) { strcpy((char*)mHorseName, i_name); }
-    void setTotalTime(s64 i_time) { mTotalTime = i_time; }
-    s64 getTotalTime() const { return mTotalTime; }
-    u8 getClearCount() const { return mClearCount; }
-
+    OSTime getTotalTime() const { return mTotalTime; }
+    void setTotalTime(OSTime i_time) { mTotalTime = i_time; }
    void addDeathCount() {
        if (mDeathCount < 0xFFFF) {
            mDeathCount++;
        }
    }
+    char* getPlayerName() const { return const_cast<char*>(mPlayerName); }
+    void setPlayerName(const char* i_name) { strcpy((char*)mPlayerName, i_name); }
+    char* getHorseName() { return mHorseName; }
+    void setHorseName(const char* i_name) { strcpy((char*)mHorseName, i_name); }
+    u8 getClearCount() const { return mClearCount; }

 private:
    /* 0x00 */ u64 unk0;
@@ -549,24 +548,24 @@ public:
    dSv_player_c() {}
    void init();

-    dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; }
    dSv_player_status_a_c& getPlayerStatusA() { return mPlayerStatusA; }
    dSv_player_status_b_c& getPlayerStatusB() { return mPlayerStatusB; }
    dSv_horse_place_c& getHorsePlace() { return mHorsePlace; }
-    dSv_player_item_c& getItem() { return mItem; }
-    dSv_player_collect_c& getCollect() { return mCollect; }
-    dSv_player_item_record_c& getItemRecord() { return mItemRecord; }
-    dSv_player_item_max_c& getItemMax() { return mItemMax; }
-    dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return mPlayerLastMarkInfo; }
    dSv_player_return_place_c& getPlayerReturnPlace() { return mPlayerReturnPlace; }
-    dSv_light_drop_c& getLightDrop() { return mLightDrop; }
-    dSv_player_get_item_c& getGetItem() { return mGetItem; }
-    dSv_player_config_c& getConfig() { return mConfig; }
-    dSv_letter_info_c& getLetterInfo() { return mLetterInfo; }
-    dSv_fishing_info_c& getFishingInfo() { return mFishingInfo; }
    dSv_player_field_last_stay_info_c& getPlayerFieldLastStayInfo() {
        return mPlayerFieldLastStayInfo;
    }
+    dSv_player_last_mark_info_c& getPlayerLastMarkInfo() { return mPlayerLastMarkInfo; }
+    dSv_player_item_c& getItem() { return mItem; }
+    dSv_player_get_item_c& getGetItem() { return mGetItem; }
+    dSv_player_item_record_c& getItemRecord() { return mItemRecord; }
+    dSv_player_item_max_c& getItemMax() { return mItemMax; }
+    dSv_player_collect_c& getCollect() { return mCollect; }
+    dSv_light_drop_c& getLightDrop() { return mLightDrop; }
+    dSv_letter_info_c& getLetterInfo() { return mLetterInfo; }
+    dSv_fishing_info_c& getFishingInfo() { return mFishingInfo; }
+    dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; }
+    dSv_player_config_c& getConfig() { return mConfig; }

 private:
    /* 0x000 */ dSv_player_status_a_c mPlayerStatusA;
@@ -630,22 +629,32 @@ public:
    u8 getKeyNum() { return mKeyNum; }
    void setKeyNum(u8 i_keyNum) { mKeyNum = i_keyNum; }
    void onDungeonItemMap() { onDungeonItem(MAP); }
+    void offDungeonItemMap() { offDungeonItem(MAP); }
    s32 isDungeonItemMap() const { return isDungeonItem(MAP); }
    void onDungeonItemCompass() { onDungeonItem(COMPASS); }
+    void offDungeonItemCompass() { offDungeonItem(COMPASS); }
    s32 isDungeonItemCompass() const { return isDungeonItem(COMPASS); }
-    void onDungeonItemWarp() { onDungeonItem(OOCCOO_NOTE); }
    void onDungeonItemBossKey() { onDungeonItem(BOSS_KEY); }
+    void offDungeonItemBossKey() { offDungeonItem(BOSS_KEY); }
    s32 isDungeonItemBossKey() const { return isDungeonItem(BOSS_KEY); }
-    void onStageBossEnemy() {
+        void onStageBossEnemy() {
        onDungeonItem(STAGE_BOSS_ENEMY);
        onDungeonItem(OOCCOO_NOTE);
    }
-    void onStageBossEnemy2() { onDungeonItem(STAGE_BOSS_ENEMY_2); }
+    void offStageBossEnemy() { offDungeonItem(STAGE_BOSS_ENEMY); }
    s32 isStageBossEnemy() const { return isDungeonItem(STAGE_BOSS_ENEMY); }
-    s32 isStageBossEnemy2() const { return isDungeonItem(STAGE_BOSS_ENEMY_2); }
-    s32 isStageLife() const { return isDungeonItem(STAGE_LIFE); }
-    s32 isDungeonItemWarp() const { return isDungeonItem(OOCCOO_NOTE); }
    void onStageLife() { onDungeonItem(STAGE_LIFE); }
+    void offStageLife() { offDungeonItem(STAGE_LIFE); }
+    s32 isStageLife() const { return isDungeonItem(STAGE_LIFE); }
+    void onStageBossDemo() { onDungeonItem(STAGE_BOSS_DEMO); }
+    void offStageBossDemo() { offDungeonItem(STAGE_BOSS_DEMO); }
+    s32 isStageBossDemo() const { return isDungeonItem(STAGE_BOSS_DEMO); }
+    void onDungeonItemWarp() { onDungeonItem(OOCCOO_NOTE); }
+    void offDungeonItemWarp() { offDungeonItem(OOCCOO_NOTE); }
+    s32 isDungeonItemWarp() const { return isDungeonItem(OOCCOO_NOTE); }
+    void onStageBossEnemy2() { onDungeonItem(STAGE_BOSS_ENEMY_2); }
+    void offStageBossEnemy2() { offDungeonItem(STAGE_BOSS_ENEMY_2); }
+    s32 isStageBossEnemy2() const { return isDungeonItem(STAGE_BOSS_ENEMY_2); }

 private:
    /* 0x00 */ u32 mTbox[2];
@@ -674,13 +683,12 @@ class dSv_MiniGame_c {
 public:
    void init();

-    void setBalloonScore(u32 i_score) { mBalloonScore = i_score; }
-    void setRaceGameTime(u32 i_time) { mRaceGameTime = i_time; }
-    void setHookGameTime(u32 i_time) { mHookGameTime = i_time; }
-
-    u32 getRaceGameTime() const { return mRaceGameTime; }
-    u32 getBalloonScore() const { return mBalloonScore; }
    u32 getHookGameTime() const { return mHookGameTime; }
+    void setHookGameTime(u32 i_time) { mHookGameTime = i_time; }
+    u32 getBalloonScore() const { return mBalloonScore; }
+    void setBalloonScore(u32 i_score) { mBalloonScore = i_score; }
+    u32 getRaceGameTime() const { return mRaceGameTime; }
+    void setRaceGameTime(u32 i_time) { mRaceGameTime = i_time; }

 private:
    /* 0x00 */ u8 unk0[1][4];
@@ -783,17 +791,16 @@ private:

 class dSv_zone_c {
 public:
-    dSv_zone_c() { mRoomNo = -1; }
+    dSv_zone_c() { reset(); }
    void init(int i_roomNo);

+    int getRoomNo() const { return mRoomNo; }
+    void reset() { mRoomNo = -1; }
    dSv_zoneBit_c& getBit() { return mBit; }
    const dSv_zoneBit_c& getBit() const { return mBit; }
    dSv_zoneActor_c& getActor() { return mActor; }
    const dSv_zoneActor_c& getActor() const { return mActor; }

-    int getRoomNo() const { return mRoomNo; }
-    void reset() { mRoomNo = -1; }
-
 private:
    /* 0x00 */ s8 mRoomNo;
    /* 0x01 */ u8 unk1;
@@ -807,23 +814,22 @@ class dSv_restart_c {
 public:
    void setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo);

-    void setRoomParam(u32 param) { mRoomParam = param; }
+    s8 getRoomNo() const { return mRoomNo; }
+    s16 getStartPoint() const { return mStartPoint; }
    void setStartPoint(s16 point) { mStartPoint = point; }
+    s16 getRoomAngleY() const { return mRoomAngleY; }
+    const cXyz& getRoomPos() const { return mRoomPos; }
+    u32 getRoomParam() const { return mRoomParam; }
+    void setRoomParam(u32 param) { mRoomParam = param; }
+    f32 getLastSpeedF() const { return mLastSpeedF; }
+    u32 getLastMode() const { return mLastMode; }
+    s16 getLastAngleY() const { return mLastAngleY; }
    void setLastSceneInfo(f32 speed, u32 mode, s16 angle) {
        mLastSpeedF = speed;
        mLastMode = mode;
        mLastAngleY = angle;
    }

-    s16 getStartPoint() const { return mStartPoint; }
-    u32 getLastMode() const { return mLastMode; }
-    s8 getRoomNo() const { return mRoomNo; }
-    u32 getRoomParam() const { return mRoomParam; }
-    const cXyz& getRoomPos() const { return mRoomPos; }
-    s16 getRoomAngleY() const { return mRoomAngleY; }
-    s16 getLastAngleY() const { return mLastAngleY; }
-    f32 getLastSpeedF() const { return mLastSpeedF; }
-
 private:
    /* 0x00 */ s8 mRoomNo;
    /* 0x01 */ u8 field_0x01[3];
@@ -847,22 +853,19 @@ public:

    void set(const cXyz& i_position, s16 i_angleY, s8, u32 i_param);

-    u32 getParam() const { return mParam; }
    const cXyz& getPos() const { return mPosition; }
+    u32 getParam() const { return mParam; }
    s16 getAngleY() const { return mAngleY; }
    s8 getRoomNo() const { return unk18; }
-
+    const cXyz& getCameraCtr() const { return mCamera.mCameraCtr; }
+    void setCameraCtr(const cXyz& i_ctr) { mCamera.mCameraCtr = i_ctr; }
+    const cXyz& getCameraEye() const { return mCamera.mCameraEye; }
+    void setCameraEye(const cXyz& i_eye) { mCamera.mCameraEye = i_eye; }
+    const cXyz& getCameraUp() const { return mCamera.mCameraUp; }
+    void setCameraUp(const cXyz& i_up) { mCamera.mCameraUp = i_up; }
    f32 getCameraFvy() const { return mCameraFvy; }
    void setCameraFvy(f32 i_fvy) { mCameraFvy = i_fvy; }

-    const cXyz& getCameraUp() const { return mCamera.mCameraUp; }
-    const cXyz& getCameraEye() const { return mCamera.mCameraEye; }
-    const cXyz& getCameraCtr() const { return mCamera.mCameraCtr; }
-
-    void setCameraUp(const cXyz& i_up) { mCamera.mCameraUp = i_up; }
-    void setCameraEye(const cXyz& i_eye) { mCamera.mCameraEye = i_eye; }
-    void setCameraCtr(const cXyz& i_ctr) { mCamera.mCameraCtr = i_ctr; }
-
 private:
    /* 0x00 */ cXyz mPosition;
    /* 0x0C */ u32 mParam;
@@ -886,18 +889,16 @@ public:
    dSv_memory2_c* getSave2(int i_stage2No);

    dSv_player_c& getPlayer() { return mPlayer; }
-    dSv_event_c& getEvent() { return mEvent; }
-    dSv_MiniGame_c& getMiniGame() { return mMiniGame; }
-
    dSv_memory_c& getSave(int i_stageNo) {
        JUT_ASSERT(1412, 0 <= i_stageNo && i_stageNo < STAGE_MAX);
        return mSave[i_stageNo];
    }
-
    void putSave(int i_stageNo, dSv_memory_c mem) {
-        JUT_ASSERT(1417, 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
+        JUT_ASSERT(1417, 0 <= i_stageNo && i_stageNo < STAGE_MAX);
        mSave[i_stageNo] = mem;
    }
+    dSv_event_c& getEvent() { return mEvent; }
+    dSv_MiniGame_c& getMiniGame() { return mMiniGame; }

    static const int STAGE_MAX = 32;
    static const int STAGE2_MAX = 64;
@@ -954,33 +955,32 @@ public:
    int initdata_to_card(char* card_ptr, int dataNum);

    dSv_save_c& getSavedata() { return mSavedata; }
+    void setSavedata(dSv_save_c& i_save) { mSavedata = i_save; }
+    dSv_player_c& getPlayer() { return mSavedata.getPlayer(); }
+    dSv_event_c& getEvent() { return mSavedata.getEvent(); }
+    dSv_MiniGame_c& getMiniGame() { return mSavedata.getMiniGame(); }
    dSv_memory_c& getMemory() { return mMemory; }
+    void setMemory(dSv_memory_c& i_memory) { mMemory = i_memory; }
+    dSv_danBit_c& getDan() { return mDan; }
+    void setDan(dSv_danBit_c& i_dan) { mDan = i_dan; }
+    void resetDan() { mDan.reset(); }
+    void initDan(s8 i_stage) { mDan.init(i_stage); }
    dSv_zone_c* getZones() { return mZone; }
    dSv_zone_c& getZone(int id) { return mZone[id]; }
-    dSv_player_c& getPlayer() { return mSavedata.getPlayer(); }
-    dSv_event_c& getTmp() { return mTmp; }
+    void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
    dSv_restart_c& getRestart() { return mRestart; }
+    dSv_event_c& getTmp() { return mTmp; }
    dSv_turnRestart_c& getTurnRestart() { return mTurnRestart; }
-    dSv_event_c& getEvent() { return mSavedata.getEvent(); }
-    dSv_danBit_c& getDan() { return mDan; }
-    dSv_MiniGame_c& getMiniGame() { return mSavedata.getMiniGame(); }
-    s64 getStartTime() const { return mStartTime; }
-    s64 getSaveTotalTime() const { return mSaveTotalTime; }
-    void setStartTime(s64 time) { mStartTime = time; }
-    void setSaveTotalTime(s64 time) { mSaveTotalTime = time; }
-    void initDan(s8 i_stage) { mDan.init(i_stage); }
-    void resetDan() { mDan.reset(); }
    u8 getDataNum() const { return mDataNum; }
    void setDataNum(u8 num) { mDataNum = num; }
-    void removeZone(int zoneNo) { mZone[zoneNo].reset(); }
-    u8 getNoFile() const { return mNoFile; }
-    void setNoFile(u8 file) { mNoFile = file; }
    u8 getNewFile() const { return mNewFile; }
    void setNewFile(u8 file) { mNewFile = file; }
-
-    void setSavedata(dSv_save_c& i_save) { mSavedata = i_save; }
-    void setMemory(dSv_memory_c& i_memory) { mMemory = i_memory; }
-    void setDan(dSv_danBit_c& i_dan) { mDan = i_dan; }
+    u8 getNoFile() const { return mNoFile; }
+    void setNoFile(u8 file) { mNoFile = file; }
+    s64 getStartTime() const { return mStartTime; }
+    void setStartTime(s64 time) { mStartTime = time; }
+    s64 getSaveTotalTime() const { return mSaveTotalTime; }
+    void setSaveTotalTime(s64 time) { mSaveTotalTime = time; }

    static const int MEMORY_SWITCH = 0x80;
    static const int DAN_SWITCH = 0x40;
@@ -1100,13 +1100,8 @@ public:
        /* 0x1 */ bankDataEntry m_entries[32];  // ?
    };

-    static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); }
-    static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); }
-    static void removeRoomDzs() { m_roomDzs.remove(); }
-
    dStage_roomControl_c() {}
    void init(void);
-    static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); }
    void initZone();
    dStage_roomDt_c* getStatusRoomDt(int);
    static JKRExpHeap* getMemoryBlock(int);
@@ -1120,23 +1115,20 @@ public:
    static void setArcBank(int, char const*);
    static char* getArcBank(int);
    static bool resetArchiveBank(int);
-    static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; }
-    static void setZoneNo(int, int);
-    static dBgp_c* getBgp(int i_roomNo) {
-#if DEBUG
-        // DEBUG NONMATCHING
-#else
-        return NULL;
-#endif
-    }
-    static BOOL GetTimePass() { return m_time_pass; }

+    static s8 getRoomReadId() { return mRoomReadId; }
+    static void setRoomReadId(s8 id) { mRoomReadId = id; }
+    static u32 getProcID() { return mProcID; }
+    static void setProcID(u32 id) { mProcID = id; }
    static int getStayNo() { return mStayNo; }
-    static u8 getRegionNo(int i_roomNo) { return mStatus[i_roomNo].mRegionNo; }
-    static int getMemoryBlockID(int i_roomNo) {
-        JUT_ASSERT(2757, 0 <= i_roomNo && i_roomNo < 64);
-        return mStatus[i_roomNo].mMemBlockID;
-    }
+    static int getNextStayNo() { return mNextStayNo; }
+    static BOOL GetTimePass() { return m_time_pass; }
+    static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; }
+    static nameData* getArcBankName() { return mArcBankName; }
+    static bankData* getArcBankData() { return mArcBankData; }
+    static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); }
+    static void removeRoomDzs() { m_roomDzs.remove(); }
+    static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); }
    dKy_tevstr_c* getTevStr(int i_roomNo) {
        JUT_ASSERT(2675, 0 <= i_roomNo && i_roomNo < 64);
        return &mStatus[i_roomNo].mKyTevStr;
@@ -1145,67 +1137,81 @@ public:
        JUT_ASSERT(2679, 0 <= i_roomNo && i_roomNo < 64);
        mStatus[i_roomNo].mFlag = flag;
    }
-    static void onStatusDraw(int i_roomNo) {
-        JUT_ASSERT(2725, 0 <= i_roomNo && i_roomNo < 64);
-        mStatus[i_roomNo].mDraw = true;
+    void onStatusFlag(int i_roomNo, u8 flag) {
+        JUT_ASSERT(2691, 0 <= i_roomNo && i_roomNo < 64);
+        return cLib_onBit(mStatus[i_roomNo].mFlag, flag);
+    }
+    void offStatusFlag(int i_roomNo, u8 flag) {
+        JUT_ASSERT(2695, 0 <= i_roomNo && i_roomNo < 64);
+        return cLib_offBit(mStatus[i_roomNo].mFlag, flag);
+    }
+    u8 checkStatusFlag(int i_roomNo, u8 flag) const {
+        JUT_ASSERT(2699, 0 <= i_roomNo && i_roomNo < 64);
+        return cLib_checkBit((u8) mStatus[i_roomNo].mFlag, flag);
+    }
+    static void setFileList2(int i_roomNo, dStage_FileList2_dt_c* list) {
+        JUT_ASSERT(2711, 0 <= i_roomNo && i_roomNo < 64);
+        mStatus[i_roomNo].mRoomDt.setFileList2Info(list);
    }
    static dStage_FileList2_dt_c* getFileList2(int i_roomNo) {
        JUT_ASSERT(2715, 0 <= i_roomNo && i_roomNo < 64);
        return mStatus[i_roomNo].mRoomDt.getFileList2Info();
    }
-    static char* getDemoArcName() { return mDemoArcName; }
-    static nameData* getArcBankName() { return mArcBankName; }
-    static bankData* getArcBankData() { return mArcBankData; }
-    static void setRoomReadId(s8 id) { mRoomReadId = id; }
-    static s8 getRoomReadId() { return mRoomReadId; }
-    static void offNoChangeRoom() { mNoChangeRoom = false; }
-    static void onNoChangeRoom() { mNoChangeRoom = true; }
-    static int getNextStayNo() { return mNextStayNo; }
-    static void setProcID(u32 id) { mProcID = id; }
-    static u32 getProcID() { return mProcID; }
-    static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; }
-    static int getStatusProcID(int i_roomNo) {
-        JUT_ASSERT(2774, 0 <= i_roomNo && i_roomNo < 64);
-        return mStatus[i_roomNo].mProcID; 
+    static void onStatusDraw(int i_roomNo) {
+        JUT_ASSERT(2725, 0 <= i_roomNo && i_roomNo < 64);
+        mStatus[i_roomNo].mDraw = true;
    }
-    static void setRegionNo(int i_roomNo, u8 i_regionNo) { mStatus[i_roomNo].mRegionNo = i_regionNo; }
-
-    u8 checkStatusFlag(int i_roomNo, u8 flag) const {
-        JUT_ASSERT(2699, 0 <= i_roomNo && i_roomNo < 64);
-        return cLib_checkBit((u8) mStatus[i_roomNo].mFlag, flag);
-    }
-
-    void onStatusFlag(int i_roomNo, u8 flag) {
-        JUT_ASSERT(2691, 0 <= i_roomNo && i_roomNo < 64);
-        return cLib_onBit(mStatus[i_roomNo].mFlag, flag);
-    }
-
-    void offStatusFlag(int i_roomNo, u8 flag) {
-        JUT_ASSERT(2695, 0 <= i_roomNo && i_roomNo < 64);
-        return cLib_offBit(mStatus[i_roomNo].mFlag, flag);
-    }
-
-    static void setFileList2(int i_roomNo, dStage_FileList2_dt_c* list) {
-        JUT_ASSERT(2711, 0 <= i_roomNo && i_roomNo < 64);
-        mStatus[i_roomNo].mRoomDt.setFileList2Info(list);
-    }
-
    static void setZoneCount(int i_roomNo, int count) {
        JUT_ASSERT(2737, 0 <= i_roomNo && i_roomNo < 64);
        mStatus[i_roomNo].mZoneCount = count;
    }
-
+    static void setZoneNo(int i_roomNo, int i_zoneNo) {
+        JUT_ASSERT(2745, 0 <= i_roomNo && i_roomNo < 64);
+        mStatus[i_roomNo].mZoneNo = i_zoneNo;
+    }
+    static int getZoneNo(int i_roomNo) {
+        JUT_ASSERT(2749, 0 <= i_roomNo && i_roomNo < 64);
+        return mStatus[i_roomNo].mZoneNo;
+    }
    static void setMemoryBlockID(int i_roomNo, int i_blockID) {
        JUT_ASSERT(2753, 0 <= i_roomNo && i_roomNo < 64);
        mStatus[i_roomNo].mMemBlockID = i_blockID;
    }
-
+    static int getMemoryBlockID(int i_roomNo) {
+        JUT_ASSERT(2757, 0 <= i_roomNo && i_roomNo < 64);
+        return mStatus[i_roomNo].mMemBlockID;
+    }
+    static void setRegionNo(int i_roomNo, u8 i_regionNo) {
+        JUT_ASSERT(2762, 0 <= i_roomNo && i_roomNo < 64);
+        mStatus[i_roomNo].mRegionNo = i_regionNo;
+    }
+    static u8 getRegionNo(int i_roomNo) {
+        JUT_ASSERT(2766, 0 <= i_roomNo && i_roomNo < 64);
+        return mStatus[i_roomNo].mRegionNo;
+    }
+    static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) {
+        JUT_ASSERT(2770, 0 <= i_roomNo && i_roomNo < 64);
+        mStatus[i_roomNo].mProcID = i_id;
+    }
+    static int getStatusProcID(int i_roomNo) {
+        JUT_ASSERT(2774, 0 <= i_roomNo && i_roomNo < 64);
+        return mStatus[i_roomNo].mProcID;
+    }
    static void setBgW(int i_roomNo, dBgW_Base* i_bgw) {
        JUT_ASSERT(2778, 0 <= i_roomNo && i_roomNo < 64);
        mStatus[i_roomNo].mpBgW = i_bgw;
    }
-
+    static dBgp_c* getBgp(int i_roomNo) {
+#if DEBUG
+        return (dBgp_c*)mBgp[i_roomNo];
+#else
+        return NULL;
+#endif
+    }
    static JKRExpHeap* getMemoryBlockHeap(int i_no) { return mMemoryBlock[i_no]; }
+    static char* getDemoArcName() { return mDemoArcName; }
+    static void offNoChangeRoom() { mNoChangeRoom = false; }
+    static void onNoChangeRoom() { mNoChangeRoom = true; }

    #if DEBUG
    static void setBgp(int, void*);
@@ -1233,6 +1239,7 @@ public:
        mNoArcBank = true;
    } 

+    static void* mBgp[];
    static u8 mNoArcBank;
    #endif

@@ -56,6 +56,7 @@ public:
    class csr_c {
    public:
        virtual ~csr_c() {}
+        virtual void draw(f32, f32) = 0;
        virtual bool isPointer();

        static void particleExecute();
@@ -870,7 +870,7 @@ void dDlst_2D_c::draw() {
 }

 void dDlst_blo_c::draw() {
-    mScreen.draw(anm.field_0x4, anm.field_0x8, dComIfGp_getCurrentGrafPort());
+    mScreen.draw(field_0x120, field_0x124, dComIfGp_getCurrentGrafPort());
 }

 // stand-in for a function that pulls in a bunch of inline functions but was presumably stripped
@@ -1105,12 +1105,12 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
    ShdwDrawPoly_c shdwDrawPoly;
    cXyz local_8c;
    cXyz local_98;
-    f32 tmp1 = param_1 * param_1 * 0.002f;
-    f32 tmp2 = cLib_maxLimit(tmp1, 120.0f);
-    f32 var1 = param_1 + param_2 - tmp2;
-    local_8c.y = param_0->y - var1;
+    f32 f31 = param_1 * param_1 * 0.002f;
+    f31 = cLib_maxLimit(f31, 120.0f);
+    f31 = param_1 + param_2 - f31;
+    local_8c.y = param_0->y - f31;
    local_98.y = param_0->y + param_1 * 0.15f;
-    local_98.x = param_0->x + param_3->x * var1;
+    local_98.x = param_0->x + param_3->x * f31;
    if (local_98.x < param_0->x) {
        local_8c.x = local_98.x;
        local_98.x = param_0->x;
@@ -1119,9 +1119,8 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
    }
    local_8c.x -= param_1;
    local_98.x += param_1;
-    var1 = param_0->z + param_3->z * var1;
-    local_98.z = var1;
-    if (var1 < param_0->z) {
+    local_98.z = param_0->z + param_3->z * f31;
+    if (local_98.z < param_0->z) {
        local_8c.z = local_98.z;
        local_98.z = param_0->z;
    } else {
@@ -88,8 +88,9 @@ void dFile_info_c::screenSet() {
 }

 int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) {
+    int result;
    if (i_validChksum) {
-        char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName();
+        char* player_name = i_savedata->getPlayer().getPlayerInfo().getPlayerName();
        if (*player_name == 0) {
            if (field_0x22 == 1 && i_dataNo == dComIfGs_getDataNum()) {
                i_savedata->getPlayer().getPlayerStatusA().setLife(dComIfGs_getLife());
@@ -99,22 +100,23 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d
                strcpy(mSaveDate, "");
                strcpy(mPlayTime, "");
                dMeter2Info_getString(0x4D, mSaveStatus, NULL);  // New Quest Log
-                return 2;
+                result = 2;
            } else {
                dMeter2Info_getString(0x4D, mSaveStatus, NULL);  // New Quest Log
-                return 1;
+                result = 1;
            }
        } else {
            setHeartCnt(i_savedata);
            strcpy(mPlayerName, player_name);
            setSaveDate(i_savedata);
            setPlayTime(i_savedata);
-            return 0;
+            result = 0;
        }
    } else {
        dMeter2Info_getString(0x51, mSaveStatus, NULL);  // This Quest Log is Corrupted
-        return -1;
+        result = -1;
    }
+    return result;
 }

 void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {
@@ -1071,15 +1071,15 @@ void item_func_CHUCHU_BLACK() {
 void item_func_LIGHT_DROP() {}

 void item_func_DROP_CONTAINER() {
-    dComIfGs_onLightDropFlag(FARON_VESSEL);
+    dComIfGs_onLightDropGetFlag(FARON_VESSEL);
 }

 void item_func_DROP_CONTAINER02() {
-    dComIfGs_onLightDropFlag(ELDIN_VESSEL);
+    dComIfGs_onLightDropGetFlag(ELDIN_VESSEL);
 }

 void item_func_DROP_CONTAINER03() {
-    dComIfGs_onLightDropFlag(LANAYRU_VESSEL);
+    dComIfGs_onLightDropGetFlag(LANAYRU_VESSEL);
 }

 void item_func_FILLED_CONTAINER() {}
@@ -784,7 +784,7 @@ void dMenu_ItemExplain_c::setNumber() {
    }
 }

-bool dMenu_ItemExplain_c::getWarpMarkFlag() {
+u8 dMenu_ItemExplain_c::getWarpMarkFlag() {
    if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) {
        return dComIfGs_getWarpMarkFlag();
    }
@@ -406,10 +406,6 @@ static int phase_2(room_of_scene_class* i_this) {
    return cPhs_NEXT_e;
 }

-void dStage_roomControl_c::setZoneNo(int i_roomNo, int i_zoneNo) {
-    mStatus[i_roomNo].mZoneNo = i_zoneNo;
-}
-
 static int phase_3(room_of_scene_class* i_this) {
    if (objectSetCheck(i_this)) {
        return cPhs_NEXT_e;
@@ -1793,7 +1793,8 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
    i_cardPtr = i_cardPtr + i_dataNum * QUEST_LOG_SIZE;
    char* var_r30 = i_cardPtr;

-    memcpy(dComIfGs_getSaveData(), i_cardPtr, sizeof(dSv_save_c));
+    dSv_save_c* pSave = dComIfGs_getSaveData();
+    memcpy(pSave, i_cardPtr, sizeof(dSv_save_c));
    i_cardPtr += sizeof(dSv_save_c);

 #if PLATFORM_GCN
@@ -1846,7 +1847,8 @@ int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) {
    save.init();
    save.getPlayer().getPlayerInfo().setPlayerName("");
    save.getPlayer().getPlayerInfo().setHorseName("");
-    memcpy(i_cardPtr, &save, sizeof(dSv_save_c));
+    dSv_save_c* pSave = &save;
+    memcpy(i_cardPtr, pSave, sizeof(dSv_save_c));
    i_cardPtr += sizeof(dSv_save_c);

    if (i_cardPtr - var_r30 > (QUEST_LOG_SIZE - 8)) {