updated to 5.8.7

11 files changed, 117 insertions, 1189 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1613d13d242..ac816f2623c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,36 @@
 pkgbase = dolphin-emu-faster-melee
 	pkgdesc = The FasterMelee NetPlay build of the Dolphin Emulator
-	pkgver = 5.0.3
-	pkgrel = 4
+	pkgver = 5.8.7
+	pkgrel = 1
 	url = http://fastermelee.net
-	install = faster-melee.install
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
+	makedepends = wget
 	depends = bluez-libs
+	depends = curl
 	depends = enet
 	depends = ffmpeg
+	depends = glu
 	depends = libao
 	depends = libevdev
+	depends = libsystemd
+	depends = libusb
+	depends = libxext
 	depends = mbedtls
+	depends = mesa
 	depends = miniupnpc
+	depends = openal
 	depends = portaudio
-	depends = sfml
 	depends = soundtouch
 	depends = xdg-utils
-	depends = wxgtk
+	depends = wxgtk3
 	optdepends = pulseaudio: PulseAudio backend
-	provides = dolphin-emu
 	options = !emptydirs
-	source = dolphin-emu-faster-melee::git+https://github.com/Tinob/Ishiiruka.git#commit=d462ca38724db65d7f92f3edbd16b6657291e420
-	source = GALE01r0.ini
-	source = GALE01r1.ini
-	source = GALE01r2.ini
-	source = GALE01.ini
-	source = MNCE02.ini
-	source = GKYE01.ini
-	source = NMNB01.ini
-	source = PALE02.ini
-	sha256sums = SKIP
-	sha256sums = be5bc1ed63fc6a030b39786e8dbc7074304a0b82c0333dfe27edb061b7e2dad8
-	sha256sums = 1d8a2553af3581f3a80e36c95d8e01d334015ec7cd3cfc9c19b12e77230567b2
-	sha256sums = ac0c39f7fe27f1e232523b02347b0645404d40dc0e6ef328d1e37993ab94de0c
-	sha256sums = 6cfb98a6592dbc597b90a7c0562c4179a5f2db5f7ce293e8fad1a0bd19e8c861
-	sha256sums = 858158866197425edcda5b176aa4da289eca8e5422252145c40ea1337c4a1b63
-	sha256sums = 1ad7113b73fe9298a037c020cad63dded4ba842565fb7477e6240cd5d58749e9
-	sha256sums = 11b5a9d907207e9732d9d1b02d99487d0cbed416f033b248baa56c47391d79f6
-	sha256sums = 858158866197425edcda5b176aa4da289eca8e5422252145c40ea1337c4a1b63
+	source = https://github.com/FasterMelee/Ishiiruka/archive/6ababb9222fb8bb9723ae137e1263a27196fcd47.tar.gz
+	source = https://github.com/FasterMelee/FasterMelee-installer/raw/master/config/5.8.7-fmconfig.tar.gz
+	sha256sums = 02a645a4cc91d0e5c3ff64e2c849c31fe439d9a8ca30e9b072d8899066ac4b66
+	sha256sums = b2ba6b74bbc6df5ffb86fb696cb3d1198c6a9b18862b3e2ace9ad1dd211032c3
 
 pkgname = dolphin-emu-faster-melee
 
