d_meter2 mostly complete (#310)

* d_meter2 mostly complete * remove asm
2026-09-06 10:55:34 -04:00 · 2023-03-18 15:25:47 -07:00
parent 808032a02b
commit 721880831e
51 changed files with 3013 additions and 6424 deletions
@@ -169,14 +169,31 @@ public:
    u8 getCStickStatusForce() { return mCStickStatusForce; }
    u8 getCStickSetFlagForce() { return mCStickSetFlagForce; }
    u8 getCStickDirectionForce() { return mCStickDirectionForce; }
+    u8 getDoStatusForce() { return mDoStatusForce; }
+    u8 getDoSetFlagForce() { return mDoSetFlagForce; }
+    u8 getAStatusForce() { return mAStatusForce; }
+    u8 getASetFlagForce() { return mASetFlagForce; }
+    u8 getRStatusForce() { return mRStatusForce; }
+    u8 getRSetFlagForce() { return mRSetFlagForce; }
+    u8 getZStatusForce() { return mZStatusForce; }
+    u8 getZSetFlagForce() { return mZSetFlagForce; }
+    u8 getBottleStatusForce() { return mBottleStatusForce; }
+    u8 getBottleSetFlagForce() { return mBottleSetFlagForce; }
+    u8 get3DStatusForce() { return m3DStatusForce; }
+    u8 get3DSetFlagForce() { return m3DSetFlagForce; }
+    u8 get3DDirectionForce() { return m3DDirectionForce; }
+    u8 getXStatusForce() { return mXStatusForce; }
+    u8 getXSetFlagForce() { return mXSetFlagForce; }
+    u8 getYStatusForce() { return mYStatusForce; }
+    u8 getYSetFlagForce() { return mYSetFlagForce; }
    u8 getFaceAnimeID() { return mFaceAnimeID; }
    u8 getBaseAnimeID() { return mBaseAnimeID; }
    bool isCStickSetFlag(u8 flag) { return mCStickSetFlag & flag; }
-    bool isDoSetFlag(u8 flag) { return flag & mDoSetFlag; }
-    bool isASetFlag(u8 flag) { return flag & mASetFlag; }
-    bool isRSetFlag(u8 flag) { return flag & mRSetFlag; }
-    bool isXSetFlag(u8 flag) { return flag & mXSetFlag; }
-    bool isYSetFlag(u8 flag) { return flag & mYSetFlag; }
+    bool isDoSetFlag(u8 flag) { return (mDoSetFlag & flag) ? true : false; }
+    bool isASetFlag(u8 flag) { return (mASetFlag & flag) ? true : false; }
+    bool isRSetFlag(u8 flag) { return (mRSetFlag & flag) ? true : false; }
+    bool isXSetFlag(u8 flag) { return (mXSetFlag & flag) ? true : false; }
+    bool isYSetFlag(u8 flag) { return (mYSetFlag & flag) ? true : false; }

    void setZStatus(u8 status, u8 flag) {
        mZStatus = status;
@@ -203,16 +220,31 @@ public:
        mXSetFlag = flag;
    }

+    void setXStatusForce(u8 status, u8 flag) {
+        mXStatusForce = status;
+        mXSetFlagForce = flag;
+    }
+
    void setYStatus(u8 status, u8 flag) {
        mYStatus = status;
        mYSetFlag = flag;
    }

+    void setYStatusForce(u8 status, u8 flag) {
+        mYStatusForce = status;
+        mYSetFlagForce = flag;
+    }
+
    void setBottleStatus(u8 status, u8 flag) {
        mBottleStatus = status;
        mBottleSetFlag = flag;
    }

+    void setBottleStatusForce(u8 status, u8 flag) {
+        mBottleStatusForce = status;
+        mBottleSetFlagForce = flag;
+    }
+
    void setNunStatus(u8 status, u8 param_1, u8 flag) {
        mNunStatus = status;
        field_0x4ef0 = param_1;
@@ -263,6 +295,12 @@ public:
        m3DSetFlag = flag;
    }

+    void set3DStatusForce(u8 status, u8 direction, u8 flag) {
+        m3DStatusForce = status;
+        m3DDirectionForce = direction;
+        m3DSetFlagForce = flag;
+    }
+
    void setDoStatusForce(u8 status, u8 flag) {
        mDoStatusForce = status;
        mDoSetFlagForce = flag;
@@ -278,6 +316,11 @@ public:
        mRSetFlagForce = flag;
    }

+    void setZStatusForce(u8 status, u8 flag) {
+        mZStatusForce = status;
+        mZSetFlagForce = flag;
+    }
+
    void setItemRupeeCount(s32 rupees) { mItemRupeeCount += rupees; }
    void setItemMagicCount(s16 magic) { mItemMagicCount += magic; }
    void setItemMaxMagicCount(s16 max) { mItemMaxMagicCount += max; }
@@ -290,6 +333,7 @@ public:
    void setOxygenCount(s32 oxygen) { mOxygenCount += oxygen; }
    int getOxygen() { return mOxygen; }
    void setMaxOxygen(int max) { mMaxOxygen = max; }
+    void setOxygen(s32 i_oxygen) { mOxygen = i_oxygen; }
    int getMaxOxygen() { return mMaxOxygen; }
    int getNowOxygen() { return mNowOxygen; }
    void setItemNowLife(u16 life) { mItemNowLife = life; }
@@ -299,9 +343,23 @@ public:
    s16 getItemMaxLifeCount() { return mItemMaxLifeCount; }
    f32 getItemLifeCount() { return mItemLifeCount; }
    s16 getItemMaxArrowNumCount() { return mItemMaxArrowNumCount; }
+    s16 getItemArrowNumCount() { return mItemArrowNumCount; }
+    s32 getItemMaxOilCount() { return mItemMaxOilCount; }
+    s32 getItemOilCount() { return mItemOilCount; }
+    s32 getMaxOxygenCount() { return mMaxOxygenCount; }
+    s32 getOxygenCount() { return mOxygenCount; }
+    s32 getItemRupeeCount() { return mItemRupeeCount; }
+    s16 getItemKeyNumCount() { return mItemKeyNumCount; }
    void clearNowAnimeID() { mNowAnimeID = -1; }
    void clearMesgCamInfoID() { mMesgCamInfo = -1; }
    void clearItemMaxLifeCount() { mItemMaxLifeCount = 0; }
+    void clearItemMaxOilCount() { mItemMaxOilCount = 0; }
+    void clearItemOilCount() { mItemOilCount = 0; }
+    void clearMaxOxygenCount() { mMaxOxygenCount = 0; }
+    void clearOxygenCount() { mOxygenCount = 0; }
+    void clearItemRupeeCount() { mItemRupeeCount = 0; }
+    void clearItemKeyNumCount() { mItemKeyNumCount = 0; }
+    void clearItemArrowNumCount() { mItemArrowNumCount = 0; }
    void clearItemLifeCount() {
        mItemLifeCount = 0.0f;
        mItemLifeCountType = 0;
@@ -399,6 +457,7 @@ public:
    BOOL checkCameraAttentionStatus(int i, u32 flag) {
        return mCameraInfo[i].mCameraAttentionStatus & flag;
    }
+    u32 getCameraAttentionStatus(int i) { return mCameraInfo[i].mCameraAttentionStatus; }
    void setCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus = flag; }
    void onCameraAttentionStatus(int i, u32 flag) { mCameraInfo[i].mCameraAttentionStatus |= flag; }
    void offCameraAttentionStatus(int i, u32 flag) {
@@ -430,6 +489,7 @@ public:
    void setOxygenShowFlag(u8 flag) { mOxygenShowFlag = flag; }
    void show2dOn() { mShow2D = 1; }
    void show2dOff() { mShow2D = 0; }
+    u8 show2dCheck() { return mShow2D; }
    s8 getLayerOld() { return mLayerOld; }
    void setMesgCancelButton(u8 button) { mMesgCancelButton = button; }
    void setMesgBgm(u8 param_0) { mMesgBgm = param_0; }
@@ -860,6 +920,7 @@ u16 dComIfGs_getRupee();
 static u16 dComIfGs_getLife();
 s8 dComIfGs_BossLife_public_Get();
 u8 dComIfGs_checkGetInsectNum();
+u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx);

 inline void dComIfGs_init() {
    g_dComIfG_gameInfo.info.init();
@@ -1600,6 +1661,10 @@ inline void dComIfGs_addDeathCount() {
    g_dComIfG_gameInfo.info.getPlayer().getPlayerInfo().addDeathCount();
 }

+inline u8 dComIfGs_getWalletSize() {
+    return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getWalletSize();
+}
+
 void dComIfGp_setSelectItem(int index);
 s32 dComIfGp_offHeapLockFlag(int flag);
 void dComIfGp_createSubExpHeap2D();
@@ -1926,18 +1991,34 @@ inline void dComIfGp_setZStatus(u8 status, u8 flag) {
    g_dComIfG_gameInfo.play.setZStatus(status, flag);
 }

+inline void dComIfGp_setZStatusForce(u8 status, u8 flag) {
+    g_dComIfG_gameInfo.play.setZStatusForce(status, flag);
+}
+
 inline void dComIfGp_set3DStatus(u8 status, u8 direction, u8 flag) {
    g_dComIfG_gameInfo.play.set3DStatus(status, direction, flag);
 }

+inline void dComIfGp_set3DStatusForce(u8 status, u8 direction, u8 flag) {
+    g_dComIfG_gameInfo.play.set3DStatusForce(status, direction, flag);
+}
+
 inline void dComIfGp_setXStatus(u8 status, u8 flag) {
    g_dComIfG_gameInfo.play.setXStatus(status, flag);
 }

+inline void dComIfGp_setXStatusForce(u8 status, u8 flag) {
+    g_dComIfG_gameInfo.play.setXStatusForce(status, flag);
+}
+
 inline void dComIfGp_setYStatus(u8 status, u8 flag) {
    g_dComIfG_gameInfo.play.setYStatus(status, flag);
 }

+inline void dComIfGp_setYStatusForce(u8 status, u8 flag) {
+    g_dComIfG_gameInfo.play.setYStatusForce(status, flag);
+}
+
 inline void dComIfGp_setNunStatus(u8 status, u8 param_1, u8 flag) {
    g_dComIfG_gameInfo.play.setNunStatus(status, param_1, flag);
 }
@@ -2050,6 +2131,74 @@ inline u8 dComIfGp_getSButtonSetFlagForce() {
    return g_dComIfG_gameInfo.play.getSButtonSetFlagForce();
 }

+inline u8 dComIfGp_getDoStatusForce() {
+    return g_dComIfG_gameInfo.play.getDoStatusForce();
+}
+
+inline u8 dComIfGp_getDoSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getDoSetFlagForce();
+}
+
+inline u8 dComIfGp_getAStatusForce() {
+    return g_dComIfG_gameInfo.play.getAStatusForce();
+}
+
+inline u8 dComIfGp_getASetFlagForce() {
+    return g_dComIfG_gameInfo.play.getASetFlagForce();
+}
+
+inline u8 dComIfGp_getRStatusForce() {
+    return g_dComIfG_gameInfo.play.getRStatusForce();
+}
+
+inline u8 dComIfGp_getRSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getRSetFlagForce();
+}
+
+inline u8 dComIfGp_getZStatusForce() {
+    return g_dComIfG_gameInfo.play.getZStatusForce();
+}
+
+inline u8 dComIfGp_getZSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getZSetFlagForce();
+}
+
+inline u8 dComIfGp_getBottleStatusForce() {
+    return g_dComIfG_gameInfo.play.getBottleStatusForce();
+}
+
+inline u8 dComIfGp_getBottleSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getBottleSetFlagForce();
+}
+
+inline u8 dComIfGp_getXStatusForce() {
+    return g_dComIfG_gameInfo.play.getXStatusForce();
+}
+
+inline u8 dComIfGp_getXSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getXSetFlagForce();
+}
+
+inline u8 dComIfGp_getYStatusForce() {
+    return g_dComIfG_gameInfo.play.getYStatusForce();
+}
+
+inline u8 dComIfGp_getYSetFlagForce() {
+    return g_dComIfG_gameInfo.play.getYSetFlagForce();
+}
+
+inline u8 dComIfGp_get3DStatusForce() {
+    return g_dComIfG_gameInfo.play.get3DStatusForce();
+}
+
+inline u8 dComIfGp_get3DDirectionForce() {
+    return g_dComIfG_gameInfo.play.get3DDirectionForce();
+}
+
+inline u8 dComIfGp_get3DSetFlagForce() {
+    return g_dComIfG_gameInfo.play.get3DSetFlagForce();
+}
+
 inline void dComIfGp_setItemMagicCount(s16 count) {
    g_dComIfG_gameInfo.play.setItemMagicCount(count);
 }
