From 1239124401a9c31d070832ca818add9fcb490917 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Sat, 25 Feb 2023 10:54:03 -0500
Subject: [PATCH] Proper Primehack preconfiguration

---
 emu-configs/primehack/Dolphin.ini             |  5 +-
 emu-configs/primehack/GCPadNew.ini            | 39 ++++++-----
 emu-configs/primehack/GFX.ini                 | 25 ++++++++
 emu-configs/primehack/Hotkeys.ini             |  3 +
 ...ni => PrimeHack SD-GC Nintendo Layout.ini} | 18 +++---
 .../GCPad/PrimeHack SD-GC Xbox Layout.ini     | 34 ++++++++++
 .../Profiles/Hotkeys/RetroDECK Defaults.ini   |  3 +
 ...i => PrimeHack SD-Wii Nintendo Layout.ini} | 12 ++--
 .../Wiimote/PrimeHack SD-Wii Xbox Layout.ini  | 51 +++++++++++++++
 emu-configs/primehack/Qt.ini                  |  8 +--
 emu-configs/primehack/WiimoteNew.ini          | 64 ++++++++++---------
 11 files changed, 196 insertions(+), 66 deletions(-)
 create mode 100644 emu-configs/primehack/GFX.ini
 create mode 100644 emu-configs/primehack/Hotkeys.ini
 rename emu-configs/primehack/Profiles/GCPad/{PrimeHack SD-GC.ini => PrimeHack SD-GC Nintendo Layout.ini} (76%)
 create mode 100644 emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Xbox Layout.ini
 create mode 100644 emu-configs/primehack/Profiles/Hotkeys/RetroDECK Defaults.ini
 rename emu-configs/primehack/Profiles/Wiimote/{PrimeHack SD-Wii.ini => PrimeHack SD-Wii Nintendo Layout.ini} (85%)
 create mode 100644 emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Xbox Layout.ini

diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini
index 8b4df327..7731928e 100644
--- a/emu-configs/primehack/Dolphin.ini
+++ b/emu-configs/primehack/Dolphin.ini
@@ -33,6 +33,7 @@ WiiKeyboard = False
 WiiSDCard = True
 WiiSDCardAllowWrites = True
 WiiSDCardEnableFolderSync = False
+GFXBackend = Vulkan
 [NetPlay]
 TraversalChoice = direct
 [General]
@@ -45,8 +46,9 @@ ISOPaths = 1
 [Display]
 DisableScreenSaver = True
 KeepWindowOnTop = False
+Fullscreen = True
 [Interface]
-ConfirmStop = True
+ConfirmStop = False
 LanguageCode =
 OnScreenDisplayMessages = True
 PauseOnFocusLost = False
@@ -59,6 +61,7 @@ CursorVisibility = 2
 [DSP]
 Backend = No Audio Output
 EnableJIT = False
+DSPThread = True
 [GBA]
 BIOS = /var/data/primehack/GBA/gba_bios.bin
 Rom1 =
diff --git a/emu-configs/primehack/GCPadNew.ini b/emu-configs/primehack/GCPadNew.ini
index 9579f8ef..a6e6dd31 100644
--- a/emu-configs/primehack/GCPadNew.ini
+++ b/emu-configs/primehack/GCPadNew.ini
@@ -1,32 +1,37 @@
 [GCPad1]
 Device = SDL/0/Microsoft X-Box 360 pad 0
-Buttons/A = `Button 0`
+Buttons/A = `Full Axis 5+` | `Button 0`
 Buttons/B = `Button 1`
 Buttons/X = `Button 2`
 Buttons/Y = `Button 3`
 Buttons/Z = `Button 6`
 Buttons/Start = `Button 7`
-Main Stick/Up = `Axis 4-`
-Main Stick/Down = `Axis 4+`
-Main Stick/Left = `Axis 3-`
-Main Stick/Right = `Axis 3+`
+Main Stick/Dead Zone = 10.0
+Main Stick/Up = `Axis 1-`
+Main Stick/Down = `Axis 1+`
+Main Stick/Left = `Axis 0-`
+Main Stick/Right = `Axis 0+`
 Main Stick/Modifier/Range = 50.0
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
-C-Stick/Up = `Axis 1-`
-C-Stick/Down = `Axis 1+`
-C-Stick/Left = `Axis 0-`
-C-Stick/Right = `Axis 0+`
+C-Stick/Up = `Button 5` & `Hat 0 N`
+C-Stick/Down = `Button 5` & `Hat 0 S`
+C-Stick/Left = `Button 5` & `Hat 0 W`
+C-Stick/Right = `Button 5` & `Hat 0 E`
 C-Stick/Modifier/Range = 50.0
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
-Triggers/L = `Button 4`
-D-Pad/Up = `Hat 0 N`
-D-Pad/Down = `Hat 0 S`
-D-Pad/Left = `Hat 0 W`
-D-Pad/Right = `Hat 0 E`
-Camera Control/Modifier/Range = 50.0
+Triggers/L = `Full Axis 2+`
 Triggers/L-Analog = `Full Axis 2+`