diff --git a/GALE01.ini b/GALE01.ini
deleted file mode 100644
index 8bac6351f473..000000000000
--- a/GALE01.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[Gecko_Enabled]
-$Faster Melee Netplay Settings
-$VRH Polling
-$Game Music ON
-[Core]
-Video_Rate = 32
-GPUDeterminismMode = fake-completion
-SyncGPU = True
-CPUThread = True
diff --git a/GALE01r0.ini b/GALE01r0.ini
deleted file mode 100644
index 0490f7da4895..000000000000
--- a/GALE01r0.ini
+++ /dev/null
@@ -1,458 +0,0 @@
-# GALE01 - Super Smash Bros. Melee
-
-[ActionReplay]
-# Add action replay cheats here.
-$All 293 trophies
-0245A3C8 00000125
-0245A3CD 01266363
-
-$All Special Messages
-0045A238 000018FF
-
-$All Bonuses
-0045A380 00001FFF
-
-$All Characters and Stages
-04459F58 FFFFFFFF
-04459F60 FFFFFFFF
-
-$Infinite Time
-04469702 00000075
-
-$Infinite Ray Gun
-0428D1F0 60000000
-
-$Infinite Lip's Stick
-042941A0 60000000
-
-$Infinite Star Rod
-04290DE8 60000000
-
-$Infinite Super Scope
-042909F0 60000000
-
-$Infinite Fire Flower
-0429198C 60000000
-
-$Infinite Lotto Coins
-0245A142 00002706
-
-$Over 1 Million Vs. Matches
-0245A110 00000010
-
-$One Hit Kills
-044D60E0 40100000
-
-$Mega Jumps
-044D6D3C 40000000
-
-$Items Never Disappear
-0C268318 D01F0D44
-04268318 60000000
-
-$Flashing Items
-042682A0 60000000
-
-$Unrestricted Pause Camera
-04450F94 42000000
-04450F98 42000000
-04450F9C 42000000
-04450FA0 40200000
-04450FA4 47000000
-
-$Forces pose from animations
-044D60F8 00000000
-
-$Forces char to always face forward
-044D60F0 00000000
-
-$P1 - Instant Fully Charged Smash Attack
-42451170 10BC4270
-
-$P1 - Infinite Shields
-42451170 0CFC4270
-
-$P1 - Superman
-044D60E0 40100000
-04451118 00000000
-04451120 00000000
-
-$P1 - Invincible
-04451118 00000000
-04451120 00000000
-
-$P1 - Play As Master Hand (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001A
-
-$P1 - Play As Boy Wireframe (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001B
-
-$P1 - Play As Girl Wireframe (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001C
-
-$P1 - Play As Giga Bowser (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001D
-
-$P1 - Play As Crazy Hand (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001E
-
-$P1 - Play As Sandbag (1P HRC & All Modes In Vs Mode)
-0847E864 00000040
-0047E864 00000000
-0047E858 0000001F
-
-$P1 - Play As Dark Link (1P HRC & All Modes In Vs Mode)
-0047E858 00000006
-0047E85F 00000003
-
-$P1 - 5x size
-0447E730 409FFFFB
-
-$P1 - 2x size
-0447E730 40000002
-
-$P1 - one-half size
-0447E730 3F000002
-
-$P1 - one-tenth size
-0447E730 3DCCCCDF
-
-$GAME MODIFIER
-557E0000 60000000
-00000000 857E0000
-60000000 00400001
-057E0004 38BCFFF8
-057E002C 4A8381F4
-0401821C 497C7DE8
-057E0030 90010004
-057E00FC 4A98DC34
-0416DD2C 49672304
-
-$P1 Remove Skirt-Zelda
-*Game Modifier must be enabled
-0A4510C6 00000012
-40451170 000657FF
-
-$P1 Remove Skirt-Peach
-*Game Modifier must be enabled
-0A4510C6 0000000C
-40451170 000659FF
-
-$P2 Remove Skirt - Zelda
-*Game Modifier must be enabled
-0A451F56 00000012
-40452000 000657FF
-
-$P2 Remove Skirt - Peach
-*Game Modifier must be enabled
-0A451F56 0000000C
-40452000 000659FF
-
-$P3 Remove Skirt - Zelda
-*Game Modifier must be enabled
-0A452DE6 00000013
-40452E90 000657FF
-
-$P3 Remove Skirt - Peach
-*Game Modifier must be enabled
-0A452DE6 0000000C
-40452E90 000659FF
-
-$P4 Remove Skirt - Zelda
-*Game Modifier must be enabled
-0A453C76 00000013
-40453D20 000657FF
-
-$P4 Remove Skirt - Peach
-*Game Modifier must be enabled
-0A453C76 0000000C
-40453D20 000659FF
-
-$Each player gets a CPU clone that fights for them
-*Don't use in story modes or with Zelda/Sheik.
-04031B4C 4BFD13CC
-04002F18 907E00B0
-04002F1C 88810028
-04002F20 1C840004
-04002F24 3CA08000
-04002F28 60A52F00
-04002F2C 7F65202E
-04002F30 2C1B0000
-04002F34 41820024
-04002F38 38600080
-04002F3C 9861002A
-04002F40 38610024
-04002F44 48065E31
-04002F48 907E00B4
-04002F4C 3B7BFFFF
-04002F50 2C1B0000
-04002F54 4181FFEC
-04002F58 4802EBF8
-
-$Player 1 gets one clone
-04002F00 00000001
-
-$Player 2 gets one clone
-04002F04 00000001
-
-$Player 3 gets one clone
-04002F08 00000001
-
-$Player 4 gets one clone
-04002F0C 00000001
-
-$Player 1 gets two clones
-04002F00 00000002
-
-$Player 2 gets two clones
-04002F04 00000002
-
-$Player 3 gets two clones
-04002F08 00000002
-
-$Player 4 gets two clones
-04002F0C 00000002
-
-[Gecko]
-# General Codes
-$Unlock All Characters and Stages [Datel]
-*Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
-04459F58 FFFFFFFF
-04459F60 FFFFFFFF
-
-$Unlock All 293 Trophies [Datel]
-0245A3C8 00000125
-0245A3CD 01266363
-
-$Default Tournament Settings [Magus, et all]
-*4 stock, 8 min, items off, tourney legal stages,
-*friendly fire on, rumble off for all players, sfx>music, deflicker off
-043D2B90 00340102
-043D2B94 04000A00
-043D2B98 08010100
-043D2BA8 FF000000
-043D2BB8 00000000
-043D2BBC 3C000000
-043D2BC2 E70000B0
-
-$Boot to Character Select Screen [Dan Salvato, Achilles]
-*Memory card data is loaded.
-041BEBB4 38600002
-
-$Debug Menu Replaces Tournament Mode [Magus, donny2112]
-0422C340 38000006
-
-$Disable Name Tag Reset After Closing Character Port [Ato]
-04260810 60000000
-04260824 60000000
-
-$Spoof Controller Plugins (P1) [Achilles]
-*Makes the game think there is a controller plugged into a specific slot
-04374D20 38000000
-
-$Spoof Controller Plugins (P2) [Achilles]
-*Makes the game think there is a controller plugged into a specific slot
-04374D28 38000000
-
-$Spoof Controller Plugins (P3) [Achilles]
-*Makes the game think there is a controller plugged into a specific slot
-04374D3C 380000D8
-
-$Spoof Controller Plugins (P4) [Achilles]
-*Makes the game think there is a controller plugged into a specific slot
-04374D50 38000001
-
-$Stage Striking [Sham Rock]
-**Stage striking now works like it does in Project M
-**X = ban currently selected stage
-**Y = ban all stages that aren´t allowed in random, unban all that are allowed
-**Z = unban all
-**Banned stages can´t be selected anymore, however
-*they can still be selected when someone chooses "Random".
-C225910C 00000025
-39E00001 3E008046
-62109134 1E2F000C
-7E31802E 5630014B
-4182000C 3A200001
-48000020 56300109
-4182000C 3A200002
-48000010 563002D7
-418200DC 3A200003
-3EA0803E 62B5E840
-3EC0804D 62D64B2E
-3A800000 3A600000
-3A400000 2C110001
-40820014 8A560000
-2C12001C 418100A8
-48000050 2C110003
-40820010 3A80003F
-3A600002 4800003C
-1E12001C 7E10AA14
-8AF0000A 3E008045
-6210A3C0 82100000
-7E10BC30 561007FF
-41820010 3A600002
-3A80003F 4800000C
-3A600000 3A800000
-1E12001C 7E10A82E
-2C120016 41800008
-82100010 82100018
-82100004 82100008
-8210001C 82100008
-9A900024 1E12001C
-3A100008 7E70A9AE
-3A00001E 9A160000
-2C110001 41820010
-3A520001 2C12001D
-41A0FF4C 39EF0001
-2C0F0005 41A0FEE8
-C022C9E8 00000000
-
-# Gameplay Codes
-$Normal C Stick Functionality in Singleplayer Modes [Zauron]
-0416AB64 60000000
-
-$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
-*Does not work with Nana
-0406AD38 38000000
-04030024 38000000
-
-$Skip Result Screen & KO Star Count Equals Placement [Sham Rock]
-**KO Star Count displays player placement from the previous match
-**1st Place = 1 Star
-**2nd Place = 2 Stars
-**etc.
-C21A3414 0000000D
-3803FFFF 2C000004
-40820060 2C0B0020
-41820058 3A400000
-3E808047 62947D90
-3EA0804D 62B545AF
-8E1400A8 8A340001
-2C10004E 4080000C
-9E350001 4800000C
-3A310001 9E350001
-3A520001 2C120004
-41A0FFD8 3A000000
-3A200000 3A800000
-3AA00000 38000000
-60000000 00000000
-
-$Hold A+B for Salty Runback [Dan Salvato, Sham Rock]
-*Hold A+B at the end of a match or during a ragequit
-*and the match will be immediately restarted on the same stage
-C21A3418 00000008
-39C00000 3DE08046
-61EF9140 820F0000
-5611018D 41820010
-561101CF 41820008
-38000002 39CE0001
-2C0E0004 4080000C
-39EF000C 4BFFFFD8
-981F0003 00000000
-
-$Change Rumble Settings from CSS - Color Mod [Sham Rock]
-*Pressing Up/Down on the D-Pad while at the CSS in versus mode
-*will set the Rumble settings for that slot to On/Off
-*Colored CSP background is modified;
-*White = Rumble On, Grey = Rumble Off
-C2261D40 0000001F
-8803000E 3DC08045
-61CEA3B8 3DE08046
-61EF9134 3A800000
-860F000C 56110319
-41820010 3A200001
-9A2E0000 48000014
-5611035B 4182000C
-3A200000 9A2E0000
-3A940001 39CE0001
-2C140004 41A0FFCC
-39CEFFFB 3E401919
-62521900 3E00804C
-2C140004 40820008
-62100390 2C140005
-40820008 621002FC
-2C140006 40820008
-621003FC 2C140007
-40820008 62100368
-2C140005 41810008
-82100000 82100000
-82100000 82100008
-82100018 82100008
-8210001C 82100004
-82100008 8E2E0001
-2C110001 40820010
-3E20EEEE 6231EE00
-4800000C 3E205555
-62315500 92300000
-92500004 3A940001
-2C140008 41A0FF70
-60000000 00000000
-
-$Costume Dependent Marth Sword Swing Colors [Achilles]
-*Color 1 of Marth's sword swing is changed on a per costume basis
-**Blue costume [default] = Default swing color (teal)
-**Red costume = Red swing color
-**Green costume = Green swing color
-**White costume = Light purple swing color
-**Black costume = Gold swing color
-C2135E98 0000000F
-3DC0FF00 61CEFFFF
-7C007000 40820060
-39E5E181 89EF0000
-2C0F0001 40820010
-3C60FF00 6063BE0C
-3C001900 2C0F0002
-40820010 3C60FF00
-60638DD5 3C002E00
-2C0F0003 40820010
-3C60FF00 6063F7E1
-3C008300 2C0F0004
-40820010 3C60FF00
-60637D77 3C00C800
-6000FFFF 94650008
-60000000 00000000
-
-$Rolling Results in Immediate Death [Dan Salvato, standardtoaster]
-04098F98 4803A879
-
-$Enable Taunt Cancelling [Dan Salvato]
-040DEA24 4BFA55B5
-040CA114 40820058
-
-# Other Codes
-$Proper 16:9 Widescreen Support [Dan Salvato, mirrorbender]
-C2021ABC 00000002
-39C00001 38600006
-60000000 00000000
-C23685F4 00000007
-C03F0034 2C0E0001
-41820024 3C004260
-90010030 3C00421C
-90010034 C0010030
-EC210032 C0010034
-EC210024 39C00000
-281E0000 00000000
-
-$Properly Display in 4:3 [Dan Salvato, mirrorbender]
-C2021ABC 00000002
-39C00001 38600006
-60000000 00000000
-C23685F4 00000007
-C03F0034 2C0E0001
-41820024 3C004160
-90010030 3C004150
-90010034 C0010030
-EC210032 C0010034
-EC210024 39C00000
-281E0000 00000000
diff --git a/GALE01r1.ini b/GALE01r1.ini
deleted file mode 100644
index adb6bebaa557..000000000000
--- a/GALE01r1.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-[Gecko]
-# General Codes
-$Unlock All Characters and Stages [Datel]
-*Also Unlocks All Star Mode, Sound Test, and Vs. Mode Additions
-0445B240 FFFFFFFF
-0445B248 FFFFFFFF
-
-$Unlock All 293 Trophies [Datel]
-0245B6B0 00000125
-0245B6B5 01266363
-
-$Default Tournament Settings [Magus, et all]
-*4 stock, 8 min, items off, tourney legal stages,
-*friendly fire on, rumble off for all players, sfx>music, deflicker off
-043D3D68 00340102
-043D3D6C 04000A00
-043D3D70 08010100
-043D3D80 FF000000
-043D3D90 00000000
-043D3D94 3C000000
-043D3D98 E70000B0
-
-$Debug Menu Replaces Tournament Mode [Magus, donny2112]
-0422CEB0 38000006
-
-$Disable Name Tag Reset After Closing Character Port [Ato]
-04261380 60000000
-04261394 60000000
-
-$Spoof Controller Plugins (P1) [Achilles]
-04375EF4 38000000
-
-$Spoof Controller Plugins (P2) [Achilles]
-04375EFC 38000000
-
-$Spoof Controller Plugins (P3) [Achilles]
-04375F10 380000D8
-
-$Spoof Controller Plugins (P4) [Achilles]
-04375F24 38000001
-
-# Gameplay Codes
-$Normal C Stick Functionality in Singleplayer Modes [Zauron, Standardtoaster]
-0416B18C 60000000
-
-$Normal C Stick Functionality in Develop Mode [Magus, Achilles]
-*Does not work with Nana
-0406AE48 38000000
-040300A4 38000000
-
-$Enable Taunt Cancelling [Dan Salvato]
-040DEBFC 4BFA54C5
-040CA258 40820058
-
diff --git a/GALE01r2.ini b/GALE01r2.ini
deleted file mode 100644
index 5fee1b4b83d1..000000000000
--- a/GALE01r2.ini
+++ /dev/null
@@ -1,208 +0,0 @@
-# GALE01 - Super Smash Bros. Melee
-
-[ActionReplay]
-$Debug Menu
-0422D638 38000006
-
-[Gecko]
-$Faster Melee Netplay Settings
-*Disable this for 20XX, the Netplay Community Build, or other Melee ISOs
-0445BF28 FFFFFFFF
-0445BF2C FFFFFFFF
-0415D94C 4E800020
-041A45A0 3C000202
-041A45A4 901E0000
-C21BFA20 00000003
-3DE08017 61EF2898
-7DE903A6 4E800421
-38600002 00000000
-0424CEC4 48000058
-04162EE8 60000000
-0245C390 00000125
-0245C395 01266363
-041644E8 38600001
-041648F4 38600001
-04164F34 38600001
-043D4A48 00340102
-043D4A4C 04000A00
-043D4A50 08010100
-043D4A60 FF000000
-043D4A78 E70000B0
-0415D984 4E800020
-0425B8BC 38600002
-04261B1C 60000000
-04261B30 60000000
-041A55EC 4E800020
-C208D600 00000009
-8A830678 3DC08000
-61CE45D4 1EB40008
-7DCEAA14 81EE0000
-39EF0001 91EE0000
-3A0EFFFC 82300000
-7E717BD6 3E408045
-62523DA4 1EB40E90
-7E52AA14 92720000
-3880FFFF 00000000
-04040BBC 60000000
-20C61DB8 16200D20
-06C61DB8 00000014
-1620151A 200C2024
-20312026 2028202F
-1A210300 00000000
-020045D0 000F0000
-E2000001 00000000
-C216E2DC 00000017
-3C608000 60633300
-3C80804D 88846CAE
-38C00000 7CA6182E
-7C052000 41820014
-2C05FFFF 4182000C
-38C6000C 4BFFFFE8
-38C60004 3CE08048
-88E707C8 2C070000
-41820008 38C60004
-7CA6182E 90A3FFFC
-4182005C 39000000
-3C80803F 60840E06
-80E40000 39080001
-2C080004 40800040
-1D280024 7CC9202E
-7C063800 4082FFE8
-3863FFFC 7D064378
-38C6FFFF 2C060000
-4081001C 7C8618AE
-7CA818AE 7CA619AE
-7C8819AE 3908FFFF
-4BFFFFE0 881F0007
-60000000 00000000
-C216E48C 00000004
-3CA08000 60A532FC
-8085FFFC 7C6428AE
-38840001 9085FFFC
-60000000 00000000
-C216DF54 00000004
-3CA08000 60A532FC
-8085FFFC 7C6428AE
-38840001 9085FFFC
-60000000 00000000
-C216DF30 00000003
-3C808000 608432F8
-38A00000 90A40000
-3B9A0000 00000000
-C216E468 00000003
-3C808000 608432F8
-38A00000 90A40000
-3F600004 00000000
-06003300 00000060
-00000019 00010203
-00020103 00000008
-00010203 02000301
-00000006 00010302
-03000201 0000001A
-01030002 00010203
-00000018 02030001
-00020103 00000012
-03020001 03000201
-0000001C 00030102
-00010302 FFFFFFFF
-00010203 00010203
-0416B480 60000000
-C21A4160 00000008
-39C00000 3DE08046
-61EFB108 820F0000
-5611018D 41820010
-561101CF 41820008
-38000002 39CE0001
-2C0E0004 4080000C
-39EF000C 4BFFFFD8
-981F0003 00000000
-04452F54 42000000
-04452F58 42000000
-04452F5C 42000000
-04452F60 40200000
-04452F64 47000000
-C202CB34 0000000C
-7C040774 3E00804C
-62101FD4 1DE00044
-7E107A14 C022C3D8
-FE200850 C1F00000
-FC0F0840 4081000C
-FC0F8840 41800010
-C21F0314 FE0F802A
-D21F0314 C1F00004
-FC0F0840 4081000C
-FC0F8840 41800010
-C21F0318 FE0F802A
-D21F0318 00000000
-0406AE90 38000000
-040300A4 38000000
-0422D638 38000006
-043FA25B 01000000
-041B0A14 38600002
-041A5B00 3B600000
-041CC8AC FC000028
-0421AAE4 60000000
-C2166A44 0000000F
-3E208045 82512C6C
-2C120001 41820008
-48000044 3E208046
-6231B6A1 8A310000
-3C808045 60843080
-80040000 2C000000
-41A20018 88040045
-7C008800 41A2000C
-7C040378 48000010
-38840E90 4200FFDC
-48000000 3C00804D
-60006730 3A000000
-7E10012E 3A000001
-7E0401AE 7F83E378
-60000000 00000000
-041CBBD4 60000000
-041CBF54 60000000
-041CBF84 60000000
-
-$VRH Polling
-*Set Video Rate Hack to 4x or 2x in GameConfig.
-08402CC4 02100100
-20020004 00000000
-
-$Game Music ON
-*Keep checked if you want music ON. Uncheck "Game Music OFF".
-04023FFC 3880007F
-
-$Game Music OFF
-*Keep checked if you want music OFF. Uncheck "Game Music ON".
-04023FFC 38800000
-
-$Widescreen 16:9
-*Set Aspect Ratio to "Force 16:9" in Graphics for 16:9 monitors -----------------
-*Requires all players to have enabled for netplay.
-C2021ABC 00000002
-39C00001 38600006
-60000000 00000000
-C236A4A8 00000007
-C03F0034 2C0E0001
-41820024 3C004E79
-90010030 3C004E2B
-90010034 C0010030
-EC210032 C0010034
-EC210024 39C00000
-281E0000 00000000
-044DDB48 3DF92C60
-
-$Widescreen Compatible
-*Set Aspect Ratio to "Force Analog 16:9" in Graphics for non-16:9 monitors ------
-*Requires all players to have enabled for netplay.
-C2021ABC 00000002
-39C00001 38600006
-60000000 00000000
-C236A4A8 00000007
-C03F0034 2C0E0001
-41820024 3C004080
-90010030 3C004040
-90010034 C0010030
-EC210032 C0010034
-EC210024 39C00000
-281E0000 00000000
-044DDB48 3DF92C60
diff --git a/GKYE01.ini b/GKYE01.ini
deleted file mode 100644
index efc29a41ca0e..000000000000
--- a/GKYE01.ini
+++ /dev/null
@@ -1,274 +0,0 @@
-[Gecko]
-$P1 Fullscreen
-C202DF30 00000003
-2C1A0000 4082000C
-38600001 48000008
-38600000 00000000
-C2020764 00000003
-2C1B0000 4082000C
-38600001 48000008
-38600000 00000000
-$P2 Fullscreen
-C202DF30 00000003
-2C1A0001 4082000C
-38600001 48000008
-38600000 00000000
-C2020764 00000003
-2C1B0001 4082000C
-38600001 48000008
-38600000 00000000
-$P3 Fullscreen
-C202DF30 00000003
-2C1A0002 4082000C
-38600001 48000008
-38600000 00000000
-C2020764 00000003
-2C1B0002 4082000C
-38600001 48000008
-38600000 00000000
-$P4 Fullscreen
-C202DF30 00000003
-2C1A0003 4082000C
-38600001 48000008
-38600000 00000000
-C2020764 00000003
-2C1B0003 4082000C
-38600001 48000008
-38600000 00000000
-$KAR Netplay Community Settings v3 [UnclePunch,Cheetaboy,MagicScrumpy]
-025367BC 003BFFFF
-025369FC 003BFFFF
-025368d4 003BFFFF
-04536EE8 FFFFFFFF
-04536EEC 00000000
-00535a02 000000FE
-04452798 38600000
-04047750 38600003
-0401F580 39000001
-0401F548 39000063
-0401F540 2C000001
-0401F578 2C000063
-040B6980 60000000
-C2033B78 0000000C
-3DE08053 61EF6EDC
-7E1678AE 3DC00010
-7F867000 419E0014
-3DC00020 7F867000
-419E0030 48000030
-3A600001 7E7679AE
-38800004 38C0FFFE
-7EC3B378 7C852378
-3E208007 62311D00
-7E2903A6 4E800420
-7E5679AE 4E800020
-60000000 00000000
-*Includes Skip Memory Card Prompt, Skip Intro Movie, Boot to Main Menu, Unlock Everything, Unrestricted Camera, Unlock City Trial Limit, and Toggle Rumble from CT CSS
-$Remove Stats Limit [container12345,gamemasterplc]
-04194DEC 4800000C
-04194E40 60000000
-04194ED4 60000000
-04194F28 60000000
-04195020 48000060
-041CAB14 4800001C
-041CAC64 4800001C
-$Press X for Rear View v2 [UnclePunch]
-C20B67E8 00000002
-C0440028 A2240002
-60000000 00000000
-C20CC2A8 00000002
-7FE4FB78 7FFEFB78
-60000000 00000000
-C20B6934 00000009
-C0028AE8 3E60805F
-62736430 5631056B
-4182001C 3E404046
-625262B9 92430088
-3A800001 7E9E99AE
-4800001C 7E9E98AE
-2C140000 41820010
-92830088 3A800000
-7E9E99AE 00000000
-$Press Y to Bring Up Stats v2 [UnclePunch]
-040410b4 540004E9
-040410b8 40820018
-040410bc 38000000
-C20410B0 0000000C
-80030008 3E40805F
-6252642C 8A320000
-2C110001 40820028
-540004E9 40820008
-4800001C 3A200000
-9A320000 3E208004
-62311210 7E2903A6
-4E800420 54000529
-41820014 80030008
-3A200001 9A320000
-4800000C 80030008
-3A200000 00000000
-C20617FC 00000003
-2C110001 40820008
-4E800020 9421FFF0
-60000000 00000000
-C2061A44 00000003
-2C110001 40820008
-4E800020 9421FFF0
-60000000 00000000
-C2005D78 00000003
-2C110001 40820008
-4E800020 9421FFF0
-60000000 00000000
-C21285DC 00000003
-2C110001 40820008
-4E800020 9421FFE0
-60000000 00000000
-C20BC054 00000003
-2C110001 40820008
-4E800020 9421FFE0
-60000000 00000000
-C2061B44 00000003
-2C110001 40820008
-4E800020 9421FFF0
-60000000 00000000
-C21126F4 00000003
-2C110001 40820008
-4E800020 9421FFE0
-60000000 00000000
-$City Trial Starts at 8 Mins [UnclePunch]
-040075bc 38C001E0
-040070e8 38C001E0
-$Sound Test Song as CT Theme [UnclePunch]
-04017ed0 4800000C
-C2017EDC 00000007
-A87B004E 3E008049
-6210851C 3E408049
-625289B8 2C030026
-41820018 3E208049
-62318750 1E030010
-7E318214 82110008
-92120000 00000000
-$Brake with B (All Kirby Machines) [UnclePunch]
-04190d6c 5404C7BE
-C21EF414 00000004
-881F0C30 2C0000E0
-41800014 89DF066F
-2C0E0002 40820008
-38000000 00000000
-C21FA298 00000005
-7FE3FB78 89DF066F
-2C0E0002 40820014
-3DE0801F 61EFA2A0
-7DE903A6 4E800420
-60000000 00000000
-*Allows you to stop moving without using your ability. Very useful with Plasma and Bomb.
-$Press Z to Drop Abilities [UnclePunch]
-C21A7CEC 00000004
-80010014 823F03E4
-2C110010 4082000C
-3A400000 925F091C
-60000000 00000000
-$Z When Paused for Random Music [UnclePunch]
-C20415A8 00000015
-881F0831 2C040010
-40820098 3821FFF6
-9001000C 7C0802A6
-90010008 3E008041
-6210E668 7E0903A6
-3860002F 4E800421
-2C03000F 4081FFE8
-2C030027 40820008
-38600006 2C030029
-40820008 38600004
-2C03002B 40820008
-3860000D 2C03001A
-40820008 3860003F
-2C030025 40820008
-38600041 2C03002F
-40820008 38600043
-3E008005 6210E1A8
-7E0903A6 4E800421
-80010008 7C0803A6
-8001000C 3821000A
-60000000 00000000
-$LAN disabled goes to Debug, LAN enabled goes to LAN [UnclePunch]
-04015f00 60000000
-C2015CA0 00000004
-8A1E0050 2C100000
-4082000C 38600010
-48000008 38600013
-60000000 00000000
-$Fix Machine Formation Glitch [container12345]
-C21E0458 00000002
-D0010060 D0010064
-D0010078 00000000
-$Nonstop Events (Event Time Modifier) [container12345]
-040EE2A8 28030010
-$All players start with random machine on City Trial [container12345]
-C202DE80 00000005
-3860000F 3E808041
-6294E668 3E608002
-6273DE84 7E6803A6
-7E8903A6 4E800420
-7C601B78 00000000
-0402DE84 987C0061
-$Enable getting out of a vehicle on Air Ride and Stadium [container12345]
-041918EC 38600001
-$All Craft in Air Ride [Gamemasterplc]
-04020BBC 60000000
-04020B20 60000000
-$Infinite Jumps
-C21BD7C4 00000003
-2C030001 4182000C
-38030001 48000008
-7C601B78 00000000
-$Disable Music [UnclePunch]
-0405e328 60000000
-$16:9 Aspect Ratio v2 [gamemasterplc]
-040647F4 C05E0040
-C2064588 00000006
-C05C0044 3C808010
-80610114 7C041800
-386100B4 41800014
-3C803FAB 90830000
-C0630000 EC4300B2
-60000000 00000000
-C2401508 00000009
-3821FFFC 3C803F40
-90810000 809E004C
-3CA04280 7C042800
-41820020 C0210000
-C0010030 EC010032
-D0010030 C001003C
-EC010032 D001003C
-38210004 7FE4FB78
-60000000 00000000
-0427AE50 4E800020
-C20D7F08 00000004
-3821FFFC 3C603E40
-90610000 C3A10000
-C01E0044 EC00E824
-38210004 00000000
-$3 Laps Single Race [container12345]
-C2045C88 00000005
-3E808053 629459D8
-88140A94 2C00000F
-40A2000C 38000003
-48000008 38000000
-60000000 00000000
-[Gecko_Enabled]
-$P1 Fullscreen
-$KAR Netplay Community Settings v3
-$Remove Stats Limit
-$Press X for Rear View v2
-$Press Y to Bring Up Stats v2
-$City Trial Starts at 8 Mins
-$Sound Test Song as CT Theme
-$Brake with B (All Kirby Machines)
-$Press Z to Drop Abilities
-$Z When Paused for Random Music
-$LAN disabled goes to Debug, LAN enabled goes to LAN
-$Fix Machine Formation Glitch
-[Core]
-Video_Rate = 32
-GPUDeterminismMode = fake-completion
-SyncGPU = True
-CPUThread = True
diff --git a/MNCE02.ini b/MNCE02.ini
deleted file mode 100644
index 43a61985bbd8..000000000000
--- a/MNCE02.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Gecko_Enabled]
-$VRH Polling
-$Game Music ON
-[Core]
-Video_Rate = 32
-GPUDeterminismMode = fake-completion
-SyncGPU = True
-CPUThread = True
diff --git a/NMNB01.ini b/NMNB01.ini
deleted file mode 100644
index 9f492fa40066..000000000000
--- a/NMNB01.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Gecko_Enabled]
-$VRH Polling (PAL)
-$Game Music ON (PAL)
-[Core]
-Video_Rate = 32
-GPUDeterminismMode = fake-completion
-SyncGPU = True
-CPUThread = True
diff --git a/PALE02.ini b/PALE02.ini
deleted file mode 100644
index 43a61985bbd8..000000000000
--- a/PALE02.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Gecko_Enabled]
-$VRH Polling
-$Game Music ON
-[Core]
-Video_Rate = 32
-GPUDeterminismMode = fake-completion
-SyncGPU = True
-CPUThread = True
diff --git a/PKGBUILD b/PKGBUILD
index 494127a9cf29..5d0d5af2b779 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,129 +1,123 @@
 # Maintainer: flurb
 # Previously pyamsoft <pyam(dot)soft(at)gmail(dot)com>
 
-# Please read the comments in the PKGBUILD if you wish to attempt to use
-# multiple versions of the dolphin emulator.
-#
-# Installing multiple versions alongside each other is not tested too often,
-# use at own risk. Please report build issues.
+# This build can be installed alongside dolphin-emu
+# Run using dolphin-emu-faster-melee
+# Make sure to set CPUS_DESIRED for faster compilation
+
+# Uses a modified version of https://github.com/FasterMelee/FasterMelee-installer (thank you!)
 
 pkgname=dolphin-emu-faster-melee
-# shellcheck disable=SC2034
-pkgver=5.0.3
-# shellcheck disable=SC2034
-pkgrel=4
-# shellcheck disable=SC2034
+pkgver=5.8.7
+pkgrel=1
 pkgdesc='The FasterMelee NetPlay build of the Dolphin Emulator'
-# shellcheck disable=SC2034
 arch=('x86_64')
-# shellcheck disable=SC2034
 url='http://fastermelee.net'
-# shellcheck disable=SC2034
 license=('GPL')
-# shellcheck disable=SC2034
-install="faster-melee.install"
-# shellcheck disable=SC2034
-makedepends=('cmake')
-# shellcheck disable=SC2034
-depends=('bluez-libs' 'enet' 'ffmpeg' 'libao' 'libevdev' 'mbedtls' 'miniupnpc'
-         'portaudio' 'sfml' 'soundtouch' 'xdg-utils' 'wxgtk')
-# shellcheck disable=SC2034
+makedepends=('cmake' 'wget')
+depends=('bluez-libs' 'curl' 'enet' 'ffmpeg' 'glu' 'libao' 'libevdev' 'libsystemd' 'libusb' 'libxext' 'mbedtls' 'mesa' 'miniupnpc' 'openal' 'portaudio' 'soundtouch' 'xdg-utils' 'wxgtk3')
 optdepends=('pulseaudio: PulseAudio backend')
-# shellcheck disable=SC2034
 options=('!emptydirs')
-# The commit for FasterMelee 4.3 (unchanged for FasterMelee 4.4)
-# shellcheck disable=SC2034
-source=("${pkgname}::git+https://github.com/Tinob/Ishiiruka.git#commit=d462ca38724db65d7f92f3edbd16b6657291e420"
-        "GALE01r0.ini"
-        "GALE01r1.ini"
-        "GALE01r2.ini"
-        "GALE01.ini"
-        "MNCE02.ini"
-        "GKYE01.ini"
-        "NMNB01.ini"
-        "PALE02.ini"
-       )
-# shellcheck disable=SC2034
-sha256sums=('SKIP'
-            'be5bc1ed63fc6a030b39786e8dbc7074304a0b82c0333dfe27edb061b7e2dad8'
-            '1d8a2553af3581f3a80e36c95d8e01d334015ec7cd3cfc9c19b12e77230567b2'
-            'ac0c39f7fe27f1e232523b02347b0645404d40dc0e6ef328d1e37993ab94de0c'
-            '6cfb98a6592dbc597b90a7c0562c4179a5f2db5f7ce293e8fad1a0bd19e8c861'
-            '858158866197425edcda5b176aa4da289eca8e5422252145c40ea1337c4a1b63'
-            '1ad7113b73fe9298a037c020cad63dded4ba842565fb7477e6240cd5d58749e9'
-            '11b5a9d907207e9732d9d1b02d99487d0cbed416f033b248baa56c47391d79f6'
-            '858158866197425edcda5b176aa4da289eca8e5422252145c40ea1337c4a1b63')
-# shellcheck disable=SC2034
-provides=('dolphin-emu')
-
-# Pulled directly from github.com/ccl2of4
-# Thank you
+
+COMMITHASH="6ababb9222fb8bb9723ae137e1263a27196fcd47"
+
+source=("https://github.com/FasterMelee/Ishiiruka/archive/$COMMITHASH.tar.gz"
+        "https://github.com/FasterMelee/FasterMelee-installer/raw/master/config/$pkgver-fmconfig.tar.gz")
+
+sha256sums=('02a645a4cc91d0e5c3ff64e2c849c31fe439d9a8ca30e9b072d8899066ac4b66'
+            'b2ba6b74bbc6df5ffb86fb696cb3d1198c6a9b18862b3e2ace9ad1dd211032c3')
+
+CPUS_DESIRED=3
+
 prepare() {
-  # shellcheck disable=SC2154
-  cd "${srcdir}/${pkgname}" || {
-        msg "Failed to cd into ${srcdir}/${pkgname}"
-        return 1
-   }
+  cd "$srcdir"
+  
+  echo "Extracting..."
+  tar -xzf "$pkgver-fmconfig.tar.gz" && rm "$pkgver-fmconfig.tar.gz"	
+  echo "Extracting..."
+  tar -xzf "$COMMITHASH.tar.gz" && rm "$COMMITHASH.tar.gz"
+  mv "Ishiiruka-$COMMITHASH" Ishiiruka
+  cd Ishiiruka
+
+  # --- Temporary patch for updated glibc
+  echo "Patching xlocale.h requirement..."
+  sed -i "s|#define wxUSE_XLOCALE 1|#define wxUSE_XLOCALE 0|g" Externals/wxWidgets3/wx/wxcocoa.h
+  sed -i "s|#define wxUSE_XLOCALE 1|#define wxUSE_XLOCALE 0|g" Externals/wxWidgets3/wx/wxgtk.h
+  # ---
+
+  # --- Patch tarball to display correct hash to other netplay clients
+  echo "Patching tarball..."
+  sed -i "s|\${GIT_EXECUTABLE} rev-parse HEAD|echo $COMMITHASH|g" CMakeLists.txt
+  # --set scm_rev_str everywhere to actual commit hash when downloaded
+  sed -i "s|\${GIT_EXECUTABLE} describe --always --long --dirty|echo FM v$pkgver BETA|g" CMakeLists.txt
+  # ensures compatibility w/ netplay
+  sed -i "s|\${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD|echo HEAD|g" CMakeLists.txt
+  # ---
+  
+  # --- move necessary config files into the build folder
+  echo "Adding FM config files..."
+  mkdir build && cd build
+  mv ../../Binaries .
+  mv ../Data/dolphin-emu.png Binaries/
+  # ---
 }
 
 build() {
-  # shellcheck disable=SC2154
-  cd "${srcdir}/${pkgname}" || {
-        msg "Failed to cd into ${srcdir}/${pkgname}"
-        return 1
-  }
-
-  mkdir build
-  cd build || {
-        msg "Failed to cd into ${srcdir}/${pkgname}/build"
-        return 1
-  }
-
-  # To install multiple versions of the Dolphin emulator, use
-  #
-  #  -DCMAKE_INSTALL_PREFIX='/opt/dolphin-emu-faster-melee'
-  #
-  # instead of
-  #
-  #  -DCMAKE_INSTALL_PREFIX='/usr'
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DCMAKE_CXX_FLAGS='-fno-pie' \
-    -DENABLE_LTO='TRUE' \
-    -DUSE_SHARED_ENET='TRUE' \
-    -DDISTRIBUTOR='aur.archlinux.org'
-  make
+ 
+  cd "$srcdir"
+  
+  if [ ! -d "$srcdir/bin" ]; then # ...then we need to compile !
+    # --- Attempts to determine the number of cores in the CPU. ---
+    # Source: https://gist.github.com/jj1bdx/5746298
+    # Linux and similar...
+    CPUS=$(getconf _NPROCESSORS_ONLN 2>/dev/null)
+    # FreeBSD and similar...
+    [ -z "$CPUS" ] && CPUS=$(getconf NPROCESSORS_ONLN)
+    # Solaris and similar...
+    [ -z "$CPUS" ] && CPUS=$(ksh93 -c 'getconf NPROCESSORS_ONLN')
+    # Give up...
+    [ -z "$CPUS" ] && CPUS=1
+
+    # --- for -j flag (# of cores utilized)
+
+    echo ""
+    echo "CPU Threads detected: $CPUS"
+    if [ "$CPUS_DESIRED" -ge 1 ] 2> /dev/null && [ "$CPUS_DESIRED" -le $((CPUS + 1)) ] 2> /dev/null; then
+	    CPUS=$CPUS_DESIRED 
+    else
+	    CPUS=1
+    fi
+    echo "Using $CPUS thread(s)!"
+    
+    # --- cmake and compile
+    cd Ishiiruka/build
+    echo "cmaking..."
+    cmake .. -DLINUX_LOCAL_DEV=true \
+             -DDISTRIBUTOR='aur.archlinux.org'
+    echo "Compiling..."
+    make -j $CPUS
+
+    echo "Cleaning up..."
+    cd ../..
+    mv Ishiiruka/build/Binaries bin/
+    rm -rf Ishiiruka
+  fi
 }
 
 package() {
-  cd "${srcdir}/${pkgname}" || {
-        msg "Failed to cd into ${srcdir}/${pkgname}"
-        return 1
-  }
-
-  cd build || {
-        msg "Failed to cd into ${srcdir}/${pkgname}/build"
-        return 1
-  }
-
-  # shellcheck disable=SC2154
-  make DESTDIR="${pkgdir}" install
-
-  # To install multiple versions of the Dolphin emulator,
-  # install the repository dolphin-emu first as it includes this file.
-  # Then comment out this line.
-  install -Dm 644 ../Data/51-usb-device.rules -t "${pkgdir}"/usr/lib/udev/rules.d/
-
-  # Patch Gecko Codes
-  #
-  # To install multiple versions of the Dolphin emulator, use
-  #
-  # cp -f "${srcdir}/GALE01r2.ini" "${pkgdir}"/opt/dolphin-emu-faster-melee/dolphin-emu/sys/GameSettings/GALE01r2.ini
-  #
-  # Instead of the line below
-  cp -f "${srcdir}/GALE01r0.ini" "${pkgdir}"/usr/share/dolphin-emu/sys/GameSettings/GALE01r0.ini
-  cp -f "${srcdir}/GALE01r1.ini" "${pkgdir}"/usr/share/dolphin-emu/sys/GameSettings/GALE01r1.ini
-  cp -f "${srcdir}/GALE01r2.ini" "${pkgdir}"/usr/share/dolphin-emu/sys/GameSettings/GALE01r2.ini
+  cd "$srcdir"
+
+
+	echo 'SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="0337", MODE="0666"' > 51-gcadapter.rules
+  install -Dm 644 "${srcdir}"/51-gcadapter.rules -t "${pkgdir}"/usr/lib/dev/rules.d/
+
+  install -d "${pkgdir}"/usr/share/
+  cp -r "${srcdir}"/bin "${pkgdir}"/usr/share/dolphin-emu-faster-melee/
+  
+  echo "#!/bin/sh
+/usr/share/dolphin-emu-faster-melee/dolphin-emu \"\$@\"" > dolphin-emu-faster-melee
+  install -Dm 755 "${srcdir}"/dolphin-emu-faster-melee -t "${pkgdir}"/usr/bin/
+
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/faster-melee.install b/faster-melee.install
deleted file mode 100644
index be08b698208d..000000000000
--- a/faster-melee.install
+++ /dev/null
@@ -1,30 +0,0 @@
-# Dolphin upstream states that files should be placed in ~/.dolphin-emu
-# but the emulator does not ever actually populate that directory.
-#
-# In some dark corner of the Internet a kind fellow stated to put configs
-# in ~/.local/share but the actual location of these files is debatable.
-#
-# It would be nice to automate this, but I do not want to ship a seperate
-# script if the project itself does not.
-post_install() {
-  printf -- "%s\n" "$(cat << EOF
-
-  Make sure you install the following config files into
-  '~/.local/share/dolphin-emu/GameSettings'
-
-  GALE01.ini
-  MNCE02.ini
-  NMNB01.ini
-  PALE02.ini
-  GKYE01.ini
-
-  See https://fastermelee.net for more information on the
-  Faster Melee build of the Dolphin Emulator.
-
-EOF
-)"
-}
-
-post_upgrade() {
-  post_install
-}