diff --git a/data/database/gamedb.json b/data/database/gamedb.json
index d3163cb8e..bbf99a0f5 100644
--- a/data/database/gamedb.json
+++ b/data/database/gamedb.json
@@ -280073,7 +280073,7 @@
   "serial": "SCPS-10023",
   "name": "PoPoLoCrois Monogatari (Japan)",
   "codes": [
-   "SCPS-10023"
+   "HASH-72E54F40E1FCDE62"
   ],
   "languages": [
    "Japanese"
@@ -280099,6 +280099,36 @@
    "DigitalController"
   ]
  },
+ {
+  "serial": "SCPS-10023",
+  "name": "PoPoLoCrois Monogatari (Japan) (Rev 1)",
+  "codes": [
+   "HASH-670BF5FA849D6979"
+  ],
+  "languages": [
+   "Japanese"
+  ],
+  "publisher": "Sony",
+  "developer": "G-Artists / Sugar & Rockets",
+  "releaseDate": "1996-07-12",
+  "genre": "Tactical RPG",
+  "minPlayers": 1,
+  "maxPlayers": 1,
+  "minBlocks": 1,
+  "maxBlocks": 5,
+  "tracks": [
+   {
+    "size": 683611152,
+    "md5": "60418240bc5488f3127469011d40296b"
+   }
+  ],
+  "vibration": false,
+  "multitap": false,
+  "linkCable": false,
+  "controllers": [
+   "DigitalController"
+  ]
+ },
  {
   "serial": "PCPX-96195",
   "name": "PoPoLoCrois Monogatari II (Japan) (Demo)",
@@ -280117,6 +280147,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 1)",
   "codes": [
    "SCPS-10112",
+   "SCPS-45483",
+   "SCPS-91220",
    "SCPS-91313"
   ],
   "languages": [
@@ -280124,7 +280156,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -280149,6 +280181,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 2)",
   "codes": [
    "SCPS-10113",
+   "SCPS-45484",
+   "SCPS-91221",
    "SCPS-91314"
   ],
   "languages": [
@@ -280156,7 +280190,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -280181,6 +280215,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 3)",
   "codes": [
    "SCPS-10114",
+   "SCPS-45485",
+   "SCPS-91222",
    "SCPS-91315"
   ],
   "languages": [
@@ -280188,7 +280224,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -280225,7 +280261,7 @@
   "serial": "SCPS-10050",
   "name": "PoPoRoGue (Japan)",
   "codes": [
-   "SCPS-10050"
+   "HASH-E6F9616D27744F0F"
   ],
   "languages": [
    "Japanese"
@@ -280253,17 +280289,17 @@
   ]
  },
  {
-  "serial": "SCPS-91312",
+  "serial": "SCPS-10050",
   "name": "PoPoRoGue (Japan) (Rev 1)",
   "codes": [
-   "SCPS-91312"
+   "HASH-6796D79E4BC5E282"
   ],
   "languages": [
    "Japanese"
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-11-27",
+  "releaseDate": "1998-11-26",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -282332,62 +282368,6 @@
    "DigitalController"
   ]
  },
- {
-  "serial": "SCPS-45483",
-  "name": "Popolocrois II",
-  "codes": [
-   "SCPS-45483",
-   "SCPS-45484",
-   "SCPS-45485"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2000-01-27",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "tracks": [],
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ]
- },
- {
-  "serial": "SCPS-91220",
-  "name": "Popolocrois II [PlayStation the Best]",
-  "codes": [
-   "SCPS-91220",
-   "SCPS-91221",
-   "SCPS-91222"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-05-04",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "tracks": [],
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ]
- },
  {
   "serial": "SLES-03657",
   "name": "Popstar Maker (Europe)",
diff --git a/gamedb/p.json b/gamedb/p.json
index c211b41b8..239743d56 100644
--- a/gamedb/p.json
+++ b/gamedb/p.json
@@ -15209,7 +15209,7 @@
   "serial": "SCPS-10023",
   "name": "PoPoLoCrois Monogatari (Japan)",
   "codes": [
-   "SCPS-10023"
+   "HASH-72E54F40E1FCDE62"
   ],
   "languages": [
    "Japanese"
@@ -15235,6 +15235,36 @@
    "DigitalController"
   ]
  },
+ {
+  "serial": "SCPS-10023",
+  "name": "PoPoLoCrois Monogatari (Japan) (Rev 1)",
+  "codes": [
+   "HASH-670BF5FA849D6979"
+  ],
+  "languages": [
+   "Japanese"
+  ],
+  "publisher": "Sony",
+  "developer": "G-Artists / Sugar & Rockets",
+  "releaseDate": "1996-07-12",
+  "genre": "Tactical RPG",
+  "minPlayers": 1,
+  "maxPlayers": 1,
+  "minBlocks": 1,
+  "maxBlocks": 5,
+  "tracks": [
+   {
+    "size": 683611152,
+    "md5": "60418240bc5488f3127469011d40296b"
+   }
+  ],
+  "vibration": false,
+  "multitap": false,
+  "linkCable": false,
+  "controllers": [
+   "DigitalController"
+  ]
+ },
  {
   "serial": "PCPX-96195",
   "name": "PoPoLoCrois Monogatari II (Japan) (Demo)",
@@ -15253,6 +15283,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 1)",
   "codes": [
    "SCPS-10112",
+   "SCPS-45483",
+   "SCPS-91220",
    "SCPS-91313"
   ],
   "languages": [
@@ -15260,7 +15292,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -15285,6 +15317,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 2)",
   "codes": [
    "SCPS-10113",
+   "SCPS-45484",
+   "SCPS-91221",
    "SCPS-91314"
   ],
   "languages": [
@@ -15292,7 +15326,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -15317,6 +15351,8 @@
   "name": "PoPoLoCrois Monogatari II (Japan) (Disc 3)",
   "codes": [
    "SCPS-10114",
+   "SCPS-45485",
+   "SCPS-91222",
    "SCPS-91315"
   ],
   "languages": [
@@ -15324,7 +15360,7 @@
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-06-12",
+  "releaseDate": "2000-01-27",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -15361,7 +15397,7 @@
   "serial": "SCPS-10050",
   "name": "PoPoRoGue (Japan)",
   "codes": [
-   "SCPS-10050"
+   "HASH-E6F9616D27744F0F"
   ],
   "languages": [
    "Japanese"
@@ -15389,17 +15425,17 @@
   ]
  },
  {
-  "serial": "SCPS-91312",
+  "serial": "SCPS-10050",
   "name": "PoPoRoGue (Japan) (Rev 1)",
   "codes": [
-   "SCPS-91312"
+   "HASH-6796D79E4BC5E282"
   ],
   "languages": [
    "Japanese"
   ],
   "publisher": "Sony",
   "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-11-27",
+  "releaseDate": "1998-11-26",
   "genre": "Tactical RPG",
   "minPlayers": 1,
   "maxPlayers": 1,
@@ -17468,62 +17504,6 @@
    "DigitalController"
   ]
  },
- {
-  "serial": "SCPS-45483",
-  "name": "Popolocrois II",
-  "codes": [
-   "SCPS-45483",
-   "SCPS-45484",
-   "SCPS-45485"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2000-01-27",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "tracks": [],
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ]
- },
- {
-  "serial": "SCPS-91220",
-  "name": "Popolocrois II [PlayStation the Best]",
-  "codes": [
-   "SCPS-91220",
-   "SCPS-91221",
-   "SCPS-91222"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "2001-05-04",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "tracks": [],
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ]
- },
  {
   "serial": "SLES-03657",
   "name": "Popstar Maker (Europe)",