diff --git a/Data/Sys/GameSettings/SFR.ini b/Data/Sys/GameSettings/SFR.ini
@@ -0,0 +1,4 @@
+# SFRDRV, SFRPXT - Fit & Fun
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SG2.ini b/Data/Sys/GameSettings/SG2.ini
@@ -0,0 +1,4 @@
+# SG2EFS, SG2PUG, SG2XUG, SG2YFS - Crazy Mini Golf 2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SG3.ini b/Data/Sys/GameSettings/SG3.ini
@@ -0,0 +1,4 @@
+# SG3DSV - Germany's Next Top Model 2010
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SGD.ini b/Data/Sys/GameSettings/SGD.ini
@@ -0,0 +1,4 @@
+# SGDEJJ, SGDPKM - Let's Play Garden
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SGT.ini b/Data/Sys/GameSettings/SGT.ini
@@ -0,0 +1,4 @@
+# SGTEFS, SGTPUG - My Personal Golf Trainer with IMG Academies and David Leadbetter
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SH2.ini b/Data/Sys/GameSettings/SH2.ini
@@ -0,0 +1,4 @@
+# SH2JMS - Hula Wii: Tanoshiku Hula o Odorou!!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SH9.ini b/Data/Sys/GameSettings/SH9.ini
@@ -0,0 +1,4 @@
+# SH9ESZ, SH9PNJ - Heathcliff: The Fast and the Furriest
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SHO.ini b/Data/Sys/GameSettings/SHO.ini
@@ -0,0 +1,4 @@
+# SHOXKR, SHOYKR - Hugo: Magic in the Troll Woods
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SHW.ini b/Data/Sys/GameSettings/SHW.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SHY.ini b/Data/Sys/GameSettings/SHY.ini
@@ -0,0 +1,4 @@
+# SHYE69, SHYP69 - NHL Slapshot
+
+[Video_Hacks]
+TMEMCacheEmulation = False
diff --git a/Data/Sys/GameSettings/SIS.ini b/Data/Sys/GameSettings/SIS.ini
@@ -0,0 +1,4 @@
+# SISENR, SISJ0Q, SISPUH - Princess Isabella: A Witch's Curse
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SJC.ini b/Data/Sys/GameSettings/SJC.ini
@@ -0,0 +1,4 @@
+# SJCEZW - Jerry Rice & Nitus' Dog Football
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SJK.ini b/Data/Sys/GameSettings/SJK.ini
@@ -0,0 +1,4 @@
+# SJKEPK - JumpStart Crazy Karts
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SJL.ini b/Data/Sys/GameSettings/SJL.ini
@@ -0,0 +1,4 @@
+# SJLEFS, SJLPXT - Junior League Sports
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SJQ.ini b/Data/Sys/GameSettings/SJQ.ini
@@ -0,0 +1,4 @@
+# SJQEPZ, SJQPGR - Jewel Quest Trilogy
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SKB.ini b/Data/Sys/GameSettings/SKB.ini
@@ -0,0 +1,4 @@
+# SKBEG9 - Kidz Bop Dance Party!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SKP.ini b/Data/Sys/GameSettings/SKP.ini
@@ -0,0 +1,4 @@
+# SKP - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SKT.ini b/Data/Sys/GameSettings/SKT.ini
@@ -0,0 +1,4 @@
+# SKTE78, SKTP78 - All Star Karate
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SKW.ini b/Data/Sys/GameSettings/SKW.ini
@@ -0,0 +1,4 @@
+# SKWPNK - Cocoto Kart Racer 2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SKX.ini b/Data/Sys/GameSettings/SKX.ini
@@ -0,0 +1,4 @@
+# SKXE20, SKXPFH - Pirate Blast
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SLP.ini b/Data/Sys/GameSettings/SLP.ini
@@ -0,0 +1,4 @@
+# SLPP5D - Spirit of the Wolf
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SLW.ini b/Data/Sys/GameSettings/SLW.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False

diff --git a/Data/Sys/GameSettings/SM6.ini b/Data/Sys/GameSettings/SM6.ini
@@ -0,0 +1,4 @@
+# SM6PNK - My Body Coach 2: Fitness & Dance
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SMI.ini b/Data/Sys/GameSettings/SMI.ini
@@ -0,0 +1,4 @@
+# SMIE41 - Who Wants To Be A Millionaire
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SMM.ini b/Data/Sys/GameSettings/SMM.ini
@@ -0,0 +1,4 @@
+# SMMJ0Q - Momu chan Diet Wii Figurobics by Chon Dayon
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SMU.ini b/Data/Sys/GameSettings/SMU.ini
@@ -0,0 +1,4 @@
+# SMUJAF - Daikaijuu Battle: Ultra Coliseum DX - Ultra Senshi Daishuuketsu
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SNM.ini b/Data/Sys/GameSettings/SNM.ini
@@ -0,0 +1,4 @@
+# SNMEAF - Namco Museum Megamix
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SNS.ini b/Data/Sys/GameSettings/SNS.ini
@@ -14,3 +14,4 @@
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SNT.ini b/Data/Sys/GameSettings/SNT.ini
@@ -16,6 +16,7 @@ MMU = 1
 [Video]
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SOC.ini b/Data/Sys/GameSettings/SOC.ini
@@ -0,0 +1,4 @@
+# SOCE4Z - Deadliest Catch: Sea of Chaos
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SOD.ini b/Data/Sys/GameSettings/SOD.ini
@@ -0,0 +1,4 @@
+# SODPYK - The Explorer and the Mystery of the Diamond Scarab
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SOR.ini b/Data/Sys/GameSettings/SOR.ini
@@ -0,0 +1,4 @@
+# SORE4Z - The Oregon Trail
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SOU.ini b/Data/Sys/GameSettings/SOU.ini
@@ -1,14 +1,7 @@
 # SOUE01, SOUJ01, SOUK01, SOUP01 - The Legend of Zelda Skyward Sword
 
 [Core]
-# Values set here will override the main Dolphin settings.
-
-[OnLoad]
-# Add memory patches to be loaded once on boot here.
-
-[OnFrame]
-
-[ActionReplay]
+LogicOpsDrawHack = True
 
 [Video_Hacks]
 EFBEmulateFormatChanges = True