-Triggers/R-Analog = `Full Axis 5+`
-Triggers/R = `Button 5`
+D-Pad/Up = !`Button 5` & `Hat 0 N`
+D-Pad/Down = !`Button 5` & `Hat 0 S`
+D-Pad/Left = !`Button 5` & `Hat 0 W`
+D-Pad/Right = !`Button 5` & `Hat 0 E`
+Camera Control/Dead Zone = 10.0
+Camera Control/Up = `Axis 4-`
+Camera Control/Down = `Axis 4+`
+Camera Control/Left = `Axis 3-`
+Camera Control/Right = `Axis 3+`
+Camera Control/Modifier/Range = 50.0
+PrimeHack/Mode = 1
 [GCPad2]
 Device = XInput2/0/Virtual core pointer
 Main Stick/Modifier/Range = 50.0
diff --git a/emu-configs/primehack/GFX.ini b/emu-configs/primehack/GFX.ini
new file mode 100644
index 00000000..4ffbf202
--- /dev/null
+++ b/emu-configs/primehack/GFX.ini
@@ -0,0 +1,25 @@
+[Enhancements]
+ArbitraryMipmapDetection = True
+DisableCopyFilter = True
+ForceTrueColor = True
+[Hacks]
+BBoxEnable = False
+DeferEFBCopies = True
+EFBEmulateFormatChanges = False
+EFBScaledCopy = True
+EFBToTextureEnable = True
+ImmediateXFBEnable = True
+SkipDuplicateXFBs = True
+XFBToTextureEnable = True
+[PrimeHack Misc]
+Lock Camera in Motion Puzzles = True
+ReduceBloom = True
+ToggleArmRePosition = True
+[Settings]
+AspectRatio = 3
+BackendMultithreading = True
+DumpBaseTextures = True
+DumpMipTextures = True
+FastDepthCalc = True
+InternalResolution = 2
+SaveTextureCacheToState = True
diff --git a/emu-configs/primehack/Hotkeys.ini b/emu-configs/primehack/Hotkeys.ini
new file mode 100644
index 00000000..d53efc35
--- /dev/null
+++ b/emu-configs/primehack/Hotkeys.ini
@@ -0,0 +1,3 @@
+[Hotkeys]
+Device = SDL/0/Microsoft X-Box 360 pad 0
+General/Stop = `Button 6`&`Button 7`
\ No newline at end of file
diff --git a/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC.ini b/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Nintendo Layout.ini
similarity index 76%
rename from emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC.ini
rename to emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Nintendo Layout.ini
index fa18ffdd..e0cd9897 100644
--- a/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC.ini	
+++ b/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Nintendo Layout.ini	
@@ -2,11 +2,11 @@
 Device = SDL/0/Microsoft X-Box 360 pad 0
 Buttons/A = `Full Axis 5+` | `Button 1`
 Buttons/B = `Button 0`
-Buttons/X = `Button 4`
-Buttons/Y = `Button 3`
-Buttons/Z = `Button 7`
-Buttons/Start = `Button 6`
-Main Stick/Dead Zone = 8.0
+Buttons/X = `Button 3`
+Buttons/Y = `Button 2`
+Buttons/Z = `Button 6`
+Buttons/Start = `Button 7`
+Main Stick/Dead Zone = 10.0
 Main Stick/Up = `Axis 1-`
 Main Stick/Down = `Axis 1+`
 Main Stick/Left = `Axis 0-`
@@ -22,10 +22,10 @@ C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Triggers/L = `Full Axis 2+`
 Triggers/L-Analog = `Full Axis 2+`
 D-Pad/Up = !`Button 5` & `Hat 0 N`
