diff options
| author | Trueffel <106771418+Trueffeloot@users.noreply.github.com> | 2023-09-18 06:39:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-18 07:39:57 +0300 |
| commit | 6726d1cf475c2ea193b5c2a63938e6869b21e10d (patch) | |
| tree | 2fa98fbd13798185f730a0553e79f7de5b6dfcb8 /src/d/d_name.cpp | |
| parent | d1db2e48ea68ac6997210c232d646204f39109c2 (diff) | |
d_menu_insect basically OK, optimizations, match one func in d_menu_ring (#1934)
* next d_menu_insect pass
* work on d_menu_ring & d_menu_insect
* d_menu_insect basically OK
* remove unused asm
Diffstat (limited to 'src/d/d_name.cpp')
| -rw-r--r-- | src/d/d_name.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 34f1b3dcdb..700017db3d 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -474,7 +474,7 @@ void dName_c::_move() { stick->checkTrigger(); (this->*SelProc[mSelProc])(); - if (mDoCPd_c::getTrigRight(0)) { + if (mDoCPd_c::getTrigRight(PAD_1)) { // BUG: this check only fails if the cursor is at exactly 7 // setMoji allows the cursor to reach 8, which is out of bounds here if (mCurPos != 7) { @@ -483,14 +483,14 @@ void dName_c::_move() { mCurPos++; nameCursorMove(); } - } else if (mDoCPd_c::getTrigLeft(0)) { + } else if (mDoCPd_c::getTrigLeft(PAD_1)) { if (mCurPos != 0) { mDoAud_seStart(Z2SE_SY_DUMMY, 0, 0, 0); mLastCurPos = mCurPos; mCurPos--; nameCursorMove(); } - } else if (mDoCPd_c::getTrigB(0)) { + } else if (mDoCPd_c::getTrigB(PAD_1)) { if (mCurPos == 0) { mDoAud_seStart(Z2SE_SY_MENU_BACK, 0, 0, 0); field_0x2ac = mSelProc; @@ -500,7 +500,7 @@ void dName_c::_move() { } else { backSpace(); } - } else if (mDoCPd_c::getTrigStart(0)) { + } else if (mDoCPd_c::getTrigStart(PAD_1)) { if ((mSelProc != PROC_MENU_SELECT || mSelMenu != MENU_END) && (mSelProc == PROC_MENU_SELECT || mSelProc == PROC_MOJI_SELECT)) { mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, 0, 0, 0); @@ -585,7 +585,7 @@ void dName_c::Wait() { // matches with literals #ifdef NONMATCHING void dName_c::MojiSelect() { - if (mDoCPd_c::getTrigA(0)) { + if (mDoCPd_c::getTrigA(PAD_1)) { selectMojiSet(); } else if (stick->checkRightTrigger()) { mDoAud_seStart(Z2SE_SY_NAME_CURSOR, 0, 0, 0); @@ -951,7 +951,7 @@ void dName_c::MenuSelect() { selectCursorPosSet(0); MenuSelectAnmInit(); mSelProc = PROC_MENU_SEL_ANM2; - } else if (mDoCPd_c::getTrigA(0)) { + } else if (mDoCPd_c::getTrigA(PAD_1)) { if (mSelMenu == MENU_END) { if (nameCheck() != 0) { mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0); @@ -962,7 +962,7 @@ void dName_c::MenuSelect() { mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); } menuAbtnSelect(); - } else if (mDoCPd_c::getTrigStart(0)) { + } else if (mDoCPd_c::getTrigStart(PAD_1)) { if (mSelMenu == MENU_END) { if (nameCheck() != 0) { mDoAud_seStart(Z2SE_SY_NAME_OK, NULL, 0, 0); |