Commit Graph

7 Commits

Author SHA1 Message Date
Vas Crabb
438a497c37 (nw) More license shuffling
Get rid of a couple of copies of the CC0 text.  Add header comment to
CC0 files to remind people editing them what the terms are.  Also add
some missing XML headers.  The header comments in layouts won't bloat
the binary - they get stripped out before compressing, same as any other
comments.
2020-03-07 22:02:56 +11:00
Vas Crabb
97b6717027 (nw) Clean up the mess on master
This effectively reverts b380514764 and
c24473ddff, restoring the state at
598cd52272.

Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline.  When things like this happen, it wastes
everyone's time.  I really don't need this in a week when real work™ is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
2019-03-26 11:13:37 +11:00
andreasnaive
b380514764 Revert "conflict resolution (nw)"
This reverts commit c24473ddff, reversing
changes made to 009cba4fb8.
2019-03-25 23:13:40 +01:00
David Haywood
1c8b595998 new WORKING machines (Jumping Popira) (#4752)
* new NOT WORKING machines
---
Jumping Popira [Sean Riddle, Peter Wilhelmsen, ShouTime, David Haywood]

(seeprom? troubles, i've documented a hack to bypass them right now, but then it boots in an invalid state thinking you've cleared all songs with some corruption due to that)

* new NOT WORKING machines
---
Fun 2 Learn Smart Fit Park [Sean Riddle, Clawgrip]

* (nw)

* promote jumping popira (nw)

* preinit for now (nw)
2019-03-11 16:20:03 -04:00
Vas Crabb
b4c5c85fa4 (nw) mark Jumping Popira carts as unsupported as we don't emulate the compatible base, and they're attached to another system as a placeholder 2019-02-25 13:54:11 +11:00
Vas Crabb
0ed2d2684e srcclean (nw) 2019-02-24 14:25:42 +11:00
David Haywood
cf988598a5 new NOT WORKING machines (XaviX / eKara) (#4663)
* initial checkin, improved commit message to follow (nw)

* naming improvements (nw)

* naming improvements (nw)

* note what is changed (nw)

* new NOT WORKING machines
---
Popira 2 (Japan) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]

(technically it works for single player stuff, but my timer emulation, which is used for the ADC, means the 2nd player inputs lag about 10 frames behind, making it unplayable for 2 player use either co-op or vs.)

new software list entries
---
ekara_japan_d:dc0003 BHT Volume 9 (Japan) (DC0003-BHT)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_d:dc0001 BHT Volume 8 (Japan) (DC0001-BHT)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_g:gc0017 TV Pop Volume 6 (Japan) (GC0017-TPJ)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_web:ekaraweb12a e-kara Web cartridge 12M (used, with 7 Songs) (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_gk:gk1 GK-1 - Detective Conan (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_sp:sp04 SP-04 Super Cartridge (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_sp:sp03 SP-03 Super Cartridge (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_g:gc0014 MIN Volume 2 (GC0014-MIN)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_s:sc0003 unknown(1) Volume 1 (Japan) (SC0003-xxx)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_g:gc0008a MIN Volume 1 (Japan) (GC0008-MIN) (set 2)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_g:gc0008 MIN Volume 1 (Japan) (GC0008-MIN) (set 1)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_p:pc0002 TV Pop Volume 2 (Japan) (PC0002-TPJ) (set 1)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_p:pc0002a TV Pop Volume 2 (Japan) (PC0002-TPJ) ('World Trade Center' image removed)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_s:sc0018 (unknown) Volume 1 (SC0018-SAI)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_g:gc0007 BAT Volume 3 (Japan) (GC0007-BAT)   [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]

new NOT WORKING software list entries
---
jpopira_jp:jp02 JP-02 (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
jpopira_jp:jp01 JP-01 (Japan)  [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]

(how well these work depends on what you expect from them / use them with, for Karaoke you can listen to all the songs, as you'd expect, for voice controller minigames you can't do much, the ones compatible with Popira are fully playable.  The 2 for Jumping Popira can't be used with any current set as they require a Jumping Popira base, so those are marked as NOT WORKING)

* better names (nw)

* new software list additions
--
ekara_japan_bh:bh06 BH-06 Best Hit Collection (Japan) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_bh:bh05 BH-05 Best Hit Collection (Japan) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_bh:bh03 BH-03 Best Hit Collection (Japan) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_bh:bh02 BH-02 Best Hit Collection (Japan) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_m:mc0014 Artist Mini Volume 8 (BoA) (Japan) (MC0014-ATM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_m:mc0006 KSM Mini Volume 2 (Japan) (MC0006-KSM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan_m:mc0004 Artist Mini Volume 4 (w-inds) (Japan) (MC0004-ATM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]

* new software list entries
---
ekara_japan_m:mc0012  Artist Mini Volume 7 (untranslated artist) (Japan) (MC0012-ATM) [Sean Riddle, Peter Wilhelmsen, David Haywood, ShouTime]

* more 'I Can Play Guitar' cart ROM to software list

* new software list entries
---
ekara_japan:ec0060 J-Pop Mix Volume 26 (Japan) (EC0060-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0062 J-Pop Mix Volume 28 (Japan) (EC0062-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0065 J-Pop Mix Volume 30 (Japan) (EC0065-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0066 J-Pop Mix Volume 31 (Japan) (EC0066-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0067 J-Pop Mix Volume 32 (Japan) (EC0067-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0069 ETZ (Japan) (EC0069-ETZ) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0071 J-Pop Mix Volume 35 (Japan) (EC0071-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0073 untranslated volume 1 (Japan) (EC0073-) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0074 J-Pop Mix Volume 37 (Japan) (EC0074-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0075 J-Pop Mix Volume 38 (Japan) (EC0075-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0077 Artist Selection Volume 15 - unknown artist (Japan) (EC0077-ATS) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0078 J-Pop Mix Volume 40 (Japan) (EC0078-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]
ekara_japan:ec0080 J-Pop Mix Volume 41 (Japan) (EC0080-JPM) [Sean Riddle, Peter Wilhelmsen. David Haywood, ShouTime]

* minor fixes / corrections to names (nw)

* (nw)

* comment updates (nw)
2019-02-21 16:09:22 -05:00