-D-Pad/Down = !`Button 5` & `Hat 0 W`
-D-Pad/Left = !`Button 5` & `Hat 0 E`
-D-Pad/Right = !`Button 5` & `Hat 0 S`
-Camera Control/Dead Zone = 4.0
+D-Pad/Down = !`Button 5` & `Hat 0 S`
+D-Pad/Left = !`Button 5` & `Hat 0 W`
+D-Pad/Right = !`Button 5` & `Hat 0 E`
+Camera Control/Dead Zone = 10.0
 Camera Control/Up = `Axis 4-`
 Camera Control/Down = `Axis 4+`
 Camera Control/Left = `Axis 3-`
diff --git a/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Xbox Layout.ini b/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Xbox Layout.ini
new file mode 100644
index 00000000..ad5af544
--- /dev/null
+++ b/emu-configs/primehack/Profiles/GCPad/PrimeHack SD-GC Xbox Layout.ini	
@@ -0,0 +1,34 @@
+[Profile]
+Device = SDL/0/Microsoft X-Box 360 pad 0
+Buttons/A = `Full Axis 5+` | `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 2`
+Buttons/Y = `Button 3`
+Buttons/Z = `Button 6`
+Buttons/Start = `Button 7`
+Main Stick/Dead Zone = 10.0
+Main Stick/Up = `Axis 1-`
+Main Stick/Down = `Axis 1+`
+Main Stick/Left = `Axis 0-`
+Main Stick/Right = `Axis 0+`
+Main Stick/Modifier/Range = 50.0
+Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
+C-Stick/Up = `Button 5` & `Hat 0 N`
+C-Stick/Down = `Button 5` & `Hat 0 S`
+C-Stick/Left = `Button 5` & `Hat 0 W`
+C-Stick/Right = `Button 5` & `Hat 0 E`
+C-Stick/Modifier/Range = 50.0
+C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
+Triggers/L = `Full Axis 2+`
+Triggers/L-Analog = `Full Axis 2+`
+D-Pad/Up = !`Button 5` & `Hat 0 N`
+D-Pad/Down = !`Button 5` & `Hat 0 S`
+D-Pad/Left = !`Button 5` & `Hat 0 W`
+D-Pad/Right = !`Button 5` & `Hat 0 E`
+Camera Control/Dead Zone = 10.0
+Camera Control/Up = `Axis 4-`
+Camera Control/Down = `Axis 4+`
+Camera Control/Left = `Axis 3-`
+Camera Control/Right = `Axis 3+`
+Camera Control/Modifier/Range = 50.0
+PrimeHack/Mode = 1
diff --git a/emu-configs/primehack/Profiles/Hotkeys/RetroDECK Defaults.ini b/emu-configs/primehack/Profiles/Hotkeys/RetroDECK Defaults.ini
new file mode 100644
index 00000000..437f8365
--- /dev/null
+++ b/emu-configs/primehack/Profiles/Hotkeys/RetroDECK Defaults.ini	
@@ -0,0 +1,3 @@
+[Profile]
+Device = SDL/0/Microsoft X-Box 360 pad 0
+General/Stop = `Button 6`&`Button 7`
\ No newline at end of file
diff --git a/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii.ini b/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Nintendo Layout.ini
similarity index 85%
rename from emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii.ini
rename to emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Nintendo Layout.ini
index 5296c240..a42aab78 100644
--- a/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii.ini	
+++ b/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Nintendo Layout.ini	
@@ -30,13 +30,13 @@ uDraw/Stylus/Modifier/Range = 50.0
 Drawsome/Stylus/Modifier/Range = 50.0
 Rumble/Motor = Weak
 PrimeHack/Beam 1 = `Button 5` & `Hat 0 N`
-PrimeHack/Beam 2 = `Button 5` & `Hat 0 W`
-PrimeHack/Beam 3 = `Button 5` & `Hat 0 E`
-PrimeHack/Beam 4 = `Button 5` & `Hat 0 S`
+PrimeHack/Beam 2 = `Button 5` & `Hat 0 S`
+PrimeHack/Beam 3 = `Button 5` & `Hat 0 W`
+PrimeHack/Beam 4 = `Button 5` & `Hat 0 E`
 PrimeHack/Visor 1 = !`Button 5` & `Hat 0 N`
