mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-06 02:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_option work (#1909)

Browse Source 
* d_menu_option work

* done with d_menu_option for now

* remove unused asm

* format document
This commit is contained in:
Trueffel
2023-09-04 15:38:41 +02:00
committed by GitHub
parent 9da27286eb
commit c397ef7d4a
43 changed files with 2178 additions and 2782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DScreen.h
+2
View File
@@ -69,6 +69,8 @@ public:
/* 802F9640 */ static void* getNameResource(char const*);
/* 802F9690 */ void animation();
void setScissor(bool i_scissor) { mScissor = i_scissor; }
static J2DDataManage* getDataManage() { return mDataManage; }
static J2DDataManage* mDataManage;
include/JSystem/J2DGraph/J2DTextBox.h
+5
View File
@@ -105,6 +105,11 @@ public:
size.mSizeY = mFontSizeY;
}
void setFontColor(JUtility::TColor i_charColor, JUtility::TColor i_GradientColor) {
mCharColor = i_charColor;
mGradientColor = i_GradientColor;
}
void setCharSpace(f32 space) { mCharSpacing = space; }
f32 getCharSpace() const { return mCharSpacing; }
void setLineSpace(f32 space) { mLineSpacing = space; }
include/d/com/d_com_inf_game.h
+34
View File
@@ -418,6 +418,7 @@ public:
JKRArchive* getNameResArchive() { return mNameResArchive; }
JKRArchive* getFmapResArchive() { return mFmapResArchive; }
JKRAramArchive* getFieldMapArchive2() { return (JKRAramArchive*)mFieldMapArchive2; }
JKRArchive* getOptionResArchive() { return mOptionResArchive; }
void setFieldMapArchive2(JKRArchive* arc) { mFieldMapArchive2 = arc; }
void setAnmArchive(JKRArchive* arc) { mAnmArchive = arc; }
@@ -426,6 +427,7 @@ public:
void setCollectResArchive(JKRArchive* arc) { mCollectResArchive = arc; }
void setItemIconArchive(JKRArchive* arc) { mItemIconArchive = arc; }
void setAllMapArchive(JKRArchive* arc) { mAllMapArchive = arc; }
void setOptionResArchive(JKRArchive* arc) { mOptionResArchive = arc; }
void setRingResArchive(JKRArchive* arc) { mRingResArchive = arc; }
void setNameResArchive(JKRArchive* arc) { mNameResArchive = arc; }
void setDemoMsgArchive(JKRArchive* arc) { mDemoMsgArchive = arc; }
@@ -1226,6 +1228,14 @@ inline u8 dComIfGs_getOptAttentionType() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getAttentionType();
}
inline u8 dComIfGs_getOptCameraControl() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getCameraControl();
}
inline u8 dComIfGs_getOptSound() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound();
}
inline BOOL dComIfGs_isTbox(int i_no) {
return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no);
}
@@ -1672,6 +1682,22 @@ inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpAcceptStage(param_0);
}
inline void dComIfGs_setOptSound(u8 i_mode) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode);
}
inline void dComIfGs_setOptVibration(u8 i_status) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setVibration(i_status);
}
inline void dComIfGs_setOptAttentionType(u8 i_attentionType) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setAttentionType(i_attentionType);
}
inline void dComIfGs_setOptCameraControl(u8 i_cameraControl) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCameraControl(i_cameraControl);
}
inline void dComIfGs_setOptPointer(u8 i_pointer) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer);
}
@@ -1914,6 +1940,10 @@ inline void dComIfGp_setRingResArchive(JKRArchive* arc) {
g_dComIfG_gameInfo.play.setRingResArchive(arc);
}
inline void dComIfGp_setOptionResArchive(JKRArchive* arc) {
g_dComIfG_gameInfo.play.setOptionResArchive(arc);
}
inline void dComIfGp_setNameResArchive(JKRArchive* arc) {
g_dComIfG_gameInfo.play.setNameResArchive(arc);
}
@@ -2737,6 +2767,10 @@ inline JKRAramArchive* dComIfGp_getFieldMapArchive2() {
return g_dComIfG_gameInfo.play.getFieldMapArchive2();
}
inline JKRArchive* dComIfGp_getOptionResArchive() {
return g_dComIfG_gameInfo.play.getOptionResArchive();
}
inline void dComIfGp_onPauseFlag() {
g_dComIfG_gameInfo.play.onPauseFlag();
}
include/d/file/d_file_sel_warning.h
+3 -1
View File
@@ -26,7 +26,9 @@ public:
u8 getStatus() { return mStatus; }
void draw() { _draw(); }
u8 field_0x4[0x3D - 0x4];
u8 field_0x4[0x38 - 0x4];
/* 0x38 */ f32 mPosY;
/* 0x3C */ u8 field_0x3c[0x3D - 0x3C];
/* 0x3D */ u8 mStatus;
};
include/d/menu/d_menu_option.h
+30 -31
View File
@@ -24,11 +24,11 @@ public:
/* 801E36CC */ void _draw();
/* 801E38CC */ void drawHaihai();
/* 801E3A7C */ bool isSync();
/* 801E3AA4 */ void checkLeftTrigger();
/* 801E3AC8 */ void checkRightTrigger();
/* 801E3AA4 */ bool checkLeftTrigger();
/* 801E3AC8 */ bool checkRightTrigger();
/* 801E3AEC */ void setAnimation();
/* 801E3B98 */ bool _open();
/* 801E3DE0 */ void _close();
/* 801E3DE0 */ bool _close();
/* 801E3F6C */ void atten_init();
/* 801E3FC4 */ void atten_move();
/* 801E41A0 */ void vib_init();
@@ -65,7 +65,7 @@ public:
/* 801E71CC */ void setSoundString();
/* 801E7314 */ void setCursorPos(u8);
/* 801E73D8 */ void setSelectColor(u8, bool);
/* 801E76EC */ void getSelectType();
/* 801E76EC */ u8 getSelectType();
/* 801E7718 */ void changeBarColor(bool);
/* 801E78B8 */ void setHIO(bool);
/* 801E7D18 */ void cursorAnime(f32);
@@ -73,24 +73,25 @@ public:
/* 801E7DF4 */ void changeTVCheck();
/* 801E7E98 */ void setAButtonString(u16);
/* 801E7F9C */ void setBButtonString(u16);
/* 801E80A0 */ void isRumbleSupported();
/* 801E80A0 */ bool isRumbleSupported();
/* 801E80AC */ bool dpdMenuMove();
/* 801E80B4 */ void paneResize(u64);
/* 801E8210 */ void initialize();
/* 801E82C4 */ void yesnoMenuMoveAnmInitSet(int, int);
/* 801E8438 */ void yesnoMenuMoveAnm();
/* 801E85D4 */ void yesnoSelectMoveAnm();
/* 801E8438 */ bool yesnoMenuMoveAnm();
/* 801E85D4 */ u8 yesnoSelectMoveAnm();
/* 801E8888 */ void yesnoCursorShow();
/* 801E89F8 */ void yesNoSelectStart();
/* 801E8AC8 */ void yesnoSelectAnmSet();
/* 801E8C38 */ void yesnoCancelAnmSet();
/* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
/* 801E8CFC */ void yesnoWakuAlpahAnm(u8);
/* 801E8CFC */ u8 yesnoWakuAlpahAnm(u8);
/* 801E8E6C */ virtual void draw();
/* 801E2014 */ virtual ~dMenu_Option_c();
u8 getQuitStatus() { return mQuitStatus; }
u8 isUseFlag(u8 i_flag) { return (mUseFlag & i_flag) != 0; }
private:
/* 0x004 */ J2DScreen* mpBackScreen;
@@ -100,21 +101,21 @@ private:
/* 0x014 */ J2DScreen* mpTVScreen;
/* 0x018 */ J2DScreen* mpScreenIcon;
/* 0x01C */ J2DScreen* mpSelectScreen;
/* 0x020 */ void* field_0x20;
/* 0x024 */ void* field_0x24;
/* 0x028 */ void* field_0x28;
/* 0x02C */ void* field_0x2c;
/* 0x030 */ void* field_0x30;
/* 0x020 */ J2DAnmTransform* field_0x20;
/* 0x024 */ J2DAnmTransform* field_0x24;
/* 0x028 */ J2DAnmTransform* field_0x28;
/* 0x02C */ J2DAnmColor* field_0x2c;
/* 0x030 */ J2DAnmTextureSRTKey* field_0x30;
/* 0x034 */ dFile_warning_c* mpWarning;
/* 0x038 */ J2DPicture* mpBlackTex;
/* 0x03C */ dMenu_Calibration_c* field_0x3c;
/* 0x040 */ mDoDvdThd_mountArchive_c* field_0x40;
/* 0x03C */ dMenu_Calibration_c* mpCalibration;
/* 0x040 */ mDoDvdThd_mountArchive_c* mpMount;
/* 0x044 */ dSelect_cursor_c* mpDrawCursor;
/* 0x048 */ dMsgString_c* mpString;
/* 0x04C */ dMeterHaihai_c* mpMeterHaihai;
/* 0x050 */ JKRArchive* field_0x50;
/* 0x054 */ JUTFont* field_0x54;
/* 0x058 */ STControl* field_0x58;
/* 0x050 */ JKRArchive* mpArchive;
/* 0x054 */ JUTFont* mpFont;
/* 0x058 */ STControl* mpStick;
/* 0x05C */ CPaneMgr* mpParent[5];
/* 0x070 */ CPaneMgr* mpTitle;
/* 0x074 */ CPaneMgr* mpMenuNull[6];
@@ -123,12 +124,11 @@ private:
/* 0x0BC */ CPaneMgr* mpMenuPane2[6];
/* 0x0D4 */ CPaneMgr* mpMenuPane3[6];
/* 0x0EC */ CPaneMgr* mpMenuPane32[6];
/* 0x104 */ CPaneMgr* mpMenuText[5][6];
/* 0x17C */ int field_0x17c[6];
/* 0x104 */ CPaneMgr* mpMenuText[6][6];
/* 0x194 */ CPaneMgr* mpHaihaiPosL[5];
/* 0x1A8 */ CPaneMgr* mpHaihaiPosR[5];
/* 0x1BC */ u8 field_0x1bc[4];
/* 0x1C0 */ int field_0x1c0[4];
/* 0x1C0 */ CPaneMgr* field_0x1c0[4];
/* 0x1D0 */ CPaneMgr* mpZButtonText[3];
/* 0x1DC */ CPaneMgr* mpYesNoSelBase_c[2];
/* 0x1E4 */ CPaneMgr* mpYesNoTxt_c[2];
@@ -139,24 +139,23 @@ private:
/* 0x20C */ CPaneMgr* mpButtonText[2];
/* 0x214 */ CPaneMgr* mpTVButtonAB;
/* 0x218 */ CPaneMgr* mpTVButtonText;
/* 0x21C */ J2DTextBox* field_0x21c[12];
/* 0x21C */ J2DTextBox* field_0x21c[6][2];
/* 0x24C */ u8 field_0x24c[0x8];
/* 0x254 */ int field_0x254;
/* 0x258 */ int field_0x258;
/* 0x254 */ J2DTextBox* field_0x254[2];
/* 0x25C */ J2DTextBox* field_0x25c[5];
/* 0x270 */ J2DTextBox* field_0x270[3];
/* 0x27C */ int field_0x27c;
/* 0x280 */ int field_0x280[6];
/* 0x298 */ int field_0x298[6];
/* 0x27C */ J2DPane* field_0x27c;
/* 0x280 */ J2DPicture* field_0x280[6];
/* 0x298 */ J2DTextBox* field_0x298[6];
/* 0x2B0 */ JUtility::TColor field_0x2b0[2];
/* 0x2B8 */ JUtility::TColor field_0x2b8[2];
/* 0x2C0 */ JUtility::TColor field_0x2c0[2];
/* 0x2C8 */ JUtility::TColor field_0x2c8[2];
/* 0x2D0 */ int field_0x2d0[3][8];
/* 0x2D0 */ J2DPane* field_0x2d0[6][4];
/* 0x330 */ f32 field_0x330;
/* 0x334 */ f32 field_0x334;
/* 0x338 */ f32 field_0x338;
/* 0x33C */ f32 field_0x33c[2];
/* 0x33C */ f32 mBarScale[2];
/* 0x344 */ f32 field_0x344[6];
/* 0x35C */ f32 field_0x35c[6];
/* 0x374 */ f32 field_0x374;
@@ -171,8 +170,8 @@ private:
/* 0x3C0 */ int field_0x3c0;
/* 0x3C4 */ int field_0x3c4;
/* 0x3C8 */ int field_0x3c8[4];
/* 0x3D8 */ u16 field_0x3d8;
/* 0x3DA */ u16 field_0x3da;
/* 0x3D8 */ s16 mFrame;
/* 0x3DA */ s16 field_0x3da;
/* 0x3DC */ u16 field_0x3dc;
/* 0x3DE */ u16 field_0x3de;
/* 0x3E0 */ u8 field_0x3e0;
include/d/meter/d_meter_HIO.h
+1 -2
View File
@@ -95,8 +95,7 @@ public:
/* 0x3C */ f32 mOptionTypeBGPosY[4];
/* 0x4C */ f32 mTVsettingPosY;
/* 0x50 */ f32 mPointerCalibrationPosY;
/* 0x54 */ f32 mSelectBarScale;
/* 0x58 */ f32 mUnselectBarScale;
/* 0x54 */ f32 mBarScale[2]; // 0: mSelectBarScale | 1: mUnselectBarScale
/* 0x5C */ f32 mBackgroundPosY;
/* 0x60 */ f32 mArrowOffsetX;
/* 0x64 */ f32 mArrowOffsetX_4x3;