diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a854ae72..ee0f56fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/arm9/source/globalsettings.cpp b/arm9/source/globalsettings.cpp index c7fc1994..91dbc089 100644 --- a/arm9/source/globalsettings.cpp +++ b/arm9/source/globalsettings.cpp @@ -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; @@ -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" @@ -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(); } diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp index 6e2e5c4f..db4e2ddf 100644 --- a/arm9/source/main.cpp +++ b/arm9/source/main.cpp @@ -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("..."); @@ -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(); diff --git a/arm9/source/mainwnd.cpp b/arm9/source/mainwnd.cpp index 2151a085..2de48010 100644 --- a/arm9/source/mainwnd.cpp +++ b/arm9/source/mainwnd.cpp @@ -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(); @@ -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); } diff --git a/language/Deutsch/language.txt b/language/Deutsch/language.txt index f4955db0..0aaaacd7 100644 --- a/language/Deutsch/language.txt +++ b/language/Deutsch/language.txt @@ -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) diff --git a/language/English/language.txt b/language/English/language.txt index cede906c..0d6c7341 100644 --- a/language/English/language.txt +++ b/language/English/language.txt @@ -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) diff --git "a/language/Espa\303\261ol/language.txt" "b/language/Espa\303\261ol/language.txt" index a8cebf36..e4aeaf3b 100644 --- "a/language/Espa\303\261ol/language.txt" +++ "b/language/Espa\303\261ol/language.txt" @@ -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). diff --git "a/language/Fran\303\247ais/language.txt" "b/language/Fran\303\247ais/language.txt" index 1cbd18b7..7b190b11 100644 --- "a/language/Fran\303\247ais/language.txt" +++ "b/language/Fran\303\247ais/language.txt" @@ -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) diff --git a/language/Italiano/language.txt b/language/Italiano/language.txt index 48ee296d..dc7a24c6 100644 --- a/language/Italiano/language.txt +++ b/language/Italiano/language.txt @@ -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) diff --git "a/language/\346\227\245\346\234\254\350\252\236 (JP)/language.txt" "b/language/\346\227\245\346\234\254\350\252\236 (JP)/language.txt" index 36d8f9b2..36a4dabe 100644 --- "a/language/\346\227\245\346\234\254\350\252\236 (JP)/language.txt" +++ "b/language/\346\227\245\346\234\254\350\252\236 (JP)/language.txt" @@ -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) diff --git "a/language/\347\256\200\344\275\223\344\270\255\346\226\207 (CN)/language.txt" "b/language/\347\256\200\344\275\223\344\270\255\346\226\207 (CN)/language.txt" index bc3e3487..ad3fd149 100644 --- "a/language/\347\256\200\344\275\223\344\270\255\346\226\207 (CN)/language.txt" +++ "b/language/\347\256\200\344\275\223\344\270\255\346\226\207 (CN)/language.txt" @@ -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) diff --git "a/language/\347\271\201\351\253\224\344\270\255\346\226\207 (ZH)/language.txt" "b/language/\347\271\201\351\253\224\344\270\255\346\226\207 (ZH)/language.txt" index b7284ccd..dced8887 100644 --- "a/language/\347\271\201\351\253\224\344\270\255\346\226\207 (ZH)/language.txt" +++ "b/language/\347\271\201\351\253\224\344\270\255\346\226\207 (ZH)/language.txt" @@ -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)