diff --git a/Data/Dolphin.icns b/Data/Dolphin.icns
index fcaac6a744..18fb92be1d 100644
Binary files a/Data/Dolphin.icns and b/Data/Dolphin.icns differ
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/data.xdelta3 b/Data/Extras/Mario Kart Double Dash Online [PAL Only]/data.xdelta3
deleted file mode 100644
index 1076a570cc..0000000000
Binary files a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/data.xdelta3 and /dev/null differ
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.bat b/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.bat
deleted file mode 100644
index 294b33f9a8..0000000000
--- a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.bat	
+++ /dev/null
@@ -1,29 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-REM Initialize the iso_file variable
-set "iso_file="
-
-REM Get the first ISO file in the same directory as the script
-for %%F in ("%~dp0*.iso") do (
-    set "iso_file=%%~F"
-    goto :found_iso
-)
-
-:not_found
-echo.
-echo No ISO files found in the same directory as the script.
-echo Place the Mario Kart Double Dash (PAL) ISO in the script's directory and run it again.
-echo.
-pause
-exit /b 0
-
-:found_iso
-echo.
-echo Given "%iso_file%"
-xdelta3.exe -d -s "%iso_file%" data.xdelta3 "Mario Kart Double Dash (PAL) [Online V2].iso"
-
-echo.
-echo Press Enter to exit. Remember to enable SP1 Broadband HLE Emulation.
-pause
-exit /b 0
\ No newline at end of file
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.sh b/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.sh
deleted file mode 100644
index a4604ca19a..0000000000
--- a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/patch.sh	
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Get a list of ISO files in the same directory as the script
-iso_files=$(find "$(dirname "$0")" -maxdepth 1 -type f -iname "*.iso")
-
-# Check if there are no ISO files
-if [ -z "$iso_files" ]; then
-  echo ""
-  echo "No ISO files found in the same directory as the script."
-  echo "Place the Mario Kart Double Dash (PAL) ISO in the script's directory and run it again."
-  echo ""
-  read -p "Press Enter to exit..."
-  exit 0
-fi
-
-# Iterate over each ISO file and process it
-for originalISO in $iso_files; do
-  echo ""
-  echo "Given \"$originalISO\""
-  xdelta3 -d -s "$originalISO" data.xdelta3 "Mario Kart Double Dash (PAL) [Online V2].iso"
-  echo "Press Enter to exit."
-  read -p ""
-done
-
-echo ""
-read -p "Press Enter to exit..."
-exit 0
\ No newline at end of file
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/readme.txt b/Data/Extras/Mario Kart Double Dash Online [PAL Only]/readme.txt
deleted file mode 100644
index dc9b2aae54..0000000000
--- a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/readme.txt	
+++ /dev/null
@@ -1,5 +0,0 @@
-Place the Mario Kart Double Dash (PAL) ISO in the script's directory and run the patch script to patch it.
-
-This patch will convert your game to the online modified version.
-
-Please also enable the SP1 Broadband Adapter HLE Setting in Dolphin's Settings > GameCube
\ No newline at end of file
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/data.xdelta3 b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/data.xdelta3
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/data.xdelta3
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/patch.bat b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/patch.bat
similarity index 90%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/patch.bat
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/patch.bat
index a6b83630ec..ad12c22d89 100644
--- a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/patch.bat	
+++ b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_file variable
 set "iso_file="
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/patch.sh b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/patch.sh
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/patch.sh
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/readme.txt b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/readme.txt
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/readme.txt
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/xdelta3 b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/xdelta3
similarity index 100%
rename from Data/Extras/Mario Kart Double Dash Online [PAL Only]/xdelta3
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/xdelta3
diff --git a/Data/Extras/Mario Kart Double Dash Online [PAL Only]/xdelta3.exe b/Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Kart Double Dash Online [PAL Only]/xdelta3.exe
rename to Data/Extras/Mario Party 4 - Widescreen Patch (for v1.01)/xdelta3.exe
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/data.xdelta3 b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/data.xdelta3
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/data.xdelta3
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/patch.bat b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/patch.bat
similarity index 90%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/patch.bat
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/patch.bat
index 6dd082e31b..26ef52dc1d 100644
--- a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/patch.bat	
+++ b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_file variable
 set "iso_file="
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/patch.sh b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/patch.sh
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/patch.sh
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/readme.txt b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/readme.txt
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/readme.txt
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/xdelta3 b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/xdelta3
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/xdelta3
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/xdelta3
diff --git a/Data/Extras/Mario Party 4 (v1.00 to v1.01)/xdelta3.exe b/Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Party 4 (v1.00 to v1.01)/xdelta3.exe
rename to Data/Extras/Mario Party 4 - v1.00 to v1.01 Converter/xdelta3.exe
diff --git a/Data/Extras/Mario Party 5 Shop Mod/data.xdelta3 b/Data/Extras/Mario Party 5 - Shop Mod/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 5 Shop Mod/data.xdelta3
rename to Data/Extras/Mario Party 5 - Shop Mod/data.xdelta3
diff --git a/Data/Extras/Mario Party 5 Shop Mod/patch.bat b/Data/Extras/Mario Party 5 - Shop Mod/patch.bat
similarity index 90%
rename from Data/Extras/Mario Party 5 Shop Mod/patch.bat
rename to Data/Extras/Mario Party 5 - Shop Mod/patch.bat
index 52160f1fb1..73da0dd586 100644
--- a/Data/Extras/Mario Party 5 Shop Mod/patch.bat	
+++ b/Data/Extras/Mario Party 5 - Shop Mod/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_file variable
 set "iso_file="
diff --git a/Data/Extras/Mario Party 5 Shop Mod/patch.sh b/Data/Extras/Mario Party 5 - Shop Mod/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 5 Shop Mod/patch.sh
rename to Data/Extras/Mario Party 5 - Shop Mod/patch.sh
diff --git a/Data/Extras/Mario Party 5 Shop Mod/readme.txt b/Data/Extras/Mario Party 5 - Shop Mod/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 5 Shop Mod/readme.txt
rename to Data/Extras/Mario Party 5 - Shop Mod/readme.txt
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/xdelta3 b/Data/Extras/Mario Party 5 - Shop Mod/xdelta3
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/xdelta3
rename to Data/Extras/Mario Party 5 - Shop Mod/xdelta3
diff --git a/Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/xdelta3.exe b/Data/Extras/Mario Party 5 - Shop Mod/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Party 4 Widescreen Patch (for v1.01)/xdelta3.exe
rename to Data/Extras/Mario Party 5 - Shop Mod/xdelta3.exe
diff --git a/Data/Extras/Mario Party 5 Widescreen Patch/data.xdelta3 b/Data/Extras/Mario Party 5 - Widescreen Patch/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 5 Widescreen Patch/data.xdelta3
rename to Data/Extras/Mario Party 5 - Widescreen Patch/data.xdelta3
diff --git a/Data/Extras/Mario Party 5 Widescreen Patch/patch.bat b/Data/Extras/Mario Party 5 - Widescreen Patch/patch.bat
similarity index 90%
rename from Data/Extras/Mario Party 5 Widescreen Patch/patch.bat
rename to Data/Extras/Mario Party 5 - Widescreen Patch/patch.bat
index df05e0ded8..8955c0675a 100644
--- a/Data/Extras/Mario Party 5 Widescreen Patch/patch.bat	
+++ b/Data/Extras/Mario Party 5 - Widescreen Patch/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_file variable
 set "iso_file="
