summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-05-04 12:18:25 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2022-05-04 12:18:25 +1000
commit4c704a6f3e762f3fe7492b13b91b55b5fbe11e48 (patch)
treedc2c433c11edb3f7dbe7c3b9388b43c68c57a4a6
parent38d57862cf13d032ca97793494b6b1bd3afe55ba (diff)
parenta8fe401275a2d1030193abdfc413fcc019bbe742 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--hash/gba.xml14
-rw-r--r--hash/gbcolor.xml18
-rw-r--r--hash/nes.xml319
-rw-r--r--scripts/src/3rdparty.lua7
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--src/devices/cpu/mb88xx/mb88dasm.cpp140
-rw-r--r--src/emu/emuopts.cpp2
-rw-r--r--src/mame/drivers/4enlinea.cpp1
-rw-r--r--src/mame/drivers/firetrap.cpp790
-rw-r--r--src/mame/drivers/scrablex.cpp20
-rw-r--r--src/mame/drivers/spg2xx_jakks_gkr.cpp2
-rw-r--r--src/mame/drivers/xavix.cpp2
-rw-r--r--src/mame/drivers/xavix_2000.cpp11
-rw-r--r--src/mame/drivers/xavix_2002.cpp13
-rw-r--r--src/mame/includes/firetrap.h123
-rw-r--r--src/mame/includes/xavix.h2
-rw-r--r--src/mame/video/firetrap.cpp267
-rw-r--r--src/osd/sdl/sdlmain.cpp17
18 files changed, 999 insertions, 751 deletions
diff --git a/hash/gba.xml b/hash/gba.xml
index 5edc5efdb75..e1627189e9b 100644
--- a/hash/gba.xml
+++ b/hash/gba.xml
@@ -38067,8 +38067,20 @@ license:CC0
</part>
</software>
- <!-- Released by the developer as a digital download on the web. -->
<software name="worldreb">
+ <description>World Reborn (USA)</description>
+ <year>2015</year>
+ <publisher>Piko Interactive</publisher>
+ <info name="release" value="20151106"/>
+ <part name="cart" interface="gba_cart">
+ <dataarea name="rom" size="4194304">
+ <rom name="world reborn.bin" size="4194304" crc="eefb32ff" sha1="c7ec2f8d7d3dec40a893cdfe2a41a8ed43ed71c4"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <!-- Released by the developer as a digital download on the web. -->
+ <software name="worldrebp" cloneof="worldreb">
<description>World Reborn (USA, prototype)</description>
<year>2004</year>
<publisher>Destination Software</publisher>
diff --git a/hash/gbcolor.xml b/hash/gbcolor.xml
index 3326820aef1..35a31919870 100644
--- a/hash/gbcolor.xml
+++ b/hash/gbcolor.xml
@@ -22566,8 +22566,24 @@ license:CC0
</part>
</software>
+<!-- Title screen and cutscene graphics are corrupt, but main game is playable -->
+ <software name="ttex" supported="partial">
+ <!-- Notes: GBC only -->
+ <description>Tyrannosaurus Tex (USA)</description>
+ <year>2018</year>
+ <publisher>Piko Interactive</publisher>
+ <part name="cart" interface="gameboy_cart">
+ <feature name="slot" value="rom_mbc5" />
+ <dataarea name="rom" size="2097152">
+ <rom name="tyrannosaurus tex.bin" size="2097152" crc="e90504c1" sha1="7e41e92f92ff06101e48dee758420f1bd3959013"/>
+ </dataarea>
+ <dataarea name="nvram" size="8192">
+ </dataarea>
+ </part>
+ </software>
+
<!-- developed by Slitherine Software -->
- <software name="ttex" supported="no">
+ <software name="ttexp" cloneof="ttex" supported="no">
<description>Tyrannosaurus Tex (prototype)</description>
<year>2000</year><!-- 2000-03-21 on label -->
<publisher>Eidos Interactive</publisher>
diff --git a/hash/nes.xml b/hash/nes.xml
index 2895a21edcd..bb4f0238ba7 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -11432,8 +11432,8 @@ license:CC0
</part>
</software>
- <software name="explfist">
- <description>Exploding Fist (USA, Prototype 19900522)</description>
+ <software name="explfistp" cloneof="explfist">
+ <description>Exploding Fist (USA, prototype 19900522)</description>
<year>1990</year>
<publisher>Tradewest</publisher>
<part name="cart" interface="nes_cart">
@@ -44964,6 +44964,24 @@ Also notice that VRAM, WRAM & mirror are probably incorrect for some of these se
</part>
</software>
+ <software name="babyboomk" cloneof="babyboom">
+ <description>Baby Boomer (Korea)</description>
+ <year>199?</year>
+ <publisher>Daou Infosys</publisher>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="discrete_74x377" />
+ <feature name="pcb" value="COLORDREAMS-74*377" />
+ <feature name="mirroring" value="vertical" />
+ <feature name="peripheral" value="zapper" />
+ <dataarea name="prg" size="65536">
+ <rom name="baby boomer (k).prg" size="65536" crc="0bd9fbcf" sha1="20948c1618d0e1173409371140651f21b2602204" />
+ </dataarea>
+ <dataarea name="chr" size="16384">
+ <rom name="baby boomer (k).chr" size="16384" crc="45fe3114" sha1="baa3d240f1acd3a364530ae6f6dc6f8506d8b9c6" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="ballstry">
<!-- Alt. Title: ZhuangQiu ChuanShuo - HuaZhuang II - Ball Story -->
<description>Ball Story - Jong Yuk Chuen Suet Fa Jong II (Chi)</description>
@@ -46648,8 +46666,26 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part>
</software>
- <software name="explfist1" cloneof="explfist">
- <description>Exploding Fist (USA, Prototype Older)</description>
+ <software name="explfist">
+ <description>Exploding Fist (USA)</description>
+ <year>2019</year>
+ <publisher>Piko Interactive</publisher>
+ <info name="release" value="20190415"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="cnrom" />
+ <feature name="pcb" value="NES-CNROM" />
+ <feature name="mirroring" value="horizontal" />
+ <dataarea name="prg" size="32768">
+ <rom name="exploding fist.prg" size="32768" crc="9082fc29" sha1="c3cb25e12bc8a60770dd6ef7c48c16b31685393b" />
+ </dataarea>
+ <dataarea name="chr" size="32768">
+ <rom name="exploding fist.chr" size="32768" crc="fe6f36b5" sha1="595d04d967bbe8f920383c5cee0726bc7f6eeed7" />
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="explfistp1" cloneof="explfist">
+ <description>Exploding Fist (USA, prototype older)</description>
<year>1990</year>
<publisher>Tradewest</publisher>
<part name="cart" interface="nes_cart">
@@ -52008,6 +52044,27 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part>
</software>
+ <software name="uninvitep" cloneof="uninvite">
+ <description>Uninvited (USA, prototype)</description>
+ <year>1991</year>
+ <publisher>Kemco</publisher>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="txrom" />
+ <feature name="pcb_model" value="HVC-TK22EROM-01" />
+ <feature name="mmc3_type" value="MMC3B" />
+ <dataarea name="prg" size="131072">
+ <rom name="8.30 uninvited prg" size="131072" crc="d5081984" sha1="41c3067a09a21226742de5a3eaa57a64092458b1" />
+ </dataarea>
+ <dataarea name="chr" size="131072">
+ <rom name="8.23 uninvited prg" size="131072" crc="f7019d0f" sha1="1cd6e1e868519aeefd1fd0d6f5bf32df1c48925a" />
+ </dataarea>
+ <!-- 8k WRAM on cartridge, battery backed up -->
+ <dataarea name="bwram" size="8192">
+ <rom value="0x00" size="8192" offset="0" loadflag="fill" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="uruseiyap" cloneof="uruseiya">
<description>Urusei Yatsura - Lum no Wedding Bell (Jpn, Prototype)</description>
<year>1986</year>
@@ -53741,6 +53798,24 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</part>
</software>
+ <software name="tuji" cloneof="silentas">
+ <description>Tújí (Taiwan)</description>
+ <year>1989</year>
+ <publisher>Sachen</publisher>
+ <info name="serial" value="TC-005"/>
+ <info name="alt_title" value="突擊"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="nina006" />
+ <feature name="mirroring" value="vertical" />
+ <dataarea name="prg" size="65536">
+ <rom name="tu ji (tw) (joy van).prg" size="65536" crc="943b393a" sha1="624ffe7840037bfe3d8c3378da9873965fd21f0a" />
+ </dataarea>
+ <dataarea name="chr" size="65536">
+ <rom name="tu ji (tw) (joy van).chr" size="65536" crc="4e62fba8" sha1="bd491e460566b33fad9b3762044a414fa18436cb" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="twineagh">
<description>Twin Eagle (Tw, NES cart)</description>
<year>1989</year>
@@ -66904,6 +66979,29 @@ We don't include these hacks because they were not burned into real carts nor so
</part>
</software>
+ <software name="wukongdj" cloneof="dbz" supported="partial">
+ <description>Wùkōng Dòujù (China)</description>
+ <year>199?</year>
+ <publisher>&lt;pirate&gt;</publisher>
+ <info name="alt_title" value="悟空斗剧"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="hengg_shjy3" />
+ <dataarea name="prg" size="262144">
+ <rom name="wukong douju.prg" size="262144" crc="8638454c" sha1="3c7c91c552104c9c24153c00fd603c740715ff51" status="baddump" />
+ </dataarea>
+ <dataarea name="chr" size="524288">
+ <rom name="wukong douju.prg" size="524288" crc="72137bc5" sha1="1533ecf77b9bbc6864a2c62b463dfab34e017797" status="baddump" />
+ </dataarea>
+ <!-- 8k VRAM on cartridge? -->
+ <dataarea name="vram" size="8192">
+ </dataarea>
+ <!-- 8k WRAM on cartridge, battery backed up -->
+ <dataarea name="bwram" size="8192">
+ <rom value="0x00" size="8192" offset="0" loadflag="fill" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="xplan" cloneof="contrafc">
<description>X-Plan (Asia, Ripped from multicart XB-F865)</description>
<year>19??</year>
@@ -80104,7 +80202,7 @@ be better to redump them properly. -->
<feature name="slot" value="2a03pur" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="1048576">
- <rom name="2a03puritans.prg" size="1048576" crc="5baee143" sha1="5024cf5f53995119892067603bed3e23c3655e9e" status="baddump" />
+ <rom name="2a03puritans.prg" size="1048576" crc="5baee143" sha1="5024cf5f53995119892067603bed3e23c3655e9e" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80117,11 +80215,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2008</description>
<year>2008</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X8-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="nrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="32768">
- <rom name="xmas08demo.prg" size="32768" crc="3ae2a150" sha1="5ce021bebb9049604434af45d6c397e6dd7b84c4" status="baddump" />
+ <rom name="xmas08demo.prg" size="32768" crc="3ae2a150" sha1="5ce021bebb9049604434af45d6c397e6dd7b84c4" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80133,11 +80232,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2009</description>
<year>2009</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X9-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="nrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="32768">
- <rom name="xmas09demo.prg" size="32768" crc="851cea10" sha1="88ed2741e88144eda26366985d216f27629cf3f8" status="baddump" />
+ <rom name="xmas09demo.prg" size="32768" crc="851cea10" sha1="88ed2741e88144eda26366985d216f27629cf3f8" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80149,11 +80249,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2010</description>
<year>2010</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X0-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="nrom" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="32768">
- <rom name="xmas10demo.prg" size="32768" crc="a6e02975" sha1="a3a81cc6fdb7a68efbb061ba44dd52407a978e26" status="baddump" />
+ <rom name="xmas10demo.prg" size="32768" crc="a6e02975" sha1="a3a81cc6fdb7a68efbb061ba44dd52407a978e26" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80165,11 +80266,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2011</description>
<year>2011</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X1-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="nrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="32768">
- <rom name="xmas11demo.prg" size="32768" crc="d0d0c932" sha1="067bbd99c5f9ccaf66ef484e024b9c98e4893d6d" status="baddump" />
+ <rom name="xmas11demo.prg" size="32768" crc="d0d0c932" sha1="067bbd99c5f9ccaf66ef484e024b9c98e4893d6d" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80182,10 +80284,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2012</description>
<year>2012</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X2-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas12demo.prg" size="131072" crc="feab08f1" sha1="4834a8bea6df40c9566b97412de775de2ffde492" status="baddump" />
+ <rom name="xmas12demo.prg" size="131072" crc="feab08f1" sha1="4834a8bea6df40c9566b97412de775de2ffde492" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80197,10 +80300,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2013</description>
<year>2013</year>
<publisher>RetroZone</publisher>
+ <info name="serial" value="RET-X3-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas13demo.prg" size="131072" crc="f8d04aa0" sha1="98e57ebca93689042d254fe205c357cdc4d84b0a" status="baddump" />
+ <rom name="xmas13demo.prg" size="131072" crc="f8d04aa0" sha1="98e57ebca93689042d254fe205c357cdc4d84b0a" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80212,10 +80316,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2014</description>
<year>2014</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-X4-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas14demo.prg" size="131072" crc="900ca825" sha1="9e7a881a5c1e643b1327a7c4434e2623eefb95e5" status="baddump" />
+ <rom name="xmas14demo.prg" size="131072" crc="900ca825" sha1="9e7a881a5c1e643b1327a7c4434e2623eefb95e5" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80227,10 +80332,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2015</description>
<year>2015</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-X5-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas15demo.prg" size="131072" crc="376c9fcc" sha1="658929d3377e30469c82b3bf8a66c7d2fbcd0b57" status="baddump" />
+ <rom name="xmas15demo.prg" size="131072" crc="376c9fcc" sha1="658929d3377e30469c82b3bf8a66c7d2fbcd0b57" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80242,10 +80348,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2016</description>
<year>2016</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-X6-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas16demo.prg" size="131072" crc="19eb1773" sha1="9a22cb50f0b7d26f81dd0b9f8e3f05e07c3b4834" status="baddump" />
+ <rom name="xmas16demo.prg" size="131072" crc="19eb1773" sha1="9a22cb50f0b7d26f81dd0b9f8e3f05e07c3b4834" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80257,11 +80364,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2018</description>
<year>2018</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-Y8-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="xmas18demo.prg" size="131072" crc="38431bf6" sha1="cb5a7ee17b4a4a7a30d4c98073d107561d903641" status="baddump" />
+ <rom name="xmas18demo.prg" size="131072" crc="38431bf6" sha1="cb5a7ee17b4a4a7a30d4c98073d107561d903641" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80273,10 +80381,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2019</description>
<year>2019</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-Y9-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas19demo.prg" size="131072" crc="3e03466b" sha1="a8cceadd892a8fb4c43ccc660a2073c2d8b2d69e" status="baddump" />
+ <rom name="xmas19demo.prg" size="131072" crc="3e03466b" sha1="a8cceadd892a8fb4c43ccc660a2073c2d8b2d69e" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80288,10 +80397,11 @@ be better to redump them properly. -->
<description>8-bit Xmas 2020</description>
<year>2020</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-Y0-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<dataarea name="prg" size="131072">
- <rom name="xmas20demo.prg" size="131072" crc="bad62c7b" sha1="b0d4a83d71e571ab7ba5ba95784498f17b527606" status="baddump" />
+ <rom name="xmas20demo.prg" size="131072" crc="bad62c7b" sha1="b0d4a83d71e571ab7ba5ba95784498f17b527606" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80303,11 +80413,12 @@ be better to redump them properly. -->
<description>8-bit Xmas 2021</description>
<year>2021</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-Y1-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="8bitxmas" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="xmas21demo.prg" size="131072" crc="d8ab6288" sha1="8b15b9eff1bcb128ff4969de7a5d4d47b3b2b62f" status="baddump" />
+ <rom name="xmas21demo.prg" size="131072" crc="d8ab6288" sha1="8b15b9eff1bcb128ff4969de7a5d4d47b3b2b62f" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80326,10 +80437,10 @@ be better to redump them properly. -->
<feature name="slot" value="txrom" />
<feature name="pcb_model" value="KB87D" />
<dataarea name="prg" size="524288">
- <rom name="8bit music power.prg" size="524288" crc="104e9410" sha1="2861b2fa673b785b66bf46814735104da9cc61be" status="baddump" />
+ <rom name="8bit music power.prg" size="524288" crc="104e9410" sha1="2861b2fa673b785b66bf46814735104da9cc61be" />
</dataarea>
<dataarea name="chr" size="262144">
- <rom name="8bit music power.chr" size="262144" crc="16f15eb6" sha1="09a4204edb35dd742fb3110e68b533661e8ba35e" status="baddump" />
+ <rom name="8bit music power.chr" size="262144" crc="16f15eb6" sha1="09a4204edb35dd742fb3110e68b533661e8ba35e" />
</dataarea>
</part>
</software>
@@ -80345,10 +80456,10 @@ be better to redump them properly. -->
<feature name="slot" value="txrom" />
<feature name="pcb_model" value="KB87G" />
<dataarea name="prg" size="524288">
- <rom name="8bit music power final.prg" size="524288" crc="c2856b5d" sha1="c97581829fa9738a8ce6eae9b6140b4b81510f66" status="baddump" />
+ <rom name="8bit music power final.prg" size="524288" crc="c2856b5d" sha1="c97581829fa9738a8ce6eae9b6140b4b81510f66" />
</dataarea>
<dataarea name="chr" size="262144">
- <rom name="8bit music power final.chr" size="262144" crc="a8c9290a" sha1="11101ef07c2e7d66421e9ca7e7df34a8c300107f" status="baddump" />
+ <rom name="8bit music power final.chr" size="262144" crc="a8c9290a" sha1="11101ef07c2e7d66421e9ca7e7df34a8c300107f" />
</dataarea>
</part>
</software>
@@ -80362,10 +80473,10 @@ be better to redump them properly. -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="txrom" />
<dataarea name="prg" size="524288">
- <rom name="8bit rhythm land.prg" size="524288" crc="81dd11d5" sha1="7e257de8dd5103067c66fb13806084d48b028ed5" status="baddump" />
+ <rom name="8bit rhythm land.prg" size="524288" crc="81dd11d5" sha1="7e257de8dd5103067c66fb13806084d48b028ed5" />
</dataarea>
<dataarea name="chr" size="262144">
- <rom name="8bit rhythm land.chr" size="262144" crc="884b021f" sha1="2dfffa356308eddbb002cce1a7fdec72dc5c2cae" status="baddump" />
+ <rom name="8bit rhythm land.chr" size="262144" crc="884b021f" sha1="2dfffa356308eddbb002cce1a7fdec72dc5c2cae" />
</dataarea>
</part>
</software>
@@ -80396,7 +80507,7 @@ be better to redump them properly. -->
<feature name="slot" value="uxrom" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="airball (retrousb) (2007).prg" size="131072" crc="3e9d567b" sha1="76c9d4a9b9c1a4b587dd15661e39c68f125628c4" status="baddump" />
+ <rom name="airball (retrousb) (2007).prg" size="131072" crc="3e9d567b" sha1="76c9d4a9b9c1a4b587dd15661e39c68f125628c4" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80406,7 +80517,7 @@ be better to redump them properly. -->
<software name="ao">
<description>AO</description>
- <year>2016</year>
+ <year>2015</year>
<publisher>Second Dimension</publisher>
<info name="alt_title" value="青"/>
<part name="cart" interface="nes_cart">
@@ -80449,7 +80560,7 @@ be better to redump them properly. -->
<feature name="slot" value="uxrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="262144">
- <rom name="battle kid - fortress of peril (v1.100).prg" size="262144" crc="aef464ce" sha1="1f5832a163313f930893151a30efb1ebb853b0db" status="baddump" />
+ <rom name="battle kid - fortress of peril (v1.100).prg" size="262144" crc="aef464ce" sha1="1f5832a163313f930893151a30efb1ebb853b0db" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80467,7 +80578,7 @@ be better to redump them properly. -->
<feature name="slot" value="uxrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="262144">
- <rom name="battle kid - fortress of peril (v1.000).prg" size="262144" crc="48bb5a71" sha1="ed2d9137711c022613e4d9d9e4855c31652d7b8c" status="baddump" />
+ <rom name="battle kid - fortress of peril (v1.000).prg" size="262144" crc="48bb5a71" sha1="ed2d9137711c022613e4d9d9e4855c31652d7b8c" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80485,7 +80596,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="524288">
- <rom name="battle kid - fortress of peril (japan) (v2.000).prg" size="524288" crc="fa5d5a4d" sha1="7f142f448bee7972b5cf4feeb427a7f19d78f2e3" status="baddump" />
+ <rom name="battle kid - fortress of peril (japan) (v2.000).prg" size="524288" crc="fa5d5a4d" sha1="7f142f448bee7972b5cf4feeb427a7f19d78f2e3" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80503,7 +80614,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="524288">
- <rom name="battle kid 2 - mountain of torment (v1.000).prg" size="524288" crc="74b823a1" sha1="dcd6870e0d5a79899dce11b975c8a16652fc7143" status="baddump" />
+ <rom name="battle kid 2 - mountain of torment (v1.000).prg" size="524288" crc="74b823a1" sha1="dcd6870e0d5a79899dce11b975c8a16652fc7143" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80536,7 +80647,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="524288">
- <rom name="candelabra - estoscerro.prg" size="524288" crc="acc3e3df" sha1="6b929e2aaaf31b6bcddf530f608612aa5826632f" status="baddump" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
+ <rom name="candelabra - estoscerro.prg" size="524288" crc="acc3e3df" sha1="6b929e2aaaf31b6bcddf530f608612aa5826632f" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80570,7 +80681,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="et.prg" size="131072" crc="9e8eca2c" sha1="fa88ca7cadca763eb68e606c97ebf9a4302eedfd" status="baddump" />
+ <rom name="et.prg" size="131072" crc="9e8eca2c" sha1="fa88ca7cadca763eb68e606c97ebf9a4302eedfd" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80586,7 +80697,7 @@ be better to redump them properly. -->
<feature name="slot" value="2a03pur" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="524288">
- <rom name="pico.prg" size="524288" crc="0eb47d80" sha1="5a71e9936045df6408926fe9d5d97cd60af359b7" status="baddump" />
+ <rom name="pico.prg" size="524288" crc="0eb47d80" sha1="5a71e9936045df6408926fe9d5d97cd60af359b7" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192">
@@ -80594,6 +80705,22 @@ be better to redump them properly. -->
</part>
</software>
+ <software name="getgary">
+ <description>Get'em Gary</description>
+ <year>2016</year>
+ <publisher>Second Dimension</publisher>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="nrom" />
+ <feature name="mirroring" value="horizontal" />
+ <dataarea name="prg" size="32768">
+ <rom name="get'em gary.prg" size="32768" crc="8bfaa4d9" sha1="426420ef1c64173f5c419bebbdef0bcb451ee22e" />
+ </dataarea>
+ <dataarea name="chr" size="8192">
+ <rom name="get'em gary.chr" size="8192" crc="276327f8" sha1="37cba87765faf6eda80539c19e7e4df3fb510459" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="glider">
<description>Glider</description>
<year>2008</year>
@@ -80603,7 +80730,7 @@ be better to redump them properly. -->
<feature name="slot" value="cufrom" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="glider.prg" size="131072" crc="1b00c2b3" sha1="670fbb3c9a3f51a878d68a45930ee3fab4beb8dd" status="baddump" />
+ <rom name="glider.prg" size="131072" crc="1b00c2b3" sha1="670fbb3c9a3f51a878d68a45930ee3fab4beb8dd" />
</dataarea>
<!-- 32k VRAM on cartridge -->
<dataarea name="vram" size="32768">
@@ -80642,10 +80769,10 @@ be better to redump them properly. -->
<feature name="slot" value="txrom" />
<feature name="pcb_model" value="KB87G" />
<dataarea name="prg" size="262144">
- <rom name="kira kira star night dx.prg" size="262144" crc="35f72799" sha1="a865787e66b5e3c604b895ba92ef16f509bd79d3" status="baddump" />
+ <rom name="kira kira star night dx.prg" size="262144" crc="35f72799" sha1="a865787e66b5e3c604b895ba92ef16f509bd79d3" />
</dataarea>
<dataarea name="chr" size="262144">
- <rom name="kira kira star night dx.chr" size="262144" crc="baeb2c47" sha1="3a9f35bfaa920633ca96eb7df5a26b25688f6984" status="baddump" />
+ <rom name="kira kira star night dx.chr" size="262144" crc="baeb2c47" sha1="3a9f35bfaa920633ca96eb7df5a26b25688f6984" />
</dataarea>
<!-- 8k WRAM on cartridge, battery backed up -->
<dataarea name="bwram" size="8192">
@@ -80663,7 +80790,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="524288">
- <rom name="larry and the long look for a luscious lover (khan games) (2014).prg" size="524288" crc="8bc0340c" sha1="c21f74fcac66f74a248c831eda1b84c0bdf5a3e0" status="baddump" />
+ <rom name="larry and the long look for a luscious lover (khan games) (2014).prg" size="524288" crc="8bc0340c" sha1="c21f74fcac66f74a248c831eda1b84c0bdf5a3e0" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80679,7 +80806,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="524288">
- <rom name="legends of owlia (gradual games) (2016).prg" size="524288" crc="95dfc71c" sha1="1680c45e7bb1a67d754b4fef5046c6ecf16d3da4" status="baddump" />
+ <rom name="legends of owlia (gradual games) (2016).prg" size="524288" crc="95dfc71c" sha1="1680c45e7bb1a67d754b4fef5046c6ecf16d3da4" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80696,7 +80823,7 @@ be better to redump them properly. -->
<feature name="slot" value="uxrom" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="the mad wizard - a candelabra chronicle.prg" size="131072" crc="b4a7b014" sha1="c3b49ba3dd16ac203af6a43b29a8b61add21c118" status="baddump" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
+ <rom name="the mad wizard - a candelabra chronicle.prg" size="131072" crc="b4a7b014" sha1="c3b49ba3dd16ac203af6a43b29a8b61add21c118" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80704,6 +80831,39 @@ be better to redump them properly. -->
</part>
</software>
+ <software name="mglider" supported="partial"> <!-- Save not implemented -->
+ <description>More Glider</description>
+ <year>2016</year>
+ <publisher>retroUSB</publisher>
+ <info name="serial" value="RET-MG-GBL"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="unrom512" />
+ <feature name="mirroring" value="vertical" />
+ <dataarea name="prg" size="524288">
+ <rom name="more glider.prg" size="524288" crc="02196a3e" sha1="e7a0289c5957e7c6bcf053df45a0563c7f20620e" />
+ </dataarea>
+ <!-- 32k VRAM on cartridge? -->
+ <dataarea name="vram" size="32768">
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="multidude">
+ <description>Multidude</description>
+ <year>2019</year> <!-- original digital release 20150214 -->
+ <publisher>Mega Cat Studios</publisher>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="nrom" />
+ <feature name="mirroring" value="horizontal" />
+ <dataarea name="prg" size="32768">
+ <rom name="multidude.prg" size="32768" crc="d98ebe33" sha1="14b278b01ea207cf765def8b96a65f661cec6ac3" /> <!-- these are from the .nes file distributed by the author, RetroSouls -->
+ </dataarea>
+ <dataarea name="chr" size="8192">
+ <rom name="multidude.chr" size="8192" crc="08d6ea77" sha1="f1f55e1cc7bfdd1d4f571daf9eab29e889a4ecd4" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="mysticpi">
<description>Mystic Pillars</description>
<year>2008</year>
@@ -80713,7 +80873,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="65536">
- <rom name="mystic pillars (sivak games) (2008).prg" size="65536" crc="318c0a59" sha1="21a75108278a6d311f652c34430e30f3522cf742" status="baddump" />
+ <rom name="mystic pillars (sivak games) (2008).prg" size="65536" crc="318c0a59" sha1="21a75108278a6d311f652c34430e30f3522cf742" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80730,10 +80890,10 @@ be better to redump them properly. -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="txrom" />
<dataarea name="prg" size="524288">
- <rom name="neo heiankyo alien.prg" size="524288" crc="b0fc6145" sha1="a8178c5293aafc2c6dc6d78c5fe4239edfff8395" status="baddump" />
+ <rom name="neo heiankyo alien.prg" size="524288" crc="b0fc6145" sha1="a8178c5293aafc2c6dc6d78c5fe4239edfff8395" />
</dataarea>
<dataarea name="chr" size="131072">
- <rom name="neo heiankyo alien.chr" size="131072" crc="3f726765" sha1="879cb8c5a38295008aa08a79c69388d55292a249" status="baddump" />
+ <rom name="neo heiankyo alien.chr" size="131072" crc="3f726765" sha1="879cb8c5a38295008aa08a79c69388d55292a249" />
</dataarea>
</part>
</software>
@@ -80755,7 +80915,7 @@ be better to redump them properly. -->
</software>
<software name="nomolos">
- <description>Nomolos - Storming the Catsle</description>
+ <description>Nomolos - Storming the Catsle (v1.01)</description>
<year>2014</year>
<publisher>RetroZone</publisher> <!-- also re-released by Infinite NES Lives -->
<info name="serial" value="GRD-NM-GBL"/>
@@ -80763,7 +80923,7 @@ be better to redump them properly. -->
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="524288">
- <rom name="nomolos - storming the catsle (gradual games) (2012).prg" size="524288" crc="222b13a0" sha1="e0c33747107ba715bf3689429fbdb3b0caedac64" status="baddump" />
+ <rom name="nomolos - storming the catsle (gradual games) (2012).prg" size="524288" crc="222b13a0" sha1="e0c33747107ba715bf3689429fbdb3b0caedac64" />
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80771,6 +80931,40 @@ be better to redump them properly. -->
</part>
</software>
+ <software name="nomolos1" cloneof="nomolos">
+ <description>Nomolos - Storming the Catsle (v1.00)</description>
+ <year>2012</year>
+ <publisher>RetroZone</publisher>
+ <info name="serial" value="GRD-NM-GBL"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="uxrom" />
+ <feature name="mirroring" value="vertical" />
+ <dataarea name="prg" size="262144">
+ <rom name="nomolos - storming the catsle v1.00.prg" size="262144" crc="675bd9cb" sha1="5e90a49b4df1230bd1957d5ca43b097afb4310f8" />
+ </dataarea>
+ <!-- 8k VRAM on cartridge -->
+ <dataarea name="vram" size="8192">
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="questfor">
+ <description>Quest Forge - By Order of Kings</description>
+ <year>2015</year>
+ <publisher>Piko Interactive</publisher>
+ <info name="release" value="20150904"/>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="nrom" />
+ <feature name="mirroring" value="vertical" />
+ <dataarea name="prg" size="32768">
+ <rom name="questforge.prg" size="32768" crc="982c8405" sha1="df35a8c0639a08e4c7d406d8fa046480a00aa0e5" />
+ </dataarea>
+ <dataarea name="chr" size="8192">
+ <rom name="questforge.chr" size="8192" crc="e1aae1ed" sha1="a8c46107a4a1de85f8380840132b68b0f4554930" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="rbbrite">
<description>Rainbow Brite - Journey to Rainbow Land</description>
<year>2019</year>
@@ -80779,7 +80973,7 @@ be better to redump them properly. -->
<feature name="slot" value="smd133" />
<feature name="smd133-addr" value="6K" />
<dataarea name="prg" size="524288">
- <rom name="rainbow brite - journey to rainbow land.prg" size="524288" crc="660750fe" sha1="acad918691f4346c15d0d991a14059dc2ea5a6f6" status="baddump" />
+ <rom name="rainbow brite - journey to rainbow land.prg" size="524288" crc="660750fe" sha1="acad918691f4346c15d0d991a14059dc2ea5a6f6" />
</dataarea>
<!-- 128k VRAM on cartridge -->
<dataarea name="vram" size="131072">
@@ -80799,7 +80993,7 @@ be better to redump them properly. -->
<feature name="slot" value="uxrom" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072">
- <rom name="the rise of amondus.prg" size="131072" crc="825313ca" sha1="f796b7d700bd2aca18b17036e7146ef955395e4f" status="baddump" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
+ <rom name="the rise of amondus.prg" size="131072" crc="825313ca" sha1="f796b7d700bd2aca18b17036e7146ef955395e4f" /> <!-- this is from the .nes file distributed by the author, Sly Dog Studios -->
</dataarea>
<!-- 8k VRAM on cartridge? -->
<dataarea name="vram" size="8192">
@@ -80811,6 +81005,7 @@ be better to redump them properly. -->
<description>Solaris</description>
<year>2016</year>
<publisher>retroUSB</publisher>
+ <info name="serial" value="RET-SL-GBL"/>
<part name="cart" interface="nes_cart">
<feature name="slot" value="unrom512" />
<feature name="mirroring" value="vertical" />
@@ -80838,6 +81033,22 @@ be better to redump them properly. -->
</part>
</software>
+ <software name="spainter">
+ <description>Super Painter</description>
+ <year>2019</year> <!-- original digital release 20150127 -->
+ <publisher>Mega Cat Studios</publisher>
+ <part name="cart" interface="nes_cart">
+ <feature name="slot" value="nrom" />
+ <feature name="mirroring" value="vertical" />
+ <dataarea name="prg" size="32768">
+ <rom name="superpainter.prg" size="32768" crc="6fafa01f" sha1="0965bd6ce34abcca6b1b92199bac6999590df12d" /> <!-- these are from the .nes file distributed by the author, RetroSouls -->
+ </dataarea>
+ <dataarea name="chr" size="8192">
+ <rom name="superpainter.chr" size="8192" crc="05877e58" sha1="872c9acf705226a1a31e1f5dcd4fca6818aebddd" />
+ </dataarea>
+ </part>
+ </software>
+
<software name="superrr">
<description>Super Russian Roulette</description>
<year>2017</year>
@@ -80847,13 +81058,13 @@ be better to redump them properly. -->
<feature name="mirroring" value="vertical" />
<feature name="peripheral" value="zapper" />
<dataarea name="prg" size="262144">
- <rom name="super russian roulette.prg" size="262144" crc="d29e7bd7" sha1="bea73714080dfa2747a526724255fe34a381b0a0" status="baddump" />
+ <rom name="super russian roulette.prg" size="262144" crc="d29e7bd7" sha1="bea73714080dfa2747a526724255fe34a381b0a0" />
</dataarea>
<dataarea name="chr" size="262144">
- <rom name="super russian roulette.chr" size="262144" crc="6ba75953" sha1="93153b472c9a36e26e0d9243b9dee1bfacdaa3f8" status="baddump" />
+ <rom name="super russian roulette.chr" size="262144" crc="6ba75953" sha1="93153b472c9a36e26e0d9243b9dee1bfacdaa3f8" />
</dataarea>
<dataarea name="dpcm" size="8388608">
- <rom name="super russian roulette.dpcm" size="8388608" crc="e880dbe6" sha1="b05f2bd2845c3ec3aa63d7aec855c23058fc8412" status="baddump" />
+ <rom name="super russian roulette.dpcm" size="8388608" crc="e880dbe6" sha1="b05f2bd2845c3ec3aa63d7aec855c23058fc8412" />
</dataarea>
</part>
</software>
@@ -80885,10 +81096,10 @@ be better to redump them properly. -->
<feature name="slot" value="cnrom" />
<feature name="mirroring" value="horizontal" />
<dataarea name="prg" size="32768">
- <rom name="ultimate frogger champion.prg" size="32768" crc="c9c408cf" sha1="89cbc3856737967849278c0f60aa7b25d01cef4f" status="baddump" /> <!-- this is from the .nes file distributed by the author, KHAN Games -->
+ <rom name="ultimate frogger champion.prg" size="32768" crc="c9c408cf" sha1="89cbc3856737967849278c0f60aa7b25d01cef4f" /> <!-- this is from the .nes file distributed by the author, KHAN Games -->
</dataarea>
<dataarea name="chr" size="16384">
- <rom name="ultimate frogger champion.chr" size="16384" crc="96a3389f" sha1="5662ac095f8d6fad77c79fd356ccea41baef9944" status="baddump" />
+ <rom name="ultimate frogger champion.chr" size="16384" crc="96a3389f" sha1="5662ac095f8d6fad77c79fd356ccea41baef9944" />
</dataarea>
</part>
</software>
@@ -80920,7 +81131,7 @@ be better to redump them properly. -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="action53" />
<dataarea name="prg" size="524288">
- <rom name="action 53 volume 1.prg" size="524288" crc="6441e8f6" sha1="da92a26ecc64767fdbb63ab8b2d9e7dcd7884fcc" status="baddump" />
+ <rom name="action 53 volume 1.prg" size="524288" crc="6441e8f6" sha1="da92a26ecc64767fdbb63ab8b2d9e7dcd7884fcc" />
</dataarea>
<!-- 32k VRAM on cartridge? -->
<dataarea name="vram" size="32768">
@@ -80935,7 +81146,7 @@ be better to redump them properly. -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="action53" />
<dataarea name="prg" size="524288">
- <rom name="action 53 volume 2.prg" size="524288" crc="6e61971f" sha1="cb2c6dc8c8be3ee738ad8a793a75475553506e14" status="baddump" />
+ <rom name="action 53 volume 2.prg" size="524288" crc="6e61971f" sha1="cb2c6dc8c8be3ee738ad8a793a75475553506e14" />
</dataarea>
<!-- 32k VRAM on cartridge? -->
<dataarea name="vram" size="32768">
@@ -80950,7 +81161,7 @@ be better to redump them properly. -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="action53" />
<dataarea name="prg" size="1048576">
- <rom name="action 53 volume 3.prg" size="1048576" crc="660f8e82" sha1="85c67c171f77a47566f4b9ead1a352c02e2e07a6" status="baddump" />
+ <rom name="action 53 volume 3.prg" size="1048576" crc="660f8e82" sha1="85c67c171f77a47566f4b9ead1a352c02e2e07a6" />
</dataarea>
<!-- 32k VRAM on cartridge? Sinking Feeling needs this much. -->
<dataarea name="vram" size="32768">
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 0c6c03663f6..59c3f1b720b 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -2234,6 +2234,13 @@ project "asmjit"
uuid "4539757c-6e99-4bae-b3d0-b342a7c49539"
kind "StaticLib"
+ configuration { "gmake or ninja" }
+ if (_OPTIONS["gcc"] ~= nil) and (not string.find(_OPTIONS["gcc"], "clang")) and (str_to_version(_OPTIONS["gcc_version"]) < 80000) then
+ buildoptions {
+ "-Wno-maybe-uninitialized",
+ }
+ end
+
configuration { }
if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index b9597f1d2bb..b4ae2d2a2e8 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1756,8 +1756,6 @@ files {
MAME_DIR .. "src/mame/video/exprraid.cpp",
MAME_DIR .. "src/mame/drivers/ffantasy_ms.cpp",
MAME_DIR .. "src/mame/drivers/firetrap.cpp",
- MAME_DIR .. "src/mame/includes/firetrap.h",
- MAME_DIR .. "src/mame/video/firetrap.cpp",
MAME_DIR .. "src/mame/drivers/funkyjet.cpp",
MAME_DIR .. "src/mame/drivers/karnov.cpp",
MAME_DIR .. "src/mame/drivers/kchamp.cpp",
diff --git a/src/devices/cpu/mb88xx/mb88dasm.cpp b/src/devices/cpu/mb88xx/mb88dasm.cpp
index 2ab2856e1e8..16e4bf8e902 100644
--- a/src/devices/cpu/mb88xx/mb88dasm.cpp
+++ b/src/devices/cpu/mb88xx/mb88dasm.cpp
@@ -25,94 +25,94 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
switch( op )
{
- case 0x00: util::stream_format( stream, "nop" ); break;
- case 0x01: util::stream_format( stream, "outO (PortO<=A)" ); break;
- case 0x02: util::stream_format( stream, "outP" ); break;
- case 0x03: util::stream_format( stream, "outR (PortR[Y]<=A)" ); break;
- case 0x04: util::stream_format( stream, "tay (Y<=A)" ); break;
- case 0x05: util::stream_format( stream, "tath (TH<=A)" ); break;
- case 0x06: util::stream_format( stream, "tatl (TL<=A)" ); break;
- case 0x07: util::stream_format( stream, "tas (SB<=A)" ); break;
- case 0x08: util::stream_format( stream, "icy (Y++)" ); break;
- case 0x09: util::stream_format( stream, "icm (M[X,Y]++)" ); break;
- case 0x0A: util::stream_format( stream, "stic (M[X,Y]<=A; Y++)" ); break;
- case 0x0B: util::stream_format( stream, "x (A<=>M[X,Y])" ); break;
- case 0x0C: util::stream_format( stream, "rol" ); break;
- case 0x0D: util::stream_format( stream, "load (A<=M[X,Y])" ); break;
- case 0x0E: util::stream_format( stream, "adc (A<=A+M[X,Y]+cf)" ); break;
- case 0x0F: util::stream_format( stream, "and (A<=A & M[X,Y])" ); break;
- case 0x10: util::stream_format( stream, "daa (A<=A+6 if (A>9 | cf=1)" ); break;
- case 0x11: util::stream_format( stream, "das (A<=A+10 if (A>9 | cf=1)" ); break;
- case 0x12: util::stream_format( stream, "inK (A<=PortK)" ); break;
- case 0x13: util::stream_format( stream, "inR (A<=PortR[Y])" ); break;
- case 0x14: util::stream_format( stream, "tya (A<=Y)" ); break;
- case 0x15: util::stream_format( stream, "ttha (A<=TH)" ); break;
- case 0x16: util::stream_format( stream, "ttla (A<=TL)" ); break;
- case 0x17: util::stream_format( stream, "tsa (A<=S)" ); break;
- case 0x18: util::stream_format( stream, "dcy (Y--)" ); break;
- case 0x19: util::stream_format( stream, "dcm (M[X,Y]--)" ); break;
- case 0x1A: util::stream_format( stream, "stdc (M[X,Y]<=A; Y--)" ); break;
- case 0x1B: util::stream_format( stream, "xx (A<=>X)" ); break;
- case 0x1C: util::stream_format( stream, "ror" ); break;
- case 0x1D: util::stream_format( stream, "store (M[X,Y]<=A)" ); break;
- case 0x1E: util::stream_format( stream, "sbc (A<=M[X,Y]-A-cf)" ); break;
- case 0x1F: util::stream_format( stream, "or (A<=A | M[X,Y])" ); break;
- case 0x20: util::stream_format( stream, "setR (PortR bit[Y]<=1)" ); break;
- case 0x21: util::stream_format( stream, "setc (cf<=1)" ); break;
- case 0x22: util::stream_format( stream, "rstR (PortR bit[Y]<=0)" ); break;
- case 0x23: util::stream_format( stream, "rstc (cf<=0)" ); break;
- case 0x24: util::stream_format( stream, "tstR (st<=PortR bit[Y])" ); break;
- case 0x25: util::stream_format( stream, "tsti (st<=IRQ Line)" ); break;
- case 0x26: util::stream_format( stream, "tstv (st<=vf)" ); break;
- case 0x27: util::stream_format( stream, "tsts (st<=sf)" ); break;
- case 0x28: util::stream_format( stream, "tstc (st<=cf)" ); break;
- case 0x29: util::stream_format( stream, "tstz (st<=zf)" ); break;
- case 0x2A: util::stream_format( stream, "sts (M[X,Y]<=SB)" ); break;
- case 0x2B: util::stream_format( stream, "ls (SB<=M[X,Y])" ); break;
- case 0x2C: util::stream_format( stream, "rts" ); break;
- case 0x2D: util::stream_format( stream, "neg (A=-A)" ); break;
- case 0x2E: util::stream_format( stream, "c (A==M[X,Y])" ); break;
- case 0x2F: util::stream_format( stream, "eor (A ^ M[X,Y])" ); break;
+ case 0x00: util::stream_format( stream, "NOP" ); break;
+ case 0x01: util::stream_format( stream, "OUTO" ); break;
+ case 0x02: util::stream_format( stream, "OUTP" ); break;
+ case 0x03: util::stream_format( stream, "OUT" ); break;
+ case 0x04: util::stream_format( stream, "TAY" ); break;
+ case 0x05: util::stream_format( stream, "TATH" ); break;
+ case 0x06: util::stream_format( stream, "TATL" ); break;
+ case 0x07: util::stream_format( stream, "TAS" ); break;
+ case 0x08: util::stream_format( stream, "ICY" ); break;
+ case 0x09: util::stream_format( stream, "ICM" ); break;
+ case 0x0A: util::stream_format( stream, "STIC" ); break;
+ case 0x0B: util::stream_format( stream, "X" ); break;
+ case 0x0C: util::stream_format( stream, "ROL" ); break;
+ case 0x0D: util::stream_format( stream, "L" ); break;
+ case 0x0E: util::stream_format( stream, "ADC" ); break;
+ case 0x0F: util::stream_format( stream, "AND" ); break;
+ case 0x10: util::stream_format( stream, "DAA" ); break;
+ case 0x11: util::stream_format( stream, "DAS" ); break;
+ case 0x12: util::stream_format( stream, "INK" ); break;
+ case 0x13: util::stream_format( stream, "IN" ); break;
+ case 0x14: util::stream_format( stream, "TYA" ); break;
+ case 0x15: util::stream_format( stream, "TTHA" ); break;
+ case 0x16: util::stream_format( stream, "TTLA" ); break;
+ case 0x17: util::stream_format( stream, "TSA" ); break;
+ case 0x18: util::stream_format( stream, "DCY" ); break;
+ case 0x19: util::stream_format( stream, "DCM" ); break;
+ case 0x1A: util::stream_format( stream, "STDC" ); break;
+ case 0x1B: util::stream_format( stream, "XX" ); break;
+ case 0x1C: util::stream_format( stream, "ROR" ); break;
+ case 0x1D: util::stream_format( stream, "ST" ); break;
+ case 0x1E: util::stream_format( stream, "SBC" ); break;
+ case 0x1F: util::stream_format( stream, "OR" ); break;
+ case 0x20: util::stream_format( stream, "SETR" ); break;
+ case 0x21: util::stream_format( stream, "SETC" ); break;
+ case 0x22: util::stream_format( stream, "RSTR" ); break;
+ case 0x23: util::stream_format( stream, "RSTC" ); break;
+ case 0x24: util::stream_format( stream, "TSTR" ); break;
+ case 0x25: util::stream_format( stream, "TSTI" ); break;
+ case 0x26: util::stream_format( stream, "TSTV" ); break;
+ case 0x27: util::stream_format( stream, "TSTS" ); break;
+ case 0x28: util::stream_format( stream, "TSTC" ); break;
+ case 0x29: util::stream_format( stream, "TSTZ" ); break;
+ case 0x2A: util::stream_format( stream, "STS" ); break;
+ case 0x2B: util::stream_format( stream, "LS" ); break;
+ case 0x2C: util::stream_format( stream, "RTS" ); break;
+ case 0x2D: util::stream_format( stream, "NEG" ); break;
+ case 0x2E: util::stream_format( stream, "C" ); break;
+ case 0x2F: util::stream_format( stream, "EOR" ); break;
case 0x30:
case 0x31:
case 0x32:
- case 0x33: util::stream_format( stream, "sbit%d (M[X,Y] bit%d=1)", op&3, op&3 ); break;
+ case 0x33: util::stream_format( stream, "SBIT %d", op&3 ); break;
case 0x34:
case 0x35:
case 0x36:
- case 0x37: util::stream_format( stream, "rbit%d (M[X,Y] bit%d=0)", op&3, op&3 ); break;
+ case 0x37: util::stream_format( stream, "RBIT %d", op&3 ); break;
case 0x38:
case 0x39:
case 0x3A:
- case 0x3B: util::stream_format( stream, "tbit%d (M[X,Y] bit%d == 1)", op&3, op&3 ); break;
- case 0x3C: util::stream_format( stream, "rti" ); break;
- case 0x3D: util::stream_format( stream, "jpa #$%02x (jump always)", arg ); pc++; break;
- case 0x3E: util::stream_format( stream, "en #$%02x (enable bits)", arg ); pc++; break;
- case 0x3F: util::stream_format( stream, "dis #$%02x (disable bits)", arg ); pc++; break;
+ case 0x3B: util::stream_format( stream, "TBIT %d", op&3 ); break;
+ case 0x3C: util::stream_format( stream, "RTI" ); break;
+ case 0x3D: util::stream_format( stream, "JPA #$%02X", arg ); pc++; break;
+ case 0x3E: util::stream_format( stream, "EN #$%02X", arg ); pc++; break;
+ case 0x3F: util::stream_format( stream, "DIS #$%02X", arg ); pc++; break;
case 0x40:
case 0x41:
case 0x42:
- case 0x43: util::stream_format( stream, "setd%d (PortR bit%d<=1)", op&3, op&3 ); break;
+ case 0x43: util::stream_format( stream, "SETD %d", op&3 ); break;
case 0x44:
case 0x45:
case 0x46:
- case 0x47: util::stream_format( stream, "rstd%d (PortR bit%d<=0)", op&3, op&3 ); break;
+ case 0x47: util::stream_format( stream, "RSTD %d", op&3 ); break;
case 0x48:
case 0x49:
case 0x4A:
- case 0x4B: util::stream_format( stream, "tstd%d (PortR bit%d == 1)", (op&3)+8, (op&3)+8 ); break;
+ case 0x4B: util::stream_format( stream, "TSTD %d", (op&3)+8 ); break;
case 0x4C:
case 0x4D:
case 0x4E:
- case 0x4F: util::stream_format( stream, "tba%d (A bit%d == 1)", op&3, op&3 ); break;
+ case 0x4F: util::stream_format( stream, "TBA %d", op&3 ); break;
case 0x50:
case 0x51:
case 0x52:
- case 0x53: util::stream_format( stream, "xd%d (A<=>M[0,%d])", op&3, op&3 ); break;
+ case 0x53: util::stream_format( stream, "XD %d", op&3 ); break;
case 0x54:
case 0x55:
case 0x56:
- case 0x57: util::stream_format( stream, "xyd%d (Y<=>M[0,%d])", (op&3)+4, (op&3)+4 ); break;
+ case 0x57: util::stream_format( stream, "XYD %d", (op&3)+4 ); break;
case 0x58:
case 0x59:
case 0x5A:
@@ -120,7 +120,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x5C:
case 0x5D:
case 0x5E:
- case 0x5F: util::stream_format( stream, "lxi #$%1x (X<=$%1x)", op&7, op&7 ); break;
+ case 0x5F: util::stream_format( stream, "LXI #$%1X", op&7 ); break;
case 0x60:
case 0x61:
case 0x62:
@@ -128,7 +128,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x64:
case 0x65:
case 0x66:
- case 0x67: util::stream_format( stream, "call %02x%02x (call if st=1)", op&7, arg ); pc++; break;
+ case 0x67: util::stream_format( stream, "CALL $%02X%02X", op&7, arg ); pc++; break;
case 0x68:
case 0x69:
case 0x6A:
@@ -136,7 +136,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x6C:
case 0x6D:
case 0x6E:
- case 0x6F: util::stream_format( stream, "jpl %02x%02x (jump if st=1)", op&7, arg ); pc++; break;
+ case 0x6F: util::stream_format( stream, "JPL $%02X%02X", op&7, arg ); pc++; break;
case 0x70:
case 0x71:
case 0x72:
@@ -152,7 +152,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x7C:
case 0x7D:
case 0x7E:
- case 0x7F: util::stream_format( stream, "ai #$%1x (A<=A+$%1x)", op&0xf, op&0xf ); break;
+ case 0x7F: util::stream_format( stream, "AI #$%1X", op&0xf ); break;
case 0x80:
case 0x81:
case 0x82:
@@ -168,7 +168,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x8C:
case 0x8D:
case 0x8E:
- case 0x8F: util::stream_format( stream, "lyi #$%1x (Y<=$%1x)", op&0xf, op&0xf ); break;
+ case 0x8F: util::stream_format( stream, "LYI #$%1X", op&0xf ); break;
case 0x90:
case 0x91:
case 0x92:
@@ -184,7 +184,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0x9C:
case 0x9D:
case 0x9E:
- case 0x9F: util::stream_format( stream, "li #$%1x (A<=$%1x)", op&0xf, op&0xf ); break;
+ case 0x9F: util::stream_format( stream, "LI #$%1X", op&0xf ); break;
case 0xA0:
case 0xA1:
case 0xA2:
@@ -200,7 +200,7 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0xAC:
case 0xAD:
case 0xAE:
- case 0xAF: util::stream_format( stream, "cyi #$%1x (Y==$%1x)", op&0xf, op&0xf ); break;
+ case 0xAF: util::stream_format( stream, "CYI #$%1X", op&0xf ); break;
case 0xB0:
case 0xB1:
case 0xB2:
@@ -216,11 +216,11 @@ offs_t mb88_disassembler::disassemble(std::ostream &stream, offs_t pc, const dat
case 0xBC:
case 0xBD:
case 0xBE:
- case 0xBF: util::stream_format( stream, "ci #$%1x (A==$%1x)", op&0xf, op&0xf ); break;
+ case 0xBF: util::stream_format( stream, "CI #$%1X", op&0xf ); break;
default:
/* C0-FF */
- util::stream_format( stream, "jmp $%04x (jump if st=1)", (pc&(~0x3f))+ op-0xC0 );
+ util::stream_format( stream, "JMP $%04X", (pc&(~0x3f))+ op-0xC0 );
break;
}
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index a045fe23317..743d8c3cdec 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -528,7 +528,7 @@ void emu_options::update_slot_and_image_options()
if (add_and_remove_slot_options())
changed = true;
- // second, we perform an analgous operation with m_image_options
+ // second, we perform an analogous operation with m_image_options
if (add_and_remove_image_options())
changed = true;
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index af3f9789077..0797a0edda4 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -192,6 +192,7 @@
- Proper UM487F device emulation.
- Interlaced video mode.
- Sound.
+ - k7_olym accesses i2c device with an id of 0xeb. Device is unknown.
- More work...
*************************************************************************/
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index bb26e3f18a1..cdd8f40a617 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -1,5 +1,5 @@
// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria,Stephane Humbert
+// copyright-holders:Nicola Salmoria, Stephane Humbert
/***************************************************************************
Fire Trap memory map
@@ -48,7 +48,7 @@ the 8751 triggers IRQ
8000-ffff ROM
read:
-3400 command from the main cpu
+3400 command from the main CPU
write:
1000-1001 YM3526
@@ -172,30 +172,404 @@ the MSM5205-derived interrupt assigned to the NMI line instead.
***************************************************************************/
#include "emu.h"
-#include "includes/firetrap.h"
-#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
+#include "cpu/mcs51/mcs51.h"
+#include "cpu/z80/z80.h"
+#include "machine/74157.h"
+#include "machine/gen_latch.h"
+#include "machine/timer.h"
+#include "sound/msm5205.h"
#include "sound/ymopl.h"
+
+#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
+
+
+namespace {
+
+class base_state : public driver_device
+{
+public:
+ base_state(const machine_config &mconfig, device_type type, const char *tag) :
+ driver_device(mconfig, type, tag),
+ m_maincpu(*this, "maincpu"),
+ m_audiocpu(*this, "audiocpu"),
+ m_msm(*this, "msm"),
+ m_adpcm_select(*this, "adpcm_select"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_palette(*this, "palette"),
+ m_bgvideoram(*this, "bgvideoram%u", 1U),
+ m_fgvideoram(*this, "fgvideoram"),
+ m_spriteram(*this, "spriteram"),
+ m_mainbank(*this, "mainbank"),
+ m_audiobank(*this, "audiobank")
+ { }
+
+ void base(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+
+ required_device<cpu_device> m_maincpu;
+
+ uint8_t m_nmi_enable = 0;
+
+ void base_main_map(address_map &map);
+
+private:
+ // devices
+ required_device<cpu_device> m_audiocpu;
+ required_device<msm5205_device> m_msm;
+ required_device<ls157_device> m_adpcm_select;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<palette_device> m_palette;
+
+ // memory pointers
+ required_shared_ptr_array<uint8_t, 2> m_bgvideoram;
+ required_shared_ptr<uint8_t> m_fgvideoram;
+ required_shared_ptr<uint8_t> m_spriteram;
+ required_memory_bank m_mainbank;
+ required_memory_bank m_audiobank;
+
+ // video-related
+ tilemap_t *m_fg_tilemap = nullptr;
+ tilemap_t *m_bg_tilemap[2]{};
+ uint8_t m_scroll_x[2][2]{};
+ uint8_t m_scroll_y[2][2]{};
+
+ // misc
+ uint8_t m_sound_irq_enable = 0U;
+ uint8_t m_adpcm_toggle = 0;
+
+ void nmi_disable_w(uint8_t data);
+ void bankselect_w(uint8_t data);
+ void irqack_w(uint8_t data);
+ void sound_command_w(uint8_t data);
+ void sound_flip_flop_w(uint8_t data);
+ void sound_bankselect_w(uint8_t data);
+ void adpcm_data_w(uint8_t data);
+ void flip_screen_w(uint8_t data);
+ void fgvideoram_w(offs_t offset, uint8_t data);
+ template <uint8_t Which> void bgvideoram_w(offs_t offset, uint8_t data);
+ template <uint8_t Which> void bg_scrollx_w(offs_t offset, uint8_t data);
+ template <uint8_t Which> void bg_scrolly_w(offs_t offset, uint8_t data);
+ TILEMAP_MAPPER_MEMBER(get_fg_memory_offset);
+ TILEMAP_MAPPER_MEMBER(get_bg_memory_offset);
+ TILE_GET_INFO_MEMBER(get_fg_tile_info);
+ template <uint8_t Which> TILE_GET_INFO_MEMBER(get_bg_tile_info);
+ void palette(palette_device &palette) const;
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+ DECLARE_WRITE_LINE_MEMBER(adpcm_int);
+
+ void sound_map(address_map &map);
+};
+
+class original_state : public base_state
+{
+public:
+ original_state(const machine_config &mconfig, device_type type, const char *tag) :
+ base_state(mconfig, type, tag),
+ m_mcu(*this, "mcu"),
+ m_coins(*this, "COINS")
+ { }
+
+ void firetrap(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+
+private:
+ // devices
+ required_device<i8751_device> m_mcu;
+
+ required_ioport m_coins;
+
+ uint8_t m_mcu_p3 = 0;
+ uint8_t m_maincpu_to_mcu = 0;
+ uint8_t m_mcu_to_maincpu = 0;
+
+ uint8_t mcu_r();
+ void mcu_w(uint8_t data);
+ uint8_t mcu_p0_r();
+ void mcu_p3_w(uint8_t data);
+ TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
+
+ void main_map(address_map &map);
+};
+
+class bootleg_state : public base_state
+{
+public:
+ bootleg_state(const machine_config &mconfig, device_type type, const char *tag) :
+ base_state(mconfig, type, tag),
+ m_in2(*this, "IN2")
+ { }
+
+ void firetrapbl(machine_config &config);
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+private:
+ // misc
+ uint8_t m_coin_command_pending = 0;
+
+ required_ioport m_in2;
+
+ uint8_t coin_r();
+ TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
+
+ void main_map(address_map &map);
+};
+
+
+// video
+
+/***************************************************************************
+
+ Convert the color PROMs into a more useable format.
+
+ Fire Trap has one 256x8 and one 256x4 palette PROMs.
+ I don't know for sure how the palette PROMs are connected to the RGB
+ output, but it's probably the usual:
+
+ bit 7 -- 220 ohm resistor -- GREEN
+ -- 470 ohm resistor -- GREEN
+ -- 1 kohm resistor -- GREEN
+ -- 2.2kohm resistor -- GREEN
+ -- 220 ohm resistor -- RED
+ -- 470 ohm resistor -- RED
+ -- 1 kohm resistor -- RED
+ bit 0 -- 2.2kohm resistor -- RED
+
+ bit 3 -- 220 ohm resistor -- BLUE
+ -- 470 ohm resistor -- BLUE
+ -- 1 kohm resistor -- BLUE
+ bit 0 -- 2.2kohm resistor -- BLUE
+
+***************************************************************************/
+
+void base_state::palette(palette_device &palette) const
+{
+ uint8_t const *const color_prom = memregion("proms")->base();
+
+ for (int i = 0; i < palette.entries(); i++)
+ {
+ int bit0 = (color_prom[i] >> 0) & 0x01;
+ int bit1 = (color_prom[i] >> 1) & 0x01;
+ int bit2 = (color_prom[i] >> 2) & 0x01;
+ int bit3 = (color_prom[i] >> 3) & 0x01;
+ int const r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+ bit0 = (color_prom[i] >> 4) & 0x01;
+ bit1 = (color_prom[i] >> 5) & 0x01;
+ bit2 = (color_prom[i] >> 6) & 0x01;
+ bit3 = (color_prom[i] >> 7) & 0x01;
+ int const g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+ bit0 = (color_prom[i + palette.entries()] >> 0) & 0x01;
+ bit1 = (color_prom[i + palette.entries()] >> 1) & 0x01;
+ bit2 = (color_prom[i + palette.entries()] >> 2) & 0x01;
+ bit3 = (color_prom[i + palette.entries()] >> 3) & 0x01;
+ int const b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
+
+ palette.set_pen_color(i, rgb_t(r, g, b));
+ }
+}
+
+
+/***************************************************************************
+
+ Callbacks for the TileMap code
+
+***************************************************************************/
+
+TILEMAP_MAPPER_MEMBER(base_state::get_fg_memory_offset)
+{
+ return (row ^ 0x1f) + (col << 5);
+}
+
+TILEMAP_MAPPER_MEMBER(base_state::get_bg_memory_offset)
+{
+ return ((row & 0x0f) ^ 0x0f) | ((col & 0x0f) << 4) |
+ // hole at bit 8
+ ((row & 0x10) << 5) | ((col & 0x10) << 6);
+}
+
+TILE_GET_INFO_MEMBER(base_state::get_fg_tile_info)
+{
+ int code = m_fgvideoram[tile_index];
+ int color = m_fgvideoram[tile_index + 0x400];
+ tileinfo.set(0,
+ code | ((color & 0x01) << 8),
+ color >> 4,
+ 0);
+}
+
+template <uint8_t Which>
+TILE_GET_INFO_MEMBER(base_state::get_bg_tile_info)
+{
+ int code = m_bgvideoram[Which][tile_index];
+ int color = m_bgvideoram[Which][tile_index + 0x100];
+ tileinfo.set(Which + 1,
+ code + ((color & 0x03) << 8),
+ (color & 0x30) >> 4,
+ TILE_FLIPXY((color & 0x0c) >> 2));
+}
+
+
+/***************************************************************************
+
+ Start the video hardware emulation.
+
+***************************************************************************/
+
+void base_state::video_start()
+{
+ m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(base_state::get_fg_tile_info)), tilemap_mapper_delegate(*this, FUNC(base_state::get_fg_memory_offset)), 8, 8, 32, 32);
+ m_bg_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(base_state::get_bg_tile_info<0>)), tilemap_mapper_delegate(*this, FUNC(base_state::get_bg_memory_offset)), 16, 16, 32, 32);
+ m_bg_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(base_state::get_bg_tile_info<1>)), tilemap_mapper_delegate(*this, FUNC(base_state::get_bg_memory_offset)), 16, 16, 32, 32);
+
+ m_fg_tilemap->set_transparent_pen(0);
+ m_bg_tilemap[0]->set_transparent_pen(0);
+}
+
+
+/***************************************************************************
+
+ Memory handlers
-#define FIRETRAP_XTAL XTAL(12'000'000)
+***************************************************************************/
+
+void base_state::fgvideoram_w(offs_t offset, uint8_t data)
+{
+ m_fgvideoram[offset] = data;
+ m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
+}
+template <uint8_t Which>
+void base_state::bgvideoram_w(offs_t offset, uint8_t data)
+{
+ m_bgvideoram[Which][offset] = data;
+ m_bg_tilemap[Which]->mark_tile_dirty(offset & 0x6ff);
+}
-void firetrap_state::nmi_disable_w(uint8_t data)
+template <uint8_t Which>
+void base_state::bg_scrollx_w(offs_t offset, uint8_t data)
+{
+ m_scroll_x[Which][offset] = data;
+ m_bg_tilemap[Which]->set_scrollx(0, m_scroll_x[Which][0] | (m_scroll_x[Which][1] << 8));
+}
+
+template <uint8_t Which>
+void base_state::bg_scrolly_w(offs_t offset, uint8_t data)
+{
+ m_scroll_y[Which][offset] = data;
+ m_bg_tilemap[Which]->set_scrolly(0, -(m_scroll_y[Which][0] | (m_scroll_y[Which][1] << 8)));
+}
+
+
+/***************************************************************************
+
+ Display refresh
+
+***************************************************************************/
+
+void base_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ for (int offs = 0; offs < m_spriteram.bytes(); offs += 4)
+ {
+ // the meaning of bit 3 of [offs] is unknown
+
+ int sy = m_spriteram[offs];
+ int sx = m_spriteram[offs + 2];
+ int code = m_spriteram[offs + 3] + 4 * (m_spriteram[offs + 1] & 0xc0);
+ int color = ((m_spriteram[offs + 1] & 0x08) >> 2) | (m_spriteram[offs + 1] & 0x01);
+ int flipx = m_spriteram[offs + 1] & 0x04;
+ int flipy = m_spriteram[offs + 1] & 0x02;
+ if (flip_screen())
+ {
+ sx = 240 - sx;
+ sy = 240 - sy;
+ flipx = !flipx;
+ flipy = !flipy;
+ }
+
+ if (m_spriteram[offs + 1] & 0x10) // double width
+ {
+ if (flip_screen()) sy -= 16;
+
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code & ~1,
+ color,
+ flipx, flipy,
+ sx, flipy ? sy : sy + 16, 0);
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code | 1,
+ color,
+ flipx, flipy,
+ sx, flipy ? sy + 16 : sy, 0);
+
+ // redraw with wraparound
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code & ~1,
+ color,
+ flipx, flipy,
+ sx - 256, flipy ? sy : sy + 16, 0);
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code | 1,
+ color,
+ flipx, flipy,
+ sx - 256, flipy ? sy + 16 : sy, 0);
+ }
+ else
+ {
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code,
+ color,
+ flipx, flipy,
+ sx, sy, 0);
+
+ // redraw with wraparound
+ m_gfxdecode->gfx(3)->transpen(bitmap, cliprect,
+ code,
+ color,
+ flipx, flipy,
+ sx - 256, sy, 0);
+ }
+ }
+}
+
+uint32_t base_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ m_bg_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0);
+ m_bg_tilemap[0]->draw(screen, bitmap, cliprect, 0, 0);
+ draw_sprites(bitmap, cliprect);
+ m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ return 0;
+}
+
+
+// machine
+
+void base_state::nmi_disable_w(uint8_t data)
{
m_nmi_enable = ~data & 1;
if (!m_nmi_enable)
m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
}
-void firetrap_state::firetrap_bankselect_w(uint8_t data)
+void base_state::bankselect_w(uint8_t data)
{
- membank("bank1")->set_entry(data & 0x03);
+ m_mainbank->set_entry(data & 0x03);
}
-void firetrap_state::irqack_w(uint8_t data)
+void base_state::irqack_w(uint8_t data)
{
m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
}
@@ -204,18 +578,18 @@ void firetrap_state::irqack_w(uint8_t data)
// PROTECTION MCU
//**************************************************************************
-uint8_t firetrap_state::mcu_r()
+uint8_t original_state::mcu_r()
{
return m_mcu_to_maincpu;
}
-void firetrap_state::mcu_w(uint8_t data)
+void original_state::mcu_w(uint8_t data)
{
m_maincpu_to_mcu = data;
m_mcu->set_input_line(MCS51_INT0_LINE, ASSERT_LINE);
}
-uint8_t firetrap_state::mcu_p0_r()
+uint8_t original_state::mcu_p0_r()
{
// 7654---- unused
// ----3--- coin2
@@ -228,7 +602,7 @@ uint8_t firetrap_state::mcu_p0_r()
return (m_coins->read() & 0x0e) | coin_inserted;
}
-void firetrap_state::mcu_p3_w(uint8_t data)
+void original_state::mcu_p3_w(uint8_t data)
{
// 765----- unused
// ---4---- coin flip-flop reset
@@ -248,24 +622,24 @@ void firetrap_state::mcu_p3_w(uint8_t data)
m_mcu_p3 = data;
}
-uint8_t firetrap_state::firetrap_8751_bootleg_r()
+uint8_t bootleg_state::coin_r()
{
- /* Check for coin insertion */
- /* the following only works in the bootleg version, which doesn't have an */
- /* 8751 - the real thing is much more complicated than that. */
+ /* Check for coin insertion
+ the following only works in the bootleg version, which doesn't have an
+ 8751 - the real thing is much more complicated than that. */
uint8_t coin = 0;
- uint8_t port = ioport("IN2")->read() & 0x70;
+ uint8_t port = m_in2->read() & 0x70;
if (m_maincpu->pc() == 0x1188)
return ~m_coin_command_pending;
if (port != 0x70)
{
- if (!(port & 0x20)) /* COIN1 */
+ if (!(port & 0x20)) // COIN1
coin = 1;
- if (!(port & 0x40)) /* COIN2 */
+ if (!(port & 0x40)) // COIN2
coin = 2;
- if (!(port & 0x10)) /* SERVICE1 */
+ if (!(port & 0x10)) // SERVICE1
coin = 3;
m_coin_command_pending = coin;
return 0xff;
@@ -274,7 +648,7 @@ uint8_t firetrap_state::firetrap_8751_bootleg_r()
return 0;
}
-void firetrap_state::sound_flip_flop_w(uint8_t data)
+void base_state::sound_flip_flop_w(uint8_t data)
{
m_msm->reset_w(!BIT(data, 0));
m_sound_irq_enable = BIT(data, 1);
@@ -282,12 +656,12 @@ void firetrap_state::sound_flip_flop_w(uint8_t data)
m_audiocpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
}
-void firetrap_state::sound_bankselect_w(uint8_t data)
+void base_state::sound_bankselect_w(uint8_t data)
{
- membank("bank2")->set_entry(data & 0x01);
+ m_audiobank->set_entry(data & 0x01);
}
-WRITE_LINE_MEMBER(firetrap_state::firetrap_adpcm_int)
+WRITE_LINE_MEMBER(base_state::adpcm_int)
{
if (state)
{
@@ -299,67 +673,73 @@ WRITE_LINE_MEMBER(firetrap_state::firetrap_adpcm_int)
}
}
-void firetrap_state::adpcm_data_w(uint8_t data)
+void base_state::adpcm_data_w(uint8_t data)
{
m_audiocpu->set_input_line(M6502_IRQ_LINE, CLEAR_LINE);
m_adpcm_select->ba_w(data);
}
-void firetrap_state::flip_screen_w(uint8_t data)
+void base_state::flip_screen_w(uint8_t data)
{
flip_screen_set(data);
}
-void firetrap_state::firetrap_map(address_map &map)
+void base_state::base_main_map(address_map &map)
{
map(0x0000, 0x7fff).rom();
- map(0x8000, 0xbfff).bankr("bank1");
+ map(0x8000, 0xbfff).bankr(m_mainbank);
map(0xc000, 0xcfff).ram();
- map(0xd000, 0xd7ff).ram().w(FUNC(firetrap_state::firetrap_bg1videoram_w)).share("bg1videoram");
- map(0xd800, 0xdfff).ram().w(FUNC(firetrap_state::firetrap_bg2videoram_w)).share("bg2videoram");
- map(0xe000, 0xe7ff).ram().w(FUNC(firetrap_state::firetrap_fgvideoram_w)).share("fgvideoram");
- map(0xe800, 0xe97f).ram().share("spriteram");
- map(0xf000, 0xf000).w(FUNC(firetrap_state::irqack_w));
- map(0xf001, 0xf001).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0xf002, 0xf002).w(FUNC(firetrap_state::firetrap_bankselect_w));
- map(0xf003, 0xf003).w(FUNC(firetrap_state::flip_screen_w));
- map(0xf004, 0xf004).w(FUNC(firetrap_state::nmi_disable_w));
- map(0xf005, 0xf005).w(FUNC(firetrap_state::mcu_w));
- map(0xf008, 0xf009).w(FUNC(firetrap_state::firetrap_bg1_scrollx_w));
- map(0xf00a, 0xf00b).w(FUNC(firetrap_state::firetrap_bg1_scrolly_w));
- map(0xf00c, 0xf00d).w(FUNC(firetrap_state::firetrap_bg2_scrollx_w));
- map(0xf00e, 0xf00f).w(FUNC(firetrap_state::firetrap_bg2_scrolly_w));
+ map(0xd000, 0xd7ff).ram().w(FUNC(base_state::bgvideoram_w<0>)).share(m_bgvideoram[0]);
+ map(0xd800, 0xdfff).ram().w(FUNC(base_state::bgvideoram_w<1>)).share(m_bgvideoram[1]);
+ map(0xe000, 0xe7ff).ram().w(FUNC(base_state::fgvideoram_w)).share(m_fgvideoram);
+ map(0xe800, 0xe97f).ram().share(m_spriteram);
+ map(0xf000, 0xf000).w(FUNC(base_state::irqack_w));
+ map(0xf001, 0xf001).w("soundlatch", FUNC(generic_latch_8_device::write));
+ map(0xf002, 0xf002).w(FUNC(base_state::bankselect_w));
+ map(0xf003, 0xf003).w(FUNC(base_state::flip_screen_w));
+ map(0xf004, 0xf004).w(FUNC(base_state::nmi_disable_w));
+ map(0xf008, 0xf009).w(FUNC(base_state::bg_scrollx_w<0>));
+ map(0xf00a, 0xf00b).w(FUNC(base_state::bg_scrolly_w<0>));
+ map(0xf00c, 0xf00d).w(FUNC(base_state::bg_scrollx_w<1>));
+ map(0xf00e, 0xf00f).w(FUNC(base_state::bg_scrolly_w<1>));
map(0xf010, 0xf010).portr("IN0");
map(0xf011, 0xf011).portr("IN1");
map(0xf012, 0xf012).portr("IN2");
map(0xf013, 0xf013).portr("DSW0");
map(0xf014, 0xf014).portr("DSW1");
- map(0xf016, 0xf016).r(FUNC(firetrap_state::mcu_r));
}
-void firetrap_state::firetrap_bootleg_map(address_map &map)
+void original_state::main_map(address_map &map)
{
- firetrap_map(map);
- map(0xf005, 0xf005).nopw();
- map(0xf016, 0xf016).r(FUNC(firetrap_state::firetrap_8751_bootleg_r));
- map(0xf800, 0xf8ff).rom(); /* extra ROM in the bootleg with unprotection code */
+ base_main_map(map);
+
+ map(0xf005, 0xf005).w(FUNC(original_state::mcu_w));
+ map(0xf016, 0xf016).r(FUNC(original_state::mcu_r));
}
-void firetrap_state::sound_map(address_map &map)
+void bootleg_state::main_map(address_map &map)
+{
+ base_main_map(map);
+
+ map(0xf016, 0xf016).r(FUNC(bootleg_state::coin_r));
+ map(0xf800, 0xf8ff).rom(); // extra ROM in the bootleg with unprotection code
+}
+
+void base_state::sound_map(address_map &map)
{
map(0x0000, 0x07ff).ram();
map(0x1000, 0x1001).w("ymsnd", FUNC(ym3526_device::write));
- map(0x2000, 0x2000).w(FUNC(firetrap_state::adpcm_data_w));
- map(0x2400, 0x2400).w(FUNC(firetrap_state::sound_flip_flop_w));
- map(0x2800, 0x2800).w(FUNC(firetrap_state::sound_bankselect_w));
- map(0x3400, 0x3400).r(m_soundlatch, FUNC(generic_latch_8_device::read));
- map(0x4000, 0x7fff).bankr("bank2");
- map(0x8000, 0xffff).rom();
+ map(0x2000, 0x2000).w(FUNC(base_state::adpcm_data_w));
+ map(0x2400, 0x2400).w(FUNC(base_state::sound_flip_flop_w));
+ map(0x2800, 0x2800).w(FUNC(base_state::sound_bankselect_w));
+ map(0x3400, 0x3400).r("soundlatch", FUNC(generic_latch_8_device::read));
+ map(0x4000, 0x7fff).bankr(m_audiobank);
+ map(0x8000, 0xffff).rom().region("audiocpu", 0);
}
-/* verified from Z80 code */
+// verified from Z80 code
static INPUT_PORTS_START( firetrap )
- PORT_START("IN0") /* IN0 */
+ PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY
@@ -369,7 +749,7 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY
- PORT_START("IN1") /* IN1 */
+ PORT_START("IN1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_LEFT ) PORT_4WAY PORT_COCKTAIL
@@ -379,7 +759,7 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_LEFT ) PORT_4WAY PORT_COCKTAIL
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_RIGHT ) PORT_4WAY PORT_COCKTAIL
- PORT_START("IN2") /* IN2 */
+ PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -389,13 +769,13 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen")
- PORT_START("DSW0") /* DSW0 */
+ PORT_START("DSW0")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x03, DEF_STR( 1C_4C ) )
- PORT_DIPSETTING( 0x04, DEF_STR( 1C_6C ) ) /* Manual shows 1C_5C */
+ PORT_DIPSETTING( 0x04, DEF_STR( 1C_6C ) ) // Manual shows 1C_5C
PORT_DIPNAME( 0x18, 0x18, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,5")
PORT_DIPSETTING( 0x00, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x08, DEF_STR( 3C_1C ) )
@@ -411,18 +791,18 @@ static INPUT_PORTS_START( firetrap )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("DSW1") /* DSW1 */
+ PORT_START("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x02, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x03, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x01, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Hardest ) )
PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:3,4")
- PORT_DIPSETTING( 0x00, "2" ) /* "1" in the "test mode" but manual states "Infinite" */
+ PORT_DIPSETTING( 0x00, "2" ) // "1" in the "test mode" but manual states "Infinite"
PORT_DIPSETTING( 0x0c, "3" )
PORT_DIPSETTING( 0x08, "4" )
PORT_DIPSETTING( 0x04, "5" )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") /* table at 0x0ca3 - 4*30 bytes */
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") // table at 0x0ca3 - 4*30 bytes
PORT_DIPSETTING( 0x10, "30k and 70k" )
PORT_DIPSETTING( 0x00, "50k and 100k" )
PORT_DIPSETTING( 0x30, "30k only" )
@@ -439,19 +819,19 @@ static INPUT_PORTS_START( firetrap )
PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN2)
INPUT_PORTS_END
-/* verified from Z80 code */
+// verified from Z80 code
static INPUT_PORTS_START( firetrapj )
PORT_INCLUDE( firetrap )
PORT_MODIFY("DSW1")
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") /* table at 0x0ca3 - 4*30 bytes */
- PORT_DIPSETTING( 0x30, "50k & Every 70k" ) /* last bonus life at 960k */
- PORT_DIPSETTING( 0x20, "60k & Every 80k" ) /* last bonus life at 940k */
- PORT_DIPSETTING( 0x10, "80k & Every 100k" ) /* last bonus life at 980k */
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:5,6") // table at 0x0ca3 - 4*30 bytes
+ PORT_DIPSETTING( 0x30, "50k & Every 70k" ) // last bonus life at 960k
+ PORT_DIPSETTING( 0x20, "60k & Every 80k" ) // last bonus life at 940k
+ PORT_DIPSETTING( 0x10, "80k & Every 100k" ) // last bonus life at 980k
PORT_DIPSETTING( 0x00, "50k only" )
INPUT_PORTS_END
-/* verified from Z80 code */
+// verified from Z80 code
static INPUT_PORTS_START( firetrapbl )
PORT_INCLUDE( firetrapj )
@@ -502,160 +882,153 @@ static const gfx_layout spritelayout =
};
static GFXDECODE_START( gfx_firetrap )
- GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x00, 16 ) /* colors 0x00-0x3f */
- GFXDECODE_ENTRY( "gfx2", 0, tilelayout, 0x80, 4 ) /* colors 0x80-0xbf */
- GFXDECODE_ENTRY( "gfx3", 0, tilelayout, 0xc0, 4 ) /* colors 0xc0-0xff */
- GFXDECODE_ENTRY( "gfx4", 0, spritelayout, 0x40, 4 ) /* colors 0x40-0x7f */
+ GFXDECODE_ENTRY( "chars", 0, charlayout, 0x00, 16 ) // colors 0x00-0x3f
+ GFXDECODE_ENTRY( "tiles1", 0, tilelayout, 0x80, 4 ) // colors 0x80-0xbf
+ GFXDECODE_ENTRY( "tiles2", 0, tilelayout, 0xc0, 4 ) // colors 0xc0-0xff
+ GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0x40, 4 ) // colors 0x40-0x7f
GFXDECODE_END
-TIMER_DEVICE_CALLBACK_MEMBER(firetrap_state::interrupt)
+TIMER_DEVICE_CALLBACK_MEMBER(original_state::interrupt)
{
if (param == 0 && m_nmi_enable)
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
- if (param == 0 && m_mcu != nullptr)
+ if (param == 0)
m_mcu->set_input_line(MCS51_INT1_LINE, ASSERT_LINE);
- if (param == 1 && m_mcu != nullptr)
+ if (param == 1)
m_mcu->set_input_line(MCS51_INT1_LINE, CLEAR_LINE);
}
-void firetrap_state::machine_start()
+TIMER_DEVICE_CALLBACK_MEMBER(bootleg_state::interrupt)
{
- uint8_t *MAIN = memregion("maincpu")->base();
- uint8_t *SOUND = memregion("audiocpu")->base();
+ if (param == 0 && m_nmi_enable)
+ m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
+}
- membank("bank1")->configure_entries(0, 4, &MAIN[0x10000], 0x4000);
- membank("bank2")->configure_entries(0, 2, &SOUND[0x10000], 0x4000);
+void base_state::machine_start()
+{
+ uint8_t *main = memregion("maincpu")->base();
+ uint8_t *sound = memregion("audiocpu")->base();
+
+ m_mainbank->configure_entries(0, 4, &main[0x10000], 0x4000);
+ m_audiobank->configure_entries(0, 2, &sound[0x8000], 0x4000);
save_item(NAME(m_sound_irq_enable));
save_item(NAME(m_nmi_enable));
save_item(NAME(m_adpcm_toggle));
- save_item(NAME(m_coin_command_pending));
- save_item(NAME(m_scroll1_x));
- save_item(NAME(m_scroll1_y));
- save_item(NAME(m_scroll2_x));
- save_item(NAME(m_scroll2_y));
+ save_item(NAME(m_scroll_x));
+ save_item(NAME(m_scroll_y));
+}
+
+void original_state::machine_start()
+{
+ base_state::machine_start();
+
save_item(NAME(m_mcu_p3));
save_item(NAME(m_maincpu_to_mcu));
save_item(NAME(m_mcu_to_maincpu));
}
-void firetrap_state::machine_reset()
+void bootleg_state::machine_start()
{
- int i;
+ base_state::machine_start();
- for (i = 0; i < 2; i++)
+ save_item(NAME(m_coin_command_pending));
+}
+
+void base_state::machine_reset()
+{
+ for (int i = 0; i < 2; i++)
{
- m_scroll1_x[i] = 0;
- m_scroll1_y[i] = 0;
- m_scroll2_x[i] = 0;
- m_scroll2_y[i] = 0;
+ m_scroll_x[0][i] = 0;
+ m_scroll_y[0][i] = 0;
+ m_scroll_x[1][i] = 0;
+ m_scroll_y[1][i] = 0;
}
m_sound_irq_enable = 0;
m_nmi_enable = 0;
m_adpcm_toggle = 0;
- m_coin_command_pending = 0;
}
-void firetrap_state::firetrap(machine_config &config)
+void bootleg_state::machine_reset()
{
- /* basic machine hardware */
- Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz
- m_maincpu->set_addrmap(AS_PROGRAM, &firetrap_state::firetrap_map);
+ base_state::machine_reset();
- M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz
- m_audiocpu->set_addrmap(AS_PROGRAM, &firetrap_state::sound_map);
- /* IRQs are caused by the ADPCM chip */
- /* NMIs are caused by the main CPU */
+ m_coin_command_pending = 0;
+}
- I8751(config, m_mcu, 8_MHz_XTAL);
- m_mcu->port_in_cb<0>().set(FUNC(firetrap_state::mcu_p0_r));
- m_mcu->port_out_cb<1>().set([this](u8 data){ m_mcu_to_maincpu = data; });
- m_mcu->port_in_cb<2>().set([this](){ return m_maincpu_to_mcu; });
- m_mcu->port_out_cb<3>().set(FUNC(firetrap_state::mcu_p3_w));
+void base_state::base(machine_config &config)
+{
+ constexpr XTAL FIRETRAP_XTAL = XTAL(12'000'000);
- // needs a tight sync with the mcu
- config.set_perfect_quantum(m_maincpu);
+ // basic machine hardware
+ Z80(config, m_maincpu, FIRETRAP_XTAL / 2); // 6 MHz
- TIMER(config, "scantimer", 0).configure_scanline(FUNC(firetrap_state::interrupt), "screen", 0, 1);
+ M6502(config, m_audiocpu, FIRETRAP_XTAL / 8); // 1.5 MHz
+ m_audiocpu->set_addrmap(AS_PROGRAM, &base_state::sound_map);
+ // IRQs are caused by the ADPCM chip
+ // NMIs are caused by the main CPU
- /* video hardware */
+ // video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
// screen.set_refresh_hz(57.4034); // PCB measurement
-// screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+// screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); // not accurate
// screen.set_size(32*8, 32*8);
// screen.set_visarea(0*8, 32*8-1, 1*8, 31*8-1);
// DECO video CRTC, unverified
- screen.set_raw(FIRETRAP_XTAL/2,384,0,256,272,8,248);
- screen.set_screen_update(FUNC(firetrap_state::screen_update_firetrap));
+ screen.set_raw(FIRETRAP_XTAL / 2, 384, 0, 256, 272, 8, 248);
+ screen.set_screen_update(FUNC(base_state::screen_update));
screen.set_palette(m_palette);
GFXDECODE(config, m_gfxdecode, m_palette, gfx_firetrap);
- PALETTE(config, m_palette, FUNC(firetrap_state::firetrap_palette), 256);
+ PALETTE(config, m_palette, FUNC(base_state::palette), 256);
- /* sound hardware */
+ // sound hardware
SPEAKER(config, "mono").front_center();
- GENERIC_LATCH_8(config, m_soundlatch);
- m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
+ GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
- ym3526_device &ymsnd(YM3526(config, "ymsnd", FIRETRAP_XTAL/4)); // 3 MHz
+ ym3526_device &ymsnd(YM3526(config, "ymsnd", FIRETRAP_XTAL / 4)); // 3 MHz
ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0);
LS157(config, m_adpcm_select, 0);
m_adpcm_select->out_callback().set("msm", FUNC(msm5205_device::data_w));
- MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz
- m_msm->vck_callback().set(FUNC(firetrap_state::firetrap_adpcm_int));
- m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */
+ MSM5205(config, m_msm, FIRETRAP_XTAL / 32); // 375 kHz
+ m_msm->vck_callback().set(FUNC(base_state::adpcm_int));
+ m_msm->set_prescaler_selector(msm5205_device::S48_4B); // 7.8125kHz
m_msm->add_route(ALL_OUTPUTS, "mono", 0.30);
}
-void firetrap_state::firetrapbl(machine_config &config)
+void original_state::firetrap(machine_config &config)
{
- /* basic machine hardware */
- Z80(config, m_maincpu, FIRETRAP_XTAL/2); // 6 MHz
- m_maincpu->set_addrmap(AS_PROGRAM, &firetrap_state::firetrap_bootleg_map);
-
- M6502(config, m_audiocpu, FIRETRAP_XTAL/8); // 1.5 MHz
- m_audiocpu->set_addrmap(AS_PROGRAM, &firetrap_state::sound_map);
- /* IRQs are caused by the ADPCM chip */
- /* NMIs are caused by the main CPU */
+ base(config);
- TIMER(config, "scantimer", 0).configure_scanline(FUNC(firetrap_state::interrupt), "screen", 0, 1);
+ // basic machine hardware
+ m_maincpu->set_addrmap(AS_PROGRAM, &original_state::main_map);
- /* video hardware */
- screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-// screen.set_refresh_hz(57.4034);
-// screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
-// screen.set_size(32*8, 32*8);
-// screen.set_visarea(0*8, 32*8-1, 1*8, 31*8-1);
- // DECO video CRTC, unverified
- screen.set_raw(FIRETRAP_XTAL/2,384,0,256,272,8,248);
- screen.set_screen_update(FUNC(firetrap_state::screen_update_firetrap));
- screen.set_palette(m_palette);
-
- GFXDECODE(config, m_gfxdecode, m_palette, gfx_firetrap);
- PALETTE(config, m_palette, FUNC(firetrap_state::firetrap_palette), 256);
+ TIMER(config, "scantimer", 0).configure_scanline(FUNC(original_state::interrupt), "screen", 0, 1);
- /* sound hardware */
- SPEAKER(config, "mono").front_center();
+ I8751(config, m_mcu, 8_MHz_XTAL);
+ m_mcu->port_in_cb<0>().set(FUNC(original_state::mcu_p0_r));
+ m_mcu->port_out_cb<1>().set([this] (u8 data) { m_mcu_to_maincpu = data; });
+ m_mcu->port_in_cb<2>().set([this] () { return m_maincpu_to_mcu; });
+ m_mcu->port_out_cb<3>().set(FUNC(original_state::mcu_p3_w));
- GENERIC_LATCH_8(config, m_soundlatch);
- m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
+ // needs a tight sync with the MCU
+ config.set_perfect_quantum(m_maincpu);
+}
- ym3526_device &ymsnd(YM3526(config, "ymsnd", FIRETRAP_XTAL/4)); // 3 MHz
- ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0);
+void bootleg_state::firetrapbl(machine_config &config)
+{
+ base(config);
- LS157(config, m_adpcm_select, 0);
- m_adpcm_select->out_callback().set("msm", FUNC(msm5205_device::data_w));
+ // basic machine hardware
+ m_maincpu->set_addrmap(AS_PROGRAM, &bootleg_state::main_map);
- MSM5205(config, m_msm, FIRETRAP_XTAL/32); // 375 kHz
- m_msm->vck_callback().set(FUNC(firetrap_state::firetrap_adpcm_int));
- m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 7.8125kHz */
- m_msm->add_route(ALL_OUTPUTS, "mono", 0.30);
+ TIMER(config, "scantimer", 0).configure_scanline(FUNC(bootleg_state::interrupt), "screen", 0, 1);
}
@@ -667,22 +1040,22 @@ void firetrap_state::firetrapbl(machine_config &config)
***************************************************************************/
ROM_START( firetrap )
- ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + 64k for banked ROMs */
+ ROM_REGION( 0x20000, "maincpu", 0 )
ROM_LOAD( "di-02.4a", 0x00000, 0x8000, CRC(3d1e4bf7) SHA1(ee903b469619f49edb1727fb545c9a6085f50746) )
ROM_LOAD( "di-01.3a", 0x10000, 0x8000, CRC(9bbae38b) SHA1(dc1d3ed5da71bfb104fd54fc70c56833f31d281f) )
- ROM_LOAD( "di-00-a.2a", 0x18000, 0x8000, CRC(f39e2cf4) SHA1(ce77a65089937906d8a41076a3f29ad6f45fda9d) ) // this rom has data at 3FD7 where it seems to be blanked out in firetrapa, as well as other changes
+ ROM_LOAD( "di-00-a.2a", 0x18000, 0x8000, CRC(f39e2cf4) SHA1(ce77a65089937906d8a41076a3f29ad6f45fda9d) ) // this ROM has data at 3FD7 where it seems to be blanked out in firetrapa, as well as other changes
- ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
- ROM_LOAD( "di-17.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
- ROM_LOAD( "di-18.12j", 0x10000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "di-17.10j", 0x00000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
+ ROM_LOAD( "di-18.12j", 0x08000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
- ROM_REGION( 0x1000, "mcu", 0 ) /* 8751 protection MCU */
+ ROM_REGION( 0x1000, "mcu", 0 ) // 8751 protection MCU
ROM_LOAD( "di-12.16h", 0x00000, 0x1000, CRC(6340a4d7) SHA1(3c896015a2416e3d664fedd07e42bdd40078c700) )
- ROM_REGION( 0x02000, "gfx1", 0 ) /* characters */
+ ROM_REGION( 0x02000, "chars", 0 )
ROM_LOAD( "di-03.17c", 0x00000, 0x2000, CRC(46721930) SHA1(a605fe993166e95c1602a35b548649ceae77bff2) )
- ROM_REGION( 0x20000, "gfx2", 0 ) /* tiles */
+ ROM_REGION( 0x20000, "tiles1", 0 )
ROM_LOAD( "di-06.3e", 0x00000, 0x2000, CRC(441d9154) SHA1(340804e82d4aba8e9fcdd08cce0cfecefd2f77a9) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -700,7 +1073,7 @@ ROM_START( firetrap )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx3", 0 )
+ ROM_REGION( 0x20000, "tiles2", 0 )
ROM_LOAD( "di-09.3j", 0x00000, 0x2000, CRC(d11e28e8) SHA1(3e91764f74d551e0984bac92daeab4e094e8dc13) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -718,35 +1091,35 @@ ROM_START( firetrap )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx4", 0 ) /* sprites */
+ ROM_REGION( 0x20000, "sprites", 0 )
ROM_LOAD( "di-16.17h", 0x00000, 0x8000, CRC(0de055d7) SHA1(ef763237c317545520c659f438b572b11c342d5a) )
ROM_LOAD( "di-13.13h", 0x08000, 0x8000, CRC(869219da) SHA1(9ab2439d6d1c62fce24c4f78ac7887f34c86cd75) )
ROM_LOAD( "di-14.14h", 0x10000, 0x8000, CRC(6b65812e) SHA1(209e07b2fced6b033c6d5398a998374588a35f46) )
ROM_LOAD( "di-15.15h", 0x18000, 0x8000, CRC(3e27f77d) SHA1(9ceccb1f56a8d0e05f6dea45d102690a1370624e) )
ROM_REGION( 0x0300, "proms", 0 )
- ROM_LOAD( "firetrap.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) /* palette red and green component */
- ROM_LOAD( "firetrap.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) /* palette blue component */
+ ROM_LOAD( "firetrap.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) // palette red and green component
+ ROM_LOAD( "firetrap.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) // palette blue component
ROM_LOAD( "firetrap.1a", 0x0200, 0x0100, CRC(d67f3514) SHA1(afadda6111fea663fe1373a81e184e51afc601df) ) // ?
ROM_END
ROM_START( firetrapa )
- ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + 64k for banked ROMs */
+ ROM_REGION( 0x20000, "maincpu", 0 )
ROM_LOAD( "di-02.4a", 0x00000, 0x8000, CRC(3d1e4bf7) SHA1(ee903b469619f49edb1727fb545c9a6085f50746) )
ROM_LOAD( "di-01.3a", 0x10000, 0x8000, CRC(9bbae38b) SHA1(dc1d3ed5da71bfb104fd54fc70c56833f31d281f) )
ROM_LOAD( "di-00.2a", 0x18000, 0x8000, CRC(d0dad7de) SHA1(8783ebf6ddfef32f6036913d403f76c1545b813d) )
- ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
- ROM_LOAD( "di-17.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
- ROM_LOAD( "di-18.12j", 0x10000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "di-17.10j", 0x00000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
+ ROM_LOAD( "di-18.12j", 0x08000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
- ROM_REGION( 0x1000, "mcu", 0 ) /* 8751 protection MCU */
+ ROM_REGION( 0x1000, "mcu", 0 ) // 8751 protection MCU
ROM_LOAD( "di-12.16h", 0x00000, 0x1000, CRC(6340a4d7) SHA1(3c896015a2416e3d664fedd07e42bdd40078c700) )
- ROM_REGION( 0x02000, "gfx1", 0 ) /* characters */
+ ROM_REGION( 0x02000, "chars", 0 )
ROM_LOAD( "di-03.17c", 0x00000, 0x2000, CRC(46721930) SHA1(a605fe993166e95c1602a35b548649ceae77bff2) )
- ROM_REGION( 0x20000, "gfx2", 0 ) /* tiles */
+ ROM_REGION( 0x20000, "tiles1", 0 )
ROM_LOAD( "di-06.3e", 0x00000, 0x2000, CRC(441d9154) SHA1(340804e82d4aba8e9fcdd08cce0cfecefd2f77a9) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -764,7 +1137,7 @@ ROM_START( firetrapa )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx3", 0 )
+ ROM_REGION( 0x20000, "tiles2", 0 )
ROM_LOAD( "di-09.3j", 0x00000, 0x2000, CRC(d11e28e8) SHA1(3e91764f74d551e0984bac92daeab4e094e8dc13) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -782,35 +1155,35 @@ ROM_START( firetrapa )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx4", 0 ) /* sprites */
+ ROM_REGION( 0x20000, "sprites", 0 )
ROM_LOAD( "di-16.17h", 0x00000, 0x8000, CRC(0de055d7) SHA1(ef763237c317545520c659f438b572b11c342d5a) )
ROM_LOAD( "di-13.13h", 0x08000, 0x8000, CRC(869219da) SHA1(9ab2439d6d1c62fce24c4f78ac7887f34c86cd75) )
ROM_LOAD( "di-14.14h", 0x10000, 0x8000, CRC(6b65812e) SHA1(209e07b2fced6b033c6d5398a998374588a35f46) )
ROM_LOAD( "di-15.15h", 0x18000, 0x8000, CRC(3e27f77d) SHA1(9ceccb1f56a8d0e05f6dea45d102690a1370624e) )
ROM_REGION( 0x0300, "proms", 0 )
- ROM_LOAD( "firetrap.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) /* palette red and green component */
- ROM_LOAD( "firetrap.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) /* palette blue component */
+ ROM_LOAD( "firetrap.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) // palette red and green component
+ ROM_LOAD( "firetrap.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) // palette blue component
ROM_LOAD( "firetrap.1a", 0x0200, 0x0100, CRC(d67f3514) SHA1(afadda6111fea663fe1373a81e184e51afc601df) ) // ?
ROM_END
ROM_START( firetrapj )
- ROM_REGION( 0x20000, "maincpu", 0 ) /* 64k for code + 64k for banked ROMs */
+ ROM_REGION( 0x20000, "maincpu", 0 )
ROM_LOAD( "fi-03.4a", 0x00000, 0x8000, CRC(20b2a4ff) SHA1(7c5de0789c5d3459063eb791f62d41c05ab474cc) )
ROM_LOAD( "fi-02.3a", 0x10000, 0x8000, CRC(5c8a0562) SHA1(856766851faa4353445d944b7705e348fd1379e4) )
ROM_LOAD( "fi-01.2a", 0x18000, 0x8000, CRC(f2412fe8) SHA1(28a9143e36c31fe34f40888dc848aed3d572d801) )
- ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
- ROM_LOAD( "fi-18.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
- ROM_LOAD( "fi-19.12j", 0x10000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "fi-18.10j", 0x00000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
+ ROM_LOAD( "fi-19.12j", 0x08000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
- ROM_REGION( 0x1000, "mcu", 0 ) /* 8751 protection MCU */
+ ROM_REGION( 0x1000, "mcu", 0 ) // 8751 protection MCU
ROM_LOAD( "fi-13.16h", 0x00000, 0x1000, CRC(e531a633) SHA1(f21349f4e1147643204ae9735c304129f49911e7) )
- ROM_REGION( 0x02000, "gfx1", 0 ) /* characters */
+ ROM_REGION( 0x02000, "chars", 0 )
ROM_LOAD( "fi-04.17c", 0x00000, 0x2000, CRC(a584fc16) SHA1(6ac3692a14cb7c70799c23f8f6726fa5be1ac0d8) )
- ROM_REGION( 0x20000, "gfx2", 0 ) /* tiles */
+ ROM_REGION( 0x20000, "tiles1", 0 )
ROM_LOAD( "fi-06.3e", 0x00000, 0x2000, CRC(441d9154) SHA1(340804e82d4aba8e9fcdd08cce0cfecefd2f77a9) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -828,7 +1201,7 @@ ROM_START( firetrapj )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx3", 0 )
+ ROM_REGION( 0x20000, "tiles2", 0 )
ROM_LOAD( "fi-10.3j", 0x00000, 0x2000, CRC(d11e28e8) SHA1(3e91764f74d551e0984bac92daeab4e094e8dc13) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -846,33 +1219,33 @@ ROM_START( firetrapj )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx4", 0 ) /* sprites */
+ ROM_REGION( 0x20000, "sprites", 0 )
ROM_LOAD( "fi-17.17h", 0x00000, 0x8000, CRC(0de055d7) SHA1(ef763237c317545520c659f438b572b11c342d5a) )
ROM_LOAD( "fi-14.13h", 0x08000, 0x8000, CRC(dbcdd3df) SHA1(99a7722e818a0f12ece1abd038531cdcb60f1181) )
ROM_LOAD( "fi-15.14h", 0x10000, 0x8000, CRC(6b65812e) SHA1(209e07b2fced6b033c6d5398a998374588a35f46) )
ROM_LOAD( "fi-16.15h", 0x18000, 0x8000, CRC(3e27f77d) SHA1(9ceccb1f56a8d0e05f6dea45d102690a1370624e) )
ROM_REGION( 0x0300, "proms", 0 )
- ROM_LOAD( "fi-2.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) /* palette red and green component */
- ROM_LOAD( "fi-3.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) /* palette blue component */
+ ROM_LOAD( "fi-2.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) // palette red and green component
+ ROM_LOAD( "fi-3.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) // palette blue component
ROM_LOAD( "fi-1.1a", 0x0200, 0x0100, CRC(d67f3514) SHA1(afadda6111fea663fe1373a81e184e51afc601df) ) // ?
ROM_END
ROM_START( firetrapbl )
- ROM_REGION( 0x28000, "maincpu", 0 ) /* 64k for code + 96k for banked ROMs */
+ ROM_REGION( 0x28000, "maincpu", 0 )
ROM_LOAD( "ft0d.bin", 0x00000, 0x8000, CRC(793ef849) SHA1(5a2c587370733d43484ba0a38a357260cdde8357) )
- ROM_LOAD( "ft0a.bin", 0x08000, 0x8000, CRC(613313ee) SHA1(54e386b2b1faada3441e3e0bb7822a63eab36930) ) /* unprotection code */
+ ROM_LOAD( "ft0a.bin", 0x08000, 0x8000, CRC(613313ee) SHA1(54e386b2b1faada3441e3e0bb7822a63eab36930) ) // unprotection code
ROM_LOAD( "fi-02.3a", 0x10000, 0x8000, CRC(5c8a0562) SHA1(856766851faa4353445d944b7705e348fd1379e4) )
ROM_LOAD( "fi-01.2a", 0x18000, 0x8000, CRC(f2412fe8) SHA1(28a9143e36c31fe34f40888dc848aed3d572d801) )
- ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the sound CPU + 32k for banked ROMs */
- ROM_LOAD( "fi-18.10j", 0x08000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
- ROM_LOAD( "fi-19.12j", 0x10000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "fi-18.10j", 0x00000, 0x8000, CRC(8605f6b9) SHA1(4fba88f34afd91d2cbc578b3b70f5399b8844390) )
+ ROM_LOAD( "fi-19.12j", 0x08000, 0x8000, CRC(49508c93) SHA1(3812b0b1a33a1506d2896d2b676ed6aabb29dac0) )
- ROM_REGION( 0x02000, "gfx1", 0 ) /* characters */
+ ROM_REGION( 0x02000, "chars", 0 )
ROM_LOAD( "fi-04.17c", 0x00000, 0x2000, CRC(a584fc16) SHA1(6ac3692a14cb7c70799c23f8f6726fa5be1ac0d8) )
- ROM_REGION( 0x20000, "gfx2", 0 ) /* tiles */
+ ROM_REGION( 0x20000, "tiles1", 0 )
ROM_LOAD( "fi-06.3e", 0x00000, 0x2000, CRC(441d9154) SHA1(340804e82d4aba8e9fcdd08cce0cfecefd2f77a9) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -890,7 +1263,7 @@ ROM_START( firetrapbl )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx3", 0 )
+ ROM_REGION( 0x20000, "tiles2", 0 )
ROM_LOAD( "fi-10.3j", 0x00000, 0x2000, CRC(d11e28e8) SHA1(3e91764f74d551e0984bac92daeab4e094e8dc13) )
ROM_CONTINUE( 0x08000, 0x2000 )
ROM_CONTINUE( 0x02000, 0x2000 )
@@ -908,21 +1281,22 @@ ROM_START( firetrapbl )
ROM_CONTINUE( 0x16000, 0x2000 )
ROM_CONTINUE( 0x1e000, 0x2000 )
- ROM_REGION( 0x20000, "gfx4", 0 ) /* sprites */
+ ROM_REGION( 0x20000, "sprites", 0 )
ROM_LOAD( "fi-17.17h", 0x00000, 0x8000, CRC(0de055d7) SHA1(ef763237c317545520c659f438b572b11c342d5a) )
ROM_LOAD( "fi-14.13h", 0x08000, 0x8000, CRC(869219da) SHA1(9ab2439d6d1c62fce24c4f78ac7887f34c86cd75) ) // sldh
ROM_LOAD( "fi-15.14h", 0x10000, 0x8000, CRC(6b65812e) SHA1(209e07b2fced6b033c6d5398a998374588a35f46) )
ROM_LOAD( "fi-16.15h", 0x18000, 0x8000, CRC(3e27f77d) SHA1(9ceccb1f56a8d0e05f6dea45d102690a1370624e) )
ROM_REGION( 0x0300, "proms", 0 )
- ROM_LOAD( "fi-2.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) /* palette red and green component */
- ROM_LOAD( "fi-3.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) /* palette blue component */
+ ROM_LOAD( "fi-2.3b", 0x0000, 0x0100, CRC(8bb45337) SHA1(deaf6ea53eb3955230db1fdcb870079758a0c996) ) // palette red and green component
+ ROM_LOAD( "fi-3.4b", 0x0100, 0x0100, CRC(d5abfc64) SHA1(6c808c1d6087804214dc29d35280f42382c40b18) ) // palette blue component
ROM_LOAD( "fi-1.1a", 0x0200, 0x0100, CRC(d67f3514) SHA1(afadda6111fea663fe1373a81e184e51afc601df) ) // ?
ROM_END
+} // anonymous namespace
-GAME( 1986, firetrap, 0, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US, rev A)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapa, firetrap, firetrap, firetrap, firetrap_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, firetrap_state, empty_init, ROT90, "Woodplace Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
-GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, firetrap_state, empty_init, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrap, 0, firetrap, firetrap, original_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US, rev A)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapa, firetrap, firetrap, firetrap, original_state, empty_init, ROT90, "Woodplace Inc. (Data East USA license)", "Fire Trap (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapj, firetrap, firetrap, firetrapj, original_state, empty_init, ROT90, "Woodplace Inc.", "Fire Trap (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, firetrapbl, firetrap, firetrapbl, firetrapbl, bootleg_state, empty_init, ROT90, "bootleg", "Fire Trap (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/scrablex.cpp b/src/mame/drivers/scrablex.cpp
index 5f64d9a511f..15b69e7f947 100644
--- a/src/mame/drivers/scrablex.cpp
+++ b/src/mame/drivers/scrablex.cpp
@@ -54,7 +54,7 @@ private:
template<int N> void write_r(u8 data);
u8 m_inp_mux = 0;
- u8 m_r[4] = { };
+ u16 m_r = 0;
};
void scrablex_state::machine_start()
@@ -99,22 +99,14 @@ template<int N>
void scrablex_state::write_r(u8 data)
{
// R0-R13: digit segments
- m_r[N] = ~data & 0xf;
-
- u16 digit_data = 0;
- for (int i = 0; i < 4; i++)
- digit_data = (digit_data << 4) | (m_r[i ^ 3]);
-
- digit_data = bitswap<14>(digit_data,10,8,6,12,11,7,9,13,5,4,3,2,1,0);
- m_display->write_mx(digit_data);
+ m_r = (m_r & ~(0xf << (N * 4))) | ((~data & 0xf) << (N * 4));
+ m_display->write_mx(bitswap<14>(m_r,10,8,6,12,11,7,9,13,5,4,3,2,1,0));
// R14,R15: speaker out
+ m_speaker->level_w(m_r >> 14 & 3);
+
// R15: input mux part
- if (N == 3)
- {
- m_speaker->level_w(data >> 2 & 3);
- m_inp_mux = (m_inp_mux & 0xf) | (~data << 1 & 0x10);
- }
+ m_inp_mux = (m_inp_mux & 0xf) | (m_r >> 11 & 0x10);
}
diff --git a/src/mame/drivers/spg2xx_jakks_gkr.cpp b/src/mame/drivers/spg2xx_jakks_gkr.cpp
index f9cd53fc2e3..63b5c95343c 100644
--- a/src/mame/drivers/spg2xx_jakks_gkr.cpp
+++ b/src/mame/drivers/spg2xx_jakks_gkr.cpp
@@ -468,7 +468,7 @@ void jakks_gkr_state::jakks_gkr(machine_config &config)
void jakks_gkr_state::jakks_gkr_i2c(machine_config &config)
{
jakks_gkr(config);
- I2C_24C04(config, m_i2cmem, 0); // ?
+ I2C_24C16(config, m_i2cmem, 0); // ?
}
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index 9a30af26cf5..b2677d46429 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -1977,7 +1977,7 @@ CONS( 2003, jarajal, 0, 0, xavix_nv, jarajal, xavix_state,
CONS( 2003, tcarnavi, 0, 0, xavix_nv, jarajal, xavix_state, init_xavix, "Tomy / SSD Company LTD", "Tomica Carnavi Drive (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-CONS( 2003, tomcpin, 0, 0, xavix_i2c_24c02, tomcpin, xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD", "Champiyon Pinball (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2003, tomcpin, 0, 0, xavix_i2c_24c08, tomcpin, xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD", "Champiyon Pinball (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
CONS( 2004, tomplc, 0, 0, xavix_i2c_24c02, tomcpin, xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD", "Nihon Isshuu - Boku wa Plarail Untenshi (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/xavix_2000.cpp b/src/mame/drivers/xavix_2000.cpp
index 30909fd8c17..c6909d45b17 100644
--- a/src/mame/drivers/xavix_2000.cpp
+++ b/src/mame/drivers/xavix_2000.cpp
@@ -215,6 +215,13 @@ void xavix_2000_nv_sdb_state::xavix2000_nv_sdb(machine_config &config)
m_anport->read_3_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport3_r));
}
+void xavix_i2c_state::xavix2000_i2c_24c08(machine_config &config)
+{
+ xavix2000(config);
+
+ I2C_24C08(config, "i2cmem", 0);
+}
+
void xavix_i2c_state::xavix2000_i2c_24c04(machine_config &config)
{
xavix2000(config);
@@ -274,14 +281,14 @@ ROM_END
// doesn't use extra opcodes?
CONS( 2002, epo_ebox, 0, 0, xavix2000_nv, epo_ebox, xavix_state, init_xavix, "Epoch / SSD Company LTD", "Excite Boxing (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // doesn't use XaviX2000 extra opcodes, but had that type of CPU
// die not confirmed, but uses extra opcodes. (hangs on title screen due to combination of freq_timer_done nested interrupts tripping, and waiting on bits in input ports to change
-CONS( 2002, epo_bowl, 0, 0, xavix2000_i2c_24c02, epo_bowl, xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD", "Excite Bowling (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2002, epo_bowl, 0, 0, xavix2000_i2c_24c04, epo_bowl, xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD", "Excite Bowling (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
CONS( 2004, epo_sdb, 0, 0, xavix2000_nv_sdb, epo_sdb, xavix_2000_nv_sdb_state, init_xavix, "Epoch / SSD Company LTD", "Super Dash Ball (Japan)", MACHINE_IMPERFECT_SOUND )
CONS( 2005, ttv_sw, 0, 0, xavix2000_i2c_24c02, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Tiger / SSD Company LTD", "Star Wars Saga Edition - Lightsaber Battle Game", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
CONS( 2005, ttv_lotr, 0, 0, xavix2000_i2c_24c02, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Tiger / SSD Company LTD", "Lord Of The Rings - Warrior of Middle-Earth", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
CONS( 2005, ttv_mx, 0, 0, xavix2000_i2c_24c04, ttv_mx, xavix_i2c_state, init_xavix, "Tiger / SSD Company LTD", "MX Dirt Rebel", MACHINE_IMPERFECT_SOUND )
-CONS( 2003, drgqst, 0, 0, xavix2000_i2c_24c02, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Square Enix / SSD Company LTD", "Kenshin Dragon Quest: Yomigaerishi Densetsu no Ken", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2003, drgqst, 0, 0, xavix2000_i2c_24c08, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Square Enix / SSD Company LTD", "Kenshin Dragon Quest: Yomigaerishi Densetsu no Ken", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
// hangs after starting a game, or after quite a long time in attract mode (first problem could be bad save data read with the eeprom code, 2nd problem might just be how it is, ends up in a dead loop, not executing invalid code, idle timeout / battery saver)
CONS( 2004, ban_onep, 0, 0, xavix2000_i2c_24c04, ttv_lotr, xavix_i2c_lotr_state, init_xavix, "Bandai / SSD Company LTD", "One Piece Punch Battle (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/drivers/xavix_2002.cpp b/src/mame/drivers/xavix_2002.cpp
index 5cde7e9e328..aa5c03e0a64 100644
--- a/src/mame/drivers/xavix_2002.cpp
+++ b/src/mame/drivers/xavix_2002.cpp
@@ -339,7 +339,7 @@ void xavix_state::xavix2002(machine_config &config)
void xavix_i2c_jmat_state::xavix2002_i2c_jmat(machine_config &config)
{
- xavix2002_i2c_24c04(config);
+ xavix2002_i2c_24c08(config);
m_xavix2002io->read_0_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io0));
m_xavix2002io->write_0_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io0));
@@ -359,6 +359,13 @@ void xavix2002_superpttv_state::xavix2002_superpctv(machine_config& config)
}
+void xavix_i2c_state::xavix2002_i2c_24c08(machine_config &config)
+{
+ xavix2002(config);
+
+ I2C_24C08(config, "i2cmem", 0);
+}
+
void xavix_i2c_state::xavix2002_i2c_24c04(machine_config &config)
{
xavix2002(config);
@@ -501,11 +508,11 @@ ROM_END
CONS( 2004, xavtenni, 0, 0, xavix2002_i2c_24c04, xavix_i2c, xavix_i2c_state, init_xavix, "SSD Company LTD", "XaviX Tennis (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2004, xavbaseb, 0, 0, xavix2002_i2c_24c04, xavix_i2c, xavix_i2c_state, init_xavix, "SSD Company LTD", "XaviX Baseball (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2004, xavbaseb, 0, 0, xavix2002_i2c_24c08, xavix_i2c, xavix_i2c_state, init_xavix, "SSD Company LTD", "XaviX Baseball (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
CONS( 2004, xavbowl, 0, 0, xavix2002_i2c_24c04, xavix_bowl, xavix_i2c_bowl_state, init_xavix, "SSD Company LTD", "XaviX Bowling (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
CONS( 2004, xavbox, 0, 0, xavix2002_i2c_jmat, xavix, xavix_i2c_jmat_state, init_xavix, "SSD Company LTD", "XaviX Boxing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
// Bass Fishing PCB is just like Tennis except with an RF daughterboard.
-CONS( 2004, xavbassf, 0, 0, xavix2002_i2c_24c04, xavix_i2c, xavix_i2c_state, init_xavix, "SSD Company LTD", "XaviX Bass Fishing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2004, xavbassf, 0, 0, xavix2002_i2c_24c08, xavix_i2c, xavix_i2c_state, init_xavix, "SSD Company LTD", "XaviX Bass Fishing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
// TODO: check SEEPROM type and hookup, banking!
CONS( 2005, xavjmat, 0, 0, xavix2002_i2c_jmat, xavix, xavix_i2c_jmat_state, init_xavix, "SSD Company LTD", "Jackie Chan J-Mat Fitness (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
deleted file mode 100644
index d7d6736d150..00000000000
--- a/src/mame/includes/firetrap.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
-/***************************************************************************
-
- Fire Trap
-
-***************************************************************************/
-#ifndef MAME_INCLUDES_FIRETRAP_H
-#define MAME_INCLUDES_FIRETRAP_H
-
-#pragma once
-
-#include "cpu/mcs51/mcs51.h"
-#include "machine/74157.h"
-#include "machine/gen_latch.h"
-#include "machine/timer.h"
-#include "sound/msm5205.h"
-#include "emupal.h"
-#include "tilemap.h"
-
-class firetrap_state : public driver_device
-{
-public:
- firetrap_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_bg1videoram(*this, "bg1videoram"),
- m_bg2videoram(*this, "bg2videoram"),
- m_fgvideoram(*this, "fgvideoram"),
- m_spriteram(*this, "spriteram"),
- m_maincpu(*this, "maincpu"),
- m_audiocpu(*this, "audiocpu"),
- m_mcu(*this, "mcu"),
- m_msm(*this, "msm"),
- m_adpcm_select(*this, "adpcm_select"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette"),
- m_soundlatch(*this, "soundlatch"),
- m_coins(*this, "COINS")
- { }
-
- void firetrapbl(machine_config &config);
- void firetrap(machine_config &config);
-
-protected:
- virtual void machine_start() override;
- virtual void machine_reset() override;
- virtual void video_start() override;
-
-private:
- /* memory pointers */
- required_shared_ptr<uint8_t> m_bg1videoram;
- required_shared_ptr<uint8_t> m_bg2videoram;
- required_shared_ptr<uint8_t> m_fgvideoram;
- required_shared_ptr<uint8_t> m_spriteram;
-
- /* video-related */
- tilemap_t *m_fg_tilemap = nullptr;
- tilemap_t *m_bg1_tilemap = nullptr;
- tilemap_t *m_bg2_tilemap = nullptr;
- uint8_t m_scroll1_x[2]{};
- uint8_t m_scroll1_y[2]{};
- uint8_t m_scroll2_x[2]{};
- uint8_t m_scroll2_y[2]{};
-
- /* misc */
- int m_sound_irq_enable = 0;
- int m_nmi_enable = 0;
- int m_adpcm_toggle = 0;
- int m_coin_command_pending = 0;
-
- uint8_t m_mcu_p3 = 0;
- uint8_t m_maincpu_to_mcu = 0;
- uint8_t m_mcu_to_maincpu = 0;
-
- /* devices */
- required_device<cpu_device> m_maincpu;
- required_device<cpu_device> m_audiocpu;
- optional_device<i8751_device> m_mcu;
- required_device<msm5205_device> m_msm;
- required_device<ls157_device> m_adpcm_select;
- required_device<gfxdecode_device> m_gfxdecode;
- required_device<palette_device> m_palette;
- required_device<generic_latch_8_device> m_soundlatch;
-
- optional_ioport m_coins;
-
- void nmi_disable_w(uint8_t data);
- void firetrap_bankselect_w(uint8_t data);
- void irqack_w(uint8_t data);
- uint8_t mcu_r();
- void mcu_w(uint8_t data);
- uint8_t mcu_p0_r();
- void mcu_p3_w(uint8_t data);
- uint8_t firetrap_8751_bootleg_r();
- void sound_command_w(uint8_t data);
- void sound_flip_flop_w(uint8_t data);
- void sound_bankselect_w(uint8_t data);
- void adpcm_data_w(uint8_t data);
- void flip_screen_w(uint8_t data);
- void firetrap_fgvideoram_w(offs_t offset, uint8_t data);
- void firetrap_bg1videoram_w(offs_t offset, uint8_t data);
- void firetrap_bg2videoram_w(offs_t offset, uint8_t data);
- void firetrap_bg1_scrollx_w(offs_t offset, uint8_t data);
- void firetrap_bg1_scrolly_w(offs_t offset, uint8_t data);
- void firetrap_bg2_scrollx_w(offs_t offset, uint8_t data);
- void firetrap_bg2_scrolly_w(offs_t offset, uint8_t data);
- TILEMAP_MAPPER_MEMBER(get_fg_memory_offset);
- TILEMAP_MAPPER_MEMBER(get_bg_memory_offset);
- TILE_GET_INFO_MEMBER(get_fg_tile_info);
- TILE_GET_INFO_MEMBER(get_bg1_tile_info);
- TILE_GET_INFO_MEMBER(get_bg2_tile_info);
- void firetrap_palette(palette_device &palette) const;
- uint32_t screen_update_firetrap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- TIMER_DEVICE_CALLBACK_MEMBER(interrupt);
- inline void get_bg_tile_info(tile_data &tileinfo, int tile_index, uint8_t *bgvideoram, int gfx_region);
- void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect );
- DECLARE_WRITE_LINE_MEMBER(firetrap_adpcm_int);
- void firetrap_map(address_map &map);
- void firetrap_bootleg_map(address_map &map);
- void sound_map(address_map &map);
-};
-
-#endif // MAME_INCLUDES_FIRETRAP_H
diff --git a/src/mame/includes/xavix.h b/src/mame/includes/xavix.h
index e549bc96173..f2c6b544578 100644
--- a/src/mame/includes/xavix.h
+++ b/src/mame/includes/xavix.h
@@ -616,9 +616,11 @@ public:
void xavix_i2c_24c02(machine_config &config);
void xavix_i2c_24c08(machine_config &config);
+ void xavix2000_i2c_24c08(machine_config &config);
void xavix2000_i2c_24c04(machine_config &config);
void xavix2000_i2c_24c02(machine_config &config);
+ void xavix2002_i2c_24c08(machine_config &config);
void xavix2002_i2c_24c04(machine_config &config);
void xavix2002_i2c_mrangbat(machine_config& config);
diff --git a/src/mame/video/firetrap.cpp b/src/mame/video/firetrap.cpp
deleted file mode 100644
index e1d04a2a6ae..00000000000
--- a/src/mame/video/firetrap.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nicola Salmoria
-/***************************************************************************
-
- video.c
-
- Functions to emulate the video hardware of the machine.
-
-***************************************************************************/
-
-#include "emu.h"
-#include "includes/firetrap.h"
-
-
-/***************************************************************************
-
- Convert the color PROMs into a more useable format.
-
- Fire Trap has one 256x8 and one 256x4 palette PROMs.
- I don't know for sure how the palette PROMs are connected to the RGB
- output, but it's probably the usual:
-
- bit 7 -- 220 ohm resistor -- GREEN
- -- 470 ohm resistor -- GREEN
- -- 1 kohm resistor -- GREEN
- -- 2.2kohm resistor -- GREEN
- -- 220 ohm resistor -- RED
- -- 470 ohm resistor -- RED
- -- 1 kohm resistor -- RED
- bit 0 -- 2.2kohm resistor -- RED
-
- bit 3 -- 220 ohm resistor -- BLUE
- -- 470 ohm resistor -- BLUE
- -- 1 kohm resistor -- BLUE
- bit 0 -- 2.2kohm resistor -- BLUE
-
-***************************************************************************/
-
-void firetrap_state::firetrap_palette(palette_device &palette) const
-{
- uint8_t const *const color_prom = memregion("proms")->base();
-
- for (int i = 0; i < palette.entries(); i++)
- {
- int bit0, bit1, bit2, bit3;
-
- bit0 = (color_prom[i] >> 0) & 0x01;
- bit1 = (color_prom[i] >> 1) & 0x01;
- bit2 = (color_prom[i] >> 2) & 0x01;
- bit3 = (color_prom[i] >> 3) & 0x01;
- int const r = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- bit0 = (color_prom[i] >> 4) & 0x01;
- bit1 = (color_prom[i] >> 5) & 0x01;
- bit2 = (color_prom[i] >> 6) & 0x01;
- bit3 = (color_prom[i] >> 7) & 0x01;
- int const g = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
- bit0 = (color_prom[i + palette.entries()] >> 0) & 0x01;
- bit1 = (color_prom[i + palette.entries()] >> 1) & 0x01;
- bit2 = (color_prom[i + palette.entries()] >> 2) & 0x01;
- bit3 = (color_prom[i + palette.entries()] >> 3) & 0x01;
- int const b = 0x0e * bit0 + 0x1f * bit1 + 0x43 * bit2 + 0x8f * bit3;
-
- palette.set_pen_color(i, rgb_t(r, g, b));
- }
-}
-
-
-/***************************************************************************
-
- Callbacks for the TileMap code
-
-***************************************************************************/
-
-TILEMAP_MAPPER_MEMBER(firetrap_state::get_fg_memory_offset)
-{
- return (row ^ 0x1f) + (col << 5);
-}
-
-TILEMAP_MAPPER_MEMBER(firetrap_state::get_bg_memory_offset)
-{
- return ((row & 0x0f) ^ 0x0f) | ((col & 0x0f) << 4) |
- /* hole at bit 8 */
- ((row & 0x10) << 5) | ((col & 0x10) << 6);
-}
-
-TILE_GET_INFO_MEMBER(firetrap_state::get_fg_tile_info)
-{
- int code = m_fgvideoram[tile_index];
- int color = m_fgvideoram[tile_index + 0x400];
- tileinfo.set(0,
- code | ((color & 0x01) << 8),
- color >> 4,
- 0);
-}
-
-inline void firetrap_state::get_bg_tile_info(tile_data &tileinfo, int tile_index, uint8_t *bgvideoram, int gfx_region)
-{
- int code = bgvideoram[tile_index];
- int color = bgvideoram[tile_index + 0x100];
- tileinfo.set(gfx_region,
- code + ((color & 0x03) << 8),
- (color & 0x30) >> 4,
- TILE_FLIPXY((color & 0x0c) >> 2));
-}
-
-TILE_GET_INFO_MEMBER(firetrap_state::get_bg1_tile_info)
-{
- get_bg_tile_info(tileinfo, tile_index, m_bg1videoram, 1);
-}
-
-TILE_GET_INFO_MEMBER(firetrap_state::get_bg2_tile_info)
-{
- get_bg_tile_info(tileinfo, tile_index, m_bg2videoram, 2);
-}
-
-
-/***************************************************************************
-
- Start the video hardware emulation.
-
-***************************************************************************/
-
-void firetrap_state::video_start()
-{
- m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(firetrap_state::get_fg_tile_info)), tilemap_mapper_delegate(*this, FUNC(firetrap_state::get_fg_memory_offset)), 8, 8, 32, 32);
- m_bg1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(firetrap_state::get_bg1_tile_info)), tilemap_mapper_delegate(*this, FUNC(firetrap_state::get_bg_memory_offset)), 16, 16, 32, 32);
- m_bg2_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(firetrap_state::get_bg2_tile_info)), tilemap_mapper_delegate(*this, FUNC(firetrap_state::get_bg_memory_offset)), 16, 16, 32, 32);
-
- m_fg_tilemap->set_transparent_pen(0);
- m_bg1_tilemap->set_transparent_pen(0);
-}
-
-
-/***************************************************************************
-
- Memory handlers
-
-***************************************************************************/
-
-void firetrap_state::firetrap_fgvideoram_w(offs_t offset, uint8_t data)
-{
- m_fgvideoram[offset] = data;
- m_fg_tilemap->mark_tile_dirty(offset & 0x3ff);
-}
-
-void firetrap_state::firetrap_bg1videoram_w(offs_t offset, uint8_t data)
-{
- m_bg1videoram[offset] = data;
- m_bg1_tilemap->mark_tile_dirty(offset & 0x6ff);
-}
-
-void firetrap_state::firetrap_bg2videoram_w(offs_t offset, uint8_t data)
-{
- m_bg2videoram[offset] = data;
- m_bg2_tilemap->mark_tile_dirty(offset & 0x6ff);
-}
-
-
-void firetrap_state::firetrap_bg1_scrollx_w(offs_t offset, uint8_t data)
-{
- m_scroll1_x[offset] = data;
- m_bg1_tilemap->set_scrollx(0, m_scroll1_x[0] | (m_scroll1_x[1] << 8));
-}
-
-void firetrap_state::firetrap_bg1_scrolly_w(offs_t offset, uint8_t data)
-{
- m_scroll1_y[offset] = data;
- m_bg1_tilemap->set_scrolly(0, -(m_scroll1_y[0] | (m_scroll1_y[1] << 8)));
-}
-
-void firetrap_state::firetrap_bg2_scrollx_w(offs_t offset, uint8_t data)
-{
- m_scroll2_x[offset] = data;
- m_bg2_tilemap->set_scrollx(0, m_scroll2_x[0] | (m_scroll2_x[1] << 8));
-}
-
-void firetrap_state::firetrap_bg2_scrolly_w(offs_t offset, uint8_t data)
-{
- m_scroll2_y[offset] = data;
- m_bg2_tilemap->set_scrolly(0, -(m_scroll2_y[0] | (m_scroll2_y[1] << 8)));
-}
-
-
-/***************************************************************************
-
- Display refresh
-
-***************************************************************************/
-
-void firetrap_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect )
-{
- int offs;
-
- for (offs = 0; offs < m_spriteram.bytes(); offs += 4)
- {
- int sx, sy, flipx, flipy, code, color;
-
-
- /* the meaning of bit 3 of [offs] is unknown */
-
- sy = m_spriteram[offs];
- sx = m_spriteram[offs + 2];
- code = m_spriteram[offs + 3] + 4 * (m_spriteram[offs + 1] & 0xc0);
- color = ((m_spriteram[offs + 1] & 0x08) >> 2) | (m_spriteram[offs + 1] & 0x01);
- flipx = m_spriteram[offs + 1] & 0x04;
- flipy = m_spriteram[offs + 1] & 0x02;
- if (flip_screen())
- {
- sx = 240 - sx;
- sy = 240 - sy;
- flipx = !flipx;
- flipy = !flipy;
- }
-
- if (m_spriteram[offs + 1] & 0x10) /* double width */
- {
- if (flip_screen()) sy -= 16;
-
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code & ~1,
- color,
- flipx,flipy,
- sx,flipy ? sy : sy + 16,0);
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code | 1,
- color,
- flipx,flipy,
- sx,flipy ? sy + 16 : sy,0);
-
- /* redraw with wraparound */
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code & ~1,
- color,
- flipx,flipy,
- sx - 256,flipy ? sy : sy + 16,0);
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code | 1,
- color,
- flipx,flipy,
- sx - 256,flipy ? sy + 16 : sy,0);
- }
- else
- {
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code,
- color,
- flipx,flipy,
- sx,sy,0);
-
- /* redraw with wraparound */
- m_gfxdecode->gfx(3)->transpen(bitmap,cliprect,
- code,
- color,
- flipx,flipy,
- sx - 256,sy,0);
- }
- }
-}
-
-uint32_t firetrap_state::screen_update_firetrap(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- m_bg2_tilemap->draw(screen, bitmap, cliprect, 0, 0);
- m_bg1_tilemap->draw(screen, bitmap, cliprect, 0, 0);
- draw_sprites(bitmap, cliprect);
- m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
- return 0;
-}
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 1a65e48a846..3c57faeddbb 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -437,10 +437,21 @@ void sdl_osd_interface::init(running_machine &machine)
}
stemp = options().video_driver();
- if (stemp != nullptr && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
+ if (stemp != nullptr)
{
- osd_printf_verbose("Setting SDL videodriver '%s' ...\n", stemp);
- osd_setenv(SDLENV_VIDEODRIVER, stemp, 1);
+ if (strcmp(stemp, OSDOPTVAL_AUTO) != 0)
+ {
+ osd_printf_verbose("Setting SDL videodriver '%s' ...\n", stemp);
+ osd_setenv(SDLENV_VIDEODRIVER, stemp, 1);
+ }
+ else
+ {
+#if defined(__linux__)
+ // bgfx does not work with wayland
+ osd_printf_verbose("Setting SDL videodriver '%s' ...\n", "x11");
+ osd_setenv(SDLENV_VIDEODRIVER, "x11", 1);
+#endif
+ }
}
stemp = options().render_driver();