diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /hash/ibm5170.xml | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/ibm5170.xml')
-rw-r--r-- | hash/ibm5170.xml | 176 |
1 files changed, 2 insertions, 174 deletions
diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml index bd302853dde..f37b40869bf 100644 --- a/hash/ibm5170.xml +++ b/hash/ibm5170.xml @@ -8543,20 +8543,6 @@ </part> </software> - <software name="cischeat"> - <!-- Dumped via Kryoflux --> - <description>Cisco Heat - All American Police Car Race</description> - <year>1991</year> - <publisher>Image Works</publisher> - <info name="developer" value="Jaleco" /> - <part name="flop1" interface="floppy_3_5"> - <!-- Copy-protected key disk --> - <dataarea name="flop" size = "2153384"> - <rom name="Cisco Heat [Image Works] [1991] [3.5DD] [Disk 1 of 1].mfm" size="2153384" crc="07c98b52" sha1="dc195a57fb7ca8289e803c4f9173d17be72518ef" offset="0"/> - </dataarea> - </part> - </software> - <software name="wincr2"> <!-- converted from DDI format --> <description>Classic Road 2</description> @@ -9231,24 +9217,6 @@ </part> </software> - <software name="dstrike"> - <description>Desert Strike: Return to the Gulf</description> - <year>1994</year> - <publisher>Gremlin Interactive</publisher> - <info name="developer" value="Electronic Arts" /> - <info name="ported by" value="Speedlink Communications" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Desert Strike - Return To Gulf [Gremlin Interactive] [1994] [3.5HD] [Disk 1 of 2].img" size="1474560" crc="3db7fd98" sha1="8d7f5a2bef303e8e6324ae038035e8e4375f4255" offset="0"/> - </dataarea> - </part> - <part name="flop2" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Desert Strike - Return To Gulf [Gremlin Interactive] [1994] [3.5HD] [Disk 2 of 2].img" size="1474560" crc="be380f9d" sha1="c77681b251da7636f24255442ad3cae563dc7f89" offset="0"/> - </dataarea> - </part> - </software> - <software name="duke"> <!-- Dumped via Kryoflux from an original disk, all tracks show as modified - most likely not professionally duplicated --> <!-- from a registered version ordered circa 2004 --> @@ -10001,7 +9969,7 @@ <software name="hook"> <description>Hook</description> <year>1992</year> - <publisher>Ocean Software</publisher> + <publisher>Ocean Software Ltd.</publisher> <part name="flop1" interface="floppy_3_5"> <dataarea name="flop" size="737280"> <rom name="disk1.img" size="737280" crc="95e41749" sha1="4a319888e029ea2ba9bd748b74163865dd560843" offset="0" /> @@ -10281,7 +10249,7 @@ <software name="indycar"> <description>IndyCar Racing</description> <year>1993</year> - <publisher>Papyrus Publishing</publisher> + <publisher>Papyrus Publishing Inc.</publisher> <info name="version" value="1.02" /> <part name="flop1" interface="floppy_3_5"> <dataarea name="flop" size="1474560"> @@ -10476,49 +10444,6 @@ </part> </software> - <software name="lemmings"> - <!-- Dumped via Kryoflux --> - <description>Lemmings</description> - <year>1991</year> - <publisher>Psygnosis</publisher> - <info name="developer" value="DMA Design" /> - <part name="flop1" interface="floppy_3_5"> - <!-- Copy-protected key disk --> - <dataarea name="flop" size = "2181136"> - <rom name="Lemmings [Psygnosis] [1991] [3.5DD] [Disk 1 of 1].mfm" size="2181136" crc="82b47a9b" sha1="7f0912d798c97a56ac8eea1f87caa20cc2044b94" offset="0"/> - </dataarea> - </part> - </software> - - <software name="lemming3"> - <description>All New World Of Lemmings</description> - <year>1994</year> - <publisher>Psygnosis</publisher> - <info name="developer" value="DMA Design" /> - <info name="version" value="v1.53" /> - <info name="usage" value="Mouse and EMS Memory required" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="All New World Of Lemmings [Psygnosis] [1994] [3.5HD] [Disk 1 of 4].img" size="1474560" crc="23259f9a" sha1="1d1b5e21d0bd9089ba0ac41be7ca1b3ffecf15af" offset="0"/> - </dataarea> - </part> - <part name="flop2" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="All New World Of Lemmings [Psygnosis] [1994] [3.5HD] [Disk 2 of 4].img" size="1474560" crc="3826e140" sha1="b33476065013e26315bd66c33abaa301d7f6edea" offset="0"/> - </dataarea> - </part> - <part name="flop3" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="All New World Of Lemmings [Psygnosis] [1994] [3.5HD] [Disk 3 of 4].img" size="1474560" crc="d9c345b4" sha1="b0645535d12920edb2b3c918d1fe19a0e7458366" offset="0"/> - </dataarea> - </part> - <part name="flop4" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="All New World Of Lemmings [Psygnosis] [1994] [3.5HD] [Disk 4 of 4].img" size="1474560" crc="96cf7c5d" sha1="a02d03b959b2c54ae1f1fbaf7e628b30812a56fb" offset="0"/> - </dataarea> - </part> - </software> - <software name="lightspd"> <description>Lightspeed</description> <year>1990</year> @@ -10782,46 +10707,6 @@ </part> </software> - <software name="micromac"> - <description>Micro Machines</description> - <year>1994</year> - <publisher>Codemasters</publisher> - <info name="developer" value="Codemasters" /> - <info name="ported by" value="The Big Red Software" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "737280"> - <rom name="Micro Machines [Codemasters] [1994] [3.5DD] [Disk 1 of 1].img" size="737280" crc="3bc676f8" sha1="da941c58f12b7e07b19356716bf5f028106488f5" offset="0"/> - </dataarea> - </part> - </software> - - <software name="micromc2"> - <description>Micro Machines 2: Turbo Tournament</description> - <year>1995</year> - <publisher>Codemasters</publisher> - <info name="developer" value="Supersonic Software" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Micro Machines 2 [Codemasters] [1995] [3.5HD] [Disk 1 of 4].img" size="1474560" crc="0e75c5ae" sha1="5f0ba1fd58323c129b250225de7b99d5215f88b1" offset="0"/> - </dataarea> - </part> - <part name="flop2" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Micro Machines 2 [Codemasters] [1995] [3.5HD] [Disk 2 of 4].img" size="1474560" crc="89887dc2" sha1="2c697a24ccc34766e8d809460494000c73b9cf62" offset="0"/> - </dataarea> - </part> - <part name="flop3" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Micro Machines 2 [Codemasters] [1995] [3.5HD] [Disk 3 of 4].img" size="1474560" crc="38daef7b" sha1="ba5cc6fe2b767740010e9878d5a2f26d66e8ab78" offset="0"/> - </dataarea> - </part> - <part name="flop4" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Micro Machines 2 [Codemasters] [1995] [3.5HD] [Disk 4 of 4].img" size="1474560" crc="242de9de" sha1="64b552300f3cdb5d5ff73f7e6ca71bda34fa5d32" offset="0"/> - </dataarea> - </part> - </software> - <software name="msroa"> <description>Microsoft Return of Arcade</description> <year>1996</year> @@ -11349,35 +11234,6 @@ </part> </software> - <software name="monkeyit" cloneof="monkeyk"> - <description>The Secret of Monkey Island (Italian)</description> - <year>1991</year> - <publisher>Lucasfilm Games</publisher> - <info name="developer" value="Lucasfilm Games" /> - <info name="distributor" value="CTO Software" /> - <info name="version" value="(VGA) Italian 1.0, 24 May 1991" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="The Secret of Monkey Island (Italian) [Lucasfilm Games] [1991] [3.5HD] [Disk 1 of 4].img" size="1474560" crc="855256e3" sha1="045f3698543055e11ce6dd570f39e7233feca51a" offset="0"/> - </dataarea> - </part> - <part name="flop2" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="The Secret of Monkey Island (Italian) [Lucasfilm Games] [1991] [3.5HD] [Disk 2 of 4].img" size="1474560" crc="56320b7b" sha1="e4c6ac3d5409b4b2d6a397d96a45c0c40b558c5f" offset="0"/> - </dataarea> - </part> - <part name="flop3" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="The Secret of Monkey Island (Italian) [Lucasfilm Games] [1991] [3.5HD] [Disk 3 of 4].img" size="1474560" crc="456bfda5" sha1="14f1075199e39f9a033c073ba4dbed85c8937ebf" offset="0"/> - </dataarea> - </part> - <part name="flop4" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="The Secret of Monkey Island (Italian) [Lucasfilm Games] [1991] [3.5HD] [Disk 4 of 4].img" size="1474560" crc="2aab0101" sha1="689d2958ec39ab1dbdee508c66b4d8aedde71126" offset="0"/> - </dataarea> - </part> - </software> - <software name="sserv2"> <!-- Dumped via Kryoflux, shows as good and unmodified --> <description>Silent Service II (Version 457.01)</description> @@ -11900,34 +11756,6 @@ </part> </software> - <software name="ubodyblw"> - <description>Ultimate Body Blows</description> - <year>1994</year> - <publisher>Team 17</publisher> - <info name="developer" value="Team 17" /> - <info name="ported by" value="WJS Design" /> - <part name="flop1" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Ultimate Body Blows [Team 17] [1994] [3.5HD] [Disk 1 of 4].img" size="1474560" crc="d6e03514" sha1="ce3d33e595eb674fae73f446bf0c352a59f5cf2a" offset="0"/> - </dataarea> - </part> - <part name="flop2" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Ultimate Body Blows [Team 17] [1994] [3.5HD] [Disk 2 of 4].img" size="1474560" crc="1a71cc01" sha1="aa8f3c528937cf1277f14bd1cb2ba5ba328703d6" offset="0"/> - </dataarea> - </part> - <part name="flop3" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Ultimate Body Blows [Team 17] [1994] [3.5HD] [Disk 3 of 4].img" size="1474560" crc="d2f52bf8" sha1="6fc50f366bd74b96d4ab599a94e5aec7526ed160" offset="0"/> - </dataarea> - </part> - <part name="flop4" interface="floppy_3_5"> - <dataarea name="flop" size = "1474560"> - <rom name="Ultimate Body Blows [Team 17] [1994] [3.5HD] [Disk 4 of 4].img" size="1474560" crc="69452b37" sha1="656f7012ec9027dfe80b228bda9db003a544619b" offset="0"/> - </dataarea> - </part> - </software> - <software name="vanslug"> <!-- Marked as bad, could do with another dump to make sure it's correct--> <description>Vanslug: X Mission - The Way of Super Warrior</description> |