summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2024-03-23 23:14:34 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2024-03-23 23:14:34 +1100
commit8e5abc7015d60683a03bd1a85789b22be6c6888a (patch)
tree0484597d3b69fc163f27a237b8f1ad1f03f80732
parent3075d19cabe73d8355ac678a4d780e9cbdb235db (diff)
Added sf2ce58.HEADmaster
-rw-r--r--docs/release/docs/hbnew.txt3
-rw-r--r--src/hbmame/drivers/cps1mis.cpp349
-rw-r--r--src/hbmame/hbmame.lst159
3 files changed, 273 insertions, 238 deletions
diff --git a/docs/release/docs/hbnew.txt b/docs/release/docs/hbnew.txt
index 73091a52a89..62e4be65cfe 100644
--- a/docs/release/docs/hbnew.txt
+++ b/docs/release/docs/hbnew.txt
@@ -4,7 +4,7 @@
2024-0x-xx 0.245.18
- New PGM driver from IQ_132
-- Restored music to many of the kovshp hacks
+- Restored music to kovshp and many of its hacks
New Games
---------------------------------
@@ -12,6 +12,7 @@ New Games
- [nbajam03] NBA Jam Tournament Edition SE 5.0
- [pgmcabal] Cabal (PGM) [iq_132]
- [pgmsnake] PGM test program [iq_132]
+- [sf2ce58] Street Fighter II' (SrSreet edition)
- [sfz3mix] Street Fighter Zero 3 (Turbo Mix 0.28) [zero800]
diff --git a/src/hbmame/drivers/cps1mis.cpp b/src/hbmame/drivers/cps1mis.cpp
index 1fb46510e49..a2b276ef571 100644
--- a/src/hbmame/drivers/cps1mis.cpp
+++ b/src/hbmame/drivers/cps1mis.cpp
@@ -16576,7 +16576,7 @@ ROM_END
Street Fighter II: Champion Edition
***************************************/
-ROM_START( sf2ces01 )
+ROM_START( sf2ce01 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s01.p1", 0x000000, 0x80000, CRC(41c639a0) SHA1(30dfb8c79e60a3454c494922a00fed3f3337347f) )
ROM_LOAD16_WORD_SWAP( "c19s01.p2", 0x080000, 0x80000, CRC(15ff270a) SHA1(e2cd3371a6a20646ad6c9330ab41862967caff12) )
@@ -16608,7 +16608,7 @@ ROM_START( sf2ces01 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces02 )
+ROM_START( sf2ce02 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s02.p1", 0x000000, 0x80000, CRC(180bcd37) SHA1(66a38802bcfd4c50c8a960c47507e825265dff27) )
ROM_LOAD16_WORD_SWAP( "c19s02.p2", 0x080000, 0x80000, CRC(9cc2f0ef) SHA1(21c72144d37eb540a3ac60a3344fe3f34214c75c) )
@@ -16640,7 +16640,7 @@ ROM_START( sf2ces02 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces03 )
+ROM_START( sf2ce03 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s03.p1", 0x000000, 0x80000, CRC(971db586) SHA1(1da3f18c2087b398ead99f0c1664825bdbddf8e6) )
ROM_LOAD16_WORD_SWAP( "c19.p2", 0x080000, 0x80000, CRC(2bbe15ed) SHA1(a8e2edef62fa99c5ef701b28bfb6bc42f3af183d) )
@@ -16672,7 +16672,7 @@ ROM_START( sf2ces03 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces04 )
+ROM_START( sf2ce04 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s04.p1", 0x000000, 0x80000, CRC(beceb080) SHA1(254c53369b6db7130a1dab98c32242f9fd9b20c3) )
ROM_LOAD16_WORD_SWAP( "c19s04.p2", 0x080000, 0x80000, CRC(d33bcfeb) SHA1(1c834058e76c5f22a31b0a5cc0a1b4f46a3c74ac) )
@@ -16704,7 +16704,7 @@ ROM_START( sf2ces04 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces05 )
+ROM_START( sf2ce05 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s05.p1", 0x000000, 0x80000, CRC(1ba2123a) SHA1(e9d47ee17a6b0b73218c6bddfc610343f0176e71) )
ROM_LOAD16_WORD_SWAP( "c19.p2", 0x080000, 0x80000, CRC(2bbe15ed) SHA1(a8e2edef62fa99c5ef701b28bfb6bc42f3af183d) )
@@ -16736,7 +16736,7 @@ ROM_START( sf2ces05 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces06 )
+ROM_START( sf2ce06 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s06.p1", 0x000000, 0x80000, CRC(de70a231) SHA1(1c8df35a7fe44f749851c2857ddd73c38ccd5056) )
ROM_LOAD16_WORD_SWAP( "c19s06.p2", 0x080000, 0x80000, CRC(a2745394) SHA1(25628ffa00f5ea00291d3d0f8a064f5ebeb1939d) )
@@ -16768,7 +16768,7 @@ ROM_START( sf2ces06 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces07 )
+ROM_START( sf2ce07 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s07.p1", 0x000000, 0x80000, CRC(5ae76636) SHA1(430c297e58ab13f48a2e04ad43c5c32d15b0c0a5) )
ROM_LOAD16_WORD_SWAP( "c19s06.p2", 0x080000, 0x80000, CRC(a2745394) SHA1(25628ffa00f5ea00291d3d0f8a064f5ebeb1939d) )
@@ -16800,7 +16800,7 @@ ROM_START( sf2ces07 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces08 )
+ROM_START( sf2ce08 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s08.p1", 0x000000, 0x80000, CRC(afe285dd) SHA1(c4b4396de8c4ecdb263dc3b768e4369e6efb278f) )
ROM_LOAD16_WORD_SWAP( "c19s08.p2", 0x080000, 0x80000, CRC(8bd229df) SHA1(704f3127127d5c4ac06697da90ef48382afefa48) )
@@ -16832,7 +16832,7 @@ ROM_START( sf2ces08 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces09 )
+ROM_START( sf2ce09 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s09.p1", 0x000000, 0x80000, CRC(853cce41) SHA1(218c62bbb443a920b38bb0a6ef23032e66a56bff) )
ROM_LOAD16_WORD_SWAP( "c19s09.p2", 0x080000, 0x80000, CRC(de703d2f) SHA1(b029e857960026922338c335c0fff7441d8c8b3d) )
@@ -16864,7 +16864,7 @@ ROM_START( sf2ces09 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces10 )
+ROM_START( sf2ce10 )
ROM_REGION( CODE_SIZE, "maincpu", 0 ) //sf2cebr
ROM_LOAD16_WORD_SWAP( "c19s10.p1", 0x000000, 0x80000, CRC(74e848ee) SHA1(6dce8d0c7d439e6d1d08c8169a3ecdf178e82c16) )
ROM_LOAD16_WORD_SWAP( "c19s10.p2", 0x080000, 0x80000, CRC(c3c49626) SHA1(d0fae1d2758360b56e6e583feb4bdf7d4e2e1eba) )
@@ -16896,7 +16896,7 @@ ROM_START( sf2ces10 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces12 ) //sf2ceh
+ROM_START( sf2ce12 ) //sf2ceh
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s12.p1", 0x000000, 0x80000, CRC(25dc14c8) SHA1(fc7b5de3a50d7d9ee977091bab5f82f824e386f2) )
ROM_LOAD16_WORD_SWAP( "c19s12.p2", 0x080000, 0x80000, CRC(1c9dd91c) SHA1(66fbd10958d3b9f027bc3ba85c99b649cf866ab7) )
@@ -16928,7 +16928,7 @@ ROM_START( sf2ces12 ) //sf2ceh
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces13 )
+ROM_START( sf2ce13 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s13.p1", 0x000000, 0x80000, CRC(68d59bb0) SHA1(19ab6ac2079676689a791fc61b172b4e5603eb9d) )
ROM_LOAD16_WORD_SWAP( "c19s13.p2", 0x080000, 0x80000, CRC(2b467cf2) SHA1(ebcc8e20cb4c1b079c0aec8ce59a9d71d201eb7c) )
@@ -16960,7 +16960,7 @@ ROM_START( sf2ces13 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces14 )
+ROM_START( sf2ce14 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s14.p1", 0x000000, 0x80000, CRC(5f734f1b) SHA1(7f1bde6000840ea910a80e10435c890f215bdb42) )
ROM_LOAD16_WORD_SWAP( "c19s14.p2", 0x080000, 0x80000, CRC(47113158) SHA1(493da9addf38ae2b2273ddd7ccc435f6a6b1ddb0) )
@@ -16992,7 +16992,7 @@ ROM_START( sf2ces14 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces15 )
+ROM_START( sf2ce15 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s15.p1", 0x000000, 0x80000, CRC(8cbd57ae) SHA1(c3bb5f12e837b9ed313ca79eda921c3f0b9e07e5) )
ROM_LOAD16_WORD_SWAP( "c19reds06.p2", 0x080000, 0x80000, CRC(c3d93533) SHA1(9f4753f0419e1fde5ded510714f537101d7d70f7) )
@@ -17024,7 +17024,7 @@ ROM_START( sf2ces15 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces16 )
+ROM_START( sf2ce16 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s16.p1", 0x000000, 0x80000, CRC(1e3dd165) SHA1(cd966ca368db5afc826c9bafb7f76f64638372d3) )
ROM_LOAD16_WORD_SWAP( "c19s16.p2", 0x080000, 0x80000, CRC(b1e0b014) SHA1(7236b2ccfce0072ea98a9ca87b98860612f41c77) )
@@ -17056,7 +17056,7 @@ ROM_START( sf2ces16 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces17 )
+ROM_START( sf2ce17 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s17.p1", 0x000000, 0x80000, CRC(4224b064) SHA1(45ced0d48c0402e65623bf98a58cf543a96a39a3) )
ROM_LOAD16_WORD_SWAP( "c19s17.p2", 0x080000, 0x80000, CRC(3c3ecdee) SHA1(33c7bf5314ec36896bce52995f40d662bcb71ead) )
@@ -17088,7 +17088,7 @@ ROM_START( sf2ces17 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces18 )
+ROM_START( sf2ce18 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s18.p1", 0x000000, 0x80000, CRC(09a724be) SHA1(20728ab049bf224739823d035f60460dc4713bee) )
ROM_LOAD16_WORD_SWAP( "c19s14.p2", 0x080000, 0x80000, CRC(47113158) SHA1(493da9addf38ae2b2273ddd7ccc435f6a6b1ddb0) )
@@ -17120,7 +17120,7 @@ ROM_START( sf2ces18 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces19 )
+ROM_START( sf2ce19 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s19.p1", 0x000000, 0x80000, CRC(7035b10d) SHA1(83c84b3285d90d7d7f52a4e63c6fb09493e7206c) )
ROM_LOAD16_WORD_SWAP( "c19s19.p2", 0x080000, 0x80000, CRC(c537de32) SHA1(7abab533609b907917c59b2ed9b67de1c3373a89) )
@@ -17152,7 +17152,7 @@ ROM_START( sf2ces19 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces20 )
+ROM_START( sf2ce20 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s20.p1", 0x000000, 0x80000, CRC(179b5534) SHA1(50826465b459e63cf96e7fcc779497b0e1e9e5dd) )
ROM_LOAD16_WORD_SWAP( "c19s20.p2", 0x080000, 0x80000, CRC(fc34b093) SHA1(202790f04efaa7a11109e5ca585b310686cbe9d0) )
@@ -17184,7 +17184,7 @@ ROM_START( sf2ces20 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces21 )
+ROM_START( sf2ce21 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s21.p1", 0x000000, 0x80000, CRC(b0515165) SHA1(4bb559aa57b762b22741ba5454c97cc1e10f43dc) )
ROM_LOAD16_WORD_SWAP( "c19s21.p2", 0x080000, 0x80000, CRC(1ed95b6c) SHA1(2bcdb6b74c8c5b54ac209b32686b0b5141ad7e73) )
@@ -17216,7 +17216,7 @@ ROM_START( sf2ces21 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces22 )
+ROM_START( sf2ce22 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s22.p1", 0x000000, 0x80000, CRC(019d61f9) SHA1(1a6163fef5d3b7c87cdba7fb266d05f6fd05aca6) )
ROM_LOAD16_WORD_SWAP( "c19s22.p2", 0x080000, 0x80000, CRC(c4c95fcc) SHA1(caf3d582822174b421eab057170151819bd04def) )
@@ -17248,7 +17248,7 @@ ROM_START( sf2ces22 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces23 )
+ROM_START( sf2ce23 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s23.p1", 0x000000, 0x80000, CRC(6d6fb4e6) SHA1(86e2660e6bdc4cefae60a21c1e69b655d6404dd6) )
ROM_LOAD16_WORD_SWAP( "c19s23.p2", 0x080000, 0x80000, CRC(e7458191) SHA1(39275dd6d8d18e2c3ee662de96cff6b78683d13b) )
@@ -17280,7 +17280,7 @@ ROM_START( sf2ces23 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces24 )
+ROM_START( sf2ce24 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s24.p1", 0x000000, 0x80000, CRC(f65622e2) SHA1(a38598f7faa1ac38f06094d1e499778b8173173e) )
ROM_LOAD16_WORD_SWAP( "c19s21.p2", 0x080000, 0x80000, CRC(1ed95b6c) SHA1(2bcdb6b74c8c5b54ac209b32686b0b5141ad7e73) )
@@ -17312,7 +17312,7 @@ ROM_START( sf2ces24 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces25 )
+ROM_START( sf2ce25 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s25.p1", 0x000000, 0x80000, CRC(9c73b51b) SHA1(42c9925a1703e5ab45cd5f32e2c61a2a1d6d4494) )
ROM_LOAD16_WORD_SWAP( "c19s25.p2", 0x080000, 0x80000, CRC(100df769) SHA1(ef11943d84de308a6cf1eb17398204ed78088811) )
@@ -17344,7 +17344,7 @@ ROM_START( sf2ces25 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces26 )
+ROM_START( sf2ce26 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s26.p1", 0x000000, 0x80000, CRC(d016efb8) SHA1(95810791a77691c53fe311985871702bb80e17d4) )
ROM_LOAD16_WORD_SWAP( "c19.p2", 0x080000, 0x80000, CRC(2bbe15ed) SHA1(a8e2edef62fa99c5ef701b28bfb6bc42f3af183d) )
@@ -17376,7 +17376,7 @@ ROM_START( sf2ces26 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces27 )
+ROM_START( sf2ce27 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s27.p1", 0x000000, 0x80000, CRC(3b9131f5) SHA1(7dcdb437a237092d9417f026be22c684a63a4620) )
ROM_LOAD16_WORD_SWAP( "c19.p2", 0x080000, 0x80000, CRC(2bbe15ed) SHA1(a8e2edef62fa99c5ef701b28bfb6bc42f3af183d) )
@@ -17408,7 +17408,7 @@ ROM_START( sf2ces27 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces28 )
+ROM_START( sf2ce28 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD( "c19s28.p1", 0x000000, 0x80000, CRC(b8e256d1) SHA1(629a404beda20720ec9c01690f65310dda81e75d) )
ROM_LOAD16_WORD( "c19rb.p2", 0x080000, 0x80000, CRC(fe9d9cf5) SHA1(91afb25d8c0fd1a721f982cebf8fdf563fe11760) )
@@ -17440,7 +17440,7 @@ ROM_START( sf2ces28 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces29 ) //sf2ce3q
+ROM_START( sf2ce29 ) //sf2ce3q
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s29.p1", 0x000000, 0x80000, CRC(1a98a59b) SHA1(dbe968463aea1a173fe74416352df0300ee854dd) )
ROM_LOAD16_WORD_SWAP( "c19s29.p2", 0x080000, 0x80000, CRC(3a260c4f) SHA1(55455b60a36e75a96ea6f38d1d131489060a10df) )
@@ -17472,7 +17472,7 @@ ROM_START( sf2ces29 ) //sf2ce3q
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces30 ) //sf2ce3q (The same name roms sf2ces29)
+ROM_START( sf2ce30 ) //sf2ce3q (The same name roms sf2ce29)
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s30.p1", 0x000000, 0x80000, CRC(e65e524d) SHA1(15f4fe3328e74c41ca9e2c6af9a17fe3f6f081c8) )
ROM_LOAD16_WORD_SWAP( "c19s30.p2", 0x080000, 0x80000, CRC(c2a3d649) SHA1(bc200e637d4eb102f3e269d757ddae3357ddb191) )
@@ -17504,7 +17504,7 @@ ROM_START( sf2ces30 ) //sf2ce3q (The same name roms sf2ces29)
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces31 ) //sf2ce1q
+ROM_START( sf2ce31 ) //sf2ce1q
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s31.p1", 0x000000, 0x80000, CRC(cca48622) SHA1(8796a9504e7d11b64b848fcd23239d00fb15c0ec) )
ROM_LOAD16_WORD_SWAP( "c19s31.p2", 0x080000, 0x80000, CRC(b9e810ec) SHA1(335742f3de206c090897ceac88011e09002ec245) )
@@ -17536,7 +17536,7 @@ ROM_START( sf2ces31 ) //sf2ce1q
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces32 ) //sf2ce1q (The same name roms sf2ces31)
+ROM_START( sf2ce32 ) //sf2ce1q (The same name roms sf2ce31)
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s32.p1", 0x000000, 0x80000, CRC(fd9faded) SHA1(068bcbef6bf8b1a105502718af1e0cb713402960) )
ROM_LOAD16_WORD_SWAP( "c19s31.p2", 0x080000, 0x80000, CRC(b9e810ec) SHA1(335742f3de206c090897ceac88011e09002ec245) )
@@ -17568,7 +17568,7 @@ ROM_START( sf2ces32 ) //sf2ce1q (The same name roms sf2ces31)
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces33 ) //sf2cezhv - same as sf2ces27 except for oki roms
+ROM_START( sf2ce33 ) //sf2cezhv - same as sf2ce27 except for oki roms
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s27.p1", 0x000000, 0x80000, CRC(3b9131f5) SHA1(7dcdb437a237092d9417f026be22c684a63a4620) )
ROM_LOAD16_WORD_SWAP( "c19.p2", 0x080000, 0x80000, CRC(2bbe15ed) SHA1(a8e2edef62fa99c5ef701b28bfb6bc42f3af183d) )
@@ -17600,7 +17600,7 @@ ROM_START( sf2ces33 ) //sf2cezhv - same as sf2ces27 except for oki roms
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces34 ) //sf2celw
+ROM_START( sf2ce34 ) //sf2celw
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s34.p1", 0x000000, 0x80000, CRC(139fe8ab) SHA1(8ff4dad9506768fdc28fb41ab10202dc98729ac9) )
ROM_LOAD16_WORD_SWAP( "c19s34.p2", 0x080000, 0x80000, CRC(779b8751) SHA1(d4e52efaed3caef45f1ab246f5320a82d4d2d930) )
@@ -17632,7 +17632,7 @@ ROM_START( sf2ces34 ) //sf2celw
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces35 ) // sf2ced:Drakon 7.1
+ROM_START( sf2ce35 ) // sf2ced:Drakon 7.1
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s35.p1", 0x000000, 0x80000, CRC(8628f0e2) SHA1(da1f89ccbfb175d39f7e5c69c1c7088205109187) )
ROM_LOAD16_WORD_SWAP( "c19s35.p2", 0x080000, 0x80000, CRC(b7b87a54) SHA1(ab441c30ba6b0e2e8b9785d77b96535357818e0b) )
@@ -17664,7 +17664,7 @@ ROM_START( sf2ces35 ) // sf2ced:Drakon 7.1
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces36 ) // sf2ceda:Drakon unknown version
+ROM_START( sf2ce36 ) // sf2ceda:Drakon unknown version
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s36.p1", 0x000000, 0x80000, CRC(a8a81db7) SHA1(dd0d12ea049292bad48f1009419581695ea41618) )
ROM_LOAD16_WORD_SWAP( "c19s36.p2", 0x080000, 0x80000, CRC(3c9ee969) SHA1(714fb726c336c5807a1b1d2112e89d3aa5c4af91) )
@@ -17696,7 +17696,7 @@ ROM_START( sf2ces36 ) // sf2ceda:Drakon unknown version
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces37 ) // sf2cehk
+ROM_START( sf2ce37 ) // sf2cehk
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s37.p1", 0x000000, 0x80000, CRC(a233c4c8) SHA1(0446ac1bcd9ded6951c6857600e5c30f56d8c430) )
ROM_LOAD16_WORD_SWAP( "c19ea.p2", 0x080000, 0x80000, CRC(99f1cca4) SHA1(64111eba81d743fc3fd51d7a89cd0b2eefcc900d) )
@@ -17728,7 +17728,7 @@ ROM_START( sf2ces37 ) // sf2cehk
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces38 ) // sf2cehp
+ROM_START( sf2ce38 ) // sf2cehp
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s38.p1", 0x000000, 0x80000, CRC(7796519f) SHA1(a420cdca5d5d7898a99afbc62cb33d17010f2def) )
ROM_LOAD16_WORD_SWAP( "c19s38.p2", 0x080000, 0x80000, CRC(a99e9f23) SHA1(9c8a10d1382b289eb2fb0be73198c30e44e0c8af) )
@@ -17760,7 +17760,7 @@ ROM_START( sf2ces38 ) // sf2cehp
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces39 ) // sf2cejem
+ROM_START( sf2ce39 ) // sf2cejem
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s39.p1", 0x000000, 0x80000, CRC(13310615) SHA1(6749c62d19fe554c521ca28e80175ec84450a45d) )
ROM_LOAD16_WORD_SWAP( "c19s39.p2", 0x080000, 0x80000, CRC(d73ee1f8) SHA1(8d6083bf7487867146f091a1cb4bae8d539de46e) )
@@ -17792,7 +17792,7 @@ ROM_START( sf2ces39 ) // sf2cejem
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces40 ) // sf2celw
+ROM_START( sf2ce40 ) // sf2celw
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s40.p1", 0x000000, 0x80000, CRC(22a4c364) SHA1(311a1fd2101ea68c3c8570ef65b11175921a1491) )
ROM_LOAD16_WORD_SWAP( "c19s34.p2", 0x080000, 0x80000, CRC(779b8751) SHA1(d4e52efaed3caef45f1ab246f5320a82d4d2d930) )
@@ -17824,7 +17824,7 @@ ROM_START( sf2ces40 ) // sf2celw
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces41 ) // sf2h11s01
+ROM_START( sf2ce41 ) // sf2h11s01
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s44.p1", 0x000000, 0x80000, CRC(866a9b31) SHA1(92f89084293b69a9d5cd8d282ffaaca0739f1b03) )
ROM_LOAD16_BYTE( "c19s41.p2", 0x000001, 0x80000, CRC(49b15fcd) SHA1(4edc998e559568730e0fcc122162beefac541337) )
@@ -17857,7 +17857,7 @@ ROM_START( sf2ces41 ) // sf2h11s01
ROM_LOAD( "sf2m4.key", 0x00, 0x80, CRC(822729a2) SHA1(acaadef38fd97dba215c13688061cee87d877c19) )
ROM_END
-ROM_START( sf2ces42 ) // sf2h9
+ROM_START( sf2ce42 ) // sf2h9
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19m2.p1", 0x000000, 0x80000, CRC(9e6d058a) SHA1(8c9adca7b65dc929c325c0a62304d24dc0902c08) )
ROM_LOAD16_BYTE( "c19s42.p2", 0x000001, 0x80000, CRC(518d8404) SHA1(635d8ac07126caf3c623d1f28aad38c5bc4c4bae) )
@@ -17890,7 +17890,7 @@ ROM_START( sf2ces42 ) // sf2h9
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces43 ) // sf2h10
+ROM_START( sf2ce43 ) // sf2h10
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s43.p1", 0x000000, 0x80000, CRC(95306baf) SHA1(471d1578607ae1090aa46cb111a8c2745d1fd47b) )
ROM_LOAD16_BYTE( "c19s43.p2", 0x000001, 0x80000, CRC(21024d5f) SHA1(986b3910ce749f4ad42e1f86537a8fc3f0f3f867) )
@@ -17923,7 +17923,7 @@ ROM_START( sf2ces43 ) // sf2h10
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces44 ) // sf2h11
+ROM_START( sf2ce44 ) // sf2h11
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s44.p1", 0x000000, 0x80000, CRC(866a9b31) SHA1(92f89084293b69a9d5cd8d282ffaaca0739f1b03) )
ROM_LOAD16_BYTE( "c19s44.p2", 0x000001, 0x80000, CRC(f3a45593) SHA1(0ba0d05f904ac17cd34c0a7c9dd0a20759ff4e78) )
@@ -17956,7 +17956,7 @@ ROM_START( sf2ces44 ) // sf2h11
ROM_LOAD( "sf2m4.key", 0x00, 0x80, CRC(822729a2) SHA1(acaadef38fd97dba215c13688061cee87d877c19) )
ROM_END
-ROM_START( sf2ces45 ) // sf2h12
+ROM_START( sf2ce45 ) // sf2h12
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s45.p1", 0x000000, 0x80000, CRC(10ec67fe) SHA1(9eb30a0f64bf29028f89f9af74cb9d840ed197e2) )
ROM_LOAD16_BYTE( "c19s45.p2", 0x000001, 0x80000, CRC(92eb3a1c) SHA1(0ee294c8b82b100f98da697562f9644b71cabcdd) )
@@ -17989,7 +17989,7 @@ ROM_START( sf2ces45 ) // sf2h12
ROM_LOAD( "sf2m4.key", 0x00, 0x80, CRC(822729a2) SHA1(acaadef38fd97dba215c13688061cee87d877c19) )
ROM_END
-ROM_START( sf2ces47 ) //sf2ceub,sf2pun
+ROM_START( sf2ce47 ) //sf2ceub,sf2pun
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s47.p1", 0x000000, 0x80000, CRC(8c3bb8f8) SHA1(756ae3980c15d037ff6e70d0c309d9caed6bac4f) )
ROM_LOAD16_WORD_SWAP( "c19s47.p2", 0x080000, 0x80000, CRC(0786f114) SHA1(4a6b52c98c839fcde2b7f425739569abc74c91f4) )
@@ -18021,7 +18021,7 @@ ROM_START( sf2ces47 ) //sf2ceub,sf2pun
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces48 ) // sf2rbpr
+ROM_START( sf2ce48 ) // sf2rbpr
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD( "c19rb.p1", 0x000000, 0x80000, CRC(450532b0) SHA1(14d5ff44ce97247ef4c42147157856d16c5fb4b8) )
ROM_LOAD16_WORD( "c19s48.p2", 0x080000, 0x80000, CRC(20fd1382) SHA1(7b32b295ac4e61a7f7ae395d9dfc10d80747d833) )
@@ -18053,7 +18053,7 @@ ROM_START( sf2ces48 ) // sf2rbpr
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces49 ) // sf2sl73a
+ROM_START( sf2ce49 ) // sf2sl73a
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s49.p1", 0x000000, 0x80000, CRC(190f5419) SHA1(7fc7f3b6788d25b190bda3b3b6cf76a396d7d586) )
ROM_LOAD16_WORD_SWAP( "c19s49.p2", 0x080000, 0x80000, CRC(2b329193) SHA1(b1576b610e384fbeaef7be711888fb3fa3f10b1a) )
@@ -18085,7 +18085,7 @@ ROM_START( sf2ces49 ) // sf2sl73a
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces50 ) // sf2th
+ROM_START( sf2ce50 ) // sf2th
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19m5.p1", 0x000000, 0x80000, CRC(03991fba) SHA1(6c42bf15248640fdb3e98fb01b0a870649deb410) )
ROM_LOAD16_BYTE( "c19m5.p2", 0x000001, 0x80000, CRC(39f15a1e) SHA1(901c4fea76bf5bff7330ed07ffde54cdccdaa680) )
@@ -18122,7 +18122,7 @@ ROM_START( sf2ces50 ) // sf2th
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces51 ) // same as sf2amf3 with different gfx roms
+ROM_START( sf2ce51 ) // same as sf2amf3 with different gfx roms
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19amf3.p1", 0x000000, 0x80000, CRC(0d305e8b) SHA1(7094160abbf24c119a575d93e3fe1ab84b537de0) )
ROM_LOAD16_BYTE( "c19amf3.p2", 0x000001, 0x80000, CRC(137d8665) SHA1(cf4805a11ab614ce5b7e1302ac14ba50fb01e5f4) )
@@ -18159,7 +18159,7 @@ ROM_START( sf2ces51 ) // same as sf2amf3 with different gfx roms
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces52 ) // sf2turyu
+ROM_START( sf2ce52 ) // sf2turyu
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s52.p1", 0x000000, 0x100000, CRC(47468198) SHA1(D68D6342DA9B53163F36F44517F6DADF35E2A279) )
ROM_LOAD16_BYTE( "c19s52.p2", 0x000001, 0x100000, CRC(47d34191) SHA1(6718FDC8A0DAFEBCA7C35553CC270D16CE3F5D3E) )
@@ -18192,7 +18192,7 @@ ROM_START( sf2ces52 ) // sf2turyu
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces53 ) // sf2yyc3d5
+ROM_START( sf2ce53 ) // sf2yyc3d5
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s53.p1", 0x000000, 0x80000, CRC(bcdd2c3a) SHA1(eff98e425f283afc69064e8bc73f769e0aab93ed) )
ROM_LOAD16_BYTE( "c19s53.p2", 0x000001, 0x80000, CRC(01965987) SHA1(42abce3aa983ac4143490c0ab2e772a154905860) )
@@ -18227,7 +18227,7 @@ ROM_START( sf2ces53 ) // sf2yyc3d5
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces54 ) // sf2yyc3g
+ROM_START( sf2ce54 ) // sf2yyc3g
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s54.p1", 0x000000, 0x80000, CRC(c90559a5) SHA1(f45563c79cf5ce610f92ca84c96d337cf6c9a979) )
ROM_LOAD16_BYTE( "c19s54.p2", 0x000001, 0x80000, CRC(81f36682) SHA1(53776084c973c0b7aafb203e8efcfd5f5c659c93) )
@@ -18262,7 +18262,7 @@ ROM_START( sf2ces54 ) // sf2yyc3g
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces55 ) // sf2yyc6
+ROM_START( sf2ce55 ) // sf2yyc6
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s55.p1", 0x000000, 0x80000, CRC(ccd74822) SHA1(5f64585335ccc0fb1a97339532a6694076e2b6f2) )
ROM_LOAD16_BYTE( "c19s55.p2", 0x000001, 0x80000, CRC(2a48b557) SHA1(2e74925a925f86619d4f8e633af718a5eaa8c585) )
@@ -18297,7 +18297,7 @@ ROM_START( sf2ces55 ) // sf2yyc6
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2ces56 ) //sf2ceub,sf2puns01
+ROM_START( sf2ce56 ) //sf2ceub,sf2puns01
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19s56.p1", 0x000000, 0x80000, CRC(71ef3294) SHA1(98ea793915e32474b59ffc9be2aa8eeeb174f064) )
ROM_LOAD16_WORD_SWAP( "c19s47.p2", 0x080000, 0x80000, CRC(0786f114) SHA1(4a6b52c98c839fcde2b7f425739569abc74c91f4) )
@@ -18329,7 +18329,7 @@ ROM_START( sf2ces56 ) //sf2ceub,sf2puns01
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2ces57 )
+ROM_START( sf2ce57 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19s57.p1", 0x000000, 0x40000, CRC(438c6162) SHA1(e848280a4d03dd433712bad57c029b6c88be85f4) )
ROM_LOAD16_BYTE( "c19s57.p11", 0x000001, 0x40000, CRC(84686066) SHA1(695754329b89ea29fcb7a115034daea3c73bd2a8) )
@@ -18363,7 +18363,39 @@ ROM_START( sf2ces57 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2koryus01 )
+ROM_START( sf2ce58 ) // sf2hfsce - just says Street Fighter II' - nothing about turbo or hyper fighting
+ ROM_REGION( CODE_SIZE, "maincpu", 0 )
+ ROM_LOAD16_WORD_SWAP( "c19s58.p1", 0x000000, 0x80000, CRC(ee74bae8) SHA1(1174e3f042dec0907be0d99acc4288379f40bec0) )
+ ROM_LOAD16_WORD_SWAP( "c19s58.p2", 0x080000, 0x80000, CRC(eea9b9c0) SHA1(30ec78a81125434a7391fc886c7620e1c590f2a4) )
+ ROM_LOAD16_WORD_SWAP( "c19s58.p3", 0x100000, 0x80000, CRC(d6246802) SHA1(61b820139696b5da2189195f0e29f59c3790c085) )
+
+ ROM_REGION( 0x600000, "gfx", 0 )
+ ROM_LOAD64_WORD( "c19.c01", 0x000000, 0x80000, CRC(03b0d852) SHA1(f370f25c96ad2b94f8c53d6b7139100285a25bef) )
+ ROM_LOAD64_WORD( "c19.c03", 0x000002, 0x80000, CRC(840289ec) SHA1(2fb42a242f60ba7e74009b5a90eb26e035ba1e82) )
+ ROM_LOAD64_WORD( "c19.c05", 0x000004, 0x80000, CRC(cdb5f027) SHA1(4c7d944fef200fdfcaf57758b901b5511188ed2e) )
+ ROM_LOAD64_WORD( "c19.c07", 0x000006, 0x80000, CRC(e2799472) SHA1(27d3796429338d82a8de246a0ea06dd487a87768) )
+ ROM_LOAD64_WORD( "c19s58.c09", 0x200000, 0x80000, CRC(75e20f8c) SHA1(61a902c5e9c7e583ae9d8718dd847377539beefd) )
+ ROM_LOAD64_WORD( "c19s58.c11", 0x200002, 0x80000, CRC(ee803831) SHA1(dffbeb6d9edbc7551fffe45ecab83530749ed050) )
+ ROM_LOAD64_WORD( "c19s58.c13", 0x200004, 0x80000, CRC(779c37ed) SHA1(16db84b27523d0f46f7f2334ec22af203dbaadcb) )
+ ROM_LOAD64_WORD( "c19s58.c15", 0x200006, 0x80000, CRC(005867b6) SHA1(1622651cfaa5ae23d4876321bb83cc0aed39d517) )
+ ROM_LOAD64_WORD( "c19s58.c17", 0x400000, 0x80000, CRC(d374589b) SHA1(6078fcc6ea307086d0371e2c526c72a8a62f6ead) )
+ ROM_LOAD64_WORD( "c19s58.c19", 0x400002, 0x80000, CRC(d43d5f31) SHA1(bc6340757fabeb949b4262f5e7237d3132476fb2) )
+ ROM_LOAD64_WORD( "c19s58.c21", 0x400004, 0x80000, CRC(09e7ea4b) SHA1(e5bbf5caa653ea9c02f68792c25e405c33a084f8) )
+ ROM_LOAD64_WORD( "c19s58.c23", 0x400006, 0x80000, CRC(136d9999) SHA1(4a912bddfe472d77ae53638acd144380b798d033) )
+
+ ROM_REGION( 0x18000, "audiocpu", 0 )
+ ROM_LOAD( "c19.m1", 0x00000, 0x08000, CRC(08f6b60e) SHA1(8258fcaca4ac419312531eec67079b97f471179c) )
+ ROM_CONTINUE( 0x10000, 0x08000 )
+
+ ROM_REGION( 0x40000, "oki", 0 )
+ ROM_LOAD( "c14.v1", 0x00000, 0x20000, CRC(7f162009) SHA1(346bf42992b4c36c593e21901e22c87ae4a7d86d) )
+ ROM_LOAD( "c14.v2", 0x20000, 0x20000, CRC(beade53f) SHA1(277c397dc12752719ec6b47d2224750bd1c07f79) )
+
+ ROM_REGION( 0x80, "control", 0 )
+ ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
+ROM_END
+
+ROM_START( sf2koryu01 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19koryus01.p1", 0x000000, 0x80000, CRC(075b2f19) SHA1(65e3c21d328c0039a5537c23681796de196cab83) )
ROM_LOAD16_BYTE( "c19koryus01.p2", 0x000001, 0x80000, CRC(35783764) SHA1(b4124f508bef12f0ccd7f60c97f1f6987dab60c7) )
@@ -18396,7 +18428,7 @@ ROM_START( sf2koryus01 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2koryus02 )
+ROM_START( sf2koryu02 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19koryu.p1", 0x000000, 0x80000, CRC(9236a79a) SHA1(39c47b0b0ca2f5f569ff07ebb91040b95d0cb43b) )
ROM_LOAD16_BYTE( "c19koryu.p2", 0x000001, 0x80000, CRC(b23a869d) SHA1(24247d412f20d069919cc8a7fff208af3f7aa1d2) )
@@ -18429,7 +18461,7 @@ ROM_START( sf2koryus02 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2koryus03 )
+ROM_START( sf2koryu03 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19koryu.p1", 0x000000, 0x80000, CRC(9236a79a) SHA1(39c47b0b0ca2f5f569ff07ebb91040b95d0cb43b) )
ROM_LOAD16_BYTE( "c19koryu.p2", 0x000001, 0x80000, CRC(b23a869d) SHA1(24247d412f20d069919cc8a7fff208af3f7aa1d2) )
@@ -18462,7 +18494,7 @@ ROM_START( sf2koryus03 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2koryus04 ) // sf2koryuh
+ROM_START( sf2koryu04 ) // sf2koryuh
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19koryu.p1", 0x000000, 0x80000, CRC(9236a79a) SHA1(39c47b0b0ca2f5f569ff07ebb91040b95d0cb43b) )
ROM_LOAD16_BYTE( "c19koryus04.p2", 0x000001, 0x80000, CRC(2722741f) SHA1(d2a2ea29894fbf731f6c8573b85e046dd52e2c97) )
@@ -18972,7 +19004,7 @@ ROM_END
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2reds01 )
+ROM_START( sf2red01 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds01.p1", 0x000000, 0x80000, CRC(a3972cc1) SHA1(e53848032fce742b37f01c7d727c83dfca4740c4) )
ROM_LOAD16_WORD_SWAP( "c19reds01.p2", 0x080000, 0x80000, CRC(b2ed8f89) SHA1(6b6aea1ce55331682d5940d28b2e2f53f6732dba) )
@@ -19004,7 +19036,7 @@ ROM_START( sf2reds01 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds02 )
+ROM_START( sf2red02 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds02.p1", 0x000000, 0x80000, CRC(771492cc) SHA1(390fd74e147d2d352402b983bd3e68b3890eac50) )
ROM_LOAD16_WORD_SWAP( "c19reds02.p2", 0x080000, 0x80000, CRC(ca94a203) SHA1(25d716bc4d043d5cef082d80ae1f7586016e5191) )
@@ -19036,7 +19068,7 @@ ROM_START( sf2reds02 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds03 )
+ROM_START( sf2red03 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds03.p1", 0x000000, 0x80000, CRC(da6881b2) SHA1(8fb69799e6682f76e83fbcb643d284173f1d9c90) )
ROM_LOAD16_WORD_SWAP( "c19reds03.p2", 0x080000, 0x80000, CRC(746c8dc3) SHA1(ecc711feb021f9594596d6b2248d3ae3fecf5ec4) )
@@ -19068,7 +19100,7 @@ ROM_START( sf2reds03 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds04 )
+ROM_START( sf2red04 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds04.p1", 0x000000, 0x80000, CRC(76741a66) SHA1(171316a08474e938cac5123ecbc772d72d98406c) )
ROM_LOAD16_WORD_SWAP( "c19reds01.p2", 0x080000, 0x80000, CRC(b2ed8f89) SHA1(6b6aea1ce55331682d5940d28b2e2f53f6732dba) )
@@ -19100,7 +19132,7 @@ ROM_START( sf2reds04 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds05 )
+ROM_START( sf2red05 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds05.p1", 0x000000, 0x80000, CRC(4f82255d) SHA1(633e700ff09a900e24ba1d64af4cdf516be7df6d) )
ROM_LOAD16_WORD_SWAP( "c19reds05.p2", 0x080000, 0x80000, CRC(7c72351f) SHA1(9e2de669d4eb39dbda51939d6ddea4eefd1f2c95) )
@@ -19132,7 +19164,7 @@ ROM_START( sf2reds05 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds06 )
+ROM_START( sf2red06 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds06.p1", 0x000000, 0x80000, CRC(436e3208) SHA1(d82234295f840b2d3240571e45843089c712e59e) )
ROM_LOAD16_WORD_SWAP( "c19reds06.p2", 0x080000, 0x80000, CRC(c3d93533) SHA1(9f4753f0419e1fde5ded510714f537101d7d70f7) )
@@ -19164,7 +19196,7 @@ ROM_START( sf2reds06 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2reds07 )
+ROM_START( sf2red07 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c19reds07.p1", 0x000000, 0x80000, CRC(2995bef5) SHA1(24da08b8b716bf58fb9a7351d7095079f46347f9) )
ROM_LOAD16_WORD_SWAP( "c19reds07.p2", 0x080000, 0x80000, CRC(e04c15ae) SHA1(06109775358e89ee13d007d19111b92730755db1) )
@@ -19196,7 +19228,7 @@ ROM_START( sf2reds07 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2tlonas01 )
+ROM_START( sf2tlona01 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas01.p1", 0x000000, 0x80000, CRC(ac1ff60d) SHA1(2867e3d70f453efd3ffd8cd8e2453fbe88c69090) )
ROM_LOAD16_BYTE( "c19tlonas01.p2", 0x000001, 0x80000, CRC(1e5ccf52) SHA1(6a454b889ac3a97c14025d41586a31ceec69592b) )
@@ -19229,7 +19261,7 @@ ROM_START( sf2tlonas01 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas02 )
+ROM_START( sf2tlona02 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas02.p1", 0x000000, 0x80000, CRC(1485eba1) SHA1(c576cd8c931e1ac731f8531c03b26fc58bf46f38) )
ROM_LOAD16_BYTE( "c19tlonas02.p2", 0x000001, 0x80000, CRC(35215c2b) SHA1(9f2a5d75f4635c62beec862a53d6909a544cd897) )
@@ -19262,7 +19294,7 @@ ROM_START( sf2tlonas02 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas03 )
+ROM_START( sf2tlona03 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas03.p1", 0x000000, 0x80000, CRC(aec46373) SHA1(68e79d594583f23d56d3286de1af9cc80f802be9) )
ROM_LOAD16_BYTE( "c19tlonas02.p2", 0x000001, 0x80000, CRC(35215c2b) SHA1(9f2a5d75f4635c62beec862a53d6909a544cd897) )
@@ -19295,7 +19327,7 @@ ROM_START( sf2tlonas03 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas04 )
+ROM_START( sf2tlona04 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas04.p1", 0x000000, 0x80000, CRC(c6bb06f5) SHA1(1505b3d43d07c70ed74c86195e905bd4c5a2ecdc) )
ROM_LOAD16_BYTE( "c19tlonas04.p2", 0x000001, 0x80000, CRC(26194e1d) SHA1(c1ec4cc445068f2c48d2f86b91dcea0e5f9ee3a9) )
@@ -19328,7 +19360,7 @@ ROM_START( sf2tlonas04 )
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas05 ) // sf2tlona
+ROM_START( sf2tlona05 ) // sf2tlona
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas05.p1", 0x000000, 0x80000, CRC(158635ca) SHA1(878b56064861993ac92fbd88eb1117d3680fe7d7) )
ROM_LOAD16_BYTE( "c19tlonas05.p2", 0x000001, 0x80000, CRC(882cd1c4) SHA1(0cb971756352b1022ecd309b1bc3688c1f1acbd8) )
@@ -19361,7 +19393,7 @@ ROM_START( sf2tlonas05 ) // sf2tlona
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas06 ) // sf2tlonb
+ROM_START( sf2tlona06 ) // sf2tlonb
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas06.p1", 0x000000, 0x80000, CRC(afc7bd18) SHA1(ef7af7fb3563073b96563274ec48783feb2be757) )
ROM_LOAD16_BYTE( "c19tlonas05.p2", 0x000001, 0x80000, CRC(882cd1c4) SHA1(0cb971756352b1022ecd309b1bc3688c1f1acbd8) )
@@ -19394,7 +19426,7 @@ ROM_START( sf2tlonas06 ) // sf2tlonb
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2tlonas07 ) // sf2tlonc
+ROM_START( sf2tlona07 ) // sf2tlonc
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c19tlonas06.p1", 0x000000, 0x80000, CRC(afc7bd18) SHA1(ef7af7fb3563073b96563274ec48783feb2be757) )
ROM_LOAD16_BYTE( "c19tlonas05.p2", 0x000001, 0x80000, CRC(882cd1c4) SHA1(0cb971756352b1022ecd309b1bc3688c1f1acbd8) )
@@ -19431,7 +19463,7 @@ ROM_END
Street Fighter II: Hyper Fighting
***************************************/
-ROM_START( sf2hfs01 ) // sf2h13
+ROM_START( sf2hf01 ) // sf2h13
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_BYTE( "c24s01.p1", 0x000000, 0x80000, CRC(ec6f5cb3) SHA1(24b3fc88a08a721985b053120997090bc394bc8e) )
ROM_LOAD16_BYTE( "c24s01.p2", 0x000001, 0x80000, CRC(0e9ac52b) SHA1(2c5faf7d8b598f2110f389aefa1a02e2281382ee) )
@@ -19464,7 +19496,7 @@ ROM_START( sf2hfs01 ) // sf2h13
ROM_LOAD( "sf2m2.key", 0x00, 0x80, CRC(67e80fca) SHA1(e937bc4cf0e05ba93c32bc47d65c5b027bc2b48e) )
ROM_END
-ROM_START( sf2hfus01 )
+ROM_START( sf2hfu01 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c24u.p1", 0x000000, 0x80000, CRC(89a1fc38) SHA1(aafb40fc311e318250973be8c6aa0d3f7902cb3c) )
ROM_LOAD16_WORD_SWAP( "c24us01.p2", 0x080000, 0x80000, CRC(d1398057) SHA1(06a0614c1ef04d72832fb03c1cfb0b16eb325bbc) )
@@ -19496,7 +19528,7 @@ ROM_START( sf2hfus01 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2hfus02 )
+ROM_START( sf2hfu02 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c24u.p1", 0x000000, 0x80000, CRC(89a1fc38) SHA1(aafb40fc311e318250973be8c6aa0d3f7902cb3c) )
ROM_LOAD16_WORD_SWAP( "c24us02.p2", 0x080000, 0x80000, CRC(db46732e) SHA1(50b9d81d38ee46fec7354b20837949f5e50993a3) )
@@ -19528,7 +19560,7 @@ ROM_START( sf2hfus02 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2hfus03 )
+ROM_START( sf2hfu03 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c24us03.p1", 0x000000, 0x80000, CRC(0a624427) SHA1(2dd0e314d66e0dd2b3612a127bc74bd911155d0e) )
ROM_LOAD16_WORD_SWAP( "c24.p2", 0x080000, 0x80000, CRC(aea6e035) SHA1(ce5fe961b2c1c95d231d1235bfc03b47de489f2a) )
@@ -19560,7 +19592,7 @@ ROM_START( sf2hfus03 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2hfus04 )
+ROM_START( sf2hfu04 )
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c24us04.p1", 0x000000, 0x80000, CRC(a1a94916) SHA1(2c97a3a9df55729f8be9d52d5d551a5286e101c9) )
ROM_LOAD16_WORD_SWAP( "c24.p2", 0x080000, 0x80000, CRC(aea6e035) SHA1(ce5fe961b2c1c95d231d1235bfc03b47de489f2a) )
@@ -19592,7 +19624,7 @@ ROM_START( sf2hfus04 )
ROM_LOAD( "sf2ce.key", 0x00, 0x80, CRC(35b37429) SHA1(b372cce106c0900554735c207fb333ac93554ec2) )
ROM_END
-ROM_START( sf2hfus05 ) // sf2hf_ukraine
+ROM_START( sf2hfu05 ) // sf2hf_ukraine
ROM_REGION( CODE_SIZE, "maincpu", 0 )
ROM_LOAD16_WORD_SWAP( "c24us05.p1", 0x000000, 0x80000, CRC(7e5e9fa5) SHA1(eeddd2344a984bf3c386db4a200e2b1e9535343f) )
ROM_LOAD16_WORD_SWAP( "c24us05.p2", 0x080000, 0x80000, CRC(34a6a55f) SHA1(26978953bda0a764aa9d29dac61f71951719f69c) )
@@ -28394,65 +28426,66 @@ GAME( 1992, sf2s13, sf2, cps1_10MHz, sf2j, cps_state, init_cps1,
GAME( 2014, sf2s14, sf2, cps1_10MHz, sf2j, cps_state, init_cps1, ROT0, "hack", "Street Fighter II: The World Warrior (King Of The Four Heavenly Kings)", MACHINE_SUPPORTS_SAVE )
GAME( 2016, sf2s15, sf2, cps1_10MHz, sf2j, cps_state, init_cps1, ROT0, "hack", "Street Fighter II: The World Warrior (12 Person Version 2016-01-01)", MACHINE_SUPPORTS_SAVE )
// Street Fighter II: Champion Edition
-GAME( 1992, sf2ces01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Brazil)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Hispanic)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Do Not Force)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Sangigel's Whirlwind To Sit Simplified)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Vega Lifts The Main Scene Crawl Limit)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Super Plus Teleportation)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces07, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Turbo Balrog Storm)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces08, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Galactic Super Vega)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces09, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Insane Edition)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces10, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Brazil 920313/hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces12, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Hispanic 990804/hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces13, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Amazing M5 Gold Edition, 2019-08-01)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces14, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Communist Edition, 2019-07-12)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces15, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Extra Koryu, 2019-06-13)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces16, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Super V, 2019-04-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces17, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Deluxe, 2019-03-31)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces18, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Super, 2019-02-20)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces19, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultimate Golden Edition V2, 2019-01-27)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces20, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultimate Golden Edition X, 2018-12-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces21, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu 03 V1, 2018-09-24)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces22, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu 03 V2, 2018-11-01)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces23, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Omega Edition, 2018-11-12)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces24, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Blanka Funny Fight, 2018-10-16)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces25, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Super Ryu, 2018-05-01)", MACHINE_SUPPORTS_SAVE )
-GAME( 2016, sf2ces26, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "DDJ", "Street Fighter II': Champion Edition (Quick Go Next Stage, 2016-01-23)", MACHINE_SUPPORTS_SAVE )
-GAME( 2016, sf2ces27, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "DDJ", "Street Fighter II': Champion Edition (Easy Move, 2016-08-04)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces28, sf2ce, cps1_12MHz, sf2, cps_state, init_sf2rb, ROT0, "DDJ", "Street Fighter II': Champion Edition (Rainbow, bootleg, Easy Move, 2018-05-06)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces29, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (3 Questions Edition, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces30, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (3 Questions Edition Simplify The Move, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces31, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Question Mark Edition, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces32, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Question Mark Edition Simplify The Move, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2ces33, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Chinese Voice Version Simplified, 2020-06-30)", MACHINE_SUPPORTS_SAVE )
-GAME( 2020, sf2ces34, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Lowtax is a Wifebeater parody Simplified, 2020-08-03)", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, sf2ces35, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Sheng Long Hack v7.1)", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, sf2ces36, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Unknown Hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 2009, sf2ces37, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Kawada7278", "Street Fighter II': Champion Edition (Without Using Force)", MACHINE_SUPPORTS_SAVE )
-GAME( 2009, sf2ces38, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Moves hack, 2009-01-10)", MACHINE_SUPPORTS_SAVE )
-GAME( 2009, sf2ces39, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blackheart", "Street Fighter II': Champion Edition (Easy Moves, 2009-07-30)", MACHINE_SUPPORTS_SAVE )
-GAME( 2020, sf2ces40, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "A Goon", "Street Fighter II': Champion Edition (Lowtax is a Wifebeater parody)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces41, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (920322 Japan bootleg set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces42, sf2ce, cps1_12MHz, sf2, cps_state, init_sf2h9, ROT0, "Mega Co", "Street Fighter II': Champion Edition (bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces43, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Alpha Magic-F bootleg set 4, 920313 etc)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces44, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (920322 Japan bootleg set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces45, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Rainbow bootleg set 5, 920322 Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, sf2ces47, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Punishment Simplified Edition v1 Final, 2012-04-10)", MACHINE_SUPPORTS_SAVE )
-GAME( 2021, sf2ces48, sf2ce, cps1_12MHz, sf2rb, cps_state, init_cps1, ROT0, "Rotwang", "Street Fighter II': Champion Edition (Rainbow, bootleg, set 1, protection removed)", MACHINE_SUPPORTS_SAVE )
-GAME( 2013, sf2ces49, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Sheng Long v7.3a)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces50, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Turbo set 1, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces51, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Turbo set 2, bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces52, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Tu Long prototype)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces53, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (Red Wave bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces54, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (V004 bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2ces55, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (YYC bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2ces56, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Punishment Edition Simplified, 2018-06-26)", MACHINE_SUPPORTS_SAVE )
-GAME( 2015, sf2ces57, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Hacks Unknown, 2015-10-12)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2koryus01, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "King Of Destruction", "Street Fighter II': Champion Edition (Huaping Repair)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2koryus02, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition: Xiang Long (Chinese bootleg set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2koryus03, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition: Xiang Long (Chinese bootleg set 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 2013, sf2koryus04, sf2ce, cps1_12MHz, sf2hack, cps_state, init_cps1, ROT0, "TT", "Street Fighter II': Champion Edition (Koryu)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Brazil)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Hispanic)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Do Not Force)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Sangigel's Whirlwind To Sit Simplified)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Vega Lifts The Main Scene Crawl Limit)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Super Plus Teleportation)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce07, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Turbo Balrog Storm)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce08, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Galactic Super Vega)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce09, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Insane Edition)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce10, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Brazil 920313/hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce12, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Hispanic 990804/hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce13, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Amazing M5 Gold Edition, 2019-08-01)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce14, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Communist Edition, 2019-07-12)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce15, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Extra Koryu, 2019-06-13)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce16, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Super V, 2019-04-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce17, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Deluxe, 2019-03-31)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce18, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition Super, 2019-02-20)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce19, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultimate Golden Edition V2, 2019-01-27)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce20, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultimate Golden Edition X, 2018-12-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce21, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu 03 V1, 2018-09-24)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce22, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu 03 V2, 2018-11-01)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce23, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Omega Edition, 2018-11-12)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce24, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Blanka Funny Fight, 2018-10-16)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce25, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Super Ryu, 2018-05-01)", MACHINE_SUPPORTS_SAVE )
+GAME( 2016, sf2ce26, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "DDJ", "Street Fighter II': Champion Edition (Quick Go Next Stage, 2016-01-23)", MACHINE_SUPPORTS_SAVE )
+GAME( 2016, sf2ce27, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "DDJ", "Street Fighter II': Champion Edition (Easy Move, 2016-08-04)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce28, sf2ce, cps1_12MHz, sf2, cps_state, init_sf2rb, ROT0, "DDJ", "Street Fighter II': Champion Edition (Rainbow, bootleg, Easy Move, 2018-05-06)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce29, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (3 Questions Edition, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce30, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (3 Questions Edition Simplify The Move, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce31, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Question Mark Edition, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce32, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Question Mark Edition Simplify The Move, 2019-10-21)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2ce33, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Chinese Voice Version Simplified, 2020-06-30)", MACHINE_SUPPORTS_SAVE )
+GAME( 2020, sf2ce34, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Lowtax is a Wifebeater parody Simplified, 2020-08-03)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, sf2ce35, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Sheng Long Hack v7.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, sf2ce36, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Unknown Hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 2009, sf2ce37, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Kawada7278", "Street Fighter II': Champion Edition (Without Using Force)", MACHINE_SUPPORTS_SAVE )
+GAME( 2009, sf2ce38, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Moves hack, 2009-01-10)", MACHINE_SUPPORTS_SAVE )
+GAME( 2009, sf2ce39, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blackheart", "Street Fighter II': Champion Edition (Easy Moves, 2009-07-30)", MACHINE_SUPPORTS_SAVE )
+GAME( 2020, sf2ce40, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "A Goon", "Street Fighter II': Champion Edition (Lowtax is a Wifebeater parody)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce41, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (920322 Japan bootleg set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce42, sf2ce, cps1_12MHz, sf2, cps_state, init_sf2h9, ROT0, "Mega Co", "Street Fighter II': Champion Edition (bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce43, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Alpha Magic-F bootleg set 4, 920313 etc)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce44, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (920322 Japan bootleg set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce45, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "bootleg", "Street Fighter II': Champion Edition (Rainbow bootleg set 5, 920322 Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, sf2ce47, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Punishment Simplified Edition v1 Final, 2012-04-10)", MACHINE_SUPPORTS_SAVE )
+GAME( 2021, sf2ce48, sf2ce, cps1_12MHz, sf2rb, cps_state, init_cps1, ROT0, "Rotwang", "Street Fighter II': Champion Edition (Rainbow, bootleg, set 1, protection removed)", MACHINE_SUPPORTS_SAVE )
+GAME( 2013, sf2ce49, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Sheng Long v7.3a)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce50, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Turbo set 1, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce51, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Turbo set 2, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce52, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Tu Long prototype)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce53, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (Red Wave bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce54, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (V004 bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2ce55, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (YYC bootleg set 2, 920313 etc)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2ce56, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Drakon", "Street Fighter II': Champion Edition (Punishment Edition Simplified, 2018-06-26)", MACHINE_SUPPORTS_SAVE )
+GAME( 2015, sf2ce57, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "hack", "Street Fighter II': Champion Edition (Hacks Unknown, 2015-10-12)", MACHINE_SUPPORTS_SAVE )
+GAME( 2024, sf2ce58, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Brazilian Mr Street Fighter", "Street Fighter II' (SrSreet edition)", MACHINE_SUPPORTS_SAVE ) // bad tile for Blanka on player select screen
+GAME( 1992, sf2koryu01, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "King Of Destruction", "Street Fighter II': Champion Edition (Huaping Repair)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2koryu02, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition: Xiang Long (Chinese bootleg set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2koryu03, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition: Xiang Long (Chinese bootleg set 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 2013, sf2koryu04, sf2ce, cps1_12MHz, sf2hack, cps_state, init_cps1, ROT0, "TT", "Street Fighter II': Champion Edition (Koryu)", MACHINE_SUPPORTS_SAVE )
GAME( 2020, sf2mix96, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1, ROT0, "Zero800", "Street Fighter II: Champion Edition (Mix 0.96)", MACHINE_SUPPORTS_SAVE )
GAME( 2020, sf2mix96d, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1, ROT0, "Zero800", "Street Fighter II: Champion Edition (Mix 0.96d)", MACHINE_SUPPORTS_SAVE )
GAME( 2020, sf2mix97, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1, ROT0, "Zero800", "Street Fighter II: Champion Edition (Mix 0.97)", MACHINE_SUPPORTS_SAVE )
@@ -28467,27 +28500,27 @@ GAME( 2022, sf2mix110, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1,
GAME( 2022, sf2mix120, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1, ROT0, "Zero800", "Street Fighter II: Champion Edition (Mix 1.2)", MACHINE_SUPPORTS_SAVE )
GAME( 2023, sf2mix, sf2ce, cps1_12MHz, sf2mix, cps_state, init_cps1, ROT0, "Zero800", "Street Fighter II: Champion Edition (Mix 1.3)", MACHINE_SUPPORTS_SAVE )
GAME( 1992, sf2mkot01, sf2, cps1_10MHz, sf2hack, cps_state, init_sf2hack, ROT0, "bootleg", "Street Fighter II': Magic KO Turbo - Nightmare Crack (set 2)", MACHINE_SUPPORTS_SAVE ) // 920666
-GAME( 2018, sf2reds01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2reds02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Hardest Level)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2reds03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultra Golden Edition)", MACHINE_SUPPORTS_SAVE )
-GAME( 2018, sf2reds04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Golden Edition Easy Move)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2reds05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (The CPU strikes back Yoga, 2019-05-06)", MACHINE_SUPPORTS_SAVE )
-GAME( 2019, sf2reds06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu Street Warriors, 2019-06-13)", MACHINE_SUPPORTS_SAVE )
-GAME( 2020, sf2reds07, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (2020 Golden Edition)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2tlonas01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "King of Destruction", "Street Fighter II': Champion Edition (Replacement Blank Screen Repair)", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, sf2tlonas02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Zangief Spiral Piling Instructions Simplify, 2012-01-1X)", MACHINE_SUPPORTS_SAVE )
-GAME( 2012, sf2tlonas03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Zangief Spiral Piling Instructions Simplify, 2012-01-15)", MACHINE_SUPPORTS_SAVE )
-GAME( 2015, sf2tlonas04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Easy Move, 2015-11-01)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2tlonas05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 1, 811102 001)", MACHINE_SUPPORTS_SAVE ) // These 2 are Chinese bootlegs
-GAME( 1992, sf2tlonas06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 2, 811102 001)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2tlonas07, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 3, 811102 001)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2red01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Golden Edition)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2red02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Hardest Level)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2red03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Ultra Golden Edition)", MACHINE_SUPPORTS_SAVE )
+GAME( 2018, sf2red04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Golden Edition Easy Move)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2red05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (The CPU strikes back Yoga, 2019-05-06)", MACHINE_SUPPORTS_SAVE )
+GAME( 2019, sf2red06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (Koryu Street Warriors, 2019-06-13)", MACHINE_SUPPORTS_SAVE )
+GAME( 2020, sf2red07, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "MamePlus", "Street Fighter II': Champion Edition (2020 Golden Edition)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2tlona01, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "King of Destruction", "Street Fighter II': Champion Edition (Replacement Blank Screen Repair)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, sf2tlona02, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Zangief Spiral Piling Instructions Simplify, 2012-01-1X)", MACHINE_SUPPORTS_SAVE )
+GAME( 2012, sf2tlona03, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Pipi899", "Street Fighter II': Champion Edition (Zangief Spiral Piling Instructions Simplify, 2012-01-15)", MACHINE_SUPPORTS_SAVE )
+GAME( 2015, sf2tlona04, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "hack", "Street Fighter II': Champion Edition (Easy Move, 2015-11-01)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2tlona05, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 1, 811102 001)", MACHINE_SUPPORTS_SAVE ) // These 2 are Chinese bootlegs
+GAME( 1992, sf2tlona06, sf2ce, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 2, 811102 001)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2tlona07, sf2ce, cps1_12MHz, sf2hack, cps_state, init_sf2hack, ROT0, "Tu Long", "Street Fighter II': Champion Edition (Tu Long bootleg set 3, 811102 001)", MACHINE_SUPPORTS_SAVE )
// Street Fighter II: Hyper Fighting
-GAME( 1992, sf2hfs01, sf2hf, cps1_12MHz, sf2j, cps_state, init_sf2h13, ROT0, "hack", "Street Fighter II' Turbo: Hyper Fighting (bootleg set 1, 921209 Japan)", MACHINE_SUPPORTS_SAVE ) // bad tile for Blanka on player select screen
-GAME( 1992, sf2hfus01, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Deceleration)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2hfus02, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Shorten the time 60% )", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2hfus03, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Guile Shorten the time 1 90% )", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, sf2hfus04, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Guile Shorten the time 2 90% )", MACHINE_SUPPORTS_SAVE )
-GAME( 2022, sf2hfus05, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Rotwang", "Street Fighter II': Hyper Fighting (Ukraine version)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2hf01, sf2hf, cps1_12MHz, sf2j, cps_state, init_sf2h13, ROT0, "hack", "Street Fighter II' Turbo: Hyper Fighting (bootleg set 1, 921209 Japan)", MACHINE_SUPPORTS_SAVE ) // bad tile for Blanka on player select screen
+GAME( 1992, sf2hfu01, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Deceleration)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2hfu02, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Shorten the time 60% )", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2hfu03, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Guile Shorten the time 1 90% )", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, sf2hfu04, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Blue-Ray", "Street Fighter II': Hyper Fighting (Guile Shorten the time 2 90% )", MACHINE_SUPPORTS_SAVE )
+GAME( 2022, sf2hfu05, sf2hf, cps1_12MHz, sf2, cps_state, init_cps1, ROT0, "Rotwang", "Street Fighter II': Hyper Fighting (Ukraine version)", MACHINE_SUPPORTS_SAVE )
// Saturday Night Slam Masters
GAME( 1993, slammasts01, slammast, qsound, slammast, cps_state, init_slammast, ROT0, "Creamymami[EGCG]", "Saturday Night Slam Masters (Region Asia Version)", MACHINE_SUPPORTS_SAVE )
GAME( 1993, slammasts02, slammast, qsound, slammast, cps_state, init_slammast, ROT0, "Creamymami[EGCG]", "Saturday Night Slam Masters (Region Asia Version (Buggy))", MACHINE_SUPPORTS_SAVE )
diff --git a/src/hbmame/hbmame.lst b/src/hbmame/hbmame.lst
index 10d25b0ed49..58ada133b96 100644
--- a/src/hbmame/hbmame.lst
+++ b/src/hbmame/hbmame.lst
@@ -933,71 +933,72 @@ punisherjs22
punisherjs23
punisherjs24
rockmank
-sf2ces01
-sf2ces02
-sf2ces03
-sf2ces04
-sf2ces05
-sf2ces06
-sf2ces07
-sf2ces08
-sf2ces09
-sf2ces10
-sf2ces12
-sf2ces13
-sf2ces14
-sf2ces15
-sf2ces16
-sf2ces17
-sf2ces18
-sf2ces19
-sf2ces20
-sf2ces21
-sf2ces22
-sf2ces23
-sf2ces24
-sf2ces25
-sf2ces26
-sf2ces27
-sf2ces28
-sf2ces29
-sf2ces30
-sf2ces31
-sf2ces32
-sf2ces33
-sf2ces34
-sf2ces35
-sf2ces36
-sf2ces38
-sf2ces37
-sf2ces39
-sf2ces40
-sf2ces41
-sf2ces42
-sf2ces43
-sf2ces44
-sf2ces45
-sf2ces47
-sf2ces48
-sf2ces49
-sf2ces50
-sf2ces51
-sf2ces52
-sf2ces53
-sf2ces54
-sf2ces55
-sf2ces56
-sf2ces57
-sf2hfs01
-sf2hfus01
-sf2hfus02
-sf2hfus03
-sf2hfus04
-sf2hfus05
-sf2koryus01
-sf2koryus02
-sf2koryus03
-sf2koryus04
+sf2ce01
+sf2ce02
+sf2ce03
+sf2ce04
+sf2ce05
+sf2ce06
+sf2ce07
+sf2ce08
+sf2ce09
+sf2ce10
+sf2ce12
+sf2ce13
+sf2ce14
+sf2ce15
+sf2ce16
+sf2ce17
+sf2ce18
+sf2ce19
+sf2ce20
+sf2ce21
+sf2ce22
+sf2ce23
+sf2ce24
+sf2ce25
+sf2ce26
+sf2ce27
+sf2ce28
+sf2ce29
+sf2ce30
+sf2ce31
+sf2ce32
+sf2ce33
+sf2ce34
+sf2ce35
+sf2ce36
+sf2ce38
+sf2ce37
+sf2ce39
+sf2ce40
+sf2ce41
+sf2ce42
+sf2ce43
+sf2ce44
+sf2ce45
+sf2ce47
+sf2ce48
+sf2ce49
+sf2ce50
+sf2ce51
+sf2ce52
+sf2ce53
+sf2ce54
+sf2ce55
+sf2ce56
+sf2ce57
+sf2ce58
+sf2hf01
+sf2hfu01
+sf2hfu02
+sf2hfu03
+sf2hfu04
+sf2hfu05
+sf2koryu01
+sf2koryu02
+sf2koryu03
+sf2koryu04
sf2mix96
sf2mix96d
sf2mix97
@@ -1012,13 +1013,13 @@ sf2mix110
sf2mix120
sf2mix
sf2mkot01
-sf2reds01
-sf2reds02
-sf2reds03
-sf2reds04
-sf2reds05
-sf2reds06
-sf2reds07
+sf2red01
+sf2red02
+sf2red03
+sf2red04
+sf2red05
+sf2red06
+sf2red07
sf2s01
sf2s02
sf2s03
@@ -1034,13 +1035,13 @@ sf2s12
sf2s13
sf2s14
sf2s15
-sf2tlonas01
-sf2tlonas02
-sf2tlonas03
-sf2tlonas04
-sf2tlonas05
-sf2tlonas06
-sf2tlonas07
+sf2tlona01
+sf2tlona02
+sf2tlona03
+sf2tlona04
+sf2tlona05
+sf2tlona06
+sf2tlona07
sfzchs02
sfzchs03
sfzchs04