diff options
author | ajrhacker <ajrhacker@users.noreply.github.com> | 2017-03-21 23:18:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-21 23:18:50 -0400 |
commit | 7c0a550d5863c724bd797153e872e35d041052ce (patch) | |
tree | d802344433c6e4bf5808cba7f372700a672e107e | |
parent | 6b0460cf0844e65d60f140fc602d0de1f1f92b2c (diff) | |
parent | e05490e33a674e8ff0260fe33779f15368af8f0c (diff) |
Merge pull request #2174 from kazblox/master
Last minute corrections
-rw-r--r-- | hash/nes.xml | 140 | ||||
-rw-r--r-- | src/devices/bus/nes/subor.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/nes/subor.h | 2 |
3 files changed, 87 insertions, 57 deletions
diff --git a/hash/nes.xml b/hash/nes.xml index 56794f211c1..fcc88b9116a 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -69130,8 +69130,9 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="liko3in1"> <description>LIKO Study Cartridge 3 in 1 (Rus)</description> - <year>19??</year> - <publisher>BBG</publisher> + <year>1996?</year> + <publisher>BBG Electronics Co.</publisher> + <info name="alt_title" value="LIKO Обучающий Картридж"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> @@ -69230,7 +69231,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="bravew2k"> <description>Bravesoft Windows 2000 (Rus)</description> <year>19??</year> - <publisher><unknown></publisher> + <publisher>Bravesoft</publisher> <part name="cart" interface="nes_cart"> <feature name="slot" value="edu2k" /> <!-- Marked as mapper 178 in header --> <feature name="pcb" value="UNL-EDU2000" /> @@ -69268,7 +69269,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="glk48" supported="partial"> <description>GLK Book 48 in 1 (Asia?)</description> <year>19??</year> - <publisher><unknown></publisher> + <publisher>FengLi</publisher> + <info name="serial" value="FL-E8MF"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="waixing_sgzlz" /> <feature name="pcb" value="WAIXING-SGZLZ" /> @@ -69302,11 +69304,14 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> <software name="kibord3" supported="partial"> - <description>Kibord 003 (Rus?)</description> + <description>Kibord 003 (Rus)</description> <year>19??</year> <publisher><unknown></publisher> <part name="cart" interface="nes_cart"> @@ -69329,7 +69334,8 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="magistr2" supported="partial"> <description>Magistr-Genie 2 (Rus)</description> <year>19??</year> - <publisher><unknown></publisher> + <publisher>New Game</publisher> + <info name="alt_title" value="Магистр Гений 2 Говорящий Картридж"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="waixing_sgzlz" /> <feature name="pcb" value="WAIXING-SGZLZ" /> @@ -69511,7 +69517,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="abm5" supported="partial"> <description>ABM Study Card V5.0 (Chi)</description> <year>1995?</year> - <publisher><unknown></publisher> + <publisher>ABM</publisher> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> @@ -69587,7 +69593,7 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t <software name="dongshen"> <description>Dong Sheng English Sound-Word Blaster (Chi)</description> <year>19??</year> - <publisher><unknown></publisher> + <publisher>Dong Sheng</publisher> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> @@ -69938,6 +69944,9 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> @@ -69958,6 +69967,9 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> @@ -69975,12 +69987,15 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> <software name="subor8"> <description>Subor v8.0 (Chi)</description> - <year>19??</year> + <year>199?</year> <publisher>Subor</publisher> <info name="alt_title" value="小霸王中英文电脑学习卡(V8.0)"/> <part name="cart" interface="nes_cart"> @@ -69992,6 +70007,9 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> @@ -70011,6 +70029,9 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> @@ -70031,6 +70052,9 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> @@ -70056,25 +70080,6 @@ Subor v15.0 (this shows Windows 2002 on the title screen) </part> </software> - <software name="subor3a" cloneof="subor3" supported="partial"> - <description>Subor v3.0 (Chi, with Dr. Mario)</description> - <year>1994</year> - <publisher>Subor</publisher> - <info name="alt_title" value="小霸王中英文电脑学习卡(V3.0)"/> - <part name="cart" interface="nes_cart"> - <feature name="slot" value="txc_commandos" /> - <feature name="pcb" value="TXC-MXMDHTWO" /> - <feature name="mirroring" value="vertical" /> - <feature name="peripheral" value="sub_keyboard" /> - <dataarea name="prg" size="524288"> - <rom name="xiaobawang zhongyingwen diannao xuexiji iii (unl) (subor) (with dr.mario).prg" size="524288" crc="0930349e" sha1="b769c7bdbd728dc63952d3363d4a1cc44dd8c2f7" offset="00000" status="baddump" /> - </dataarea> - <!-- 8k VRAM on cartridge --> - <dataarea name="vram" size="8192"> - </dataarea> - </part> - </software> - <software name="subor3"> <description>Subor v3.0 (Chi, with Chinese Chess)</description> <year>1994</year> @@ -70091,28 +70096,30 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> - <software name="subor11"> - <description>Subor v1.1 (Chi)</description> - <year>1993?</year> + <software name="subor3a" cloneof="subor3" supported="partial"> + <description>Subor v3.0 (Chi, with Dr. Mario)</description> + <year>1994</year> <publisher>Subor</publisher> - <info name="alt_title" value="小霸王中英文电脑学习卡(V1.1)"/> + <info name="alt_title" value="小霸王中英文电脑学习卡(V3.0)"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> <feature name="mirroring" value="vertical" /> <feature name="peripheral" value="sub_keyboard" /> - <dataarea name="prg" size="262144"> - <rom name="[subor] subor v1.1 (c).prg" size="262144" crc="e4460df2" sha1="7f9630b456941a18e2f9586863f9cbc6da4f6aef" offset="00000" status="baddump" /> + <dataarea name="prg" size="524288"> + <rom name="xiaobawang zhongyingwen diannao xuexiji iii (unl) (subor) (with dr.mario).prg" size="524288" crc="0930349e" sha1="b769c7bdbd728dc63952d3363d4a1cc44dd8c2f7" offset="00000" 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" /> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> </dataarea> </part> </software> @@ -70132,9 +70139,8 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 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" /> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> </dataarea> </part> </software> @@ -70154,13 +70160,17 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> </part> </software> <software name="magistr1" cloneof="subor3"> <description>Magistr v1.0 (Rus)</description> <year>199?</year> - <publisher><unknown></publisher> + <publisher>New Game</publisher> + <info name="alt_title" value="Магистр Обучающий Картридж"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> @@ -70168,12 +70178,11 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <dataarea name="prg" size="131072"> <rom name="magistr v1.0 (subor v1.0 hack) (russian).prg" size="131072" crc="903a95eb" sha1="d1d19fc5bbc2b45c90ad1928158949aadb2fb82d" offset="00000" status="baddump" /> </dataarea> - <!-- 8k? VRAM on cartridge --> + <!-- 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" /> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> </dataarea> </part> </software> @@ -70181,7 +70190,8 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <software name="simbas1" cloneof="subor3"> <description>Simba's v1.0 (Rus)</description> <year>199?</year> - <publisher><unknown></publisher> + <publisher>Simba's</publisher> + <info name="alt_title" value="Simba's Обучающий Картридж (V1.0)"/> <part name="cart" interface="nes_cart"> <feature name="slot" value="txc_commandos" /> <feature name="pcb" value="TXC-MXMDHTWO" /> @@ -70189,12 +70199,33 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <dataarea name="prg" size="131072"> <rom name="simbas v1.0 (subor v1.0 hack) (russian).prg" size="131072" crc="7bdd12f3" sha1="4c6c0fafd66d2ef828b492550812c28371ec2917" offset="00000" status="baddump" /> </dataarea> - <!-- 8k? VRAM on cartridge --> + <!-- 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" /> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> + </dataarea> + </part> + </software> + + <software name="subor11"> + <description>Subor v1.1 (Chi)</description> + <year>1993?</year> + <publisher>Subor</publisher> + <info name="alt_title" value="小霸王中英文电脑学习卡(V1.1)"/> + <part name="cart" interface="nes_cart"> + <feature name="slot" value="txc_commandos" /> + <feature name="pcb" value="TXC-MXMDHTWO" /> + <feature name="mirroring" value="vertical" /> + <feature name="peripheral" value="sub_keyboard" /> + <dataarea name="prg" size="262144"> + <rom name="[subor] subor v1.1 (c).prg" size="262144" crc="e4460df2" sha1="7f9630b456941a18e2f9586863f9cbc6da4f6aef" offset="00000" status="baddump" /> + </dataarea> + <!-- 8k VRAM on cartridge --> + <dataarea name="vram" size="8192"> + </dataarea> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> </dataarea> </part> </software> @@ -70210,7 +70241,7 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <dataarea name="prg" size="1048576"> <rom name="subor - english word blaster v1.0 (1994)(subor)(cn)[p][!].prg" size="1048576" crc="5e073a1b" sha1="a70631cae908ec08ec4702204661d77b9a25e3b9" offset="00000" status="baddump" /> </dataarea> - <!-- 8k? VRAM on cartridge --> + <!-- 8k VRAM on cartridge --> <dataarea name="vram" size="8192"> </dataarea> <!-- 8k WRAM on cartridge, battery backed up --> @@ -70256,9 +70287,8 @@ Subor v15.0 (this shows Windows 2002 on the title screen) <!-- 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" /> + <!-- 8k WRAM on cartridge --> + <dataarea name="wram" size="8192"> </dataarea> </part> </software> @@ -76984,7 +77014,7 @@ be better to redump them properly. --> <software name="mc_20asd"> <description>ASDER 20 in 1</description> <year>19??</year> - <publisher><pirate></publisher> + <publisher>Asder</publisher> <part name="cart" interface="nes_cart"> <feature name="slot" value="ntd03" /> <feature name="pcb" value="BMC-NTD-03" /> diff --git a/src/devices/bus/nes/subor.cpp b/src/devices/bus/nes/subor.cpp index 65bf2e18e7e..7be953cd72d 100644 --- a/src/devices/bus/nes/subor.cpp +++ b/src/devices/bus/nes/subor.cpp @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Kaz +// copyright-holders:Kaz, Fabio Priuli /*********************************************************************************************************** NES/Famicom cartridge emulation for Subor PCBs diff --git a/src/devices/bus/nes/subor.h b/src/devices/bus/nes/subor.h index 167561f3b36..c58ad8ea2a4 100644 --- a/src/devices/bus/nes/subor.h +++ b/src/devices/bus/nes/subor.h @@ -1,5 +1,5 @@ // license:BSD-3-Clause -// copyright-holders:Kaz +// copyright-holders:Kaz, Fabio Priuli #ifndef MAME_BUS_NES_SUBOR_H #define MAME_BUS_NES_SUBOR_H |