summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-02-27 03:58:25 +1100
committer Vas Crabb <vas@vastheman.com>2020-02-27 03:58:25 +1100
commit6abb2dd8646ff4306eefdaea3144282ba5b4b665 (patch)
tree2d5be506a791da4dd991044bcb8ebe5e02244d4c
parent5ed9f4c1aa56757f611e74b41c057969806b1c64 (diff)
parent62ac3d1173199c1528a822e9f41a0b7f7f8caf4c (diff)
Merge branch 'release0219' into mainline-master
-rw-r--r--hash/fmtowns_cd.xml2
-rw-r--r--hash/mobigo_cart.xml6
-rw-r--r--hash/pi_storyreader_cart.xml4
-rw-r--r--hash/vgmplay.xml34
-rw-r--r--src/devices/cpu/rii/riscii.cpp2
-rw-r--r--src/mame/drivers/nes_sh6578.cpp2
-rw-r--r--src/mame/layout/hp86b.lay24
-rw-r--r--src/mame/machine/gunsense.cpp4
-rw-r--r--src/mame/video/twin16.cpp4
9 files changed, 41 insertions, 41 deletions
diff --git a/hash/fmtowns_cd.xml b/hash/fmtowns_cd.xml
index 5fcaa25a143..55cd888e6f0 100644
--- a/hash/fmtowns_cd.xml
+++ b/hash/fmtowns_cd.xml
@@ -8638,7 +8638,7 @@ User/save disks that can be created from the game itself are not included.
</part>
</software>
- <software name="parapara">
+ <software name="parapara" supported="no">
<!--
Origin: redump.org
<rom name="Para Para Paradise (Japan) (Disc A) (Akane Kouda) (Track 01).bin" size="123729312" crc="4afc3e75" sha1="775643d94e0899bfec5ce21c89b834f4de9f4006"/>
diff --git a/hash/mobigo_cart.xml b/hash/mobigo_cart.xml
index 1a494750e8a..f1348f0c5ed 100644
--- a/hash/mobigo_cart.xml
+++ b/hash/mobigo_cart.xml
@@ -38,7 +38,7 @@
</software>
<software name="ben10" supported="no">
- <description>Ben 10 - UltimateAlien - Mine der Gedanken (Germany) (80-250604)</description>
+ <description>Ben 10 - UltimateAlien - Mine der Gedanken (Germany) (80-250604)</description>
<year>201?</year>
<publisher>VTech</publisher>
<part name="cart" interface="mobigo_cart">
@@ -104,7 +104,7 @@
</software>
<software name="teamumiz" supported="no">
- <description>Team Umizoomi - Die grosse Umiauto Rettung (Germany) (80-252504)</description>
+ <description>Team Umizoomi - Die große Umiauto Rettung (Germany) (80-252504)</description>
<year>201?</year>
<publisher>VTech</publisher>
<part name="cart" interface="mobigo_cart">
@@ -137,7 +137,7 @@
</software>
<software name="fishrek" supported="no">
- <description>Fur immer Shrek (Germany) (80-250004)</description>
+ <description>Für immer Shrek (Germany) (80-250004)</description>
<year>201?</year>
<publisher>VTech</publisher>
<part name="cart" interface="mobigo_cart">
diff --git a/hash/pi_storyreader_cart.xml b/hash/pi_storyreader_cart.xml
index 1c9771a4cfa..126d329d546 100644
--- a/hash/pi_storyreader_cart.xml
+++ b/hash/pi_storyreader_cart.xml
@@ -310,7 +310,7 @@
</software>
<software name="koniglow" supported="no">
- <description>Der Konig der Lowen (Germany)</description>
+ <description>Der König der Löwen (Germany)</description>
<year>200?</year>
<publisher>Publications International Ltd. / Disney</publisher>
<part name="cart" interface="pi_storyreader_cart">
@@ -343,7 +343,7 @@
</software>
<software name="puuhtag" supported="no">
- <description>Winnie Puuh - Ein sturmischer Tag (Germany)</description>
+ <description>Winnie Puuh - Ein stürmischer Tag (Germany)</description>
<year>200?</year>
<publisher>Publications International Ltd. / Disney</publisher>
<part name="cart" interface="pi_storyreader_cart">
diff --git a/hash/vgmplay.xml b/hash/vgmplay.xml
index 824ea722a7a..f5fd3e60624 100644
--- a/hash/vgmplay.xml
+++ b/hash/vgmplay.xml
@@ -43462,27 +43462,27 @@
</dataarea>
</part>
<part name="006" interface="vgm_quik">
- <feature name="part_id" value="05 bar - (maximum).vgz" />
+ <feature name="part_id" value="05 bar - “maximum”.vgz" />
<dataarea name="quik" size="216920">
- <rom name="05 bar - (maximum).vgz" size="216920" crc="088e0816" sha1="88d29fababfcd8af6d7632e44342fe1488dd07a3" offset="0" />
+ <rom name="05 bar - maximum.vgz" size="216920" crc="088e0816" sha1="88d29fababfcd8af6d7632e44342fe1488dd07a3" offset="0" />
</dataarea>
</part>
<part name="007" interface="vgm_quik">
- <feature name="part_id" value="06 toy store - (dhalsim).vgz" />
+ <feature name="part_id" value="06 toy store - “dhalsim”.vgz" />
<dataarea name="quik" size="240732">
- <rom name="06 toy store - (dhalsim).vgz" size="240732" crc="75db893d" sha1="7eb99875705b34daa91c6f9145fbf719a7d468a8" offset="0" />
+ <rom name="06 toy store - dhalsim.vgz" size="240732" crc="75db893d" sha1="7eb99875705b34daa91c6f9145fbf719a7d468a8" offset="0" />
</dataarea>
</part>
<part name="008" interface="vgm_quik">
- <feature name="part_id" value="07 ski resort - (la menkoi).vgz" />
+ <feature name="part_id" value="07 ski resort - “la menkoi”.vgz" />
<dataarea name="quik" size="208407">
- <rom name="07 ski resort - (la menkoi).vgz" size="208407" crc="c220ab0f" sha1="8bb1e69daff5fdb7721885782edf2fc3299e1e1c" offset="0" />
+ <rom name="07 ski resort - la menkoi.vgz" size="208407" crc="c220ab0f" sha1="8bb1e69daff5fdb7721885782edf2fc3299e1e1c" offset="0" />
</dataarea>
</part>
<part name="009" interface="vgm_quik">
- <feature name="part_id" value="08 amazon - float rental shop (safuriru).vgz" />
+ <feature name="part_id" value="08 amazon - float rental shop “safuriru”.vgz" />
<dataarea name="quik" size="269671">
- <rom name="08 amazon - float rental shop (safuriru).vgz" size="269671" crc="f01b8a54" sha1="1754305d8961460d447b4a4fe99aabe81a58571b" offset="0" />
+ <rom name="08 amazon - float rental shop safuriru.vgz" size="269671" crc="f01b8a54" sha1="1754305d8961460d447b4a4fe99aabe81a58571b" offset="0" />
</dataarea>
</part>
<part name="010" interface="vgm_quik">
@@ -48528,7 +48528,7 @@
</dataarea>
</part>
<part name="023" interface="vgm_quik">
- <feature name="part_id" value="23 ole.vgz" />
+ <feature name="part_id" value="23 olé.vgz" />
<dataarea name="quik" size="144342">
<rom name="23 ole.vgz" size="144342" crc="03fc5c76" sha1="5e0177479626ae82b4e0582b84501e5607927a29" offset="0" />
</dataarea>
@@ -101766,7 +101766,7 @@
</dataarea>
</part>
<part name="002" interface="vgm_quik">
- <feature name="part_id" value="02 4th fire ss (mvs title).vgz" />
+ <feature name="part_id" value="02 4th fire ß (mvs title).vgz" />
<dataarea name="quik" size="184036">
<rom name="02 4th fire ss (mvs title).vgz" size="184036" crc="5c098949" sha1="463e70e20c1bcd0e902631d909bad92822d71d9b" offset="0" />
</dataarea>
@@ -155687,7 +155687,7 @@
</dataarea>
</part>
<part name="004" interface="vgm_quik">
- <feature name="part_id" value="04 game over (marche funebre).vgz" />
+ <feature name="part_id" value="04 game over (marche funèbre).vgz" />
<dataarea name="quik" size="7790">
<rom name="04 game over (marche funebre).vgz" size="7790" crc="d7f80b8b" sha1="21e69e627c8cf375ba198883434f8713763cd3ab" offset="0" />
</dataarea>
@@ -155735,9 +155735,9 @@
</dataarea>
</part>
<part name="012" interface="vgm_quik">
- <feature name="part_id" value="12 wedding ceremony (treulich gefuhrt).vgz" />
+ <feature name="part_id" value="12 wedding ceremony (treulich geführt).vgz" />
<dataarea name="quik" size="37561">
- <rom name="12 wedding ceremony (treulich gefuhrt).vgz" size="37561" crc="d22e9875" sha1="43eae27d7e0050d83132b8619f20ae954707105d" offset="0" />
+ <rom name="12 wedding ceremony (treulich gefuehrt).vgz" size="37561" crc="d22e9875" sha1="43eae27d7e0050d83132b8619f20ae954707105d" offset="0" />
</dataarea>
</part>
</software>
@@ -191490,7 +191490,7 @@
</dataarea>
</part>
<part name="005" interface="vgm_quik">
- <feature name="part_id" value="05 game over (marche funebre).vgz" />
+ <feature name="part_id" value="05 game over (marche funèbre).vgz" />
<dataarea name="quik" size="410">
<rom name="05 game over (marche funebre).vgz" size="410" crc="5896362a" sha1="087ee0ce5f1ed567ffa7811bceb7611712f771a0" offset="0" />
</dataarea>
@@ -191544,9 +191544,9 @@
</dataarea>
</part>
<part name="014" interface="vgm_quik">
- <feature name="part_id" value="14 wedding ceremony (treulich gefuhrt).vgz" />
+ <feature name="part_id" value="14 wedding ceremony (treulich geführt).vgz" />
<dataarea name="quik" size="604">
- <rom name="14 wedding ceremony (treulich gefuhrt).vgz" size="604" crc="e0458e55" sha1="554fe09c8d730119cffa9b4571a56b8036cbcada" offset="0" />
+ <rom name="14 wedding ceremony (treulich gefuehrt).vgz" size="604" crc="e0458e55" sha1="554fe09c8d730119cffa9b4571a56b8036cbcada" offset="0" />
</dataarea>
</part>
<part name="015" interface="vgm_quik">
@@ -198545,7 +198545,7 @@
</dataarea>
</part>
<part name="005" interface="vgm_quik">
- <feature name="part_id" value="05 melee island.vgz" />
+ <feature name="part_id" value="05 mêlée island.vgz" />
<dataarea name="quik" size="9402">
<rom name="05 melee island.vgz" size="9402" crc="6bb04145" sha1="34d7ec5241055e2166cc1f955977c48b47c4bdad" offset="0" />
</dataarea>
diff --git a/src/devices/cpu/rii/riscii.cpp b/src/devices/cpu/rii/riscii.cpp
index fef58436d25..f8d1b2a914b 100644
--- a/src/devices/cpu/rii/riscii.cpp
+++ b/src/devices/cpu/rii/riscii.cpp
@@ -19,7 +19,7 @@
#include "riscii.h"
#include "riidasm.h"
-#define LOG_TBRD (1 << 1U)
+#define LOG_TBRD (1U << 1)
#include "logmacro.h"
// device type definitions
diff --git a/src/mame/drivers/nes_sh6578.cpp b/src/mame/drivers/nes_sh6578.cpp
index 0ed46e380c7..fc1bdb757b8 100644
--- a/src/mame/drivers/nes_sh6578.cpp
+++ b/src/mame/drivers/nes_sh6578.cpp
@@ -131,7 +131,7 @@ ROM_START( ablwikid )
ROM_END
-CONS( 1997, bandgpad, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Gamppad (Bandai)", MACHINE_NOT_WORKING )
+CONS( 1997, bandgpad, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Multi Game Player Gamepad", MACHINE_NOT_WORKING )
// possibly newer than 2001
CONS( 2001, ts_handy11, 0, 0, nes_sh6578, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Techno Source", "Handy Boy 11-in-1 (TV Play Power)", MACHINE_NOT_WORKING )
diff --git a/src/mame/layout/hp86b.lay b/src/mame/layout/hp86b.lay
index c79f54047e6..621472bf7a8 100644
--- a/src/mame/layout/hp86b.lay
+++ b/src/mame/layout/hp86b.lay
@@ -13,19 +13,19 @@ Layout of Hewlett-Packard 86B with 82913A monitor (and run light)
<color red="1.0" green="1.0" blue="0" />
</disk>
</element>
- <element name="power_s"> <text string="POWER" align="1"> <color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="power_s"><text string="POWER" align="1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
<view name="82913A monitor">
- <!-- dimensions in mm -->
- <bounds x="0" y="0" width="230" height="160"/>
- <bezel element="power_s">
- <bounds x="134" y="152" width="20" height="5"/>
- </bezel>
- <bezel name="run_light" element="run_light">
- <bounds x="130" y="153" width="3" height="3"/>
- </bezel>
- <screen index="0">
- <bounds left="0" top="0" right="230" bottom="150" />
- </screen>
+ <!-- dimensions in mm -->
+ <bounds x="0" y="0" width="230" height="160"/>
+ <bezel element="power_s">
+ <bounds x="134" y="152" width="20" height="5"/>
+ </bezel>
+ <bezel name="run_light" element="run_light">
+ <bounds x="130" y="153" width="3" height="3"/>
+ </bezel>
+ <screen index="0">
+ <bounds left="0" top="0" right="230" bottom="150" />
+ </screen>
</view>
</mamelayout>
diff --git a/src/mame/machine/gunsense.cpp b/src/mame/machine/gunsense.cpp
index 9f7ccd1e39c..5bd2c2c79d3 100644
--- a/src/mame/machine/gunsense.cpp
+++ b/src/mame/machine/gunsense.cpp
@@ -42,8 +42,8 @@ void sega_gunsense_board_device::device_add_mconfig(machine_config &config)
ROM_START(gunsense)
ROM_REGION( 0x10000, "gunmcu", 0 )
- ROM_LOAD( "epr-20006a.ic2",0x00000, 0x10000, CRC(45f310dc) SHA1(b7cf40a1671dc351b607d8d6bba0d51ea128eb75) ) \
- ROM_LOAD( "epr-21262.ic2", 0x00000, 0x10000, CRC(c9adf9b6) SHA1(fc2a331430ef2f009f653b242220599c824cd1d2) ) \
+ ROM_LOAD( "epr-20006a.ic2",0x00000, 0x10000, CRC(45f310dc) SHA1(b7cf40a1671dc351b607d8d6bba0d51ea128eb75) )
+ ROM_LOAD( "epr-21262.ic2", 0x00000, 0x10000, CRC(c9adf9b6) SHA1(fc2a331430ef2f009f653b242220599c824cd1d2) )
ROM_LOAD( "tg12.ic2", 0x00000, 0x10000, CRC(2c9600b1) SHA1(91813a43851c48d400fde41b1198dabf55bade2d) )
ROM_END
diff --git a/src/mame/video/twin16.cpp b/src/mame/video/twin16.cpp
index a5bf2e24fa7..ebba2d53d93 100644
--- a/src/mame/video/twin16.cpp
+++ b/src/mame/video/twin16.cpp
@@ -331,8 +331,8 @@ void twin16_state::draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, co
xpos = 320-xpos-width;
flipx = !flipx;
}
- if( xpos>cliprect.max_x ) xpos -= 65536;
- if( ypos>cliprect.max_y ) ypos -= 65536;
+ if( xpos>=320 ) xpos -= 65536;
+ if( ypos>=256 ) ypos -= 65536;
/* slow slow slow, but it's ok for now */
for( y=0; y<height; y++, pen_data += width/4 )