@@ -2203,6 +2352,10 @@ inline f32 dComIfGp_getCameraZoomForcus(int i_no) {
    return g_dComIfG_gameInfo.play.getCameraZoomForcus(i_no);
 }

+inline u32 dComIfGp_getCameraAttentionStatus(int i_no) {
+    return g_dComIfG_gameInfo.play.getCameraAttentionStatus(i_no);
+}
+
 inline void dComIfGp_clearPlayerStatus0(int param_0, u32 flag) {
    g_dComIfG_gameInfo.play.clearPlayerStatus(param_0, 0, flag);
 }
@@ -2235,6 +2388,10 @@ inline void dComIfGp_setOxygenCount(s32 oxygen) {
    g_dComIfG_gameInfo.play.setOxygenCount(oxygen);
 }

+inline void dComIfGp_setMaxOxygen(s32 i_oxygen) {
+    g_dComIfG_gameInfo.play.setMaxOxygen(i_oxygen);
+}
+
 inline s32 dComIfGp_getMaxOxygen() {
    return g_dComIfG_gameInfo.play.getMaxOxygen();
 }
@@ -2331,6 +2488,10 @@ inline void dComIfGp_2dShowOff() {
    g_dComIfG_gameInfo.play.show2dOff();
 }

+inline u8 dComIfGp_2dShowCheck() {
+    return g_dComIfG_gameInfo.play.show2dCheck();
+}
+
 inline s16 dComIfGp_getItemMaxLifeCount() {
    return g_dComIfG_gameInfo.play.getItemMaxLifeCount();
 }
