Skip to content

Startup in favourites support // Select last rom on startup support #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coderkei merged 2 commits into from
Apr 8, 2026
Merged

Startup in favourites support // Select last rom on startup support #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221795c
treewide: startup in favorites folder
Deletecat Apr 8, 2026
fa9857c
mainlist, main: select last rom on startup
Deletecat Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions arm9/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,21 @@ int main(int argc, char* argv[]) {
irq().vblankStart();

// enter last directory
std::string lastDirectory = "...", lastFile = "...";
std::string lastDirectory = "...", lastFile = "...", favorite = "no";
if (gs().enterLastDirWhenBoot || gs().autorunWithLastRom) {
CIniFile f;
if (f.LoadIniFile(SFN_LAST_SAVEINFO)) {
lastFile = f.GetString("Save Info", "lastLoaded", "");
favorite = f.GetString("Save Info", "favorite", "no");
if ("" == lastFile) {
lastFile = "...";
} else if (gs().enterLastDirWhenBoot) {
size_t slashPos = lastFile.find_last_of('/');
if (lastFile.npos != slashPos) lastDirectory = lastFile.substr(0, slashPos + 1);
if (favorite == "yes") {
lastDirectory = "favorites:/";
} else {
size_t slashPos = lastFile.find_last_of('/');
if (lastFile.npos != slashPos) lastDirectory = lastFile.substr(0, slashPos + 1);
}
}
}
}
Expand Down Expand Up @@ -191,8 +196,11 @@ int main(int argc, char* argv[]) {
}

dbg_printf("lastDirectory '%s'\n", lastDirectory.c_str());
if (!wnd->_mainList->enterDir("..." != lastDirectory ? lastDirectory : gs().startupFolder))
if (!wnd->_mainList->enterDir("..." != lastDirectory ? lastDirectory : gs().startupFolder)) {
wnd->_mainList->enterDir("...");
} else {
wnd->_mainList->selectRom(lastFile);
}

*(u32*)(0xCFFFD0C) = 0x454D4D43;
while (*(u32*)(0xCFFFD0C) != 0) {
Expand All @@ -201,7 +209,7 @@ int main(int argc, char* argv[]) {

if (gs().autorunWithLastRom && "..." != lastFile) {
INPUT& inputs = updateInput();
if (!(inputs.keysHeld & KEY_B)) autoLaunchRom(lastFile);
if (!(inputs.keysHeld & KEY_B)) autoLaunchRom(lastFile, favorite);
}

while (true) {
Expand Down
9 changes: 9 additions & 0 deletions arm9/source/mainlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,15 @@ void cMainList::setRomInfo(u32 rowIndex, const DSRomInfo& info) {
}
}

void cMainList::selectRom(const std::string& romPath){
for(unsigned int row = 0; row < _rows.size(); row++){
if(romPath == _rows[row][REALNAME_COLUMN].text()){
selectRow(row);
break;
}
}
}

void cMainList::draw() {
updateInternalNames();
cListView::draw();
Expand Down
2 changes: 2 additions & 0 deletions arm9/source/mainlist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class cMainList : public akui::cListView {

void setRomInfo(u32 rowIndex, const DSRomInfo& info);

void selectRom(const std::string& romPath);

void setViewMode(VIEW_MODE mode);

std::string getSelectedFullPath();
Expand Down
2 changes: 1 addition & 1 deletion arm9/source/mainwnd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ void cMainWnd::launchSelected() {
progressWnd().show();
progressWnd().setPercent(0);
switch (launchRom(fullPath, rominfo,
rominfo.isHomebrew() && "BOOT.NDS" == _mainList->getSelectedShowName(), savesPath)) {
rominfo.isHomebrew() && "BOOT.NDS" == _mainList->getSelectedShowName(), savesPath, _mainList->IsFavorites() ? "yes" : "no")) {
case ELaunchNoFreeSpace:
title = LANG("no free space", "title");
text = LANG("no free space", "text");
Expand Down
12 changes: 6 additions & 6 deletions arm9/source/romlauncher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ static u32 SaveSize(SAVE_TYPE st) {
return result;
}

TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool aMenu, const std::string& savesPath) {
TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool aMenu, const std::string& savesPath, const std::string& favorite) {
u32 flags = 0;
long cheatOffset = 0;
size_t cheatSize = 0;
Expand Down Expand Up @@ -200,7 +200,7 @@ TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool
bigSaveSize);
if (!isBigSave) return ELaunchNoFreeSpace;
flags |= PATCH_SD_SAVE | (bigSaveMask << PATCH_SAVE_SHIFT);
saveManager().saveLastInfo(aFullPath);
saveManager().saveLastInfo(aFullPath, favorite);
} else {
SAVE_TYPE st = (SAVE_TYPE)aRomInfo.saveInfo().saveType;
if (ST_UNKNOWN == st) st = ST_AUTO;
Expand All @@ -217,7 +217,7 @@ TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool
if (cSaveManager::initializeSaveFile(useSavesPath, aRomInfo.saveInfo().getSlot(),
SaveSize(st))) {
flags |= PATCH_SD_SAVE | (SaveMask(st) << PATCH_SAVE_SHIFT);
saveManager().saveLastInfo(aFullPath);
saveManager().saveLastInfo(aFullPath, favorite);
} else {
return ELaunchNoFreeSpace;
}
Expand Down Expand Up @@ -255,7 +255,7 @@ TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool
}

} else {
if (!aMenu) saveManager().saveLastInfo(aFullPath);
if (!aMenu) saveManager().saveLastInfo(aFullPath, favorite);
if (gs().hbStrap == 1)
{
hb = true;
Expand All @@ -269,8 +269,8 @@ TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool
return ELaunchRomOk;
}

void autoLaunchRom(const std::string& aFullPath) {
void autoLaunchRom(const std::string& aFullPath, const std::string& favorite) {
DSRomInfo rominfo;
rominfo.MayBeDSRom(aFullPath);
if (rominfo.isDSRom()) launchRom(aFullPath, rominfo, false, "");
if (rominfo.isDSRom()) launchRom(aFullPath, rominfo, false, "", favorite);
}
4 changes: 2 additions & 2 deletions arm9/source/romlauncher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ enum TLaunchResult {
ELaunchNoFreeSpace
};

TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool aMenu, const std::string& savesPath);
void autoLaunchRom(const std::string& aFullPath);
TLaunchResult launchRom(const std::string& aFullPath, DSRomInfo& aRomInfo, bool aMenu, const std::string& savesPath, const std::string& favorite);
void autoLaunchRom(const std::string& aFullPath, const std::string& favorite);
5 changes: 3 additions & 2 deletions arm9/source/savemngr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,10 @@ void cSaveManager::updateCustomSaveList(const SAVE_INFO_EX& aSaveInfo) {
exportCustomSaveList(SFN_CUSTOM_SAVELIST);
}

bool cSaveManager::saveLastInfo(const std::string& romFilename) {
bool cSaveManager::saveLastInfo(const std::string& romFilename, const std::string& favorite) {
CIniFile f;
f.SetString("Save Info", "lastLoaded", romFilename);
f.SetString("Save Info", "favorite", favorite);
if (!f.SaveIniFile(SFN_LAST_SAVEINFO)) return false;

return true;
Expand All @@ -161,7 +162,7 @@ bool cSaveManager::loadLastInfo(std::string& lastLoadedFilename) {
bool cSaveManager::clearLastInfo() {
std::string loadLoadedFile;
if (loadLastInfo(loadLoadedFile)) {
return saveLastInfo("");
return saveLastInfo("","");
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion arm9/source/savemngr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class cSaveManager {

void updateCustomSaveList(const SAVE_INFO_EX& aSaveInfo);

bool saveLastInfo(const std::string& romFilename);
bool saveLastInfo(const std::string& romFilename, const std::string& favorite);

bool loadLastInfo(std::string& lastLoadedFilename);

Expand Down
Loading