summaryrefslogtreecommitdiffstatshomepage
path: root/hash/ekara_japan_s.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_s.xml
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'hash/ekara_japan_s.xml')
-rw-r--r--hash/ekara_japan_s.xml65
1 files changed, 22 insertions, 43 deletions
diff --git a/hash/ekara_japan_s.xml b/hash/ekara_japan_s.xml
index 7f5b4ea833d..bf95c5d9826 100644
--- a/hash/ekara_japan_s.xml
+++ b/hash/ekara_japan_s.xml
@@ -11,46 +11,36 @@
SAI seems to be used for multiple different series here, need to look at the subtitles too
S-1 SC0001- Hello Kitty Special
- S-2 SC0002-SAI SAI (series 3) Volume 1
- S-3 *SC0003- Kids' Challenge Volume 1
- S-4 *SC0004-SAI SAI (series 1) Volume 1
+ S-2 SC0002- (unknown)
+ S-3 SC0003- (unknown)
+ S-4 *SC0004-SAI SAI (series 1) Volume 1
S-5 *SC0005-SAI SAI (series 2) Volume 1 (same series as 6,9,19,21,22)
S-6 *SC0006-SAI SAI (series 2) Volume 2 (same series as 5,9,19,21,22)
- S-7 SC0007- unknown(2) Volume 1
- S-8 SC0008-SAI SAI (series 3) Volume 2
+ S-7 SC0007- (unknown)
+ S-8 SC0008- (unknown)
S-9 *SC0009-SAI SAI (series 2) Volume 3 (same series as 5,6,19,21,22)
S-10 *SC0010-HWK HWK (untranslated)
- S-11 SC0011- PostPet
- S-12 *SC0012-SAI SAI (series 3) Volume 3
- S-13 SC0013- SAI (series 2) Volume 4
- S-14 SC0014- SAI (series 3) Volume 4
- S-15 SC0015- unknown(2) Volume 2
- S-16 SC0016-SAI SAI (series 2) Volume 5
- S-17 SC0017- unknown(1) Volume 2
- S-18 *SC0018-SAI Challenge Artist Volume 1
+ S-11 SC0011- (unknown)
+ S-12 *SC0012-SAI SAI (series 3) Volume 3
+ S-13 SC0013- (unknown)
+ S-14 SC0014- (unknown)
+ S-15 SC0015- (unknown)
+ S-16 SC0016- (unknown)
+ S-17 SC0017- (unknown)
+ S-18 SC0018- (unknown) Volume 1
S-19 *SC0019-SAI SAI (series 2) Volume 6 (same series as 5,6,9,21,22)
- S-20 SC0020- SAI (series 3) Volume 5
- S-21 *SC0021-SAI SAI (series 2) Volume 7 (same series as 5,6,9,19,22)
- S-22 *SC0022-SAI SAI (series 2) Volume 8 (same series as 5,6,9,19,21)
-
- (more? what's the S highest number?, had S-23 noted, but can't find evidence of it now)
+ S-20 SC0020- (unknown) Volume 5
+ S-21 *SC0021-SAI SAI (series 2) Volume 7 (same seires as 5,6,9,19,22)
+ S-22 *SC0022-SAI SAI (series 2) Volume 8 (same seires as 5,6,9,19,21)
+ S-23 SC0023- (unknown)
+ (more? what's the S highest number?)
+
-->
<!-- Japanese e-kara cartridges SC (Special?) series -->
<!-- these have unique presentation -->
- <software name="sc0003">
- <description>Kids' Challenge Volume 1 (Japan) (SC0003-xxx)</description>
- <year>2001</year>
- <publisher>Takara</publisher>
- <part name="cart" interface="ekara_cart">
- <dataarea name="rom" size="0x100000">
- <rom name="sc0003-.u1" size="0x100000" crc="935e3445" sha1="e86949467e65d515523629ca1e8f8b47cdaaacf0" offset="0" />
- </dataarea>
- </part>
- </software>
-
<software name="sc0004">
<description>SAI (series 1) Volume 1 (Japan) (SC0004-SAI)</description>
<year>2001</year>
@@ -117,20 +107,9 @@
</part>
</software>
- <software name="sc0018">
- <description>Challenge Artist Volume 1 (Japan) (SC0018-SAI)</description>
- <year>2002</year>
- <publisher>Takara</publisher>
- <part name="cart" interface="ekara_cart">
- <dataarea name="rom" size="0x100000">
- <rom name="sc0018-sai.u1" size="0x100000" crc="23545417" sha1="64b84de483c6c5d1129826324b30580a189077ea" offset="0" />
- </dataarea>
- </part>
- </software>
-
<software name="sc0019">
<description>SAI (series 2) Volume 6 (Japan) (SC0019-SAI)</description>
- <year>2002</year>
+ <year>2001</year>
<publisher>Takara</publisher>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x200000">
@@ -141,7 +120,7 @@
<software name="sc0021">
<description>SAI (series 2) Volume 7 (Japan) (SC0021-SAI)</description>
- <year>2002</year>
+ <year>2001</year>
<publisher>Takara</publisher>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x200000">
@@ -152,7 +131,7 @@
<software name="sc0022">
<description>SAI (series 2) Volume 8 (Japan) (SC0022-SAI)</description>
- <year>2003</year>
+ <year>2001</year>
<publisher>Takara</publisher>
<part name="cart" interface="ekara_cart">
<dataarea name="rom" size="0x200000">