@@ -2343,14 +2504,78 @@ inline s16 dComIfGp_getItemMaxArrowNumCount() {
    return g_dComIfG_gameInfo.play.getItemMaxArrowNumCount();
 }

-inline void dComIfGp_clearItemMaxLifeCount() {
-    g_dComIfG_gameInfo.play.clearItemMaxLifeCount();
+inline s16 dComIfGp_getItemArrowNumCount() {
+    return g_dComIfG_gameInfo.play.getItemArrowNumCount();
+}
+
+inline s16 dComIfGp_getItemBombNumCount(u8 i_no) {
+    return g_dComIfG_gameInfo.play.getItemBombNumCount(i_no);
+}
+
+inline s32 dComIfGp_getItemMaxOilCount() {
+    return g_dComIfG_gameInfo.play.getItemMaxOilCount();
+}
+
+inline s32 dComIfGp_getItemOilCount() {
+    return g_dComIfG_gameInfo.play.getItemOilCount();
+}
+
+inline s32 dComIfGp_getMaxOxygenCount() {
+    return g_dComIfG_gameInfo.play.getMaxOxygenCount();
+}
+
+inline s32 dComIfGp_getOxygenCount() {
+    return g_dComIfG_gameInfo.play.getOxygenCount();
+}
+
+inline s32 dComIfGp_getItemRupeeCount() {
+    return g_dComIfG_gameInfo.play.getItemRupeeCount();
+}
+
+inline void dComIfGp_clearItemRupeeCount() {
+    g_dComIfG_gameInfo.play.clearItemRupeeCount();
+}
+
+inline s16 dComIfGp_getItemKeyNumCount() {
+    return g_dComIfG_gameInfo.play.getItemKeyNumCount();
+}
+
+inline void dComIfGp_clearItemMaxOilCount() {
+    g_dComIfG_gameInfo.play.clearItemMaxOilCount();
+}
+
+inline void dComIfGp_clearItemBombNumCount(u8 i_no) {
+    g_dComIfG_gameInfo.play.clearItemBombNumCount(i_no);
+}
+
+inline void dComIfGp_clearItemOilCount() {
+    g_dComIfG_gameInfo.play.clearItemOilCount();
+}
+
+inline void dComIfGp_clearMaxOxygenCount() {
+    g_dComIfG_gameInfo.play.clearMaxOxygenCount();
+}
+
+inline void dComIfGp_clearOxygenCount() {
+    g_dComIfG_gameInfo.play.clearOxygenCount();
+}
+
+inline void dComIfGp_clearItemKeyNumCount() {
+    g_dComIfG_gameInfo.play.clearItemKeyNumCount();
+}
+
+inline void dComIfGp_clearItemArrowNumCount() {
+    g_dComIfG_gameInfo.play.clearItemArrowNumCount();
 }

 inline void dComIfGp_clearItemLifeCount() {
    g_dComIfG_gameInfo.play.clearItemLifeCount();
 }

+inline void dComIfGp_clearItemMaxLifeCount() {
+    g_dComIfG_gameInfo.play.clearItemMaxLifeCount();
+}
+
 inline u8 dComIfGp_getItemLifeCountType() {
    return g_dComIfG_gameInfo.play.getItemLifeCountType();
 }
@@ -2523,6 +2748,10 @@ inline void i_dComIfGp_setBottleStatus(u8 param_0, u8 param_1) {
    g_dComIfG_gameInfo.play.setBottleStatus(param_0, param_1);
 }

+inline void dComIfGp_setBottleStatusForce(u8 param_0, u8 param_1) {
+    g_dComIfG_gameInfo.play.setBottleStatusForce(param_0, param_1);
+}
+
 inline u8 i_dComIfGp_getDoStatus() {
    return g_dComIfG_gameInfo.play.getDoStatus();
 }