From e5f86293199d56fc921cbe0eee69c9e1b14c0c04 Mon Sep 17 00:00:00 2001
From: Kei <7037851+coderkei@users.noreply.github.com>
Date: Sat, 28 Dec 2024 21:41:30 +0000
Subject: [PATCH] More fixes

- Fixed no sound issues on flashcarts running on TWL_FIRM (Not sure why this code was here, it also exists in WoodRPG)
- Fixed theme/language soft reset for DSi & 3DS version
- Removed old build files, these are now integrated into the makefile
---
 arm7/source/main.cpp    |  4 ----
 arm9/source/mainwnd.cpp | 12 ++++++++++--
 arm9/source/version.h   |  2 +-
 build.sh                |  5 -----
 clean.sh                |  3 ---
 5 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100755 build.sh
 delete mode 100755 clean.sh

diff --git a/arm7/source/main.cpp b/arm7/source/main.cpp
index 13b4629..29713eb 100644
--- a/arm7/source/main.cpp
+++ b/arm7/source/main.cpp
@@ -142,10 +142,6 @@ static void menuValue32Handler(u32 value, void* data) {
 }
 
 int main() {
-    // mute sound
-    if (2 == getSystem())
-        writePowerManagement(PM_CONTROL_REG,
-                             (readPowerManagement(PM_CONTROL_REG) & ~PM_SOUND_AMP) | PM_SOUND_MUTE);
     // switch on backlight on both screens
     writePowerManagement(PM_CONTROL_REG, readPowerManagement(PM_CONTROL_REG) | PM_BACKLIGHT_BOTTOM |
                                                  PM_BACKLIGHT_TOP);
diff --git a/arm9/source/mainwnd.cpp b/arm9/source/mainwnd.cpp
index 4cbd863..20b4fa8 100644
--- a/arm9/source/mainwnd.cpp
+++ b/arm9/source/mainwnd.cpp
@@ -608,7 +608,11 @@ void cMainWnd::setParam(void) {
             gs().uiName = uiNames[uiIndexAfter];
             gs().langDirectory = langNames[langIndexAfter];
             gs().saveSettings();
-            HomebrewLauncher().launchRom("/_nds/launcher.nds", "", 0, 0, 0);
+            #ifdef __DSIMODE__ 
+            HomebrewLauncher().launchRom("sd:/_nds/launcher.nds", "", 0, 0, 0);
+            #else
+            HomebrewLauncher().launchRom("fat:/_nds/launcher.nds", "", 0, 0, 0);
+            #endif
         }
     }
 
@@ -618,7 +622,11 @@ void cMainWnd::setParam(void) {
         if (ID_YES == ret) {
             gs().langDirectory = langNames[langIndexAfter];
             gs().saveSettings();
-            HomebrewLauncher().launchRom("/_nds/launcher.nds", "", 0, 0, 0);
+            #ifdef __DSIMODE__ 
+            HomebrewLauncher().launchRom("sd:/_nds/launcher.nds", "", 0, 0, 0);
+            #else
+            HomebrewLauncher().launchRom("fat:/_nds/launcher.nds", "", 0, 0, 0);
+            #endif
         }
     }
 
diff --git a/arm9/source/version.h b/arm9/source/version.h
index e23b4c5..b144167 100644
--- a/arm9/source/version.h
+++ b/arm9/source/version.h
@@ -8,7 +8,7 @@
 */
 
 #define AKMENU_VERSION_MAIN "1"
-#define AKMENU_VERSION_SUB "0"
+#define AKMENU_VERSION_SUB "1"
 
 #ifndef __KERNEL_LAUNCHER_SUPPORT__
 #define AKMENU_LOADER_NAME "nds-bootstrap"
diff --git a/build.sh b/build.sh
deleted file mode 100755
index dfbcd7f..0000000
--- a/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -e
-
-mkdir -p data
-make -C nds-bootloader LOADBIN=$PWD/data/load.bin
-make
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index eaa85fa..0000000
--- a/clean.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-make clean
-make -C nds-bootloader clean
-rm data/load.bin