From 6d3d9c03a847c3524e47ddb2a1d9d8e00f1704f5 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 11 Jan 2025 19:55:47 +1100 Subject: -nichibutsu/nbmj8688.cpp, nichibutsu/nbmj8891.cpp: Renames Mahjong Camera Kozou games for clarity. -cpu/m6502/m6500_1.cpp: Cleaned up a comment a bit. --- src/devices/cpu/m6502/m6500_1.cpp | 22 +++++++++++----------- src/mame/mame.lst | 6 +++--- src/mame/nichibutsu/nbmj8688.cpp | 4 ++-- src/mame/nichibutsu/nbmj8891.cpp | 20 ++++++++++---------- src/mame/nichibutsu/nbmj8891.h | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/devices/cpu/m6502/m6500_1.cpp b/src/devices/cpu/m6502/m6500_1.cpp index 6ba2f9c3919..8aa30f08c89 100644 --- a/src/devices/cpu/m6502/m6500_1.cpp +++ b/src/devices/cpu/m6502/m6500_1.cpp @@ -12,10 +12,10 @@ * Sixteen-bit programmable counter/latch The onboad clock generator has mask options for an external crystal - (2MHz to 6MHz) an external TTL-compatible clock with a 300Ω pull-up + (2MHz to 6MHz), an external TTL-compatible clock with a 300Ω pull-up resistor (2MHz to 6MHz), or an RC oscillator with an external 47kΩ resistor and internal capacitor (nominally 2MHz). The clock is - divided by two to generate the two-phase CPU code clock. + divided by two to generate the two-phase CPU core clock. There is no on-board power-on reset generator. The /RES pin must be held low (asserted) for at least eight phase 2 clock cycles after @@ -45,7 +45,7 @@ on the CNTR pin in event counter mode is half the phase 2 clock rate. This suggests that an internal flag is set when a rasing edge is detected on CNTR and reset when the counter is synchronously - decremented. This is not emulated - for simplicity the counter is + decremented. This is not emulated - for simplicity, the counter is asynchronously decremented on detecting a rising edge on CNTR. The CNTR pin has an active low driver and internal passive pull-up. @@ -59,14 +59,14 @@ is unknown what other differences these devices have. TODO: - - For some reason most if not all Amiga MCU programs accesses arbitrary - zero page 0x90-0xff with a back-to-back cmp($00, x) opcode at - PC=c06-c08 with the actual result discarded. X can be any value in - the 0x90-0xff range, depending on the last user keypress row source - e.g. 0xdf-0xe0 for 'A', 0xef-0xf0 for 'Q', 0xfb-0xfc for function - keys. - This can be extremely verbose in the logging facility so we currently - nop it out for the time being. + - For some reason most if not all Amiga MCU programs access + arbitrary zero page 0x90-0xff with a back-to-back cmp($00, x) + opcode at PC=c06-c08 with the actual result discarded. X can be + any value in the 0x90-0xff range, depending on the last user + keypress row source e.g. 0xdf-0xe0 for 'A', 0xef-0xf0 for 'Q', + 0xfb-0xfc for function keys. + This can be extremely verbose in the logging facility so we nop it + out for the time being. ***************************************************************************/ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 88642af9f17..8ec143f26e1 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -34488,7 +34488,7 @@ korinaim // (c) 1988 kyuhito // (c) 1988 ROLLER TRON livegal // (c) 1987 mcitylov // (c) 1986 -mjcamera // (c) 1988 MIKI SYOUJI +mjcamerao // (c) 1988 MIKI SYOUJI mjgaiden // (c) 1987 Central Denshi mjsikakb // (c) 1988 mjsikakc // (c) 1988 @@ -34526,7 +34526,8 @@ lovehous // (c) 1990 maiko // (c) 1990 mgion // (c) 1989 mgmen89 // (c) 1989 -mjcamerb // (c) 1989 MIKI SYOUJI +mjcamera // (c) 1989 MIKI SYOUJI +mjcameram // (c) 1988 MIKI SYOUJI mjfocus // (c) 1989 mjfocusm // (c) 1989 mjnanpaa // (c) 1989 BROOKS @@ -34534,7 +34535,6 @@ mjnanpas // (c) 1989 BROOKS mjnanpau // (c) 1989 BROOKS mladyhtr // (c) 1990 mmaiko // (c) 1990 -mmcamera // (c) 1988 MIKI SYOUJI msjiken // (c) 1988 omotesnd // (c) 1989 pairsnb // (c) 1989 diff --git a/src/mame/nichibutsu/nbmj8688.cpp b/src/mame/nichibutsu/nbmj8688.cpp index 725ef41a4dc..53973aae8d5 100644 --- a/src/mame/nichibutsu/nbmj8688.cpp +++ b/src/mame/nichibutsu/nbmj8688.cpp @@ -3835,7 +3835,7 @@ ROM_START( otonano ) ROM_LOAD( "otona_13.bin", 0x0e0000, 0x20000, CRC(208dee43) SHA1(f154ac4dab929c6f610038dbbebcf5283258e553) ) ROM_END -ROM_START( mjcamera ) +ROM_START( mjcamerao ) ROM_REGION( 0x10000, "maincpu", 0 ) /* program */ ROM_LOAD( "mcam_01.bin", 0x00000, 0x10000, CRC(73d4b9ff) SHA1(219bc9617c14490d70bb3e28ab497dfd2ef01cf8) ) @@ -3987,4 +3987,4 @@ GAME( 1988, mjsikakc, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, empty GAME( 1988, mjsikakd, mjsikaku, mjsikaku, mjsikaku, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880802)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, mmsikaku, mjsikaku, mmsikaku, mmsikaku, nbmj8688_state, empty_init, ROT0, "Nichibutsu", "Mahjong Shikaku (Japan 880929, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1988, otonano, 0, otonano, otonano, nbmj8688_state, empty_init, ROT0, "Apple", "Otona no Mahjong (Japan 880628)", MACHINE_SUPPORTS_SAVE ) // おとなの麻雀 -GAME( 1988, mjcamera, 0, mjcamera, mjcamera, nbmj8688_state, init_mjcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 1) (Japan 881109)", MACHINE_SUPPORTS_SAVE ) +GAME( 1988, mjcamerao,mjcamera, mjcamera, mjcamera, nbmj8688_state, init_mjcamera, ROT0, "Miki Syouji", "Mahjong Camera Kozou (Japan 881109, older hardware)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/nbmj8891.cpp b/src/mame/nichibutsu/nbmj8891.cpp index ba647510696..7e2e55e3062 100644 --- a/src/mame/nichibutsu/nbmj8891.cpp +++ b/src/mame/nichibutsu/nbmj8891.cpp @@ -11,8 +11,8 @@ Notes: -- mjcamerb and mmcamera is the medal version of mjcamera, however the - two don't run on the same hardware. mjcamera is in nbmj8688.cpp. +- mjcameram is the medal version of mjcamera. mjcamerao is a version of the + game on different hardware in nbmj8688.cpp. - In mjfocus(Medal Type), sometimes CPU's hands are forced out from the screen. This is correct behaviour. @@ -621,7 +621,7 @@ static INPUT_PORTS_START( hanamomo ) PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END -static INPUT_PORTS_START( mjcamerb ) +static INPUT_PORTS_START( mjcamera ) PORT_START("DSWA") PORT_DIPNAME( 0x07, 0x07, DEF_STR( Difficulty ) ) PORT_DIPSETTING( 0x07, "1 (Easy)" ) @@ -687,7 +687,7 @@ static INPUT_PORTS_START( mjcamerb ) PORT_INCLUDE( nbmjcontrols ) INPUT_PORTS_END -static INPUT_PORTS_START( mmcamera ) +static INPUT_PORTS_START( mjcameram ) PORT_START("DSWA") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -2254,7 +2254,7 @@ void nbmj8891_state::abunai(machine_config &config) } /* NBMJDRV2 */ -void nbmj8891_state::mjcamerb(machine_config &config) +void nbmj8891_state::mjcamera(machine_config &config) { gionbana(config); @@ -2270,7 +2270,7 @@ void nbmj8891_state::mjcamerb(machine_config &config) MCFG_VIDEO_START_OVERRIDE(nbmj8891_state,_1layer) } -void nbmj8891_state::mmcamera(machine_config &config) +void nbmj8891_state::mjcameram(machine_config &config) { gionbana(config); @@ -3362,7 +3362,7 @@ ROM_START( hanaojia ) ROM_LOAD( "hnoj_11.bin", 0x100000, 0x20000, CRC(bfe38671) SHA1(6c81864caab61ea60dfe446b390221bdcfb0895e) ) ROM_END -ROM_START( mjcamerb ) +ROM_START( mjcamera ) ROM_REGION( 0x10000, "maincpu", 0 ) /* program */ ROM_LOAD( "2.3h", 0x00000, 0x10000, CRC(3a0f110b) SHA1(8923136ed25ed91c90f93c3f75f5532ff8f9d420) ) @@ -3392,7 +3392,7 @@ ROM_START( mjcamerb ) ROM_LOAD( "mcam_m1.bin", 0x00000, 0x40000, CRC(f85c5b07) SHA1(0fc55e9b60ccc630a0d77862eb5e64a3ba366947) ) // same as housemnq/3i.bin gfx data ROM_END -ROM_START( mmcamera ) +ROM_START( mjcameram ) ROM_REGION( 0x10000, "maincpu", 0 ) /* program */ ROM_LOAD( "2.3ha", 0x00000, 0x10000, CRC(b6eed2cf) SHA1(87171ba9ba247e54244867f720738f9b88a1213e) ) @@ -3560,8 +3560,8 @@ GAME( 1989, abunai, 0, abunai, abunai, nbmj8891_state, empty_init, GAME( 1989, mjfocus, 0, mjfocus, mjfocus, nbmj8891_state, init_mjfocus, ROT0, "Nichibutsu", "Mahjong Focus (Japan 890313)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, mjfocusm, mjfocus, mjfocusm, mjfocusm, nbmj8891_state, init_mjfocusm, ROT0, "Nichibutsu", "Mahjong Focus (Japan 890510, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, peepshow, mjfocus, mjfocus, mjfocus, nbmj8891_state, init_mjfocus, ROT0, "AC", "Nozokimeguri Mahjong Peep Show (Japan 890404)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, mjcamerb, 0, mjcamerb, mjcamerb, nbmj8891_state, empty_init, ROT0, "Miki Syouji", "Mahjong Camera Kozou (set 2) (Japan 881109)", MACHINE_SUPPORTS_SAVE ) -GAME( 1989, mmcamera, mjcamerb, mmcamera, mmcamera, nbmj8891_state, empty_init, ROT0, "Miki Syouji", "Mahjong Camera Kozou (Japan 890509, medal)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, mjcamera, 0, mjcamera, mjcamera, nbmj8891_state, empty_init, ROT0, "Miki Syouji", "Mahjong Camera Kozou (Japan 881109, newer hardware)", MACHINE_SUPPORTS_SAVE ) +GAME( 1989, mjcameram, mjcamera, mjcameram,mjcameram,nbmj8891_state, empty_init, ROT0, "Miki Syouji", "Mahjong Camera Kozou (Japan 890509, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, scandal, 0, scandal, scandal, nbmj8891_state, init_scandal, ROT0, "Nichibutsu", "Scandal Mahjong (Japan 890213)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, scandalm, scandal, scandalm, scandalm, nbmj8891_state, empty_init, ROT0, "Nichibutsu", "Scandal Mahjong (Japan 890217, medal)", MACHINE_SUPPORTS_SAVE ) GAME( 1989, mgmen89, 0, mgmen89, mgmen89, nbmj8891_state, init_mgmen89, ROT0, "Nichibutsu", "Mahjong G-MEN'89 (Japan 890425)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/nichibutsu/nbmj8891.h b/src/mame/nichibutsu/nbmj8891.h index 1f34521b346..9c6df689084 100644 --- a/src/mame/nichibutsu/nbmj8891.h +++ b/src/mame/nichibutsu/nbmj8891.h @@ -30,9 +30,9 @@ public: void chinmoku(machine_config &config); void msjiken(machine_config &config); void hnageman(machine_config &config); - void mjcamerb(machine_config &config); + void mjcamera(machine_config &config); void mjnanpas(machine_config &config); - void mmcamera(machine_config &config); + void mjcameram(machine_config &config); void pairsnb(machine_config &config); void taiwanmb(machine_config &config); void hanaoji(machine_config &config); -- cgit v1.2.3