Merge pull request #14614 from jordan-woyak/gamesettings-metroid-prime

GameSettings: Disable EFBToTexture for "Metroid Prime 2: Dark Echoes (Wii)" to fix the scan visor.

10 files changed, 21 insertions, 60 deletions

diff --git a/Data/Sys/GameSettings/G2M.ini b/Data/Sys/GameSettings/G2M.ini
index f5a38f6cd9..571ee55c96 100644
--- a/Data/Sys/GameSettings/G2M.ini
+++ b/Data/Sys/GameSettings/G2M.ini
@@ -1,23 +1,16 @@
 # G2ME01, G2MJ01, G2MP01 - Metroid Prime 2: Echoes
 
 [Core]
-# Values set here will override the main Dolphin settings.
 CPUThread = False
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 SuggestedAspectRatio = 2
 
 # Because the minimap has a lot of unused triangles, 
 # CPU Cull can greatly speed up demanding areas of the game.
-
 CPUCull = True
 
 [Video_Hacks]
+# Required for "scan visor" to work.
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini
index 0f4be18f10..ef294b6aa5 100644
--- a/Data/Sys/GameSettings/G2ME01.ini
+++ b/Data/Sys/GameSettings/G2ME01.ini
@@ -1,10 +1,6 @@
 # G2ME01 - Metroid Prime 2: Echoes
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
 [ActionReplay]
-# Add action replay cheats here.
 $This Code Must Be On!
 043BC410 906D0000
 043BC414 88030004
diff --git a/Data/Sys/GameSettings/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini
index d337364735..1d9069a814 100644
--- a/Data/Sys/GameSettings/G2MP01.ini
+++ b/Data/Sys/GameSettings/G2MP01.ini
@@ -1,10 +1,6 @@
 # G2MP01 - Metroid Prime 2: Echoes
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
 [ActionReplay]
-# Add action replay cheats here.
 $Infinite Health
 423DDE0C 000A44BB
 423DDE0C 000B6000
diff --git a/Data/Sys/GameSettings/GM8.ini b/Data/Sys/GameSettings/GM8.ini
index 2d79111518..bf0c4444d6 100644
--- a/Data/Sys/GameSettings/GM8.ini
+++ b/Data/Sys/GameSettings/GM8.ini
@@ -1,21 +1,9 @@
 # GM8E01, GM8J01, GM8P01 - Metroid Prime
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 SuggestedAspectRatio = 2
 
 # Because the minimap has a lot of unused triangles, 
 # CPU Cull can greatly speed up demanding areas of the game.
-
 CPUCull = True
-
-[Video_Hacks]
diff --git a/Data/Sys/GameSettings/GM8E01.ini b/Data/Sys/GameSettings/GM8E01.ini
index 32f0f1c2b0..76a050abc6 100644
--- a/Data/Sys/GameSettings/GM8E01.ini
+++ b/Data/Sys/GameSettings/GM8E01.ini
@@ -1,10 +1,6 @@
 # GM8E01 - Metroid Prime
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
 [ActionReplay]
-# Add action replay cheats here.
 $This Code Must Be On
 043CB1A8 3C808000
 043CB1AC 93E4183C
diff --git a/Data/Sys/GameSettings/P2M.ini b/Data/Sys/GameSettings/P2M.ini
index 7a633d6403..49646787ea 100644
--- a/Data/Sys/GameSettings/P2M.ini
+++ b/Data/Sys/GameSettings/P2M.ini
@@ -1,17 +1,11 @@
 # P2ME01 - Metroid Prime 2: Echoes Bonus Disc
 
 [Core]
-# Values set here will override the main Dolphin settings.
 CPUThread = False
 
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Required for "scan visor" to work.
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/R32.ini b/Data/Sys/GameSettings/R32.ini
new file mode 100644
index 0000000000..818bb8aae2
--- /dev/null
+++ b/Data/Sys/GameSettings/R32.ini
@@ -0,0 +1,10 @@
+# R32J01 - Metroid Prime 2: Dark Echoes (Wii)
+
+[Video_Settings]
+# Because the minimap has a lot of unused triangles, 
+# CPU Cull can greatly speed up demanding areas of the game.
+CPUCull = True
+
+[Video_Hacks]
+# Required for "scan visor" to work.
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/R3I.ini b/Data/Sys/GameSettings/R3I.ini
new file mode 100644
index 0000000000..bf98b298e1
--- /dev/null
+++ b/Data/Sys/GameSettings/R3I.ini
@@ -0,0 +1,6 @@
+# R3IJ01 - Metroid Prime (Wii)
+
+[Video_Settings]
+# Because the minimap has a lot of unused triangles, 
+# CPU Cull can greatly speed up demanding areas of the game.
+CPUCull = True
diff --git a/Data/Sys/GameSettings/R3M.ini b/Data/Sys/GameSettings/R3M.ini
index 2bb28c61a4..a03772629c 100644
--- a/Data/Sys/GameSettings/R3M.ini
+++ b/Data/Sys/GameSettings/R3M.ini
@@ -1,23 +1,14 @@
 # R3ME01, R3MP01 - Metroid Prime Trilogy
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
-
 # Because the minimap has a lot of unused triangles, 
 # CPU Cull can greatly speed up demanding areas of the game.
-
 CPUCull = True
 
 [Video_Hacks]
+# Required for "scan visor" to work.
 EFBToTextureEnable = False
+
 ImmediateXFBEnable = False
 XFBToTextureEnable = False
 DeferEFBCopies = False
diff --git a/Data/Sys/GameSettings/RM3.ini b/Data/Sys/GameSettings/RM3.ini
index b6bc1cd81d..a1f6f6d8f2 100644
--- a/Data/Sys/GameSettings/RM3.ini
+++ b/Data/Sys/GameSettings/RM3.ini
@@ -1,21 +1,12 @@
 # RM3E01, RM3J01, RM3P01 - Metroid Prime 3: Corruption
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
 # Because the minimap has a lot of unused triangles, 
 # CPU Cull can greatly speed up demanding areas of the game.
-
 CPUCull = True
 
 [Video_Hacks]
+# Required for "scan visor" to work.
 EFBToTextureEnable = False