Updated to Updated to 5.0-16380

.gitmodules

@@ -8,3 +8,13 @@
 	url = https://github.com/mgba-emu/mgba.git
 	branch = master
 	shallow = true
+[submodule "Externals/FFmpeg-bin"]
+	path = Externals/FFmpeg-bin
+	url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
+	branch = master
+	shallow = true
+[submodule "libusb"]
+	path = Externals/libusb/libusb
+	url = https://github.com/libusb/libusb.git
+	branch = master
+	shallow = true

BuildMacOSUniversalBinary.py

@@ -337,7 +337,7 @@ def build(config):
             if not os.path.exists(arch):
                 os.mkdir(arch)
 
-            print("Building and running unit tests for: {arch}")
+            print(f"Building and running unit tests for: {arch}")
             unit_test_results[arch] = \
                 subprocess.call(["cmake", "--build", ".",
                                  "--config", config["build_type"],

CMake/FindMBEDTLS.cmake

@@ -10,7 +10,7 @@ set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRAR
 set(CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIRS})
 check_cxx_source_compiles("
 	#include <mbedtls/version.h>
-	#if MBEDTLS_VERSION_NUMBER < 0x02040000
+	#if MBEDTLS_VERSION_NUMBER < 0x021C0000
 	#error \"Your mbed TLS version is too old.\"
 	#endif
 	int main() {}"

CMakeLists.txt

@@ -50,6 +50,7 @@ option(ENABLE_TESTS "Enables building the unit tests" ON)
 option(ENABLE_VULKAN "Enables vulkan video backend" ON)
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence, show the current game on Discord" ON)
 option(USE_MGBA "Enables GBA controllers emulation using libmgba" ON)
+option(ENABLE_AUTOUPDATE "Enables support for automatic updates" ON)
 
 # Maintainers: if you consider blanket disabling this for your users, please
 # consider the following points:
@@ -264,7 +265,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
   # Fix non-conformant lambda behavior (constexpr variables shouldn't need capturing)
   add_compile_options(/experimental:newLambdaProcessor)
   # Fix various other non-conformant behaviors
-  add_compile_options(/Zc:externConstexpr,lambda,preprocessor)
+  add_compile_options(/Zc:__cplusplus,externConstexpr,lambda,preprocessor)
 
   # Temporarily disable warnings to enable /Zc:preprocessor compatibility with WinSDK headers.
   add_compile_options(
@@ -484,8 +485,12 @@ if(ENABLE_EGL)
 endif()
 
 if(ENCODE_FRAMEDUMPS)
-  if(WIN32 AND _M_X86_64)
-    set(FFMPEG_DIR Externals/ffmpeg)
+  if(WIN32)
+    if(_M_X86_64)
+      set(FFMPEG_DIR Externals/FFmpeg-bin/x64)
+    elseif(_M_ARM_64)
+      set(FFMPEG_DIR Externals/FFmpeg-bin/ARM64)
+    endif()
   endif()
   find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
   if(FFmpeg_FOUND)
@@ -536,6 +541,11 @@ if(ENABLE_ANALYTICS)
   add_definitions(-DUSE_ANALYTICS=1)
 endif()
 
+if(ENABLE_AUTOUPDATE)
+  message(STATUS "Enabling automatic update support")
+  add_definitions(-DAUTOUPDATE=1)
+endif()
+
 ########################################
 # Setup include directories (and make sure they are preferred over the Externals)
 #

Data/Sys/GameSettings/D43E01.ini

@@ -23,7 +23,7 @@ $Infinite Hover When Moving
 02CA2AB2 0000000F
 $Infinite Rupees
 02BE181C 000003E7
-$Swords/Shields/boots/tunics
+$Swords/Shields/Boots/Tunics
 02BE1884 00007777
 $Have Quiver (Adult)
 00BE1889 00000001

Data/Sys/GameSettings/GDK.ini

@@ -2,7 +2,7 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
+# This game does not work properly with large memory cards, use a 251 block card
 # see https://www.nintendo.com/consumer/memorycard1019.jsp
 MemoryCardSize = 2
 

Data/Sys/GameSettings/GDQ.ini

@@ -2,7 +2,7 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
-# This game does not work properly with large memorycards, use a 251 block card
+# This game does not work properly with large memory cards, use a 251 block card
 # see https://www.nintendo.com/consumer/memorycard1019.jsp
 MemoryCardSize = 2
 

Data/Sys/GameSettings/GMPE01.ini

@@ -123,6 +123,11 @@ $QOL - Automatically Advance Text Boxes [gamemasterplc]
 04044A90 60000000
 *Automatically scrolls the text boxes without pushing A
 
+$QOL - Disable Advance on Results [gamemasterplc]
+20446468 4182FF60
+04446468 4BFFFF60
+E2000001 80008000
+
 $QOL - Faster Boot Time [Ralf]
 04056168 38607FFF
 *Automatically advance through the initial cutscences.
@@ -261,6 +266,9 @@ $Extra - Disable Music
 041d3d1c 00000001
 *Disables all in-game music.
 
+$Mechanics - Battle Games Always Worth 20 Coins [Nora]
+001D5DE0 00040032
+
 $Mechanics - Double the Amount of Turns [Airsola]
 C205BEF8 00000004
 2C000032 4182000C
@@ -295,12 +303,6 @@ e2000001 80008000
 e2000001 80008000
 *Access all board events regardless of Mega / Mini Mushrooms.
 
-$Mechanics - Free Lottery Game [Celerizer]
-0407b28c 38600005
-0407bd04 38800000
-*Makes the lottery cost nothing instead of the usual 5 coins.
-*You need to have 5 coins but you do not lose them.
-
 $Mechanics - Free Stars [gamemasterplc]
 040843cc 2c030000
 04084590 2c030000
@@ -347,6 +349,28 @@ c208a07c 0000001f
 *Item Deletion is now a thing.
 *Press B to view your items, then delete the item with R.
 
+$Mechanics - Lose 0 Coins On Red Spaces [Nora]
+0407FD74 60000000
+0407FD78 3BC00000
+
+$Mechanics - Lose 20 Coins On Red Spaces [Nora]
+0407FD74 60000000
+0407FD78 3BC00014
+
+$Mechanics - Lottery 3rd Place Prize is Gaddlight or Warp Pipe [Nora]
+021D5678 00000805
+
+$Mechanics - Lottery 3rd Place Prize is Magic Lamp or Boo's Crystal Ball [Nora]
+021D5678 00000BOC
+
+$Mechanics - Lottery Costs 0 Coins [Nora]
+0407BD20 2C1E0000
+*Makes the lottery cost nothing instead of the usual 5 coins.
+
+$Mechanics - Lottery Costs 10 Coins [Nora]
+0407BD20 2C1E000A
+*Makes the lottery cost nothing instead of the usual 5 coins.
+
 $Mechanics - Mega Status No Longer Steals Coins [gamemasterplc]
 0406be70 38600000
 0406beac 38600000
@@ -410,3 +434,18 @@ $Minigame: Take a Breather - Mash Only L [gamemasterplc]
 044207f0 38600000
 e2000001 80008000
 *Mash just L in the minigame Take a Breather.
+
+$Minigame Replacement - Bowser's Bigger Blast ➜ Chain Chomp Fever [Nora]
+2818fd2c 00000027
+0218fd2c 00000025
+e2000001 80008000
+
+$Minigame Replacement - Dungeon Duos ➜ The Great Deflate [Nora]
+2818fd2c 0000001F
+0218fd2c 00000018
+e2000001 80008000
+
+$Minigame Replacement - Three Throw ➜ Mr. Blizzard's Brigade [Nora]
+2818fd2c 00000009
+0218fd2c 0000000B
+e2000001 80008000

Data/Sys/GameSettings/GP5E01.ini

@@ -466,13 +466,19 @@ $Press L+X: Player Stops Moving [Datel]
 
 [Gecko]
 # Add gecko cheats here.
+
 $QOL - Automatically Advance Text Boxes [gamemasterplc]
 F6000001 80008180
 A81F019C 7C001838
 1400000C 60000000
 E0000000 80008000
 *Automatically scrolls the text boxes without pushing A
 
+$QOL - Disable Advance on Results [gamemasterplc]
+20478F28 4182F754
+04478F1C 48000010
+E2000001 80008000
+
 $QOL - Faster Boot Time [gamemasterplc]
 F6000001 80008180
 38610030 38800002
@@ -538,6 +544,12 @@ $QOL - Unlock Everything
 04472838 3880FFFF
 0446BFCC 38C0FFFF
 E2000001 80008000
+F6000002 80008180 
+5460D808 54640FFE 
+7C040050 5400283E 
+14000020 3C80FFFF 
+14000024 6084FFFF 
+E0000000 80008000 
 *Unlocks Everything in the game.
 
 $Board: Bowser Nightmare - Bowser does not Steal Coins [gamemasterplc]
@@ -561,10 +573,15 @@ $Board: Future Dream - Free Taxi Ride [gamemasterplc]
 E2000001 80008000
 *Taxi does not charge you 10 coins in the board Future Dream.
 
-$Board: Pirate Dream - Free Thwomps [gamemasterplc]
+$Board: Pirate Dream - Free Thwomps & Whomps [gamemasterplc]
 0412811C 4800002C
 04128210 38800000
-*Thwomp is now free to pass in the board Pirate Dream.
+F6000001 80008180 
+4080002C 386003A0 
+14000000 4800002C 
+140000C0 38800000 
+E0000000 80008000
+*Thwomp and Whomp are now free to pass in the board Pirate Dream.
 
 $Board: Rainbow Dream - Free Bridge Crossings [gamemasterplc]
 2046A0B0 2C030005
@@ -594,13 +611,6 @@ $Mechanics - Battle Minigames Don't Affect Mini-Game Star [gamemasterplc]
 e2000001 80008000
 *Battle Minigames do not count towards the Mini-Game Star.
 
-$Mechanics - Disable Bonus Stars [gamemasterplc]
-20484E0C 40820020
-04484E0C 48000020
-04484E44 4800001C
-E2000001 80008000
-*Disables the Bonus Stars
-
 $Mechanics - Disable Capsules [gamemasterplc]
 F6000001 80008180
 3BC50005 887E0000
@@ -675,7 +685,7 @@ E2100000 80008000
 E2000001 80008000
 *Last 5 Turns Event is always x3 Coins on Spaces.
 
-$Mechanics- Last 5 Turns is 5 Star Spaces [gamemasterplc]
+$Mechanics - Last 5 Turns is 5 Star Spaces [gamemasterplc]
 20288860 00000076
 045152BC 00000003
 E2100000 80008000
@@ -710,11 +720,25 @@ E2100000 80008000
 E2000001 80008000
 *Last 5 Turns Event forces Red Spaces to turn into Bowser Spaces.
 
-$Mechanics - Same Space Duels Don't Happen [gamemasterplc]
-F6000001 80008180
-7C1D0000 40820048
-14000004 48000048
+$Mechanics - Lose 0 Coins On Red Spaces [Nora]
+040AA160 38800000
+
+$Mechanics - Lose 20 Coins On Red Spaces [Nora]
+040AA160 3880FFEC
+
+$Mechanics – Obtain Capsules on Final Turn [gamemasterplc]
+F6000001 80008180 
+7C040040 40820024 
+14000004 48000024 
 E0000000 80008000
+*Miracles can really happen
+
+$Mechanics - Same Space Duels Always Happen [Nora]
+04094740 60000000
+*Duels never happen if you are on the same space.
+
+$Mechanics - Same Space Duels Don't Happen [Nora]
+04094740 48000030
 *Duels never happen if you are on the same space.
 
 $Mechanics - Use Capsules on Yourself For Free [gamemasterplc]
@@ -743,6 +767,19 @@ $Minigame: Curvy Curves - 1 Player is Slower [Airsola]
 e2000001 00000000
 *1 Player is slower in Curvy Curves.
 
+$Minigame: Coney Island - No Slow Down 
+204763E4 3C608048 
+044763E0 38000000 
+0447663C 38000000 
+E2000001 80008000 
+*You do not slow down when gathering ice cream.
+
+$Minigame: Flower Shower - All Flowers are worth 3 Points [gamemasterplc] 
+20459BEC 801F003C 
+04459BEC 38000003 
+E2000001 80008000 
+*This makes the golden flowers the same value as the normal flowers.
+
 $Minigame: Ground Pound Down - No Rocks Until End [gamemasterplc]
 2046FCC4 4180FF6C
 0446FCC4 60000000
@@ -755,15 +792,15 @@ $Minigame: Later Skater - Only 1 Lap [gamemasterplc]
 E2000001 80008000
 *Only one lap around in the minigame Later Skater.
 
-$Minigame: Mathletes - Always Multiplication [gamemasterplc]
-2045D2AC 38030001
-C245D2AC 00000004
-3DC08047 81CE815C
-7C0EF800 40820008
-38600000 38030001
-60000000 00000000
+$Minigame: Leaf Leap - Allow score to go above 180 [gamemasterplc]
+20474848 408000FC 
+04474848 60000000 
+E2000001 80008000 
+
+$Minigame: Leaf Leap - Leaves Display Quicker [gamemasterplc]
+20474A04 38030001 
+04474A04 3800003C 
 E2000001 80008000
-*Multiplication is only present in the minigame Mathletes.
 
 $Minigame: Pop Star Piranhas - Halved Time to Pick [Airsola]
 20288860 00000016
@@ -826,6 +863,11 @@ $Minigame Replacement - Scaldin' Cauldron ➜ Rain of Fire [gamemasterplc]
 0222A4C4 0000003A
 E2000001 80008000
 
+$Minigame Replacement - Submarathon ➜ Defuse or Lose
+2822a4c4 0000002F
+0222a4c4 00000028
+e2000001 80008000
+
 $Minigame Replacement - Vicious Vending ➜ Coin Cache [gamemasterplc]
 2822a4c4 00000017
 0222a4c4 0000000f