-PrimeHack/Visor 2 = !`Button 5` & `Hat 0 W`
-PrimeHack/Visor 3 = !`Button 5` & `Hat 0 E`
-PrimeHack/Visor 4 = !`Button 5` & `Hat 0 S`
+PrimeHack/Visor 2 = !`Button 5` & `Hat 0 S`
+PrimeHack/Visor 3 = !`Button 5` & `Hat 0 W`
+PrimeHack/Visor 4 = !`Button 5` & `Hat 0 E`
 PrimeHack/AltProfile = Disabled
 PrimeHack/Control Reticle When Locked-On = True
 Camera Control/Dead Zone = 15.0
diff --git a/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Xbox Layout.ini b/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Xbox Layout.ini
new file mode 100644
index 00000000..7438d532
--- /dev/null
+++ b/emu-configs/primehack/Profiles/Wiimote/PrimeHack SD-Wii Xbox Layout.ini	
@@ -0,0 +1,51 @@
+[Profile]
+Device = SDL/0/Microsoft X-Box 360 pad 0
+Buttons/A = `Full Axis 5+` | `Button 0`
+Buttons/B = `Button 1`
+Buttons/1 = `Button 7`
+Buttons/2 = `Button 6`
+Buttons/- = `Button 4`
+Buttons/+ = `Button 5`
+Buttons/Down = `Button 3`
+D-Pad/Down = `Button 3`
+Tilt/Modifier/Range = 50.0
+IMUIR/Enabled = False
+Extension = Nunchuk
+Nunchuk/Buttons/C = `Button 4`
+Nunchuk/Buttons/Z = `Full Axis 2+`
+Nunchuk/Stick/Dead Zone = 15.0
+Nunchuk/Stick/Up = `Axis 1-`
+Nunchuk/Stick/Down = `Axis 1+`
+Nunchuk/Stick/Left = `Axis 0-`
+Nunchuk/Stick/Right = `Axis 0+`
+Nunchuk/Stick/Modifier/Range = 50.0
+Nunchuk/Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
+Nunchuk/Tilt/Modifier/Range = 50.0
+Classic/Left Stick/Modifier/Range = 50.0
+Classic/Right Stick/Modifier/Range = 50.0
+Guitar/Stick/Modifier/Range = 50.0
+Drums/Stick/Modifier/Range = 50.0
+Turntable/Stick/Modifier/Range = 50.0
+uDraw/Stylus/Modifier/Range = 50.0
+Drawsome/Stylus/Modifier/Range = 50.0
+Rumble/Motor = Weak
+PrimeHack/Beam 1 = `Button 5` & `Hat 0 N`
+PrimeHack/Beam 2 = `Button 5` & `Hat 0 S`
+PrimeHack/Beam 3 = `Button 5` & `Hat 0 W`
+PrimeHack/Beam 4 = `Button 5` & `Hat 0 E`
+PrimeHack/Visor 1 = !`Button 5` & `Hat 0 N`
+PrimeHack/Visor 2 = !`Button 5` & `Hat 0 S`
+PrimeHack/Visor 3 = !`Button 5` & `Hat 0 W`
+PrimeHack/Visor 4 = !`Button 5` & `Hat 0 E`
+PrimeHack/AltProfile = Disabled
+PrimeHack/Control Reticle When Locked-On = True
+Camera Control/Dead Zone = 15.0
+Camera Control/Up = `Axis 4-`
+Camera Control/Down = `Axis 4+`
+Camera Control/Left = `Axis 3-`
+Camera Control/Right = `Axis 3+`
+Camera Control/Modifier/Range = 50.0
+PrimeHack/Mode = 1
+PrimeHack/Tap Grapple Repeatedly To Pull = True
+PrimeHack/Spring Ball = `Button 10`
+PrimeHack/Grapple Lasso = `Button 2`
diff --git a/emu-configs/primehack/Qt.ini b/emu-configs/primehack/Qt.ini
index c9114c35..873a3e8d 100644
--- a/emu-configs/primehack/Qt.ini
+++ b/emu-configs/primehack/Qt.ini
@@ -39,8 +39,8 @@ floating=false
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
 
 [mainwindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x1f\0\0\x2\xcc\0\0\0\0\0\0\0\0\0\0\x3\x1f\0\0\x2\xcc\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x3\x1f\0\0\x2\xcc)