diff --git a/Data/Extras/Mario Party 5 Widescreen Patch/patch.sh b/Data/Extras/Mario Party 5 - Widescreen Patch/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 5 Widescreen Patch/patch.sh
rename to Data/Extras/Mario Party 5 - Widescreen Patch/patch.sh
diff --git a/Data/Extras/Mario Party 5 Widescreen Patch/readme.txt b/Data/Extras/Mario Party 5 - Widescreen Patch/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 5 Widescreen Patch/readme.txt
rename to Data/Extras/Mario Party 5 - Widescreen Patch/readme.txt
diff --git a/Data/Extras/Mario Party 5 Shop Mod/xdelta3.exe b/Data/Extras/Mario Party 5 - Widescreen Patch/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Party 5 Shop Mod/xdelta3.exe
rename to Data/Extras/Mario Party 5 - Widescreen Patch/xdelta3.exe
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/patch.bat b/Data/Extras/Mario Party 6 - Custom Orb Expansion/patch.bat
new file mode 100644
index 0000000000..92071625ba
--- /dev/null
+++ b/Data/Extras/Mario Party 6 - Custom Orb Expansion/patch.bat	
@@ -0,0 +1,98 @@
+@echo off
+setlocal enabledelayedexpansion
+
+title Mario Party 6 - Custom Orb Expansion Patcher
+
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+echo Mario Party 6 - Custom Orb Expansion Patcher!
+echo How do you wish to export your game.
+echo.
+echo 1: RVZ (Recommended for Dolphin)
+echo 2: ISO (Recommended for SwissGC)
+echo 3: Exit Patcher
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+choice /c 123 > NUL
+if errorlevel 3 exit
+if errorlevel 2 set PATCHER=ISO
+if errorlevel 1 set PATCHER=RVZ
+
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+echo Setting up patcher!
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+rmdir /s /q tmp
+
+set "iso_files="
+for %%F in ("%~dp0*.iso") do (
+    set "iso_files=!iso_files! !%%~F!"
+)
+for %%F in ("%~dp0*.rvz") do (
+    set "iso_files=!iso_files! !%%~F!"
+)
+
+if not defined iso_files (
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo No ISO or RVZ files found in the same directory as the script.
+    echo Place the Mario Party 6 (USA^) ISO or RVZ in the script's directory and run it again.
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo.
+    echo Press any key to exit...
+    pause
+    exit /b 0
+)
+
+cls
+mkdir tmp > NUL
+for %%F in ("%~dp0*.rvz") do (
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Converting RVZ to ISO! This is needed to patch the game...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/dolphintool" convert -i "%%~F" -f "iso" -o "tmp.iso"
+    set "iso_files=tmp.iso"
+)
+
+for %%F in ("%~dp0*.iso") do (
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Extracting Gamespace!  This may take awhile depending on computer speed...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/pyisotools" "%%~F" E "--dest=tmp/"
+    del "%%~F"
+
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Copying mod data!
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    xcopy "store" "tmp\root\" /s /y /e
+
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Rebuilding! This may take awhile depending on computer speed...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/pyisotools" tmp/root/ B "--dest=../../game.iso"
+    
+    rmdir /s /q tmp
+)
+
+if "%PATCHER%"=="RVZ" (
+    cls
+    "tools/dolphintool" convert -i "game.iso" -o "Mario Party 6 (USA) [Custom Orb Expansion].rvz" -f "rvz" -b "131072" -c "zstd" -l "5"
+    del "game.iso"
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Success! Your game is located in "Mario Party 6 (USA) [Custom Orb Expansion].rvz" 
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+)
+
+if "%PATCHER%"=="ISO" (
+    cls
+    move "game.iso" "Mario Party 6 (USA) [Custom Orb Expansion].iso"
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Success! Your game is located in "Mario Party 6 (USA) [Custom Orb Expansion].iso" 
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+)
+echo.
+echo Press any key to exit...
+pause > NUL
+exit /b 0
\ No newline at end of file
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/readme.txt b/Data/Extras/Mario Party 6 - Custom Orb Expansion/readme.txt
new file mode 100644
index 0000000000..ff5296bbdf
--- /dev/null
+++ b/Data/Extras/Mario Party 6 - Custom Orb Expansion/readme.txt	
@@ -0,0 +1,5 @@
+Place the Mario Party 6 (USA) ISO / RVZ in the script's directory and run the patch script to patch it.
+
+This patch will convert your game to one with custom orbs.
+
+Last updated Feb 8, 2024
\ No newline at end of file
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/data/capsule.bin b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/data/capsule.bin
new file mode 100644
index 0000000000..c08efd53a1
Binary files /dev/null and b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/data/capsule.bin differ
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/mess/messdata_eng.bin b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/mess/messdata_eng.bin
new file mode 100644
index 0000000000..44e08244b0
Binary files /dev/null and b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/files/mess/messdata_eng.bin differ
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/sys/main.dol b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/sys/main.dol
new file mode 100644
index 0000000000..1e268411f9
Binary files /dev/null and b/Data/Extras/Mario Party 6 - Custom Orb Expansion/store/sys/main.dol differ
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/dolphintool.exe b/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/dolphintool.exe
new file mode 100644
index 0000000000..ec3cdc8547
Binary files /dev/null and b/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/dolphintool.exe differ
diff --git a/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/pyisotools.exe b/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/pyisotools.exe
new file mode 100644
index 0000000000..b043e4658c
Binary files /dev/null and b/Data/Extras/Mario Party 6 - Custom Orb Expansion/tools/pyisotools.exe differ
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/data.xdelta3 b/Data/Extras/Mario Party 6 - Widescreen Patch/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 6 Widescreen Patch/data.xdelta3
rename to Data/Extras/Mario Party 6 - Widescreen Patch/data.xdelta3
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/patch.bat b/Data/Extras/Mario Party 6 - Widescreen Patch/patch.bat
similarity index 90%
rename from Data/Extras/Mario Party 6 Widescreen Patch/patch.bat
rename to Data/Extras/Mario Party 6 - Widescreen Patch/patch.bat
index 29b9db241e..fe7030de65 100644
--- a/Data/Extras/Mario Party 6 Widescreen Patch/patch.bat	
+++ b/Data/Extras/Mario Party 6 - Widescreen Patch/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_file variable
 set "iso_file="
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/patch.sh b/Data/Extras/Mario Party 6 - Widescreen Patch/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 6 Widescreen Patch/patch.sh
rename to Data/Extras/Mario Party 6 - Widescreen Patch/patch.sh
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/readme.txt b/Data/Extras/Mario Party 6 - Widescreen Patch/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 6 Widescreen Patch/readme.txt
rename to Data/Extras/Mario Party 6 - Widescreen Patch/readme.txt
diff --git a/Data/Extras/Mario Party 5 Shop Mod/xdelta3 b/Data/Extras/Mario Party 6 - Widescreen Patch/xdelta3
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 5 Shop Mod/xdelta3
rename to Data/Extras/Mario Party 6 - Widescreen Patch/xdelta3
diff --git a/Data/Extras/Mario Party 5 Widescreen Patch/xdelta3.exe b/Data/Extras/Mario Party 6 - Widescreen Patch/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Party 5 Widescreen Patch/xdelta3.exe
rename to Data/Extras/Mario Party 6 - Widescreen Patch/xdelta3.exe
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/patch.bat b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/patch.bat
new file mode 100644
index 0000000000..6e68794936
--- /dev/null
+++ b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/patch.bat	
@@ -0,0 +1,98 @@
+@echo off
+setlocal enabledelayedexpansion
+
+title Mario Party 7 - Custom Orb Expansion Patcher
+
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+echo Mario Party 7 - Custom Orb Expansion Patcher!
+echo How do you wish to export your game.
+echo.
+echo 1: RVZ (Recommended for Dolphin)
+echo 2: ISO (Recommended for SwissGC)
+echo 3: Exit Patcher
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+choice /c 123 > NUL
+if errorlevel 3 exit
+if errorlevel 2 set PATCHER=ISO
+if errorlevel 1 set PATCHER=RVZ
+
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+echo Setting up patcher!
+echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+
+rmdir /s /q tmp
+
+set "iso_files="
+for %%F in ("%~dp0*.iso") do (
+    set "iso_files=!iso_files! !%%~F!"
+)
+for %%F in ("%~dp0*.rvz") do (
+    set "iso_files=!iso_files! !%%~F!"
+)
+
+if not defined iso_files (
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo No ISO or RVZ files found in the same directory as the script.
+    echo Place the Mario Party 7 (USA^) (v1.02^) ISO or RVZ in the script's directory and run it again.
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo.
+    echo Press any key to exit...
+    pause
+    exit /b 0
+)
+
+cls
+mkdir tmp > NUL
+for %%F in ("%~dp0*.rvz") do (
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Converting RVZ to ISO! This is needed to patch the game...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/dolphintool" convert -i "%%~F" -f "iso" -o "tmp.iso"
+    set "iso_files=tmp.iso"
+)
+
+for %%F in ("%~dp0*.iso") do (
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Extracting Gamespace!  This may take awhile depending on computer speed...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/pyisotools" "%%~F" E "--dest=tmp/"
+    del "%%~F"
+
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Copying mod data!
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    xcopy "store" "tmp\root\" /s /y /e
+
+    cls
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Rebuilding! This may take awhile depending on computer speed...
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    "tools/pyisotools" tmp/root/ B "--dest=../../game.iso"
+    
+    rmdir /s /q tmp
+)
+
+if "%PATCHER%"=="RVZ" (
+    cls
+    "tools/dolphintool" convert -i "game.iso" -o "Mario Party 7 (USA) [Custom Orb Expansion].rvz" -f "rvz" -b "131072" -c "zstd" -l "5"
+    del "game.iso"
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Success! Your game is located in "Mario Party 7 (USA) [Custom Orb Expansion].rvz" 
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+)
+
+if "%PATCHER%"=="ISO" (
+    cls
+    move "game.iso" "Mario Party 7 (USA) [Custom Orb Expansion].iso"
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+    echo Success! Your game is located in "Mario Party 7 (USA) [Custom Orb Expansion].iso" 
+    echo = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
+)
+echo.
+echo Press any key to exit...
+pause > NUL
+exit /b 0
\ No newline at end of file
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/readme.txt b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/readme.txt
new file mode 100644
index 0000000000..eadda9d632
--- /dev/null
+++ b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/readme.txt	
@@ -0,0 +1,6 @@
+
+Place the Mario Party 7 (USA) (v1.02) ISO / RVZ in the script's directory and run the patch script to patch it.
+
+This patch will convert your game to one with custom orbs.
+
+Last updated Jul 11, 2024
\ No newline at end of file
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/data/capsule.bin b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/data/capsule.bin
new file mode 100644
index 0000000000..96dbd946cc
Binary files /dev/null and b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/data/capsule.bin differ
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/mess/messdata_eng.bin b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/mess/messdata_eng.bin
new file mode 100644
index 0000000000..97ad35a913
Binary files /dev/null and b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/files/mess/messdata_eng.bin differ
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/sys/main.dol b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/sys/main.dol
new file mode 100644
index 0000000000..7b583b087a
Binary files /dev/null and b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/store/sys/main.dol differ
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/dolphintool.exe b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/dolphintool.exe
new file mode 100644
index 0000000000..ec3cdc8547
Binary files /dev/null and b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/dolphintool.exe differ
diff --git a/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/pyisotools.exe b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/pyisotools.exe
new file mode 100644
index 0000000000..b043e4658c
Binary files /dev/null and b/Data/Extras/Mario Party 7 - Custom Orb Expansion (for v1.02)/tools/pyisotools.exe differ
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/data.xdelta3 b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/data.xdelta3
similarity index 100%
rename from Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/data.xdelta3
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/data.xdelta3
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/patch.bat b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/patch.bat
similarity index 80%
rename from Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/patch.bat
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/patch.bat
index b0c920e96a..6622e4b85d 100644
--- a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/patch.bat	
+++ b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/patch.bat	
@@ -13,7 +13,7 @@ for %%F in ("%~dp0*.iso") do (
 :not_found
 echo.
 echo No ISO files found in the same directory as the script.
-echo Place the Mario Party 7 (USA) ISO in the script's directory and run it again.
+echo Place the Mario Party 7 (USA) (v1.02) ISO in the script's directory and run it again.
 echo.
 pause
 exit /b 0
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/patch.sh b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/patch.sh
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/patch.sh
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/readme.txt b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/readme.txt
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/readme.txt
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/xdelta3 b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/xdelta3
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 6 Widescreen Patch/xdelta3
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/xdelta3
diff --git a/Data/Extras/Mario Party 6 Widescreen Patch/xdelta3.exe b/Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/xdelta3.exe
similarity index 100%
rename from Data/Extras/Mario Party 6 Widescreen Patch/xdelta3.exe
rename to Data/Extras/Mario Party 7 - Widescreen Patch (for v1.02)/xdelta3.exe
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3 b/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3
deleted file mode 100755
index b4e0540abb..0000000000
Binary files a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3 and /dev/null differ
diff --git a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3.exe b/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3.exe
deleted file mode 100644
index 5a24f43dcf..0000000000
Binary files a/Data/Extras/Mario Party 7 Widescreen Patch (for v1.02)/xdelta3.exe and /dev/null differ
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/mp8candy/files/data/candy.bin b/Data/Extras/Mario Party 8 - Extended Candy Patch/mp8candy/files/data/candy.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/mp8candy/files/data/candy.bin
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/mp8candy/files/data/candy.bin
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/patch.bat b/Data/Extras/Mario Party 8 - Extended Candy Patch/patch.bat
similarity index 93%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/patch.bat
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/patch.bat
index ac3bfc931f..4d3d32d01f 100644
--- a/Data/Extras/Mario Party 8 Extended Candy Patch/patch.bat	
+++ b/Data/Extras/Mario Party 8 - Extended Candy Patch/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_files variable
 set "iso_files="
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/patch.sh b/Data/Extras/Mario Party 8 - Extended Candy Patch/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/patch.sh
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/patch.sh
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/readme.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/readme.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/readme.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/bash.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/bash.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/bash.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/bash.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cp.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cp.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cp.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cp.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygattr-1.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygattr-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygattr-1.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygattr-1.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygffi-6.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygffi-6.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygffi-6.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygffi-6.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggcc_s-1.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggcc_s-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggcc_s-1.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggcc_s-1.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggmp-10.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggmp-10.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggmp-10.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggmp-10.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggnutls-28.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggnutls-28.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyggnutls-28.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyggnutls-28.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyghogweed-2.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyghogweed-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyghogweed-2.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyghogweed-2.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygiconv-2.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygiconv-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygiconv-2.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygiconv-2.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygidn-11.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygidn-11.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygidn-11.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygidn-11.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygidn2-0.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygidn2-0.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygidn2-0.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygidn2-0.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygintl-8.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygintl-8.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygintl-8.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygintl-8.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygncursesw-10.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygncursesw-10.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygncursesw-10.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygncursesw-10.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygnettle-4.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygnettle-4.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygnettle-4.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygnettle-4.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygp11-kit-0.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygp11-kit-0.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygp11-kit-0.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygp11-kit-0.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygpcre-1.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygpcre-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygpcre-1.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygpcre-1.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygpsl-5.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygpsl-5.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygpsl-5.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygpsl-5.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygreadline7.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygreadline7.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygreadline7.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygreadline7.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygsigsegv-2.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygsigsegv-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygsigsegv-2.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygsigsegv-2.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygtasn1-6.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygtasn1-6.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygtasn1-6.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygtasn1-6.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygunistring-2.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygunistring-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygunistring-2.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygunistring-2.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyguuid-1.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyguuid-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cyguuid-1.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cyguuid-1.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygwin1.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygwin1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygwin1.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygwin1.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygz.dll b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygz.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/cygz.dll
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/cygz.dll
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/diff.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/diff.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/diff.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/diff.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/env.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/env.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/env.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/env.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/grep.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/grep.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/grep.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/grep.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/load-titles.bat b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/load-titles.bat
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/load-titles.bat
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/load-titles.bat
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/load-titles.sh b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/load-titles.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/load-titles.sh
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/load-titles.sh
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/magic.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/magic.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/magic.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/magic.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/mkdir.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/mkdir.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/mkdir.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/mkdir.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/mv.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/mv.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/mv.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/mv.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/realpath.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/realpath.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/realpath.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/realpath.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/regtool.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/regtool.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/regtool.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/regtool.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/rm.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/rm.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/rm.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/rm.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/stat.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/stat.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/stat.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/stat.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/system-menu.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/system-menu.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/system-menu.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/system-menu.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-de.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-de.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-de.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-de.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-es.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-es.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-es.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-es.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-fr.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-fr.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-fr.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-fr.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-it.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-it.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-it.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-it.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ja.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ja.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ja.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ja.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ko.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ko.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ko.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ko.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-nl.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-nl.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-nl.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-nl.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-pt.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-pt.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-pt.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-pt.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ru.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ru.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-ru.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-ru.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-zhcn.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-zhcn.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-zhcn.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-zhcn.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-zhtw.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-zhtw.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles-zhtw.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles-zhtw.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles.txt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/titles.txt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/titles.txt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/tr.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/tr.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/tr.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/tr.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-cat b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-cat
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-cat
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-cat
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-cat.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-cat.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-cat.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-cat.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-dump b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-dump
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-dump
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-dump
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-dump.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-dump.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf-dump.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf-dump.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wdf.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wdf.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wget.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wget.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wget.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wget.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-install.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-install.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-install.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-install.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-install.sh b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-install.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-install.sh
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-install.sh
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-uninstall.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-uninstall.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-uninstall.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-uninstall.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-uninstall.sh b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-uninstall.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/windows-uninstall.sh
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/windows-uninstall.sh
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit-console.bat b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit-console.bat
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit-console.bat
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit-console.bat
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wit.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wit.exe
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wwt b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wwt
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wwt
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wwt
diff --git a/Data/Extras/Mario Party 8 Extended Candy Patch/tools/wwt.exe b/Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wwt.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 Extended Candy Patch/tools/wwt.exe
rename to Data/Extras/Mario Party 8 - Extended Candy Patch/tools/wwt.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/disc/header.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/disc/header.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/disc/header.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/disc/header.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/disc/region.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/disc/region.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/disc/region.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/disc/region.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/candy.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/candy.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/candy.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/candy.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/mgresult.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/mgresult.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/mgresult.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/mgresult.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/win.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/win.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/data/win.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/data/win.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/bootdll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/bootdll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/bootdll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/bootdll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m802Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m802Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m802Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m802Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m803DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m803DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m803DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m803DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m804dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m804dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m804dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m804dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m806DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m806DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m806DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m806DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m809DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m809DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m809DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m809DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m812Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m812Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m812Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m812Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m815DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m815DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m815DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m815DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m816dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m816dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m816dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m816dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m817dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m817dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m817dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m817dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m818dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m818dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m818dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m818dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m819DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m819DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m819DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m819DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m820dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m820dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m820dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m820dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m823Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m823Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m823Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m823Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m824Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m824Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m824Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m824Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m826DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m826DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m826DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m826DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m829dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m829dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m829dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m829dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m832DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m832DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m832DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m832DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m833DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m833DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m833DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m833DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m835dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m835dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m835dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m835dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m836dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m836dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m836dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m836dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m839dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m839dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m839dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m839dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m841Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m841Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m841Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m841Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m845DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m845DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m845DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m845DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m846DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m846DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m846DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m846DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m847dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m847dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m847dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m847dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m852dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m852dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m852dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m852dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m854dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m854dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m854dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m854dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m855Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m855Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m855Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m855Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m856Dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m856Dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m856Dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m856Dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m857dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m857dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m857dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m857dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m858DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m858DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m858DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m858DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m859dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m859dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m859dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m859dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m860dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m860dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m860dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m860dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m866dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m866dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m866dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m866dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m868dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m868dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m868dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m868dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m869dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m869dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m869dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m869dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m870dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m870dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m870dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m870dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m871DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m871DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m871DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m871DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m874dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m874dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m874dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m874dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m875dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m875dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m875dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m875dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m876DLL.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m876DLL.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/m876DLL.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/m876DLL.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/mgextdll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/mgextdll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/mgextdll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/mgextdll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/mginstdll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/mginstdll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/mginstdll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/mginstdll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w01dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w01dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w01dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w01dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w02dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w02dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w02dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w02dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w03dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w03dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w03dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w03dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w04dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w04dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w04dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w04dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w05dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w05dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w05dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w05dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w06dll.rel b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w06dll.rel
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/dll/w06dll.rel
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/dll/w06dll.rel
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/mess/messdata_eng.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/mess/messdata_eng.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/files/mess/messdata_eng.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/files/mess/messdata_eng.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/apploader.img b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/apploader.img
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/apploader.img
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/apploader.img
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/bi2.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/bi2.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/bi2.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/bi2.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/boot.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/boot.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/boot.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/boot.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/fst.bin b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/fst.bin
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/fst.bin
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/fst.bin
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/main.dol b/Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/main.dol
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/mp8motion/sys/main.dol
rename to Data/Extras/Mario Party 8 - GC Controller Patch/mp8motion/sys/main.dol
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/patch.bat b/Data/Extras/Mario Party 8 - GC Controller Patch/patch.bat
similarity index 93%
rename from Data/Extras/Mario Party 8 GC Controller Patch/patch.bat
rename to Data/Extras/Mario Party 8 - GC Controller Patch/patch.bat
index b587c9a4be..7da20f8305 100644
--- a/Data/Extras/Mario Party 8 GC Controller Patch/patch.bat	
+++ b/Data/Extras/Mario Party 8 - GC Controller Patch/patch.bat	
@@ -1,5 +1,4 @@
 @echo off
-setlocal enabledelayedexpansion
 
 REM Initialize the iso_files variable
 set "iso_files="
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/patch.sh b/Data/Extras/Mario Party 8 - GC Controller Patch/patch.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/patch.sh
rename to Data/Extras/Mario Party 8 - GC Controller Patch/patch.sh
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/readme.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/readme.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/readme.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/readme.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/bash.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/bash.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/bash.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/bash.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cp.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cp.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cp.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cp.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygattr-1.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygattr-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygattr-1.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygattr-1.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygffi-6.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygffi-6.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygffi-6.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygffi-6.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggcc_s-1.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggcc_s-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggcc_s-1.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggcc_s-1.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggmp-10.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggmp-10.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggmp-10.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggmp-10.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggnutls-28.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggnutls-28.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cyggnutls-28.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyggnutls-28.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cyghogweed-2.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyghogweed-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cyghogweed-2.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyghogweed-2.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygiconv-2.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygiconv-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygiconv-2.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygiconv-2.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygidn-11.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygidn-11.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygidn-11.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygidn-11.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygidn2-0.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygidn2-0.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygidn2-0.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygidn2-0.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygintl-8.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygintl-8.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygintl-8.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygintl-8.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygncursesw-10.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygncursesw-10.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygncursesw-10.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygncursesw-10.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygnettle-4.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygnettle-4.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygnettle-4.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygnettle-4.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygp11-kit-0.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygp11-kit-0.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygp11-kit-0.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygp11-kit-0.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygpcre-1.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygpcre-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygpcre-1.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygpcre-1.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygpsl-5.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygpsl-5.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygpsl-5.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygpsl-5.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygreadline7.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygreadline7.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygreadline7.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygreadline7.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygsigsegv-2.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygsigsegv-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygsigsegv-2.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygsigsegv-2.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygtasn1-6.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygtasn1-6.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygtasn1-6.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygtasn1-6.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygunistring-2.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygunistring-2.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygunistring-2.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygunistring-2.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cyguuid-1.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyguuid-1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cyguuid-1.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cyguuid-1.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygwin1.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygwin1.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygwin1.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygwin1.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/cygz.dll b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygz.dll
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/cygz.dll
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/cygz.dll
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/diff.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/diff.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/diff.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/diff.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/env.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/env.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/env.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/env.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/grep.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/grep.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/grep.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/grep.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/load-titles.bat b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/load-titles.bat
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/load-titles.bat
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/load-titles.bat
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/load-titles.sh b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/load-titles.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/load-titles.sh
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/load-titles.sh
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/magic.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/magic.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/magic.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/magic.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/mkdir.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/mkdir.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/mkdir.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/mkdir.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/mv.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/mv.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/mv.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/mv.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/realpath.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/realpath.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/realpath.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/realpath.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/regtool.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/regtool.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/regtool.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/regtool.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/rm.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/rm.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/rm.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/rm.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/stat.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/stat.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/stat.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/stat.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/system-menu.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/system-menu.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/system-menu.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/system-menu.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-de.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-de.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-de.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-de.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-es.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-es.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-es.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-es.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-fr.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-fr.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-fr.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-fr.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-it.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-it.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-it.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-it.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ja.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ja.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ja.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ja.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ko.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ko.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ko.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ko.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-nl.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-nl.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-nl.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-nl.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-pt.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-pt.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-pt.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-pt.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ru.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ru.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-ru.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-ru.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-zhcn.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-zhcn.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-zhcn.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-zhcn.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-zhtw.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-zhtw.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles-zhtw.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles-zhtw.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/titles.txt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles.txt
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/titles.txt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/titles.txt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/tr.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/tr.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/tr.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/tr.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-cat b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-cat
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-cat
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-cat
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-cat.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-cat.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-cat.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-cat.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-dump b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-dump
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-dump
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-dump
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-dump.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-dump.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf-dump.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf-dump.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wdf.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wdf.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wget.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wget.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wget.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wget.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-install.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-install.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-install.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-install.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-install.sh b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-install.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-install.sh
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-install.sh
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-uninstall.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-uninstall.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-uninstall.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-uninstall.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-uninstall.sh b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-uninstall.sh
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/windows-uninstall.sh
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/windows-uninstall.sh
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wit b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wit
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wit-console.bat b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit-console.bat
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wit-console.bat
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit-console.bat
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wit.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wit.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wit.exe
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wwt b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wwt
old mode 100755
new mode 100644
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wwt
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wwt
diff --git a/Data/Extras/Mario Party 8 GC Controller Patch/tools/wwt.exe b/Data/Extras/Mario Party 8 - GC Controller Patch/tools/wwt.exe
similarity index 100%
rename from Data/Extras/Mario Party 8 GC Controller Patch/tools/wwt.exe
rename to Data/Extras/Mario Party 8 - GC Controller Patch/tools/wwt.exe
diff --git a/Data/Sys/Resources/dolphin_logo.png b/Data/Sys/Resources/dolphin_logo.png
index 2a139b6c95..81ac255fdf 100644
Binary files a/Data/Sys/Resources/dolphin_logo.png and b/Data/Sys/Resources/dolphin_logo.png differ
diff --git a/Data/Sys/Resources/dolphin_logo@2x.png b/Data/Sys/Resources/dolphin_logo@2x.png
index 2a139b6c95..81ac255fdf 100644
Binary files a/Data/Sys/Resources/dolphin_logo@2x.png and b/Data/Sys/Resources/dolphin_logo@2x.png differ
diff --git a/Data/dolphin-mpn.png b/Data/dolphin-mpn.png
index 2a139b6c95..81ac255fdf 100644
Binary files a/Data/dolphin-mpn.png and b/Data/dolphin-mpn.png differ
diff --git a/Installer/Dolphin.ico b/Installer/Dolphin.ico
index b6f018ecc6..0a11504201 100644
Binary files a/Installer/Dolphin.ico and b/Installer/Dolphin.ico differ
diff --git a/Source/Core/Core/MarioPartyNetplay/Discord.cpp b/Source/Core/Core/MarioPartyNetplay/Discord.cpp
index c79dffb66e..3ea419a3f9 100644
--- a/Source/Core/Core/MarioPartyNetplay/Discord.cpp
+++ b/Source/Core/Core/MarioPartyNetplay/Discord.cpp
@@ -1,15 +1,15 @@
 #include "Discord.h"
-#include "UICommon/DiscordPresence.h"
+#include <Core/State.h>
 #include "Core/Config/NetplaySettings.h"
 #include "Core/Core.h"
 #include "Core/IOS/DolphinDevice.h"
-#include <Core/State.h>
 #include "Core/System.h"
+#include "UICommon/DiscordPresence.h"
 
 bool mpn_update_discord()
 {
-  //if (!Memory::IsInitialized())
-  //  return false;
+  // if (!Memory::IsInitialized())
+  //   return false;
 
   DiscordRichPresence RichPresence = {};
 
@@ -19,19 +19,33 @@ bool mpn_update_discord()
   if (CurrentState.Scenes != NULL && CurrentState.Scene != NULL)
     RichPresence.state = CurrentState.Scene->Name.c_str();
 
-  if (mpn_read_value(CurrentState.Addresses->CurrentTurn, 1) == (mpn_read_value(CurrentState.Addresses->TotalTurns, 1) + 1))
-  {
-    State::Save(Core::System::GetInstance(), 1);
-  }
   if (CurrentState.Addresses != NULL)
   {
+    if (mpn_read_value(CurrentState.Addresses->CurrentTurn, 1) ==
+        (mpn_read_value(CurrentState.Addresses->TotalTurns, 1) + 1))
+    {
+      State::Save(Core::System::GetInstance(), 1);
+    }
+
+    // Add controller port values
+    int value1 = mpn_read_value(CurrentState.Addresses->ControllerPortAddress1, 1);
+    int value2 = mpn_read_value(CurrentState.Addresses->ControllerPortAddress2, 1);
+    int value3 = mpn_read_value(CurrentState.Addresses->ControllerPortAddress3, 1);
+    int value4 = mpn_read_value(CurrentState.Addresses->ControllerPortAddress4, 1);
+
+    // Modify values based on the given conditions
+    value1 = (value1 == 0) ? 1 : 0;
+    value2 = (value2 == 0) ? 1 : 0;
+    value3 = (value3 == 0) ? 1 : 0;
+    value4 = (value4 == 0) ? 1 : 0;
+
+    int controller_port_sum = value1 + value2 + value3 + value4;
+
     char Details[128] = "";
 
     if (CurrentState.Boards && CurrentState.Board)
     {
-      DiscordRichPresence discord_presence = {};
-      
-      snprintf(Details, sizeof(Details), "Players: 1/4 Turn: %d/%d",
+      snprintf(Details, sizeof(Details), "Players: %d/4 Turn: %d/%d", controller_port_sum,
                mpn_read_value(CurrentState.Addresses->CurrentTurn, 1),
                mpn_read_value(CurrentState.Addresses->TotalTurns, 1));
 
@@ -40,12 +54,19 @@ bool mpn_update_discord()
     }
     else
     {
-      snprintf(Details, sizeof(Details), "Players: 1/4");
+      snprintf(Details, sizeof(Details), "Players: %d/4", controller_port_sum);
       RichPresence.smallImageKey = "";
       RichPresence.smallImageText = "";
     }
     RichPresence.details = Details;
   }
+  else
+  {
+    // Handle the case where CurrentState.Addresses is NULL
+    RichPresence.details = "Invalid state: Addresses are NULL";
+    RichPresence.smallImageKey = "";
+    RichPresence.smallImageText = "";
+  }
 
   RichPresence.startTimestamp = std::time(nullptr);
   Discord_UpdatePresence(&RichPresence);
diff --git a/Source/Core/Core/MarioPartyNetplay/Discord.h b/Source/Core/Core/MarioPartyNetplay/Discord.h
index af73b0bcca..abf3802a3c 100644
--- a/Source/Core/Core/MarioPartyNetplay/Discord.h
+++ b/Source/Core/Core/MarioPartyNetplay/Discord.h
@@ -1,4 +1,4 @@
-#include <discord_rpc.h>
-#include "Gamestate.h"
-
-bool mpn_update_discord();
+#include <discord_rpc.h>
+#include "Gamestate.h"
+
+bool mpn_update_discord();
diff --git a/Source/Core/Core/MarioPartyNetplay/Gamestate.cpp b/Source/Core/Core/MarioPartyNetplay/Gamestate.cpp
index db19b71c39..32a2176dcd 100644
--- a/Source/Core/Core/MarioPartyNetplay/Gamestate.cpp
+++ b/Source/Core/Core/MarioPartyNetplay/Gamestate.cpp
@@ -1,201 +1,201 @@
-#include "Gamestate.h"
-#include "Core/System.h"
-
-mpn_state_t CurrentState;
-
-
-bool mpn_init_state()
-{
-  auto& system = Core::System::GetInstance();
-  auto& memory = system.GetMemory();
-  if (!memory.IsInitialized())
-    return false;
-
-  switch (mpn_read_value(0x00000000, 4))
-  {
-  case MPN_GAMEID_MP4:
-    CurrentState.Addresses = &MP4_ADDRESSES;
-    CurrentState.Boards = MP4_BOARDS;
-    CurrentState.Image = "box-mp4";
-    CurrentState.IsMarioParty = true;
-    CurrentState.Scenes = MP4_GAMESTATES;
-    CurrentState.Title = "Mario Party 4";
-    break;
-  case MPN_GAMEID_MP5:
-    CurrentState.Addresses = &MP5_ADDRESSES;
-    CurrentState.Boards = MP5_BOARDS;
-    CurrentState.Image = "box-mp5";
-    CurrentState.IsMarioParty = true;
-    CurrentState.Scenes = MP5_GAMESTATES;
-    CurrentState.Title = "Mario Party 5";
-    break;
-  case MPN_GAMEID_MP6:
-    CurrentState.Addresses = &MP6_ADDRESSES;
-    CurrentState.Boards = MP6_BOARDS;
-    CurrentState.Image = "box-mp6";
-    CurrentState.IsMarioParty = true;
-    CurrentState.Scenes = MP6_GAMESTATES;
-    CurrentState.Title = "Mario Party 6";
-    break;
-  case MPN_GAMEID_MP7:
-    CurrentState.Addresses    = &MP7_ADDRESSES;
-    CurrentState.Boards       = MP7_BOARDS;
-    CurrentState.Image = "box-mp7";
-    CurrentState.IsMarioParty = true;
-    CurrentState.Scenes = MP7_GAMESTATES;
-    CurrentState.Title = "Mario Party 7";
-    break;
-  case MPN_GAMEID_MP8:
-    CurrentState.Addresses = &MP8_ADDRESSES;
-    CurrentState.Boards = MP8_BOARDS;
-    CurrentState.Image = "box-mp8";
-    CurrentState.IsMarioParty = true;
-    CurrentState.Scenes = MP8_GAMESTATES;
-    CurrentState.Title = "Mario Party 8";
-    break;
-  case MPN_GAMEID_MP9: /* TODO */
-  default:
-    CurrentState.Addresses = NULL;
-    CurrentState.Boards = NULL;
-    CurrentState.Image = "box-mp9";
-    CurrentState.IsMarioParty = false;
-    CurrentState.Scenes = NULL;
-  }
-
-  return CurrentState.Scenes != NULL;
-}
-
-bool mpn_update_board()
-{
-  uint8_t i;
-
-  if (CurrentState.Boards == NULL)
-    CurrentState.Board = NULL;
-  else if (CurrentState.CurrentSceneId != CurrentState.PreviousSceneId)
-  {
-    for (i = 0;; i++)
-    {
-      /* Unknown scene ID */
-      if (CurrentState.Boards[i].SceneId == NONE)
-        break;
-      if (CurrentState.Boards[i].SceneId == CurrentState.CurrentSceneId)
-      {
-        CurrentState.Board = &CurrentState.Boards[i];
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-uint8_t mpn_get_needs(uint16_t StateId, bool IsSceneId)
-{
-  uint16_t i;
-
-  if (CurrentState.Scenes == NULL)
-    return MPN_NEEDS_NOTHING;
-  else if (CurrentState.CurrentSceneId != CurrentState.PreviousSceneId)
-  {
-    for (i = 0;; i++)
-    {
-      /* Unknown scene ID */
-      if (CurrentState.Scenes[i].SceneId == NONE)
-        return MPN_NEEDS_NOTHING;
-
-      /* Scene ID found in array */
-      if ((IsSceneId && StateId == CurrentState.Scenes[i].SceneId) ||
-          (StateId == CurrentState.Scenes[i].MiniGameId))
-        return CurrentState.Scenes[i].Needs;
-    }
-  }
-
-  return MPN_NEEDS_NOTHING;
-}
-
-void mpn_push_osd_message(const std::string& Message)
-{
-#ifdef MPN_USE_OSD
-  OSD::AddMessage(Message, OSD::Duration::SHORT, MPN_OSD_COLOR);
-#endif
-}
-
-bool mpn_update_state()
-{
-  if (CurrentState.Scenes == NULL && !mpn_init_state())
-    return false;
-  auto& system = Core::System::GetInstance();
-  auto& memory = system.GetMemory();
-  if (!memory.IsInitialized())
-    return false;
-
-  CurrentState.PreviousSceneId = CurrentState.CurrentSceneId;
-  CurrentState.CurrentSceneId = mpn_read_value(CurrentState.Addresses->SceneIdAddress, 2);
-
-  for (uint16_t i = 0;; i++)
-  {
-    if (CurrentState.Scenes[i].SceneId == NONE)
-      break;
-    if (CurrentState.CurrentSceneId == CurrentState.Scenes[i].SceneId)
-    {
-      CurrentState.Scene = &CurrentState.Scenes[i];
-      return true;
-    }
-  }
-
-  return false;
-}
-
-#define OSD_PUSH(a) mpn_push_osd_message("Adjusting #a for " + CurrentState.Scene->Name);
-void mpn_per_frame()
-{
-  uint8_t Needs = 0;
-
-  if (!mpn_update_state() || CurrentState.PreviousSceneId == CurrentState.CurrentSceneId)
-    return;
-
-  mpn_update_board();
-  mpn_update_discord();
-
-  Needs = mpn_get_needs(mpn_read_value(CurrentState.Addresses->SceneIdAddress, 2), true);
-
-  if (Needs != MPN_NEEDS_NOTHING)
-  {
-    if (Needs & MPN_NEEDS_SAFE_TEX_CACHE)
-    {
-      OSD_PUSH(GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES)
-      Config::SetCurrent(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES, 0);
-    }
-    else
-      Config::SetCurrent(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES, 128);
-
-    if (Needs & MPN_NEEDS_NATIVE_RES)
-    {
-      OSD_PUSH(GFX_EFB_SCALE)
-      Config::SetCurrent(Config::GFX_EFB_SCALE, 1);
-    }
-    else
-      Config::SetCurrent(Config::GFX_EFB_SCALE, Config::GetBase(Config::GFX_EFB_SCALE));
-
-    if (Needs & MPN_NEEDS_EFB_TO_TEXTURE)
-    {
-      OSD_PUSH(GFX_HACK_SKIP_EFB_COPY_TO_RAM)
-      Config::SetCurrent(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM, false);
-    }
-    else
-      Config::SetCurrent(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM, true);
-
-    UpdateActiveConfig();
-  }
-}
-
-uint32_t mpn_read_value(uint32_t Address, uint8_t Size)
-{
-  uint32_t Value = 0;
-  auto& system = Core::System::GetInstance();
-  auto& memory = system.GetMemory();
-  for (int8_t i = 0; i < Size; i++)
-    Value += memory.GetRAM()[Address + i] * pow(256, Size - i - 1);
-
-  return Value;
-}
+#include "Gamestate.h"
+#include "Core/System.h"
+
+mpn_state_t CurrentState;
+
+
+bool mpn_init_state()
+{
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  if (!memory.IsInitialized())
+    return false;
+
+  switch (mpn_read_value(0x00000000, 4))
+  {
+  case MPN_GAMEID_MP4:
+    CurrentState.Addresses = &MP4_ADDRESSES;
+    CurrentState.Boards = MP4_BOARDS;
+    CurrentState.Image = "box-mp4";
+    CurrentState.IsMarioParty = true;
+    CurrentState.Scenes = MP4_GAMESTATES;
+    CurrentState.Title = "Mario Party 4";
+    break;
+  case MPN_GAMEID_MP5:
+    CurrentState.Addresses = &MP5_ADDRESSES;
+    CurrentState.Boards = MP5_BOARDS;
+    CurrentState.Image = "box-mp5";
+    CurrentState.IsMarioParty = true;
+    CurrentState.Scenes = MP5_GAMESTATES;
+    CurrentState.Title = "Mario Party 5";
+    break;
+  case MPN_GAMEID_MP6:
+    CurrentState.Addresses = &MP6_ADDRESSES;
+    CurrentState.Boards = MP6_BOARDS;
+    CurrentState.Image = "box-mp6";
+    CurrentState.IsMarioParty = true;
+    CurrentState.Scenes = MP6_GAMESTATES;
+    CurrentState.Title = "Mario Party 6";
+    break;
+  case MPN_GAMEID_MP7:
+    CurrentState.Addresses    = &MP7_ADDRESSES;
+    CurrentState.Boards       = MP7_BOARDS;
+    CurrentState.Image = "box-mp7";
+    CurrentState.IsMarioParty = true;
+    CurrentState.Scenes = MP7_GAMESTATES;
+    CurrentState.Title = "Mario Party 7";
+    break;
+  case MPN_GAMEID_MP8:
+    CurrentState.Addresses = &MP8_ADDRESSES;
+    CurrentState.Boards = MP8_BOARDS;
+    CurrentState.Image = "box-mp8";
+    CurrentState.IsMarioParty = true;
+    CurrentState.Scenes = MP8_GAMESTATES;
+    CurrentState.Title = "Mario Party 8";
+    break;
+  case MPN_GAMEID_MP9: /* TODO */
+  default:
+    CurrentState.Addresses = NULL;
+    CurrentState.Boards = NULL;
+    CurrentState.Image = "box-mp9";
+    CurrentState.IsMarioParty = false;
+    CurrentState.Scenes = NULL;
+  }
+
+  return CurrentState.Scenes != NULL;
+}
+
+bool mpn_update_board()
+{
+  uint8_t i;
+
+  if (CurrentState.Boards == NULL)
+    CurrentState.Board = NULL;
+  else if (CurrentState.CurrentSceneId != CurrentState.PreviousSceneId)
+  {
+    for (i = 0;; i++)
+    {
+      /* Unknown scene ID */
+      if (CurrentState.Boards[i].SceneId == NONE)
+        break;
+      if (CurrentState.Boards[i].SceneId == CurrentState.CurrentSceneId)
+      {
+        CurrentState.Board = &CurrentState.Boards[i];
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+uint8_t mpn_get_needs(uint16_t StateId, bool IsSceneId)
+{
+  uint16_t i;
+
+  if (CurrentState.Scenes == NULL)
+    return MPN_NEEDS_NOTHING;
+  else if (CurrentState.CurrentSceneId != CurrentState.PreviousSceneId)
+  {
+    for (i = 0;; i++)
+    {
+      /* Unknown scene ID */
+      if (CurrentState.Scenes[i].SceneId == NONE)
+        return MPN_NEEDS_NOTHING;
+
+      /* Scene ID found in array */
+      if ((IsSceneId && StateId == CurrentState.Scenes[i].SceneId) ||
+          (StateId == CurrentState.Scenes[i].MiniGameId))
+        return CurrentState.Scenes[i].Needs;
+    }
+  }
+
+  return MPN_NEEDS_NOTHING;
+}
+
+void mpn_push_osd_message(const std::string& Message)
+{
+#ifdef MPN_USE_OSD
+  OSD::AddMessage(Message, OSD::Duration::SHORT, MPN_OSD_COLOR);
+#endif
+}
+
+bool mpn_update_state()
+{
+  if (CurrentState.Scenes == NULL && !mpn_init_state())
+    return false;
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  if (!memory.IsInitialized())
+    return false;
+
+  CurrentState.PreviousSceneId = CurrentState.CurrentSceneId;
+  CurrentState.CurrentSceneId = mpn_read_value(CurrentState.Addresses->SceneIdAddress, 2);
+
+  for (uint16_t i = 0;; i++)
+  {
+    if (CurrentState.Scenes[i].SceneId == NONE)
+      break;
+    if (CurrentState.CurrentSceneId == CurrentState.Scenes[i].SceneId)
+    {
+      CurrentState.Scene = &CurrentState.Scenes[i];
+      return true;
+    }
+  }
+
+  return false;
+}
+
+#define OSD_PUSH(a) mpn_push_osd_message("Adjusting #a for " + CurrentState.Scene->Name);
+void mpn_per_frame()
+{
+  uint8_t Needs = 0;
+
+  if (!mpn_update_state() || CurrentState.PreviousSceneId == CurrentState.CurrentSceneId)
+    return;
+
+  mpn_update_board();
+  mpn_update_discord();
+
+  Needs = mpn_get_needs(mpn_read_value(CurrentState.Addresses->SceneIdAddress, 2), true);
+
+  if (Needs != MPN_NEEDS_NOTHING)
+  {
+    if (Needs & MPN_NEEDS_SAFE_TEX_CACHE)
+    {
+      OSD_PUSH(GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES)
+      Config::SetCurrent(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES, 0);
+    }
+    else
+      Config::SetCurrent(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES, 128);
+
+    if (Needs & MPN_NEEDS_NATIVE_RES)
+    {
+      OSD_PUSH(GFX_EFB_SCALE)
+      Config::SetCurrent(Config::GFX_EFB_SCALE, 1);
+    }
+    else
+      Config::SetCurrent(Config::GFX_EFB_SCALE, Config::GetBase(Config::GFX_EFB_SCALE));
+
+    if (Needs & MPN_NEEDS_EFB_TO_TEXTURE)
+    {
+      OSD_PUSH(GFX_HACK_SKIP_EFB_COPY_TO_RAM)
+      Config::SetCurrent(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM, false);
+    }
+    else
+      Config::SetCurrent(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM, true);
+
+    UpdateActiveConfig();
+  }
+}
+
+uint32_t mpn_read_value(uint32_t Address, uint8_t Size)
+{
+  uint32_t Value = 0;
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  for (int8_t i = 0; i < Size; i++)
+    Value += memory.GetRAM()[Address + i] * pow(256, Size - i - 1);
+
+  return Value;
+}
diff --git a/Source/Core/Core/MarioPartyNetplay/Gamestate.h b/Source/Core/Core/MarioPartyNetplay/Gamestate.h
index 7eac9447e7..150e7671b2 100644
--- a/Source/Core/Core/MarioPartyNetplay/Gamestate.h
+++ b/Source/Core/Core/MarioPartyNetplay/Gamestate.h
@@ -65,6 +65,10 @@ typedef struct mpn_addresses_t
   uint32_t TotalTurns;
   uint32_t MinigameIdAddress;
   uint32_t SceneIdAddress;
+  uint32_t ControllerPortAddress1;
+  uint32_t ControllerPortAddress2;
+  uint32_t ControllerPortAddress3;
+  uint32_t ControllerPortAddress4;
 } mpn_addresses_t;
 
 typedef struct mpn_player_t
@@ -112,7 +116,16 @@ bool mpn_update_state();
 /* ============================================================================
    Mario Party 4 metadata
 ============================================================================ */
-const mpn_addresses_t MP4_ADDRESSES = {0x0018FCFC, 0x0018FCFD, 0x0018FD2C, 0x001D3CE2};
+const mpn_addresses_t MP4_ADDRESSES = {
+    0x0018FCFC,  // Current Turns
+    0x0018FCFD,  // Total Turns
+    0x0018FD2C,  // Mini ID
+    0x001D3CE2,  // Scene ID
+    0x0018FC19,  // Controller Port A
+    0x0018FC23,  // Controller Port B
+    0x0018FC2D,  // Controller Port C
+    0x0018FC37   // Controller Port D
+};
 
 const mpn_board_t MP4_BOARDS[] = {{1, 0x59, {"Toad's Midway Madness"}, {"mp4-toad"}},
                                   {2, 0x5A, {"Goomba's Greedy Gala"}, {"mp4-goomba"}},
@@ -213,7 +226,11 @@ const mpn_addresses_t MP5_ADDRESSES = {
     0x0022A494,  // Current Turns
     0x0022A495,  // Total Turns
     0x0022A4C4,  // Mini ID
-    0x00288862   // Scene ID
+    0x00288862,  // Scene ID
+    0x0022A05B,  // Controller Port A
+    0x0022A051,  // Controller Port B
+    0x0022A065,  // Controller Port C
+    0x0022A06F   // Controller Port D
 };
 
 const mpn_board_t MP5_BOARDS[] = {{1, 0x76, {"Toy Dream"}, {"mp5-toy"}},
@@ -333,8 +350,11 @@ const mpn_addresses_t MP6_ADDRESSES = {
     0x00265B74,  // Current Turns
     0x00265B75,  // Total Turns
     0x00265BA8,  // Mini ID
-    0x002C0256   // Scene ID
-};
+    0x002C0256,  // Scene ID
+    0x00265745,  // Controller Port A
+    0x00265731,  // Controller Port B
+    0x0026574F,  // Controller Port C
+    0x0026573B}; // Controller Port D
 
 const mpn_board_t MP6_BOARDS[] = {{1, 0x7B, {"Towering Treetop"}, {"mp6-treetop"}},
                                   {2, 0x7C, {"E. Gadd's Garage"}, {"mp6-garage"}},
@@ -460,7 +480,20 @@ const mpn_scene_t MP6_GAMESTATES[] = {{NONE, 0x01, {"Title Screen"}, 0},
    Mario Party 7 metadata
 ============================================================================ */
 
-const mpn_addresses_t MP7_ADDRESSES = {0x0029151C, 0x0029151D, 0x00291558, 0x002F2F3E};
+const mpn_addresses_t MP7_ADDRESSES = {
+  0x0029151C,   // Current Turns
+  0x0029151D,   // Total Turns
+  0x00291558,   // Mini ID
+  0x002F2F3E,   // Scene ID
+  0x00290C51,   // Controller Port A
+  0x00290C5B,   // Controller Port B
+  0x00290C65,   // Controller Port C
+  0x00290C6F    // Controller Port D
+  //0x00290C79, // Controller Port E
+  //0x00290C83, // Controller Port F
+  //0x00290C8D, // Controller Port G
+  //0x00290C97  // Controller Port H
+};  
 
 const mpn_board_t MP7_BOARDS[] = {{1, 0x7A, {"Grand Canal"}, {"mp7-canal"}},
                                   {2, 0x7B, {"Pagoda Peak"}, {"mp7-peak"}},
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.user b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
index 22760f9a5b..95370995fa 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj.user
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <ShowAllFiles>true</ShowAllFiles>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
 </Project>
\ No newline at end of file