first d_menu_ring (item wheel) pass (#1928)

* first pass on d_menu_ring

* d_menu_item_explain mostly OK

* match ptmf's and sinit

* format d_menu_item_explain

* first item wheel pass to pr

* fix seStart calls

* d_menu_item_explain OK
This commit is contained in:
Trueffel
2023-09-16 19:16:57 +02:00
committed by GitHub
parent c2193c41eb
commit 3d8048edba
54 changed files with 2087 additions and 4610 deletions
+22 -1
View File
@@ -415,9 +415,12 @@ public:
JKRArchive* getCollectResArchive() { return mCollectResArchive; }
JKRArchive* getItemIconArchive() { return mItemIconArchive; }
JKRArchive* getNameResArchive() { return mNameResArchive; }
JKRArchive* getDemoMsgArchive() { return mDemoMsgArchive; }
JKRArchive* getFmapResArchive() { return mFmapResArchive; }
JKRArchive* getDmapResArchive() { return mDmapResArchive; }
JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; }
JKRArchive* getOptionResArchive() { return mOptionResArchive; }
JKRArchive* getRingResArchive() { return mRingResArchive; }
void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; }
void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; }
@@ -902,12 +905,14 @@ u8 dComIfGs_getBottleMax();
u8 dComIfGs_checkGetItem(u8 i_itemNo);
void dComIfGs_setSelectEquipClothes(u8 i_itemNo);
void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum);
s32 dComIfGs_isDungeonItemWarp(int i_stageNo);
void dComIfGs_BossLife_public_Set(s8);
s8 dComIfGs_sense_type_change_Get();
cXyz& dComIfGs_getWarpPlayerPos();
const char* dComIfGs_getWarpStageName();
s16 dComIfGs_getWarpPlayerAngleY();
s8 dComIfGs_getWarpRoomNo();
bool dComIfGs_getWarpMarkFlag();
BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo);
BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo);
BOOL dComIfGs_isZoneSwitch(int, int);
@@ -1126,6 +1131,10 @@ inline u8 dComIfGs_getItem(int i_slotNo, bool i_checkCombo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getItem(i_slotNo, i_checkCombo);
}
inline u8 dComIfGs_getLineUpItem(int i_slotNo) {
return g_dComIfG_gameInfo.info.getPlayer().getItem().getLineUpItem(i_slotNo);
}
inline BOOL dComIfGs_isCollectSword(u8 i_swordNo) {
return g_dComIfG_gameInfo.info.getPlayer().getCollect().isCollect(COLLECT_SWORD, i_swordNo);
}
@@ -1195,7 +1204,7 @@ inline u8 dComIfGs_getLastWarpMarkRoomNo() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getRoomNo();
}
inline char dComIfGs_getLastWarpAcceptStage() {
inline s8 dComIfGs_getLastWarpAcceptStage() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().getWarpAcceptStage();
}
@@ -1899,6 +1908,10 @@ inline JKRArchive* dComIfGp_getNameResArchive() {
return g_dComIfG_gameInfo.play.getNameResArchive();
}
inline JKRArchive* dComIfGp_getDemoMsgArchive() {
return g_dComIfG_gameInfo.play.getDemoMsgArchive();
}
inline JKRArchive* dComIfGp_getMsgDtArchive(int idx) {
return g_dComIfG_gameInfo.play.getMsgDtArchive(idx);
}
@@ -2774,6 +2787,10 @@ inline JKRArchive* dComIfGp_getOptionResArchive() {
return g_dComIfG_gameInfo.play.getOptionResArchive();
}
inline JKRArchive* dComIfGp_getRingResArchive() {
return g_dComIfG_gameInfo.play.getRingResArchive();
}
inline void dComIfGp_onPauseFlag() {
g_dComIfG_gameInfo.play.onPauseFlag();
}
@@ -2792,6 +2809,10 @@ inline JKRArchive* dComIfGp_getFmapResArchive() {
return g_dComIfG_gameInfo.play.getFmapResArchive();
}
inline JKRArchive* dComIfGp_getDmapResArchive() {
return g_dComIfG_gameInfo.play.getDmapResArchive();
}
inline u8 dComIfGp_getMesgStatus() {
return g_dComIfG_gameInfo.play.getMesgStatus();
}
+2
View File
@@ -56,6 +56,8 @@ struct dItem_data {
static s16 getTexture(u8 index) { return item_resource[index].mTexture; }
static u8 getTexScale (u8 index) { return item_resource[index].mTexScale; }
static const char* getFieldArc(u8 index) { return field_item_res[index].mFieldArc; }
static s16 getItemBmdName(u8 index) { return field_item_res[index].mItemBmdName; }
+98 -1
View File
@@ -1,6 +1,103 @@
#ifndef D_MENU_D_MENU_ITEM_EXPLAIN_H
#define D_MENU_D_MENU_ITEM_EXPLAIN_H
#include "dolphin/types.h"
#include "d/d_drawlist.h"
class CPaneMgr;
class J2DTextBox;
class STControl;
class dKantera_icon_c;
class dMsgString_c;
class dMenu_ItemExplain_c;
class dSelect_cursor_c;
class dMsgScrnArrow_c;
class dMsgScrn3Select_c;
class J2DOrthoGraph;
class dMenu_ItemExplain_c {
public:
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ virtual ~dMenu_ItemExplain_c();
/* 801DB470 */ void move();
/* 801DB514 */ void draw(J2DOrthoGraph*);
/* 801DB744 */ void drawKantera();
/* 801DB818 */ void wait_init();
/* 801DB81C */ void wait_proc();
/* 801DB820 */ void open_init();
/* 801DBAB4 */ void open_proc();
/* 801DBB50 */ void move_init();
/* 801DBB7C */ void move_proc();
/* 801DBCB4 */ void move_select_init();
/* 801DBF44 */ void move_select_proc();
/* 801DC1E0 */ void move_next_init();
/* 801DC214 */ void move_next_proc();
/* 801DC2E4 */ void close_init();
/* 801DC2F0 */ void close_proc();
/* 801DC340 */ u8 openExplain(u8, u8, u8, bool);
/* 801DC3C8 */ u8 openExplainDmap(u8, u8, u8, bool, u8);
/* 801DC738 */ u8 openExplainTx(u32, u32);
/* 801DC7AC */ f32 getAlphaRatio();
/* 801DC7FC */ void setNumber();
/* 801DCB54 */ bool getWarpMarkFlag();
/* 801DCBBC */ void setScale();
u8 getStatus() { return mStatus; }
void offForceButton() { mForceButton = 0; }
u8 getForceButton() { return mForceButton; }
u8 checkEndButton() { return mEndButton; }
void trans(f32 x, f32 y) {
field_0xd4 = x;
field_0xd8 = y;
}
private:
/* 0x04 */ JKRExpHeap* mpHeap;
/* 0x08 */ JKRArchive* mpArchive;
/* 0x0C */ dMsgString_c* mpInfoString;
/* 0x10 */ CPaneMgr* mpInfoText;
/* 0x14 */ J2DPane* field_0x14; // actual data type not known
/* 0x18 */ CPaneMgr* mpNameText[4];
/* 0x28 */ J2DPane* field_0x28[4]; // actual data type not known
/* 0x38 */ CPaneMgr* mpInfoIcon;
/* 0x3C */ CPaneMgr* mpParent[2];
/* 0x44 */ J2DPane* field_0x44[2]; // actual data type not known
/* 0x4C */ CPaneMgr* mpLabel;
/* 0x50 */ J2DPane* field_0x50; // actual data type not known
/* 0x54 */ u8 field_0x54[0x5C - 0x54];
/* 0x5C */ J2DPane* field_0x5c; // actual data type not known
/* 0x60 */ J2DPane* field_0x60[3]; // actual data type not known
/* 0x6C */ dKantera_icon_c* mpKanteraMeter;
/* 0x70 */ J2DScreen* mpInfoScreen;
/* 0x74 */ J2DPane* field_0x74; // actual data type not known
/* 0x78 */ int field_0x78;
/* 0x7C */ J2DPicture* mpExpItemPane[3];
/* 0x88 */ ResTIMG* mpExpItemTex[4];
/* 0x98 */ dMsgScrnArrow_c* mpArrow;
/* 0x9C */ dMsgScrn3Select_c* mpSelect_c;
/* 0xA0 */ int field_0xa0[2];
/* 0xA8 */ J2DPicture* mpItemNumTex[3];
/* 0xB4 */ J2DPicture* mpBackTex;
/* 0xB8 */ STControl* mpStick;
/* 0xBC */ f32 mAlphaRatio;
/* 0xC0 */ f32 mDescAlpha;
/* 0xC4 */ u32 field_0xc4;
/* 0xC8 */ u32 field_0xc8;
/* 0xCC */ u32 field_0xcc;
/* 0xD0 */ u32 field_0xd0;
/* 0xD4 */ f32 field_0xd4;
/* 0xD8 */ f32 field_0xd8;
/* 0xDC */ u16 field_0xdc;
/* 0xDE */ u8 field_0xde;
/* 0xDF */ u8 field_0xdf;
/* 0xE0 */ u8 mStatus;
/* 0xE1 */ u8 field_0xe1;
/* 0xE2 */ u8 field_0xe2;
/* 0xE3 */ u8 mEndButton;
/* 0xE4 */ u8 mForceButton;
/* 0xE5 */ u8 field_0xe5;
/* 0xE6 */ u8 field_0xe6;
/* 0xE7 */ u8 field_0xe7;
};
#endif /* D_MENU_D_MENU_ITEM_EXPLAIN_H */
+64 -71
View File
@@ -1,9 +1,11 @@
#ifndef D_MENU_D_MENU_RING_H
#define D_MENU_D_MENU_RING_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
class CPaneMgr;
class CPaneMgrAlpha;
struct CSTControl;
class J2DTextBox;
class STControl;
@@ -23,8 +25,8 @@ public:
/* 801EB0A4 */ bool isOpen();
/* 801EB2B4 */ bool isMoveEnd();
/* 801EB3CC */ bool isClose();
/* 801EB624 */ void getStickInfo(STControl*);
/* 801EB8C0 */ void calcStickAngle(STControl*, u8);
/* 801EB624 */ u8 getStickInfo(STControl*);
/* 801EB8C0 */ s16 calcStickAngle(STControl*, u8);
/* 801EB960 */ void setRotate();
/* 801EBA38 */ void setItemScale(int, f32);
/* 801EBAB8 */ void setButtonScale(int, f32);
@@ -47,30 +49,31 @@ public:
/* 801EDB14 */ void setSelectItem(int, u8);
/* 801EDC98 */ void drawSelectItem();
/* 801EDF2C */ void setSelectItemForce(int);
/* 801EDFDC */ void getCursorPos(u8);
/* 801EE058 */ void getItemNum(u8);
/* 801EE15C */ void getItemMaxNum(u8);
/* 801EDFDC */ s32 getCursorPos(u8);
/* 801EE058 */ u8 getItemNum(u8);
/* 801EE15C */ u8 getItemMaxNum(u8);
/* 801EE228 */ void checkExplainForce();
/* 801EE63C */ bool checkCombineBomb(int);
/* 801EE644 */ void setCombineBomb(int);
/* 801EE648 */ void drawNumber(int, int, f32, f32);
/* 801EEA84 */ void getItem(int, u8);
/* 801EEA84 */ u8 getItem(int, u8);
/* 801EEAE4 */ void setDoStatus(u8);
/* 801EEB58 */ void isMixItemOn();
/* 801EEC98 */ void isMixItemOff();
/* 801EEB58 */ bool isMixItemOn();
/* 801EEC98 */ bool isMixItemOff();
/* 801EED84 */ void setMixMessage();
/* 801EEF14 */ void textScaleHIO();
/* 801EF11C */ void textCentering();
/* 801EF13C */ void clacEllipseFunction(f32, f32, f32);
/* 801EF174 */ void calcDistance(f32, f32, f32, f32);
/* 801EF13C */ f32 clacEllipseFunction(f32, f32, f32);
/* 801EF174 */ f32 calcDistance(f32, f32, f32, f32);
/* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32);
/* 801EF484 */ bool dpdMove();
/* 801EF48C */ void openExplain(u8);
/* 801EF48C */ u8 openExplain(u8);
/* 801EF560 */ virtual void draw();
/* 801EA708 */ virtual ~dMenu_Ring_c();
void drawFlag0() { mDrawFlag = 0; }
void setStatus(u8 i_status) { mStatus = i_status; }
private:
/* 0x004 */ JKRExpHeap* mpHeap;
@@ -78,34 +81,32 @@ private:
/* 0x00C */ CSTControl* mpCStick;
/* 0x010 */ dSelect_cursor_c* mpDrawCursor;
/* 0x014 */ dMsgString_c* mpString;
/* 0x018 */ CPaneMgr* mpMessageParent;
/* 0x01C */ CPaneMgr* mpCenterParent;
/* 0x020 */ CPaneMgr* mpSpotParent;
/* 0x018 */ CPaneMgrAlpha* mpMessageParent;
/* 0x01C */ CPaneMgrAlpha* mpCenterParent;
/* 0x020 */ CPaneMgrAlpha* mpSpotParent;
/* 0x024 */ CPaneMgr* mpTextParent[10];
/* 0x04C */ CPaneMgr* mpNameParent;
/* 0x050 */ CPaneMgr* mpCircle;
/* 0x054 */ dKantera_icon_c* mpKanteraMeter;
/* 0x058 */ J2DScreen* mpScreen;
/* 0x05C */ J2DScreen* mpSpotScreen;
/* 0x060 */ u8 field_0x60[4];
/* 0x060 */ u8 field_0x060[0x064 - 0x060];
/* 0x064 */ J2DScreen* mpCenterScreen;
/* 0x068 */ J2DPicture* mpSelectItemTex[4][3];
/* 0x098 */ J2DPicture* mpItemTex[4][3];
/* 0x0C8 */ u8 field_0xc8[0xF0];
/* 0x098 */ J2DPicture* mpItemTex[MAX_ITEM_SLOTS][3];
/* 0x1B8 */ J2DPicture* mpBlackTex;
/* 0x1BC */ J2DPicture* mpItemNumTex[3];
/* 0x1C8 */ J2DTextBox* field_0x1c8[5];
/* 0x1DC */ J2DTextBox* field_0x1dc[5];
/* 0x1F0 */ ResTIMG* mpSelectItemTexBuf[4][3][2];
/* 0x250 */ ResTIMG* mpItemBuf[4][3];
/* 0x280 */ u8 field_0x280[0xF0];
/* 0x250 */ ResTIMG* mpItemBuf[MAX_ITEM_SLOTS][3];
/* 0x370 */ dMenu_ItemExplain_c* mpItemExplain;
/* 0x374 */ void* field_0x374[3];
/* 0x380 */ cXyz field_0x380;
/* 0x38C */ f32 field_0x38c[24];
/* 0x3EC */ f32 field_0x3ec[24];
/* 0x44C */ f32 field_0x44c[24];
/* 0x4AC */ f32 field_0x4ac[24];
/* 0x38C */ f32 field_0x38c[MAX_ITEM_SLOTS];
/* 0x3EC */ f32 field_0x3ec[MAX_ITEM_SLOTS];
/* 0x44C */ f32 field_0x44c[MAX_ITEM_SLOTS];
/* 0x4AC */ f32 field_0x4ac[MAX_ITEM_SLOTS];
/* 0x50C */ f32 field_0x50c;
/* 0x510 */ f32 field_0x510;
/* 0x514 */ f32 field_0x514;
@@ -117,71 +118,63 @@ private:
/* 0x568 */ f32 field_0x568;
/* 0x56C */ f32 field_0x56c;
/* 0x570 */ f32 field_0x570;
/* 0x574 */ f32 field_0x574[2];
/* 0x57C */ f32 field_0x57c[2];
/* 0x584 */ f32 field_0x584;
/* 0x588 */ f32 field_0x588;
/* 0x574 */ f32 field_0x574[3];
/* 0x580 */ f32 field_0x580[3];
/* 0x58C */ f32 field_0x58c;
/* 0x590 */ f32 field_0x590[10];
/* 0x5B8 */ f32 field_0x5b8[10];
/* 0x5E0 */ f32 field_0x5e0[10];
/* 0x608 */ f32 field_0x608;
/* 0x60C */ f32 field_0x60c;
/* 0x590 */ f32 field_0x590;
/* 0x594 */ f32 field_0x594;
/* 0x598 */ f32 field_0x598[10];
/* 0x5C0 */ f32 field_0x5c0[10];
/* 0x5E8 */ f32 field_0x5e8[10];
/* 0x610 */ f32 field_0x610;
/* 0x614 */ f32 field_0x614;
/* 0x618 */ f32 field_0x618;
/* 0x61C */ f32 field_0x61c;
/* 0x620 */ u8 field_0x620[4];
/* 0x624 */ int field_0x624;
/* 0x620 */ f32 field_0x620;
/* 0x624 */ f32 field_0x624;
/* 0x628 */ u32 field_0x628;
/* 0x62C */ int field_0x62c;
/* 0x630 */ u16 field_0x630;
/* 0x632 */ u16 field_0x632;
/* 0x634 */ u16 field_0x634;
/* 0x636 */ u16 field_0x636[24];
/* 0x666 */ u16 field_0x666;
/* 0x668 */ u16 field_0x668;
/* 0x66A */ u16 field_0x66a;
/* 0x66C */ u16 field_0x66c[4];
/* 0x674 */ u16 field_0x674;
/* 0x676 */ u16 field_0x676;
/* 0x678 */ u16 field_0x678;
/* 0x67A */ u16 field_0x67a;
/* 0x62C */ u32 field_0x62c;
/* 0x630 */ u32 field_0x630;
/* 0x634 */ u32 field_0x634;
/* 0x638 */ s16 field_0x638;
/* 0x63A */ s16 field_0x63a;
/* 0x63C */ s16 field_0x63c;
/* 0x63E */ s16 field_0x63e[MAX_ITEM_SLOTS];
/* 0x66E */ s16 field_0x66e;
/* 0x670 */ s16 field_0x670;
/* 0x672 */ s16 field_0x672;
/* 0x674 */ s16 field_0x674[4];
/* 0x67C */ u16 field_0x67c;
/* 0x67E */ u16 field_0x67e[4];
/* 0x686 */ u16 field_0x686;
/* 0x688 */ u8 field_0x688[24];
/* 0x6A0 */ u8 field_0x6a0;
/* 0x6A1 */ u8 field_0x6a1;
/* 0x6A2 */ u8 field_0x6a2;
/* 0x6A3 */ u8 field_0x6a3;
/* 0x6A4 */ u8 field_0x6a4;
/* 0x6A5 */ u8 field_0x6a5;
/* 0x6A6 */ u8 field_0x6a6;
/* 0x6A7 */ u8 field_0x6a7;
/* 0x67E */ s16 field_0x67e;
/* 0x680 */ s16 field_0x680;
/* 0x682 */ s16 field_0x682;
/* 0x684 */ s16 field_0x684;
/* 0x686 */ s16 field_0x686[4];
/* 0x68E */ s16 field_0x68e;
/* 0x690 */ u8 field_0x690[MAX_ITEM_SLOTS];
/* 0x6A8 */ u8 mStatus;
/* 0x6A9 */ u8 field_0x6a9;
/* 0x6AA */ u8 field_0x6aa;
/* 0x6AB */ u8 field_0x6ab;
/* 0x6AC */ u8 field_0x6ac[4];
/* 0x6B0 */ u8 field_0x6b0[4];
/* 0x6B4 */ u8 field_0x6b4;
/* 0x6B5 */ u8 field_0x6b5;
/* 0x6B6 */ u8 field_0x6b6[4];
/* 0x6BA */ u8 field_0x6ba;
/* 0x6BB */ u8 field_0x6bb;
/* 0x6AC */ u8 field_0x6ac;
/* 0x6AD */ u8 field_0x6ad;
/* 0x6AE */ u8 field_0x6ae;
/* 0x6AF */ u8 field_0x6af;
/* 0x6B0 */ u8 field_0x6b0;
/* 0x6B1 */ u8 field_0x6b1;
/* 0x6B2 */ u8 field_0x6b2;
/* 0x6B3 */ u8 field_0x6b3;
/* 0x6B4 */ u8 field_0x6b4[4];
/* 0x6B8 */ u8 field_0x6b8[4];
/* 0x6BC */ u8 field_0x6bc;
/* 0x6BD */ u8 mDrawFlag;
/* 0x6BE */ u8 field_0x6be;
/* 0x6BF */ u8 field_0x6bf[4];
/* 0x6BE */ u8 field_0x6be[4];
/* 0x6C2 */ u8 field_0x6c2;
/* 0x6C3 */ u8 field_0x6c3;
/* 0x6C4 */ u8 field_0x6c4;
/* 0x6C5 */ u8 field_0x6c5;
/* 0x6C6 */ u8 field_0x6c6;
/* 0x6C7 */ u8 field_0x6c7;
/* 0x6C8 */ u8 field_0x6c8;
/* 0x6C9 */ u8 field_0x6c9;
/* 0x6CA */ u8 field_0x6ca;
/* 0x6C7 */ u8 field_0x6c7[4];
/* 0x6CB */ u8 field_0x6cb;
/* 0x6CC */ u8 field_0x6cc;
/* 0x6CD */ u8 field_0x6cd;
+9
View File
@@ -18,6 +18,15 @@ class dMenu_Ring_c;
class dMenu_Skill_c;
class dMenu_save_c;
BOOL dMw_UP_TRIGGER();
BOOL dMw_DOWN_TRIGGER();
BOOL dMw_LEFT_TRIGGER();
BOOL dMw_RIGHT_TRIGGER();
BOOL dMw_A_TRIGGER();
BOOL dMw_B_TRIGGER();
BOOL dMw_Z_TRIGGER();
BOOL dMw_START_TRIGGER();
class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
public:
/* 801FDFCC */ virtual void draw();/* {
+1
View File
@@ -243,6 +243,7 @@ public:
void onRupeeSoundBit(int bit) { mRupeeSound |= (1 << bit); }
void offRupeeSoundBit(int bit) { mRupeeSound &= ~(1 << bit); }
bool isRupeeSoundBit(int bit) { return mRupeeSound & (1 << bit); }
dMeter2Draw_c* getMeterDrawPtr() { return mpMeterDraw; }
s16 getNowLifeGauge() { return mNowLifeGauge; }
u8 getSubContents() { return mSubContentType; }
u16 getSubContentsStringType() { return mSubContentsStringType; }
+20 -1
View File
@@ -94,6 +94,7 @@ public:
dMeterMap_c* getMeterMapClass() { return mMeterMap; }
void setMenuWindowClass(dMw_c* p_menu) { mMenuWindowClass = p_menu; }
dMw_c* getMenuWindowClass() { return mMenuWindowClass; }
CPaneMgr* getMeterItemPanePtr(s32 i_idx) { return mMeterItemPanePtr[i_idx]; }
void offUseButton(int pButton) { mUseButton &= ~(u16)pButton; }
u16 getOilGaugeBackUp() { return mOilGaugeBackUp; }
u8 getInsectSelectType() { return mInsectSelectType; }
@@ -116,6 +117,7 @@ public:
void resetPauseStatus() { mPauseStatus = 0; }
u8 getPauseStatus() { return mPauseStatus; }
bool isGameStatus(int status) { return mGameStatus & status; }
bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & i_status; }
void setMapKeyDirection(u16 direction) { mMapKeyDirection = direction; }
bool isSub2DStatus(int flag) { return mSub2DStatus & (1 << flag); }
void offMenuInForce(int flag) { unk152 &= ~(1 << flag); }
@@ -152,6 +154,7 @@ public:
u8 getNowCount() { return mNowCount; }
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; }
void resetDirectUseItem() { mDirectUseItem = 0; }
u16 getFloatingFlowID() { return mFloatingFlowID; }
void setCollectCursorPosXY(u8 x, u8 y) {
@@ -269,6 +272,10 @@ inline void dMeter2Info_setWindowStatus(u8 status) {
g_meter2_info.setWindowStatus(status);
}
inline CPaneMgr* dMeter2Info_getMeterItemPanePtr(s32 i_idx) {
return g_meter2_info.getMeterItemPanePtr(i_idx);
}
inline void dMeter2Info_getString(u32 param_0, char* param_1, JMSMesgEntry_c* param_2) {
g_meter2_info.getString(param_0, param_1, param_2);
}
@@ -317,6 +324,11 @@ inline int dMeter2Info_readItemTexture(u8 i_itemNo, void* param_1, J2DPicture* p
param_6, param_7, param_8, param_9);
}
inline void dMeter2Info_setItemColor(u8 param_0, J2DPicture* param_1, J2DPicture* param_2,
J2DPicture* param_3, J2DPicture* param_4) {
g_meter2_info.setItemColor(param_0, param_1, param_2, param_3, param_4);
}
inline u8 dMeter2Info_getWarpRoomNo() {
return g_meter2_info.getWarpRoomNo();
}
@@ -393,6 +405,10 @@ inline bool dMeter2Info_isGameStatus(int status) {
return g_meter2_info.isGameStatus(status);
}
inline bool dMeter2Info_isTouchKeyCheck(int i_status) {
return g_meter2_info.isTouchKeyCheck(i_status);
}
inline void dMeter2Info_setMapKeyDirection(u16 direction) {
g_meter2_info.setMapKeyDirection(direction);
}
@@ -569,7 +585,6 @@ inline void dMeter2Info_decMsgKeyWaitTimer() {
g_meter2_info.decMsgKeyWaitTimer();
}
const char* dMeter2Info_getNumberTextureName(int pIndex);
inline bool dMeter2Info_isFloatingMessageVisible() {
return g_meter2_info.isFloatingMessageVisible();
}
@@ -578,6 +593,10 @@ inline u8 dMeter2Info_getItemExplainWindowStatus() {
return g_meter2_info.getItemExplainWindowStatus();
}
inline void dMeter2Info_setItemExplainWindowStatus(u8 i_value) {
g_meter2_info.setItemExplainWindowStatus(i_value);
}
inline void dMeter2Info_resetDirectUseItem() {
g_meter2_info.resetDirectUseItem();
}
+1 -1
View File
@@ -12,7 +12,7 @@ public:
/* 80249CA0 */ dMsgString_c(u8);
/* 80249D28 */ ~dMsgString_c();
/* 80191B6C */ virtual void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80191B6C */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 801E1D10 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
/* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*);
+1 -1
View File
@@ -22,7 +22,7 @@ public:
/* 80249A48 */ void getPageMax(int);
/* 80249A70 */ void getMessageLocal(u32, char*);
/* 80249BB0 */ virtual void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80249BB0 */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80249BD0 */ virtual void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
/* 80249BF8 */ virtual void getMessage(u32, char*);
+12 -6
View File
@@ -4,8 +4,11 @@
#include "JSystem/JUtility/TColor.h"
#include "d/pane/d_pane_class_alpha.h"
class JKRHeap;
void dPaneClass_showNullPane(J2DScreen*);
void dPaneClass_showNullPane(J2DPane*);
bool dPaneClass_setPriority(void**, JKRHeap*, J2DScreen*, char const*, u32, JKRArchive*);
class CPaneMgr : public CPaneMgrAlpha {
public:
@@ -54,18 +57,21 @@ public:
f32 getInitCenterPosY() { return mInitPos.y + mInitSize.y * 0.5f; }
f32 getInitSizeX() { return mInitSize.x; }
f32 getInitSizeY() { return mInitSize.y; }
f32 getInitPosX() { return mInitPos.x; }
f32 getInitPosY() { return mInitPos.y; }
JUtility::TColor getInitBlack() { return mInitBlack; }
JUtility::TColor getInitWhite() { return mInitWhite; }
f32 getInitGlobalPosX() { return mGlobalPos.x; }
f32 getInitGlobalPosY() { return mGlobalPos.y; }
f32 getInitSizeX() { return mInitSize.x; }
f32 getInitSizeY() { return mInitSize.y; }
f32 getInitScaleX() { return mInitScale.x; }
f32 getInitScaleY() { return mInitScale.y; }
JUtility::TColor getInitBlack() { return mInitBlack; }
JUtility::TColor getInitWhite() { return mInitWhite; }
private:
/* 0x1C */ void* mpFirstStackSize;
/* 0x20 */ s16* field_0x20;
+1 -1
View File
@@ -522,7 +522,7 @@ public:
cXyz& getPos() { return mPos; }
s16 getAngleY() { return mAngleY; }
s8 getRoomNo() { return mRoomNo; }
char getWarpAcceptStage() { return mWarpAcceptStage; }
s8 getWarpAcceptStage() { return mWarpAcceptStage; }
void resetWarpAcceptStage() { mWarpAcceptStage = -1; }
void setWarpAcceptStage(s8 accept) { mWarpAcceptStage = accept; }
+2 -1
View File
@@ -3,7 +3,8 @@
#include "dolphin/types.h"
struct dMsgScrn3Select_c {
class dMsgScrn3Select_c {
public:
/* 802390B4 */ dMsgScrn3Select_c();
/* 802398CC */ virtual ~dMsgScrn3Select_c();
/* 80239C64 */ bool isSelect();