-state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\x1\x8f\0\0\x2\x80\xfc\x2\0\0\0\x1\xfc\0\0\0t\0\0\x2\x80\0\0\0\0\0\xff\xff\xff\xfa\xff\xff\xff\xff\x2\0\0\0\n\xfb\0\0\0\x6\0l\0o\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x88\0\xff\xff\xff\xfb\0\0\0\x12\0l\0o\0g\0\x63\0o\0n\0\x66\0i\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xc3\0\xff\xff\xff\xfb\0\0\0\b\0\x63\0o\0\x64\0\x65\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x2\0\xff\xff\xff\xfb\0\0\0\x12\0r\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0]\0\xff\xff\xff\xfb\0\0\0\xe\0t\0h\0r\0\x65\0\x61\0\x64\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x14\0\xff\xff\xff\xfb\0\0\0\n\0w\0\x61\0t\0\x63\0h\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0\x16\0\x62\0r\0\x65\0\x61\0k\0p\0o\0i\0n\0t\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0\f\0m\0\x65\0m\0o\0r\0y\0\0\0\0\0\xff\xff\xff\xff\0\0\0]\0\xff\xff\xff\xfb\0\0\0\xe\0n\0\x65\0t\0w\0o\0r\0k\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x1d\0\xff\xff\xff\xfb\0\0\0\x12\0j\0i\0t\0w\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xc4\0\xff\xff\xff\0\0\x3 \0\0\x2w\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\xe\0t\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf)
+state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\x1\x8f\0\0\x2\x80\xfc\x2\0\0\0\x1\xfc\0\0\0t\0\0\x2\x80\0\0\0\0\0\xff\xff\xff\xfa\xff\xff\xff\xff\x2\0\0\0\n\xfb\0\0\0\x6\0l\0o\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x88\0\xff\xff\xff\xfb\0\0\0\x12\0l\0o\0g\0\x63\0o\0n\0\x66\0i\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xc3\0\xff\xff\xff\xfb\0\0\0\b\0\x63\0o\0\x64\0\x65\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x2\0\xff\xff\xff\xfb\0\0\0\x12\0r\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0]\0\xff\xff\xff\xfb\0\0\0\xe\0t\0h\0r\0\x65\0\x61\0\x64\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x14\0\xff\xff\xff\xfb\0\0\0\n\0w\0\x61\0t\0\x63\0h\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0\x16\0\x62\0r\0\x65\0\x61\0k\0p\0o\0i\0n\0t\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0\f\0m\0\x65\0m\0o\0r\0y\0\0\0\0\0\xff\xff\xff\xff\0\0\0]\0\xff\xff\xff\xfb\0\0\0\xe\0n\0\x65\0t\0w\0o\0r\0k\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x1d\0\xff\xff\xff\xfb\0\0\0\x12\0j\0i\0t\0w\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xc4\0\xff\xff\xff\0\0\x2\x80\0\0\x1\x8a\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\xe\0t\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
 
 [memorywidget]
 addrspace_auxiliary=false
@@ -69,10 +69,10 @@ floating=false
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
 
 [renderwidget]
-geometry=@ByteArray()
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf)
 
 [tableheader]
-state=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x2\x1\0\0\0\0\0\0\0\0\0\0\0\xe(?\0\0\0\b\0\0\0\t\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\v\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\0\r\0\0\0\x64\0\0\0\f\0\0\0\x64\0\0\0\x3\0\0\0\x64\0\0\0\x5\0\0\0\x46\0\0\x3\x13\0\0\0\xe\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\0\0\0&\0\0\0\x84\0\0\0\0\0\0\0\xe\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0\x66\0\0\0\x1\0\0\0\x2\0\0\x1\x6\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x1\x6\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0U\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\0)
+state=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x2\x1\0\0\0\0\0\0\0\0\0\0\0\xe(?\0\0\0\b\0\0\0\f\0\0\0\x64\0\0\0\r\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\0\v\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\t\0\0\0\x64\0\0\0\x5\0\0\0\x46\0\0\0\x3\0\0\0\x64\0\0\x2s\0\0\0\xe\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\0\0\0&\0\0\0\x84\0\0\0\0\0\0\0\xe\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0\x66\0\0\0\x1\0\0\0\x2\0\0\0\xb6\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\xb6\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0U\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\0)
 
 [threadwidget]
 floating=false
diff --git a/emu-configs/primehack/WiimoteNew.ini b/emu-configs/primehack/WiimoteNew.ini
index af2be94b..ba4ec69d 100644
--- a/emu-configs/primehack/WiimoteNew.ini
+++ b/emu-configs/primehack/WiimoteNew.ini
@@ -1,24 +1,26 @@
 [Wiimote1]
