Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,9 @@ jobs:
with:
name: akmenu-next-3ds
path: package/akmenu-next-3ds.zip

- name: Upload akmenu-next-pico
uses: actions/upload-artifact@v4
with:
name: akmenu-next-pico
path: package/akmenu-next-pico.zip
11 changes: 1 addition & 10 deletions arm9/source/globalsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ void cGlobalSettings::loadSettings() {
: (temp == "nds") ? ESlot2Nds
: ESlot2Ask;

#ifdef __KERNEL_LAUNCHER_SUPPORT__
temp = ini.GetString("system", "nds-bootstrap", "false");
romLauncher = (temp != "false") ? ENdsBootstrapLauncher : EKernelLauncher;
#endif

struct stat st;
if (0 == stat((SFN_CHEATS).c_str(), &st)) cheatDB = true;

Expand Down Expand Up @@ -150,6 +145,7 @@ void cGlobalSettings::saveSettings() {
ini.SetInt("system", "pico", pico);
ini.SetInt("system", "icon", icon);
ini.SetInt("system", "phatCol", phatCol);
ini.SetInt("system", "autorunWithLastRom", autorunWithLastRom);
ini.SetString(
"system", "saveext",
saveExt ? ".sav"
Expand All @@ -174,11 +170,6 @@ void cGlobalSettings::saveSettings() {
: (slot2mode == ESlot2Ask) ? "ask"
: "ask" );

#ifdef __KERNEL_LAUNCHER_SUPPORT__
ini.SetString("system", "nds-bootstrap",
romLauncher == ENdsBootstrapLauncher ? "true" : "false");
#endif

ini.SaveIniFile(SFN_GLOBAL_SETTINGS);
updateSafeMode();
}
Expand Down
10 changes: 5 additions & 5 deletions arm9/source/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,6 @@ int main(int argc, char* argv[]) {
}
}

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

dbg_printf("lastDirectory '%s'\n", lastDirectory.c_str());
if (!wnd->_mainList->enterDir("..." != lastDirectory ? lastDirectory : gs().startupFolder))
wnd->_mainList->enterDir("...");
Expand All @@ -204,6 +199,11 @@ int main(int argc, char* argv[]) {
swiDelay(100);
}

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

while (true) {
timer().updateFps();

Expand Down
7 changes: 6 additions & 1 deletion arm9/source/mainwnd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,10 @@ void cMainWnd::setParam(void) {
_values.push_back(LANG("gba settings", "modegba"));
_values.push_back(LANG("gba settings", "modends"));
settingWnd.addSettingItem(LANG("gba settings", "mode"), _values, gs().slot2mode);
_values.clear();
_values.push_back(LANG("switches", "Disable"));
_values.push_back(LANG("switches", "Enable"));
settingWnd.addSettingItem(LANG("autorun", "text"), _values, gs().autorunWithLastRom);

if (isDSiMode()) {
_values.clear();
Expand Down Expand Up @@ -664,9 +668,10 @@ void cMainWnd::setParam(void) {
// page 5: other
gs().cheats = settingWnd.getItemSelection(4, 0);
gs().slot2mode = settingWnd.getItemSelection(4, 1);
gs().autorunWithLastRom = settingWnd.getItemSelection(4, 2);

if (isDSiMode()){
gs().hbStrap = settingWnd.getItemSelection(4, 2);
gs().hbStrap = settingWnd.getItemSelection(4, 3);
}


Expand Down
3 changes: 3 additions & 0 deletions language/Deutsch/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ tab2 = Zusatzfunktionen
title = System-Konfig.
safe mode = Safe Mode

[autorun]
text = Autorun Last ROM

[rom info]
title = Dateiinformation
file date = Letzte Änderung: %d/%d/%d %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/English/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ tab2 = Features
title = System settings
safe mode = Safe Mode

[autorun]
text = Autorun Last ROM

[rom info]
title = File Information
file date = Last change: %d/%d/%d %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/Español/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ tab2 = Características
title = Ajustes del sistema
safe mode = Modo Seguro

[autorun]
text = Autorun Last ROM

[rom info]
title = Información de elemento
file date = Último cambio: %d/%d/%d %02d:%02d:%02d(GMT).
Expand Down
3 changes: 3 additions & 0 deletions language/Français/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ tab2 = Options
title = Interface utilisateur
safe mode = Safe Mode

[autorun]
text = Autorun Last ROM

[rom info]
title = Propriétés du fichier
file date = Modifié le : %d/%d/%d %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/Italiano/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ tab2 = Caratteristiche
title = Impostazioni di sistema
safe mode = Modalità sicura

[autorun]
text = Autorun Last ROM

[rom info]
title = Informazioni
file date = Ultima modifica: %d/%d/%d %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/日本語 (JP)/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ tab2 = 機能
title = システム設定
safe mode = Safe Mode

[autorun]
text = Autorun Last ROM

[rom info]
title = ファイル詳細
file date = 最終更新: %d/%d/%d %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/简体中文 (CN)/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ tab2 = 功能
title = 系统选项
safe mode = 安全模式

[autorun]
text = Autorun Last ROM

[rom info]
title = 文件信息
file date = 最后写入:%d年%d月%d日 %02d:%02d:%02d(GMT)
Expand Down
3 changes: 3 additions & 0 deletions language/繁體中文 (ZH)/language.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ tab2 = 功能
title = 系統設定
safe mode = 安全模式

[autorun]
text = Autorun Last ROM

[rom info]
title = 檔案資訊
file date = 最後寫入:%d年%d月%d日 %02d:%02d:%02d(GMT)
Expand Down
Loading