mirror of
https://github.com/zeldaret/tp
synced 2026-08-08 18:43:50 -04:00
d_meter2 mostly complete (#310)
* d_meter2 mostly complete * remove asm
This commit is contained in:
TakaRikka
@@ -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();
|
||||
}
|
||||
|
||||
+49
-1
@@ -1,6 +1,54 @@
|
||||
#ifndef D_D_SCOPE_H
|
||||
#define D_D_SCOPE_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
#include "d/pane/d_pane_class.h"
|
||||
#include "d/meter/d_meter2.h"
|
||||
|
||||
class dScope_c : public dMeterSub_c {
|
||||
public:
|
||||
enum {
|
||||
/* 0 */ PROC_OPEN,
|
||||
/* 1 */ PROC_MOVE,
|
||||
/* 2 */ PROC_CLOSE,
|
||||
};
|
||||
|
||||
/* 80193690 */ dScope_c(u8);
|
||||
/* 80193FB4 */ void open_init();
|
||||
/* 80193FD0 */ void open_proc();
|
||||
/* 80194048 */ void move_init();
|
||||
/* 8019404C */ void move_proc();
|
||||
/* 80194050 */ void close_init();
|
||||
/* 80194054 */ void close_proc();
|
||||
|
||||
/* 80193C68 */ virtual void draw();
|
||||
/* 8019396C */ virtual ~dScope_c();
|
||||
/* 80193B90 */ virtual int _execute(u32);
|
||||
/* 80193FA0 */ virtual bool isDead();
|
||||
|
||||
/* 0x04 */ J2DScreen* mHawkEyeScrn;
|
||||
/* 0x08 */ J2DScreen* mZoomInOutScrn;
|
||||
/* 0x0C */ CPaneMgr* mHawkEyeRootPane;
|
||||
/* 0x10 */ CPaneMgr* mZoomInOutRootPane;
|
||||
/* 0x14 */ CPaneMgr* mHawkEyePanes[3];
|
||||
/* 0x20 */ CPaneMgr* mZoomInOutPanes[3][2];
|
||||
/* 0x38 */ J2DPicture* mpWipeTex;
|
||||
/* 0x3C */ J2DPicture* mpBlackTex;
|
||||
/* 0x40 */ u8 field_0x40[0x48 - 0x40];
|
||||
/* 0x48 */ JUtility::TColor field_0x48[2];
|
||||
/* 0x50 */ JUtility::TColor field_0x50[2];
|
||||
/* 0x58 */ u32 field_0x58;
|
||||
/* 0x5C */ u32 field_0x5c;
|
||||
/* 0x60 */ u8 field_0x60[0x78 - 0x60];
|
||||
/* 0x78 */ f32 mWidth;
|
||||
/* 0x7C */ f32 mHeight;
|
||||
/* 0x80 */ f32 mScale;
|
||||
/* 0x84 */ f32 mAlpha;
|
||||
/* 0x88 */ s16 mOpenTimer;
|
||||
/* 0x8A */ s16 field_0x8a;
|
||||
/* 0x8C */ u8 mProcess;
|
||||
/* 0x8D */ u8 field_0x8d;
|
||||
/* 0x8E */ u8 mIsDead;
|
||||
/* 0x8F */ u8 field_0x8f;
|
||||
};
|
||||
|
||||
#endif /* D_D_SCOPE_H */
|
||||
|
||||
@@ -1031,6 +1031,10 @@ inline int dStage_stagInfo_GetRangeDown(stage_stag_info_class* pstag) {
|
||||
return pstag->mRangeDown;
|
||||
}
|
||||
|
||||
inline u32 dStage_stagInfo_ChkKeyDisp(stage_stag_info_class* pstag) {
|
||||
return pstag->field_0x09 & 1;
|
||||
}
|
||||
|
||||
inline u32 dStage_sclsInfo_getSceneLayer(stage_scls_info_class* p_info) {
|
||||
return p_info->field_0xb & 0xF;
|
||||
}
|
||||
|
||||
+135
-23
@@ -25,7 +25,7 @@ public:
|
||||
/* 8019411C */ virtual int _create();
|
||||
/* 80194130 */ virtual int _execute(u32);
|
||||
/* 80194124 */ virtual int _delete();
|
||||
/* 80194138 */ virtual int isDead();
|
||||
/* 80194138 */ virtual bool isDead();
|
||||
};
|
||||
|
||||
class dMeterButton_c : public dDlst_base_c {
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
/* 802092C0 */ void setAlphaButtonOAnimeMax(int);
|
||||
/* 80209368 */ void setAlphaIconAnimeMin();
|
||||
/* 802093D8 */ void setAlphaIconAnimeMax();
|
||||
/* 80209474 */ void isClose();
|
||||
/* 80209474 */ bool isClose();
|
||||
/* 802095C0 */ void setString(char*, u8, u8, u8);
|
||||
/* 80209CEC */ void hideAll();
|
||||
/* 80209D7C */ void getCenterPosCalc(u8, char*, int);
|
||||
@@ -125,7 +125,11 @@ public:
|
||||
/* 80202240 */ virtual void draw();
|
||||
/* 80201370 */ virtual ~dMeterButton_c();
|
||||
|
||||
/* 0x004 */ u8 field_0x4[0x630 - 0x4];
|
||||
bool isSetButton(u8 i_no) { return field_0x484[i_no] <= 0; }
|
||||
|
||||
/* 0x004 */ u8 field_0x4[0x484 - 0x4];
|
||||
/* 0x48C */ s16 field_0x484[21];
|
||||
/* 0x4AE */ u8 field_0x4ae[0x630 - 0x4ae];
|
||||
};
|
||||
|
||||
class dMeterString_c : public dMeterSub_c {
|
||||
@@ -141,6 +145,8 @@ public:
|
||||
/* 8020EE70 */ virtual int _create();
|
||||
/* 8020F150 */ virtual int _execute(u32);
|
||||
/* 8020F49C */ virtual int _delete();
|
||||
|
||||
/* 0x04 */ u8 field_0x4[0x40 - 0x4];
|
||||
};
|
||||
|
||||
class dMeterHaihai_c : public dMeterSub_c {
|
||||
@@ -164,6 +170,8 @@ public:
|
||||
/* 8020AF6C */ virtual int _create();
|
||||
/* 8020B0F4 */ virtual int _execute(u32);
|
||||
/* 8020BDAC */ virtual int _delete();
|
||||
|
||||
u8 field_0x4[0x2c - 0x4];
|
||||
};
|
||||
|
||||
class dMeter2_c : public msg_class {
|
||||
@@ -221,38 +229,40 @@ public:
|
||||
/* 802254C0 */ void alphaAnimeButtonCross();
|
||||
/* 802256DC */ bool isShowLightDrop();
|
||||
/* 802258A0 */ void killSubContents(u8);
|
||||
/* 80225960 */ void isKeyVisible();
|
||||
/* 80225960 */ BOOL isKeyVisible();
|
||||
/* 802259F8 */ int isArrowEquip();
|
||||
/* 80225A64 */ int isPachinkoEquip();
|
||||
|
||||
void setNowLifeGauge(s16 life) { mNowLifeGauge = life; }
|
||||
void onArrowSoundBit(int bit) { mArrowSound |= (1 << bit); }
|
||||
void offArrowSoundBit(int bit) { mArrowSound &= ~(1 << bit); }
|
||||
bool isArrowSoundBit(int bit) { return mArrowSound & (1 << bit); }
|
||||
bool isArrowSoundBit(int bit) { return mArrowSound & (1 << bit) ? true : false; }
|
||||
void onRupeeSoundBit(int bit) { mRupeeSound |= (1 << bit); }
|
||||
void offRupeeSoundBit(int bit) { mRupeeSound &= ~(1 << bit); }
|
||||
bool isRupeeSoundBit(int bit) { return mRupeeSound & (1 << bit); }
|
||||
s16 getNowLifeGauge() { return mNowLifeGauge; }
|
||||
u8 getSubContents() { return mSubContents; }
|
||||
u8 getSubContents() { return mSubContentType; }
|
||||
u16 getSubContentsStringType() { return mSubContentsStringType; }
|
||||
bool isShowFlag(int i_no) { return field_0x1e6 & (1 << i_no); }
|
||||
void onShowFlag(int i_no) { field_0x1e6 |= (1 << i_no); }
|
||||
|
||||
private:
|
||||
/* 0x0FC */ int field_0xfc;
|
||||
/* 0x100 */ JKRExpHeap* mpHeap;
|
||||
/* 0x104 */ JKRExpHeap* mpSubHeap;
|
||||
/* 0x108 */ void* field_0x108;
|
||||
/* 0x108 */ JKRHeap* field_0x108;
|
||||
/* 0x10C */ dMeter2Draw_c* mpMeterDraw;
|
||||
/* 0x110 */ dMeterSub_c* mpMeterSub;
|
||||
/* 0x114 */ dMeterString_c* mpMeterString;
|
||||
/* 0x118 */ dMeterButton_c* mpMeterButton;
|
||||
/* 0x110 */ dMeterSub_c* mpSubContents;
|
||||
/* 0x114 */ dMeterString_c* mpSubSubContents;
|
||||
/* 0x118 */ dMeterButton_c* mpEmpButton;
|
||||
/* 0x11C */ dMeterHaihai_c* field_0x11c; // type is a guess for now
|
||||
/* 0x120 */ dMeterMap_c* mpMap;
|
||||
/* 0x124 */ u32 field_0x124;
|
||||
/* 0x124 */ u32 mStatus;
|
||||
/* 0x128 */ u32 field_0x128;
|
||||
/* 0x12C */ int field_0x12c;
|
||||
/* 0x130 */ f32 field_0x130;
|
||||
/* 0x134 */ f32 field_0x134[2];
|
||||
/* 0x13C */ f32 field_0x13c[2];
|
||||
/* 0x134 */ f32 mAButtonTalkPosX[2];
|
||||
/* 0x13C */ f32 mAButtonTalkPosY[2];
|
||||
/* 0x144 */ f32 field_0x144;
|
||||
/* 0x148 */ f32 field_0x148[2];
|
||||
/* 0x150 */ f32 field_0x150[2];
|
||||
@@ -275,9 +285,9 @@ private:
|
||||
/* 0x1A4 */ int mNowOxygen;
|
||||
/* 0x1A8 */ int mMaxOxygen;
|
||||
/* 0x1AC */ int field_0x1ac;
|
||||
/* 0x1B0 */ u16 mRupeeNum;
|
||||
/* 0x1B2 */ u16 mKeyNum;
|
||||
/* 0x1B4 */ u16 field_0x1b4;
|
||||
/* 0x1B0 */ s16 mRupeeNum;
|
||||
/* 0x1B2 */ s16 mKeyNum;
|
||||
/* 0x1B4 */ s16 field_0x1b4;
|
||||
/* 0x1B6 */ u16 mSubContentsStringType;
|
||||
/* 0x1B8 */ u16 field_0x1b8[5];
|
||||
/* 0x1C2 */ u8 mLightDropNum;
|
||||
@@ -310,7 +320,7 @@ private:
|
||||
/* 0x1E2 */ u8 mEquipSword;
|
||||
/* 0x1E3 */ u8 field_0x1e3;
|
||||
/* 0x1E4 */ u8 field_0x1e4;
|
||||
/* 0x1E5 */ u8 mSubContents;
|
||||
/* 0x1E5 */ u8 mSubContentType;
|
||||
/* 0x1E6 */ u8 field_0x1e6;
|
||||
/* 0x1E7 */ u8 field_0x1e7;
|
||||
/* 0x1E8 */ u8 field_0x1e8;
|
||||
@@ -319,7 +329,7 @@ private:
|
||||
/* 0x1EB */ u8 mArrowSound;
|
||||
/* 0x1EC */ u8 field_0x1ec;
|
||||
/* 0x1ED */ u8 field_0x1ed;
|
||||
/* 0x1EE */ u8 field_0x1ee;
|
||||
/* 0x1EE */ u8 mLifeCountType;
|
||||
/* 0x1EF */ u8 mBottleNum[4];
|
||||
/* 0x1F3 */ u8 mBombNum[3];
|
||||
/* 0x1F6 */ u8 mBombMax[3];
|
||||
@@ -329,11 +339,113 @@ private:
|
||||
/* 0x1FF */ u8 field_0x1ff;
|
||||
/* 0x200 */ u8 field_0x200;
|
||||
/* 0x201 */ u8 field_0x201;
|
||||
/* 0x204 */ f32 field_0x204;
|
||||
/* 0x208 */ f32 field_0x208;
|
||||
/* 0x20C */ f32 field_0x20c;
|
||||
/* 0x210 */ f32 field_0x210;
|
||||
/* 0x214 */ f32 field_0x214;
|
||||
/* 0x204 */ f32 mLifeGaugePosX;
|
||||
/* 0x208 */ f32 mLifeGaugePosY;
|
||||
/* 0x20C */ f32 mLifeGaugeScale;
|
||||
/* 0x210 */ f32 mHeartScale;
|
||||
/* 0x214 */ f32 mLargeHeartScale;
|
||||
/* 0x218 */ u8 field_0x218[0x22C - 0x218];
|
||||
/* 0x22C */ f32 mLanternMeterScale;
|
||||
/* 0x230 */ f32 mLanternMeterPosX;
|
||||
/* 0x234 */ f32 mLanternMeterPosY;
|
||||
/* 0x238 */ f32 mOxygenMeterScale;
|
||||
/* 0x23C */ f32 mOxygenMeterPosX;
|
||||
/* 0x240 */ f32 mOxygenMeterPosY;
|
||||
/* 0x244 */ u8 field_0x244[0x246 - 0x244];
|
||||
/* 0x246 */ s16 field_0x246;
|
||||
/* 0x248 */ s16 field_0x248;
|
||||
/* 0x24A */ u8 field_0x24a[0x268 - 0x24a];
|
||||
/* 0x268 */ f32 mRupeeKeyScale;
|
||||
/* 0x26C */ f32 mRupeeKeyPosX;
|
||||
/* 0x270 */ f32 mRupeeKeyPosY;
|
||||
/* 0x274 */ f32 mRupeeScale;
|
||||
/* 0x278 */ f32 mRupeePosX;
|
||||
/* 0x27C */ f32 mRupeePosY;
|
||||
/* 0x280 */ f32 mRupeeFramePosY;
|
||||
/* 0x284 */ f32 mRupeeFrameScale;
|
||||
/* 0x288 */ f32 mRupeeFramePosX;
|
||||
/* 0x28C */ f32 mRupeeCountScale;
|
||||
/* 0x290 */ f32 mRupeeCountPosX;
|
||||
/* 0x294 */ f32 mRupeeCountPosY;
|
||||
/* 0x298 */ u8 mWalletSize;
|
||||
/* 0x29C */ f32 mKeyScale;
|
||||
/* 0x2A0 */ f32 mKeyPosX;
|
||||
/* 0x2A4 */ f32 mKeyPosY;
|
||||
/* 0x2A8 */ f32 mKeyNumScale;
|
||||
/* 0x2AC */ f32 mKeyNumPosX;
|
||||
/* 0x2B0 */ f32 mKeyNumPosY;
|
||||
/* 0x2B4 */ f32 mAButtonScale;
|
||||
/* 0x2B8 */ f32 mAButtonPosX;
|
||||
/* 0x2BC */ f32 mAButtonPosY;
|
||||
/* 0x2C0 */ f32 mAButtonFontScale;
|
||||
/* 0x2C4 */ f32 mAButtonFontPosX;
|
||||
/* 0x2C8 */ f32 mAButtonFontPosY;
|
||||
/* 0x2CC */ f32 field_0x2cc;
|
||||
/* 0x2D0 */ f32 mBButtonPosX;
|
||||
/* 0x2D4 */ f32 mBButtonPosY;
|
||||
/* 0x2D8 */ u8 field_0x2d8[0x2e4 - 0x2d8];
|
||||
/* 0x2E4 */ f32 mAButtonTalkScale[2];
|
||||
/* 0x2EC */ f32 field_0x2ec[2];
|
||||
/* 0x2F4 */ f32 mBItemBaseScale[2];
|
||||
/* 0x2FC */ f32 mBItemBasePosX[2];
|
||||
/* 0x304 */ f32 mBItemBasePosY[2];
|
||||
/* 0x30C */ f32 mBButtonFontScale;
|
||||
/* 0x310 */ f32 mBButtonFontPosX;
|
||||
/* 0x314 */ f32 mBButtonFontPosY;
|
||||
/* 0x318 */ u8 field_0x318[0x324 - 0x318];
|
||||
/* 0x324 */ f32 field_0x324;
|
||||
/* 0x328 */ f32 field_0x328;
|
||||
/* 0x32C */ f32 field_0x32c;
|
||||
/* 0x330 */ f32 field_0x330;
|
||||
/* 0x334 */ f32 field_0x334;
|
||||
/* 0x338 */ f32 field_0x338;
|
||||
/* 0x33C */ f32 field_0x33c;
|
||||
/* 0x340 */ f32 field_0x340;
|
||||
/* 0x344 */ f32 field_0x344;
|
||||
/* 0x348 */ f32 field_0x348;
|
||||
/* 0x34C */ f32 field_0x34c;
|
||||
/* 0x350 */ f32 field_0x350;
|
||||
/* 0x354 */ u8 field_0x354[0x360 - 0x354];
|
||||
/* 0x360 */ f32 field_0x360;
|
||||
/* 0x364 */ f32 field_0x364;
|
||||
/* 0x368 */ f32 field_0x368;
|
||||
/* 0x36C */ f32 field_0x36c;
|
||||
/* 0x370 */ f32 field_0x370;
|
||||
/* 0x374 */ f32 field_0x374;
|
||||
/* 0x378 */ u8 field_0x378[0x384 - 0x378];
|
||||
/* 0x384 */ f32 field_0x384;
|
||||
/* 0x388 */ f32 field_0x388;
|
||||
/* 0x38C */ f32 field_0x38c;
|
||||
/* 0x390 */ f32 field_0x390[3];
|
||||
/* 0x39C */ f32 field_0x39c[2];
|
||||
/* 0x3A4 */ f32 field_0x3a4[2];
|
||||
/* 0x3AC */ f32 field_0x3ac[2];
|
||||
/* 0x3B4 */ f32 field_0x3b4[2];
|
||||
/* 0x3BC */ f32 field_0x3bc[2];
|
||||
/* 0x3C4 */ f32 field_0x3c4[2];
|
||||
/* 0x3CC */ u8 field_0x3cc[0x3e4 - 0x3CC];
|
||||
/* 0x3E4 */ f32 field_0x3e4;
|
||||
/* 0x3E8 */ f32 field_0x3e8;
|
||||
/* 0x3EC */ f32 field_0x3ec;
|
||||
/* 0x3F0 */ f32 field_0x3f0;
|
||||
/* 0x3F4 */ f32 field_0x3f4;
|
||||
/* 0x3F8 */ f32 field_0x3f8;
|
||||
/* 0x3FC */ u8 field_0x3fc[0x420 - 0x3fc];
|
||||
/* 0x420 */ f32 mVesselPosX;
|
||||
/* 0x424 */ f32 mVesselPosY;
|
||||
/* 0x428 */ f32 mVesselScale;
|
||||
/* 0x42C */ f32 mVesselAlpha;
|
||||
/* 0x430 */ f32 field_0x430;
|
||||
/* 0x434 */ u8 field_0x434[0x448 - 0x434];
|
||||
/* 0x448 */ f32 mDPadButtonOFFPosX;
|
||||
/* 0x44C */ f32 mDPadButtonOFFPosY;
|
||||
/* 0x450 */ f32 mDPadButtonScale;
|
||||
/* 0x454 */ f32 mDPadButtonONPosX;
|
||||
/* 0x458 */ f32 mDPadButtonONPosY;
|
||||
/* 0x45C */ f32 mDPadButtonLetterSpacing;
|
||||
/* 0x460 */ u8 field_0x460[0x4bc - 0x460];
|
||||
/* 0x4BC */ u8 field_0x4bc;
|
||||
/* 0x4BC */ u8 field_0x4bd;
|
||||
};
|
||||
|
||||
#endif /* D_METER_D_METER2_H */
|
||||
|
||||
@@ -209,7 +209,7 @@ public:
|
||||
/* 802179C0 */ void drawButtonS(u8);
|
||||
/* 80217A10 */ void drawButtonBin(u8);
|
||||
/* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
|
||||
/* 80218238 */ void getButtonCrossParentInitTransY();
|
||||
/* 80218238 */ f32 getButtonCrossParentInitTransY();
|
||||
/* 80218254 */ void drawButtonCross(f32, f32);
|
||||
/* 80218338 */ void setAlphaButtonCrossAnimeMin();
|
||||
/* 802183A8 */ void setAlphaButtonCrossAnimeMax();
|
||||
@@ -229,7 +229,7 @@ public:
|
||||
/* 80219A84 */ void setButtonIconMidonaAlpha(u32);
|
||||
/* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
|
||||
/* 8021A29C */ ResTIMG* getNumberTexture(int);
|
||||
/* 8021A2F4 */ void getActionString(u8, u8, u8*);
|
||||
/* 8021A2F4 */ char* getActionString(u8, u8, u8*);
|
||||
/* 8021A468 */ void changeTextureItemB(u8);
|
||||
/* 8021A71C */ void changeTextureItemXY(int, u8);
|
||||
/* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16);
|
||||
@@ -244,16 +244,28 @@ public:
|
||||
/* 8021B810 */ void setItemParamB(u8);
|
||||
/* 8021BB6C */ bool getFishingType();
|
||||
/* 8021BBB4 */ bool getCanoeFishing();
|
||||
/* 8021BC24 */ void getCameraSubject();
|
||||
/* 8021BC54 */ void getItemSubject();
|
||||
/* 8021BC24 */ bool getCameraSubject();
|
||||
/* 8021BC54 */ bool getItemSubject();
|
||||
/* 8021BCAC */ bool getPlayerSubject();
|
||||
/* 8021BCC0 */ void isBButtonShow(bool);
|
||||
/* 8021BCC0 */ bool isBButtonShow(bool);
|
||||
/* 8021BDD0 */ s16 getButtonTimer();
|
||||
|
||||
/* 802102F8 */ virtual ~dMeter2Draw_c();
|
||||
|
||||
J2DScreen* getMainScreenPtr() { return mpScreen; }
|
||||
bool isEmphasisC() { return field_0x766 == 7 ? true : false; }
|
||||
f32 getMeterGaugeAlphaRate(u8 i_no) { return mMeterAlphaRate[i_no]; }
|
||||
bool isEmphasisA() { return field_0x761 == 7 ? true : false; }
|
||||
bool isEmphasisB() { return field_0x762 == 7 ? true : false; }
|
||||
bool isEmphasisBin() { return field_0x763 == 7 ? true : false; }
|
||||
bool isEmphasisZ() { return field_0x764 == 7 ? true : false; }
|
||||
bool isEmphasis3D() { return field_0x765 == 7 ? true : false; }
|
||||
bool isEmphasisS() { return field_0x767 == 7 ? true : false; }
|
||||
bool isEmphasisX() { return field_0x768[0] == 7 ? true : false; }
|
||||
bool isEmphasisY() { return field_0x768[1] == 7 ? true : false; }
|
||||
bool isEmphasisR() { return field_0x768[2] == 7 ? true : false; }
|
||||
void setEmphasisA(u8 param_0) { field_0x761 = param_0; }
|
||||
void setEmphasisB(u8 param_0) { field_0x762 = param_0; }
|
||||
|
||||
private:
|
||||
/* 0x004 */ f32 field_0x4;
|
||||
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
void init(void);
|
||||
int setFloatingMessage(u16, s16, bool);
|
||||
int setFloatingFlow(u16, s16, bool);
|
||||
int isFloatingMessageVisible(void);
|
||||
bool isFloatingMessageVisible(void);
|
||||
int decFloatingMessageTimer(void);
|
||||
void resetFloatingMessage(void);
|
||||
void decMsgKeyWaitTimer(void);
|
||||
@@ -149,6 +149,8 @@ public:
|
||||
u32 getTimeMs() { return mTimeMs; }
|
||||
u8 getNowCount() { return mNowCount; }
|
||||
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
|
||||
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
|
||||
void resetDirectUseItem() { mDirectUseItem = 0; }
|
||||
|
||||
public:
|
||||
/* 0x04 */ u8 unk4[4];
|
||||
@@ -242,6 +244,7 @@ void dMeter2Info_set2DVibration();
|
||||
void dMeter2Info_set2DVibrationM();
|
||||
static void dMeter2Info_setFloatingMessage(u16 pMessageID, s16 pMessageTimer, bool pWakuVisible);
|
||||
static void dMeter2Info_offUseButton(int pButton);
|
||||
bool dMeter2Info_is2DActiveTouchArea();
|
||||
|
||||
inline void dMeter2Info_Initialize() {
|
||||
g_meter2_info.init();
|
||||
@@ -523,6 +526,18 @@ inline void dMeter2Info_setScopeZoomPointer(u8 param_0) {
|
||||
g_meter2_info.setScopeZoomPointer(param_0);
|
||||
}
|
||||
|
||||
inline bool dMeter2Info_isFloatingMessageVisible() {
|
||||
return g_meter2_info.isFloatingMessageVisible();
|
||||
}
|
||||
|
||||
inline u8 dMeter2Info_getItemExplainWindowStatus() {
|
||||
return g_meter2_info.getItemExplainWindowStatus();
|
||||
}
|
||||
|
||||
inline void dMeter2Info_resetDirectUseItem() {
|
||||
g_meter2_info.resetDirectUseItem();
|
||||
}
|
||||
|
||||
char* dMeter2Info_getNumberTextureName(int pIndex);
|
||||
void dMeter2Info_recieveLetter();
|
||||
u8 dMeter2Info_getNewLetterNum();
|
||||
|
||||
@@ -645,30 +645,22 @@ public:
|
||||
/* 0x0A8 */ f32 mAButtonAlpha;
|
||||
/* 0x0AC */ f32 mAButtonPosX;
|
||||
/* 0x0B0 */ f32 mAButtonPosY;
|
||||
/* 0x0B4 */ f32 mAButtonTalkScale;
|
||||
/* 0x0B8 */ f32 mAButtonFontTalkScale;
|
||||
/* 0x0BC */ f32 mAButtonTalkPosX;
|
||||
/* 0x0C0 */ f32 mAButtonFontTalkPosX;
|
||||
/* 0x0C4 */ f32 mAButtonTalkPosY;
|
||||
/* 0x0C8 */ f32 mAButtonFontTalkPosY;
|
||||
/* 0x0B4 */ f32 mAButtonTalkScale[2];
|
||||
/* 0x0BC */ f32 mAButtonTalkPosX[2];
|
||||
/* 0x0C4 */ f32 mAButtonTalkPosY[2];
|
||||
/* 0x0CC */ f32 mAButtonTalkAScale;
|
||||
/* 0x0D0 */ f32 mAButtonFontTalkAScale;
|
||||
/* 0x0D4 */ f32 mAButtonTalkAPosX;
|
||||
/* 0x0D8 */ f32 mAButtonFontTalkAPosX;
|
||||
/* 0x0DC */ f32 mAButtonTalkAPosY;
|
||||
/* 0x0E0 */ f32 mAButtonFontTalkAPosY;
|
||||
/* 0x0D4 */ f32 mAButtonTalkAPosX[2];
|
||||
/* 0x0DC */ f32 mAButtonTalkAPosY[2];
|
||||
/* 0x0E4 */ f32 mAButtonVesselPosX;
|
||||
/* 0x0E8 */ f32 mAButtonVesselPosY;
|
||||
/* 0x0EC */ f32 mBButtonScale;
|
||||
/* 0x0F0 */ f32 mBButtonAlpha;
|
||||
/* 0x0F4 */ f32 mBButtonPosX;
|
||||
/* 0x0F8 */ f32 mBButtonPosY;
|
||||
/* 0x0FC */ f32 mBButtonTalkScale;
|
||||
/* 0x100 */ f32 mBButtonFontTalkScale;
|
||||
/* 0x104 */ f32 mBButtonTalkPosX;
|
||||
/* 0x108 */ f32 mBButtonFontTalkPosX;
|
||||
/* 0x10C */ f32 mBButtonTalkPosY;
|
||||
/* 0x110 */ f32 mBButtonFontTalkPosY;
|
||||
/* 0x0FC */ f32 mBButtonTalkScale[2];
|
||||
/* 0x104 */ f32 mBButtonTalkPosX[2];
|
||||
/* 0x10C */ f32 mBButtonTalkPosY[2];
|
||||
/* 0x114 */ f32 mBButtonWolfPosX;
|
||||
/* 0x118 */ f32 mBButtonWolfPosY;
|
||||
/* 0x11C */ f32 mBButtonVesselPosX;
|
||||
@@ -738,19 +730,13 @@ public:
|
||||
/* 0x228 */ f32 mBItemBasePosX[2];
|
||||
/* 0x230 */ f32 mBItemBasePosY[2];
|
||||
/* 0x238 */ f32 mBItemBaseAlpha[2];
|
||||
/* 0x240 */ f32 mXButtonItemBaseScale;
|
||||
/* 0x244 */ f32 mXButtonItemBaseNoItemScale;
|
||||
/* 0x248 */ f32 mXButtonItemBasePosX;
|
||||
/* 0x24C */ f32 mXButtonItemBaseNoItemPosX;
|
||||
/* 0x250 */ f32 mXButtonItemBasePosY;
|
||||
/* 0x254 */ f32 mXButtonItemBaseNoItemPosY;
|
||||
/* 0x240 */ f32 mXButtonItemBaseScale[2];
|
||||
/* 0x248 */ f32 mXButtonItemBasePosX[2];
|
||||
/* 0x250 */ f32 mXButtonItemBasePosY[2];
|
||||
/* 0x258 */ f32 mXButtonItemBaseAlpha[2];
|
||||
/* 0x260 */ f32 mYButtonItemBaseScale;
|
||||
/* 0x264 */ f32 mYButtonItemBaseNoItemScale;
|
||||
/* 0x268 */ f32 mYButtonItemBasePosX;
|
||||
/* 0x26C */ f32 mYButtonItemBaseNoItemPosX;
|
||||
/* 0x270 */ f32 mYButtonItemBasePosY;
|
||||
/* 0x274 */ f32 mYButtonItemBaseNoItemPosY;
|
||||
/* 0x260 */ f32 mYButtonItemBaseScale[2];
|
||||
/* 0x268 */ f32 mYButtonItemBasePosX[2];
|
||||
/* 0x270 */ f32 mYButtonItemBasePosY[2];
|
||||
/* 0x278 */ f32 mYButtonItemBaseAlpha[2];
|
||||
/* 0x280 */ f32 field_0x280;
|
||||
/* 0x284 */ f32 field_0x284;
|
||||
|
||||
@@ -167,6 +167,7 @@ public:
|
||||
void onAutoMessageFlagLocal() { mAutoMessageFlag = 1; }
|
||||
void setFundRaisingValueLocal(s16 i_value) { mFundRaisingValue = i_value; }
|
||||
u16 getPortalMessageIDLocal() { return mPortalMessageID; }
|
||||
bool isAutoMessageFlagLocal() { return mAutoMessageFlag; }
|
||||
|
||||
u8 getSelectPushFlag() { return mSelectPushFlag; }
|
||||
u8 getSelectCancelPos() { return mSelectCancelPos; }
|
||||
@@ -179,6 +180,7 @@ public:
|
||||
void onAutoMessageFlag() { onAutoMessageFlagLocal(); }
|
||||
void setFundRaisingValue(s16 i_value) { setFundRaisingValueLocal(i_value); }
|
||||
u16 getPortalMessageID() { return getPortalMessageIDLocal(); }
|
||||
bool isAutoMessageFlag() { return isAutoMessageFlagLocal(); }
|
||||
|
||||
jmessage_tSequenceProcessor* getSequenceProcessor() { return mpSeqProc; }
|
||||
|
||||
|
||||
@@ -392,15 +392,16 @@ public:
|
||||
u16 getRupeeMax() const;
|
||||
int isMagicFlag(u8 i_magic) const;
|
||||
|
||||
u16 getMaxLife() { return mMaxLife; }
|
||||
u16 getMaxLife() const { return mMaxLife; }
|
||||
u16 getLife() const { return mLife; }
|
||||
u16 getRupee() const { return mRupee; }
|
||||
u16 getOil() { return mOil; }
|
||||
u16 getOil() const { return mOil; }
|
||||
u16 getMaxOil() const { return mMaxOil; }
|
||||
u8& getMagic() { return mMagic; }
|
||||
u8& getMaxMagic() { return mMaxMagic; }
|
||||
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; }
|
||||
@@ -608,7 +609,7 @@ public:
|
||||
u8 getBombNum(u8 i_bombType) const;
|
||||
|
||||
void setArrowNum(u8 i_maxNum) { mItemMax[ARROW_MAX] = i_maxNum; }
|
||||
u8 getArrowNum() { return mItemMax[ARROW_MAX]; }
|
||||
u8 getArrowNum() const { return mItemMax[ARROW_MAX]; }
|
||||
|
||||
private:
|
||||
/* 0x0 */ u8 mItemMax[8];
|
||||
|
||||
@@ -116,6 +116,10 @@ inline void mDoAud_rainPlay(s32 enable) {
|
||||
g_mEnvSeMgr.startRainSe(enable, 0);
|
||||
}
|
||||
|
||||
inline void mDoAud_heartGaugeOn() {
|
||||
Z2AudioMgr::getInterface()->mStatusMgr.heartGaugeOn();
|
||||
}
|
||||
|
||||
inline void mDoAud_mEnvse_framework() {
|
||||
g_mEnvSeMgr.framework();
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ public:
|
||||
bool checkNoBombProc() const { return field_0x16b4 == 0 || field_0x16b4 == 1; }
|
||||
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return mResetStateFlg0 & flag; }
|
||||
bool checkEndResetStateFlg0(daHorse_ERFLG0 flag) { return mEndResetStateFlg0 & flag; }
|
||||
bool checkStateFlg0(daHorse_FLG0 flag) { return mStateFlg0 & flag; }
|
||||
bool checkStateFlg0(daHorse_FLG0 flag) const { return mStateFlg0 & flag; }
|
||||
f32 getNormalMaxSpeedF() { return mNormalMaxSpeedF; }
|
||||
void changeDemoMoveAngle(s16 angle) { mDemoMoveAngle = angle; }
|
||||
void setDemoStickR(f32 stick) { mDemoStickR = stick; }
|
||||
@@ -168,6 +168,7 @@ public:
|
||||
|
||||
bool checkTurnStandCamera() const { return checkResetStateFlg0(TURN_STAND_CAMERA); }
|
||||
bool checkTurnStand() const { return checkResetStateFlg0(TURN_STAND); }
|
||||
bool checkRodeoMode() const { return checkStateFlg0(RODEO_MODE); }
|
||||
|
||||
static u8 const m_footJointTable[8];
|
||||
static f32 const m_callLimitDistance2;
|
||||
|
||||
Reference in New Issue
Block a user