From db2d5bba09e37418bfd2361aac68be294260568c Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 27 Feb 2024 21:38:19 +0100
Subject: [PATCH] (Android) Added Mupen64Plus AE standalone as an alternative
 emulator for the n64 and n64dd systems

Also added support for the Amazon Appstore release of M64Plus FZ Pro
---
 resources/systems/android/es_find_rules.xml | 9 +++++++++
 resources/systems/android/es_systems.xml    | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/resources/systems/android/es_find_rules.xml b/resources/systems/android/es_find_rules.xml
index 7577cf1ea..213140a2e 100644
--- a/resources/systems/android/es_find_rules.xml
+++ b/resources/systems/android/es_find_rules.xml
@@ -3,8 +3,10 @@
 <ruleList>
     <emulator name="RETROARCH">
         <rule type="androidpackage">
+            <!-- 64-bit and 32-bit releases from the retroarch.com website -->
             <entry>com.retroarch.aarch64/com.retroarch.browser.retroactivity.RetroActivityFuture</entry>
             <entry>com.retroarch.ra32/com.retroarch.browser.retroactivity.RetroActivityFuture</entry>
+            <!-- Amazon Appstore and Google Play releases -->
             <entry>com.retroarch/com.retroarch.browser.retroactivity.RetroActivityFuture</entry>
         </rule>
     </emulator>
@@ -146,6 +148,7 @@
     <emulator name="M64PLUS-FZ">
         <!-- Nintendo 64 emulator M64Plus FZ -->
         <rule type="androidpackage">
+            <entry>org.mupen64plusae.v3.fzurita.amazon/paulscode.android.mupen64plusae.SplashActivity</entry>
             <entry>org.mupen64plusae.v3.fzurita.pro/paulscode.android.mupen64plusae.SplashActivity</entry>
             <entry>org.mupen64plusae.v3.fzurita/paulscode.android.mupen64plusae.SplashActivity</entry>
         </rule>
@@ -192,6 +195,12 @@
             <entry>com.explusalpha.MsxEmu/com.imagine.BaseActivity</entry>
         </rule>
     </emulator>
+    <emulator name="MUPEN64PLUS-AE">
+        <!-- Nintendo 64 emulator Mupen64Plus AE -->
+        <rule type="androidpackage">
+            <entry>org.mupen64plusae.v3.alpha/paulscode.android.mupen64plusae.SplashActivity</entry>
+        </rule>
+    </emulator>
     <emulator name="MY-BOY">
         <!-- Nintendo Game Boy Advance emulator My Boy! -->
         <rule type="androidpackage">
diff --git a/resources/systems/android/es_systems.xml b/resources/systems/android/es_systems.xml
index f0a3aaebf..c49c35507 100644
--- a/resources/systems/android/es_systems.xml
+++ b/resources/systems/android/es_systems.xml
@@ -1050,6 +1050,7 @@
         <extension>.bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
         <command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% %EXTRA_CONFIGFILE%=/storage/emulated/0/Android/data/%ANDROIDPACKAGE%/files/retroarch.cfg %EXTRA_LIBRETRO%=mupen64plus_next_gles3_libretro_android.so %EXTRA_ROM%=%ROM%</command>
         <command label="M64Plus FZ (Standalone)">%EMULATOR_M64PLUS-FZ% %ACTION%=android.intent.action.VIEW %DATA%=%ROMSAF%</command>
+        <command label="Mupen64Plus AE (Standalone)">%EMULATOR_MUPEN64PLUS-AE% %ACTION%=android.intent.action.VIEW %DATA%=%ROMSAF%</command>
         <command label="ParaLLEl N64">%EMULATOR_RETROARCH% %EXTRA_CONFIGFILE%=/storage/emulated/0/Android/data/%ANDROIDPACKAGE%/files/retroarch.cfg %EXTRA_LIBRETRO%=parallel_n64_libretro_android.so %EXTRA_ROM%=%ROM%</command>
         <platform>n64</platform>
         <theme>n64</theme>
@@ -1061,6 +1062,7 @@
         <extension>.bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP</extension>
         <command label="Mupen64Plus-Next">%EMULATOR_RETROARCH% %EXTRA_CONFIGFILE%=/storage/emulated/0/Android/data/%ANDROIDPACKAGE%/files/retroarch.cfg %EXTRA_LIBRETRO%=mupen64plus_next_gles3_libretro_android.so %EXTRA_ROM%=%ROM%</command>
         <command label="M64Plus FZ (Standalone)">%EMULATOR_M64PLUS-FZ% %ACTION%=android.intent.action.VIEW %DATA%=%ROMSAF%</command>
+        <command label="Mupen64Plus AE (Standalone)">%EMULATOR_MUPEN64PLUS-AE% %ACTION%=android.intent.action.VIEW %DATA%=%ROMSAF%</command>
         <command label="ParaLLEl N64">%EMULATOR_RETROARCH% %EXTRA_CONFIGFILE%=/storage/emulated/0/Android/data/%ANDROIDPACKAGE%/files/retroarch.cfg %EXTRA_LIBRETRO%=parallel_n64_libretro_android.so %EXTRA_ROM%=%ROM%</command>
         <platform>n64</platform>
         <theme>n64dd</theme>