diff --git a/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt b/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt index b3d921ff..5b699ef0 100644 --- a/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_control_panelNP/symbols.txt @@ -145,7 +145,7 @@ __vt__52sFStateMgr_c<13dAcOCtrlPnl_c,20sStateMethodUsr_FI_c> = .data:0x00000290; __vt__82sStateMgr_c<13dAcOCtrlPnl_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000002C0; // type:object size:0x30 __vt__29sFStateFct_c<13dAcOCtrlPnl_c> = .data:0x000002F0; // type:object size:0x14 __vt__26sFState_c<13dAcOCtrlPnl_c> = .data:0x00000308; // type:object size:0x18 -__vt__22dAcOCtrlPnl_c_callback = .data:0x00000320; // type:object size:0x18 +__vt__Q213dAcOCtrlPnl_c10callback_c = .data:0x00000320; // type:object size:0x18 @39632 = .data:0x00000338; // type:object size:0xC @39633 = .data:0x00000344; // type:object size:0xC @39634 = .data:0x00000350; // type:object size:0xC diff --git a/src/REL/d/a/obj/d_a_obj_control_panel.cpp b/src/REL/d/a/obj/d_a_obj_control_panel.cpp index 893c81bd..a6a0457d 100644 --- a/src/REL/d/a/obj/d_a_obj_control_panel.cpp +++ b/src/REL/d/a/obj/d_a_obj_control_panel.cpp @@ -114,7 +114,7 @@ bool dAcOCtrlPnl_c::createHeap() { void *dzb = getOarcDZB(oarcName, "ControlPanel"); void *plc = getOarcPLC(oarcName, "ControlPanel"); updateMatrix(); - return !mBgW.Set((cBgD_t *)dzb, (PLC *)plc, 0x81, &mWorldMtx, &mScale); + return !mBgW.Set((cBgD_t *)dzb, (PLC *)plc, cBgW::LOCK_e | cBgW::MOVE_BG_e, &mWorldMtx, &mScale); } int dAcOCtrlPnl_c::actorCreate() { @@ -431,23 +431,23 @@ void dAcOCtrlPnl_c::handleControl() { } if (!mIsGrabbing) { if (canGrabTile) { - dLytMeter_c::GetInstance()->setFlags(0x200); + dLytMeter_c::GetInstance()->setFlags(METER_BTN_NUN_STK); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_A, LytDoButtonRelated::ACT_IE_INFO_GRAB_2); } else { - dLytMeter_c::GetInstance()->clearFlags(0x200); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_NUN_STK); } } - dLytMeter_c::GetInstance()->setFlags(0x10); + dLytMeter_c::GetInstance()->setFlags(METER_BTN_B); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_B, LytDoButtonRelated::ACT_IE_ETC_DONE); - dLytMeter_c::GetInstance()->setFlags(0x400); + dLytMeter_c::GetInstance()->setFlags(METER_BTN_C); LytDoButtonRelated::set(LytDoButtonRelated::DO_BUTTON_C, LytDoButtonRelated::ACT_IE_ETC_RESET_PANELS); - dLytMeter_c::GetInstance()->clearFlags(0x1); - dLytMeter_c::GetInstance()->clearFlags(0x4); - dLytMeter_c::GetInstance()->clearFlags(0x8); - dLytMeter_c::GetInstance()->clearFlags(0x40); - dLytMeter_c::GetInstance()->clearFlags(0x80); - dLytMeter_c::GetInstance()->clearFlags(0x800); - dLytMeter_c::GetInstance()->setFlags(0x2); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_CROSS_UP); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_CROSS_LEFT); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_CROSS_RIGHT); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_MINUS); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_1); + dLytMeter_c::GetInstance()->clearFlags(METER_BTN_Z); + dLytMeter_c::GetInstance()->setFlags(METER_BTN_CROSS_DOWN); LytDoButtonRelated::setCrossDown(LytDoButtonRelated::ACT_IE_ETC_CENTER, true); bool downPressed = dPad::getDownTrigDown(); if (downPressed) {