From 34021b5ebc8d13478058e63b3d67cc1fccb9de29 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sun, 24 Oct 2021 16:29:38 +0200
Subject: [PATCH 1/3] Android: Allow starting game with Riivolution patches
 from the GUI

---
 .../Android/app/src/main/AndroidManifest.xml  |  5 ++
 .../dolphinemu/dolphinemu/NativeLibrary.java  |  5 +-
 .../activities/AppLinkActivity.java           |  2 +-
 .../activities/EmulationActivity.java         | 19 ++++---
 .../dolphinemu/adapters/GameAdapter.java      |  2 +-
 .../dialogs/GamePropertiesDialog.java         | 19 ++++---
 .../ui/RiivolutionBootActivity.java           | 50 +++++++++++++++++++
 .../fragments/EmulationFragment.java          | 10 ++--
 .../dolphinemu/ui/main/MainActivity.java      |  2 +-
 .../dolphinemu/ui/main/TvMainActivity.java    |  4 +-
 .../dolphinemu/utils/StartupHandler.java      |  2 +-
 .../res/layout/activity_riivolution_boot.xml  | 36 +++++++++++++
 .../app/src/main/res/values/strings.xml       |  6 ++-
 Source/Android/jni/MainAndroid.cpp            | 27 +++++++---
 Source/Core/DiscIO/RiivolutionParser.cpp      | 43 ++++++++++++++--
 Source/Core/DiscIO/RiivolutionParser.h        |  5 +-
 16 files changed, 200 insertions(+), 37 deletions(-)
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
 create mode 100644 Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml

diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml
index 5062741456..e46eaf7797 100644
--- a/Source/Android/app/src/main/AndroidManifest.xml
+++ b/Source/Android/app/src/main/AndroidManifest.xml
@@ -127,6 +127,11 @@
             android:label="@string/user_data_submenu"
             android:theme="@style/DolphinSettingsBase" />
 
+        <activity
+            android:name=".features.riivolution.ui.RiivolutionBootActivity"
+            android:exported="false"
+            android:theme="@style/DolphinBase" />
+
         <service
             android:name=".utils.DirectoryInitialization"
             android:exported="false"/>
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 123cd6c066..974832878e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -379,12 +379,13 @@ public final class NativeLibrary
   /**
    * Begins emulation.
    */
-  public static native void Run(String[] path);
+  public static native void Run(String[] path, boolean riivolution);
 
   /**
    * Begins emulation from the specified savestate.
    */
-  public static native void Run(String[] path, String savestatePath, boolean deleteSavestate);
+  public static native void Run(String[] path, boolean riivolution, String savestatePath,
+          boolean deleteSavestate);
 
   public static native void ChangeDisc(String path);
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
index 47b9a17842..b36acfe292 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
@@ -140,6 +140,6 @@ public class AppLinkActivity extends FragmentActivity
       mAfterDirectoryInitializationRunner.cancel();
       mAfterDirectoryInitializationRunner = null;
     }
-    EmulationActivity.launch(this, GameFileCacheService.findSecondDiscAndGetPaths(game));
+    EmulationActivity.launch(this, GameFileCacheService.findSecondDiscAndGetPaths(game), false);
   }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 9eeab5adcb..644fca916f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -79,11 +79,13 @@ public final class EmulationActivity extends AppCompatActivity
 
   private boolean activityRecreated;
   private String[] mPaths;
+  private boolean mRiivolution;
   private boolean mIgnoreWarnings;
   private static boolean sUserPausedEmulation;
   private boolean mMenuToastShown;
 
   public static final String EXTRA_SELECTED_GAMES = "SelectedGames";
+  public static final String EXTRA_RIIVOLUTION = "Riivolution";
   public static final String EXTRA_IGNORE_WARNINGS = "IgnoreWarnings";
   public static final String EXTRA_USER_PAUSED_EMULATION = "sUserPausedEmulation";
   public static final String EXTRA_MENU_TOAST_SHOWN = "MenuToastShown";
@@ -164,12 +166,12 @@ public final class EmulationActivity extends AppCompatActivity
             EmulationActivity.MENU_ACTION_MOTION_CONTROLS);
   }
 
-  public static void launch(FragmentActivity activity, String filePath)
+  public static void launch(FragmentActivity activity, String filePath, boolean riivolution)
   {
-    launch(activity, new String[]{filePath});
+    launch(activity, new String[]{filePath}, riivolution);
   }
 
-  public static void launch(FragmentActivity activity, String[] filePaths)
+  public static void launch(FragmentActivity activity, String[] filePaths, boolean riivolution)
   {
     if (sIgnoreLaunchRequests)
       return;
@@ -183,7 +185,7 @@ public final class EmulationActivity extends AppCompatActivity
               FileBrowserHelper.isPathEmptyOrValid(StringSetting.MAIN_RESOURCEPACK_PATH) &&
               FileBrowserHelper.isPathEmptyOrValid(StringSetting.MAIN_SD_PATH))
       {
-        launchWithoutChecks(activity, filePaths);
+        launchWithoutChecks(activity, filePaths, riivolution);
       }
       else
       {
@@ -192,18 +194,20 @@ public final class EmulationActivity extends AppCompatActivity
         builder.setPositiveButton(R.string.yes, (dialogInterface, i) ->
                 SettingsActivity.launch(activity, MenuTag.CONFIG_PATHS));
         builder.setNeutralButton(R.string.continue_anyway, (dialogInterface, i) ->
-                launchWithoutChecks(activity, filePaths));
+                launchWithoutChecks(activity, filePaths, riivolution));
         builder.show();
       }
     });
   }
 
-  private static void launchWithoutChecks(FragmentActivity activity, String[] filePaths)
+  private static void launchWithoutChecks(FragmentActivity activity, String[] filePaths,
+          boolean riivolution)
   {
     sIgnoreLaunchRequests = true;
 
     Intent launcher = new Intent(activity, EmulationActivity.class);
     launcher.putExtra(EXTRA_SELECTED_GAMES, filePaths);
+    launcher.putExtra(EXTRA_RIIVOLUTION, riivolution);
 
     activity.startActivity(launcher);
   }
