diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index e226c862c..80eb905da 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -182531,6 +182531,8 @@ SLPM-86429:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   codes:
     - SLPM-86429
     - SLPM-86943
@@ -182557,6 +182559,8 @@ SLUS-00860:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182576,17 +182580,23 @@ SLED-02879:
   saveName: "Tony Hawk's Pro Skater 2 (Australia) (Demo)"
   metadata:
     genre: "** DEMO **"
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
 SLED-03048:
   name: "Tony Hawk's Pro Skater 2 (Demo)"
   saveName: "Tony Hawk's Pro Skater 2 (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
 SLES-02908:
   name: "Tony Hawk's Pro Skater 2"
   saveName: "Tony Hawk's Pro Skater 2 (Europe, Australia)"
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182607,6 +182617,8 @@ SLES-02909:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182627,6 +182639,8 @@ SLES-02910:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182648,6 +182662,8 @@ SLPM-86751:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Success"
     developer: "Neversoft Entertainment"
@@ -182671,6 +182687,8 @@ SLUS-01066:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182690,12 +182708,16 @@ SLUS-90086:
   saveName: "Tony Hawk's Pro Skater 2 (USA) (Demo)"
   metadata:
     genre: "** DEMO **"
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
 SLES-03645:
   name: "Tony Hawk's Pro Skater 3"
   saveName: "Tony Hawk's Pro Skater 3 (Europe)"
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Shaba Games"
@@ -182716,6 +182738,8 @@ SLES-03646:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Shaba Games"
@@ -182736,6 +182760,8 @@ SLES-03647:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Shaba Games"
@@ -182759,6 +182785,8 @@ SLUS-01419:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Shaba Games"
@@ -182779,6 +182807,8 @@ SLES-03954:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Vicarious Visions"
@@ -182799,6 +182829,8 @@ SLES-03956:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Vicarious Visions"
@@ -182819,6 +182851,8 @@ SLES-03955:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Vicarious Visions"
@@ -182842,6 +182876,8 @@ SLUS-01485:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Vicarious Visions"
@@ -182858,10 +182894,13 @@ SLUS-01485:
     linkCable: false
 SLES-02055:
   name: "Tony Hawk's Skateboarding"
+  sortName: "Tony Hawk's Pro Skater"
   saveName: "Tony Hawk's Skateboarding (Europe)"
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
   metadata:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
@@ -182878,9 +182917,12 @@ SLES-02055:
     linkCable: false
 SLED-02054:
   name: "Tony Hawk's Skateboarding (Demo)"
+  sortName: "Tony Hawk's Pro Skater (Demo)"
   saveName: "Tony Hawk's Skateboarding (Europe) (Demo)"
   metadata:
     genre: "** DEMO **"
+  traits:
+    - ForcePGXPCPUMode # Reduces near-camera wobble, but still not perfect.
 SLPS-00430:
   name: "Tonzura-kun"
   localizedName: "トンズラくん"