From 45b2e613cf00f96bed29a27d55d14cec4898c573 Mon Sep 17 00:00:00 2001
From: GreemDev <greemdev@ryujinx.app>
Date: Sun, 20 Jul 2025 03:29:01 -0500
Subject: [PATCH 1/3] Update Ryujinx.LibHac

This should fix crashes with mods that worked on Ryubing 1.3.1.

Thanks @cyphix!

https://git.ryujinx.app/ryubing/libhac/-/commit/e39169ab5053ff179b7fef38f624dfc608d2596c
---
 Directory.Packages.props | 2 +-
 nuget.config             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 602295d15..5eb7eda3a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -40,7 +40,7 @@
     <PackageVersion Include="Ryujinx.Audio.OpenAL.Dependencies" Version="1.21.0.1" />
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies.AllArch" Version="6.1.2-build3" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
-    <PackageVersion Include="Ryujinx.LibHac" Version="0.20.0" />
+    <PackageVersion Include="Ryujinx.LibHac" Version="0.21.0-alpha.116" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
     <PackageVersion Include="Ryujinx.UpdateClient" Version="1.0.29" />
     <PackageVersion Include="Ryujinx.Systems.Update.Common" Version="1.0.29" />
diff --git a/nuget.config b/nuget.config
index 26f795ba1..c8d71a836 100644
--- a/nuget.config
+++ b/nuget.config
@@ -5,7 +5,7 @@
         <clear />
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
         <!-- Only needed when using pre-release versions of Ryujinx.LibHac. -->
-        <!--<add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />-->
+        <add key="LibHacAlpha" value="https://git.ryujinx.app/api/v4/projects/17/packages/nuget/index.json" />
         <add key="Ryujinx.UpdateClient" value="https://git.ryujinx.app/api/v4/projects/71/packages/nuget/index.json" />
     </packageSources>
     <packageSourceMapping>
@@ -18,8 +18,8 @@
             <package pattern="Ryujinx.UpdateClient" />
             <package pattern="Ryujinx.Systems.Update.Common" />
         </packageSource>
-        <!--<packageSource key="LibHacAlpha">
+        <packageSource key="LibHacAlpha">
             <package pattern="Ryujinx.LibHac" />
-        </packageSource>-->
+        </packageSource>
     </packageSourceMapping>
 </configuration>

From f2eb3749f94655948ba20de2d8e94b91a1e5585f Mon Sep 17 00:00:00 2001
From: Daenorth <daenorth@proton.me>
Date: Thu, 24 Jul 2025 13:48:56 +0200
Subject: [PATCH 2/3] Edit compatibility.csv (ryubing/ryujinx!80)

See merge request ryubing/ryujinx!80
---
 docs/compatibility.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/compatibility.csv b/docs/compatibility.csv
index e368cd4f5..567dbe343 100644
--- a/docs/compatibility.csv
+++ b/docs/compatibility.csv
@@ -2257,6 +2257,7 @@
 010086F0064CE000,"Poi: Explorer Edition",nvdec,playable,2021-01-21 19:32:00
 0100EB6012FD2000,"Poison Control",,playable,2021-05-16 14:01:54
 010072400E04A000,"Pokémon Café ReMix",,playable,2021-08-17 20:00:04
+010008c01e742000,"Pokémon Friends",crash;services,menus,2025-07-24 13:32:00
 01003D200BAA2000,"Pokémon Mystery Dungeon™: Rescue Team DX",mac-bug,playable,2024-01-21 00:16:32
 01008DB008C2C000,"Pokémon Shield + Pokémon Shield Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-12 07:20:22
 0100ABF008968000,"Pokémon Sword + Pokémon Sword Expansion Pass",deadlock;crash;online-broken;ldn-works;LAN,ingame,2024-08-26 15:40:37

From dce5f0eb55db105bc6ae33ff6532b63888e946e5 Mon Sep 17 00:00:00 2001
From: Daenorth <daenorth@proton.me>
Date: Thu, 24 Jul 2025 20:04:22 +0200
Subject: [PATCH 3/3] Edit TileIDs.cs (ryubing/ryujinx!81)

See merge request ryubing/ryujinx!81
---
 src/Ryujinx.Common/TitleIDs.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Ryujinx.Common/TitleIDs.cs b/src/Ryujinx.Common/TitleIDs.cs
index d753caa33..329078af9 100644
--- a/src/Ryujinx.Common/TitleIDs.cs
+++ b/src/Ryujinx.Common/TitleIDs.cs
@@ -93,6 +93,7 @@ namespace Ryujinx.Common
                           //The Pokémon Franchise
             "0100f4300bf2c000", // New Pokémon Snap
             "0100000011d90000", // Pokémon Brilliant Diamond
+            "010008c01e742000", // Pokémon Friends
             "01001f5010dfa000", // Pokémon Legends: Arceus
             "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
             "0100a3d008c5c000", // Pokémon Scarlet