mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-12 13:34:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_reset naming

Browse Source
This commit is contained in:
elijah-thomas774
2025-06-15 17:25:25 -04:00
parent 48493a4fc4
commit 4766819367
16 changed files with 278 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/toBeSorted/save_manager.cpp
+5 -6
View File
@@ -6,6 +6,7 @@
#include "d/d_dvd_unk.h"
#include "d/d_heap.h"
#include "d/d_message.h"
#include "d/d_reset.h"
#include "d/d_s_boot.h"
#include "d/d_sc_game.h"
#include "d/d_sys.h"
@@ -18,7 +19,6 @@
#include "toBeSorted/file_manager.h"
#include "toBeSorted/nand_request_thread.h"
#include "toBeSorted/nand_result_tracker.h"
#include "toBeSorted/reload_color_fader.h"
#include "rvl/NAND.h"
#include "rvl/TPL.h"
@@ -1437,10 +1437,9 @@ void SaveMgr::executeNandError() {
}
case 6: {
if (systemWindow->getField_0xE10() != 0) {
if (!ReloadColorFader::GetInstance()->fn_80068E80() &&
!ReloadColorFader::GetInstance()->fn_80067F60() &&
mPad::g_currentCore->downTrigger(/* A */ 0x800) && systemWindow->getField_0xDE0() != 2 &&
systemWindow->fn_80152F60() == true) {
if (!dReset::Manage_c::GetInstance()->FadeOutCalc() &&
!dReset::Manage_c::GetInstance()->IsFaderBlank() && mPad::getCore()->downTrigger(mPad::BUTTON_A) &&
systemWindow->getField_0xDE0() != 2 && systemWindow->fn_80152F60() == true) {
mStep = 7;
}
}
@@ -1457,7 +1456,7 @@ void SaveMgr::executeNandError() {
mStep = 9;
} else {
dCsBase_c::GetInstance()->setField704(false);
ReloadColorFader::GetInstance()->fn_80067FE0();
dReset::Manage_c::GetInstance()->SetInteriorReturnDataManager();
endState();
field_0x836 = 0;
}