-Device = XInput2/0/Virtual core pointer
-Buttons/A = `Click 1` | RETURN
-Buttons/B = space
-Buttons/1 = Tab
-Buttons/2 = `grave`
-Buttons/- = E
-Buttons/+ = R
+Device = SDL/0/Microsoft X-Box 360 pad 0
+Buttons/A = `Full Axis 5+` | `Button 0`
+Buttons/B = `Button 1`
+Buttons/1 = `Button 7`
+Buttons/2 = `Button 6`
+Buttons/- = `Button 4`
+Buttons/+ = `Button 5`
+Buttons/Down = `Button 3`
+D-Pad/Down = `Button 3`
 Tilt/Modifier/Range = 50.0
 IMUIR/Enabled = False
 Extension = Nunchuk
-Nunchuk/Buttons/C = Ctrl
-Nunchuk/Buttons/Z = `Click 3`
-Nunchuk/Stick/Up = W | UP
-Nunchuk/Stick/Down = S | DOWN
-Nunchuk/Stick/Left = A | LEFT
-Nunchuk/Stick/Right = D | RIGHT
+Nunchuk/Buttons/C = `Button 4`
+Nunchuk/Buttons/Z = `Full Axis 2+`
+Nunchuk/Stick/Dead Zone = 15.0
+Nunchuk/Stick/Up = `Axis 1-`
+Nunchuk/Stick/Down = `Axis 1+`
+Nunchuk/Stick/Left = `Axis 0-`
+Nunchuk/Stick/Right = `Axis 0+`
 Nunchuk/Stick/Modifier/Range = 50.0
 Nunchuk/Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Nunchuk/Tilt/Modifier/Range = 50.0
-Nunchuk/Shake/Y = LSHIFT & (`Axis Y-` | `Axis Y+` | `Axis X-` | `Axis X+`)
 Classic/Left Stick/Modifier/Range = 50.0
 Classic/Right Stick/Modifier/Range = 50.0
 Guitar/Stick/Modifier/Range = 50.0
@@ -26,23 +28,27 @@ Drums/Stick/Modifier/Range = 50.0
 Turntable/Stick/Modifier/Range = 50.0
 uDraw/Stylus/Modifier/Range = 50.0
 Drawsome/Stylus/Modifier/Range = 50.0
-D-Pad/Down = F
-PrimeHack/Beam 1 = `1` & !E
-PrimeHack/Beam 2 = `2` & !E
-PrimeHack/Beam 3 = `3` & !E
-PrimeHack/Beam 4 = `4` & !E
-PrimeHack/Next Beam = !E & `Axis Z+`
-PrimeHack/Previous Beam = !E & `Axis Z-`
-PrimeHack/Visor 1 = E & (!`1` & !`2` & !`3`)
-PrimeHack/Visor 2 = E & `1`
-PrimeHack/Visor 3 = E & `2`
-PrimeHack/Visor 4 = E & `3`
-PrimeHack/Next Visor = E & `Axis Z+`
-PrimeHack/Previous Visor = E & `Axis Z-`
+Rumble/Motor = Weak
+PrimeHack/Beam 1 = `Button 5` & `Hat 0 N`
+PrimeHack/Beam 2 = `Button 5` & `Hat 0 S`
+PrimeHack/Beam 3 = `Button 5` & `Hat 0 W`
+PrimeHack/Beam 4 = `Button 5` & `Hat 0 E`
+PrimeHack/Visor 1 = !`Button 5` & `Hat 0 N`
+PrimeHack/Visor 2 = !`Button 5` & `Hat 0 S`
+PrimeHack/Visor 3 = !`Button 5` & `Hat 0 W`
+PrimeHack/Visor 4 = !`Button 5` & `Hat 0 E`
 PrimeHack/AltProfile = Disabled
+PrimeHack/Control Reticle When Locked-On = True
+Camera Control/Dead Zone = 15.0
+Camera Control/Up = `Axis 4-`
+Camera Control/Down = `Axis 4+`
+Camera Control/Left = `Axis 3-`
+Camera Control/Right = `Axis 3+`
 Camera Control/Modifier/Range = 50.0
-PrimeHack/Spring Ball = Alt
-PrimeHack/Grapple Lasso = Shift
+PrimeHack/Mode = 1
+PrimeHack/Tap Grapple Repeatedly To Pull = True
+PrimeHack/Spring Ball = `Button 10`
+PrimeHack/Grapple Lasso = `Button 2`
 [Wiimote2]
 Device = XInput2/0/Virtual core pointer
 Tilt/Modifier/Range = 50.0