diff --git a/Data/Sys/GameSettings/SP3.ini b/Data/Sys/GameSettings/SP3.ini
@@ -0,0 +1,4 @@
+# SP3E41 - The $1,000,000 Pyramid
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SP9.ini b/Data/Sys/GameSettings/SP9.ini
@@ -0,0 +1,4 @@
+# SP9PJW - Pucca's Race for Kisses
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPA.ini b/Data/Sys/GameSettings/SPA.ini
@@ -0,0 +1,4 @@
+# SPAE5G - Pirates Plund-Arrr
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPC.ini b/Data/Sys/GameSettings/SPC.ini
@@ -0,0 +1,4 @@
+# SPCPZS - Pocoyo Racing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPH.ini b/Data/Sys/GameSettings/SPH.ini
@@ -0,0 +1,4 @@
+# SPHPJW - Spaghetti Western Shooter
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPM.ini b/Data/Sys/GameSettings/SPM.ini
@@ -0,0 +1,4 @@
+# SPMDRM, SPMPWP - Mahjong Party Pack
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPR.ini b/Data/Sys/GameSettings/SPR.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SPU.ini b/Data/Sys/GameSettings/SPU.ini
@@ -0,0 +1,4 @@
+# SPUE20 - Let's Paint
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SPZ.ini b/Data/Sys/GameSettings/SPZ.ini
@@ -0,0 +1,4 @@
+# SPZE5G - Pizza Delivery Boy
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SQQ.ini b/Data/Sys/GameSettings/SQQ.ini
@@ -0,0 +1,4 @@
+# SQQEVZ, SQQPVZ - Disney Planes: Fire & Rescue
+
+[Video_Hacks]
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SR5.ini b/Data/Sys/GameSettings/SR5.ini
@@ -0,0 +1,4 @@
+# SR5E41, SR5P41 - Raving Rabbids Party Collection
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SR6.ini b/Data/Sys/GameSettings/SR6.ini
@@ -0,0 +1,4 @@
+# SR6EHG - Reader Rabbit 1st Grade
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SR7.ini b/Data/Sys/GameSettings/SR7.ini
@@ -0,0 +1,4 @@
+# SR7EHG - Reader Rabbit 2nd Grade
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SR8.ini b/Data/Sys/GameSettings/SR8.ini
@@ -0,0 +1,4 @@
+# SR8EHG - Reader Rabbit Kindergarten
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SR9.ini b/Data/Sys/GameSettings/SR9.ini
@@ -0,0 +1,4 @@
+# SR9EHG - Reader Rabbit Preschool
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRA.ini b/Data/Sys/GameSettings/SRA.ini
@@ -0,0 +1,4 @@
+# SRAJMS - Rajirugi Noa Wii
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRE.ini b/Data/Sys/GameSettings/SRE.ini
@@ -0,0 +1,4 @@
+# SREXNL - Reader Rabbit Kindergarten
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRL.ini b/Data/Sys/GameSettings/SRL.ini
@@ -0,0 +1,4 @@
+# SRLXNL - Reader Rabbit Preschool
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRT.ini b/Data/Sys/GameSettings/SRT.ini
@@ -0,0 +1,4 @@
+# SRTXNL - Reader Rabbit 1st Grade
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRV.ini b/Data/Sys/GameSettings/SRV.ini
@@ -0,0 +1,4 @@
+# SRVE41 - The Price Is Right Decades
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SRW.ini b/Data/Sys/GameSettings/SRW.ini
@@ -0,0 +1,4 @@
+# SRWXNL - Reader Rabbit 2nd Grade
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SS9.ini b/Data/Sys/GameSettings/SS9.ini
@@ -0,0 +1,4 @@
+# SS9JMS - Milestone Shooting Collection 2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SSC.ini b/Data/Sys/GameSettings/SSC.ini
@@ -0,0 +1,4 @@
+# SSCDWR, SSCEPM, SSCFWR, SSCIWR, SSCPWR, SSCSWR, SSCXPM - Scene It? Bright Lights! Big Screen!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SSG.ini b/Data/Sys/GameSettings/SSG.ini
@@ -0,0 +1,4 @@
+# SSGPNG - We Sing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SSH.ini b/Data/Sys/GameSettings/SSH.ini
@@ -0,0 +1,4 @@
+# SSHPHH - Sherlock Holmes: The Silver Earring
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/ST4.ini b/Data/Sys/GameSettings/ST4.ini
@@ -0,0 +1,4 @@
+# ST4PNX, ST4XNX - Thomas & Friends: Hero of the Rails
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/STM.ini b/Data/Sys/GameSettings/STM.ini
@@ -0,0 +1,4 @@
+# STMEGN, STMPKP - Titanic Mystery
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/STV.ini b/Data/Sys/GameSettings/STV.ini
@@ -0,0 +1,4 @@
+# STVDSV - TV Total Events
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SU3.ini b/Data/Sys/GameSettings/SU3.ini
@@ -0,0 +1,4 @@
+# SU3DMR, SU3FMR, SU3HMR, SU3PMR, SU3SMR, SU3UMR - U-Sing 2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SUM.ini b/Data/Sys/GameSettings/SUM.ini
@@ -0,0 +1,4 @@
+# SUMJC8 - Winning Post World 2010
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SUS.ini b/Data/Sys/GameSettings/SUS.ini
@@ -0,0 +1,4 @@
+# SUSFMR, SUSPMR - U-Sing Girls Night
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SVF.ini b/Data/Sys/GameSettings/SVF.ini
@@ -0,0 +1,4 @@
+# SVF - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/SVW.ini b/Data/Sys/GameSettings/SVW.ini
@@ -0,0 +1,4 @@
+# SVWEQH - Veggy World
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W22.ini b/Data/Sys/GameSettings/W22.ini
@@ -0,0 +1,4 @@
+# W22E - Planet Fish
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W2L.ini b/Data/Sys/GameSettings/W2L.ini
@@ -0,0 +1,4 @@
+# W2LE, W2LP - Bloons
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W34.ini b/Data/Sys/GameSettings/W34.ini
@@ -0,0 +1,4 @@
+# W34J - Simple Series Vol. 4: The Misshitsu kara no Dasshutsu
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W3B.ini b/Data/Sys/GameSettings/W3B.ini
@@ -0,0 +1,4 @@
+# W3BE, W3BP - Soccer Bashi
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W4A.ini b/Data/Sys/GameSettings/W4A.ini
@@ -0,0 +1,4 @@
+# W4AE, W4AP - Arcade Sports
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W4O.ini b/Data/Sys/GameSettings/W4O.ini
@@ -0,0 +1,4 @@
+# W4OJ - Shikakui Atama wo Marukusuru Challenge
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W5I.ini b/Data/Sys/GameSettings/W5I.ini
@@ -0,0 +1,4 @@
+# W5IE - 5 in 1 Solitaire
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W64.ini b/Data/Sys/GameSettings/W64.ini
@@ -0,0 +1,4 @@
+# W64 - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W69.ini b/Data/Sys/GameSettings/W69.ini
@@ -0,0 +1,4 @@
+# W69 - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W8I.ini b/Data/Sys/GameSettings/W8I.ini
@@ -0,0 +1,4 @@
+# W8IJ - Hachi-One Diver Wii
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W8L.ini b/Data/Sys/GameSettings/W8L.ini
@@ -0,0 +1,4 @@
+# W8LE - Balloon Pop Festival
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W8X.ini b/Data/Sys/GameSettings/W8X.ini
@@ -0,0 +1,4 @@
+# W8XE - Battle Poker
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/W9L.ini b/Data/Sys/GameSettings/W9L.ini
@@ -0,0 +1,4 @@
+# W9LE - Christmas Clix
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WAF.ini b/Data/Sys/GameSettings/WAF.ini
@@ -0,0 +1,4 @@
+# WAFE, WAFP - Airport Mania: First Flight
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WAN.ini b/Data/Sys/GameSettings/WAN.ini
@@ -0,0 +1,4 @@
+# WANE, WANP - Ant Nation
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WAZ.ini b/Data/Sys/GameSettings/WAZ.ini
@@ -0,0 +1,4 @@
+# WAZE - The Amazing Brain Train
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WBA.ini b/Data/Sys/GameSettings/WBA.ini
@@ -0,0 +1,4 @@
+# WBAJ - Bakutan
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WBI.ini b/Data/Sys/GameSettings/WBI.ini
@@ -0,0 +1,4 @@
+# WBIE - Boingz
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WBL.ini b/Data/Sys/GameSettings/WBL.ini
@@ -0,0 +1,4 @@
+# WBLE, WBLJ, WBLP - Bubble Bobble Plus!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WBR.ini b/Data/Sys/GameSettings/WBR.ini
@@ -0,0 +1,4 @@
+# WBRP - Pirates: The Key of Dreams
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WBV.ini b/Data/Sys/GameSettings/WBV.ini
@@ -0,0 +1,4 @@
+# WBVE, WBVP - SPOGS Racing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WC2.ini b/Data/Sys/GameSettings/WC2.ini
@@ -0,0 +1,4 @@
+# WC2E, WC2J, WC2P - Crystal Defenders R2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCH.ini b/Data/Sys/GameSettings/WCH.ini
@@ -11,6 +11,7 @@ EFBEmulateFormatChanges = True
 
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WCI.ini b/Data/Sys/GameSettings/WCI.ini
@@ -0,0 +1,4 @@
+# WCIE, WCIJ, WCIP - Crystal Defenders R1
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCJ.ini b/Data/Sys/GameSettings/WCJ.ini
@@ -0,0 +1,4 @@
+# WCJE, WCJP - Cocoto Platform Jumper
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCO.ini b/Data/Sys/GameSettings/WCO.ini
@@ -0,0 +1,4 @@
+# WCOE, WCOP - Cocoto Fishing Master
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCP.ini b/Data/Sys/GameSettings/WCP.ini
@@ -0,0 +1,4 @@
+# WCPE, WCPP - Copter Crisis
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCU.ini b/Data/Sys/GameSettings/WCU.ini
@@ -0,0 +1,4 @@
+# WCUE, WCUJ, WCUP - 3-2-1, Rattle Battle!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCV.ini b/Data/Sys/GameSettings/WCV.ini
@@ -0,0 +1,4 @@
+# WCVE, WCVP - Cave Story
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WCZ.ini b/Data/Sys/GameSettings/WCZ.ini
@@ -0,0 +1,4 @@
+# WCZE, WCZJ, WCZP - ColorZ
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WDA.ini b/Data/Sys/GameSettings/WDA.ini
@@ -0,0 +1,4 @@
+# WDAJ - Darts Wii
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WDE.ini b/Data/Sys/GameSettings/WDE.ini
@@ -0,0 +1,4 @@
+# WDEE, WDEP - Magic Destiny Astrological Games
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WDF.ini b/Data/Sys/GameSettings/WDF.ini
@@ -0,0 +1,4 @@
+# WDFE, WDFP - Defend your Castle
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WDN.ini b/Data/Sys/GameSettings/WDN.ini
@@ -0,0 +1,4 @@
+# WDNJ - Discipline Teikoku no Tanjyou
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WDX.ini b/Data/Sys/GameSettings/WDX.ini
@@ -0,0 +1,4 @@
+# WDXE - Diatomic
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WEM.ini b/Data/Sys/GameSettings/WEM.ini
@@ -0,0 +1,4 @@
+# WEME, WEMJ, WEMP - Aha! I Got It! Escape Game
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WF3.ini b/Data/Sys/GameSettings/WF3.ini
@@ -0,0 +1,4 @@
+# WF3E - Family Games - Pen & Paper Edition
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WF5.ini b/Data/Sys/GameSettings/WF5.ini
@@ -0,0 +1,4 @@
+# WF5E, WF5J, WF5P - Family Card Games
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFA.ini b/Data/Sys/GameSettings/WFA.ini
@@ -0,0 +1,4 @@
+# WFAE, WFAP - Fast Draw Showdown
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFI.ini b/Data/Sys/GameSettings/WFI.ini
@@ -0,0 +1,4 @@
+# WFIE, WFIJ, WFIP - Reel Fishing Challenge
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFK.ini b/Data/Sys/GameSettings/WFK.ini
@@ -0,0 +1,4 @@
+# WFKE, WFKJ - Family Go-Kart Racing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFM.ini b/Data/Sys/GameSettings/WFM.ini
@@ -0,0 +1,4 @@
+# WFME, WFMP - Family & Friends Party
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFN.ini b/Data/Sys/GameSettings/WFN.ini
@@ -0,0 +1,4 @@
+# WFNE, WFNP - Fish Tank
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WFY.ini b/Data/Sys/GameSettings/WFY.ini
@@ -0,0 +1,4 @@
+# WFYE, WFYP - Family Games Pen & Paper Edition
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WGU.ini b/Data/Sys/GameSettings/WGU.ini
@@ -0,0 +1,4 @@
+# WGUJ - Aero Guitar
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WH3.ini b/Data/Sys/GameSettings/WH3.ini
@@ -0,0 +1,4 @@
+# WH3E, WH3P - Home Sweet Home
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WHE.ini b/Data/Sys/GameSettings/WHE.ini
@@ -0,0 +1,4 @@
+# WHEE, WHEP - Heracles: Chariot Racing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WHO.ini b/Data/Sys/GameSettings/WHO.ini
@@ -0,0 +1,4 @@
+# WHOE - Hockey Allstar Shootout
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WIN.ini b/Data/Sys/GameSettings/WIN.ini
@@ -0,0 +1,4 @@
+# WINE, WINJ, WINP - The Incredible Maze
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WIT.ini b/Data/Sys/GameSettings/WIT.ini
@@ -0,0 +1,4 @@
+# WITE, WITJ, WITP - Aha! I Found It! Hidden Object Game
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WJS.ini b/Data/Sys/GameSettings/WJS.ini
@@ -0,0 +1,4 @@
+# WJSE, WJSP - Jungle Speed
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKD.ini b/Data/Sys/GameSettings/WKD.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WKE.ini b/Data/Sys/GameSettings/WKE.ini
@@ -0,0 +1,4 @@
+# WKEJ - RakuRaku Kinen Apori Wii: Kinenka no Isha ga Osheru Nanoka de yameru Houhou
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKI.ini b/Data/Sys/GameSettings/WKI.ini
@@ -0,0 +1,4 @@
+# WKIE, WKIP - The Mystery of Whiterock Castle
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKK.ini b/Data/Sys/GameSettings/WKK.ini
@@ -0,0 +1,4 @@
+# WKKE, WKKJ, WKKP - Party Fun Pirate
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKN.ini b/Data/Sys/GameSettings/WKN.ini
@@ -0,0 +1,4 @@
+# WKNJ - Kanken Minna de Waiwai Kanji Nou
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKU.ini b/Data/Sys/GameSettings/WKU.ini
@@ -0,0 +1,4 @@
+# WKUJ - Downtown Nekketsu Dodgeball
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WKW.ini b/Data/Sys/GameSettings/WKW.ini
@@ -0,0 +1,4 @@
+# WKWE, WKWJ, WKWP - Adventure on Lost Island: Hidden Object Game
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLC.ini b/Data/Sys/GameSettings/WLC.ini
@@ -0,0 +1,4 @@
+# WLCE, WLCJ, WLCP - Bingo Party Deluxe
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLD.ini b/Data/Sys/GameSettings/WLD.ini
@@ -0,0 +1,4 @@
+# WLDJ - Boku mo Sekai o Sukuitai: Battle Tournament
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLJ.ini b/Data/Sys/GameSettings/WLJ.ini
@@ -0,0 +1,4 @@
+# WLJJ - Boku mo Sekai o Sukuitai: Battle Tournament
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLK.ini b/Data/Sys/GameSettings/WLK.ini
@@ -0,0 +1,4 @@
+# WLKJ - Okiraku Tennis SP
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLM.ini b/Data/Sys/GameSettings/WLM.ini
@@ -0,0 +1,4 @@
+# WLME, WLMJ, WLMP - La-Mulana
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLP.ini b/Data/Sys/GameSettings/WLP.ini
@@ -0,0 +1,4 @@
+# WLPE, WLPJ, WLPP - Lonpos
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLT.ini b/Data/Sys/GameSettings/WLT.ini
@@ -0,0 +1,4 @@
+# WLTE, WLTJ, WLTP - LIT
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WLX.ini b/Data/Sys/GameSettings/WLX.ini
@@ -0,0 +1,4 @@
+# WLXJ - Phalanx
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WM4.ini b/Data/Sys/GameSettings/WM4.ini
@@ -0,0 +1,4 @@
+# WM4E, WM4P - Mix Superstar
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WM5.ini b/Data/Sys/GameSettings/WM5.ini
@@ -0,0 +1,4 @@
+# WM5E - MDK2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WM9.ini b/Data/Sys/GameSettings/WM9.ini
@@ -0,0 +1,4 @@
+# WM9E, WM9J, WM9P - Happy Hammerin
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WMD.ini b/Data/Sys/GameSettings/WMD.ini
@@ -0,0 +1,4 @@
+# WMDE - Madstone
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WML.ini b/Data/Sys/GameSettings/WML.ini
@@ -0,0 +1,4 @@
+# WMLE, WMLJ - Major League Eating: The Game
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WMO.ini b/Data/Sys/GameSettings/WMO.ini
@@ -0,0 +1,4 @@
+# WMOE, WMOJ, WMOP - Moki Moki
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WO6.ini b/Data/Sys/GameSettings/WO6.ini
@@ -0,0 +1,4 @@
+# WO6E, WO6J, WO6P - Family Pirate Party
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOA.ini b/Data/Sys/GameSettings/WOA.ini
@@ -0,0 +1,4 @@
+# WOAE, WOAJ, WOAP - Family Glide Hockey
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOD.ini b/Data/Sys/GameSettings/WOD.ini
@@ -0,0 +1,4 @@
+# WODJ - Ouudaa!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOF.ini b/Data/Sys/GameSettings/WOF.ini
@@ -0,0 +1,4 @@
+# WOFE - Overflow
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOG.ini b/Data/Sys/GameSettings/WOG.ini
@@ -0,0 +1,4 @@
+# WOGE, WOGJ, WOGP - Family Mini Golf
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOL.ini b/Data/Sys/GameSettings/WOL.ini
@@ -0,0 +1,4 @@
+# WOLJ - Othello
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOP.ini b/Data/Sys/GameSettings/WOP.ini
@@ -0,0 +1,4 @@
+# WOPE - Word Searcher Deluxe
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WOX.ini b/Data/Sys/GameSettings/WOX.ini
@@ -0,0 +1,4 @@
+# WOXJ - Osu! Exercise Dojo
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WP6.ini b/Data/Sys/GameSettings/WP6.ini
@@ -0,0 +1,4 @@
+# WP6J - Boku wa Plarail Untenshi: Shinkansen Joukikikansha-Hen
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WP9.ini b/Data/Sys/GameSettings/WP9.ini
@@ -0,0 +1,4 @@
+# WP9J - Po-Ka-Zu Wii
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPB.ini b/Data/Sys/GameSettings/WPB.ini
@@ -0,0 +1,4 @@
+# WPBE, WPBP - Pub Darts
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPD.ini b/Data/Sys/GameSettings/WPD.ini
@@ -0,0 +1,4 @@
+# WPDJ - Chindouchuu!! Pole no Daibouken
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPJ.ini b/Data/Sys/GameSettings/WPJ.ini
@@ -4,3 +4,4 @@
 [ActionReplay]
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPN.ini b/Data/Sys/GameSettings/WPN.ini
@@ -0,0 +1,4 @@
+# WPNJ - Ponjan
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPP.ini b/Data/Sys/GameSettings/WPP.ini
@@ -0,0 +1,4 @@
+# WPPE, WPPJ, WPPP - Family Table Tennis
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPQ.ini b/Data/Sys/GameSettings/WPQ.ini
@@ -0,0 +1,4 @@
+# WPQE, WPQP - Protöthea
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPT.ini b/Data/Sys/GameSettings/WPT.ini
@@ -0,0 +1,4 @@
+# WPTJ - Fantasic Cube
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPX.ini b/Data/Sys/GameSettings/WPX.ini
@@ -0,0 +1,4 @@
+# WPXJ - Minna de Tobikome Penguin Diving Hooper Looper
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WPZ.ini b/Data/Sys/GameSettings/WPZ.ini
@@ -0,0 +1,4 @@
+# WPZE - Bruiser & Scratch
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WQ4.ini b/Data/Sys/GameSettings/WQ4.ini
@@ -0,0 +1,4 @@
+# WQ4J - Kentoushi FuriFuri Boxing
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WRA.ini b/Data/Sys/GameSettings/WRA.ini
@@ -0,0 +1,4 @@
+# WRA - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WRD.ini b/Data/Sys/GameSettings/WRD.ini
@@ -0,0 +1,4 @@
+# WRDE, WRDP - Word Searcher
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WRF.ini b/Data/Sys/GameSettings/WRF.ini
@@ -0,0 +1,4 @@
+# WRFE, WRFP - Reel Fishing Challenge II
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WRS.ini b/Data/Sys/GameSettings/WRS.ini
@@ -0,0 +1,4 @@
+# WRSE - Step Up
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS2.ini b/Data/Sys/GameSettings/WS2.ini
@@ -0,0 +1,4 @@
+# WS2J - Saikyou Ginsei Igo
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS3.ini b/Data/Sys/GameSettings/WS3.ini
@@ -0,0 +1,4 @@
+# WS3E, WS3J - Silver Star: Chess
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS4.ini b/Data/Sys/GameSettings/WS4.ini
@@ -0,0 +1,4 @@
+# WS4J - Saikyou Ginsei Mahjong
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS5.ini b/Data/Sys/GameSettings/WS5.ini
@@ -0,0 +1,4 @@
+# WS5J - Saikyou Ginsei Gomoku Narabe
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS6.ini b/Data/Sys/GameSettings/WS6.ini
@@ -0,0 +1,4 @@
+# WS6E, WS6J - Silver Star: Reversi
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WS9.ini b/Data/Sys/GameSettings/WS9.ini
@@ -0,0 +1,4 @@
+# WS9E, WS9P - Sudoku Challenge!
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WSH.ini b/Data/Sys/GameSettings/WSH.ini
@@ -0,0 +1,4 @@
+# WSHE - Stonekeep: Bones of the Ancestors
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WSI.ini b/Data/Sys/GameSettings/WSI.ini
@@ -0,0 +1,4 @@
+# WSIJ - Saikyou Ginsei Shogi
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WSX.ini b/Data/Sys/GameSettings/WSX.ini
@@ -0,0 +1,4 @@
+# WSXE, WSXP - Stunt Cars
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WT8.ini b/Data/Sys/GameSettings/WT8.ini
@@ -0,0 +1,4 @@
+# WT8J - Hajite! Block Rush
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WTB.ini b/Data/Sys/GameSettings/WTB.ini
@@ -0,0 +1,4 @@
+# WTBJ - Fantasic Tambourine
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WTD.ini b/Data/Sys/GameSettings/WTD.ini
@@ -0,0 +1,4 @@
+# WTDJ - Tomica Drive
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WTI.ini b/Data/Sys/GameSettings/WTI.ini
@@ -0,0 +1,4 @@
+# WTIE - Tiki Towers
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WTN.ini b/Data/Sys/GameSettings/WTN.ini
@@ -0,0 +1,4 @@
+# WTNE, WTNJ - Family Tennis
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WTU.ini b/Data/Sys/GameSettings/WTU.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WTX.ini b/Data/Sys/GameSettings/WTX.ini
@@ -13,6 +13,7 @@
 # Add action replay cheats here.
 
 [Video_Settings]
+SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WUK.ini b/Data/Sys/GameSettings/WUK.ini
@@ -0,0 +1,4 @@
+# WUKJ - Unou Kids Okigaru Unou Training
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WW2.ini b/Data/Sys/GameSettings/WW2.ini
@@ -0,0 +1,4 @@
+# WW2P - Where's Wally? Fantastic Journey 2
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WW3.ini b/Data/Sys/GameSettings/WW3.ini
@@ -0,0 +1,4 @@
+# WW3P - Where's Wally? Fantastic Journey 3
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WWI.ini b/Data/Sys/GameSettings/WWI.ini
@@ -0,0 +1,4 @@
+# WWIP - Where's Wally? Fantastic Journey 1
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WWX.ini b/Data/Sys/GameSettings/WWX.ini
@@ -0,0 +1,4 @@
+# WWXE, WWXP - Paper Wars: Cannon Fodder
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WZB.ini b/Data/Sys/GameSettings/WZB.ini
@@ -0,0 +1,4 @@
+# WZBP - Cricket Challenge
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WZG.ini b/Data/Sys/GameSettings/WZG.ini
@@ -0,0 +1,4 @@
+# WZGE - Zoo Disc Golf
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/WZM.ini b/Data/Sys/GameSettings/WZM.ini
@@ -0,0 +1,4 @@
+# WZMJ - Simple Wii Series Vol. 3: The Mahjong
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XH2.ini b/Data/Sys/GameSettings/XH2.ini
@@ -0,0 +1,4 @@
+# XH2E, XH2P - Cave Story (Demo)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XH7.ini b/Data/Sys/GameSettings/XH7.ini
@@ -0,0 +1,4 @@
+# XH7E, XH7P - Lit (Demo)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XH9.ini b/Data/Sys/GameSettings/XH9.ini
@@ -0,0 +1,4 @@
+# XH9 - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XI9.ini b/Data/Sys/GameSettings/XI9.ini
@@ -0,0 +1,4 @@
+# XI9 - (unknown title - INI file autogenerated from vWii system menu list of titles without 16:9 support)
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XIT.ini b/Data/Sys/GameSettings/XIT.ini
@@ -0,0 +1,4 @@
+# XITE, XITP - Fast Draw Demo
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XIU.ini b/Data/Sys/GameSettings/XIU.ini
@@ -0,0 +1,4 @@
+# XIUE, XIUP - Soccer Bashi Demo
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/GameSettings/XIV.ini b/Data/Sys/GameSettings/XIV.ini
@@ -0,0 +1,4 @@
+# XIVE, XIVP - Mix Superstar Demo
+
+[Video_Settings]
+SuggestedAspectRatio = 2
diff --git a/Data/Sys/Shaders/CRT.glsl b/Data/Sys/Shaders/CRT.glsl
diff --git a/Data/Sys/Shaders/FXAA_natural.glsl b/Data/Sys/Shaders/FXAA_natural.glsl
@@ -0,0 +1,80 @@
+#define FXAA_REDUCE_MIN     (1.0 / 128.0)
+#define FXAA_REDUCE_MUL     (1.0 / 8.0)
+#define FXAA_SPAN_MAX       8.0
+
+float3 applyFXAA(float2 fragCoord)
+{
+    float2 inverseVP = GetInvResolution();
+    float3 rgbNW = SampleLocation((fragCoord + float2(-1.0, -1.0)) * inverseVP).xyz;
+    float3 rgbNE = SampleLocation((fragCoord + float2(1.0, -1.0)) * inverseVP).xyz;
+    float3 rgbSW = SampleLocation((fragCoord + float2(-1.0, 1.0)) * inverseVP).xyz;
+    float3 rgbSE = SampleLocation((fragCoord + float2(1.0, 1.0)) * inverseVP).xyz;
+    float3 rgbM  = SampleLocation(fragCoord  * inverseVP).xyz;
+    float3 luma = float3(0.299, 0.587, 0.114);
+    float lumaNW = dot(rgbNW, luma);
+    float lumaNE = dot(rgbNE, luma);
+    float lumaSW = dot(rgbSW, luma);
+    float lumaSE = dot(rgbSE, luma);
+    float lumaM  = dot(rgbM,  luma);
+    float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
+    float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
+
+    float2 dir;
+    dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
+    dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
+
+    float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
+                        (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
+
+    float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
+    dir = min(float2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
+            max(float2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
+            dir * rcpDirMin)) * inverseVP;
+
+    float3 rgbA = 0.5 * (
+        SampleLocation(fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz +
+        SampleLocation(fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz);
+    float3 rgbB = rgbA * 0.5 + 0.25 * (
+        SampleLocation(fragCoord * inverseVP + dir * -0.5).xyz +
+        SampleLocation(fragCoord * inverseVP + dir * 0.5).xyz);
+
+    float lumaB = dot(rgbB, luma);
+    if ((lumaB < lumaMin) || (lumaB > lumaMax))
+        return rgbA;
+    else
+        return rgbB;
+}
+
+#define MUL(a, b) (b * a)
+#define GIN   2.2
+#define GOUT  2.2
+#define Y   1.1
+#define I   1.1
+#define Q   1.1 
+
+const mat3x3 RGBtoYIQ = mat3x3(0.299,     0.587,     0.114,
+                      0.595716, -0.274453, -0.321263,
+                      0.211456, -0.522591,  0.311135);
+
+const mat3x3 YIQtoRGB = mat3x3(1,  0.95629572,  0.62102442,
+                      1, -0.27212210, -0.64738060,
+                      1, -1.10698902,  1.70461500);
+
+const float3 YIQ_lo = float3(0, -0.595716, -0.522591);
+const float3 YIQ_hi = float3(1,  0.595716,  0.522591);
+
+float4 applyNatural(float3 c)
+{
+    c = pow(c, float3(GIN, GIN, GIN));
+    c = MUL(RGBtoYIQ, c);
+    c = float3(pow(c.x, Y), c.y * I, c.z * Q);
+    c = clamp(c, YIQ_lo, YIQ_hi);
+    c = MUL(YIQtoRGB, c);
+    c = pow(c, float3(1.0/GOUT, 1.0/GOUT, 1.0/GOUT));
+    return float4(c, 1.0);
+}
+
+void main()
+{
+    SetOutput(applyNatural(applyFXAA(GetCoordinates() * GetResolution())));
+}
diff --git a/Data/Sys/Shaders/SEDI.glsl b/Data/Sys/Shaders/SEDI.glsl
@@ -0,0 +1,114 @@
+/*
+   Simple Edge Directed Interpolation (SEDI) v1.0
+
+   Copyright (C) 2017 SimoneT - simone1tarditi@gmail.com
+
+   de Blur - Copyright (C) 2016 guest(r) - guest.r@gmail.com
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+// de Blur control
+#define filterparam 5.0
+
+float CLength(float3 c1)
+{
+	float rmean = c1.r * 0.5;
+	c1 *= c1;
+	return sqrt((2.0 + rmean) * c1.r + 4.0 * c1.g + (3.0 - rmean) * c1.b);
+}
+
+float Cdistance(float3 c1, float3 c2)
+{
+	float rmean = (c1.r + c2.r) * 0.5;
+	c1 = pow(c1 - c2, float3(2.0));
+	return sqrt((2.0 + rmean) * c1.r + 4.0 * c1.g + (3.0 - rmean) * c1.b);
+}
+
+float3 ColMin(float3 a, float3 b)
+{
+	float dist = step(0.01, sign(CLength(a) - CLength(b)));
+	return mix(a, b, dist);
+}
+
+float3 ColMax(float3 a, float3 b)
+{
+	float dist = step(0.01, sign(CLength(a) - CLength(b)));
+	return mix(b, a, dist);
+}
+
+float3 Blur(float2 TexCoord)
+{
+	float2 shift  = GetInvResolution() * 0.5;
+
+	float3 C06 = SampleLocation(TexCoord - shift.xy).rgb;
+	float3 C07 = SampleLocation(TexCoord + float2( shift.x,-shift.y)).rgb;
+	float3 C11 = SampleLocation(TexCoord + float2(-shift.x, shift.y)).rgb;
+	float3 C12 = SampleLocation(TexCoord + shift.xy).rgb;
+
+	float dif1 = Cdistance(C06, C12) + 0.00001;
+	float dif2 = Cdistance(C07, C11) + 0.00001;
+
+	dif1 = pow(dif1, filterparam);
+	dif2 = pow(dif2, filterparam);
+
+	float dif3 = dif1 + dif2;
+	return (dif1 * (C07 + C11) * 0.5 + dif2 * (C06 + C12) * 0.5) / dif3;
+}
+
+// de Blur code
+float3 deBlur() 
+{
+	float2 Size = GetInvResolution();
+	float2 coord = GetCoordinates();
+	float2 dx = float2( Size.x,    0.0);
+	float2 dy = float2(    0.0, Size.y);
+	float2 g1 = float2( Size.x, Size.y);
+	float2 g2 = float2(-Size.x, Size.y);
+
+	float3 C0 = Blur(coord-g1).rgb; 
+	float3 C1 = Blur(coord-dy).rgb;
+	float3 C2 = Blur(coord-g2).rgb;
+	float3 C3 = Blur(coord-dx).rgb;
+	float3 C4 = Blur(coord   ).rgb;
+	float3 C5 = Blur(coord+dx).rgb;
+	float3 C6 = Blur(coord+g2).rgb;
+	float3 C7 = Blur(coord+dy).rgb;
+	float3 C8 = Blur(coord+g1).rgb;
+
+	float3 mn1 = ColMin(ColMin(C0, C1), C2);
+	float3 mn2 = ColMin(ColMin(C3, C4), C5);
+	float3 mn3 = ColMin(ColMin(C6, C7), C8);
+	     mn1 = ColMin(ColMin(mn1, mn2), mn3);
+
+	float3 mx1 = ColMax(ColMax(C0, C1), C2);
+	float3 mx2 = ColMax(ColMax(C3, C4), C5);
+	float3 mx3 = ColMax(ColMax(C6, C7), C8);
+ 	     mx1 = ColMax(ColMax(mx1, mx2), mx3);
+
+	float dif1 = Cdistance(C4, mn1) + 0.00001;
+	float dif2 = Cdistance(C4, mx1) + 0.00001;
+
+	dif1 = pow(dif1, filterparam);
+	dif2 = pow(dif2, filterparam);
+
+	float dif3 = dif1 + dif2;
+	return (dif1 * mx1 + dif2 * mn1) / dif3;
+}
+
+void main()
+{
+	SetOutput(float4(deBlur(), 1.0));
+} 
diff --git a/Data/Sys/Shaders/auto_toon.glsl b/Data/Sys/Shaders/auto_toon.glsl
diff --git a/Data/Sys/Shaders/bad_bloom.glsl b/Data/Sys/Shaders/bad_bloom.glsl
diff --git a/Data/Sys/Shaders/brighten.glsl b/Data/Sys/Shaders/brighten.glsl
@@ -1,4 +1,4 @@
 void main()
 {
-	SetOutput(Sample()* 3.0);
+	SetOutput(Sample()* 2.0);
 }
diff --git a/Data/Sys/Shaders/cartoon.glsl b/Data/Sys/Shaders/cartoon.glsl
@@ -0,0 +1,47 @@
+const float scaleoffset = 0.8; //edge detection offset
+const float bb = 0.5; // effects black border sensitivity; from 0.0 to 1.0
+
+void main()
+{
+  float2 delta = GetInvResolution() * scaleoffset;
+  float2 dg1 = float2( delta.x, delta.y);
+  float2 dg2 = float2(-delta.x, delta.y);
+  float2 dx  = float2( delta.x, 0.0);
+  float2 dy  = float2( 0.0, delta.y);
+
+  float4 v_texcoord1, v_texcoord2, v_texcoord3, v_texcoord4, v_texcoord5, v_texcoord6;
+
+  v_texcoord1.xy = GetCoordinates() - dy;
+  v_texcoord2.xy = GetCoordinates() + dy;
+  v_texcoord3.xy = GetCoordinates() - dx;
+  v_texcoord4.xy = GetCoordinates() + dx;
+  v_texcoord5.xy = GetCoordinates() - dg1;
+  v_texcoord6.xy = GetCoordinates() + dg1;
+  v_texcoord1.zw = GetCoordinates() - dg2;
+  v_texcoord2.zw = GetCoordinates() + dg2;
+
+  float3 c00 = SampleLocation(v_texcoord5.xy).xyz; 
+  float3 c10 = SampleLocation(v_texcoord1.xy).xyz; 
+  float3 c20 = SampleLocation(v_texcoord2.zw).xyz; 
+  float3 c01 = SampleLocation(v_texcoord3.xy).xyz; 
+  float3 c11 = SampleLocation(GetCoordinates()).xyz; 
+  float3 c21 = SampleLocation(v_texcoord4.xy).xyz; 
+  float3 c02 = SampleLocation(v_texcoord1.zw).xyz; 
+  float3 c12 = SampleLocation(v_texcoord2.xy).xyz; 
+  float3 c22 = SampleLocation(v_texcoord6.xy).xyz; 
+  float3 dt = float3(1.0, 1.0, 1.0); 
+
+  float d1 = dot(abs(c00 - c22), dt);
+  float d2 = dot(abs(c20 - c02), dt);
+  float hl = dot(abs(c01 - c21), dt);
+  float vl = dot(abs(c10 - c12), dt);
+  float  d = bb * (d1 + d2 + hl + vl) / (dot(c11, dt) + 0.15);
+
+  float lc = 4.0 * length(c11);
+  float f = fract(lc); f*=f;
+  lc = 0.25 * (floor(lc) + f * f) + 0.05;
+  c11 = 4.0 * normalize(c11); 
+  float3 frct = fract(c11); frct *= frct;
+  c11 = floor(c11) + 0.05 * dt + frct * frct;
+  SetOutput(float4(0.25 * lc * (1.1 - d * sqrt(d)) * c11, 1.0));
+}
diff --git a/Data/Sys/Shaders/emboss.glsl b/Data/Sys/Shaders/emboss.glsl
diff --git a/Data/Sys/Shaders/film.glsl b/Data/Sys/Shaders/film.glsl
@@ -0,0 +1,109 @@
+const float Filmic_Strength = 0.60; 
+const float Filmic_Contrast = 1.03; 
+const float Fade = 0.0; 
+const float Linearization = 1.0; 
+const float Filmic_Bleach = 0.0; 
+const float Saturation = -0.25; 
+const float BaseCurve = 1.5; 
+const float BaseGamma = 1.0; 
+const float EffectGamma = 0.68;
+
+void main() 
+{
+	float3 B = Sample().rgb; 
+	float3 G = B; 
+	float3 H = float3(0.01); 
+
+	B = clamp(B, 0.0, 1.); 
+	B = pow(float3(B), float3(Linearization)); 
+	B = mix(H, B, Filmic_Contrast); 
+
+	float3 LumCoeff = float3(0.2126, 0.7152, 0.0722); 
+	float A = dot(B.rgb, LumCoeff); 
+	float3 D = float3(A); 
+
+	B = pow(B, 1.0 / float3(BaseGamma)); 
+
+	float RedCurve = 1.0; 
+	float GreenCurve = 1.0; 
+	float BlueCurve = 1.0; 
+
+	float a = RedCurve; 
+	float b = GreenCurve; 
+	float c = BlueCurve; 
+	float d = BaseCurve; 
+
+	float y = 1.0 / (1.0 + exp(a / 2.0)); 
+	float z = 1.0 / (1.0 + exp(b / 2.0)); 
+	float w = 1.0 / (1.0 + exp(c / 2.0)); 
+	float v = 1.0 / (1.0 + exp(d / 2.0)); 
+
+	float3 C = B; 
+
+	D.r = (1.0 / (1.0 + exp(-a * (D.r - 0.5))) - y) / (1.0 - 2.0 * y); 
+	D.g = (1.0 / (1.0 + exp(-b * (D.g - 0.5))) - z) / (1.0 - 2.0 * z); 
+	D.b = (1.0 / (1.0 + exp(-c * (D.b - 0.5))) - w) / (1.0 - 2.0 * w); 
+
+	D = pow(D, 1.0 / float3(EffectGamma)); 
+
+	float3 Di = 1.0 - D; 
+
+	D = mix(D, Di, Filmic_Bleach); 
+
+	float EffectGammaR = 1.0; 
+	float EffectGammaG = 1.0; 
+	float EffectGammaB = 1.0; 
+
+	D.r = pow(abs(D.r), 1.0 / EffectGammaR); 
+	D.g = pow(abs(D.g), 1.0 / EffectGammaG); 
+	D.b = pow(abs(D.b), 1.0 / EffectGammaB); 
+
+	if (D.r < 0.5) 
+		C.r = (2.0 * D.r - 1.0) * (B.r - B.r * B.r) + B.r; 
+	else 
+		C.r = (2.0 * D.r - 1.0) * (sqrt(B.r) - B.r) + B.r; 
+
+	if (D.g < 0.5) 
+		C.g = (2.0 * D.g - 1.0) * (B.g - B.g * B.g) + B.g; 
+	else 
+		C.g = (2.0 * D.g - 1.0) * (sqrt(B.g) - B.g) + B.g; 
+
+	if (D.b < 0.5) 
+		C.b = (2.0 * D.b - 1.0) * (B.b - B.b * B.b) + B.b; 
+	else 
+		C.b = (2.0 * D.b - 1.0) * (sqrt(B.b) - B.b) + B.b; 
+
+	float3 F = mix(B, C, Filmic_Strength); 
+	F = (1.0 / (1.0 + exp(-d * (F - 0.5))) - v) / (1.0 - 2.0 * v); 
+
+	float r2R = 1.0 - Saturation; 
+	float g2R = 0.0 + Saturation; 
+	float b2R = 0.0 + Saturation; 
+
+	float r2G = 0.0 + Saturation; 
+	float g2G = (1.0 - Fade) - Saturation; 
+	float b2G = (0.0 + Fade) + Saturation; 
+
+	float r2B = 0.0 + Saturation; 
+	float g2B = (0.0 + Fade) + Saturation; 
+	float b2B = (1.0 - Fade) - Saturation; 
+
+	float3 iF = F; 
+
+	F.r = (iF.r * r2R + iF.g * g2R + iF.b * b2R); 
+	F.g = (iF.r * r2G + iF.g * g2G + iF.b * b2G); 
+	F.b = (iF.r * r2B + iF.g * g2B + iF.b * b2B); 
+
+	float N = dot(F.rgb, LumCoeff); 
+	float3 Cn = F; 
+
+	if (N < 0.5) 
+		Cn = (2.0 * N - 1.0) * (F - F * F) + F; 
+	else 
+		Cn = (2.0 * N - 1.0) * (sqrt(F) - F) + F; 
+
+	Cn = pow(max(Cn, float3(0)), 1.0 / float3(Linearization)); 
+
+	float3 Fn = mix(B, Cn, Filmic_Strength); 
+	SetOutput(float4(Fn, 1.0)); 
+}
diff --git a/Data/Sys/Shaders/grayscale2.glsl b/Data/Sys/Shaders/grayscale2.glsl
diff --git a/Data/Sys/Shaders/invert.glsl b/Data/Sys/Shaders/invert.glsl
diff --git a/Data/Sys/Shaders/mad_world.glsl b/Data/Sys/Shaders/mad_world.glsl
diff --git a/Data/Sys/Shaders/natural.glsl b/Data/Sys/Shaders/natural.glsl
diff --git a/Data/Sys/Shaders/posterize.glsl b/Data/Sys/Shaders/posterize.glsl
diff --git a/Data/Sys/Shaders/sketchy.glsl b/Data/Sys/Shaders/sketchy.glsl
diff --git a/Data/Sys/wiitdb-de.txt b/Data/Sys/wiitdb-de.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: DE_unique version: 20180527221325)
+TITLES = https://www.gametdb.com (type: Wii language: DE_unique version: 20190127013834)
 R22J01 = FlingSmash
 R23P52 = Barbie und Die Drei Musketiere
 R25PWR = LEGO Harry Potter: Die Jahre 1-4
@@ -137,7 +137,6 @@ RJOP99 = Ju-On Der Fluch
 RJQP70 = Pyjama Pit: Keine Angst im Dunkeln
 RJXXFR = Go Play Lumberjacks - Die verrückte Holzfäller-Meisterschaft
 RK5P01 = Kirby und das magische Garn
-RKGPGY = Bratz - Kidz Party
 RKHP52 = Kung Fu Panda: Legendäre Kämpfer
 RL2PFR = Pferd & Pony: Mein Gestüt - Ein Leben für die Pferde
 RL4P64 = LEGO Indiana Jones 2: Die neuen Abenteuer
@@ -420,13 +419,13 @@ SVQPVZ = Barbie und ihre Schwestern: Die Rettung der Welpen
 SVVPAF = Die Croods: Steinzeit Party!
 SW3PKM = Eurosport Winter Stars
 CS4P00 = SingItStar NRJ Music Tour
+SDNP01 = New SUPER DODO BROS wii
 SIS1OH = SingItStar Custom: Volume 1
 SISACD = SingItStar AC/DC
 SISPOH = SingItStar Custom: Party
 W2CP = Gehirntraining
 W2PP = Physiofun - Beckenboden Training
 W3MP = Die Drei Musketiere Einer für alle!
-W3TP = Pearl Harbor Trilogy 1941 - Red Sun Rising
 W73P = Lernerfolg Grundschule Deutsch Klasse 4
 W74P = Lernerfolg Grundschule Deutsch Klasse 5
 W7IP = Lernerfolg Grundschule Deutsch Klasse 2
@@ -484,7 +483,7 @@ GDKPA4 = Disney´s Sports Fußball
 GDOP41 = Disney's Donald Duck Phantomias: Platyrhynchos Kineticus
 GEND69 = James Bond 007: Alles Oder Nichts
 GENP69 = 007: Alles Oder Nichts
-GF4D52 = Die Fantastischen Vier™ and ©2005
+GF4D52 = Die Fantastischen Vier
 GFAD69 = FIFA Football 2003
 GFSD69 = FIFA Fussball Weltmeisterschaft 2002
 GGVD78 = Der SpongBob Schwammkopf Film

diff --git a/Data/Sys/wiitdb-en.txt b/Data/Sys/wiitdb-en.txt
diff --git a/Data/Sys/wiitdb-es.txt b/Data/Sys/wiitdb-es.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: ES_unique version: 20180527221333)
+TITLES = https://www.gametdb.com (type: Wii language: ES_unique version: 20190127013840)
 R22J01 = FlingSmash
 R23E52 = Barbie y las Tres Mosqueteras
 R23P52 = Barbie y las Tres Mosqueteras
@@ -110,6 +110,7 @@ RDOP41 = Dogz: ¡Diviértete con Más Perros!
 RDOX41 = Dogz: ¡Diviértete con Más Perros!
 RDPP54 = Dora al Rescate de la Princesa de la Nieve
 RDPX54 = Dora al Rescate de la Princesa de la Nieve
+RDQEGD = Dragon Quest Swords: La Reina Enmascarada y la Torre de los Espejos
 RDQPGD = Dragon Quest Swords: La Reina Enmascarada y la Torre de los Espejos
 REBPMT = Mr. Bean en el Estrambótico Mundo de Wii
 REKP41 = Mi Experto en Fitness: Cardio Training
@@ -285,7 +286,6 @@ RR5P70 = Ready 2 Rumble: Revolution
 RR7PVP = Real Madrid: The Game
 RRCP52 = Barbie Horses: Escuela de Equitación
 RRGP52 = Madagascar 2: El Videojuego
-RRIPTV = Paint Works
 RRJFMR = Ready, Steady, Cook: The Game
 RRJIMR = Ready, Steady, Cook: The Game
 RRJPMR = Ready, Steady, Cook: The Game
@@ -445,7 +445,6 @@ SCYZ4Q = Cars 2: El Videojuego
 SD2Y41 = Just Dance 2 (Edición Best Buy)
 SD6PTV = Éxito en Primaria: Inglés - Curso 1-4
 SD7PTV = Éxito en Primaria: Matemáticas - Curso 1-4
-SDDPML = The Ultimate Battle of the Sexes
 SDFP4Q = Disney Sing It: Éxitos de película
 SDLP78 = La Gran Aventura de Dood
 SDMEG9 = Gru, Mi Villano Favorito
@@ -499,6 +498,7 @@ SJDZ41 = Just Dance 3 (Edición Target)
 SJIEG9 = Fitness Ultimatum 2011 de Jillian Michaels
 SJME5G = Fitness Ultimatum 2010 de Jillian Michaels
 SJMPGT = Fitness Ultimatum 2010 de Jillian Michaels
+SJXD41 = Just Dance 4
 SK4E52 = Shrek: Felices Para Siempre
 SK4P52 = Shrek: Felices Para Siempre
 SK7PVZ = Disney Violetta: Ritmo & Música
@@ -511,7 +511,7 @@ SLFXKM = Let's Sing 5 - Versión Española
 SLHEWR = LEGO Harry Potter: Años 5-7
 SLHPWR = LEGO Harry Potter: Años 5-7
 SLJPKM = Let's Sing 8 - Versión Española
-SLNP7M = La Voz 3
+SLNP7M = La Voz Vol. 3
 SLPP5D = The Spirit of the Wolf
 SLRPWR = LEGO El Señor de los Anillos
 SLVP41 = Party Night ¿Te Atreves?
@@ -533,6 +533,8 @@ SPBPGT = ¿Quién tiene la última palabra?
 SPDE52 = Spider-Man: Dimensions
 SPDP52 = Spider-Man: Dimensions
 SPXP41 = Prince of Persia: Las Arenas Olvidadas
+SQLE4Z = Cartoon Network: Explosión de Puñetazos XL
+SQLPGN = Cartoon Network: Explosión de Puñetazos XL
 SQQPVZ = Disney Aviones: Equipo De Rescate
 SR4P41 = Raving Rabbids: Regreso al Pasado
 SR9EHG = El Conejo Lector Preescolar
@@ -699,6 +701,7 @@ RGZC52 = Guitar Hero III Custom: Led Zeppelin
 RGZE52 = Guitar Hero III Custom: Shred Edition
 RJJG52 = Guitar Hero III Custom: JJ-KwiK's Edition
 RMCC01 = Mario Kart Wii (Personalizado)
+RMCEB8 = Mario Kart Manía
 RMGE52 = Guitar Hero III Custom: Megadeth
 RMHC08 = Monster Hunter Tri (Personalizado)
 RMMP52 = Guitar Hero III Custom: Metal Mayhem
@@ -814,6 +817,7 @@ NAJ8 = The Legend of Zelda: Ocarina of Time (traducido al español)
 NARP = The Legend of Zelda : Majora's Mask
 LALE = Fantasy Zone II
 EA5P = Fatal Fury 3 : Road To The Final Victory
+E6PP = Ninja Gaiden
 E6VE = Zaxxon
 HAAA = Canal Fotos
 HABA = Canal Tienda
@@ -838,7 +842,6 @@ HCJP = Canal BBC iPlayer
 JODI = Canal Homebrew
 LULZ = Canal Homebrew
 OHBC = Canal Homebrew
-9XGX = SNES9XGX
 D64A = Wii64
 DGPA = Genesis Plus GX
 DMAA = SDL Mame

diff --git a/Data/Sys/wiitdb-fr.txt b/Data/Sys/wiitdb-fr.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: FR_unique version: 20180527221340)
+TITLES = https://www.gametdb.com (type: Wii language: FR_unique version: 20190127013847)
 R22J01 = FlingSmash
 R23P52 = Barbie et les Trois Mousquetaires
 R25PWR = LEGO Harry Potter : Années 1 à 4
@@ -248,7 +248,7 @@ RK5P01 = Kirby au Fil de l'Aventure
 RKDP01 = Trauma Center : Second Opinion
 RKEPGN = Cate West : The Vanishing Files
 RKFP7U = The King of Fighters Collection : The Orochi Saga
-RKGPGY = Bratz : Kidz Party
+RKGPGY = Bratz Kidz : Pyjama Party
 RKHE52 = Kung Fu Panda : Guerriers Légendaires
 RKHP52 = Kung Fu Panda : Guerriers Légendaires
 RKMP5D = Mortal Kombat : Armageddon
@@ -309,7 +309,6 @@ RNSF69 = Need for Speed : Carbon
 RNSP69 = Need for Speed : Carbon
 RNSX69 = Need for Speed : Carbon
 RNXPDA = Naruto : Clash of Ninja Revolution European Version
-RNYPDA = Naruto : Clash of Ninja Revolution 2 European Version
 RO7P7D = The Legend of Spyro : The Eternal Night
 RO8P7D = La Légende de Spyro : La Naissance d'un Dragon
 RO8X7D = La Légende de Spyro: La Naissance d'un Dragon
@@ -632,7 +631,7 @@ SOSPAF = Turbo : Équipe de Cascadeurs
 SOUP01 = The Legend of Zelda : Skyward Sword
 SP5PVV = The Kore Gang : La Menace Intraterrestre
 SP8P78 = Les Pingouins de Madagascar: Le docteur Blowhole est de retour!
-SPDP52 = Spider-Man : Dimensions
+SPDP52 = Spider-Man: Dimensions
 SPXP41 = Prince of Persia : Les Sables Oubliés
 SQDP8P = Gunblade NY & LA Machineguns : Arcade Hits Pack
 SQMP52 = Spider-Man : Aux frontières du temps
@@ -744,6 +743,7 @@ WLNP = Apprends avec les PooYoos: Episode 2
 WLOP = LostWinds : Winter of the Melodias
 WMBP = MaBoShi : l'arcade des trois formes
 WMWP = Le monde de Miffy
+WMWX = Le monde de Miffy
 WN9P = Military Madness : Nectaris
 WNVP = Neves Plus
 WOBP = Art Style : ORBIENT
@@ -782,6 +782,7 @@ JADD = The Legend of Zelda : A Link to the Past
 JADE = The Legend of Zelda : A Link to the Past
 JADF = The Legend of Zelda : A Link to the Past
 JADP = The Legend of Zelda : A Link to the Past
+JAHP = R-TYPE III : The Third Lightning
 JAJP = Street Fighter II : The World Warrior
 JALP = Super Probotector : Alien Rebels
 JBBP = Super Street Fighter II : The New Challengers
@@ -801,10 +802,12 @@ MAKP = Shadow Dancer : The Secret of Shinobi
 MARP = La Légende de Thor
 MB6P = Shining Force II
 MBIP = Landstalker : Le Trésor du Roi Nole
+MCHM = MUSHA : Metallic Uniframe Super Hybrid Armor
 PAWP = Galaga'88
 PB3P = Devil Crash
 PBIP = Bonk III : Bonk's Big Adventure
 PC2P = Taito Chase H.Q.
+PCSL = Digital Champ : Battle Boxing
 QA3P = SimEarth : The Living Planet
 QADL = Gradius II : Gofer no Yabou
 QAPP = Castlevania : Rondo of Blood

diff --git a/Data/Sys/wiitdb-it.txt b/Data/Sys/wiitdb-it.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: IT_unique version: 20180527221347)
+TITLES = https://www.gametdb.com (type: Wii language: IT_unique version: 20190127013854)
 R23P52 = Barbie e le Tre Moschettiere
 R25PWR = LEGO Harry Potter: Anni 1-4
 R2AP7D = L'Era Glaciale 2: Il Disgelo
@@ -362,18 +362,30 @@ SP9P4Q = SingItStar POP 2009
 WFFF4I = Fatal Frame 4: La Maschera dell'eclissi lunare
 W2CP = Brain Challenge L'Allena-Mente
 W3MP = I Tre Moschettieri Uno per tutti!
+W6BP = 530 ECO SHOOTER
 W8WP = Happy Holidays Halloween
 W9RP = Happy Holidays Christmas
 WDMP = Dr. Mario & Sterminavirus
 WETP = Giochi da tavolo animati: Un'avventura pop-up!
+WGPP = Zenquaria™: Acquario virtuale
 WHUP = Fantasma Party
 WLEE = Impara con i PooYoo: Episodio 1
 WLEP = Impara con i PooYoo: Episodio 1
 WLNE = Impara con i PooYoo: Episodio 2
 WLNP = Impara con i PooYoo: Episodio 2
 WMBP = MaBoShi: L'arcade delle tre forme
+WTMP = ADVENTURE ISLAND The Beginning
+FERM = Zoda's Revenge: StarTropics II
+FFVM = S.C.A.T.
 FFWP = Donkey Kong: Edizione Originale
 FFXP = Super Mario Brothers: Edizione Esclusiva per il 25° Anniversario
+JCCP = Kirby's Fun Pak
+JECM = CHRONO TRIGGER
+PCSL = DIGITAL CHAMP Battle Boxing
+QAPL = CASTLEVANIA RONDO OF BLOOD
+QAPP = CASTLEVANIA RONDO OF BLOOD
+SP4V = CASTLEVANIA RONDO OF BLOOD
+E55P = Wolf of the Battlefield: Commando
 HAAA = Canale Foto
 HAFP = Canale Meteo
 HAGE = Canale Notizie

diff --git a/Data/Sys/wiitdb-ja.txt b/Data/Sys/wiitdb-ja.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: JA_unique version: 20180527221353)
+TITLES = https://www.gametdb.com (type: Wii language: JA_unique version: 20190127013900)
 D2AJAF = みんなで冒険!ファミリートレーナー 体験版
 DCHJAF = WE CHEER
 DHHJ8J = 平野綾 Premiumムービーディスク from 涼宮ハルヒの激動
@@ -508,7 +508,6 @@ GVS45J = バーチャストライカー4
 R8FJSC = 匠レストランは大繁盛！
 RMCJ12 = マリオカートWii カスタム(2011-11 Wiimm)
 RYAJSC = ヤッターマンWii ビックリドッキリマシンで猛レースだコロン
-FFXJ = 25th スーパーマリオブラザーズ
 W34J = @SIMPLEシリーズ Vol.4 THE 密室からの脱出
 W42J = F･O･R･T･U･N･E フォーチュン～星のふりそそぐ丘～
 WA2J = みんなでパズループ
@@ -535,6 +534,7 @@ WTBJ = ファンタジックタンバリン FANTASIC TAMBOURINE
 WZJJ = @ SIMPLEシリーズ Vol.5 THE 柔道
 WZPJ = ゾンビ　イン　ワンダーランド
 FB2J = スーパーマリオブラザーズ２
+FFXJ = 25th スーパーマリオブラザーズ
 MBIJ = ランドストーカー 皇帝の財宝
 HADJ = インターネットチャンネル
 HAFJ = お天気チャンネル
@@ -587,12 +587,11 @@ GALJ01 = 大乱闘スマッシュブラザーズDX
 GASJ8P = ソニックアドベンチャー デラックス
 GAUJ08 = アウトモデリスタ U.S.-tuned
 GAZJ13 = ハリー・ポッターとアズカバンの囚人
-GAZJ69 = ハリー・ポッターとアズカバンの囚人
 GB2J18 = ボンバーマンランド2 ゲーム史上最大のテーマパーク
 GBGJ18 = ボンバーマンジェネレーション
 GBHJC8 = バトル封神
 GBIJ08 = バイオハザード
-GBMJ7F = バットマン ダークトゥモロー
+GBMJ28 = バットマン ダークトゥモロー
 GBNJC0 = ウォーリアーブレイド　ラスタンvsバーバリアン編
 GBPJCM = THE BASEBALL 2003 バトルボールパーク宣言 パーフェクトプレープロ野球
 GBRJ18 = ブラッディ ロア エクストリーム
@@ -632,17 +631,14 @@ GEOJ08 = CAPCOM VS SNK 2 EO: ミリオネアファイティング2001
 GESJA4 = エヴォリューションスケートボーディング
 GEVJ0M = 神機世界エヴォルシア
 GEYJ13 = ファイトナイト　ラウンド２
-GEYJ69 = ファイトナイト　ラウンド２
 GF7J01 = スターフォックス アサルト
 GFAJ13 = FIFAヨーロッパサッカー2003
-GFAJ69 = FIFAヨーロッパサッカー2003
 GFEJ01 = ファイアーエムブレム 蒼炎の軌跡
 GFGJA4 = フロッガー
 GFIJ13 = 2002FIFAワールドカップ
 GFMJAF = ファミリースタジアム2003
 GFNJG2 = ファインディング・ニモ
 GFSJ13 = FIFA 2002 ロード・トゥ・FIFAワールドカップ
-GFSJ69 = FIFA 2002 ロード・トゥ・FIFAワールドカップ
 GFTJ01 = マリオゴルフ ファミリーツアー
 GFZJ01 = エフゼロ GX
 GG4J08 = ガチャフォース
@@ -656,14 +652,11 @@ GGSJA4 = メタルギアソリッド ザ・ツインスネークス
 GGTJ01 = ちびロボ！
 GGZJB2 = マダガスカル
 GH4J13 = ハリー・ポッターと炎のゴブレット
-GH4J69 = ハリーポッターと炎のゴブレット
 GHAJ08 = バイオハザード2
 GHCJG9 = チキン・リトル
 GHEJ91 = ホームランド
 GHLJ13 = ハリー・ポッターと賢者の石
-GHLJ69 = ハリー・ポッターと賢者の石
 GHSJ13 = ハリー・ポッターと秘密の部屋
-GHSJ69 = ハリーポッターと秘密の部屋
 GHTJA4 = ヒカルの碁3
 GI2J18 = 桃太郎電鉄12(西日本編もありまっせー!)
 GICJG9 = Ｍｒ．インクレディブル
@@ -690,7 +683,6 @@ GKFJ8P = カオスフィールド エクスパンデッド
 GKGJ01 = ドンキーコンガ
 GKJJ78 = カーズ
 GKLJ13 = ロード・オブ・ザ・リング／王の帰還
-GKLJ69 = ロード・オブ・ザ・リング／王の帰還
 GKNJB2 = キン肉マンII世 新世代超人VS伝説超人
 GKPJA4 = 実況パワフルプロ野球12
 GKQJ01 = くるりんスカッシュ!
@@ -720,7 +712,6 @@ GNBJ01 = NBAコートサイド2002
 GNDJ13 = ニード・フォー・スピード アンダーグラウンド
 GNRJDA = NARUTO-ナルト-激闘忍者大戦！
 GNSJ13 = ＮＢＡストリート
-GNSJ69 = ＮＢＡストリート
 GNUJDA = NARUTO－ナルト－ 激闘忍者大戦！2
 GODJGA = 四国巡礼体験ゲーム お遍路さん 〜発心の道場（阿波国編）〜
 GOGJB2 = ONE PIECE グランドバトル！3
@@ -730,7 +721,6 @@ GOOJ01 = 大玉
 GOPJB2 = ワンピース グラバト! ラッシュ
 GOTJB2 = From TV animation ONE PIECE トレジャーバトル!
 GOWJ13 = ニード・フォー・スピード モスト・ウォンテッド
-GOWJ69 = ニード・フォー・スピード モスト・ウォンテッド
 GP4J18 = ハドソン セレクション Vol.3 PC原人
 GP5J01 = マリオパーティ 5
 GP6J01 = マリオパーティ6
@@ -750,7 +740,6 @@ GPZJ01 = NINTENDO パズルコレクション
 GQAJA7 = チョロQ!
 GQRJ18 = ハドソンセレクションVol.1 キュービックロードランナー
 GQWJ13 = ハリー・ポッター　クイディッチ・ワールドカップ
-GQWJ69 = ハリー・ポッター　クイディッチ・ワールドカップ
 GQZJ01 = 伝説のクイズ王決定戦
 GR2JCQ = ＲＵＮＥ２～コルテンの鍵の秘密～
 GR5J1K = ロボコップ 新たなる危機
@@ -769,7 +758,6 @@ GSMJ08 = スパイダーマン
 GSOJ8P = ソニック メガコレクション
 GSSJ8P = セガ サッカースラム
 GSTJ13 = SSX トリッキー
-GSTJ69 = SSX トリッキー
 GSWJ64 = スター・ウォーズ ローグ スコードロン２
 GSXJ13 = スター・ウォーズ クローン戦争
 GT2J18 = 天外魔境II MANJIMARU
@@ -809,7 +797,6 @@ GXBJ13 = SSX3
 GXCJ01 = カスタムロボ バトルレボリューション
 GXEJ8P = ソニックライダーズ
 GXOJ13 = SSX On Tour with マリオ
-GXOJ69 = SSX On Tour with マリオ
 GXRJ08 = ロックマンＸ コマンドミッション
 GXXJ01 = ポケモンXD 闇の旋風ダーク・ルギア
 GY2J01 = ドンキーコンガ2 ヒットソングパレード

diff --git a/Data/Sys/wiitdb-ko.txt b/Data/Sys/wiitdb-ko.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: KO_unique version: 20180527221400)
+TITLES = https://www.gametdb.com (type: Wii language: KO_unique version: 20190127013907)
 R2PKZ4 = 스윙골프 팡야 2nd 샷!
 R4CK69 = 심시티 나만의 도시
 R4QK01 = 마리오 파워 사커
@@ -58,7 +58,7 @@ RWSK01 = 마리오와 소닉 베이징 올림픽
 RX9K69 = 니드포스피드 언더커버
 RY2K41 = 래이맨 엽기토끼 2
 RY3K41 = 래이맨 엽기토끼 TV파티
-RYKKAF = 패밀리 스키 & 스노보드
+RYKK01 = 패밀리 스키 & 스노보드
 RYWK01 = Wii로 다함께! 말랑말랑 두뇌교실
 RZDK01 = 젤다의 전설- 황혼의 공주
 RZPK01 = 링크의 사격트레이닝
@@ -75,11 +75,12 @@ SK6KJD = 케이팝 댄스 페스티벌
 SMNK01 = 뉴 슈퍼 마리오브라더스 Wii
 SOMK01 = 리듬 세상 Wii
 SOUK01 = 젤다의 전설 스카이워드 소드
-SROKQC = 천공의 기사 로데아
+SROKZ5 = 천공의 기사 로데아
 SSQE01 = 마리오 파티 9
 SSQJ01 = 마리오 파티 9
 SSQK01 = 마리오 파티 9
 SSQP01 = 마리오 파티 9
 SUKK01 = 별의 커비
 SUPK01 = wii 파티
-SVMK01 = 슈퍼 마리오 25주년 스페셜 에디션
+SVMK01 = 슈퍼 마리오 컬렉션
+GIJKC0 = 스페이스 레이더스
diff --git a/Data/Sys/wiitdb-nl.txt b/Data/Sys/wiitdb-nl.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: NL_unique version: 20180527221407)
+TITLES = https://www.gametdb.com (type: Wii language: NL_unique version: 20190127013913)
 R23P52 = Barbie en De Drie Musketiers
 R25PWR = LEGO Harry Potter: Jaren 1-4
 R27X54 = Dora redt het Land van Kristal
@@ -181,6 +181,7 @@ SHDP52 = Hoe Tem Je Een Draak
 SIAP52 = Ice Age 4: Continental Drift
 SIIP8P = Mario & Sonic op de Olympische Spelen – Londen 2012
 SJ2PWR = Scooby-Doo! En Het Spookmoeras
+SJXD41 = Just Dance 4
 SK4P52 = Shrek Voor Eeuwig En Altijd
 SLHPWR = LEGO Harry Potter: Jaren 5-7
 SM4PXT = Monster Trucks

diff --git a/Data/Sys/wiitdb-pt.txt b/Data/Sys/wiitdb-pt.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: PT_unique version: 20180527221413)
+TITLES = https://www.gametdb.com (type: Wii language: PT_unique version: 20190127013920)
 R42P69 = Os SIMS 2: Naufragos
 R43P69 = EA Sports Active
 R4PP69 = Os SIMS 2: Animais de Estimação

diff --git a/Data/Sys/wiitdb-ru.txt b/Data/Sys/wiitdb-ru.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: RU_unique version: 20180527221420)
+TITLES = https://www.gametdb.com (type: Wii language: RU_unique version: 20190127013926)
 R5IR4Q = История игрушек: Парк развлечений
 RN4P41 = Anno: Create A New World
 RWAR78 = Валл-И

diff --git a/Data/Sys/wiitdb-zh_CN.txt b/Data/Sys/wiitdb-zh_CN.txt
@@ -1,11 +1,11 @@
-TITLES = https://www.gametdb.com (type: Wii language: ZHCN_unique version: 20180527221426)
+TITLES = https://www.gametdb.com (type: Wii language: ZHCN_unique version: 20190127013933)
 410E01 = Wii 备份盘 v1.31(美)
 D2AJAF = 运动生活 探险家 试玩版(日)
 D2SE18 = 德卡运动会2 试玩版(美)
 D3DE18 = 德卡运动会3 试玩版(美)
 DASE4Q = 米老鼠传奇 试玩版(美)
-DAXE01 = 萨尔达传说 天空之剑 试玩版(欧)
-DAXP01 = 萨尔达传说 天空之剑 试玩版(欧)
+DAXE01 = 塞尔达传说 天空之剑 试玩版(欧)
+DAXP01 = 塞尔达传说 天空之剑 试玩版(欧)
 DBBE18 = 金属战斗陀螺 对决大赛场 试玩版(美)
 DBKE69 = 轰炸方块 试玩版(美)
 DBKP69 = 轰炸方块 试玩版(欧)
@@ -413,7 +413,6 @@ R8NEA4 = 专业击球练习场[MP](美)
 R8NJG0 = 日本棒球机构承认 击球革命[MP](日)
 R8OE54 = 玲玲马戏团[平衡板](美)
 R8OX54 = 我的马戏团(X)
-R8PC01 = 超级纸片马里奥(简)
 R8PE01 = 超级纸片马里奥(美)
 R8PJ01 = 超级纸片马里奥(日)
 R8PK01 = 超级纸片马里奥(韩)
@@ -577,7 +576,7 @@ RC5JDQ = 扫除战队(日)
 RC7E20 = 与海怪同行 史前探险(美)
 RC7P7J = 与海怪同行 史前探险(欧)
 RC8E7D = 古惑狼 变异心灵(美)
-RC8P52 = 古惑 狼 变异 心灵 (欧)
+RC8P52 = 古惑狼 变异心灵(欧)
 RC8P7D = 古惑狼 变异心灵(欧)
 RC8X7D = 古惑狼 变异心灵(X)
 RC9PGN = 人偶CID(欧)
@@ -612,7 +611,6 @@ RCJP8P = 管道(欧)
 RCKPGN = 阿伦·汉森的运动挑战(欧)
 RCLE4Q = 四眼天鸡之动作天王(美)
 RCLP4Q = 四眼天鸡之动作天王(欧)
-RCOC99 = 名侦探柯南 追忆的幻想(汉化版)
 RCOJ99 = 名侦探柯南 追忆的幻想(日)
 RCOKZF = 名侦探柯南 追忆的幻想(韩)
 RCOPNP = 名侦探柯南 追忆的幻想(欧)
@@ -831,7 +829,7 @@ RFRJC0 = 摇摆回转公园(日)
 RFSEEB = 风来之西林3(美)
 RFSJ8P = 风来之西林3 机关屋沉睡公主(日)
 RFTE70 = 后院橄榄球(美)
-RFUJA4 = 麻将格斗俱乐部 对应 (日)
+RFUJA4 = 麻将格斗俱乐部 对应(日)
 RFVE52 = 淘气小猴 聚会时间(美)
 RFVP52 = 淘气小猴 聚会时间(欧)
 RFWE5Z = 野外探险 非洲(美)
@@ -1673,7 +1671,7 @@ RS3X52 = 蜘蛛侠3(X)
 RS4EXS = 式神之城3(美)
 RS4JJF = 式神之城3(日)
 RS4PXS = 式神之城3(欧)
-RS5EC8 = 战国无双KATANA(美)
+RS5EC8 = 战国无双 KATANA(美)
 RS5JC8 = 战国无双 KATANA(日)
 RS5PC8 = 战国无双 KATANA(欧)
 RS7J01 = 光速蒙面侠21 赛场上的最强战士(日)
@@ -2354,6 +2352,7 @@ SB6P52 = 爆丸 核心守护者(欧)
 SB8EQH = 汉堡博特(美)
 SB9E78 = 芭比娃娃 照顾小狗(美)
 SB9P78 = 芭比娃娃 照顾小狗(欧)
+SB9X78 = 芭比娃娃 照顾小狗(美)
 SBAJGD = 勇者斗恶龙 怪兽战斗之路 胜利(日)
 SBBE18 = 金属战斗陀螺 对决大赛场(美)
 SBBJ18 = 金属战斗陀螺 对决大赛场(日)
@@ -2652,6 +2651,7 @@ SHTE20 = 马修斯狩猎弓[MP](美)
 SHUE52 = 坎贝拉危险狩猎 2011 特别版(美)
 SHVE78 = 风火轮赛车 赛道攻击(美)
 SHVP78 = 风火轮赛车 赛道攻击(欧)
+SHVX78 = 风火轮赛车 赛道攻击(美)
 SHWE41 = 好莱坞广场(美)
 SHXEWR = 快乐大脚2(美)
 SHXPWR = 快乐大脚2(欧)
@@ -2750,11 +2750,11 @@ SKUE78 = 功夫熊猫2(美)
 SKUP78 = 功夫熊猫2(欧)
 SKVE20 = 凯文万达姆的大巴斯挑战(欧)
 SKXE20 = 海盗袭击(美)
-SKYE52 = 小龙斯派罗：巨人(美)
-SKYP52 = 小龙斯派罗：巨人(欧)
-SKYX52 = 小龙斯派罗：巨人(欧)
-SKYY52 = 小龙斯派罗：巨人(欧)
-SKYZ52 = 小龙斯派罗：巨人(欧)
+SKYE52 = 小龙斯派罗 巨人(美)
+SKYP52 = 小龙斯派罗 巨人(欧)
+SKYX52 = 小龙斯派罗 巨人(欧)
+SKYY52 = 小龙斯派罗 巨人(欧)
+SKYZ52 = 小龙斯派罗 巨人(欧)
 SKZE52 = 梦工厂超级明星赛(美)
 SKZP52 = 梦工厂超级明星赛(欧)
 SL2J01 = 零 ~ 真红之蝶(日)
@@ -2900,10 +2900,10 @@ SONFMR = 我的第一首卡拉OK(法)
 SONPMR = 我的第一首卡拉OK(欧)
 SOSEG9 = 极速蜗牛 超级特技队(美)
 SOTE52 = 失败比赛(美)
-SOUE01 = 萨尔达传说 天空之剑(美)
-SOUJ01 = 萨尔达传说 天空之剑(日或中)
-SOUK01 = 萨尔达传说 天空之剑(韩)
-SOUP01 = 萨尔达传说 天空之剑(欧)
+SOUE01 = 塞尔达传说 天空之剑(美)
+SOUJ01 = 塞尔达传说 天空之剑(日或中)
+SOUK01 = 塞尔达传说 天空之剑(韩)
+SOUP01 = 塞尔达传说 天空之剑(欧)
 SP2E01 = Wii运动+Wii运动 度假胜地(欧)
 SP2P01 = Wii运动+Wii运动 度假胜地(欧)
 SP3E41 = 百万美金金字塔(美)
@@ -2955,6 +2955,8 @@ SQLPGN = 卡通频道大乱斗
 SQME52 = 蜘蛛侠 时间边缘(美)
 SQMP52 = 蜘蛛侠 时间裂痕(欧)
 SQPPX4 = 速度2(欧)
+SQQEVZ = 飞机总动员 火线救援(美)
+SQQPVZ = 飞机总动员 火线救援(欧)
 SQUDX3 = 测验派对(欧)
 SQUFX3 = 测验派对(欧)
 SQUPX3 = 测验派对(欧)
@@ -3209,8 +3211,7 @@ SZAE69 = 摇滚乐团2(美)
 SZAP69 = 摇滚乐团2(欧)
 SZBE69 = 摇滚乐团3(美)
 SZBP69 = 摇滚乐团3(欧)
-010E01 = Wii 备份盘 v1.31(美)
-AMNE01 = 自制 另一个超级马里奥兄弟(美)
+AMNE01 = 自制 另一个超级马里奥兄弟Wii(美)
 AMOR04 = 自制 吉他英雄3 HARDcore(欧)
 APRP01 = 自制 ANDY AFRO的复古自制(欧)
 APRP02 = 自制 ANDY AFRO的新超级马里奥兄弟 混搭X 第三辑(欧)
@@ -3367,7 +3368,9 @@ R15POH = 自制 唱吧 Radio 105(欧)
 R4ZE01 = 自制 零月蚀之假面(美)
 R4ZP01 = 自制 零月蚀之假面(美)
 R8FJSC = 匠餐厅大繁盛！ 简体中文版
+R8PC01 = 超级纸片马里奥(简)
 RCCR78 = 自制 吉他英雄3 Coheed与Cambria(欧)
+RCOC99 = 名侦探柯南 追忆的幻想(汉化版)
 RDUE01 = 自制 DU超级马里奥兄弟 寻找公主(美)
 RG0E52 = 自制 吉他英雄 年轻岁月 加强版(美)
 RG1552 = 自制 吉他英雄 Weird Al Yankovic(?)
@@ -3762,6 +3765,7 @@ G4ME69 = 模拟人生 纯属意外(美)
 G4OE69 = 模拟人生2 宠物(美)
 G4OP69 = 模拟人生2 宠物(欧)
 G8MP01 = 纸片马里奥 千年之门(欧)
+G8SJAF = D.O.N 大乱斗
 GBHJC8 = 战斗封神(日)
 GBZE08 = 生化危机0(美)
 GBZJ08 = 生化危机0(日)
@@ -3775,6 +3779,9 @@ GLEP08 = 生化危机3(欧)
 G4BE08 = 生化危机4(美)
 G4BJ08 = 生化危机4(日)
 G4BP08 = 生化危机4(欧)
+GCDE08 = 生化危机 代号维罗妮卡X(美)
+GCDJ08 = 生化危机 代号维罗妮卡X(日)
+GCDP08 = 生化危机 代号维罗妮卡X(欧)
 G4SE01 = 塞尔达传说 四剑历险(美)
 G4SJ01 = 塞尔达传说 四剑历险(日)
 G4SP01 = 塞尔达传说 四剑历险(欧)
@@ -3934,6 +3941,16 @@ GEDP01 = 永恒黑暗(欧)
 GXXE01 = 口袋妖怪XD 暗之旋风(美)
 GXXJ01 = 口袋妖怪XD 暗之旋风(日)
 GXXP01 = 口袋妖怪XD 暗之旋风(欧)
+GDED71 = 博德之门 黑暗联盟(德)
+GDEE71 = 博德之门 黑暗联盟(美)
+GDEF71 = 博德之门 黑暗联盟(法)
+GDEP71 = 博德之门 黑暗联盟(欧)
+GM4E01 = 马里奥赛车 双重冲击(美)
+GM4J01 = 马里奥赛车 双重冲击(日)
+GM4P01 = 马里奥赛车 双重冲击(欧)
+GFEE01 = 火焰之纹章 苍炎之轨迹(美)
+GFEJ01 = 火焰之纹章 苍炎之轨迹(日)
+GFEP01 = 火焰之纹章 苍炎之轨迹(欧)
 NACE = 塞尔达传说 时之笛(美)
 NACJ = 塞尔达传说 时之笛(日)
 NACP = 塞尔达传说 时之笛(欧)

diff --git a/Data/Sys/wiitdb-zh_TW.txt b/Data/Sys/wiitdb-zh_TW.txt
@@ -1,4 +1,4 @@
-TITLES = https://www.gametdb.com (type: Wii language: ZHTW_unique version: 20180527221434)
+TITLES = https://www.gametdb.com (type: Wii language: ZHTW_unique version: 20190127013940)
 410E01 = Wii 備份光碟 v1.31(美)
 D2AJAF = 運動生活 探險家 試玩版(日)
 D2SE18 = 運動大集錦2 試玩版(美)
@@ -413,7 +413,6 @@ R8NEA4 = 擊打革命[MP](美)
 R8NJG0 = 日本棒球機構承認 擊球革命[MP](日)
 R8OE54 = 玲玲馬戲團[平衡板](美)
 R8OX54 = 我的馬戲團(X)
-R8PC01 = 超級紙片瑪利歐(簡)
 R8PE01 = 超級紙片瑪利歐(美)
 R8PJ01 = 超級紙片瑪利歐(日)
 R8PK01 = 超級紙片瑪利歐(韓)
@@ -611,7 +610,6 @@ RCJP8P = 暗渠[WiFi](歐)
 RCKPGN = 阿倫·漢森的運動挑戰(歐)
 RCLE4Q = 四眼天雞之動作天王(美)
 RCLP4Q = 四眼天雞之動作天王(歐)
-RCOC99 = 名偵探柯南 追憶的幻想(ACG漢化簡體中文版)
 RCOJ99 = 名偵探柯南 追憶的幻想(日)
 RCOKZF = 名偵探柯南 追憶的幻想(韓)
 RCOPNP = 名偵探柯南 追憶的幻想(歐)
@@ -2353,6 +2351,7 @@ SB6P52 = 爆丸 核心守護者(歐)
 SB8EQH = 漢堡博特(美)
 SB9E78 = 芭比娃娃 照顧小狗(美)
 SB9P78 = 芭比娃娃 照顧小狗(歐)
+SB9X78 = 芭比娃娃 照顧小狗(美)
 SBAJGD = 勇者鬥惡龍 怪獸戰鬥之路 勝利(日)
 SBBE18 = 戰鬥陀螺 爆神須佐之男來襲(美)
 SBBJ18 = 戰鬥陀螺 對決大賽(日)
@@ -2649,6 +2648,7 @@ SHTE20 = 馬修斯狩獵弓[MP](美)
 SHUE52 = 坎貝拉危險狩獵 2011 特別版(美)
 SHVE78 = 風火輪賽車 賽道攻擊(美)
 SHVP78 = 風火輪賽車 賽道攻擊(歐)
+SHVX78 = 風火輪賽車 賽道攻擊(美)
 SHWE41 = 好萊塢廣場(美)
 SHXEWR = 快樂腳2(美)
 SHXPWR = 快樂腳2(歐)
@@ -3201,7 +3201,6 @@ SZAE69 = 搖滾樂隊2[WiFi](美)
 SZAP69 = 搖滾樂隊2[WiFi](歐)
 SZBE69 = 搖滾樂隊3(美)
 SZBP69 = 搖滾樂隊3(歐)
-010E01 = Wii 備份光碟 v1.31(美)
 AMNE01 = 另一個超級瑪利歐兄弟Wii(美)
 AMOR04 = 自製 吉他英雄3 HARDcore(歐)
 APRP01 = 自製 ANDY AFRO的復古自製(歐)
@@ -3279,7 +3278,6 @@ DQAJSC = 水瓶座棒球 (猫星汉化版)
 DRP22Q = 自制 唱吧 下載版(歐)
 FF4ENG = 零月蝕之假面(美)
 HBWE01 = 超級瑪利歐兄弟Wii Hellboy Edition(美)
-HITS41 = 只是跳舞点击
 KMKE01 = Kustom 瑪利歐賽車[WiFi](美)
 L40P4Q = 自制 唱吧 下載版(歐)
 MDUE01 = 瑪利歐賽車 Track Grand Priix[WiFi](美)
@@ -3299,6 +3297,8 @@ R02PEA = 自制 唱吧 下載版(歐)
 R15POH = 自製 唱吧 Radio 105(歐)
 R4ZE01 = 零月蝕之假面(美)
 R4ZP01 = 零月蝕之假面(美)
+R8PC01 = 超級紙片瑪利歐(簡)
+RCOC99 = 名偵探柯南 追憶的幻想(ACG漢化簡體中文版)
 RDUE01 = DU 超級瑪利歐兄弟 尋找公主(美)
 RG0E52 = 吉他英雄 年輕歲月 加強版(美)
 RG1552 = 自制 吉他英雄 怪人奧爾(?)

diff --git a/Externals/cubeb/CMakeLists.txt b/Externals/cubeb/CMakeLists.txt
@@ -167,7 +167,8 @@ endif()
 check_include_files(SLES/OpenSLES.h USE_OPENSL)
 if(USE_OPENSL)
   target_sources(cubeb PRIVATE
-    src/cubeb_opensl.c)
+    src/cubeb_opensl.c
+    src/cubeb-jni.cpp)
   target_compile_definitions(cubeb PRIVATE USE_OPENSL)
   target_link_libraries(cubeb PRIVATE OpenSLES)
 endif()

diff --git a/Externals/cubeb/include/cubeb/cubeb.h b/Externals/cubeb/include/cubeb/cubeb.h
@@ -53,12 +53,14 @@ extern "C" {
     output_params.format = CUBEB_SAMPLE_FLOAT32NE;
     output_params.rate = rate;
     output_params.channels = 2;
+    output_params.layout = CUBEB_LAYOUT_UNDEFINED;
     output_params.prefs = CUBEB_STREAM_PREF_NONE;
 
     cubeb_stream_params input_params;
     input_params.format = CUBEB_SAMPLE_FLOAT32NE;
     input_params.rate = rate;
     input_params.channels = 1;
+    input_params.layout = CUBEB_LAYOUT_UNDEFINED;
     input_params.prefs = CUBEB_STREAM_PREF_NONE;
 
     cubeb_stream * stm;
@@ -102,7 +104,7 @@ extern "C" {
 
       for (i = 0; i < nframes; ++i) {
         for (c = 0; c < 2; ++c) {
-          buf[i][c] = in[i];
+          out[i][c] = in[i];
         }
       }
       return nframes;

diff --git a/Externals/cubeb/src/cubeb_audiounit.cpp b/Externals/cubeb/src/cubeb_audiounit.cpp
@@ -1834,6 +1834,7 @@ static void audiounit_get_available_samplerate(AudioObjectID devid, AudioObjectP
                                    uint32_t * min, uint32_t * max, uint32_t * def);
 static int
 audiounit_create_device_from_hwdev(cubeb_device_info * dev_info, AudioObjectID devid, cubeb_device_type type);
+static void audiounit_device_destroy(cubeb_device_info * device);
 
 static void
 audiounit_workaround_for_airpod(cubeb_stream * stm)
@@ -1879,6 +1880,8 @@ audiounit_workaround_for_airpod(cubeb_stream * stm)
       LOG("Non fatal error, AudioObjectSetPropertyData/kAudioDevicePropertyNominalSampleRate, rv=%d", rv);
     }
   }
+  audiounit_device_destroy(&input_device_info);
+  audiounit_device_destroy(&output_device_info);
 }
 
 /*
@@ -3101,7 +3104,7 @@ int audiounit_stream_register_device_changed_callback(cubeb_stream * stream,
   auto_lock dev_cb_lock(stream->device_changed_callback_lock);
   /* Note: second register without unregister first causes 'nope' error.
    * Current implementation requires unregister before register a new cb. */
-  assert(!stream->device_changed_callback);
+  assert(!device_changed_callback || !stream->device_changed_callback);
   stream->device_changed_callback = device_changed_callback;
   return CUBEB_OK;
 }
@@ -3378,14 +3381,20 @@ audiounit_enumerate_devices(cubeb * /* context */, cubeb_device_type type,
   return CUBEB_OK;
 }
 
+static void
+audiounit_device_destroy(cubeb_device_info * device)
+{
+  delete [] device->device_id;
+  delete [] device->friendly_name;
+  delete [] device->vendor_name;
+}
+
 static int
 audiounit_device_collection_destroy(cubeb * /* context */,
                                     cubeb_device_collection * collection)
 {
   for (size_t i = 0; i < collection->count; i++) {
-    delete [] collection->device[i].device_id;
-    delete [] collection->device[i].friendly_name;
-    delete [] collection->device[i].vendor_name;
+    audiounit_device_destroy(&collection->device[i]);
   }
   delete [] collection->device;
 

diff --git a/Externals/cubeb/src/cubeb_pulse.c b/Externals/cubeb/src/cubeb_pulse.c
@@ -85,6 +85,7 @@
   X(pa_context_subscribe)                       \
   X(pa_mainloop_api_once)                       \
   X(pa_get_library_version)                     \
+  X(pa_channel_map_init_auto)                   \
 
 #define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x;
 LIBPULSE_API_VISIT(MAKE_TYPEDEF);
@@ -786,6 +787,25 @@ to_pulse_format(cubeb_sample_format format)
   }
 }
 
+static cubeb_channel_layout
+pulse_default_layout_for_channels(uint32_t ch)
+{
+  assert (ch > 0 && ch <= 8);
+  switch (ch) {
+    case 1: return CUBEB_LAYOUT_MONO;
+    case 2: return CUBEB_LAYOUT_STEREO;
+    case 3: return CUBEB_LAYOUT_3F;
+    case 4: return CUBEB_LAYOUT_QUAD;
+    case 5: return CUBEB_LAYOUT_3F2;
+    case 6: return CUBEB_LAYOUT_3F_LFE |
+                   CHANNEL_SIDE_LEFT | CHANNEL_SIDE_RIGHT;
+    case 7: return CUBEB_LAYOUT_3F3R_LFE;
+    case 8: return CUBEB_LAYOUT_3F4_LFE;
+  }
+  // Never get here!
+  return CUBEB_LAYOUT_UNDEFINED;
+}
+
 static int
 create_pa_stream(cubeb_stream * stm,
                  pa_stream ** pa_stm,
@@ -809,7 +829,16 @@ create_pa_stream(cubeb_stream * stm,
   ss.channels = stream_params->channels;
 
   if (stream_params->layout == CUBEB_LAYOUT_UNDEFINED) {
-    *pa_stm = WRAP(pa_stream_new)(stm->context->context, stream_name, &ss, NULL);
+    pa_channel_map cm;
+    if (stream_params->channels <= 8 &&
+       !WRAP(pa_channel_map_init_auto)(&cm, stream_params->channels, PA_CHANNEL_MAP_DEFAULT)) {
+      LOG("Layout undefined and PulseAudio's default layout has not been configured, guess one.");
+      layout_to_channel_map(pulse_default_layout_for_channels(stream_params->channels), &cm);
+      *pa_stm = WRAP(pa_stream_new)(stm->context->context, stream_name, &ss, &cm);
+    } else {
+      LOG("Layout undefined, PulseAudio will use its default.");
+      *pa_stm = WRAP(pa_stream_new)(stm->context->context, stream_name, &ss, NULL);
+    }
   } else {
     pa_channel_map cm;
     layout_to_channel_map(stream_params->layout, &cm);

diff --git a/Externals/cubeb/src/cubeb_wasapi.cpp b/Externals/cubeb/src/cubeb_wasapi.cpp
diff --git a/Externals/ed25519/CMakeLists.txt b/Externals/ed25519/CMakeLists.txt
@@ -0,0 +1,13 @@
+project(ed25519 C)
+
+add_library(ed25519
+  add_scalar.c
+  ge.c
+  keypair.c
+  seed.c
+  sign.c
+  fe.c
+  key_exchange.c
+  sc.c
+  sha512.c
+  verify.c)
diff --git a/Externals/soundtouch/AAFilter.cpp b/Externals/soundtouch/AAFilter.cpp
@@ -68,7 +68,6 @@ using namespace soundtouch;
     #define _DEBUG_SAVE_AAFIR_COEFFS(x, y)
 #endif
 
-
 /*****************************************************************************
  *
  * Implementation of the class 'AAFilter'
@@ -83,14 +82,12 @@ AAFilter::AAFilter(uint len)
 }
 
 
-
 AAFilter::~AAFilter()
 {
     delete pFIR;
 }
 
 
-
 // Sets new anti-alias filter cut-off edge frequency, scaled to
 // sampling frequency (nyquist frequency = 0.5).
 // The filter will cut frequencies higher than the given frequency.
@@ -101,7 +98,6 @@ void AAFilter::setCutoffFreq(double newCutoffFreq)
 }
 
 
-
 // Sets number of FIR filter taps
 void AAFilter::setLength(uint newLength)
 {
@@ -110,7 +106,6 @@ void AAFilter::setLength(uint newLength)
 }
 
 
-
 // Calculates coefficients for a low-pass FIR filter using Hamming window
 void AAFilter::calculateCoeffs()
 {
@@ -170,12 +165,10 @@ void AAFilter::calculateCoeffs()
     for (i = 0; i < length; i ++) 
     {
         temp = work[i] * scaleCoeff;
-//#if SOUNDTOUCH_INTEGER_SAMPLES
         // scale & round to nearest integer
         temp += (temp >= 0) ? 0.5 : -0.5;
         // ensure no overfloods
         assert(temp >= -32768 && temp <= 32767);
-//#endif
         coeffs[i] = (SAMPLETYPE)temp;
     }
 

diff --git a/Externals/soundtouch/BPMDetect.cpp b/Externals/soundtouch/BPMDetect.cpp
@@ -186,8 +186,10 @@ BPMDetect::BPMDetect(int numChannels, int aSampleRate) :
 
     // choose decimation factor so that result is approx. 1000 Hz
     decimateBy = sampleRate / TARGET_SRATE;
-    assert(decimateBy > 0);
-    assert(INPUT_BLOCK_SIZE < decimateBy * DECIMATED_BLOCK_SIZE);
+    if ((decimateBy <= 0) || (decimateBy * DECIMATED_BLOCK_SIZE < INPUT_BLOCK_SIZE))
+    {
+        ST_THROW_RT_ERROR("Too small samplerate");
+    }
 
     // Calculate window length & starting item according to desired min & max bpms
     windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
@@ -311,7 +313,7 @@ void BPMDetect::updateXCorr(int process_samples)
     #pragma omp parallel for
     for (offs = windowStart; offs < windowLen; offs ++) 
     {
-        double sum;
+        float sum;
         int i;
 
         sum = 0;
@@ -339,7 +341,6 @@ void BPMDetect::updateBeatPos(int process_samples)
     //    static double thr = 0.0003;
     double posScale = (double)this->decimateBy / (double)this->sampleRate;
     int resetDur = (int)(0.12 / posScale + 0.5);
-    double corrScale = 1.0 / (double)(windowLen - windowStart);
 
     // prescale pbuffer
     float tmp[XCORR_UPDATE_SEQUENCE / 2];
@@ -351,7 +352,7 @@ void BPMDetect::updateBeatPos(int process_samples)
     #pragma omp parallel for
     for (int offs = windowStart; offs < windowLen; offs++)
     {
-        double sum = 0;
+        float sum = 0;
         for (int i = 0; i < process_samples; i++)
         {
             sum += tmp[i] * pBuffer[offs + i];

diff --git a/Externals/soundtouch/BPMDetect.h b/Externals/soundtouch/BPMDetect.h
@@ -66,7 +66,6 @@ namespace soundtouch
     /// Maximum allowed BPM rate range. Used to restrict accepted result below a reasonable limit.
     #define MAX_BPM_VALID 190
 
-
 ////////////////////////////////////////////////////////////////////////////////
 
     typedef struct
@@ -184,15 +183,13 @@ namespace soundtouch
             int numSamples                            ///< Number of samples in buffer
         );
 
-
         /// Analyzes the results and returns the BPM rate. Use this function to read result
         /// after whole song data has been input to the class by consecutive calls of
         /// 'inputSamples' function.
         ///
         /// \return Beats-per-minute rate, or zero if detection failed.
         float getBpm();
 
-
         /// Get beat position arrays. Note: The array includes also really low beat detection values 
         /// in absence of clear strong beats. Consumer may wish to filter low values away.
         /// - "pos" receive array of beat positions

diff --git a/Externals/soundtouch/FIFOSampleBuffer.cpp b/Externals/soundtouch/FIFOSampleBuffer.cpp
@@ -265,4 +265,3 @@ uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples)
     }
     return samplesInBuffer;
 }
-
diff --git a/Externals/soundtouch/FIFOSamplePipe.h b/Externals/soundtouch/FIFOSamplePipe.h
@@ -127,7 +127,6 @@ class FIFOSamplePipe
 };
 
 
-
 /// Base-class for sound processing routines working in FIFO principle. With this base 
 /// class it's easy to implement sound processing stages that can be chained together,
 /// so that samples that are fed into beginning of the pipe automatically go through 
@@ -150,29 +149,25 @@ class FIFOProcessor :public FIFOSamplePipe
         output = pOutput;
     }
 
-
     /// Constructor. Doesn't define output pipe; it has to be set be 
     /// 'setOutPipe' function.
     FIFOProcessor()
     {
         output = NULL;
     }
 
-
     /// Constructor. Configures output pipe.
     FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.
                  )
     {
         output = pOutput;
     }
 
-
     /// Destructor.
     virtual ~FIFOProcessor()
     {
     }
 
-
     /// Returns a pointer to the beginning of the output samples. 
     /// This function is provided for accessing the output samples directly. 
     /// Please be careful for not to corrupt the book-keeping!
@@ -199,7 +194,6 @@ class FIFOProcessor :public FIFOSamplePipe
         return output->receiveSamples(outBuffer, maxSamples);
     }
 
-
     /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
     /// sample buffer without copying them anywhere. 
     ///
@@ -211,14 +205,12 @@ class FIFOProcessor :public FIFOSamplePipe
         return output->receiveSamples(maxSamples);
     }
 
-
     /// Returns number of samples currently available.
     virtual uint numSamples() const
     {
         return output->numSamples();
     }
 
-
     /// Returns nonzero if there aren't any samples available for outputting.
     virtual int isEmpty() const
     {
@@ -231,7 +223,6 @@ class FIFOProcessor :public FIFOSamplePipe
     {
         return output->adjustAmountOfSamples(numSamples);
     }
-
 };
 
 }

diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp
@@ -68,6 +68,7 @@ FIRFilter::~FIRFilter()
     delete[] filterCoeffs;
 }
 
+
 // Usual C-version of the filter routine for stereo sound
 uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
 {
@@ -126,8 +127,6 @@ uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, ui
 }
 
 
-
-
 // Usual C-version of the filter routine for mono sound
 uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
 {
@@ -253,7 +252,6 @@ uint FIRFilter::getLength() const
 }
 
 
-
 // Applies the filter to the given sequence of samples. 
 //
 // Note : The amount of outputted samples is by value of 'filter_length' 
@@ -283,7 +281,6 @@ uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSample
 }
 
 
-
 // Operator 'new' is overloaded so that it automatically creates a suitable instance 
 // depending on if we've a MMX-capable CPU available or not.
 void * FIRFilter::operator new(size_t s)

diff --git a/Externals/soundtouch/FIRFilter.h b/Externals/soundtouch/FIRFilter.h
@@ -110,7 +110,7 @@ class FIRFilter
         FIRFilterMMX();
         ~FIRFilterMMX();
 
-        virtual void setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor);
+        virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor);
     };
 
 #endif // SOUNDTOUCH_ALLOW_MMX
@@ -129,7 +129,7 @@ class FIRFilter
         FIRFilterSSE();
         ~FIRFilterSSE();
 
-        virtual void setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor);
+        virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor);
     };
 
 #endif // SOUNDTOUCH_ALLOW_SSE

diff --git a/Externals/soundtouch/PeakFinder.cpp b/Externals/soundtouch/PeakFinder.cpp
@@ -57,7 +57,7 @@ int PeakFinder::findTop(const float *data, int peakpos) const
 
     refvalue = data[peakpos];
 
-    // seek within �10 points
+    // seek within �10 points
     start = peakpos - 10;
     if (start < minPos) start = minPos;
     end = peakpos + 10;
@@ -142,7 +142,7 @@ int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, i
     peaklevel = data[peakpos];
     assert(peaklevel >= level);
     pos = peakpos;
-    while ((pos >= minPos) && (pos < maxPos))
+    while ((pos >= minPos) && (pos + direction < maxPos))
     {
         if (data[pos + direction] < level) return pos;   // crossing found
         pos += direction;
@@ -171,7 +171,6 @@ double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos)
 }
 
 
-
 /// get exact center of peak near given position by calculating local mass of center
 double PeakFinder::getPeakCenter(const float *data, int peakpos) const
 {
@@ -211,7 +210,6 @@ double PeakFinder::getPeakCenter(const float *data, int peakpos) const
 }
 
 
-
 double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) 
 {
 
@@ -258,7 +256,7 @@ double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos)
 
         // accept harmonic peak if 
         // (a) it is found
-        // (b) is within �4% of the expected harmonic interval
+        // (b) is within �4% of the expected harmonic interval
         // (c) has at least half x-corr value of the max. peak
 
         double diff = harmonic * peaktmp / highPeak;

diff --git a/Externals/soundtouch/RateTransposer.cpp b/Externals/soundtouch/RateTransposer.cpp
@@ -64,15 +64,13 @@ RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
 }
 
 
-
 RateTransposer::~RateTransposer()
 {
     delete pAAFilter;
     delete pTransposer;
 }
 
 
-
 /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
 void RateTransposer::enableAAFilter(bool newMode)
 {
@@ -96,7 +94,6 @@ AAFilter *RateTransposer::getAAFilter()
 }
 
 
-
 // Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
 // iRate, larger faster iRates.
 void RateTransposer::setRate(double newRate)

diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h
@@ -55,7 +55,7 @@ typedef unsigned long   ulong;
 #define ST_NO_EXCEPTION_HANDLING 1
 #define SOUNDTOUCH_INTEGER_SAMPLES 1
 #ifdef _WIN32
-#define SOUNDTOUCH_ALLOW_SSE
+//#define SOUNDTOUCH_ALLOW_SSE
 //#define SOUNDTOUCH_ALLOW_MMX
 #endif
 

diff --git a/Externals/soundtouch/SoundTouch.h b/Externals/soundtouch/SoundTouch.h
@@ -72,10 +72,10 @@ namespace soundtouch
 {
 
 /// Soundtouch library version string
-#define SOUNDTOUCH_VERSION          "2.1pre"
+#define SOUNDTOUCH_VERSION          "2.1.3"
 
 /// SoundTouch library version id
-#define SOUNDTOUCH_VERSION_ID       (20009)
+#define SOUNDTOUCH_VERSION_ID       (20103)
 
 //
 // Available setting IDs for the 'setSetting' & 'get_setting' functions:

diff --git a/Externals/soundtouch/TDStretch.h b/Externals/soundtouch/TDStretch.h
@@ -157,7 +157,6 @@ class TDStretch : public FIFOProcessor
     void calcSeqParameters();
     void adaptNormalizer();
 
-
     /// Changes the tempo of the given sound samples.
     /// Returns amount of samples returned in the "output" buffer.
     /// The maximum amount of samples that can be returned at a time is set by
@@ -242,7 +241,6 @@ class TDStretch : public FIFOProcessor
         return seekWindowLength - overlapLength;
     }
 
-
 	/// return approximate initial input-output latency
 	int getLatency() const
 	{
@@ -251,7 +249,6 @@ class TDStretch : public FIFOProcessor
 };
 
 
-
 // Implementation-specific class declarations:
 
 #ifdef SOUNDTOUCH_ALLOW_MMX

diff --git a/Externals/soundtouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp
@@ -68,7 +68,6 @@ void disableExtensions(uint dwDisableMask)
 }
 
 
-
 /// Checks which instruction set extensions are supported by the CPU.
 uint detectCPUextensions(void)
 {

diff --git a/Externals/soundtouch/mmx_optimized.cpp b/Externals/soundtouch/mmx_optimized.cpp
@@ -217,7 +217,6 @@ void TDStretchMMX::clearCrossCorrState()
 }
 
 
-
 // MMX-optimized version of the function overlapStereo
 void TDStretchMMX::overlapStereo(short *output, const short *input) const
 {
@@ -307,7 +306,7 @@ FIRFilterMMX::~FIRFilterMMX()
 
 
 // (overloaded) Calculates filter coefficients for MMX routine
-void FIRFilterMMX::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
+void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor)
 {
     uint i;
     FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
@@ -333,7 +332,6 @@ void FIRFilterMMX::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uin
 }
 
 
-
 // mmx-optimized version of the filter routine for stereo sound
 uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const
 {

diff --git a/Externals/soundtouch/sse_optimized.cpp b/Externals/soundtouch/sse_optimized.cpp
@@ -209,7 +209,7 @@ FIRFilterSSE::~FIRFilterSSE()
 
 
 // (overloaded) Calculates filter coefficients for SSE routine
-void FIRFilterSSE::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
+void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor)
 {
     uint i;
     float fDivider;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@

		[Video_Settings]
		SafeTextureCacheColorSamples = 0
		SuggestedAspectRatio = 2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -265,4 +265,3 @@ uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples)
		}
		return samplesInBuffer;
		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,6 @@ void disableExtensions(uint dwDisableMask) @@
     }
     /// Checks which instruction set extensions are supported by the CPU.
     uint detectCPUextensions(void)
     {
@@ Expand Down @@