mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-05 03:07:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

pad fixes and stuff

Browse Source
This commit is contained in:
robojumper
2025-07-23 00:15:55 +02:00
parent 3b6081165a
commit f6178769c0
10 changed files with 400 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_reset.cpp
+5 -4
View File
@@ -113,8 +113,8 @@ void Manage_c::BootComplete(bool complete) {
bool Manage_c::CanExecSoftReset() const {
return mMode == SoftReset && mpFader->getStatus() == EGG::Fader::STATUS_PREPARE_IN && field_0x60 == 0 &&
dHbm::Manage_c::GetInstance()->getField_0x210() != 2 && dSndPlayerMgr_c::GetInstance()->fn_8035E2E0() &&
FileManager::GetInstance()->getField_0xA84D() != 1;
dHbm::Manage_c::GetInstance()->getState() != dHbm::Manage_c::HBM_MANAGE_ACTIVE &&
dSndPlayerMgr_c::GetInstance()->fn_8035E2E0() && FileManager::GetInstance()->getField_0xA84D() != 1;
}
void Manage_c::SetSoftResetFinish() {
@@ -234,7 +234,8 @@ void Manage_c::ModeProc() {
if (mMode != DiskWait && mMode != SafetyWait) {
ModeRequest(DiskWait);
}
} else if (mMode == Normal && dHbm::Manage_c::GetInstance()->getField_0x210() == 2) {
} else if (mMode == Normal &&
dHbm::Manage_c::GetInstance()->getState() == dHbm::Manage_c::HBM_MANAGE_ACTIVE) {
ModeRequest(HbmWait);
}
static void (Manage_c::*const procs[6])() = {
@@ -393,7 +394,7 @@ void Manage_c::ModeProc_HbmWait() {
DiskCheckModeRequest(true);
doFade = true;
} else {
if (dHbm::Manage_c::GetInstance()->getField_0x210() != 2) {
if (dHbm::Manage_c::GetInstance()->getState() != dHbm::Manage_c::HBM_MANAGE_ACTIVE) {
if (mShutdown) {
ModeRequestSafetyWait(Shutdown);
} else if (mRestart) {