GameDB: Adjust cropping in a number of titles (part 2) (#3656)

* GameDB: Adjust cropping in a number of titles

Namely:
 - Metal Gear Solid
 - Parasite Eve 1 & 2
 - Resident Evil 3
 - Star Ocean
 - Tales of Destiny II
 - Tenchu 1 & 2
 - Vagrant Story
 - Valkyrie Profile

* GameDB: Disable auto analog for Xenogears

data/resources/gamedb.yaml

@@ -16463,6 +16463,8 @@ SLPS-02300:
     - ForceRecompilerICache # Fixes hangs in CD code.
   settings:
     cdromMaxReadSpeedupCycles: 70000 # Randomly hangs after certain door transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Capcom"
     developer: "Capcom Production Studio 4"
@@ -16489,6 +16491,8 @@ SLPM-80485:
     - ForceRecompilerICache # Fixes hangs in CD code.
   settings:
     cdromMaxReadSpeedupCycles: 70000 # Randomly hangs after certain door transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
 SLPM-87224:
   name: "Biohazard 3 - Last Escape"
   localizedName: "バイオハザード３　ラストエスケープ"
@@ -16502,6 +16506,8 @@ SLPM-87224:
     - ForceRecompilerICache # Fixes hangs in CD code.
   settings:
     cdromMaxReadSpeedupCycles: 70000 # Randomly hangs after certain door transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Capcom"
     developer: "Capcom Production Studio 4"
@@ -105674,7 +105680,7 @@ SCPS-45320:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   codes:
     - SCPS-45320
     - SCPS-45321
@@ -105703,7 +105709,7 @@ PAPX-90044:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
 SCPS-45317:
   name: "Metal Gear Solid (Disc 1) (Ichi) (Premium Package)"
   localizedName: "メタルギア　ソリッド"
@@ -105715,7 +105721,7 @@ SCPS-45317:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   codes:
     - SCPS-45317
     - SLPM-86111
@@ -105744,7 +105750,7 @@ SCPS-45318:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   codes:
     - SCPS-45318
     - SLPM-86112
@@ -105770,7 +105776,7 @@ SLED-01400:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
 SLED-01775:
   name: "Metal Gear Solid (Demo 2)"
   saveName: "Metal Gear Solid (Europe) (Demo 2)"
@@ -105779,7 +105785,7 @@ SLED-01775:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
 SLES-01370:
   name: "Metal Gear Solid (Disc 1)"
   saveName: "Metal Gear Solid (Europe) (Disc 1)"
@@ -105793,7 +105799,7 @@ SLES-01370:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105821,7 +105827,7 @@ SLES-11370:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105849,7 +105855,7 @@ SLES-01506:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105877,7 +105883,7 @@ SLES-11506:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105905,7 +105911,7 @@ SLES-01507:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105933,7 +105939,7 @@ SLES-11507:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105961,7 +105967,7 @@ SLES-01508:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -105989,7 +105995,7 @@ SLES-11508:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106014,7 +106020,7 @@ SLPM-86098:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
@@ -106040,7 +106046,7 @@ SLPM-86114:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   codes:
     - SLPM-86114
     - SLPM-87411
@@ -106069,7 +106075,7 @@ SLPM-86115:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   codes:
     - SLPM-86115
     - SLPM-87412
@@ -106100,7 +106106,7 @@ SLES-01734:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106128,7 +106134,7 @@ SLES-11734:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106151,7 +106157,7 @@ SLUS-90035:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
 SLUS-00594:
   name: "Metal Gear Solid (Disc 1)"
   saveName: "Metal Gear Solid (USA) (Disc 1)"
@@ -106165,7 +106171,9 @@ SLUS-00594:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106193,7 +106201,9 @@ SLUS-00776:
   traits:
     - ForcePGXPCPUMode
   settings:
-    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, screen flickering at 80-90k.
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106208,35 +106218,6 @@ SLUS-00776:
     vibration: true
     multitap: false
     linkCable: false
-SCPS-45414:
-  name: "Metal Gear Solid - Integral (Disc 3) (VR-Disc)"
-  localizedName: "メタル・ギア・ソリッド　～インテグラル～"
-  saveName: "Metal Gear Solid - Integral (Japan, Asia) (Disc 3) (VR-Disc)"
-  controllers:
-    - AnalogController
-    - AnalogJoystick
-    - DigitalController
-  codes:
-    - SCPS-45414
-    - SLPM-86249
-    - SLPM-86472
-    - SLPM-87326
-    - SLPM-87413
-  metadata:
-    publisher: "Konami"
-    developer: "KCE Japan"
-    releaseDate: "2003-11-06"
-    genre: "Action / Adventure / Strategy / Shooter"
-    languages:
-      - English
-      - Japanese
-    minPlayers: 1
-    maxPlayers: 1
-    minBlocks: 1
-    maxBlocks: 1
-    vibration: true
-    multitap: false
-    linkCable: false
 SCPS-45412:
   name: "Metal Gear Solid - Integral (Disc 1)"
   localizedName: "メタル・ギア・ソリッド　～インテグラル～ (Disc 1)"
@@ -106248,6 +106229,12 @@ SCPS-45412:
     - AnalogController
     - AnalogJoystick
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode
+  settings:
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   codes:
     - SCPS-45412
     - SLPM-86247
@@ -106279,6 +106266,12 @@ SCPS-45413:
     - AnalogController
     - AnalogJoystick
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode
+  settings:
+    cdromMaxReadSpeedupCycles: 100000 # Crash at 70k, texture flickering at 80-90k.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   codes:
     - SCPS-45413
     - SLPM-86248
@@ -106299,6 +106292,40 @@ SCPS-45413:
     vibration: true
     multitap: false
     linkCable: false
+SCPS-45414:
+  name: "Metal Gear Solid - Integral (Disc 3) (VR-Disc)"
+  localizedName: "メタル・ギア・ソリッド　～インテグラル～"
+  saveName: "Metal Gear Solid - Integral (Japan, Asia) (Disc 3) (VR-Disc)"
+  controllers:
+    - AnalogController
+    - AnalogJoystick
+    - DigitalController
+  traits:
+    - ForcePGXPCPUMode
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
+  codes:
+    - SCPS-45414
+    - SLPM-86249
+    - SLPM-86472
+    - SLPM-87326
+    - SLPM-87413
+  metadata:
+    publisher: "Konami"
+    developer: "KCE Japan"
+    releaseDate: "2003-11-06"
+    genre: "Action / Adventure / Strategy / Shooter"
+    languages:
+      - English
+      - Japanese
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: true
+    multitap: false
+    linkCable: false
 SLES-02136:
   name: "Metal Gear Solid - Special Missions"
   saveName: "Metal Gear Solid - Special Missions (Europe) (En,Fr,De,Es,It)"
@@ -106309,6 +106336,8 @@ SLES-02136:
     - AnalogController
     - AnalogJoystick
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106337,6 +106366,11 @@ SLUS-00957:
     - AnalogController
     - AnalogJoystick
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Konami"
     developer: "KCE Japan"
@@ -106356,6 +106390,8 @@ SLUS-90062:
   saveName: "Metal Gear Solid - VR Missions (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
+  traits:
+    - ForcePGXPCPUMode
 SLPM-86485:
   name: "Metal Gear Solid [Konami the Best]"
   controllers:
@@ -128178,6 +128214,9 @@ SCPS-45203:
     - DigitalController
   traits:
     - DisableWidescreen
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   codes:
     - SCPS-45203
     - SCPS-45204
@@ -128204,6 +128243,9 @@ SLPS-01230:
     - DigitalController
   traits:
     - DisableWidescreen
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -128227,6 +128269,9 @@ SLPS-01231:
     - DigitalController
   traits:
     - DisableWidescreen
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -128252,6 +128297,9 @@ SLUS-00662:
     - DigitalController
   traits:
     - DisableWidescreen
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -128277,6 +128325,9 @@ SLUS-00668:
     - DigitalController
   traits:
     - DisableWidescreen
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -128688,6 +128739,8 @@ SLUS-01042:
     - DisableWidescreen
   settings:
     cdromMaxReadSpeedupCycles: 120000 # Fixes BGM glitches during area transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -128715,6 +128768,8 @@ SLUS-01055:
     - DisableWidescreen
   settings:
     cdromMaxReadSpeedupCycles: 120000 # Fixes BGM glitches during area transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -142267,6 +142322,8 @@ SLUS-00923:
     - ForceRecompilerICache # Fixes hangs in CD code.
   settings:
     cdromMaxReadSpeedupCycles: 70000 # Randomly hangs after certain door transitions.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Capcom"
     developer: "Capcom Production Studio 4"
@@ -153624,6 +153681,9 @@ SLPM-86192:
     - Justifier
   traits:
     - ForceRecompilerICache
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Konami"
     developer: "KCET"
@@ -163880,6 +163940,9 @@ SCUS-94421:
     - DigitalController
   traits:
     - DisableCDROMSpeedupOnMDEC # Stops FMVs breaking.
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   codes:
     - HASH-360EBC987F8D1BB3
   metadata:
@@ -163907,6 +163970,9 @@ SCUS-94422:
     - DigitalController
   traits:
     - DisableCDROMSpeedupOnMDEC # Stops FMVs breaking.
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   codes:
     - HASH-21D700A3A4CEA53F
   metadata:
@@ -174006,6 +174072,9 @@ SLUS-01355:
   controllers:
     - AnalogController
     - DigitalController
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Namco"
     developer: "Wolf Team"
@@ -174029,6 +174098,9 @@ SLUS-01367:
   controllers:
     - AnalogController
     - DigitalController
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Namco"
     developer: "Wolf Team"
@@ -174052,6 +174124,9 @@ SLUS-01368:
   controllers:
     - AnalogController
     - DigitalController
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Namco"
     developer: "Wolf Team"
@@ -175890,6 +175965,9 @@ SLUS-00706:
     - DigitalController
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Activision"
     developer: "Acquire Corp"
@@ -176027,6 +176105,9 @@ SLUS-00939:
     - DigitalController
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
+  settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Activision"
     developer: "Acquire Corp"
@@ -188683,6 +188764,8 @@ SLUS-01040:
     - AnalogController
     - DigitalController
   settings:
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
     gpuPGXPPreserveProjFP: true # Improves jitter on character models.
   metadata:
     publisher: "Squaresoft"
@@ -188845,6 +188928,8 @@ SLUS-01156:
     - DisableCDROMSpeedupOnMDEC # Stops FMVs breaking with speedup.
   settings:
     cdromMaxReadSpeedupCycles: 60000 # Stops FMVs breaking.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Enix America Inc"
     developer: "tri-Ace"
@@ -188873,6 +188958,8 @@ SLUS-01179:
     - DisableCDROMSpeedupOnMDEC # Stops FMVs breaking with speedup.
   settings:
     cdromMaxReadSpeedupCycles: 60000 # Stops FMVs breaking.
+    displayActiveStartOffset: -8
+    displayActiveEndOffset: -8
   metadata:
     publisher: "Enix America Inc"
     developer: "tri-Ace"
@@ -199037,13 +199124,15 @@ SLES-00815:
 SCPS-45170:
   name: "Xenogears"
   controllers:
+    - AnalogController
     - DigitalController
   codes:
     - SCPS-45170
     - SCPS-45171
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -199061,13 +199150,15 @@ SCPS-45170:
 SLPS-02773:
   name: "Xenogears (Elhaym Van Houten Version) [Square Millennium Collection]"
   controllers:
+    - AnalogController
     - DigitalController
   codes:
     - SLPS-02773
     - SLPS-02774
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -199087,6 +199178,7 @@ SLPS-01160:
   localizedName: "ゼノギアス (DISC 1)"
   saveName: "Xenogears (Japan) (Disc 1)"
   controllers:
+    - AnalogController
     - DigitalController
   codes:
     - SLPS-01160
@@ -199094,8 +199186,9 @@ SLPS-01160:
     - SLPS-91436
     - SLPS-91437
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -199115,13 +199208,15 @@ SLPS-01161:
   localizedName: "ゼノギアス (DISC 2)"
   saveName: "Xenogears (Japan) (Disc 2)"
   controllers:
+    - AnalogController
     - DigitalController
   codes:
     - SLPS-01161
     - SLPS-02776
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -199143,10 +199238,12 @@ SLUS-00664:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
   controllers:
+    - AnalogController
     - DigitalController
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"
@@ -199168,10 +199265,12 @@ SLUS-00669:
     rating: NoIssues
     versionTested: "0.1-1308-g622e50fa"
   controllers:
+    - AnalogController
     - DigitalController
   traits:
-    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
+    - DisableAutoAnalogMode # Analog sticks do nothing.
     - DisablePGXPOn2DPolygons # Fixes misaligned text.
+    - ForcePGXPCPUMode # Fixes battle shadows, radar jitter.
   metadata:
     publisher: "Squaresoft"
     developer: "Squaresoft"