diff options
| author | JMC47 <JMC4789@gmail.com> | 2022-10-22 15:57:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 15:57:55 -0400 |
| commit | 804e42150e03532e63ecc5a7f6f6eed751a132af (patch) | |
| tree | 25d523aff0d247c90104b00029fd9d1ad991a302 /Source/Android | |
| parent | 5b69c67b3ac895998c8964b019f98e0eb0ff0222 (diff) | |
| parent | 88c57a00a351148c7c66787dc3af1c2e5e641305 (diff) | |
Merge pull request #11188 from GaryOderNichts/feature/vwii_ancast
Support for loading vWii System Menu
Diffstat (limited to 'Source/Android')
4 files changed, 18 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index 480e7472e3..8fa685128b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -161,9 +161,12 @@ public final class MainActivity extends AppCompatActivity if (WiiUtils.isSystemMenuInstalled()) { + int resId = WiiUtils.isSystemMenuvWii() ? + R.string.grid_menu_load_vwii_system_menu_installed : + R.string.grid_menu_load_wii_system_menu_installed; + menu.findItem(R.id.menu_load_wii_system_menu).setTitle( - getString(R.string.grid_menu_load_wii_system_menu_installed, - WiiUtils.getSystemMenuVersion())); + getString(resId, WiiUtils.getSystemMenuVersion())); } return true; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java index fb1d7e90cb..61dfedf5cd 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/WiiUtils.java @@ -32,6 +32,8 @@ public final class WiiUtils public static native boolean isSystemMenuInstalled(); + public static native boolean isSystemMenuvWii(); + public static native String getSystemMenuVersion(); public static native boolean syncSdFolderToSdImage(); diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 23eccd0c10..72c4d73356 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -441,6 +441,7 @@ <string name="grid_menu_online_system_update">Perform Online System Update</string> <string name="grid_menu_load_wii_system_menu">Load Wii System Menu</string> <string name="grid_menu_load_wii_system_menu_installed">Load Wii System Menu (%s)</string> + <string name="grid_menu_load_vwii_system_menu_installed">Load vWii System Menu (%s)</string> <string name="import_in_progress">Importing...</string> <string name="export_in_progress">Exporting...</string> <string name="do_not_close_app">Do not close the app!</string> diff --git a/Source/Android/jni/WiiUtils.cpp b/Source/Android/jni/WiiUtils.cpp index e26ac485e9..5939816b8e 100644 --- a/Source/Android/jni/WiiUtils.cpp +++ b/Source/Android/jni/WiiUtils.cpp @@ -165,6 +165,15 @@ Java_org_dolphinemu_dolphinemu_utils_WiiUtils_isSystemMenuInstalled(JNIEnv* env, return tmd.IsValid(); } +JNIEXPORT jboolean JNICALL +Java_org_dolphinemu_dolphinemu_utils_WiiUtils_isSystemMenuvWii(JNIEnv* env, jclass) +{ + IOS::HLE::Kernel ios; + const auto tmd = ios.GetES()->FindInstalledTMD(Titles::SYSTEM_MENU); + + return tmd.IsvWii(); +} + JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_utils_WiiUtils_getSystemMenuVersion(JNIEnv* env, jclass) { @@ -176,7 +185,7 @@ Java_org_dolphinemu_dolphinemu_utils_WiiUtils_getSystemMenuVersion(JNIEnv* env, return ToJString(env, ""); } - return ToJString(env, DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion())); + return ToJString(env, DiscIO::GetSysMenuVersionString(tmd.GetTitleVersion(), tmd.IsvWii())); } JNIEXPORT jboolean JNICALL |