@@ -251,6 +255,7 @@ public final class EmulationActivity extends AppCompatActivity
       // Get params we were passed
       Intent gameToEmulate = getIntent();
       mPaths = gameToEmulate.getStringArrayExtra(EXTRA_SELECTED_GAMES);
+      mRiivolution = gameToEmulate.getBooleanExtra(EXTRA_RIIVOLUTION, false);
       mIgnoreWarnings = gameToEmulate.getBooleanExtra(EXTRA_IGNORE_WARNINGS, false);
       sUserPausedEmulation = gameToEmulate.getBooleanExtra(EXTRA_USER_PAUSED_EMULATION, false);
       mMenuToastShown = false;
@@ -283,7 +288,7 @@ public final class EmulationActivity extends AppCompatActivity
             .findFragmentById(R.id.frame_emulation_fragment);
     if (mEmulationFragment == null)
     {
-      mEmulationFragment = EmulationFragment.newInstance(mPaths);
+      mEmulationFragment = EmulationFragment.newInstance(mPaths, mRiivolution);
       getSupportFragmentManager().beginTransaction()
               .add(R.id.frame_emulation_fragment, mEmulationFragment)
               .commit();
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
index 560c17f4fc..15210eea2f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
@@ -141,7 +141,7 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
     GameViewHolder holder = (GameViewHolder) view.getTag();
 
     String[] paths = GameFileCacheService.findSecondDiscAndGetPaths(holder.gameFile);
-    EmulationActivity.launch((FragmentActivity) view.getContext(), paths);
+    EmulationActivity.launch((FragmentActivity) view.getContext(), paths, false);
   }
 
   /**
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
index e0340139f2..0bdccda214 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
@@ -15,6 +15,7 @@ import org.dolphinemu.dolphinemu.DolphinApplication;
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.ConvertActivity;
 import org.dolphinemu.dolphinemu.features.cheats.ui.CheatsActivity;
+import org.dolphinemu.dolphinemu.features.riivolution.ui.RiivolutionBootActivity;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag;
@@ -34,6 +35,7 @@ public class GamePropertiesDialog extends DialogFragment
   private static final String ARG_GAME_ID = "game_id";
   private static final String ARG_GAMETDB_ID = "gametdb_id";
   public static final String ARG_REVISION = "revision";
+  public static final String ARG_DISC_NUMBER = "disc_number";
   private static final String ARG_PLATFORM = "platform";
   private static final String ARG_SHOULD_ALLOW_CONVERSION = "should_allow_conversion";
 
@@ -46,6 +48,7 @@ public class GamePropertiesDialog extends DialogFragment
     arguments.putString(ARG_GAME_ID, gameFile.getGameId());
     arguments.putString(ARG_GAMETDB_ID, gameFile.getGameTdbId());
     arguments.putInt(ARG_REVISION, gameFile.getRevision());
+    arguments.putInt(ARG_DISC_NUMBER, gameFile.getDiscNumber());
     arguments.putInt(ARG_PLATFORM, gameFile.getPlatform());
     arguments.putBoolean(ARG_SHOULD_ALLOW_CONVERSION, gameFile.shouldAllowConversion());
     fragment.setArguments(arguments);
@@ -61,6 +64,7 @@ public class GamePropertiesDialog extends DialogFragment
     final String gameId = requireArguments().getString(ARG_GAME_ID);
     final String gameTdbId = requireArguments().getString(ARG_GAMETDB_ID);
     final int revision = requireArguments().getInt(ARG_REVISION);
+    final int discNumber = requireArguments().getInt(ARG_DISC_NUMBER);
     final int platform = requireArguments().getInt(ARG_PLATFORM);
     final boolean shouldAllowConversion =
             requireArguments().getBoolean(ARG_SHOULD_ALLOW_CONVERSION);
@@ -75,14 +79,11 @@ public class GamePropertiesDialog extends DialogFragment
             GameDetailsDialog.newInstance(path).show(requireActivity()
                     .getSupportFragmentManager(), "game_details"));
 
-    if (shouldAllowConversion)
-    {
-      itemsBuilder.add(R.string.properties_convert, (dialog, i) ->
-              ConvertActivity.launch(getContext(), path));
-    }
-
     if (isDisc)
     {
+      itemsBuilder.add(R.string.properties_start_with_riivolution, (dialog, i) ->
+              RiivolutionBootActivity.launch(getContext(), path, gameId, revision, discNumber));
+
       itemsBuilder.add(R.string.properties_set_default_iso, (dialog, i) ->
       {
         try (Settings settings = new Settings())
@@ -94,6 +95,12 @@ public class GamePropertiesDialog extends DialogFragment
       });
     }
 
+    if (shouldAllowConversion)
+    {
+      itemsBuilder.add(R.string.properties_convert, (dialog, i) ->
+              ConvertActivity.launch(getContext(), path));
+    }
+
     itemsBuilder.add(R.string.properties_edit_game_settings, (dialog, i) ->
             SettingsActivity.launch(getContext(), MenuTag.SETTINGS, gameId, revision, isWii));
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
new file mode 100644
index 0000000000..1b6e55df98
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.ui;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+
+public class RiivolutionBootActivity extends AppCompatActivity
+{
+  private static final String ARG_GAME_PATH = "game_path";
+  private static final String ARG_GAME_ID = "game_id";
+  private static final String ARG_REVISION = "revision";
+  private static final String ARG_DISC_NUMBER = "disc_number";
+
+  public static void launch(Context context, String gamePath, String gameId, int revision,
+          int discNumber)
+  {
+    Intent launcher = new Intent(context, RiivolutionBootActivity.class);
+    launcher.putExtra(ARG_GAME_PATH, gamePath);
+    launcher.putExtra(ARG_GAME_ID, gameId);
+    launcher.putExtra(ARG_REVISION, revision);
+    launcher.putExtra(ARG_DISC_NUMBER, discNumber);
+    context.startActivity(launcher);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState)
+  {
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.activity_riivolution_boot);
+
+    Intent intent = getIntent();
+
+    String path = getIntent().getStringExtra(ARG_GAME_PATH);
+    String gameId = intent.getStringExtra(ARG_GAME_ID);
+    int revision = intent.getIntExtra(ARG_REVISION, -1);
+    int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1);
+
+    Button buttonStart = findViewById(R.id.button_start);
+    buttonStart.setOnClickListener((v) -> EmulationActivity.launch(this, path, true));
+  }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
index 4e9e864137..463b6ff9de 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
@@ -29,19 +29,22 @@ import java.io.File;
 public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback
 {
   private static final String KEY_GAMEPATHS = "gamepaths";
+  private static final String KEY_RIIVOLUTION = "riivolution";
 
   private InputOverlay mInputOverlay;
 
   private String[] mGamePaths;
+  private boolean mRiivolution;
   private boolean mRunWhenSurfaceIsValid;
   private boolean mLoadPreviousTemporaryState;
 
   private EmulationActivity activity;
 
-  public static EmulationFragment newInstance(String[] gamePaths)
+  public static EmulationFragment newInstance(String[] gamePaths, boolean riivolution)
   {
     Bundle args = new Bundle();
     args.putStringArray(KEY_GAMEPATHS, gamePaths);
+    args.putBoolean(KEY_RIIVOLUTION, riivolution);
 
     EmulationFragment fragment = new EmulationFragment();
     fragment.setArguments(args);
@@ -76,6 +79,7 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
     setRetainInstance(true);
 
     mGamePaths = getArguments().getStringArray(KEY_GAMEPATHS);
+    mRiivolution = getArguments().getBoolean(KEY_RIIVOLUTION);
   }
 
   /**
@@ -267,12 +271,12 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
         if (mLoadPreviousTemporaryState)
         {
           Log.debug("[EmulationFragment] Starting emulation thread from previous state.");
-          NativeLibrary.Run(mGamePaths, getTemporaryStateFilePath(), true);
+          NativeLibrary.Run(mGamePaths, mRiivolution, getTemporaryStateFilePath(), true);
         }
         else
         {
           Log.debug("[EmulationFragment] Starting emulation thread.");
-          NativeLibrary.Run(mGamePaths);
+          NativeLibrary.Run(mGamePaths, mRiivolution);
         }
         EmulationActivity.stopIgnoringLaunchRequests();
       }, "NativeEmulation");
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 f55486d51d..cc17b71aae 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
@@ -216,7 +216,7 @@ public final class MainActivity extends AppCompatActivity
         case MainPresenter.REQUEST_GAME_FILE:
           FileBrowserHelper.runAfterExtensionCheck(this, uri,
                   FileBrowserHelper.GAME_LIKE_EXTENSIONS,
-                  () -> EmulationActivity.launch(this, result.getData().toString()));
+                  () -> EmulationActivity.launch(this, result.getData().toString(), false));
           break;
 
         case MainPresenter.REQUEST_WAD_FILE:
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index 38b8fed094..f8a78c4934 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -153,7 +153,7 @@ public final class TvMainActivity extends FragmentActivity
 
                 // Start the emulation activity and send the path of the clicked ISO to it.
                 String[] paths = GameFileCacheService.findSecondDiscAndGetPaths(holder.gameFile);
-                EmulationActivity.launch(TvMainActivity.this, paths);
+                EmulationActivity.launch(TvMainActivity.this, paths, false);
               }
             });
   }
@@ -255,7 +255,7 @@ public final class TvMainActivity extends FragmentActivity
         case MainPresenter.REQUEST_GAME_FILE:
           FileBrowserHelper.runAfterExtensionCheck(this, uri,
                   FileBrowserHelper.GAME_LIKE_EXTENSIONS,
-                  () -> EmulationActivity.launch(this, result.getData().toString()));
+                  () -> EmulationActivity.launch(this, result.getData().toString(), false));
           break;
 
         case MainPresenter.REQUEST_WAD_FILE:
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
index 547d6934d1..5132e023bb 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
@@ -51,7 +51,7 @@ public final class StartupHandler
     if (start_files != null && start_files.length > 0)
     {
       // Start the emulation activity, send the ISO passed in and finish the main activity
-      EmulationActivity.launch(parent, start_files);
+      EmulationActivity.launch(parent, start_files, false);
       parent.finish();
     }
   }
diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
new file mode 100644
index 0000000000..6ca71f5b1f
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ScrollView
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/button_start">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="0dp" />
+
+    </ScrollView>
+
+    <Button
+        android:id="@+id/button_start"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/spacing_large"
+        android:text="@string/riivolution_start"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/scroll_view"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 10edec446a..2a74122e6e 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -399,8 +399,9 @@
 
     <!-- Game Properties Screen -->
     <string name="properties_details">Details</string>
-    <string name="properties_convert">Convert File</string>
+    <string name="properties_start_with_riivolution">Start with Riivolution Patches</string>
     <string name="properties_set_default_iso">Set as Default ISO</string>
+    <string name="properties_convert">Convert File</string>
     <string name="properties_edit_game_settings">Edit Game Settings</string>
     <string name="properties_edit_cheats">Edit Cheats</string>
     <string name="properties_clear_game_settings">Clear Game Settings and Cheats</string>
@@ -480,6 +481,9 @@ and a few other programs. It can efficiently compress encrypted Wii data, but no
 It can efficiently compress both junk data and encrypted Wii data.
     </string>
 
+    <!-- Riivolution Boot Screen -->
+    <string name="riivolution_start">Start</string>
+
     <!-- Emulation Menu -->
     <string name="pause_emulation">Pause Emulation</string>
     <string name="unpause_emulation">Unpause Emulation</string>
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 14197d79d2..c08106ee4f 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -48,6 +48,7 @@
 
 #include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
+#include "DiscIO/RiivolutionParser.h"
 #include "DiscIO/ScrubbedBlob.h"
 #include "DiscIO/Volume.h"
 
@@ -547,7 +548,7 @@ static float GetRenderSurfaceScale(JNIEnv* env)
   return env->CallStaticFloatMethod(native_library_class, get_render_surface_scale_method);
 }
 
-static void Run(JNIEnv* env, const std::vector<std::string>& paths,
+static void Run(JNIEnv* env, const std::vector<std::string>& paths, bool riivolution,
                 const std::optional<std::string>& savestate_path = {},
                 bool delete_savestate = false)
 {
@@ -564,6 +565,16 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths,
   if (boot)
     boot->delete_savestate = delete_savestate;
 
+  if (riivolution && std::holds_alternative<BootParameters::Disc>(boot->parameters))
+  {
+    const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX);
+    const DiscIO::Volume& volume = *std::get<BootParameters::Disc>(boot->parameters).volume;
+
+    AddRiivolutionPatches(boot.get(), DiscIO::Riivolution::GenerateRiivolutionPatchesFromConfig(
+                                          riivolution_dir, volume.GetGameID(), volume.GetRevision(),
+                                          volume.GetDiscNumber()));
+  }
+
   WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf, s_surf);
   wsi.render_surface_scale = GetRenderSurfaceScale(env);
 
@@ -616,17 +627,19 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths,
                             IDCache::GetFinishEmulationActivity());
 }
 
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2(
-    JNIEnv* env, jclass, jobjectArray jPaths)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2Z(
+    JNIEnv* env, jclass, jobjectArray jPaths, jboolean jRiivolution)
 {
-  Run(env, JStringArrayToVector(env, jPaths));
+  Run(env, JStringArrayToVector(env, jPaths), jRiivolution);
 }
 
 JNIEXPORT void JNICALL
-Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2Ljava_lang_String_2Z(
-    JNIEnv* env, jclass, jobjectArray jPaths, jstring jSavestate, jboolean jDeleteSavestate)
+Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2ZLjava_lang_String_2Z(
+    JNIEnv* env, jclass, jobjectArray jPaths, jboolean jRiivolution, jstring jSavestate,
+    jboolean jDeleteSavestate)
 {
-  Run(env, JStringArrayToVector(env, jPaths), GetJString(env, jSavestate), jDeleteSavestate);
+  Run(env, JStringArrayToVector(env, jPaths), jRiivolution, GetJString(env, jSavestate),
+      jDeleteSavestate);
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ChangeDisc(JNIEnv* env, jclass,
diff --git a/Source/Core/DiscIO/RiivolutionParser.cpp b/Source/Core/DiscIO/RiivolutionParser.cpp
index 92f37444a0..8a121d7e8b 100644
--- a/Source/Core/DiscIO/RiivolutionParser.cpp
+++ b/Source/Core/DiscIO/RiivolutionParser.cpp
@@ -9,8 +9,10 @@
 #include <string_view>
 #include <vector>
 
+#include <fmt/format.h>
 #include <pugixml.hpp>
 
+#include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/StringUtil.h"
@@ -354,7 +356,7 @@ std::vector<Patch> GenerateRiivolutionPatchesFromGameModDescriptor(
     {
       for (auto& option : section.m_options)
       {
-        const auto* info = [&]() -> const DiscIO::GameModDescriptorRiivolutionPatchOption* {
+        const auto* info = [&]() -> const GameModDescriptorRiivolutionPatchOption* {
           for (const auto& o : patch_info.options)
           {
             if (o.section_name == section.m_name)
@@ -374,14 +376,47 @@ std::vector<Patch> GenerateRiivolutionPatchesFromGameModDescriptor(
 
     for (auto& p : parsed->GeneratePatches(game_id))
     {
-      p.m_file_data_loader = std::make_shared<DiscIO::Riivolution::FileDataLoaderHostFS>(
-          patch_info.root, parsed->m_xml_path, p.m_root);
+      p.m_file_data_loader =
+          std::make_shared<FileDataLoaderHostFS>(patch_info.root, parsed->m_xml_path, p.m_root);
       result.emplace_back(std::move(p));
     }
   }
   return result;
 }
 
+std::vector<Patch> GenerateRiivolutionPatchesFromConfig(const std::string root_directory,
+                                                        const std::string& game_id,
+                                                        std::optional<u16> revision,
+                                                        std::optional<u8> disc_number)
+{
+  std::vector<Patch> result;
+
+  // The way Riivolution stores settings only makes sense for standard game IDs.
+  if (!(game_id.size() == 4 || game_id.size() == 6))
+    return result;
+
+  const std::optional<Config> config = ParseConfigFile(
+      fmt::format("{}/riivolution/config/{}.xml", root_directory, game_id.substr(0, 4)));
+
+  for (const std::string& path : Common::DoFileSearch({root_directory + "riivolution"}, {".xml"}))
+  {
+    std::optional<Disc> parsed = ParseFile(path);
+    if (!parsed || !parsed->IsValidForGame(game_id, revision, disc_number))
+      continue;
+    if (config)
+      ApplyConfigDefaults(&*parsed, *config);
+
+    for (auto& patch : parsed->GeneratePatches(game_id))
+    {
+      patch.m_file_data_loader =
+          std::make_shared<FileDataLoaderHostFS>(root_directory, parsed->m_xml_path, patch.m_root);
+      result.emplace_back(std::move(patch));
+    }
+  }
+
+  return result;
+}
+
 std::optional<Config> ParseConfigFile(const std::string& filename)
 {
   ::File::IOFile f(filename, "rb");
@@ -460,7 +495,7 @@ void ApplyConfigDefaults(Disc* disc, const Config& config)
 {
   for (const auto& config_option : config.m_options)
   {
-    auto* matching_option = [&]() -> DiscIO::Riivolution::Option* {
+    auto* matching_option = [&]() -> Option* {
       for (auto& section : disc->m_sections)
       {
         for (auto& option : section.m_options)
diff --git a/Source/Core/DiscIO/RiivolutionParser.h b/Source/Core/DiscIO/RiivolutionParser.h
index d826425e5a..f9f03f67c1 100644
--- a/Source/Core/DiscIO/RiivolutionParser.h
+++ b/Source/Core/DiscIO/RiivolutionParser.h
@@ -143,7 +143,6 @@ struct Memory
   std::vector<u8> m_original;
 
   // If true, this memory patch is an ocarina-style patch.
-  // TODO: I'm unsure what this means exactly, need to check some examples...
   bool m_ocarina = false;
 
   // If true, the offset is not known, and instead we should search for the m_original bytes in
@@ -223,6 +222,10 @@ std::optional<Disc> ParseString(std::string_view xml, std::string xml_path);
 std::vector<Patch> GenerateRiivolutionPatchesFromGameModDescriptor(
     const GameModDescriptorRiivolution& descriptor, const std::string& game_id,
     std::optional<u16> revision, std::optional<u8> disc_number);
+std::vector<Patch> GenerateRiivolutionPatchesFromConfig(const std::string root_directory,
+                                                        const std::string& game_id,
+                                                        std::optional<u16> revision,
+                                                        std::optional<u8> disc_number);
 std::optional<Config> ParseConfigFile(const std::string& filename);
 std::optional<Config> ParseConfigString(std::string_view xml);
 std::string WriteConfigString(const Config& config);

From 22a1f3422cd99fd88c2671d05955a4860dc6e959 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sun, 24 Oct 2021 21:06:59 +0200
Subject: [PATCH 2/3] Android: Add Riivolution patch configuration

---
 .../riivolution/model/RiivolutionPatches.java |  86 ++++++++
 .../riivolution/ui/RiivolutionAdapter.java    |  84 ++++++++
 .../ui/RiivolutionBootActivity.java           |  41 +++-
 .../riivolution/ui/RiivolutionItem.java       |  40 ++++
 .../riivolution/ui/RiivolutionViewHolder.java |  84 ++++++++
 .../res/layout/activity_riivolution_boot.xml  |   3 +-
 .../layout/list_item_riivolution_header.xml   |   9 +
 .../layout/list_item_riivolution_option.xml   |  30 +++
 .../app/src/main/res/values/strings.xml       |   1 +
 Source/Android/jni/AndroidCommon/IDCache.cpp  |  21 ++
 Source/Android/jni/AndroidCommon/IDCache.h    |   3 +
 Source/Android/jni/CMakeLists.txt             |   1 +
 Source/Android/jni/RiivolutionPatches.cpp     | 193 ++++++++++++++++++
 13 files changed, 594 insertions(+), 2 deletions(-)
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionAdapter.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionItem.java
 create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionViewHolder.java
 create mode 100644 Source/Android/app/src/main/res/layout/list_item_riivolution_header.xml
 create mode 100644 Source/Android/app/src/main/res/layout/list_item_riivolution_option.xml
 create mode 100644 Source/Android/jni/RiivolutionPatches.cpp

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.java
new file mode 100644
index 0000000000..6d2ff51b6b
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches.java
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.model;
+
+import androidx.annotation.Keep;
+
+public class RiivolutionPatches
+{
+  private String mGameId;
+  private int mRevision;
+  private int mDiscNumber;
+
+  private boolean mUnsavedChanges = false;
+
+  @Keep
+  private long mPointer;
+
+  public RiivolutionPatches(String gameId, int revision, int discNumber)
+  {
+    mGameId = gameId;
+    mRevision = revision;
+    mDiscNumber = discNumber;
+
+    mPointer = initialize();
+  }
+
+  @Override
+  public native void finalize();
+
+  private static native long initialize();
+
+  public native int getDiscCount();
+
+  public native String getDiscName(int discIndex);
+
+  public native int getSectionCount(int discIndex);
+
+  public native String getSectionName(int discIndex, int sectionIndex);
+
+  public native int getOptionCount(int discIndex, int sectionIndex);
+
+  public native String getOptionName(int discIndex, int sectionIndex, int optionIndex);
+
+  public native int getChoiceCount(int discIndex, int sectionIndex, int optionIndex);
+
+  public native String getChoiceName(int discIndex, int sectionIndex, int optionIndex,
+          int choiceIndex);
+
+  /**
+   * @return 0 if no choice is selected, otherwise the index of the selected choice plus one.
+   */
+  public native int getSelectedChoice(int discIndex, int sectionIndex, int optionIndex);
+
+  /**
+   * @param choiceIndex 0 to select no choice, otherwise the choice index plus one.
+   */
+  public void setSelectedChoice(int discIndex, int sectionIndex, int optionIndex, int choiceIndex)
+  {
+    mUnsavedChanges = true;
+    setSelectedChoiceImpl(discIndex, sectionIndex, optionIndex, choiceIndex);
+  }
+
+  /**
+   * @param choiceIndex 0 to select no choice, otherwise the choice index plus one.
+   */
+  private native void setSelectedChoiceImpl(int discIndex, int sectionIndex, int optionIndex,
+          int choiceIndex);
+
+  public void loadConfig()
+  {
+    loadConfigImpl(mGameId, mRevision, mDiscNumber);
+  }
+
+  private native void loadConfigImpl(String gameId, int revision, int discNumber);
+
+  public void saveConfig()
+  {
+    if (mUnsavedChanges)
+    {
+      mUnsavedChanges = false;
+      saveConfigImpl(mGameId);
+    }
+  }
+
+  private native void saveConfigImpl(String gameId);
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionAdapter.java
new file mode 100644
index 0000000000..d1fe8ca5b3
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionAdapter.java
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.ui;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
+
+import java.util.ArrayList;
+
+public class RiivolutionAdapter extends RecyclerView.Adapter<RiivolutionViewHolder>
+{
+  private final Context mContext;
+  private final RiivolutionPatches mPatches;
+  private final ArrayList<RiivolutionItem> mItems = new ArrayList<>();
+
+  public RiivolutionAdapter(Context context, RiivolutionPatches patches)
+  {
+    mContext = context;
+    mPatches = patches;
+
+    int discCount = mPatches.getDiscCount();
+    for (int i = 0; i < discCount; i++)
+    {
+      mItems.add(new RiivolutionItem(i));
+
+      int sectionCount = mPatches.getSectionCount(i);
+      for (int j = 0; j < sectionCount; j++)
+      {
+        mItems.add(new RiivolutionItem(i, j));
+
+        int optionCount = mPatches.getOptionCount(i, j);
+        for (int k = 0; k < optionCount; k++)
+        {
+          mItems.add(new RiivolutionItem(i, j, k));
+        }
+      }
+    }
+  }
+
+  @NonNull @Override
+  public RiivolutionViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
+  {
+    LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+
+    switch (viewType)
+    {
+      case RiivolutionViewHolder.TYPE_HEADER:
+        View headerView = inflater.inflate(R.layout.list_item_riivolution_header, parent, false);
+        return new RiivolutionViewHolder(headerView);
+      case RiivolutionViewHolder.TYPE_OPTION:
+        View optionView = inflater.inflate(R.layout.list_item_riivolution_option, parent, false);
+        return new RiivolutionViewHolder(optionView);
+      default:
+        throw new UnsupportedOperationException();
+    }
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull RiivolutionViewHolder holder, int position)
+  {
+    holder.bind(mContext, mPatches, mItems.get(position));
+  }
+
+  @Override
+  public int getItemCount()
+  {
+    return mItems.size();
+  }
+
+  @Override
+  public int getItemViewType(int position)
+  {
+    return mItems.get(position).mOptionIndex != -1 ?
+            RiivolutionViewHolder.TYPE_OPTION : RiivolutionViewHolder.TYPE_HEADER;
+  }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
index 1b6e55df98..37921c4af8 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -7,10 +7,15 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
+import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
+import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
 
 public class RiivolutionBootActivity extends AppCompatActivity
 {
@@ -19,6 +24,8 @@ public class RiivolutionBootActivity extends AppCompatActivity
   private static final String ARG_REVISION = "revision";
   private static final String ARG_DISC_NUMBER = "disc_number";
 
+  private RiivolutionPatches mPatches;
+
   public static void launch(Context context, String gamePath, String gameId, int revision,
           int discNumber)
   {
@@ -45,6 +52,38 @@ public class RiivolutionBootActivity extends AppCompatActivity
     int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1);
 
     Button buttonStart = findViewById(R.id.button_start);
-    buttonStart.setOnClickListener((v) -> EmulationActivity.launch(this, path, true));
+    buttonStart.setOnClickListener((v) ->
+    {
+      if (mPatches != null)
+        mPatches.saveConfig();
+
+      EmulationActivity.launch(this, path, true);
+    });
+
+    new Thread(() ->
+    {
+      RiivolutionPatches patches = new RiivolutionPatches(gameId, revision, discNumber);
+      patches.loadConfig();
+      runOnUiThread(() -> populateList(patches));
+    }).start();
+  }
+
+  @Override
+  protected void onStop()
+  {
+    super.onStop();
+
+    if (mPatches != null)
+      mPatches.saveConfig();
+  }
+
+  private void populateList(RiivolutionPatches patches)
+  {
+    mPatches = patches;
+
+    RecyclerView recyclerView = findViewById(R.id.recycler_view);
+
+    recyclerView.setAdapter(new RiivolutionAdapter(this, patches));
+    recyclerView.setLayoutManager(new LinearLayoutManager(this));
   }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionItem.java
new file mode 100644
index 0000000000..8d2ef17e5b
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionItem.java
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.ui;
+
+public class RiivolutionItem
+{
+  public final int mDiscIndex;
+  public final int mSectionIndex;
+  public final int mOptionIndex;
+
+  /**
+   * Constructor for a disc.
+   */
+  public RiivolutionItem(int discIndex)
+  {
+    mDiscIndex = discIndex;
+    mSectionIndex = -1;
+    mOptionIndex = -1;
+  }
+
+  /**
+   * Constructor for a section.
+   */
+  public RiivolutionItem(int discIndex, int sectionIndex)
+  {
+    mDiscIndex = discIndex;
+    mSectionIndex = sectionIndex;
+    mOptionIndex = -1;
+  }
+
+  /**
+   * Constructor for an option.
+   */
+  public RiivolutionItem(int discIndex, int sectionIndex, int optionIndex)
+  {
+    mDiscIndex = discIndex;
+    mSectionIndex = sectionIndex;
+    mOptionIndex = optionIndex;
+  }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionViewHolder.java
new file mode 100644
index 0000000000..e51a575262
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionViewHolder.java
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.riivolution.ui;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
+
+public class RiivolutionViewHolder extends RecyclerView.ViewHolder
+        implements AdapterView.OnItemSelectedListener
+{
+  public static final int TYPE_HEADER = 0;
+  public static final int TYPE_OPTION = 1;
+
+  private final TextView mTextView;
+  private final Spinner mSpinner;
+
+  private RiivolutionPatches mPatches;
+  private RiivolutionItem mItem;
+
+  public RiivolutionViewHolder(@NonNull View itemView)
+  {
+    super(itemView);
+
+    mTextView = itemView.findViewById(R.id.text_name);
+    mSpinner = itemView.findViewById(R.id.spinner_choice);
+  }
+
+  public void bind(Context context, RiivolutionPatches patches, RiivolutionItem item)
+  {
+    String text;
+    if (item.mOptionIndex != -1)
+      text = patches.getOptionName(item.mDiscIndex, item.mSectionIndex, item.mOptionIndex);
+    else if (item.mSectionIndex != -1)
+      text = patches.getSectionName(item.mDiscIndex, item.mSectionIndex);
+    else
+      text = patches.getDiscName(item.mDiscIndex);
+    mTextView.setText(text);
+
+    if (item.mOptionIndex != -1)
+    {
+      mPatches = patches;
+      mItem = item;
+
+      ArrayAdapter<String> adapter = new ArrayAdapter<>(context,
+              R.layout.list_item_riivolution_header);
+
+      int choiceCount = patches.getChoiceCount(mItem.mDiscIndex, mItem.mSectionIndex,
+              mItem.mOptionIndex);
+      adapter.add(context.getString(R.string.riivolution_disabled));
+      for (int i = 0; i < choiceCount; i++)
+      {
+        adapter.add(patches.getChoiceName(mItem.mDiscIndex, mItem.mSectionIndex, mItem.mOptionIndex,
+                i));
+      }
+
+      mSpinner.setAdapter(adapter);
+      mSpinner.setSelection(patches.getSelectedChoice(mItem.mDiscIndex, mItem.mSectionIndex,
+              mItem.mOptionIndex));
+      mSpinner.setOnItemSelectedListener(this);
+    }
+  }
+
+  @Override
+  public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+  {
+    mPatches.setSelectedChoice(mItem.mDiscIndex, mItem.mSectionIndex, mItem.mOptionIndex, position);
+  }
+
+  @Override
+  public void onNothingSelected(AdapterView<?> parent)
+  {
+  }
+}
diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
index 6ca71f5b1f..3d136367d5 100644
--- a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
+++ b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -18,7 +18,8 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp" />
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/spacing_medlarge" />
 
     </ScrollView>
 
diff --git a/Source/Android/app/src/main/res/layout/list_item_riivolution_header.xml b/Source/Android/app/src/main/res/layout/list_item_riivolution_header.xml
new file mode 100644
index 0000000000..b31ee13c05
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/list_item_riivolution_header.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:id="@+id/text_name"
+          tools:text="Example Section"
+          android:paddingHorizontal="@dimen/spacing_large"
+          android:paddingVertical="@dimen/spacing_medlarge" />
diff --git a/Source/Android/app/src/main/res/layout/list_item_riivolution_option.xml b/Source/Android/app/src/main/res/layout/list_item_riivolution_option.xml
new file mode 100644
index 0000000000..a778c3bfea
--- /dev/null
+++ b/Source/Android/app/src/main/res/layout/list_item_riivolution_option.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/text_name"
+        tools:text="Example Option"
+        android:layout_marginHorizontal="@dimen/spacing_large"
+        android:layout_marginVertical="@dimen/spacing_medlarge"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/spinner_choice"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <Spinner
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/spinner_choice"
+        app:layout_constraintStart_toEndOf="@id/text_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 2a74122e6e..56feb15e21 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -482,6 +482,7 @@ It can efficiently compress both junk data and encrypted Wii data.
     </string>
 
     <!-- Riivolution Boot Screen -->
+    <string name="riivolution_disabled">Disabled</string>
     <string name="riivolution_start">Start</string>
 
     <!-- Emulation Menu -->
diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index d0a7710e1a..a5a52a4f36 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -70,6 +70,9 @@ static jclass s_patch_cheat_class;
 static jfieldID s_patch_cheat_pointer;
 static jmethodID s_patch_cheat_constructor;
 
+static jclass s_riivolution_patches_class;
+static jfieldID s_riivolution_patches_pointer;
+
 namespace IDCache
 {
 JNIEnv* GetEnvForThread()
@@ -325,6 +328,16 @@ jmethodID GetPatchCheatConstructor()
   return s_patch_cheat_constructor;
 }
 
+jclass GetRiivolutionPatchesClass()
+{
+  return s_riivolution_patches_class;
+}
+
+jfieldID GetRiivolutionPatchesPointer()
+{
+  return s_riivolution_patches_pointer;
+}
+
 }  // namespace IDCache
 
 extern "C" {
@@ -454,6 +467,13 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_patch_cheat_constructor = env->GetMethodID(patch_cheat_class, "<init>", "(J)V");
   env->DeleteLocalRef(patch_cheat_class);
 
+  const jclass riivolution_patches_class =
+      env->FindClass("org/dolphinemu/dolphinemu/features/riivolution/model/RiivolutionPatches");
+  s_riivolution_patches_class =
+      reinterpret_cast<jclass>(env->NewGlobalRef(riivolution_patches_class));
+  s_riivolution_patches_pointer = env->GetFieldID(riivolution_patches_class, "mPointer", "J");
+  env->DeleteLocalRef(riivolution_patches_class);
+
   return JNI_VERSION;
 }
 
@@ -477,5 +497,6 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_ar_cheat_class);
   env->DeleteGlobalRef(s_gecko_cheat_class);
   env->DeleteGlobalRef(s_patch_cheat_class);
