From f4e1392ecfa5e55521fd36915c36760cb733a49c Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 26 Feb 2020 23:38:42 +1100 Subject: clean up various stuff (nw) --- hash/mobigo_cart.xml | 2 +- hash/vgmplay.xml | 34 +++++++++++++++++----------------- src/devices/cpu/rii/riscii.cpp | 2 +- src/mame/drivers/nes_clone.cpp | 2 +- src/mame/layout/hp86b.lay | 24 ++++++++++++------------ src/mame/machine/gunsense.cpp | 4 ++-- src/mame/video/twin16.cpp | 4 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/hash/mobigo_cart.xml b/hash/mobigo_cart.xml index 543c475ecbc..297767551c6 100644 --- a/hash/mobigo_cart.xml +++ b/hash/mobigo_cart.xml @@ -38,7 +38,7 @@ - Ben 10 - UltimateAlien - Mine der Gedanken (Germany) (80-250604) + Ben 10 - UltimateAlien - Mine der Gedanken (Germany) (80-250604) 201? VTech 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 @@ - + - + - + - + - + - + - + - + @@ -48528,7 +48528,7 @@ - + @@ -101766,7 +101766,7 @@ - + @@ -155687,7 +155687,7 @@ - + @@ -155735,9 +155735,9 @@ - + - + @@ -191490,7 +191490,7 @@ - + @@ -191544,9 +191544,9 @@ - + - + @@ -198545,7 +198545,7 @@ - + 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_clone.cpp b/src/mame/drivers/nes_clone.cpp index ff26c929400..4a03b5b95d9 100644 --- a/src/mame/drivers/nes_clone.cpp +++ b/src/mame/drivers/nes_clone.cpp @@ -119,7 +119,7 @@ void nes_clone_state::init_nes_clone() { } -CONS( 200?, pjoypj001, 0, 0, nes_clone, nes_clone, nes_clone_state, init_nes_clone, "Trump Grand", "PowerJoy (PJ001, NES based plug & play)", 0 ) +CONS( 200?, pjoypj001, 0, 0, nes_clone, nes_clone, nes_clone_state, init_nes_clone, "Trump Grand", "PowerJoy (PJ001, NES based plug & play)", MACHINE_NOT_WORKING ) // "Flashback Mini 7800 uses normal NES-style hardware, together with a mapper chipset similar to the Waixing kk33xx cartridges (NES 2.0 Mapper 534)" CONS( 2004, afbm7800, 0, 0, nes_clone, nes_clone, nes_clone_state, init_nes_clone, "Atari", "Atari Flashback Mini 7800", 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) - + - - - - - - - - - - - + + + + + + + + + + + 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