mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-11 03:25:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_menu_save mostly done (#1103)

Browse Source
This commit is contained in:
TakaRikka
2026-07-05 10:34:40 -07:00
committed by GitHub
parent a7a5b5d636
commit d3c642c5d3
12 changed files with 3136 additions and 1739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_file_error.cpp
+22 -22
View File
@@ -106,7 +106,7 @@ void dFile_error_c::setErrMessage(u32 stringId, int param_2) {
setMessage(message_buffer);
m2fe = 0;
m2f5 = 1;
mStatus = 1;
mState = 1;
mDoAud_seStart(JA_SE_MSEL_ALERT_PANEL_IN);
@@ -261,7 +261,7 @@ void dFile_error_c::ShowMsgBoard() {
g_feHIO.m8,
(f32) g_feHIO.m6,
40.0f,
curxp[mSelectedOption] - msgPanes[0].mPosTopLeftOrig.x,
curxp[mYesNo] - msgPanes[0].mPosTopLeftOrig.x,
m300 + (f32) g_feHIO.m12,
1,
0
@@ -274,7 +274,7 @@ void dFile_error_c::ShowMsgBoard() {
g_feHIO.m8,
40.0f,
0.0f,
curxp[mSelectedOption] - msgPanes[0].mPosTopLeftOrig.x,
curxp[mYesNo] - msgPanes[0].mPosTopLeftOrig.x,
m300 + (f32) g_feHIO.m12,
4,
2
@@ -297,7 +297,7 @@ void dFile_error_c::ShowMsgBoard() {
/* 8017E4FC-8017E638 .text ynCursorInit__13dFile_error_cFv */
void dFile_error_c::ynCursorInit() {
for (int i = 0; i < 2; i ++) {
fopMsgM_paneScaleX(&msgPanes[i], g_feHIO.m14[mSelectedOption]);
fopMsgM_paneScaleX(&msgPanes[i], g_feHIO.m14[mYesNo]);
}
msgPanes[0].pane->rotate(
@@ -322,7 +322,7 @@ void dFile_error_c::HideMsgBoard() {
g_feHIO.m9,
0.0f,
40.0f,
curxp[mSelectedOption] - msgPanes[0].mPosTopLeftOrig.x,
curxp[mYesNo] - msgPanes[0].mPosTopLeftOrig.x,
m300 + (f32) g_feHIO.m12,
4,
2
@@ -335,7 +335,7 @@ void dFile_error_c::HideMsgBoard() {
g_feHIO.m9,
40.0f,
(f32) g_feHIO.m6,
curxp[mSelectedOption] - msgPanes[0].mPosTopLeftOrig.x,
curxp[mYesNo] - msgPanes[0].mPosTopLeftOrig.x,
m300 + (f32) g_feHIO.m12,
1,
1
@@ -345,16 +345,16 @@ void dFile_error_c::HideMsgBoard() {
m2fe ++;
if (cond1 == 1 && cond2 == 1) {
m2fc = 0;
mTimeCountDownMode = 0;
m2fb = 0x5a;
m2f5 = 2;
mStatus = 2;
mState = 0;
}
}
/* 8017E798-8017E86C .text msgDispWait__13dFile_error_cFv */
void dFile_error_c::msgDispWait() {
if (m2fc == 1 && m2fb != 0) {
if (mTimeCountDownMode == 1 && m2fb != 0) {
m2fb --;
}
@@ -373,7 +373,7 @@ void dFile_error_c::yesNoSelectWait() {
stick->checkTrigger();
if (CPad_CHECK_TRIG_A(0)) {
if (mSelectedOption == 0) {
if (mYesNo == 0) {
mDoAud_seStart(JA_SE_MSEL_OK_1);
} else {
mDoAud_seStart(JA_SE_MSEL_CANCEL_1);
@@ -387,7 +387,7 @@ void dFile_error_c::yesNoSelectWait() {
mDoAud_seStart(JA_SE_MSEL_ALERT_PANEL_OUT);
} else if (CPad_CHECK_TRIG_B(0)) {
mSelectedOption = 1;
mYesNo = 1;
ynCursorMove();
@@ -396,17 +396,17 @@ void dFile_error_c::yesNoSelectWait() {
mDoAud_seStart(JA_SE_MSEL_ALERT_PANEL_OUT);
} else if (stick->checkLeftTrigger()) {
if (mSelectedOption != 0) {
if (mYesNo != 0) {
mDoAud_seStart(JA_SE_MSEL_CURSOR);
mSelectedOption = 0;
mYesNo = 0;
ynCursorMove();
}
} else if (stick->checkRightTrigger()) {
if (mSelectedOption != 1) {
if (mYesNo != 1) {
mDoAud_seStart(JA_SE_MSEL_CURSOR);
mSelectedOption = 1;
mYesNo = 1;
ynCursorMove();
}
}
@@ -428,10 +428,10 @@ void dFile_error_c::ynCursorMove() {
fopMsgM_setAlpha(&msgPanes[1]);
for (int i = 0; i < 2; i ++) {
fopMsgM_paneScaleX(&msgPanes[i], g_feHIO.m14[mSelectedOption]);
fopMsgM_paneScaleX(&msgPanes[i], g_feHIO.m14[mYesNo]);
fopMsgM_paneTrans(
&msgPanes[i],
curxp[mSelectedOption] - msgPanes[i].mPosTopLeftOrig.x,
curxp[mYesNo] - msgPanes[i].mPosTopLeftOrig.x,
m300 + (f32) g_feHIO.m12
);
}
@@ -462,13 +462,13 @@ void dFile_error_c::ynCursorAnime() {
msgPanes[0].mUserArea = g_feHIO.mc;
fopMsgM_paneTrans(
&msgPanes[0],
curxp[mSelectedOption] - msgPanes[0].mPosTopLeftOrig.x + xp1[m2f9],
curxp[mYesNo] - msgPanes[0].mPosTopLeftOrig.x + xp1[m2f9],
m300 + (f32) g_feHIO.m12
);
fopMsgM_paneTrans(
&msgPanes[1],
curxp[mSelectedOption] - msgPanes[1].mPosTopLeftOrig.x + xp2[m2f9],
curxp[mYesNo] - msgPanes[1].mPosTopLeftOrig.x + xp2[m2f9],
m300 + (f32) g_feHIO.m12
);
@@ -652,7 +652,7 @@ void dFile_error_c::paneTransInit() {
fopMsgM_setAlpha(&msgPanes[0]);
fopMsgM_setAlpha(&msgPanes[1]);
mSelectedOption = 1;
mYesNo = 1;
PaneTranceBase(m2fe, g_feHIO.m8, (f32) g_feHIO.m6, 0.0, 0.0, 0.0, 1, 1);
@@ -702,9 +702,9 @@ void dFile_error_c::displayInit() {
}
#endif
m2fc = 0;
mTimeCountDownMode = 0;
m2fb = 0x5a;
m2f5 = 0;
mStatus = 0;
mState = 0;
}
src/d/d_file_select.cpp
+5 -5
View File
@@ -184,9 +184,9 @@ void dFile_select_c::_move() {
(this->*DataSelProc[field_0x392b])();
#else
#if VERSION <= VERSION_JPN
if(g_mDoMemCd_control.field_0x165A == 1 && field_0x3941 == 0)
if(g_mDoMemCd_control.mProbeStat == 1 && field_0x3941 == 0)
#else
if((g_mDoMemCd_control.field_0x165A == 0 || g_mDoMemCd_control.field_0x165A == 1) && field_0x3941 == 0)
if((g_mDoMemCd_control.mProbeStat == 0 || g_mDoMemCd_control.mProbeStat == 1) && field_0x3941 == 0)
#endif
{
field_0x392e = 1;
@@ -200,7 +200,7 @@ void dFile_select_c::_move() {
(this->*DataSelProc[field_0x392b])();
}
g_mDoMemCd_control.field_0x165A = 2;
g_mDoMemCd_control.mProbeStat = 2;
#endif
}
@@ -3637,7 +3637,7 @@ int dFile_select_c::ExCardCheck() {
return 1;
}
if(dComIfGs_getNoFile() == 1) {
if(dComIfGs_getNewFile() == 1) {
return 0;
}
@@ -3645,7 +3645,7 @@ int dFile_select_c::ExCardCheck() {
return 2;
}
if (dComIfGs_getNewFile()) {
if (dComIfGs_getNoFile()) {
return 2;
}
src/d/d_menu_save.cpp
+1591 -117
View File
File diff suppressed because it is too large Load Diff
src/d/d_s_name.cpp
+3 -3
View File
@@ -128,8 +128,8 @@ cPhs_State dScnName_c::create() {
JUT_ASSERT(489, dFe_c != NULL);
dFe_c->_create();
dMs_c = NULL;
dComIfGs_setNoFile(0);
dComIfGs_setNewFile(0);
dComIfGs_setNoFile(0);
}
if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) {
dComIfGs_setClearCount(1);
@@ -749,8 +749,8 @@ void dScnName_c::FileSelectClose() {
case 2:
if (fpcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) {
dMs_c->initialize();
dMs_c->field_0x053c = 1;
dMs_c->field_0x053d = dFs_c->field_0x392f; // getErrType?
dMs_c->field_0x53c = 1;
dMs_c->field_0x53d = dFs_c->field_0x392f; // getErrType?
if (dFs_c->field_0x392f == 2) {
dMs_c->initializeEx();
}
src/f_op/f_op_msg_mng.cpp
+1207 -1418
View File
File diff suppressed because it is too large Load Diff
src/m_Do/m_Do_MemCard.cpp
+4 -4
View File
@@ -27,7 +27,7 @@ void mDoMemCd_Ctrl_c::ThdInit() {
mPictDataPtr = NULL;
mPictDataWritePtr = NULL;
mCopyToPos = 0;
field_0x165A = 2;
mProbeStat = 2;
field_0x1660 = CARD_NO_COMMAND;
mCommand = CARD_NO_COMMAND;
mCardSlot = 0;
@@ -85,7 +85,7 @@ void mDoMemCd_Ctrl_c::update() {
if (mDoRst::isReset()) {
OSLockMutex(&mMutex);
mCommand = CARD_DETACH;
field_0x165A = 3;
mProbeStat = 3;
OSUnlockMutex(&mMutex);
OSSignalCond(&mCond);
} else
@@ -94,13 +94,13 @@ void mDoMemCd_Ctrl_c::update() {
if (getStatus(0) != 14) {
if (CARDProbe(0) && getStatus(0) == 0) {
OSLockMutex(&mMutex);
field_0x165A = 0;
mProbeStat = 0;
mCommand = CARD_ATTACH;
OSUnlockMutex(&mMutex);
OSSignalCond(&mCond);
} else if (!CARDProbe(0) && getStatus(0) != 0) {
OSLockMutex(&mMutex);
field_0x165A = 1;
mProbeStat = 1;
mCommand = CARD_DETACH;
OSUnlockMutex(&mMutex);
OSSignalCond(&mCond);