+  env->DeleteGlobalRef(s_riivolution_patches_class);
 }
 }
diff --git a/Source/Android/jni/AndroidCommon/IDCache.h b/Source/Android/jni/AndroidCommon/IDCache.h
index 3268c842c3..8dc93d60ba 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.h
+++ b/Source/Android/jni/AndroidCommon/IDCache.h
@@ -69,4 +69,7 @@ jclass GetPatchCheatClass();
 jfieldID GetPatchCheatPointer();
 jmethodID GetPatchCheatConstructor();
 
+jclass GetRiivolutionPatchesClass();
+jfieldID GetRiivolutionPatchesPointer();
+
 }  // namespace IDCache
diff --git a/Source/Android/jni/CMakeLists.txt b/Source/Android/jni/CMakeLists.txt
index 6d28a334cf..74d9d90e03 100644
--- a/Source/Android/jni/CMakeLists.txt
+++ b/Source/Android/jni/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(main SHARED
   GameList/GameFileCache.cpp
   IniFile.cpp
   MainAndroid.cpp
+  RiivolutionPatches.cpp
   WiiUtils.cpp
 )
 
diff --git a/Source/Android/jni/RiivolutionPatches.cpp b/Source/Android/jni/RiivolutionPatches.cpp
new file mode 100644
index 0000000000..6d088fe029
--- /dev/null
+++ b/Source/Android/jni/RiivolutionPatches.cpp
@@ -0,0 +1,193 @@
+// Copyright 2021 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include <fmt/format.h>
+#include <jni.h>
+
+#include "Common/FileSearch.h"
+#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
+#include "DiscIO/RiivolutionParser.h"
+#include "jni/AndroidCommon/AndroidCommon.h"
+#include "jni/AndroidCommon/IDCache.h"
+
+static std::vector<DiscIO::Riivolution::Disc>* GetPointer(JNIEnv* env, jobject obj)
+{
+  return reinterpret_cast<std::vector<DiscIO::Riivolution::Disc>*>(
+      env->GetLongField(obj, IDCache::GetRiivolutionPatchesPointer()));
+}
+
+static std::vector<DiscIO::Riivolution::Disc>& GetReference(JNIEnv* env, jobject obj)
+{
+  return *GetPointer(env, obj);
+}
+
+extern "C" {
+
+JNIEXPORT jlong JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_initialize(JNIEnv* env,
+                                                                                        jclass obj)
+{
+  return reinterpret_cast<jlong>(new std::vector<DiscIO::Riivolution::Disc>);
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_finalize(JNIEnv* env,
+                                                                                      jobject obj)
+{
+  delete GetPointer(env, obj);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getDiscCount(
+    JNIEnv* env, jobject obj)
+{
+  return GetReference(env, obj).size();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getDiscName(
+    JNIEnv* env, jobject obj, jint disc_index)
+{
+  std::string filename, extension;
+  SplitPath(GetReference(env, obj)[disc_index].m_xml_path, nullptr, &filename, &extension);
+  return ToJString(env, filename + extension);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getSectionCount(
+    JNIEnv* env, jobject obj, jint disc_index)
+{
+  return GetReference(env, obj)[disc_index].m_sections.size();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getSectionName(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index)
+{
+  return ToJString(env, GetReference(env, obj)[disc_index].m_sections[section_index].m_name);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getOptionCount(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index)
+{
+  return GetReference(env, obj)[disc_index].m_sections[section_index].m_options.size();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getOptionName(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index, jint option_index)
+{
+  return ToJString(
+      env,
+      GetReference(env, obj)[disc_index].m_sections[section_index].m_options[option_index].m_name);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getChoiceCount(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index, jint option_index)
+{
+  return GetReference(env, obj)[disc_index]
+      .m_sections[section_index]
+      .m_options[option_index]
+      .m_choices.size();
+}
+
+JNIEXPORT jstring JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getChoiceName(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index, jint option_index,
+    jint choice_index)
+{
+  return ToJString(env, GetReference(env, obj)[disc_index]
+                            .m_sections[section_index]
+                            .m_options[option_index]
+                            .m_choices[choice_index]
+                            .m_name);
+}
+
+JNIEXPORT jint JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_getSelectedChoice(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index, jint option_index)
+{
+  return GetReference(env, obj)[disc_index]
+      .m_sections[section_index]
+      .m_options[option_index]
+      .m_selected_choice;
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_setSelectedChoiceImpl(
+    JNIEnv* env, jobject obj, jint disc_index, jint section_index, jint option_index,
+    jint choice_index)
+{
+  GetReference(env, obj)[disc_index]
+      .m_sections[section_index]
+      .m_options[option_index]
+      .m_selected_choice = choice_index;
+}
+
+static std::optional<DiscIO::Riivolution::Config> LoadConfigXML(const std::string& root_directory,
+                                                                std::string_view game_id)
+{
+  // The way Riivolution stores settings only makes sense for standard game IDs.
+  if (!(game_id.size() == 4 || game_id.size() == 6))
+    return std::nullopt;
+
+  return DiscIO::Riivolution::ParseConfigFile(
+      fmt::format("{}/riivolution/config/{}.xml", root_directory, game_id.substr(0, 4)));
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_loadConfigImpl(
+    JNIEnv* env, jobject obj, jstring j_game_id, jint revision, jint disc_number)
+{
+  const std::string game_id = GetJString(env, j_game_id);
+  auto& discs = GetReference(env, obj);
+
+  const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX);
+  const auto config = LoadConfigXML(riivolution_dir, game_id);
+
+  discs.clear();
+  for (const std::string& path : Common::DoFileSearch({riivolution_dir + "riivolution"}, {".xml"}))
+  {
+    auto parsed = DiscIO::Riivolution::ParseFile(path);
+    if (!parsed || !parsed->IsValidForGame(game_id, revision, disc_number))
+      continue;
+    if (config)
+      DiscIO::Riivolution::ApplyConfigDefaults(&*parsed, *config);
+    discs.emplace_back(std::move(*parsed));
+  }
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_riivolution_model_RiivolutionPatches_saveConfigImpl(
+    JNIEnv* env, jobject obj, jstring j_game_id)
+{
+  const std::string game_id = GetJString(env, j_game_id);
+  if (!(game_id.size() == 4 || game_id.size() == 6))
+    return;
+
+  DiscIO::Riivolution::Config config;
+  for (const auto& disc : GetReference(env, obj))
+  {
+    for (const auto& section : disc.m_sections)
+    {
+      for (const auto& option : section.m_options)
+      {
+        std::string id = option.m_id.empty() ? (section.m_name + option.m_name) : option.m_id;
+        config.m_options.emplace_back(
+            DiscIO::Riivolution::ConfigOption{std::move(id), option.m_selected_choice});
+      }
+    }
+  }
+
+  const std::string& root = File::GetUserPath(D_RIIVOLUTION_IDX);
+  DiscIO::Riivolution::WriteConfigFile(
+      fmt::format("{}/riivolution/config/{}.xml", root, game_id.substr(0, 4)), config);
+}
+}

From 8b0624f53e7c2636ffb71155128a0c5a13ac0ccd Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 27 Oct 2021 19:24:34 +0200
Subject: [PATCH 3/3] Android: Show SD root path in Riivolution activity

---
 .../ui/RiivolutionBootActivity.java           |  6 ++++
 .../res/layout/activity_riivolution_boot.xml  | 29 +++++++++++++++++--
 .../app/src/main/res/values/strings.xml       |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
index 37921c4af8..26016a800f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +17,7 @@ import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
 import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
 import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
+import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
 
 public class RiivolutionBootActivity extends AppCompatActivity
 {
@@ -51,6 +53,10 @@ public class RiivolutionBootActivity extends AppCompatActivity
     int revision = intent.getIntExtra(ARG_REVISION, -1);
     int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1);
 
+    TextView textSdRoot = findViewById(R.id.text_sd_root);
+    String riivolutionPath = DirectoryInitialization.getUserDirectory() + "/Load/Riivolution";
+    textSdRoot.setText(getString(R.string.riivolution_sd_root, riivolutionPath));
+
     Button buttonStart = findViewById(R.id.button_start);
     buttonStart.setOnClickListener((v) ->
     {
diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
index 3d136367d5..4cabdc846c 100644
--- a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
+++ b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -1,25 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/text_sd_root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/spacing_large"
+        tools:text="@string/riivolution_sd_root"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/divider" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="#1F000000"
+        android:layout_marginHorizontal="@dimen/spacing_large"
+        android:layout_marginVertical="@dimen/spacing_small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_sd_root"
+        app:layout_constraintBottom_toTopOf="@id/scroll_view" />
+
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider"
         app:layout_constraintBottom_toTopOf="@id/button_start">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/spacing_medlarge" />
+            android:layout_height="0dp" />
 
     </ScrollView>
 
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 56feb15e21..efcdf82bd4 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -482,6 +482,7 @@ It can efficiently compress both junk data and encrypted Wii data.
     </string>
 
     <!-- Riivolution Boot Screen -->
+    <string name="riivolution_sd_root">SD Root: %1$s</string>
     <string name="riivolution_disabled">Disabled</string>
     <string name="riivolution_start">Start</string>