WhiteTPoison · Oct 8, 2026 · Sep 27, 2026 · Sep 27, 2026 · Sep 26, 2026 · Aug 4, 2026
diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake
@@ -1,75 +1,75 @@
-cmake_minimum_required(VERSION 3.13)
-
-# for revision info
-if(GIT_FOUND)
-  # defines DOLPHIN_WC_REVISION
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-      OUTPUT_VARIABLE DOLPHIN_WC_REVISION
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # defines DOLPHIN_WC_DESCRIBE
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
-      OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  # remove hash (and trailing "-0" if needed) from description
-  string(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
-
-  # defines DOLPHIN_WC_BRANCH
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-      OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # defines DOLPHIN_WC_COMMITS_AHEAD_MASTER
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^master
-      OUTPUT_VARIABLE DOLPHIN_WC_COMMITS_AHEAD_MASTER
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-  # defines DOLPHIN_WC_TAG
-  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --exact-match HEAD
-    OUTPUT_VARIABLE DOLPHIN_WC_TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET)
-endif()
-
-string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
-
-# version number
-set(DOLPHIN_VERSION_MAJOR "v3.2.1")
-set(DOLPHIN_VERSION_MINOR "0")
-set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
-
-# If Dolphin is not built from a Git repository, default the version info to
-# reasonable values.
-if(NOT DOLPHIN_WC_REVISION)
-  set(DOLPHIN_WC_DESCRIBE "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}")
-  set(DOLPHIN_WC_REVISION "${DOLPHIN_WC_DESCRIBE} (no further info)")
-  set(DOLPHIN_WC_BRANCH "master")
-  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
-endif()
-
-# If this is a tag (i.e. a release), then set the current patch version and
-# the number of commits ahead to zero.
-if(DOLPHIN_WC_TAG)
-  set(DOLPHIN_VERSION_PATCH "0")
-  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
-endif()
-
-function(configure_source_file path)
-  configure_file(
-    "${PROJECT_SOURCE_DIR}/${path}.in"
-    "${PROJECT_BINARY_DIR}/${path}.tmp"
-  )
-
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_BINARY_DIR}/${path}.tmp" "${PROJECT_BINARY_DIR}/${path}")
-
-  file(REMOVE "${PROJECT_BINARY_DIR}/${path}.tmp")
-endfunction()
-
-configure_source_file("Source/Core/Common/scmrev.h")
-
-if(APPLE)
-  configure_source_file("Source/Core/VersionInfo.plist")
-endif()
-
-if(LINUX)
-  configure_source_file("Distribution/flatpak/org.projectplusgame.project-plus-dolphin.metainfo.xml")
-endif()
+cmake_minimum_required(VERSION 3.13)
+
+# for revision info
+if(GIT_FOUND)
+  # defines DOLPHIN_WC_REVISION
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+      OUTPUT_VARIABLE DOLPHIN_WC_REVISION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # defines DOLPHIN_WC_DESCRIBE
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+      OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # remove hash (and trailing "-0" if needed) from description
+  string(REGEX REPLACE "(-0)?-[^-]+((-dirty)?)$" "\\2" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
+
+  # defines DOLPHIN_WC_BRANCH
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # defines DOLPHIN_WC_COMMITS_AHEAD_MASTER
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD ^master
+      OUTPUT_VARIABLE DOLPHIN_WC_COMMITS_AHEAD_MASTER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # defines DOLPHIN_WC_TAG
+  execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --exact-match HEAD
+    OUTPUT_VARIABLE DOLPHIN_WC_TAG
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET)
+endif()
+
+string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC)
+
+# version number
+set(DOLPHIN_VERSION_MAJOR "v3.2.1")
+set(DOLPHIN_VERSION_MINOR "0")
+set(DOLPHIN_VERSION_PATCH ${DOLPHIN_WC_REVISION})
+
+# If Dolphin is not built from a Git repository, default the version info to
+# reasonable values.
+if(NOT DOLPHIN_WC_REVISION)
+  set(DOLPHIN_WC_DESCRIBE "${DOLPHIN_VERSION_MAJOR}.${DOLPHIN_VERSION_MINOR}")
+  set(DOLPHIN_WC_REVISION "${DOLPHIN_WC_DESCRIBE} (no further info)")
+  set(DOLPHIN_WC_BRANCH "master")
+  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
+endif()
+
+# If this is a tag (i.e. a release), then set the current patch version and
+# the number of commits ahead to zero.
+if(DOLPHIN_WC_TAG)
+  set(DOLPHIN_VERSION_PATCH "0")
+  set(DOLPHIN_WC_COMMITS_AHEAD_MASTER 0)
+endif()
+
+function(configure_source_file path)
+  configure_file(
+    "${PROJECT_SOURCE_DIR}/${path}.in"
+    "${PROJECT_BINARY_DIR}/${path}.tmp"
+  )
+
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${PROJECT_BINARY_DIR}/${path}.tmp" "${PROJECT_BINARY_DIR}/${path}")
+
+  file(REMOVE "${PROJECT_BINARY_DIR}/${path}.tmp")
+endfunction()
+
+configure_source_file("Source/Core/Common/scmrev.h")
+
+if(APPLE)
+  configure_source_file("Source/Core/VersionInfo.plist")
+endif()
+
+if(LINUX)
+  configure_source_file("Distribution/flatpak/org.projectplusgame.project-plus-dolphin.metainfo.xml")
+endif()
diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json
diff --git a/Data/Sys/GameSettings/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini
@@ -183,7 +183,10 @@ $60FPS [gamemasterplc]
 C20066EC 00000002
 C2C28028 EC2105B2
 FEC00890 00000000
