diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index fd492abf8..8ae2d86d8 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -23009,6 +23009,8 @@ SLUS-01245:
     linkCable: false
 SCPS-45196:
   name: "Castlevania - Symphony of the Night (Asia)"
+  controllers:
+    - DigitalController
 SLES-00524:
   name: "Castlevania - Symphony of the Night (Europe)"
   controllers:
@@ -23051,7 +23053,6 @@ SLUS-00067:
 SLPM-86754:
   name: "Castlevania Chronicle - Akumajou Dracula (Japan)"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Konami"
@@ -23070,7 +23071,6 @@ SLPM-86754:
 SLES-03532:
   name: "Castlevania Chronicles (Europe)"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Konami"
@@ -23092,7 +23092,6 @@ SLUS-01384:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Konami"
@@ -72615,6 +72614,8 @@ SCPS-10012:
     linkCable: false
 SLPM-80431:
   name: "Herohero-kun to Ralph no Daibouken (Japan)"
+  controllers:
+    - DigitalController
 SLPS-00471:
   name: "Heroine Dream"
   controllers:
@@ -93050,6 +93051,8 @@ SLES-00451:
     linkCable: false
 SLED-00516:
   name: "Lomax (Europe) (En,Fr,De,Es,It) (Demo)"
+  controllers:
+    - DigitalController
   metadata:
     genre: "** DEMO **"
 SLPS-00987:
@@ -99908,7 +99911,6 @@ SLES-01176:
 SLPM-88509:
   name: "Megaman X6"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "KokoCapcom"
@@ -133775,6 +133777,8 @@ SLUS-90001:
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2108-ga036ae92"
+  controllers:
+    - DigitalController
 SLES-02906:
   name: "Rayman 2 - The Great Escape (Europe) (En,Es,It)"
   compatibility:
@@ -159274,7 +159278,6 @@ SLES-12867:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Virgin Interactive"
@@ -159296,7 +159299,6 @@ SLUS-01142:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Capcom"
@@ -159318,7 +159320,6 @@ SLES-02867:
     rating: NoIssues
     versionTested: "0.1-3968-gd9151ceb"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Virgin Interactive"
@@ -159340,7 +159341,6 @@ SLUS-01163:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Capcom"
@@ -159368,7 +159368,6 @@ SLPS-02620:
       - SLPS-02620
       - SLPS-02621
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Capcom"
@@ -159392,7 +159391,6 @@ SLPS-02621:
       - SLPS-02620
       - SLPS-02621
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Capcom"
@@ -159411,7 +159409,6 @@ SLPS-02621:
 SLPM-87401:
   name: "Strider Hiryuu [Capcom Game Books]"
   controllers:
-    - AnalogController
     - DigitalController
   metadata:
     publisher: "Capcom"