summaryrefslogtreecommitdiffstatshomepage
path: root/hash/ekara_japan_p.xml
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /hash/ekara_japan_p.xml
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/ekara_japan_p.xml')
-rw-r--r--hash/ekara_japan_p.xml34
1 files changed, 6 insertions, 28 deletions
diff --git a/hash/ekara_japan_p.xml b/hash/ekara_japan_p.xml
index 7b87f3cb076..a6736fff155 100644
--- a/hash/ekara_japan_p.xml
+++ b/hash/ekara_japan_p.xml
@@ -13,9 +13,9 @@
3. Konami DDR Family Mat
*P-1 BHT Volume 4 (Best Artists?) (1,2,3, 5 in G series)
- *P-2 TV Pop Volume 2 (1,3,4 in G series)
+ P-2 TV Pop Volume 2 (1,3,4 in G series)
*P-3 ENB Volume 1
- *P-4 BHT Volume 7
+ P-4 BHT Volume 7
-->
<software name="pc0001">
@@ -29,28 +29,6 @@
</part>
</software>
- <software name="pc0002">
- <description>TV Pop Volume 2 (Japan) (PC0002-TPJ) (set 1)</description>
- <year>2001</year>
- <publisher>Takara</publisher>
- <part name="cart" interface="ekara_cart">
- <dataarea name="rom" size="0x100000">
- <rom name="pc0002-tpj.u1" size="0x100000" crc="2ce065ed" sha1="1c0ae8050f7093a53f74637f27063f720f19610c" offset="0" />
- </dataarea>
- </part>
- </software>
-
- <software name="pc0002a" cloneof="pc0002">
- <description>TV Pop Volume 2 (Japan) (PC0002-TPJ) ('World Trade Center' image removed)</description> <!-- The song 'Run Run Run' features an image containing the twin towers in the original release, it is swapped for another here -->
- <year>2001</year>
- <publisher>Takara</publisher>
- <part name="cart" interface="ekara_cart">
- <dataarea name="rom" size="0x100000">
- <rom name="pc0002-tpj(alt).u1" size="0x100000" crc="f8c54474" sha1="4ae876d8deed068c710700499cba22b88bea3d17" offset="0" />
- </dataarea>
- </part>
- </software>
-
<software name="pc0003">
<description>ENB Volume 1 (Japan) (PC0003-ENB)</description>
<year>2001</year>
@@ -61,17 +39,17 @@
</dataarea>
</part>
</software>
-
+
<software name="pc0004">
<description>BHT Volume 7 (Japan) (PC0004-BHT)</description>
<year>2002</year>
<publisher>Takara</publisher>
<part name="cart" interface="ekara_cart">
- <feature name="slot" value="rom_24lc02"/>
+ <feature name="slot" value="rom_24lc02"/>
<dataarea name="rom" size="0x100000">
- <rom name="pc0004-bht.u1" size="0x100000" crc="95e35899" sha1="a9bd2694f5ee4b964e8d73afc3e88c0eb18ca1d2" offset="0" />
+ <rom name="pc0004-bht.u1" size="0x100000" crc="95e35899" sha1="a9bd2694f5ee4b964e8d73afc3e88c0eb18ca1d2" offset="0" />
</dataarea>
</part>
- </software>
+ </software>
</softwarelist>