+$Disable Heat Wave
+0419F83C 4E800020
 
 [Gecko_RetroAchievements_Verified]
 $Widescreen
 $60FPS
+$Disable Heat Wave
diff --git a/Data/Sys/GameSettings/GYAE78.ini b/Data/Sys/GameSettings/GYAE78.ini
@@ -0,0 +1,15 @@
+# GYAE78 - Barnyard
+
+[ActionReplay]
+$16:9 Widescreen
+0408DAF4 7F3AB300
+0404F3F0 42965B3A
+$60FPS
+040CB2E4 00000001
+$Remove Bloom/Fix Upper Left
+041A29F8 00000000
+
+[AR_RetroAchievements_Verified]
+$16:9 Widescreen
+$60FPS
+$Remove Bloom/Fix Upper Left
diff --git a/Data/Sys/GameSettings/RBU.ini b/Data/Sys/GameSettings/RBU.ini
@@ -0,0 +1,8 @@
+# 	RBUP08, RBUE08, RBUJ08, RBUK08 - Resident Evil: The Umbrella Chronicles
+
+[Gecko]
+$60FPS [Nick Reynolds]
+04158204 60000000
+
+[Gecko_RetroAchievements_Verified]
+$60FPS
diff --git a/Data/Sys/GameSettings/RDGEA4.ini b/Data/Sys/GameSettings/RDGEA4.ini
@@ -0,0 +1,10 @@
+# RDGEA4 - Castlevania Judgment
+
+[Gecko]
+$60fps [Nick Reynolds]
+040f0974 60000000
+040f0564 60000000
+040f055c 60000000
+
+[Gecko_RetroAchievements_Verified]
+$60fps
diff --git a/Data/Sys/GameSettings/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini
@@ -0,0 +1,8 @@
+# SBDE08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+
+[Gecko]
+$60FPS [solitarius]
+04736D44 00000001
+
+[Gecko_RetroAchievements_Verified]
+$60FPS
diff --git a/Data/Sys/GameSettings/SBDP08.ini b/Data/Sys/GameSettings/SBDP08.ini
@@ -0,0 +1,8 @@
+# SBDP08 - RESIDENT EVIL THE DARKSIDE CHRONICLES
+
+[Gecko]
+$60FPS [solitarius]
+04736D44 00000001
+
+[Gecko_RetroAchievements_Verified]
+$60FPS
diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts
@@ -97,6 +97,12 @@ android {
     namespace = "org.dolphinemu.dolphinemu"
 
     defaultConfig {
+        ndk {
+            // We only officially support arm64-v8a and x86_64.
+            // If you want to try building other ABIs anyway, you need -DENABLE_GENERIC=ON.
+            abiFilters += listOf("arm64-v8a", "x86_64") //, "armeabi-v7a", "x86"
+        }
+
         externalNativeBuild {
             cmake {
                 arguments(
@@ -105,7 +111,6 @@ android {
                     "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     // , "-DENABLE_GENERIC=ON"
                 )
-                abiFilters("arm64-v8a", "x86_64") //, "armeabi-v7a", "x86"
 
                 // Uncomment the line below if you don't want to build the C++ unit tests
                 //targets("main", "hook_impl", "main_hook", "gsl_alloc_hook", "file_redirect_hook")
@@ -165,6 +170,8 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.compose.ui.tooling.preview)
+
+    implementation(libs.accompanist)
 }
 
 fun getGitVersion(): String {

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK"/>
     <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"/>
     <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>
     <uses-permission android:name="android.permission.VIBRATE"/>