From 6e434ccf97e1396b661e0919bc06463aab57cde5 Mon Sep 17 00:00:00 2001 From: Luca Elia Date: Wed, 17 Aug 2022 10:35:56 +0200 Subject: misc/astrcorp.cpp protection and layouts update: (#10235) * Emulated the "CPU Code" protection in newer games (astoneag, dinodino, hacher, magibombd, winbingo, winbingoa, zoo). * Expanded ROM patches to work around imperfect data in the first 0x400 bytes (ROM overlay?), getting all games to boot. * Implemented 16x32 sprites in astoneag. * Created layouts and factory defaults EEPROMs for all sets. * showhand: Fixed regression that caused the new opponent face to be invisible while entering the screen. Machines promoted to working ---------------------------- Magic Bomb (Ver. L3.5S) [Luca Elia, Ivan Vangelista, Angelo Salese, Phil Bennett, Cristiano MDQ] Dino Dino (Ver. A1.1, 01/13/2005) [Olivier Galibert, Luca Elia, Ivan Vangelista, Guru] Stone Age (Astro, Ver. EN.03.A, 2005/02/21) [Olivier Galibert, Luca Elia, ANY, The Dumping Union] Win Win Bingo (Ver. GM.03.3, Feb 23 2006) [Olivier Galibert, Luca Elia, Ivan Vangelista, f205v, Filippo Tarderia] Zoo (Ver. ZO.02.D, Aug 27 2004) [Olivier Galibert, Luca Elia, Ivan Vangelista, Brian Troha, The Dumping Union] Clones promoted to working -------------------------- Magic Bomb (Ver. A3.1) [Luca Elia, Ivan Vangelista, Angelo Salese, Phil Bennett, Cristiano MDQ] Hacher (hack of Win Win Bingo EN.01.6) [Olivier Galibert, Luca Elia, Ivan Vangelista, ANY, The Dumping Union] --- src/emu/xtal.cpp | 2 + src/mame/layout/astoneag.lay | 151 ++++ src/mame/layout/dinodino.lay | 143 ++++ src/mame/layout/magibomb.lay | 167 +++++ src/mame/layout/magibombb.lay | 167 +++++ src/mame/layout/showhanc.lay | 175 +++++ src/mame/layout/showhand.lay | 175 +++++ src/mame/layout/skilldrp.lay | 119 ++++ src/mame/layout/winbingo.lay | 159 +++++ src/mame/layout/zoo.lay | 175 +++++ src/mame/mame.lst | 2 +- src/mame/misc/astrcorp.cpp | 1544 +++++++++++++++++++++++++++-------------- 12 files changed, 2460 insertions(+), 519 deletions(-) create mode 100644 src/mame/layout/astoneag.lay create mode 100644 src/mame/layout/dinodino.lay create mode 100644 src/mame/layout/magibomb.lay create mode 100644 src/mame/layout/magibombb.lay create mode 100644 src/mame/layout/showhanc.lay create mode 100644 src/mame/layout/showhand.lay create mode 100644 src/mame/layout/skilldrp.lay create mode 100644 src/mame/layout/winbingo.lay create mode 100644 src/mame/layout/zoo.lay diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp index 7bf77c4af55..2449f62bd2e 100644 --- a/src/emu/xtal.cpp +++ b/src/emu/xtal.cpp @@ -362,6 +362,7 @@ const double XTAL::known_xtals[] = { 26'666'000, /* 26.666_MHz_XTAL Imagetek I4220/I4300 */ 26'666'666, /* 26.666666_MHz_XTAL Irem M92 but most use 27MHz */ 26'686'000, /* 26.686_MHz_XTAL Typically used on 90's Taito PCBs to drive the custom chips */ + 26'824'000, /* 26.824_MHz_XTAL Astro Corp.'s Zoo */ 26'880'000, /* 26.88_MHz_XTAL Roland RF5C36/SA-16 clock (30000 * 896) */ 26'989'200, /* 26.9892_MHz_XTAL TeleVideo 965 */ 27'000'000, /* 27_MHz_XTAL Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */ @@ -482,6 +483,7 @@ const double XTAL::known_xtals[] = { 101'491'200, /* 101.4912_MHz_XTAL PSX-based Namco System 10 */ 105'561'000, /* 105.561_MHz_XTAL Sun cgsix */ 108'108'000, /* 108.108_MHz_XTAL HP 98550 high-res color card */ + 120'000'000, /* 120_MHz_XTAL Astro Corp.'s Stone Age */ 200'000'000 /* 200_MHz_XTAL Base SH4 CPU (Naomi, Hikaru etc.) */ }; diff --git a/src/mame/layout/astoneag.lay b/src/mame/layout/astoneag.lay new file mode 100644 index 00000000000..b6d1125aa44 --- /dev/null +++ b/src/mame/layout/astoneag.lay @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/dinodino.lay b/src/mame/layout/dinodino.lay new file mode 100644 index 00000000000..a633579291d --- /dev/null +++ b/src/mame/layout/dinodino.lay @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/magibomb.lay b/src/mame/layout/magibomb.lay new file mode 100644 index 00000000000..8dbf7ff981e --- /dev/null +++ b/src/mame/layout/magibomb.lay @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/magibombb.lay b/src/mame/layout/magibombb.lay new file mode 100644 index 00000000000..0df41bda9e9 --- /dev/null +++ b/src/mame/layout/magibombb.lay @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/showhanc.lay b/src/mame/layout/showhanc.lay new file mode 100644 index 00000000000..9a34581c892 --- /dev/null +++ b/src/mame/layout/showhanc.lay @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/showhand.lay b/src/mame/layout/showhand.lay new file mode 100644 index 00000000000..08197a82057 --- /dev/null +++ b/src/mame/layout/showhand.lay @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/skilldrp.lay b/src/mame/layout/skilldrp.lay new file mode 100644 index 00000000000..ae87f5a19d7 --- /dev/null +++ b/src/mame/layout/skilldrp.lay @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/winbingo.lay b/src/mame/layout/winbingo.lay new file mode 100644 index 00000000000..37d9bcedb8f --- /dev/null +++ b/src/mame/layout/winbingo.lay @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/layout/zoo.lay b/src/mame/layout/zoo.lay new file mode 100644 index 00000000000..dff5be5d29a --- /dev/null +++ b/src/mame/layout/zoo.lay @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/mame.lst b/src/mame/mame.lst index b6923fd7ea4..2cc99947868 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -2462,7 +2462,7 @@ speeddrp // (c) 2003 Astro Corp. westvent // (c) 2007? Astro Corp. winbingo // (c) 2006 Astro Corp. winbingoa // (c) 2006 Astro Corp. -zulu // (c) 2004 Astro Corp. +zoo // (c) 2004 Astro Corp. @source:midway/astrocde.cpp demndrgn // (c) 1982 Bally Midway diff --git a/src/mame/misc/astrcorp.cpp b/src/mame/misc/astrcorp.cpp index 563839d95b9..149b238d158 100644 --- a/src/mame/misc/astrcorp.cpp +++ b/src/mame/misc/astrcorp.cpp @@ -1,47 +1,65 @@ // license:BSD-3-Clause -// copyright-holders:Luca Elia +// copyright-holders:Luca Elia, Olivier Galibert, Ivan Vangelista /************************************************************************************************************* -= Astro Corp. CGA Hardware =- driver by Luca Elia (l.elia@tin.it) + decryption by Olivier Galibert + additional decryption work by Ivan Vangelista CPU: 68000 -GFX: ASTRO V0x (x = 1,2,5,6 or 7) +GFX: ASTRO V0x (seen with x = 1,2,5,6 or 7) SOUND: OKI M6295 (AD-65) OTHER: EEPROM, Battery - 512 sprites, each made of N x M tiles. Tiles are 16x16x8 - ------------------------------------------------------------------------------------------------------------------------ -Year + Game PCB ID CPU Video Chips Notes ------------------------------------------------------------------------------------------------------------------------ -00 Show Hand CHE-B50-4002A 68000 ASTRO V01 pLSI1016-60LJ, ASTRO 0001B (28 pins) -00 Wang Pai Dui J. CHE-B50-4002A 68000 ASTRO V01 pLSI1016, MDT2020AP MCU (28 pins) -01 Magic Bomb None ASTRO V03 ASTRO V02 0022 pLSI1016 Encrypted -02 Skill Drop GA None JX-1689F1028N ASTRO V02 pLSI1016-60LJ -02? Keno 21 ? ASTRO V102? ASTRO V05 ASTRO F02? not dumped -03 Speed Drop None JX-1689HP ASTRO V05 pLSI1016-60LJ -03? Dino Dino T-3802A ASTRO V102PX-010? ASTRO V05 ASTRO F02 2003-03-12 Encrypted -04? Stone Age L1 ASTRO V102PX-012? ASTRO V05x2 ASTRO F02 2004-09-04 Encrypted -05? Zoo M1.1 ASTRO V102PX-005? ASTRO V06 ASTRO F02 2005-02-18 Encrypted -05? Win Win Bingo M1.2 ASTRO V102PX-006? ASTRO V06 ASTRO F02 2005-09-17 Encrypted -05? Hacher (hack) M1.2 ? ? ASTRO F02 2005-02-18 Encrypted -07? Western Venture CS350P032 ASTRO V102? ASTRO V07 ASTRO F01 2007-06-03 Encrypted ------------------------------------------------------------------------------------------------------------------------ + 512 sprites, each made of N x M tiles. Tiles are 16x16x8 (16x32x8 in Stone Age) + +------------------------------------------------------------------------------------------------------------------------------ +Year + Game PCB ID CPU Video Chips Notes +------------------------------------------------------------------------------------------------------------------------------ +00 Show Hand CHE-B50-4002A MC68HC000FN12 ASTRO V01 pLSI1016-60LJ, ASTRO 0001B MCU? (28 pins) +00 Wangpai Duijue CHE-B50-4002A MC68HC000FN12 ASTRO V01 pLSI1016, MDT2020AP MCU (28 pins) +01 Magic Bomb (NB4.5) None ASTRO V03 ASTRO V02 pLSI1016 Encrypted +02 Skill Drop GA None JX-1689F1028N ASTRO V02 pLSI1016-60LJ +02? Keno 21 ? ASTRO V102? ASTRO V05 ASTRO F02? not dumped +03 Speed Drop None JX-1689HP ASTRO V05 pLSI1016-60LJ +04 Zoo M1.1 ASTRO V102PX-005? ASTRO V06 ASTRO F02 2005-02-18 Encrypted +05 Dino Dino T-3802A ASTRO V102PX-010? ASTRO V05 ASTRO F02 2003-03-12 Encrypted +05 Stone Age L1 ASTRO V102PX-012? ASTRO V05(x2) ASTRO F02 2004-09-04 Encrypted +05? Hacher (hack) M1.2 ? ? ASTRO F02 2005-02-18 Encrypted +06 Win Win Bingo M1.2 ASTRO V102PX-006? ASTRO V06 ASTRO F02 2005-09-17 Encrypted +07? Western Venture O (CS350P032) ASTRO V102? ASTRO V07 ASTRO F01 2007-06-03 Encrypted +------------------------------------------------------------------------------------------------------------------------------ + +- astoneag, magibomb, winbingo, etc.: to initialize EEPROM (and self test in some games), keep keyout (W) pressed during boot. + Needs ticket (or reserve switch) and hopper lines to be 0 though (disconnected?). +- magibomb: sets with a "game count" option, when set to "yes", display the number of games played by the current player. + Pressing payout (I) disallows registering further coin/key-ins, decreases this number, and activates the hopper. + But when the games count is 0 only the first step is performed, preventing further coin-in until reset or key-out. Probably an original game bug. +- showhand: in the settings screen, to reset settings to factory defaults in battery-backed RAM, press keyout + memory reset (W + F1). + When exiting the settings screen, settings are saved in the EEPROM. +- showhand: to mark the settings in battery-backed RAM as valid and saving them to EEPROM, keep keyout + memory reset (W + F1) pressed during boot. +- showhand: after pressing payout (I), press start while "COLLECTING POINTS" is displayed to activate the hopper. + Otherwise, while "GAME" is displayed, the points just vanish. +- showhand: hopper jam error if "payout sensor type" is set to "normal low" in the settings. + It seems the game code is buggy: it uses 4000 as hopper status mask (from showhanc) instead of 8000. +- winbingo: it starts with a Tetris game. To switch to the gambling game, press stop all + stop 2 (Z + C). TODO: -- Find source of level 2 interrupt (sprite DMA end?); -- magibomb: fix timings; -- astoneag, dinodino, magibombd: currently stop with 'ROM error'. The first few hundred bytes don't decrypt correctly, - it is suspected there's a ROM overlay provided by the protection device; -- winbingo and clones, zulu: these should be at the same state of the two above, but don't show anything on screen; -- magibomba, westvent: need a redump of one of the program ROMs; +- MCU on showhand/showhanc PCB, what does it do? Games run fine and there appears to be no interaction... +- Protection in magibomb sets with simpler encryption (writes to $a0101x, $a11100, etc.). Some sets appear to work fine regardless, others freeze. +- Fix mirror ROM checksum / ROM overlay without code patches (in games with heavier encryption). +- Find source of level 2 interrupt (sprite DMA end?). +- magibomba, westvent: need a redump of one of the program ROMs. +- magibombd, hacher: need a redump of the sprite ROMs. +- astoneag, dinodino, magibombd: exiting from test menu goes haywire (requires a soft-reset with F3). *************************************************************************************************************/ #include "emu.h" + #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/nvram.h" @@ -49,10 +67,101 @@ TODO: #include "machine/timer.h" #include "sound/okim6295.h" #include "video/ramdac.h" + #include "emupal.h" #include "screen.h" #include "speaker.h" +#include "astoneag.lh" +#include "dinodino.lh" +#include "magibomb.lh" +#include "magibombb.lh" +#include "showhanc.lh" +#include "showhand.lh" +#include "skilldrp.lh" +#include "winbingo.lh" +#include "zoo.lh" + +/*************************************************************************** + + CPU Code (Protection) + +***************************************************************************/ + +class astro_cpucode_device : public device_t +{ +public: + astro_cpucode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + + // read handlers + DECLARE_READ_LINE_MEMBER(do_read); // DO + + // write handlers + DECLARE_WRITE_LINE_MEMBER(cs_write); // CS signal (active high) + DECLARE_WRITE_LINE_MEMBER(clk_write); // CLK signal (active high) + +protected: + virtual void device_start() override; + virtual void device_reset() override; + +private: + required_region_ptr m_region_key; + + u8 m_cs_state = CLEAR_LINE; + attotime m_last_cs_rising_edge_time = attotime::zero; + u8 m_clk_state = CLEAR_LINE; + u16 m_shift_register = 0; +}; + +DEFINE_DEVICE_TYPE(ASTRO_CPUCODE, astro_cpucode_device, "astro_cpucode", "Astro CPU Code") + +astro_cpucode_device::astro_cpucode_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) + : device_t(mconfig, ASTRO_CPUCODE, tag, owner, clock) + , m_region_key(*this, DEVICE_SELF) +{ } + +void astro_cpucode_device::device_start() +{ + save_item(NAME(m_cs_state)); + save_item(NAME(m_last_cs_rising_edge_time)); + save_item(NAME(m_clk_state)); + save_item(NAME(m_shift_register)); +} + +void astro_cpucode_device::device_reset() +{ + m_shift_register = 0; +} + +READ_LINE_MEMBER(astro_cpucode_device::do_read) +{ + return BIT(m_shift_register, 15); +} + +WRITE_LINE_MEMBER(astro_cpucode_device::cs_write) +{ + if (state != m_cs_state) + { + m_cs_state = state; + if (state == ASSERT_LINE) + { + m_last_cs_rising_edge_time = machine().time(); + constexpr int shift = 11; // 0 1 10AAAAAA R + const u16 cpucode = *m_region_key; + m_shift_register = BIT(cpucode, shift, 16 - shift) | (BIT(cpucode, 0, shift) << (16 - shift)); + } + } +} + +WRITE_LINE_MEMBER(astro_cpucode_device::clk_write) +{ + if (m_cs_state == ASSERT_LINE && state != m_clk_state) + { + m_clk_state = state; + if (state == ASSERT_LINE && machine().time() > m_last_cs_rising_edge_time) + m_shift_register = BIT(m_shift_register, 15) | (BIT(m_shift_register, 0, 15) << 1); + } +} namespace { @@ -69,13 +178,15 @@ public: m_hopper(*this, "hopper"), m_ticket(*this, "ticket"), m_spriteram(*this, "spriteram"), + m_eeprom_out(*this, "EEPROM_OUT"), + m_can_flip_sprites(true), m_lamps(*this, "lamp%u", 0U) { } - void skilldrp(machine_config &config); + void showhanc(machine_config &config); void showhand(machine_config &config); + void skilldrp(machine_config &config); void speeddrp(machine_config &config); - void showhanc(machine_config &config); void init_showhanc(); void init_showhand(); @@ -90,28 +201,37 @@ protected: required_device m_gfxdecode; required_device m_screen; required_device m_palette; - optional_device m_hopper; - optional_device m_ticket; + required_device m_hopper; + required_device m_ticket; // memory pointers required_shared_ptr m_spriteram; - TIMER_DEVICE_CALLBACK_MEMBER(skilldrp_scanline_cb); + // i/o ports + required_ioport m_eeprom_out; + + // video-related + u8 m_screen_enable = 0; + bool m_can_flip_sprites; + + TIMER_DEVICE_CALLBACK_MEMBER(irq_2_4_scanline_cb); + void draw_sprites_w(offs_t offset, u16 data, u16 mem_mask = ~0); - void eeprom_w(u8 data); + virtual void eeprom_w(u8 data); + void showhanc_outputs_w(offs_t offset, u16 data, u16 mem_mask = ~0); void showhand_outputs_w(offs_t offset, u16 data, u16 mem_mask = ~0); void skilldrp_outputs_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void magibomb_outputs_w(offs_t offset, u16 data, u16 mem_mask = ~0); void screen_enable_w(u8 data); u16 unk_r(); void oki_bank_w(u8 data); - u8 m_screen_enable = 0; private: // video-related bitmap_ind16 m_bitmap; - u16 m_sprite_dma = 0; + u16 m_sprite_dma = 0; - output_finder<7> m_lamps; + output_finder<8> m_lamps; u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -123,6 +243,7 @@ private: void speeddrp_map(address_map &map); }; +// Simpler encryption. No IRQs. class magibomb_state : public astrocorp_state { public: @@ -133,45 +254,46 @@ public: void magibomb(machine_config &config); void magibombb(machine_config &config); void magibombf(machine_config &config); - void init_magibomb(); + + void init_magibomb(); // simple encryption private: u16 video_flags_r(); + void magibomb_base_map(address_map &map, u32 base_offs); void magibomb_map(address_map &map); void magibombb_map(address_map &map); void magibombf_map(address_map &map); }; -class astoneage_state : public astrocorp_state +// Heavier encryption. CPU Code protection. +class zoo_state : public astrocorp_state { public: - astoneage_state(const machine_config &mconfig, device_type type, const char *tag) : - astrocorp_state(mconfig, type, tag) - , m_ramdac(*this, "ramdac") + zoo_state(const machine_config &mconfig, device_type type, const char *tag) : + astrocorp_state(mconfig, type, tag), + m_cpucode(*this, "astro_cpucode"), + m_cpucode_out(*this, "CPUCODE_OUT") { } - void astoneage(machine_config &config); + void hacher(machine_config &config); void dinodino(machine_config &config); void magibombd(machine_config &config); - void init_astoneage(); + void winbingo(machine_config &config); + void zoo(machine_config &config); + void init_dinodino(); + void init_hacher(); void init_magibombd(); void init_winbingo(); - void init_zulu(); + void init_winbingoa(); + void init_zoo(); + + virtual void eeprom_w(u8 data) override; protected: virtual void machine_start() override; -private: - optional_device m_ramdac; - - TIMER_DEVICE_CALLBACK_MEMBER(astoneage_scanline_cb); - void astoneage_map(address_map &map); - void dinodino_map(address_map &map); - void magibombd_map(address_map &map); - void ramdac_map(address_map &map); - struct decryption_info { struct { // Address bits used for bitswap/xor selection @@ -186,13 +308,48 @@ private: // Global address bitswap (src -> dest, some sets use bits 12-8 only, while others 12-2) u8 bits[11]; }; + void decrypt_rom(const decryption_info &table); + +private: + required_device m_cpucode; + + required_ioport m_cpucode_out; + + TIMER_DEVICE_CALLBACK_MEMBER(irq_1_2_scanline_cb); + + void dinodino_map(address_map &map); + void hacher_map(address_map &map); + void magibombd_map(address_map &map); + void winbingo_map(address_map &map); + void zoo_map(address_map &map); - static const decryption_info astoneag_table; static const decryption_info dinodino_table; static const decryption_info magibombd_table; static const decryption_info winbingo_table; - static const decryption_info zulu_table; - void decrypt_rom(const decryption_info &table); + static const decryption_info zoo_table; +}; + +// Adds RAMDAC and 16x32 sprites +class astoneag_state : public zoo_state +{ +public: + astoneag_state(const machine_config &mconfig, device_type type, const char *tag) : + zoo_state(mconfig, type, tag), + m_ramdac(*this, "ramdac") + { } + + void astoneag(machine_config &config); + + void init_astoneag(); + +private: + required_device m_ramdac; + + void astoneag_map(address_map &map); + void ramdac_map(address_map &map); + + static const decryption_info astoneag_table; + void interleave_sprites_16x32(); }; /*************************************************************************** @@ -223,8 +380,8 @@ void astrocorp_state::video_start() 1 Code 2 fedc ba-- ---- ---- ignored? - ---- --9- ---- ---- flip Y - ---- ---8 ---- ---- flip X + ---- --9- ---- ---- Flip Y (ignored in showhand/showhanc) + ---- ---8 ---- ---- Flip X "" ---- ---- 7654 3210 Y 3 fedc ba98 ---- ---- X Size @@ -234,25 +391,32 @@ void astrocorp_state::video_start() void astrocorp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect) { - u16 *source = m_spriteram; - u16 *finish = m_spriteram + m_spriteram.bytes() / 2; + const u16 *source = m_spriteram; + const u16 * const finish = m_spriteram + m_spriteram.length(); + + gfx_element * const gfx = m_gfxdecode->gfx(0); + + const int yfactor = gfx->height() / 16; for ( ; source < finish; source += 8 / 2 ) { int sx = source[ 0x0/2 ]; int code = source[ 0x2/2 ]; int sy = source[ 0x4/2 ]; - int attr = source[ 0x6/2 ]; - - int dimx = (attr >> 8) & 0xff; - int dimy = (attr >> 0) & 0xff; + int size = source[ 0x6/2 ]; // end flag, particularly needed by magibomb if (!(sx & 0x8000)) return; - int fx = sy & 0x100; - int fy = sy & 0x200; + const int dimx = (size >> 8) & 0xff; + const int dimy = (size >> 0) & 0xff; + + // Showhand pollutes the flip bits with negative y coordinates (when the new opponent face enters the screen). + // So at least this game has no flip bits in sy. + const int flipx = m_can_flip_sprites ? sy & 0x100 : 0; + const int flipy = m_can_flip_sprites ? sy & 0x200 : 0; + sx &= 0x01ff; sy &= 0x00ff; @@ -264,13 +428,12 @@ void astrocorp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clipre { for (int xwrap = 0 ; xwrap <= 0x200 ; xwrap += 0x200) { - // TODO: needs updating 16 to a protected const for compensating with astoneag gfxs - int resx = fx ? (sx+1) - ((x+1) * 16 + xwrap) : sx + x * 16 - xwrap; - int resy = fy ? (sy+1) - ((y+1) * 16 + ywrap) : sy + y * 16 - ywrap; - m_gfxdecode->gfx(0)->transpen(bitmap,cliprect, + int resx = flipx ? (sx + 1) - ((x + 1) * 16 + xwrap) : sx + x * 16 - xwrap; + int resy = flipy ? (sy + 1) - ((y + 1) * 16 + ywrap) : sy + y * 16 - ywrap; + gfx->transpen(bitmap,cliprect, code, 0, - fx, fy, - resx, resy, 0xff); + flipx, flipy, + resx, resy * yfactor, 0xff); } } code++; @@ -281,7 +444,7 @@ void astrocorp_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &clipre u32 astrocorp_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - if (m_screen_enable & 1) + if (BIT(m_screen_enable, 0)) copybitmap(bitmap, m_bitmap, 0,0,0,0, cliprect); else bitmap.fill(m_palette->black_pen(), cliprect); @@ -289,15 +452,14 @@ u32 astrocorp_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, return 0; } - /*************************************************************************** Memory Maps ***************************************************************************/ void astrocorp_state::draw_sprites_w(offs_t offset, u16 data, u16 mem_mask) { - u16 old = m_sprite_dma; - u16 now = COMBINE_DATA(&m_sprite_dma); + const u16 old = m_sprite_dma; + const u16 now = COMBINE_DATA(&m_sprite_dma); if (!old && now) draw_sprites(m_bitmap, m_screen->visible_area()); @@ -305,83 +467,148 @@ void astrocorp_state::draw_sprites_w(offs_t offset, u16 data, u16 mem_mask) void astrocorp_state::eeprom_w(u8 data) { - ioport("EEPROMOUT")->write(data, 0xff); + m_eeprom_out->write(data, 0xff); } void astrocorp_state::oki_bank_w(u8 data) { - m_oki->set_rom_bank(data & 1); -// logerror("CPU #0 PC %06X: OKI bank %02X\n", m_maincpu->pc(), data); + m_oki->set_rom_bank(BIT(data, 0)); +// logerror("%s: OKI bank %02X\n", machine().describe_context(), data); + if (data & (~1)) + logerror("%s: warning, unknown bits written in oki_bank_w = %02X\n", machine().describe_context(), data); } void astrocorp_state::showhand_outputs_w(offs_t offset, u16 data, u16 mem_mask) { if (ACCESSING_BITS_0_7) { - machine().bookkeeping().coin_counter_w(0, (data & 0x0004)); // coin counter - m_lamps[0] = BIT(data, 3); // you win - if ((data & 0x0010)) machine().bookkeeping().increment_dispensed_tickets(1); // coin out - m_lamps[1] = BIT(data, 5); // coin/hopper jam + m_hopper->motor_w( BIT(data, 0)); // (0001) hopper motor + // BIT(data, 1); // (0002) + machine().bookkeeping().coin_counter_w(0, BIT(data, 2)); // (0004) coin-in / key-in counter + m_lamps[0] = BIT(data, 3); // (0008) win lamp + machine().bookkeeping().coin_counter_w(1, BIT(data, 4)); // (0010) coin-out counter + m_lamps[1] = BIT(data, 5); // (0020) error lamp (coin/hopper jam) + // BIT(data, 6); // (0040) + // BIT(data, 7); // (0080) } if (ACCESSING_BITS_8_15) { - m_lamps[2] = BIT(data, 8); // bet - m_lamps[3] = BIT(data, 11); // start - m_lamps[4] = BIT(data, 12); // ? select/choose - m_lamps[5] = BIT(data, 13); // ? select/choose - m_lamps[6] = BIT(data, 15); // look + m_lamps[2] = BIT(data, 8); // (0100) bet / double up lamp + m_lamps[3] = BIT(data, 9); // (0200) payout lamp + // BIT(data, 10); // (0400) + m_lamps[4] = BIT(data, 11); // (0800) start / take lamp + m_ticket->motor_w( BIT(data, 12)); // (1000) ticket motor + m_lamps[5] = BIT(data, 13); // (2000) select or yes / big lamp ? + m_lamps[6] = BIT(data, 14); // (4000) look / small lamp + m_lamps[7] = BIT(data, 13); // (8000) select or yes / big lamp ? } -// popmessage("%04X",data); + + if (data & 0x04c2) + logerror("%s: warning, unknown bits written in outputs_w = %04x\n", machine().describe_context(), data); + +// popmessage("OUT %04X",data); +} + +void astrocorp_state::showhanc_outputs_w(offs_t offset, u16 data, u16 mem_mask) +{ + if (ACCESSING_BITS_0_7) + { + // BIT(data, 0); // (0001) + machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); // (0002) coin-in / key-in counter + // BIT(data, 2); // (0004) + m_hopper->motor_w( BIT(data, 3)); // (0008) hopper motor + machine().bookkeeping().coin_counter_w(1, BIT(data, 4)); // (0010) coin out + m_lamps[0] = BIT(data, 5); // (0020) error lamp (coin/hopper jam) + // BIT(data, 6); // (0040) + // BIT(data, 7); // (0080) + } + if (ACCESSING_BITS_8_15) + { + // BIT(data, 8); // (0100) + m_lamps[1] = BIT(data, 9); // (0200) payout lamp + m_lamps[2] = BIT(data, 10); // (0400) bet / double up lamp + m_lamps[3] = BIT(data, 11); // (0800) start / take lamp + m_lamps[4] = BIT(data, 12); // (1000) win lamp + m_lamps[5] = BIT(data, 13); // (2000) look / small lamp + m_lamps[6] = BIT(data, 14); // (4000) select or yes / big lamp ? + m_lamps[7] = BIT(data, 15); // (8000) select or yes / big lamp ? + } + + if (data & 0x01c5) + logerror("%s: warning, unknown bits written in outputs_w = %04x\n", machine().describe_context(), data); + +// popmessage("OUT %04X",data); } void astrocorp_state::skilldrp_outputs_w(offs_t offset, u16 data, u16 mem_mask) { - // key in (0001) - // coin in (0002) - // key out (0004) - // coin out (0008) - // hopper? (0010) - // error lamp (0020) - // ticket motor? (0080) - // select lamp (0100) - // take lamp (0400) - // bet lamp (0800) - // start lamp (1000) - // win / test lamp (4000) - // ticket? (8000) - - // account (5d20 4d20 4520 4420 4020 4000) + if (ACCESSING_BITS_0_7) + { + machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); // (0001) key in count | + // BIT(data, 1)); // (0002) coin in count |- skilldrp manual shows 1 in- and 1 out- counter + machine().bookkeeping().coin_counter_w(1, BIT(data, 2)); // (0004) key out count | + m_hopper->motor_w( BIT(data, 3)); // (0008) hopper motor + // BIT(data, 4)); // (0010) coin out count | + m_lamps[0] = BIT(data, 5); // (0020) error lamp (coin/hopper jam: "call attendant") + // BIT(data, 6); // (0040) + m_ticket->motor_w( BIT(data, 7)); // (0080) ticket motor + } + if (ACCESSING_BITS_8_15) + { + m_lamps[1] = BIT(data, 8); // (0100) select / double up lamp + // BIT(data, 9); // (0200) + m_lamps[3] = BIT(data, 10); // (0400) take lamp + m_lamps[4] = BIT(data, 11); // (0800) play (bet) lamp + m_lamps[5] = BIT(data, 12); // (1000) start lamp + // BIT(data, 13); // (2000) + m_lamps[7] = BIT(data, 14); // (4000) win lamp + // BIT(data, 15); // (8000) ticket dispenser enable? + } + // account (5d20 4d20 4520 4420 4020 4000) + + if (data & 0x2240) + logerror("%s: warning, unknown bits written in outputs_w = %04x\n", machine().describe_context(), data); +// popmessage("OUT %04X",data); +} + +void astrocorp_state::magibomb_outputs_w(offs_t offset, u16 data, u16 mem_mask) +{ if (ACCESSING_BITS_0_7) { - machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); // key in | - machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); // coin in |- manual shows 1 in- and 1 out- counter - machine().bookkeeping().coin_counter_w(1, BIT(data, 2)); // key out | - m_hopper->motor_w(BIT(data, 3)); // hopper motor? - // BIT(data, 4) // hopper? - m_lamps[0] = BIT(data, 5); // error lamp (coin/hopper jam: "call attendant") - m_ticket->motor_w(BIT(data, 7)); // ticket motor? + machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); // (0001) key in count | + machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // (0002) coin in count |- magibomb manual shows 2 in- and 2 out- counters + machine().bookkeeping().coin_counter_w(2, BIT(data, 2)); // (0004) key out count | + m_hopper->motor_w( BIT(data, 3)); // (0008) hopper motor + machine().bookkeeping().coin_counter_w(3, BIT(data, 4)); // (0010) coin out count | + m_lamps[0] = BIT(data, 5); // (0020) error lamp (coin/hopper jam: "call attendant") + // BIT(data, 6); // (0040) ? used in-game + m_ticket->motor_w( BIT(data, 7)); // (0080) ticket motor } if (ACCESSING_BITS_8_15) { - // lamps: - m_lamps[1] = BIT(data, 8); // select - m_lamps[2] = BIT(data, 10); // take - m_lamps[3] = BIT(data, 11); // bet - m_lamps[4] = BIT(data, 12); // start - m_lamps[5] = BIT(data, 14); // win / test - m_lamps[6] = BIT(data, 15); // ticket? + m_lamps[1] = BIT(data, 8); // (0100) stop 1 / double up lamp + m_lamps[2] = BIT(data, 9); // (0200) stop all / big lamp + m_lamps[3] = BIT(data, 10); // (0400) stop 3 / take lamp + m_lamps[4] = BIT(data, 11); // (0800) bet lamp + m_lamps[5] = BIT(data, 12); // (1000) start lamp + m_lamps[6] = BIT(data, 13); // (2000) stop 2 / small lamp + m_lamps[7] = BIT(data, 14); // (4000) win lamp + // BIT(data, 15); // (8000) ticket dispenser enable? } -// popmessage("%04X",data); + if (data & 0x0040) + logerror("%s: warning, unknown bits written in outputs_w = %04x\n", machine().describe_context(), data); + +// popmessage("OUT %04X",data); } void astrocorp_state::screen_enable_w(u8 data) { m_screen_enable = data; -// popmessage("%02X",data); +// popmessage("ENAB %02X",data); if (m_screen_enable & (~1)) - logerror("CPU #0 PC %06X: screen enable = %02X\n", m_maincpu->pc(), m_screen_enable); + logerror("%s: warning, unknown bits written in screen_enable_w = %02X\n", machine().describe_context(), m_screen_enable); } u16 astrocorp_state::unk_r() @@ -389,20 +616,19 @@ u16 astrocorp_state::unk_r() return 0xffff; // bit 3? } - void astrocorp_state::showhand_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x050000, 0x050fff).ram().share("spriteram"); - map(0x052000, 0x052001).w(FUNC(astrocorp_state::draw_sprites_w)); + map(0x052000, 0x052001).nopr().w(FUNC(astrocorp_state::draw_sprites_w)); map(0x054000, 0x054001).portr("INPUTS"); map(0x058001, 0x058001).w(FUNC(astrocorp_state::eeprom_w)); map(0x05a000, 0x05a001).w(FUNC(astrocorp_state::showhand_outputs_w)); - map(0x05e000, 0x05e001).portr("EEPROMIN"); + map(0x05e000, 0x05e001).portr("EEPROM_IN"); map(0x060000, 0x0601ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x070000, 0x073fff).ram().share("nvram"); // battery map(0x080000, 0x080000).w(FUNC(astrocorp_state::oki_bank_w)); - map(0x0a0001, 0x0a0001).w(FUNC(astrocorp_state::screen_enable_w)); + map(0x0a0000, 0x0a0001).nopr().w(FUNC(astrocorp_state::screen_enable_w)).umask16(0x00ff); map(0x0d0000, 0x0d0001).r(FUNC(astrocorp_state::unk_r)); map(0x0d0000, 0x0d0000).w(m_oki, FUNC(okim6295_device::write)); } @@ -413,64 +639,61 @@ void astrocorp_state::showhanc_map(address_map &map) map(0x060000, 0x0601ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); map(0x070000, 0x070000).w(FUNC(astrocorp_state::oki_bank_w)); map(0x080000, 0x080fff).ram().share("spriteram"); - map(0x082000, 0x082001).w(FUNC(astrocorp_state::draw_sprites_w)); + map(0x082000, 0x082001).nopr().w(FUNC(astrocorp_state::draw_sprites_w)); map(0x084000, 0x084001).portr("INPUTS"); map(0x088001, 0x088001).w(FUNC(astrocorp_state::eeprom_w)); - map(0x08a000, 0x08a001).w(FUNC(astrocorp_state::showhand_outputs_w)); - map(0x08e000, 0x08e001).portr("EEPROMIN"); + map(0x08a000, 0x08a001).w(FUNC(astrocorp_state::showhanc_outputs_w)); + map(0x08e000, 0x08e001).portr("EEPROM_IN"); map(0x090000, 0x093fff).ram().share("nvram"); // battery - map(0x0a0001, 0x0a0001).w(FUNC(astrocorp_state::screen_enable_w)); + map(0x0a0000, 0x0a0001).nopr().w(FUNC(astrocorp_state::screen_enable_w)).umask16(0x00ff); map(0x0e0000, 0x0e0001).r(FUNC(astrocorp_state::unk_r)); map(0x0e0000, 0x0e0000).w(m_oki, FUNC(okim6295_device::write)); } -// unknown read at 0x202000, 0x20a000, 0x400000 void astrocorp_state::skilldrp_map(address_map &map) { map(0x000000, 0x03ffff).rom(); map(0x200000, 0x200fff).ram().share("spriteram"); - map(0x202000, 0x202001).w(FUNC(astrocorp_state::draw_sprites_w)); + map(0x202000, 0x202001).nopr().w(FUNC(astrocorp_state::draw_sprites_w)); map(0x204000, 0x204001).portr("INPUTS"); map(0x208001, 0x208001).w(FUNC(astrocorp_state::eeprom_w)); - map(0x20a000, 0x20a001).w(FUNC(astrocorp_state::skilldrp_outputs_w)); - map(0x20e000, 0x20e001).portr("EEPROMIN"); + map(0x20a000, 0x20a001).nopr().w(FUNC(astrocorp_state::skilldrp_outputs_w)); + map(0x20e000, 0x20e001).portr("EEPROM_IN"); map(0x380000, 0x3801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x400001, 0x400001).w(FUNC(astrocorp_state::screen_enable_w)); + map(0x400000, 0x400001).nopr().w(FUNC(astrocorp_state::screen_enable_w)).umask16(0x00ff); map(0x500000, 0x507fff).ram().share("nvram"); // battery map(0x580001, 0x580001).w(FUNC(astrocorp_state::oki_bank_w)); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } -// unknown read at 0x500000 void astrocorp_state::speeddrp_map(address_map &map) { map(0x000000, 0x01ffff).rom(); map(0x280000, 0x283fff).ram().share("nvram"); // battery map(0x380000, 0x380fff).ram().share("spriteram"); - map(0x382000, 0x382001).w(FUNC(astrocorp_state::draw_sprites_w)); + map(0x382000, 0x382001).nopr().w(FUNC(astrocorp_state::draw_sprites_w)); map(0x384000, 0x384001).portr("INPUTS"); map(0x388001, 0x388001).w(FUNC(astrocorp_state::eeprom_w)); map(0x38a000, 0x38a001).w(FUNC(astrocorp_state::skilldrp_outputs_w)); - map(0x38e000, 0x38e001).portr("EEPROMIN"); + map(0x38e000, 0x38e001).portr("EEPROM_IN"); map(0x480000, 0x4801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x500001, 0x500001).w(FUNC(astrocorp_state::screen_enable_w)); + map(0x500000, 0x500001).nopr().w(FUNC(astrocorp_state::screen_enable_w)).umask16(0x00ff); map(0x580001, 0x580001).w(FUNC(astrocorp_state::oki_bank_w)); map(0x600001, 0x600001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); } // PC refers to magibomb: -// - 0x22a4 reads to $a0101a, resets if 0 -// - 0x8ba if $a10001 & 0xf != 0 it writes "SEGA" to $a14000 (wtf?) -// - all lv 1-7 irqs writes a vector to D1 then resets program flow, +// - 0x22a4 reads from $a0101a, resets if 0 +// - 0x8ba if $a10001 & 0xf != 0 it writes "SEGA" to $a14000 (!?) +// - all irq service routines write an id number to register D1 and then reset the program flow, // is it expecting to NOT use irqs at all and actually using it for remote control? // - tight loops at 0x1fb2, bypass by jumping to 0x1fb6, otherwise works on an initialized nvram/eeprom, -// presumably wants an operator input code? +// keep keyout pressed during boot to initialize (needs ticket and hopper lines to be 0 though: disconnected?). u16 magibomb_state::video_flags_r() { // bit 0: vblank? bit 3: sprite busy flag? - - return m_screen->vblank() ^ 1; + return (m_screen->vblank() ^ 1) | ((m_screen->vblank() ^ 1) << 3); } void magibomb_state::magibomb_base_map(address_map &map, u32 base_offs) @@ -479,20 +702,28 @@ void magibomb_state::magibomb_base_map(address_map &map, u32 base_offs) // map(0x040000, 0x07ffff) in client (later HW maps these ones at 0x50000-0x6ffff instead of 0x40000-0x5ffff) map(0x040000+base_offs, 0x043fff+base_offs).ram().share("nvram"); map(0x050000+base_offs, 0x050fff+base_offs).ram().share("spriteram"); - map(0x052000+base_offs, 0x052001+base_offs).w(FUNC(magibomb_state::draw_sprites_w)); + map(0x052000+base_offs, 0x052001+base_offs).nopr().w(FUNC(magibomb_state::draw_sprites_w)); map(0x054000+base_offs, 0x054001+base_offs).portr("INPUTS"); map(0x058001+base_offs, 0x058001+base_offs).w(FUNC(magibomb_state::eeprom_w)); - map(0x05a000+base_offs, 0x05a001+base_offs).w(FUNC(magibomb_state::skilldrp_outputs_w)); - map(0x05e000+base_offs, 0x05e001+base_offs).portr("EEPROMIN"); + map(0x05a000+base_offs, 0x05a001+base_offs).w(FUNC(magibomb_state::magibomb_outputs_w)); + map(0x05e000+base_offs, 0x05e001+base_offs).portr("EEPROM_IN"); map(0x080001, 0x080001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); - map(0x090001, 0x090001).w(FUNC(magibomb_state::oki_bank_w)); + map(0x090000, 0x090000).w(FUNC(magibomb_state::oki_bank_w)); map(0x0a0000, 0x0a0001).r(FUNC(magibomb_state::video_flags_r)); map(0x0a0000, 0x0a0000).w(FUNC(magibomb_state::screen_enable_w)); - map(0x0b0000, 0x0b01ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0xa00000, 0xa005ff).ram(); // unknown +// map(0xa01000, 0xa0101f).rw map(0xa0101a, 0xa0101b).r(FUNC(magibomb_state::unk_r)); +// 0xa10001.b r (bits 0-3) +// 0xa11100.w w (0x0000 -> 0x0100) +// 0xa11100.b r (bit 0) +// 0xa11200.w w (0x0000 -> 0x0100) +// 0xa14000.l w ("SEGA" !?) +// 0xc00004.w w (0x8000 -> 0x8100) +// 0xc00005.b r (bit 1) } void magibomb_state::magibomb_map(address_map &map) @@ -511,71 +742,129 @@ void magibomb_state::magibombf_map(address_map &map) map(0x060000, 0x063fff).ram().share("nvram"); map(0x070000, 0x070001).r(FUNC(magibomb_state::video_flags_r)); map(0x080000, 0x080fff).ram().share("spriteram"); - map(0x082000, 0x082001).w(FUNC(magibomb_state::draw_sprites_w)); + map(0x082000, 0x082001).nopr().w(FUNC(magibomb_state::draw_sprites_w)); map(0x084000, 0x084001).portr("INPUTS"); map(0x088001, 0x088001).w(FUNC(magibomb_state::eeprom_w)); - map(0x08a000, 0x08a001).w(FUNC(magibomb_state::skilldrp_outputs_w)); - map(0x08e000, 0x08e001).portr("EEPROMIN"); + map(0x08a000, 0x08a001).w(FUNC(magibomb_state::magibomb_outputs_w)); + map(0x08e000, 0x08e001).portr("EEPROM_IN"); map(0x090000, 0x0901ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0a0000, 0x0a0000).w(FUNC(magibomb_state::screen_enable_w)); - map(0x0b0001, 0x0b0001).w(FUNC(magibomb_state::oki_bank_w)); + map(0x0a0000, 0x0a0001).nopr().w(FUNC(magibomb_state::screen_enable_w)).umask16(0xff00); + map(0x0b0000, 0x0b0000).w(FUNC(magibomb_state::oki_bank_w)); map(0x0c0001, 0x0c0001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xa00000, 0xa005ff).ram(); // unknown map(0xa0101a, 0xa0101b).r(FUNC(magibomb_state::unk_r)); } -void astoneage_state::astoneage_map(address_map &map) +void zoo_state::eeprom_w(u8 data) { - map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM crc at mirror - map(0xb00000, 0xb03fff).ram().share("nvram"); // battery - map(0xc00000, 0xc00fff).ram().share("spriteram"); - map(0xc02000, 0xc02001).w(FUNC(astoneage_state::draw_sprites_w)); - map(0xc04000, 0xc04001).portr("INPUTS"); - map(0xc08001, 0xc08001).w(FUNC(astoneage_state::eeprom_w)); - map(0xc0a000, 0xc0a001).w(FUNC(astoneage_state::skilldrp_outputs_w)); - map(0xc0e000, 0xc0e001).portr("EEPROMIN"); - map(0xd00000, 0xd00000).w(m_ramdac, FUNC(ramdac_device::index_w)); - map(0xd00002, 0xd00002).w(m_ramdac, FUNC(ramdac_device::pal_w)); - map(0xd00004, 0xd00004).w(m_ramdac, FUNC(ramdac_device::mask_w)); -// map(0x480000, 0x4801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - // unknown location -// map(0x500001, 0x500001).w(FUNC(astoneage_state::screen_enable_w)); - map(0x580001, 0x580001).w(FUNC(astoneage_state::oki_bank_w)); - map(0xe00001, 0xe00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + m_eeprom_out->write(data, 0xff); + m_cpucode_out->write(data, 0xff); } -void astoneage_state::dinodino_map(address_map &map) +void zoo_state::dinodino_map(address_map &map) { - map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM crc at mirror + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror map(0x900000, 0x903fff).ram().share("nvram"); // battery map(0xb00000, 0xb00fff).ram().share("spriteram"); - map(0xb02000, 0xb02001).w(FUNC(astoneage_state::draw_sprites_w)); + map(0xb02000, 0xb02001).nopr().w(FUNC(zoo_state::draw_sprites_w)); map(0xb04000, 0xb04001).portr("INPUTS"); - map(0xb08001, 0xb08001).w(FUNC(astoneage_state::eeprom_w)); - map(0xb0a000, 0xb0a001).w(FUNC(astoneage_state::skilldrp_outputs_w)); - map(0xb0e000, 0xb0e001).portr("EEPROMIN"); + map(0xb08001, 0xb08001).w(FUNC(zoo_state::eeprom_w)); + map(0xb0a000, 0xb0a001).w(FUNC(zoo_state::magibomb_outputs_w)); + map(0xb0e000, 0xb0e001).portr("EEPROM_IN"); + map(0xb80000, 0xb80001).portr("CPUCODE_IN"); map(0xc80000, 0xc801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - // unknown location -// map(0x500001, 0x500001).w(FUNC(astoneage_state::screen_enable_w)); - map(0x580001, 0x580001).w(FUNC(astoneage_state::oki_bank_w)); - map(0xe00001, 0xe00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xd00001, 0xd00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xd80000, 0xd80000).w(FUNC(zoo_state::oki_bank_w)); +// map(0x??0001, 0x??0001).w(FUNC(zoo_state::screen_enable_w)); // unknown location } -void astoneage_state::magibombd_map(address_map &map) // seems to use old style palette instead of ramdac +void zoo_state::magibombd_map(address_map &map) { - map(0x000000, 0x03ffff).rom().mirror(0x800000); + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror + map(0xa80000, 0xa80fff).ram().share("spriteram"); + map(0xa82000, 0xa82001).nopr().w(FUNC(zoo_state::draw_sprites_w)); + map(0xa84000, 0xa84001).portr("INPUTS"); + map(0xa88001, 0xa88001).w(FUNC(zoo_state::eeprom_w)); + map(0xa8a000, 0xa8a001).w(FUNC(zoo_state::magibomb_outputs_w)); + map(0xa8e000, 0xa8e001).portr("EEPROM_IN"); + map(0xb80000, 0xb80001).portr("CPUCODE_IN"); map(0xc80000, 0xc83fff).ram().share("nvram"); // battery + map(0xd00000, 0xd001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0xd80000, 0xd80000).w(FUNC(zoo_state::oki_bank_w)); + map(0xe00001, 0xe00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); +// map(0x??0001, 0x??0001).w(FUNC(zoo_state::screen_enable_w)); // unknown location +} + +void zoo_state::winbingo_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror + map(0x900001, 0x900001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0x980001, 0x980001).w(FUNC(zoo_state::oki_bank_w)); + map(0xa00000, 0xa03fff).ram().share("nvram"); // battery map(0xa80000, 0xa80fff).ram().share("spriteram"); - map(0xa82000, 0xa82001).w(FUNC(astoneage_state::draw_sprites_w)); + map(0xa82000, 0xa82001).nopr().w(FUNC(zoo_state::draw_sprites_w)); map(0xa84000, 0xa84001).portr("INPUTS"); - map(0xa88001, 0xa88001).w(FUNC(astoneage_state::eeprom_w)); - map(0xa8a000, 0xa8a001).w(FUNC(astoneage_state::skilldrp_outputs_w)); - map(0xa8e000, 0xa8e001).portr("EEPROMIN"); + map(0xa88001, 0xa88001).w(FUNC(zoo_state::eeprom_w)); + map(0xa8a000, 0xa8a001).w(FUNC(zoo_state::magibomb_outputs_w)); + map(0xa8e000, 0xa8e001).portr("EEPROM_IN"); + map(0xb00000, 0xb00001).nopr().w(FUNC(zoo_state::screen_enable_w)).umask16(0x00ff); map(0xd00000, 0xd001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - // unknown location -// map(0x500001, 0x500001).w(FUNC(astoneage_state::screen_enable_w)); - map(0x580001, 0x580001).w(FUNC(astoneage_state::oki_bank_w)); + map(0xd80000, 0xd80001).portr("CPUCODE_IN"); +} + +void zoo_state::hacher_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror + map(0xb80000, 0xb80fff).ram().share("spriteram"); + map(0xb82000, 0xb82001).nopr().w(FUNC(zoo_state::draw_sprites_w)); + map(0xb84000, 0xb84001).portr("INPUTS"); + map(0xb88001, 0xb88001).w(FUNC(zoo_state::eeprom_w)); + map(0xb8a000, 0xb8a001).w(FUNC(zoo_state::magibomb_outputs_w)); + map(0xb8e000, 0xb8e001).portr("EEPROM_IN"); + map(0xa00001, 0xa00001).w(FUNC(zoo_state::oki_bank_w)); + map(0xc00001, 0xc00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); +// map(0xc00001, 0xc00001).w(FUNC(zoo_state::screen_enable_w)); // also used as screen enable! But 0/1 are no-ops for the OKI, so maybe an innocuous bug of this hacked game? + map(0xc80000, 0xc83fff).ram().share("nvram"); // battery + map(0xd00000, 0xd001ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0xd80000, 0xd80001).portr("CPUCODE_IN"); +} + +void zoo_state::zoo_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror + map(0xa80000, 0xa83fff).ram().share("nvram"); // battery + map(0xb80000, 0xb80fff).ram().share("spriteram"); + map(0xb82000, 0xb82001).nopr().w(FUNC(zoo_state::draw_sprites_w)); + map(0xb84000, 0xb84001).portr("INPUTS"); + map(0xb88001, 0xb88001).w(FUNC(zoo_state::eeprom_w)); + map(0xb8a000, 0xb8a001).w(FUNC(zoo_state::magibomb_outputs_w)); + map(0xb8e000, 0xb8e001).portr("EEPROM_IN"); + map(0xc00000, 0xc00001).nopr().w(FUNC(zoo_state::screen_enable_w)).umask16(0x00ff); + map(0xc80000, 0xc801ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); + map(0xd00001, 0xd00001).w(FUNC(zoo_state::oki_bank_w)); + map(0xd80001, 0xd80001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xe00000, 0xe00001).portr("CPUCODE_IN"); +} + +void astoneag_state::astoneag_map(address_map &map) +{ + map(0x000000, 0x03ffff).rom().mirror(0x800000); // POST checks for ROM checksum at mirror + map(0xb00000, 0xb03fff).ram().share("nvram"); // battery + map(0xb80000, 0xb80001).portr("CPUCODE_IN"); + map(0xc00000, 0xc00fff).ram().share("spriteram"); + map(0xc02000, 0xc02001).nopr().w(FUNC(astoneag_state::draw_sprites_w)); + map(0xc04000, 0xc04001).portr("INPUTS"); + map(0xc08001, 0xc08001).w(FUNC(astoneag_state::eeprom_w)); + map(0xc0a000, 0xc0a001).w(FUNC(astoneag_state::magibomb_outputs_w)); + map(0xc0e000, 0xc0e001).portr("EEPROM_IN"); + map(0xd00000, 0xd00000).w(m_ramdac, FUNC(ramdac_device::index_w)); + map(0xd00002, 0xd00002).w(m_ramdac, FUNC(ramdac_device::pal_w)); + map(0xd00004, 0xd00004).w(m_ramdac, FUNC(ramdac_device::mask_w)); + map(0xd80000, 0xd80000).w(FUNC(astoneag_state::oki_bank_w)); map(0xe00001, 0xe00001).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)); + map(0xf80000, 0xf80001).nopw(); // ? ffff->0000 before EEPROM read +// map(0x??0001, 0x??0001).w(FUNC(astoneag_state::screen_enable_w)); // unknown location } /*************************************************************************** @@ -584,102 +873,187 @@ void astoneage_state::magibombd_map(address_map &map) // seems to use old style static INPUT_PORTS_START( showhand ) PORT_START("INPUTS") // 54000 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // coin - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_F1) // payout (must be 0 on startup) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Bet / Double") - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Look / Small") - PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) // settings - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_CUSTOM ) // coin sensor - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Yes / Big") - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold1") // HOLD1 in test mode - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Select") - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Take") - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Settings") // when 1 in test mode: reset settings (must be 0 on startup) - PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // ? - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN2 ) // key in - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_CUSTOM ) // coin sensor - - PORT_START( "EEPROMIN" ) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) // press with memory_reset if eeprom error (green screen) or to reset settings + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet / Double Up") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Look / Small") // HOLD5 in full test mode + PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) // settings + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("ticket", hopper_device, line_r) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_NAME("Yes / Big") // HOLD4 in full test mode + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // HOLD1 in full test mode + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Select") // HOLD2 in full test mode + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_START ) PORT_NAME("Start / Take") + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MEMORY_RESET ) // press with keyout if eeprom error (green screen) or to reset settings + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) + PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r) + + PORT_START( "EEPROM_IN" ) PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) - PORT_START( "EEPROMOUT" ) + PORT_START( "EEPROM_OUT" ) PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, di_write) PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, clk_write) PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write) INPUT_PORTS_END static INPUT_PORTS_START( showhanc ) - PORT_START("INPUTS") // 84000 - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // coin - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_F1) // payout (must be 0 on startup) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Bet / Double") - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Select") - PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) // settings - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start / Take") // HOLD1 in test mode - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Look / Small / Exit") // HOLD5 in test mode - PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold2") // HOLD2 in test mode - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Yes / Big") // HOLD4 in test mode - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Reset Settings") // when 1 in test mode: reset settings (must be 0 on startup) - PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_CUSTOM ) // must be 0 for inputs to work - PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(1) // key in (shows an error) - PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - - PORT_START( "EEPROMIN" ) - PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) - - PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, di_write) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, clk_write) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write) + PORT_INCLUDE( showhand ) + + PORT_MODIFY("INPUTS") // 84000 + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) // press with memory_reset if eeprom error (green screen) or to reset settings + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Bet / Double Up") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_POKER_HOLD1 ) PORT_NAME("Select") + PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) // settings + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) // note: no payout with default settings + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_NAME("Start / Take") // HOLD1 in full test mode + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_POKER_HOLD3 ) PORT_NAME("Look / Small") // HOLD5 in full test mode + PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be 0 for payout/lamps to work, might be a hopper empty sense? HOLD2 in full test mode + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_POKER_HOLD2 ) PORT_NAME("Yes / Big") // HOLD4 in full test mode + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_MEMORY_RESET ) // press with keyout if eeprom error (green screen) or to reset settings. "DOOR OPEN" error in-game. + PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // must be 0 for payout/lamps to work, might be a hopper empty sense? + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) INPUT_PORTS_END static INPUT_PORTS_START( skilldrp ) - PORT_START("INPUTS") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5) + PORT_INCLUDE( showhand ) + + // Skill Drop Georgia manual, buttons layout: + // ( START ) ( PLAY ) ( SELECT / DOUBLE ) ( TAKE ) + PORT_MODIFY("INPUTS") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) // 5 causes coin jam in magibomb PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START3 ) PORT_NAME("Select / Double") + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP ) PORT_NAME("Select / Double Up") PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_T) PORT_NAME("Ticket Out") + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Ticket Out") PORT_CODE(KEYCODE_T) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_START2 ) PORT_NAME("Bet") - PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("ticket", ticket_dispenser_device, line_r) // ticket sw + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Play") + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("ticket", hopper_device, line_r) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) - PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", ticket_dispenser_device, line_r) // hopper sw + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) +INPUT_PORTS_END + +static INPUT_PORTS_START( magibomb ) + PORT_INCLUDE( skilldrp ) + + // Magic Bomb manuals (American Alpha and AA7 versions), 36-pin layout: + // [ ALL STOP ] [ STOP1 / DOUBLE UP ] [ STOP2 / ODDS ] [ STOP3 / TAKE ] [ START ] + PORT_MODIFY("INPUTS") + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Stop Reel 3 / Take Score") + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Stop Reel 1 / Double Up") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserve Switch") // shown in test mode + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Stop All Reels / Big") + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Stop Reel 2 / Small / Odds") +INPUT_PORTS_END + +static INPUT_PORTS_START( magibombd ) + PORT_INCLUDE( magibomb ) + + PORT_MODIFY( "EEPROM_IN" ) + PORT_BIT( 0xfffb, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) + + PORT_START( "CPUCODE_IN" ) + PORT_BIT( 0xfffb, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, do_read) + + PORT_MODIFY( "EEPROM_OUT" ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write) - PORT_START( "EEPROMIN" ) + PORT_START( "CPUCODE_OUT" ) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, clk_write) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, cs_write) +INPUT_PORTS_END + +static INPUT_PORTS_START( dinodino ) + PORT_INCLUDE( magibomb ) + + PORT_MODIFY("INPUTS") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Take Score") + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Double Up") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserve Switch") // shown in test mode + PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Ticket Out") PORT_CODE(KEYCODE_T) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Auto") + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Odds") + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Play") + PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("ticket", hopper_device, line_r) + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) + + PORT_START( "CPUCODE_IN" ) PORT_BIT( 0xfff7, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read) + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_READ_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, do_read) - PORT_START( "EEPROMOUT" ) - PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, di_write) - PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, clk_write) - PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write) + PORT_START( "CPUCODE_OUT" ) + PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, clk_write) + PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("astro_cpucode", astro_cpucode_device, cs_write) INPUT_PORTS_END -static INPUT_PORTS_START( magibomb ) - PORT_INCLUDE( skilldrp ) +static INPUT_PORTS_START( winbingo ) + PORT_INCLUDE( magibombd ) PORT_MODIFY("INPUTS") - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Stop3 / Take Score") - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Stop1 / Double Up") - PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserve SW") // unknown purpose - PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Stop All / Big") - PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Stop2 / Small") + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Take Score / Select") + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Line / Double Up") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserve Switch") // shown in test mode + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Auto") + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Odds") INPUT_PORTS_END +static INPUT_PORTS_START( astoneag ) + PORT_INCLUDE( dinodino ) + + PORT_MODIFY("INPUTS") + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SLOT_STOP3 ) PORT_NAME("Take") + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SLOT_STOP1 ) PORT_NAME("Auto Play") + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_GAMBLE_DOOR ) + PORT_SERVICE_NO_TOGGLE( 0x0020, IP_ACTIVE_LOW ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT ) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START ) PORT_NAME("Start / Stop") + PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BILL1 ) + PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_SLOT_STOP_ALL ) PORT_NAME("Odds") + PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_SLOT_STOP2 ) PORT_NAME("Select Line / Double Up") + PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) + PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reserve Switch") // shown in test mode + PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) + PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r) + PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN ) +INPUT_PORTS_END + +/* Zoo manual, 36-pin layout: +[ SKIP ] [ 4 ] +[ NEXT ] [ ] +[ ] [ DOUBLEX1 ] + +[ 1 ] [ 2 ] +[ ODDS ] [ ] +[ DOUBLE1/2 ] [ TAKE ] + +[ 3 ] [ 5 ] +[ PLAY ] [ ] +[ DOUBLEX2 ] [ START ] */ + /*************************************************************************** Graphics Layout ***************************************************************************/ @@ -688,98 +1062,97 @@ static GFXDECODE_START( gfx_astrocorp ) GFXDECODE_ENTRY("sprites", 0, gfx_16x16x8_raw, 0, 1) GFXDECODE_END +GFXLAYOUT_RAW(gfx_16x32x8_raw, 16, 32, 16 * 8, 16 * 32 * 8); + +static GFXDECODE_START( gfx_astoneag ) + GFXDECODE_ENTRY("sprites", 0, gfx_16x32x8_raw, 0, 1) +GFXDECODE_END /*************************************************************************** Machine Drivers ***************************************************************************/ -// TODO: move to ROM loading -static const u16 showhand_default_eeprom[15] = {0x0001,0x0007,0x000a,0x0003,0x0000,0x0009,0x0003,0x0000,0x0002,0x0001,0x0000,0x0000,0x0000,0x0000,0x0000}; - - void astrocorp_state::machine_start() { m_lamps.resolve(); - m_screen_enable = 0; } void astrocorp_state::showhand(machine_config &config) { - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(20'000'000) / 2); + // basic machine hardware + M68000(config, m_maincpu, 20_MHz_XTAL / 2); // MC68HC000FN12 (10 MHz ?) m_maincpu->set_addrmap(AS_PROGRAM, &astrocorp_state::showhand_map); m_maincpu->set_vblank_int("screen", FUNC(astrocorp_state::irq4_line_hold)); - NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); + NVRAM(config, "nvram"); + EEPROM_93C46_16BIT(config, "eeprom"); - EEPROM_93C46_16BIT(config, "eeprom").default_data(showhand_default_eeprom, sizeof(showhand_default_eeprom)); + HOPPER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); - /* video hardware */ + // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_raw(XTAL(26'601'712) / 4, 433, 0, 320, 261, 0, 240); // ~15.354KHz Hsync, ~58.846Hz Vsync + m_screen->set_raw(26.601712_MHz_XTAL / 4, 433, 0, 320, 261, 0, 240); // ~15.354kHz Hsync, ~58.846Hz Vsync m_screen->set_screen_update(FUNC(astrocorp_state::screen_update)); m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_astrocorp); PALETTE(config, m_palette).set_format(palette_device::BGR_565, 0x100); - /* sound hardware */ + // sound hardware SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(20'000'000)/20, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); + OKIM6295(config, m_oki, 20_MHz_XTAL / 20, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); } - void astrocorp_state::showhanc(machine_config &config) { showhand(config); m_maincpu->set_addrmap(AS_PROGRAM, &astrocorp_state::showhanc_map); } - -TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::skilldrp_scanline_cb) +TIMER_DEVICE_CALLBACK_MEMBER(astrocorp_state::irq_2_4_scanline_cb) { int scanline = param; - if(scanline == 240) // vblank-out irq. controls sprites, sound, i/o - m_maincpu->set_input_line(4, HOLD_LINE); + if (scanline == m_screen->visible_area().max_y + 1) // vblank-in? + m_maincpu->set_input_line(4, HOLD_LINE); // sprites, sound, i/o - if(scanline == 0) // vblank-in? controls palette - m_maincpu->set_input_line(2, HOLD_LINE); + if (scanline == 0) // vblank-out? + m_maincpu->set_input_line(2, HOLD_LINE); // palette } void astrocorp_state::skilldrp(machine_config &config) { - /* basic machine hardware */ - M68000(config, m_maincpu, XTAL(24'000'000) / 2); // JX-1689F1028N GRX586.V5 + // basic machine hardware + M68000(config, m_maincpu, 24_MHz_XTAL / 2); // JX-1689F1028N GRX586.V5 (12 MHz ?) m_maincpu->set_addrmap(AS_PROGRAM, &astrocorp_state::skilldrp_map); - TIMER(config, "scantimer").configure_scanline(FUNC(astrocorp_state::skilldrp_scanline_cb), "screen", 0, 1); + TIMER(config, "scantimer").configure_scanline(FUNC(astrocorp_state::irq_2_4_scanline_cb), "screen", 0, 1); - NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); + NVRAM(config, "nvram"); EEPROM_93C46_16BIT(config, "eeprom"); - TICKET_DISPENSER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); - TICKET_DISPENSER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_ticket, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + HOPPER(config, m_hopper, attotime::from_msec(200), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); - /* video hardware */ + // video hardware SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // TODO: verify H/VSync & pixel clock for this type of HW // (most likely different to compensate for the higher HRes) - m_screen->set_raw(XTAL(24'000'000) / 2, 781, 0, 512, 261, 0, 240); + m_screen->set_raw(24_MHz_XTAL / 2, 781, 0, 512, 261, 0, 240); // double horizontal resolution m_screen->set_screen_update(FUNC(astrocorp_state::screen_update)); m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_astrocorp); PALETTE(config, m_palette).set_format(palette_device::BGR_565, 0x100); - /* sound hardware */ + // sound hardware SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(24'000'000)/24, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); + OKIM6295(config, m_oki, 24_MHz_XTAL / 24, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); } - void astrocorp_state::speeddrp(machine_config &config) { skilldrp(config); @@ -789,13 +1162,11 @@ void astrocorp_state::speeddrp(machine_config &config) void magibomb_state::magibomb(machine_config &config) { skilldrp(config); -// m_maincpu->set_clock(XTAL(80'000'000) / 5); + m_maincpu->set_clock(80_MHz_XTAL / 5); // ASTRO V03 (16 MHz ?) m_maincpu->set_addrmap(AS_PROGRAM, &magibomb_state::magibomb_map); - config.device_remove("scantimer"); + config.device_remove("scantimer"); // irqs soft-reset the game - m_screen->set_raw(XTAL(26'601'712) / 4, 433, 0, 320, 261, 0, 240); - - // TODO: 80 MHz XTAL for VGA-like pixel clock? + m_screen->set_raw(80_MHz_XTAL / 3 / 4, 433, 0, 320, 261, 0, 240); // standard horizontal res } void magibomb_state::magibombb(machine_config &config) @@ -810,23 +1181,21 @@ void magibomb_state::magibombf(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &magibomb_state::magibombf_map); } -TIMER_DEVICE_CALLBACK_MEMBER(astoneage_state::astoneage_scanline_cb) +TIMER_DEVICE_CALLBACK_MEMBER(zoo_state::irq_1_2_scanline_cb) { int scanline = param; - if(scanline == 240) // vblank-out irq. controls sprites, sound, i/o - m_maincpu->set_input_line(2, HOLD_LINE); + // NOTE: in astoneag title screen, if the IRQ levels are swapped, a timing issue causes the SP to overwrite the palette data + // before it's written to the RAMDAC, causing corrupt colors - if(scanline == 0) // vblank-in? controls palette - m_maincpu->set_input_line(1, HOLD_LINE); -} + if (scanline == m_screen->visible_area().max_y + 1) // vblank-in? + m_maincpu->set_input_line(1, HOLD_LINE); // palette -void astoneage_state::ramdac_map(address_map &map) -{ - map(0x000, 0x2ff).rw(m_ramdac, FUNC(ramdac_device::ramdac_pal_r), FUNC(ramdac_device::ramdac_rgb666_w)); + if (scanline == 0) // vblank-out? + m_maincpu->set_input_line(2, HOLD_LINE); // sprites, sound, i/o } -void astoneage_state::machine_start() +void zoo_state::machine_start() { astrocorp_state::machine_start(); // doesn't seem to have a suitable handler for this, so keep it always enabled @@ -836,36 +1205,66 @@ void astoneage_state::machine_start() m_screen_enable = 1; } -void astoneage_state::astoneage(machine_config &config) +void zoo_state::zoo(machine_config &config) { skilldrp(config); - m_maincpu->set_addrmap(AS_PROGRAM, &astoneage_state::astoneage_map); - TIMER(config.replace(), "scantimer").configure_scanline(FUNC(astoneage_state::astoneage_scanline_cb), "screen", 0, 1); + m_maincpu->set_addrmap(AS_PROGRAM, &zoo_state::zoo_map); + TIMER(config.replace(), "scantimer").configure_scanline(FUNC(zoo_state::irq_1_2_scanline_cb), "screen", 0, 1); - PALETTE(config.replace(), m_palette).set_entries(256); - RAMDAC(config, m_ramdac, 0, m_palette); - m_ramdac->set_addrmap(0, &astoneage_state::ramdac_map); + m_screen->set_raw(26.824_MHz_XTAL / 4, 437, 0, 320, 261, 0, 240); // ??? ~15.345kHz Hsync, ??? ~58.795Hz Vsync - // TODO: Has 120MHz XTAL + VGA connector ... - // TODO: gfxdecode ROMs are interleaved and bumped compared to other games in the HW, at least 16x32 + ASTRO_CPUCODE(config, m_cpucode, 0); } -void astoneage_state::magibombd(machine_config &config) +void zoo_state::magibombd(machine_config &config) { - astoneage(config); + zoo(config); + m_maincpu->set_addrmap(AS_PROGRAM, &zoo_state::magibombd_map); +} - m_maincpu->set_addrmap(AS_PROGRAM, &astoneage_state::magibombd_map); +void zoo_state::winbingo(machine_config &config) +{ + zoo(config); + m_maincpu->set_addrmap(AS_PROGRAM, &zoo_state::winbingo_map); + m_screen->set_raw(24_MHz_XTAL / 2, 781, 0, 512, 261, 0, 240); // double horizontal resolution +} - PALETTE(config.replace(), m_palette).set_format(palette_device::BGR_565, 0x100); - config.device_remove("ramdac"); +void zoo_state::hacher(machine_config &config) +{ + winbingo(config); + m_maincpu->set_addrmap(AS_PROGRAM, &zoo_state::hacher_map); } -void astoneage_state::dinodino(machine_config &config) +void zoo_state::dinodino(machine_config &config) { - magibombd(config); + winbingo(config); + m_maincpu->set_addrmap(AS_PROGRAM, &zoo_state::dinodino_map); + + TIMER(config.replace(), "scantimer").configure_scanline(FUNC(zoo_state::irq_2_4_scanline_cb), "screen", 0, 1); +} - m_maincpu->set_addrmap(AS_PROGRAM, &astoneage_state::dinodino_map); - TIMER(config.replace(), "scantimer").configure_scanline(FUNC(astoneage_state::skilldrp_scanline_cb), "screen", 0, 1); +void astoneag_state::ramdac_map(address_map &map) +{ + map(0x000, 0x2ff).rw(m_ramdac, FUNC(ramdac_device::ramdac_pal_r), FUNC(ramdac_device::ramdac_rgb666_w)); +} + +void astoneag_state::astoneag(machine_config &config) +{ + winbingo(config); + m_maincpu->set_addrmap(AS_PROGRAM, &astoneag_state::astoneag_map); + + // 120MHz XTAL + VGA connector + // TODO: verify H/VSync & pixel clock for this type of HW + // (most likely different to compensate for the higher HRes and higher VRes) + m_screen->set_raw(120_MHz_XTAL / 10 * 2, 781, 0, 512, 261*2, 0, 240*2); // double horizontal & vertical resolution (~30.730kHz Hsync ?? , ~58.869Hz Vsync ??) + + // Adds RAMDAC + PALETTE(config.replace(), m_palette).set_entries(256); + RAMDAC(config, m_ramdac, 0, m_palette); + m_ramdac->set_addrmap(0, &astoneag_state::ramdac_map); + + // Tiles are double size vertically + GFXDECODE(config.replace(), m_gfxdecode, m_palette, gfx_astoneag); } /*************************************************************************** @@ -874,7 +1273,7 @@ void astoneage_state::dinodino(machine_config &config) /*************************************************************************** -Show Hand +Show Hand (Italy) (C) 2000? Astro Corp. PCB CHE-B50-4002A 88 94V-0 0002 @@ -885,19 +1284,19 @@ CPU 1x MC68HC000FN12 (main) 1x AD-65 (equivalent to OKI6295)(sound) 1x ASTRO 0001B (custom) 1x oscillator 20.000MHz - 1x oscillator 25.601712MHz (Note Dec/3/2012: should this be 26.601712Mhz, 6x PAL subcarrier?) + 1x oscillator 26.601712MHz (6x PAL subcarrier) ROMs 2x 27C512 (1,2) 2x M27C801 (3,4) 1x M27C4001 (5) - 1x 93C46 (not dumped) + 1x Atmel 93C46 (not dumped) Note 1x 28x2 JAMMA edge connector 1x 18x2 edge connector 1x 10x2 edge connector 1x pushbutton 1x trimmer (volume) - 1x 2x2 switches dip + 1x 2x2 dip switches (JAMMA 10/18/28) Hardware info by f205v @@ -914,11 +1313,14 @@ ROM_START( showhand ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "5", 0x00000, 0x80000, CRC(e6987122) SHA1(fb3e7c2399057c64b5c496a393f6f22a1e54c844) ) + + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u9", 0x00, 0x80, CRC(1583a53e) SHA1(e4ba380e8cce64fba94dd3f9506ae43f37d11440) ) // factory default ROM_END /*************************************************************************** -Show Hand +Show Hand (China) - Wángpái Duìjué (王牌对决) Astro Corp, 199? PCB Layout @@ -960,6 +1362,9 @@ ROM_START( showhanc ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "5.u43", 0x00000, 0x80000, CRC(d6b70f02) SHA1(5a94680594c1f06196fe3bcf7faf56e2ed576f01) ) + + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u9", 0x00, 0x80, CRC(f0c30fdc) SHA1(48f6f964e096e8b9f675f84400a5c99b92964c3d) ) // factory default ROM_END /*************************************************************************** @@ -970,14 +1375,14 @@ Skill Drop Georgia No specific PCB model or number.... - Astro V02 0022 160pin PQFP ("ASTRO02" silkscreened under chip) - JX-1689F1028N GRC586.V5 (68K core, has direct connection to program roms) - Lattice IspLSI 1016 60LJ socketed FPGA - OKI 6295 clone chip (AD-65 or U6295) +Astro V02 0022 160pin PQFP ("ASTRO02" silkscreened under chip) +JX-1689F1028N GRC586.V5 (68K core, has direct connection to program roms) +Lattice IspLSI 1016 60LJ socketed FPGA +OKI 6295 clone chip (AD-65 or U6295) -EEPROM Atmel 93C46 +EEPROM Atmel 93C46 Battery 3.6V -OSC 24.000MHz +OSC 24.000MHz PC1 is a push button for test mode VR1 is for sound volume @@ -1027,10 +1432,10 @@ ROM_START( skilldrp ) ROM_LOAD( "mx29f1610amc.u26", 0x000000, 0x200000, CRC(4fdac800) SHA1(bcafceb6c34866c474714347e23f9e819b5fcfa6) ) ROM_REGION( 0x80000, "oki", 0 ) - ROM_LOAD( "5-skill_drop", 0x00000, 0x80000, CRC(a479e06d) SHA1(ee690d39188b8a43652c4aa5bf8267c1f6632d2f) ) // No chip location just "ROM#5" silkscreened under socket + ROM_LOAD( "5-skill_drop.rom5", 0x00000, 0x80000, CRC(a479e06d) SHA1(ee690d39188b8a43652c4aa5bf8267c1f6632d2f) ) // No chip location just "ROM#5" silkscreened under socket - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD( "skilldrp.u6", 0x00, 0x80, CRC(57886a3d) SHA1(bad8fa2ec2262ccb5ef8ec50959aec3f3bf8b90b) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(01c4bc62) SHA1(49710d2dac73791b4019b1dc15e0b5159c6fbaef) ) // factory default ROM_END /*************************************************************************** @@ -1041,10 +1446,10 @@ Speed Drop No specific PCB model or number, same as used for Skill Drop but with newer video chip - Astro V05 0206 160pin PQFP ("ASTRO02" silkscreened under chip) - JX-1689HP TA5265188 (68K core, has direct connection to program roms) - Lattice IspLSI 1016 60LJ socketed FPGA - OKI 6295 clone chip (AD-65 or U6295) +Astro V05 0206 160pin PQFP ("ASTRO02" silkscreened under chip) +JX-1689HP TA5265188 (68K core, has direct connection to program roms) +Lattice IspLSI 1016 60LJ socketed FPGA +OKI 6295 clone chip (AD-65 or U6295) EEPROM Atmel 93C46 Battery 3.6V @@ -1103,17 +1508,17 @@ ROM_START( speeddrp ) ROM_LOAD( "mx29f1610amc.u26", 0x000000, 0x200000, CRC(baa0f728) SHA1(12f0e7689eb6555f86ac9a7272e8e119faa968e0) ) ROM_REGION( 0x80000, "oki", 0 ) - ROM_LOAD( "5_speed_drop", 0x00000, 0x80000, CRC(684bb8b5) SHA1(65276ce03da7be7275646f5a0d9d163eecb78190) ) // No chip location just "ROM#5" silkscreened under socket + ROM_LOAD( "5_speed_drop.rom5", 0x00000, 0x80000, CRC(684bb8b5) SHA1(65276ce03da7be7275646f5a0d9d163eecb78190) ) // No chip location just "ROM#5" silkscreened under socket - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, CRC(6890534e) SHA1(a62893015e53c02551d57d0e1cce436b6df8d289) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(6890534e) SHA1(a62893015e53c02551d57d0e1cce436b6df8d289) ) // factory default ROM_END /*************************************************************************** - Magic Bomb -***************************************************************************/ -// eeprom marked as bad dump, settings needs to be verified and factory defaulted +Magic Bomb + +***************************************************************************/ ROM_START( magibomb ) ROM_REGION( 0x20000, "maincpu", 0 ) @@ -1121,28 +1526,28 @@ ROM_START( magibomb ) ROM_LOAD16_BYTE( "rom2", 0x00001, 0x10000, CRC(ca0b693d) SHA1(27fc7db9d3f19d6dcb8756e4fc9c3839116977fe) ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1 set, should be the same for most sets, marking as bad as precaution ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(28644b9e) SHA1(3d63892bf5207145039ae7994552e2ab67cd8293) ) // factory default ROM_END ROM_START( magibomba ) ROM_REGION( 0x20000, "maincpu", 0 ) - ROM_LOAD16_BYTE( "rom1", 0x00000, 0x10000, BAD_DUMP CRC(f01ab462) SHA1(5c9052f66da166f926910562a6a8aea5397549db) ) // BADADDR xxxxxx-xxxxxxxxx + ROM_LOAD16_BYTE( "rom1", 0x00000, 0x10000, BAD_DUMP CRC(f01ab462) SHA1(5c9052f66da166f926910562a6a8aea5397549db) ) // BADADDR xxxxxx-xxxxxxxxx ROM_LOAD16_BYTE( "rom2", 0x00001, 0x10000, CRC(ac3224ef) SHA1(810117dc89369eee0f4f5b6744cfbf0cb70ccce6) ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1 set, should be the same for most sets, marking as bad as precaution ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(f7d14414) SHA1(af932df09aa970ec05cc12e590e152e7288c1f5c) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(28644b9e) SHA1(3d63892bf5207145039ae7994552e2ab67cd8293) ) // factory default from parent (this set doesn't work) ROM_END ROM_START( magibombb ) @@ -1151,13 +1556,13 @@ ROM_START( magibombb ) ROM_LOAD16_BYTE( "rom2", 0x00001, 0x10000, CRC(55ea8303) SHA1(974bc026f0b284ffad50d3e441613952db768e04) ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1 set, should be the same for most sets, marking as bad as precaution ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) // factory default ROM_END ROM_START( magibombc ) @@ -1166,28 +1571,32 @@ ROM_START( magibombc ) ROM_LOAD16_BYTE( "rom2", 0x00001, 0x10000, CRC(3d2abaa5) SHA1(8a39abda8e52a0d8a8d0c54a45b72a7d9f624e84) ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1 set, should be the same for most sets, marking as bad as precaution ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(e7d335e8) SHA1(cda263e6012985f17765a449b0614615c35efcfe) ) // factory default ROM_END ROM_START( magibombd ) ROM_REGION( 0x40000, "maincpu", 0 ) ROM_LOAD16_BYTE( "rom1", 0x00000, 0x10000, CRC(91883755) SHA1(bc6dd5cac352f169beac790825e86a2ecb45af05) ) ROM_LOAD16_BYTE( "rom2", 0x00001, 0x10000, CRC(b55bc270) SHA1(7486018b87708cf5b653c27b1ed824e441c169b7) ) + ROM_FILL( 0x20000, 0x20000, 0xff ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "gfx", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // different from the Ver. A3.1 set! ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, BAD_DUMP CRC(53bb180a) SHA1(8a2b7ae3abf31a1972864cf96e1ac74ed69fb1ee) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(7278d581) SHA1(c0851466b669e42c657ca5517c00c44d76e559f4) ) // factory default + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "magibombd_cpucode.key", 0x00, 0x02, CRC(ee980d67) SHA1(f3bdb8a14701ec01828f7c92f18e9bba4c56a4e0) ) ROM_END ROM_START( magibombe ) @@ -1201,24 +1610,23 @@ ROM_START( magibombe ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - // TODO: doesn't seem to initialize properly, set works with above eeprom - ROM_LOAD16_WORD_SWAP( "93c46p.u6", 0x00, 0x80, CRC(037f5f07) SHA1(d82145ebb94681841ec0c41724ef93857f50d8f0) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(2e38cfad) SHA1(0f2490ca2ba738723b4c014a4fec4f631167f786) ) // factory default ROM_END ROM_START( magibombf ) - ROM_REGION( 0x40000, "maincpu", 0 ) + ROM_REGION( 0x20000, "maincpu", 0 ) ROM_LOAD16_BYTE( "rom1.u21", 0x00000, 0x10000, CRC(bc9a9c68) SHA1(cee6d20322ba500f82321fa56ca71c8ec152b953) ) ROM_LOAD16_BYTE( "rom2.u20", 0x00001, 0x10000, CRC(b52bfa4d) SHA1(e413536867148967f4ddbf1cf81c4cf45da41d1e) ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "29f1610mc.u26", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1A set, should be same for all, marking as bad as precaution + ROM_LOAD( "29f1610mc.u26", 0x000000, 0x200000, BAD_DUMP CRC(042f7992) SHA1(2e175994d0b14200a92bdb46e82847b1a1c88265) ) // dumped for the Ver. A3.1 set, should be the same for most sets, marking as bad as precaution ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "rom5.u33", 0x00000, 0x80000, CRC(c9edbf1b) SHA1(8e3a96a38aea23950d6add66a5a3d079013bc217) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u6", 0x00, 0x80, CRC(532b7aae) SHA1(cb93a3061a05a9741d01fcdc19b7319ad4792e49) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u6", 0x00, 0x80, CRC(a01e5ce7) SHA1(77213c0b426ca1806bb8a4c55e9e7f4f2db66962) ) // factory default ROM_END /*************************************************************************** @@ -1250,15 +1658,18 @@ ROM_START( westvent ) ROM_LOAD16_BYTE( "2_w.v.aa.02.d.bin", 0x00001, 0x20000, BAD_DUMP CRC(f56d3ead) SHA1(2cf8960eab221cfce1c7ac6a20d002c4b05d8cc6) ) // FIXED BITS (xxxxxx0xxxxxxxxx) ROM_REGION( 0x600000, "sprites", 0 ) - ROM_LOAD( "top.bin", 0x000000, 0x200000, CRC(75bbaae0) SHA1(ef35775dd481ff343df1ee071ccd52b024d084b7) ) - ROM_LOAD( "bottom.bin", 0x200000, 0x200000, CRC(e2dd58d5) SHA1(9ab881cfb2ee6cbc48aa28ba28529adb00803e44) ) - ROM_LOAD( "middle.bin", 0x400000, 0x200000, CRC(7348fd37) SHA1(b5ec0994afb5bceae5627c37f1b35c7abcfd2f0a) ) + ROM_LOAD( "mx29f1610mc_bottom.bin", 0x000000, 0x200000, CRC(e2dd58d5) SHA1(9ab881cfb2ee6cbc48aa28ba28529adb00803e44) ) // no U location on the PCB + ROM_LOAD( "mx29f1610mc_middle.u51", 0x200000, 0x200000, CRC(7348fd37) SHA1(b5ec0994afb5bceae5627c37f1b35c7abcfd2f0a) ) + ROM_LOAD( "mx29f1610mc_top.u30", 0x400000, 0x200000, CRC(75bbaae0) SHA1(ef35775dd481ff343df1ee071ccd52b024d084b7) ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "5.bin", 0x00000, 0x80000, CRC(92dc09d1) SHA1(6b448b3372e78047d054c5e42fcfcff7f75ff9b9) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) ROM_LOAD( "at93c46.bin", 0x00, 0x80, CRC(fd961d46) SHA1(e238da65e8769575f17b4464fb00f5c4813bafab) ) + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "westvent_cpucode.key", 0x00, 0x02, NO_DUMP ) ROM_END /*************************************************************************** @@ -1329,14 +1740,24 @@ ROM_START( winbingo ) ROM_LOAD16_BYTE( "f29c51001t.u31", 0x00000, 0x20000, CRC(964cfdb5) SHA1(01109466e07f5e906be300bc69310171d34f2e6c) ) ROM_LOAD16_BYTE( "f29c51001t.u25", 0x00001, 0x20000, CRC(4ebeec72) SHA1(c603265e6319cff94a0c75017a12c6d86787f906) ) - ROM_REGION( 0x400000, "sprites", ROMREGION_ERASE ) + ROM_REGION( 0x1000000, "sprites", 0 ) ROM_LOAD( "mx29f1610mc.u26", 0x000000, 0x200000, CRC(ad1f61e7) SHA1(845aa01d49c50bcadaed16d76c0dd9131a425b46) ) - ROM_LOAD( "mx29f1610mc.u30", 0x200000, 0x200000, CRC(31613d99) SHA1(1c720f8d981c3e9cb9d9b3b27eb95e7f72ccfc93) ) -// ROM_LOAD( "mx29f1610mc.u30.bad.dump", 0x200000, 0x0a0000, BAD_DUMP CRC(6da439c5) SHA1(6afc0c800fe57b9b34ca317f4d1c040b11d3d988) ) -// U30 is a bad dump in this set, so use U30 from winbingoa (since U26 is the same too) + ROM_LOAD( "mx29f1610mc.u30", 0x200000, 0x200000, CRC(31613d99) SHA1(1c720f8d981c3e9cb9d9b3b27eb95e7f72ccfc93) ) // girl animation at 1ff0 in u26 continues into u30, it needs this rom here + ROM_RELOAD( 0x400000, 0x200000 ) + ROM_RELOAD( 0x600000, 0x200000 ) + ROM_RELOAD( 0x800000, 0x200000 ) // u30 tiles addressed as 8xxx also + ROM_RELOAD( 0xa00000, 0x200000 ) + ROM_RELOAD( 0xc00000, 0x200000 ) + ROM_RELOAD( 0xe00000, 0x200000 ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "mx27c4000pc.u35", 0x00000, 0x80000, CRC(445d81c0) SHA1(cacb9c262740c31ea42f406e9f960a1edd1b3ead) ) + + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u13", 0x00, 0x80, CRC(a8c974b1) SHA1(4a42aeded6296881bc343179863e515230ed5fc5) ) // factory default + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "winbingo_cpucode.key", 0x00, 0x02, CRC(66035e7e) SHA1(d8696eeeb66e4050635141ed987c9347db408cfb) ) ROM_END ROM_START( winbingoa ) @@ -1344,17 +1765,29 @@ ROM_START( winbingoa ) ROM_LOAD16_BYTE( "f29c51001t.u31", 0x00000, 0x20000, CRC(c33676c3) SHA1(9f5b7d05d187cf59948a572f80c55cb8fa1f656f) ) // sldh ROM_LOAD16_BYTE( "f29c51001t.u25", 0x00001, 0x20000, CRC(43c7b2d8) SHA1(16ee79c34b7c485dfccecdf3e0ae9f18f8a20150) ) // sldh - ROM_REGION( 0x400000, "sprites", 0 ) - ROM_LOAD( "mx29f1610mc.u26", 0x000000, 0x200000, CRC(ad1f61e7) SHA1(845aa01d49c50bcadaed16d76c0dd9131a425b46) ) - ROM_LOAD( "mx29f1610mc.u30", 0x200000, 0x200000, CRC(31613d99) SHA1(1c720f8d981c3e9cb9d9b3b27eb95e7f72ccfc93) ) + ROM_REGION( 0x1000000, "sprites", 0 ) + ROM_LOAD( "mx29f1610mc.u26", 0x000000, 0x200000, BAD_DUMP CRC(ad1f61e7) SHA1(845aa01d49c50bcadaed16d76c0dd9131a425b46) ) + ROM_LOAD( "mx29f1610mc.u30", 0x200000, 0x200000, BAD_DUMP CRC(31613d99) SHA1(1c720f8d981c3e9cb9d9b3b27eb95e7f72ccfc93) ) // girl animation at 1ff0 in u26 continues into u30, it needs this rom here + ROM_RELOAD( 0x400000, 0x200000 ) + ROM_RELOAD( 0x600000, 0x200000 ) + ROM_RELOAD( 0x800000, 0x200000 ) // u30 tiles addressed as 8xxx also + ROM_RELOAD( 0xa00000, 0x200000 ) + ROM_RELOAD( 0xc00000, 0x200000 ) + ROM_RELOAD( 0xe00000, 0x200000 ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "mx27c4000pc.u35", 0x00000, 0x80000, CRC(e48ed57d) SHA1(11995b90e70e010b292ba9db2da0af4ebf795c1a) ) // sldh + + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u13", 0x00, 0x80, CRC(a8c974b1) SHA1(4a42aeded6296881bc343179863e515230ed5fc5) ) // factory default + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "winbingoa_cpucode.key", 0x00, 0x02, CRC(6bd252c3) SHA1(8d1ad9546795e81573df1c79f7be28cf41fd04e0) ) ROM_END /*************************************************************************** -Hacher (graphics hack of Win Win Bingo Ver. EN.01.6?) +Hacher (graphics hack of Win Win Bingo Ver. EN.01.6) ASTRO M1.2 PCB with Astro F02 2005-02-18 @@ -1365,17 +1798,25 @@ ROM_START( hacher ) ROM_LOAD16_BYTE( "w-w-en-01-6.rom1", 0x00000, 0x20000, CRC(994acd32) SHA1(ee137ca96f4e2d22f2bae32051bbf2bd487e8c5a) ) ROM_LOAD16_BYTE( "w-w-en-01-6.rom2", 0x00001, 0x20000, CRC(b45c3f64) SHA1(c8f26fc3f9e2c46d8083d249f79ff8a3d47b67d0) ) - ROM_REGION( 0x400000, "sprites", 0 ) + ROM_REGION( 0x1000000, "sprites", 0 ) ROM_LOAD( "wb3.bin", 0x000000, 0x200000, CRC(d97e5056) SHA1(662fefc2dcac31023fa063fbf891b05a139e48d8) ) - ROM_LOAD( "wb4.bin", 0x200000, 0x200000, BAD_DUMP CRC(5cd7dcd9) SHA1(69e5fd0c8c5c14938c02f4f50e5b16fc0fbff7e4) ) // FIXED BITS (xxxxxxxxxxxxx1xx) + ROM_LOAD( "wb4.bin", 0x800000, 0x200000, BAD_DUMP CRC(5cd7dcd9) SHA1(69e5fd0c8c5c14938c02f4f50e5b16fc0fbff7e4) ) // FIXED BITS (xxxxxxxxxxxxx1xx) + ROM_RELOAD( 0x400000, 0x200000 ) + ROM_RELOAD( 0x600000, 0x200000 ) + ROM_RELOAD( 0x800000, 0x200000 ) // wb4 tiles addressed as 8xxx also + ROM_RELOAD( 0xa00000, 0x200000 ) + ROM_RELOAD( 0xc00000, 0x200000 ) + ROM_RELOAD( 0xe00000, 0x200000 ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "win-win-bingo.ic5", 0x00000, 0x80000, CRC(445d81c0) SHA1(cacb9c262740c31ea42f406e9f960a1edd1b3ead) ) // = mx27c4000pc.u35 winbingo - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD( "93c46.u13", 0x00, 0x80, CRC(e097ae26) SHA1(90a670b5f1931e892d0a134aa8bf7d36d6222dcb) ) -ROM_END + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u13", 0x00, 0x80, CRC(6c776ff8) SHA1(5f48b0ac657df41a747718ef0f3b14715c40cb4a) ) // factory default + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "hacher_cpucode.key", 0x00, 0x02, CRC(6fdfa275) SHA1(d22c5fcaf182ccb78ec486a9f1d47ad0d1c63466) ) +ROM_END /*************************************************************************** @@ -1400,7 +1841,7 @@ PC1 is a push button for test mode VR1 is for sound volume -ZOO Z0.02.D at both U25 & U26 are Winbond W27C512 roms and are program code +ZOO ZO.02.D at both U25 & U26 are Winbond W27C512 roms and are program code 5 ZOO is a MX 27C4000 rom and is the sample rom 29F1610mc at U26 (yes "U26" is present twice on the PCB) are the graphics @@ -1442,19 +1883,23 @@ J1 is an 2 pin connector, unknown purpose ***************************************************************************/ -ROM_START( zulu ) +ROM_START( zoo ) ROM_REGION( 0x40000, "maincpu", 0 ) ROM_LOAD16_BYTE( "zoo_zo.02.d.u26", 0x00000, 0x10000, CRC(1a3be45a) SHA1(877be4c9e8d5e7c4644e7bcb9a6729443ed772a4) ) ROM_LOAD16_BYTE( "zoo_zo.02.d.u25", 0x00001, 0x10000, CRC(8566aa21) SHA1(319192e2074f3bdda6001d8e9a4b97e98826d7ce) ) + ROM_FILL( 0x20000, 0x20000, 0xff ) ROM_REGION( 0x200000, "sprites", 0 ) - ROM_LOAD( "29f1610mc.u26", 0x000000, 0x200000, CRC(f5cfd915) SHA1(ec869b47d0762102509dcfc1349d94340037fad5) ) + ROM_LOAD( "29f1610mc.u26", 0x000000, 0x200000, CRC(f5cfd915) SHA1(ec869b47d0762102509dcfc1349d94340037fad5) ) // the "U26" marking is present twice (should have been U31?) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "5_zoo", 0x00000, 0x80000, CRC(b0c9f7aa) SHA1(99345ba0f8da3907f26c9bd29d70135f3ab7cd60) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD( "zoo_93c46", 0x00, 0x80, CRC(0053fcc4) SHA1(e67a495f9586dd3946f79d50506fba1ae913f6ec) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u13", 0x00, 0x80, CRC(2af3fab5) SHA1(7097e735eb1beda8aff12f783d4039b4b9aab651) ) // factory default + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "zoo_cpucode.key", 0x00, 0x02, CRC(cd3fdba4) SHA1(33d33bf711f96e18a2fc515689853f92cd71713d) ) ROM_END /*************************************************************************** @@ -1512,17 +1957,20 @@ ROM_START( astoneag ) ROM_LOAD16_BYTE( "1-s-a-eng-03-a.rom1", 0x00000, 0x20000, CRC(5e600713) SHA1(48ac0a52f90b972b77064e9e59711082aa95c654) ) ROM_LOAD16_BYTE( "2-s-a-eng-03-a.rom2", 0x00001, 0x20000, CRC(488e355e) SHA1(6550292cae7eda95a24e1982e869540464b1fcdd) ) - ROM_REGION( 0x800000, "sprites", 0 ) - ROM_LOAD( "29f1610.rom3", 0x200000, 0x200000, CRC(8d4e66f0) SHA1(744f83b35684aa6653b0d93b303f2914cd0250ba) ) - ROM_LOAD( "29f1610.rom4", 0x000000, 0x200000, CRC(1affd8db) SHA1(2523f156933c61d36b6646944b5da874f8424864) ) - ROM_LOAD( "29f1610.rom5", 0x600000, 0x200000, CRC(2b77d827) SHA1(b082254e1c8a7945e2a406b1b937a763b30cb496) ) - ROM_LOAD( "29f1610.rom6", 0x400000, 0x200000, CRC(eb8ee0e7) SHA1(c6c973460ca96b54151f7523f6afc0184b8fbd40) ) + ROM_REGION( 0x2000000, "sprites", 0 ) // 16 x 32 tiles !! + ROM_LOAD16_BYTE( "29f1610.rom4", 0x0000000, 0x200000, CRC(1affd8db) SHA1(2523f156933c61d36b6646944b5da874f8424864) ) + ROM_LOAD16_BYTE( "29f1610.rom5", 0x0000001, 0x200000, CRC(2b77d827) SHA1(b082254e1c8a7945e2a406b1b937a763b30cb496) ) + ROM_LOAD16_BYTE( "29f1610.rom3", 0x1000000, 0x200000, CRC(8d4e66f0) SHA1(744f83b35684aa6653b0d93b303f2914cd0250ba) ) + ROM_LOAD16_BYTE( "29f1610.rom6", 0x1000001, 0x200000, CRC(eb8ee0e7) SHA1(c6c973460ca96b54151f7523f6afc0184b8fbd40) ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "5-s-a-eng-03-a.rom7", 0x00000, 0x80000, CRC(1b13b0c2) SHA1(d6d8c8070ba146b444958fa0b896cebc12b32f5c) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD( "93c46.ic99", 0x0000, 0x0080, CRC(2fd85a9b) SHA1(3240e40debf5af15f08072b76d6910808d3d282f) ) + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u99", 0x00, 0x80, CRC(be7cb115) SHA1(0f2eb141e84785b565b387cd52a1594bc876fc8d) ) // factory default + + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "astoneag_cpucode.key", 0x00, 0x02, CRC(fd3642ce) SHA1(8b4e630e114f36c9c15b1a6e6185156786ec9502) ) ROM_END /*************************************************************************** @@ -1561,61 +2009,94 @@ ROM_START( dinodino ) ROM_LOAD16_BYTE( "dd_rom1.u20", 0x00000, 0x20000, CRC(056613dd) SHA1(e8481177b1dacda222fe4fae2b50841ddb0c87ba) ) ROM_LOAD16_BYTE( "dd_rom2.u19", 0x00001, 0x20000, CRC(575519c5) SHA1(249fe33b6ea0bc154125a988315f571a30b9375c) ) - ROM_REGION( 0x400000, "sprites", 0 ) + ROM_REGION( 0x1000000, "sprites", 0 ) ROM_LOAD( "dd_rom3.u26", 0x000000, 0x200000, CRC(47c95b43) SHA1(43e9a13c38f2f7d13dd4dcb105c65e43b18ccdbf) ) - ROM_LOAD( "dd_rom4.u24", 0x200000, 0x200000, CRC(2cf4be21) SHA1(831d7d125c4161b42b017a69fc05e30a51172620) ) + ROM_LOAD( "dd_rom4.u24", 0x200000, 0x200000, CRC(2cf4be21) SHA1(831d7d125c4161b42b017a69fc05e30a51172620) ) // rotating cherries uses 1fff as tile code for 1 frame, they need this rom here + ROM_RELOAD( 0x400000, 0x200000 ) + ROM_RELOAD( 0x600000, 0x200000 ) + ROM_RELOAD( 0x800000, 0x200000 ) // rom4 tiles addressed as 8xxx also + ROM_RELOAD( 0xa00000, 0x200000 ) + ROM_RELOAD( 0xc00000, 0x200000 ) + ROM_RELOAD( 0xe00000, 0x200000 ) ROM_REGION( 0x80000, "oki", 0 ) ROM_LOAD( "dd_rom5.u33", 0x00000, 0x80000, CRC(482e456a) SHA1(c7111522383c4e1fd98b0f759153be98dcbe06c1) ) - ROM_REGION16_BE( 0x80, "eeprom", 0 ) - ROM_LOAD16_WORD_SWAP( "93c46.u10", 0x0000, 0x0080, CRC(6769bfb8) SHA1(bf6b905805c2c61a89fbc4c046b23069431e4709) ) -ROM_END + ROM_REGION16_LE( 0x80, "eeprom", 0 ) + ROM_LOAD( "93c46.u10", 0x0000, 0x0080, CRC(29fe0e1d) SHA1(9694d7a7ad401d0fec879c183a28b3aa1ff02407) ) // factory default + ROM_REGION16_LE( 0x02, "astro_cpucode", 0 ) + ROM_LOAD( "dinodino_cpucode.key", 0x00, 0x02, CRC(674b2687) SHA1(9c1338a41162fa2ffbd2ea0a579ad87a6c084a0e) ) +ROM_END void astrocorp_state::init_showhand() { #if 0 - u16 *rom = (u16*)memregion("maincpu")->base(); + u16 * const rom = (u16*)memregion("maincpu")->base(); - rom[0x0a1a/2] = 0x6000; // hopper jam +// rom[0x0a1a/2] = 0x6000; // prevent hopper jam +// rom[0x6e7a/2] = 0x8000; // fix hopper jam when payout sensor type set to "normal low" (buggy code). Requires matching polarity of the hopper. - rom[0x1494/2] = 0x4e71; // enable full test mode - rom[0x1496/2] = 0x4e71; // "" - rom[0x1498/2] = 0x4e71; // "" + rom[0x1498/2] = 0x149a; // enable full test mode (has garbled graphics in i/o test, monitor screen unreachable?) rom[0x12f6/2] = 0x6000; // rom error rom[0x4916/2] = 0x6000; // rom error #endif + + m_can_flip_sprites = false; } void astrocorp_state::init_showhanc() { #if 0 - u16 *rom = (u16*)memregion("maincpu")->base(); + u16 * const rom = (u16*)memregion("maincpu")->base(); - rom[0x14d4/2] = 0x4e71; // enable full test mode - rom[0x14d6/2] = 0x4e71; // "" - rom[0x14d8/2] = 0x4e71; // "" + rom[0x14d8/2] = 0x14da; // enable full test mode (has garbled graphics in i/o test, monitor and image screens unreachable?) rom[0x139c/2] = 0x6000; // rom error #endif + + m_can_flip_sprites = false; +} + +// Simpler encryption (fixed bitswap, no xor) + +void magibomb_state::init_magibomb() +{ + const u32 size = memregion("maincpu")->bytes(); + u8 * const rom = memregion("maincpu")->base(); + + std::unique_ptr tmp = std::make_unique(size); + + // decrypt data + std::copy_n(rom, size, &tmp[0]); + for (u32 i = 1; i < size; i += 2) + tmp[i] = bitswap<8>(rom[i], 6, 7, 5, 0, 4, 1, 3, 2); + + // descramble addresses + for (u32 i = 0; i < size; i++) + { + u32 dest = (i & ~0xffff) | bitswap<16>(i, 14,15,13,8,12,9,11,10, 7,6,5,4,3,2,1,0); + rom[dest] = tmp[i]; + } } -void astoneage_state::decrypt_rom(const decryption_info &table) +// Heavier encryption + +void zoo_state::decrypt_rom(const decryption_info &table) { - u32 size = memregion("maincpu")->bytes(); - u16 *rom = (u16 *)memregion("maincpu")->base(); + const u32 size = memregion("maincpu")->bytes(); + u16 * const rom = (u16 *)memregion("maincpu")->base(); std::unique_ptr tmp = std::make_unique(size/2); // Pass 1: decrypt high and low byte independently. They go // through a bitswap and an xor, choosing between 8 possibilities // through address bits. - for(u32 i = 0; i != size; i += 2) { + for (u32 i = 0; i != size; i += 2) { u16 orig = rom[i >> 1]; u16 result = 0; - for(u32 rb = 0; rb < 2; rb ++) { + for (u32 rb = 0; rb < 2; rb ++) { u8 val = orig >> (rb ? 0 : 8); u32 index = (BIT(i, table.rom[rb].bits[0]) << 2) | @@ -1639,7 +2120,7 @@ void astoneage_state::decrypt_rom(const decryption_info &table) // Pass 2: copy back the decrypted data following the address // scrambling - for(u32 i = 0; i != size; i += 2) { + for (u32 i = 0; i != size; i += 2) { u32 dest = (i & 0xffffe003) | (BIT(i, table.bits[0]) << 12) | @@ -1657,10 +2138,10 @@ void astoneage_state::decrypt_rom(const decryption_info &table) } } -const astoneage_state::decryption_info astoneage_state::astoneag_table = { +const zoo_state::decryption_info zoo_state::magibombd_table = { { { - { 11, 10, 9 }, + { 8, 11, 9 }, { { { 7, 5, 4, 6, 0, 3, 2, 1 }, 0x00 }, { { 1, 4, 6, 0, 2, 5, 3, 7 }, 0xd0 }, @@ -1673,7 +2154,7 @@ const astoneage_state::decryption_info astoneage_state::astoneag_table = { } }, { - { 12, 10, 8 }, + { 12, 11, 10 }, { { { 6, 5, 4, 3, 2, 1, 0, 7 }, 0x90 }, { { 2, 4, 0, 7, 5, 6, 3, 1 }, 0x32 }, @@ -1684,24 +2165,28 @@ const astoneage_state::decryption_info astoneage_state::astoneag_table = { { { 3, 5, 2, 7, 6, 1, 4, 0 }, 0x0a }, { { 0, 6, 4, 2, 7, 3, 1, 5 }, 0x81 }, } - }, + } }, - { 12, 9, 11, 8, 10, 7, 6, 5, 4, 3, 2 } + { 12, 9, 8, 10, 11, 7, 6, 5, 4, 3, 2 } }; -void astoneage_state::init_astoneage() +void zoo_state::init_magibombd() { - decrypt_rom(astoneag_table); - + decrypt_rom(magibombd_table); +#if 1 // TODO: There's more stuff happening for addresses < 0x400... // override reset vector for now - u16 *rom = (u16 *)memregion("maincpu")->base(); - rom[0x004/2] = 0x0000; - rom[0x006/2] = 0x0440; - // notice that ROM is sum16 checked at PC=2870, must be equal to 0x0000 + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0446; + + rom[0x00400/2] = 0x4e75; // overlay!? + + rom[0x00f80/2] = 0x4e75; // Mirror ROM word checksum (it expects 0) +#endif } -const astoneage_state::decryption_info astoneage_state::magibombd_table = { +const zoo_state::decryption_info zoo_state::winbingo_table = { { { { 8, 11, 9 }, @@ -1728,26 +2213,57 @@ const astoneage_state::decryption_info astoneage_state::magibombd_table = { { { 3, 5, 2, 7, 6, 1, 4, 0 }, 0x0a }, { { 0, 6, 4, 2, 7, 3, 1, 5 }, 0x81 }, } - }, + } }, - { 12, 9, 8, 10, 11, 7, 6, 5, 4, 3, 2 } + { 12, 9, 8, 10, 11, 7, 5, 3, 6, 2, 4 } }; -void astoneage_state::init_magibombd() +void zoo_state::init_winbingo() { - decrypt_rom(magibombd_table); + decrypt_rom(winbingo_table); +#if 1 + // TODO: There's more stuff happening for addresses < 0x400... + // override reset vector for now + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0400; + + rom[0x0821c/2] = 0x4e71; // Mirror ROM word checksum (it expects 0) +#endif +} +void zoo_state::init_winbingoa() +{ + decrypt_rom(winbingo_table); +#if 1 // TODO: There's more stuff happening for addresses < 0x400... // override reset vector for now - u16 *rom = (u16 *)memregion("maincpu")->base(); - rom[0x004/2] = 0x0000; - rom[0x006/2] = 0x0446; + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0400; + + rom[0x081f2/2] = 0x4e71; // Mirror ROM word checksum (it expects 0) +#endif } -const astoneage_state::decryption_info astoneage_state::winbingo_table = { +void zoo_state::init_hacher() +{ + decrypt_rom(winbingo_table); +#if 1 + // TODO: There's more stuff happening for addresses < 0x400... + // override reset vector for now + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0400; + + rom[0x07d6e/2] = 0x4e71; // Mirror ROM word checksum (it expects 0) +#endif +} + +const zoo_state::decryption_info zoo_state::zoo_table = { { { - { 8, 11, 9 }, + { 8, 9, 10 }, { { { 7, 5, 4, 6, 0, 3, 2, 1 }, 0x00 }, { { 1, 4, 6, 0, 2, 5, 3, 7 }, 0xd0 }, @@ -1760,7 +2276,7 @@ const astoneage_state::decryption_info astoneage_state::winbingo_table = { } }, { - { 12, 11, 10 }, + { 12, 9, 11 }, { { { 6, 5, 4, 3, 2, 1, 0, 7 }, 0x90 }, { { 2, 4, 0, 7, 5, 6, 3, 1 }, 0x32 }, @@ -1771,26 +2287,32 @@ const astoneage_state::decryption_info astoneage_state::winbingo_table = { { { 3, 5, 2, 7, 6, 1, 4, 0 }, 0x0a }, { { 0, 6, 4, 2, 7, 3, 1, 5 }, 0x81 }, } - }, + } }, - { 12, 9, 8, 10, 11, 7, 5, 3, 6, 2, 4 } + { 12, 10, 8, 11, 9, 7, 5, 3, 6, 2, 4 } }; -void astoneage_state::init_winbingo() +void zoo_state::init_zoo() { - decrypt_rom(winbingo_table); - + decrypt_rom(zoo_table); +#if 1 // TODO: There's more stuff happening for addresses < 0x400... // override reset vector for now - u16 *rom = (u16 *)memregion("maincpu")->base(); - rom[0x004/2] = 0x0000; - rom[0x006/2] = 0x0400; + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0400; + + rom[0x00010/2] = 0x1e00; // ROM 0405 ERROR + rom[0x00012/2] = 0x10d0; // "" + + rom[0x091ac/2] = 0x4e71; // Mirror ROM word checksum (it expects 0) +#endif } -const astoneage_state::decryption_info astoneage_state::zulu_table = { +const zoo_state::decryption_info zoo_state::dinodino_table = { { { - { 8, 9, 10 }, + { 8, 11, 9 }, { { { 7, 5, 4, 6, 0, 3, 2, 1 }, 0x00 }, { { 1, 4, 6, 0, 2, 5, 3, 7 }, 0xd0 }, @@ -1803,7 +2325,7 @@ const astoneage_state::decryption_info astoneage_state::zulu_table = { } }, { - { 12, 9, 11 }, + { 12, 11, 10 }, { { { 6, 5, 4, 3, 2, 1, 0, 7 }, 0x90 }, { { 2, 4, 0, 7, 5, 6, 3, 1 }, 0x32 }, @@ -1814,26 +2336,31 @@ const astoneage_state::decryption_info astoneage_state::zulu_table = { { { 3, 5, 2, 7, 6, 1, 4, 0 }, 0x0a }, { { 0, 6, 4, 2, 7, 3, 1, 5 }, 0x81 }, } - }, + } }, - { 12, 10, 8, 11, 9, 7, 5, 3, 6, 2, 4 } + { 12, 9, 8, 10, 11, 7, 2, 6, 3, 5, 4 } }; -void astoneage_state::init_zulu() +void zoo_state::init_dinodino() { - decrypt_rom(zulu_table); - + decrypt_rom(dinodino_table); +#if 1 // TODO: There's more stuff happening for addresses < 0x400... // override reset vector for now - u16 *rom = (u16 *)memregion("maincpu")->base(); - rom[0x004/2] = 0x0000; - rom[0x006/2] = 0x0400; + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0446; + + rom[0x00400/2] = 0x4e75; // overlay!? + + rom[0x02236/2] = 0x4e75; // Mirror ROM word checksum (it expects 0) +#endif } -const astoneage_state::decryption_info astoneage_state::dinodino_table = { +const astoneag_state::decryption_info astoneag_state::astoneag_table = { { { - { 8, 11, 9 }, + { 11, 10, 9 }, { { { 7, 5, 4, 6, 0, 3, 2, 1 }, 0x00 }, { { 1, 4, 6, 0, 2, 5, 3, 7 }, 0xd0 }, @@ -1846,7 +2373,7 @@ const astoneage_state::decryption_info astoneage_state::dinodino_table = { } }, { - { 12, 11, 10 }, + { 12, 10, 8 }, { { { 6, 5, 4, 3, 2, 1, 0, 7 }, 0x90 }, { { 2, 4, 0, 7, 5, 6, 3, 1 }, 0x32 }, @@ -1857,82 +2384,63 @@ const astoneage_state::decryption_info astoneage_state::dinodino_table = { { { 3, 5, 2, 7, 6, 1, 4, 0 }, 0x0a }, { { 0, 6, 4, 2, 7, 3, 1, 5 }, 0x81 }, } - }, + } }, - { 12, 9, 8, 10, 11, 7, 2, 6, 3, 5, 4 } + { 12, 9, 11, 8, 10, 7, 6, 5, 4, 3, 2 } }; -void astoneage_state::init_dinodino() +void astoneag_state::init_astoneag() { - decrypt_rom(dinodino_table); - + decrypt_rom(astoneag_table); +#if 1 // TODO: There's more stuff happening for addresses < 0x400... // override reset vector for now - u16 *rom = (u16 *)memregion("maincpu")->base(); - rom[0x004/2] = 0x0000; - rom[0x006/2] = 0x0446; + u16 * const rom = (u16 *)memregion("maincpu")->base(); + rom[0x00004/2] = 0x0000; + rom[0x00006/2] = 0x0440; - // enable the patch below to pass ROM checksum, but then it jumps into the weeds after expecting to read something from 0xb80000 - //rom[0x30b70/2] = 0xe5f5; -} + rom[0x00400/2] = 0x4e75; // overlay!? -void magibomb_state::init_magibomb() -{ - // decrypt data - u8 *rom = memregion("maincpu")->base(); + rom[0x02872/2] = 0x4e75; // Mirror ROM word checksum (it expects 0) +#endif - for (u32 i = 1; i < 0x20000; i += 2) - { - rom[i] = bitswap<8>(rom[i], 6, 7, 5, 0, 4, 1, 3, 2); - } + interleave_sprites_16x32(); +} - // descramble addresses - std::unique_ptr tmp = std::make_unique(0x20000); +void astoneag_state::interleave_sprites_16x32() +{ + u8 * const rom = memregion("sprites")->base(); + const u32 size = memregion("sprites")->bytes(); - for(u32 i = 0; i < 0x20000; i++) - { - tmp[i] = rom[i]; - } + std::unique_ptr tmp = std::make_unique(size); + std::copy_n(rom, size, &tmp[0]); - for(u32 i = 0; i < 0x20000; i++) - { - u32 dest = - (i & 0xffff20ff) | - (BIT(i, 14) << 15) | - (BIT(i, 15) << 14) | - (BIT(i, 8) << 12) | - (BIT(i, 12) << 11) | - (BIT(i, 9) << 10) | - (BIT(i, 11) << 9) | - (BIT(i, 10) << 8); - rom[dest] = tmp[i]; - } + for (u32 i = 0; i != size; i += 1) + rom[i] = tmp[(i & ~0xff) | (bitswap<8>(i, 7,6,5, 3,2,1, 4, 0) ^ 2)]; } } // Anonymous namespace - -GAME( 2000, showhand, 0, showhand, showhand, astrocorp_state, init_showhand, ROT0, "Astro Corp.", "Show Hand (Italy)", MACHINE_SUPPORTS_SAVE ) -GAME( 2000, showhanc, showhand, showhanc, showhanc, astrocorp_state, init_showhanc, ROT0, "Astro Corp.", "Wang Pai Dui Jue (China)", MACHINE_SUPPORTS_SAVE ) -GAME( 2002, skilldrp, 0, skilldrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Skill Drop Georgia (Ver. G1.0S)", MACHINE_SUPPORTS_SAVE ) -GAME( 2003, speeddrp, 0, speeddrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Speed Drop (Ver. 1.06)", MACHINE_SUPPORTS_SAVE ) - -// Encrypted games (not working): +// YEAR NAME PARENT MACHINE INPUTS STATE INIT ROT COMPANY FULLNAME FLAGS LAYOUT +GAMEL( 2000, showhand, 0, showhand, showhand, astrocorp_state, init_showhand, ROT0, "Astro Corp.", "Show Hand (Italy)", MACHINE_SUPPORTS_SAVE, layout_showhand ) +GAMEL( 2000, showhanc, showhand, showhanc, showhanc, astrocorp_state, init_showhanc, ROT0, "Astro Corp.", "Wangpai Duijue (China)", MACHINE_SUPPORTS_SAVE, layout_showhanc ) +GAMEL( 2002, skilldrp, 0, skilldrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Skill Drop Georgia (Ver. G1.0S, Sep 13 2002)", MACHINE_SUPPORTS_SAVE, layout_skilldrp ) // Sep 13 2002 09:17:54 +GAMEL( 2003, speeddrp, 0, speeddrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Speed Drop (Ver. 1.06, Sep 3 2003)", MACHINE_SUPPORTS_SAVE, layout_skilldrp ) // Sep 3 2003 16:01:26 // Simpler encryption -GAME( 2001?, magibomb, 0, magibomb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. L3.5S)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2002, magibomba, magibomb, magibomb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. BR4.4, 04/19/02)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // one bad program ROM -GAME( 2002, magibombb, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. AB4.5A, 07/10/02)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2001, magibombc, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. AB4.2, 11/10/01)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2001?, magibombe, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. A3.1A)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2002, magibombf, magibomb, magibombf, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. NB4.5 061402)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAMEL( 2001?, magibomb, 0, magibomb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. L3.5S)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_magibomb ) +GAMEL( 2002, magibomba, magibomb, magibomb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. BR4.4, 04/19/02S)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_magibomb ) // One bad program ROM +GAMEL( 2002, magibombb, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. AB4.5A, 07/10/02S)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_magibombb ) +GAMEL( 2001, magibombc, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. AB4.2, 11/10/01)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_magibomb ) +GAMEL( 2001?, magibombe, magibomb, magibombb, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. A3.1)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_magibomb ) +GAMEL( 2002, magibombf, magibomb, magibombf, magibomb, magibomb_state, init_magibomb, ROT0, "Astro Corp.", "Magic Bomb (Ver. NB4.5, 06/14/02S)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_magibomb ) // Heavier encryption -GAME( 2005, dinodino, 0, dinodino, skilldrp, astoneage_state, init_dinodino, ROT0, "Astro Corp.", "Dino Dino (Ver. A1.1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 13/01.2005 10:59 -GAME( 2005, astoneag, 0, astoneage, skilldrp, astoneage_state, init_astoneage, ROT0, "Astro Corp.", "Stone Age (Astro, Ver. ENG.03.A)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 2005/02/21 -GAME( 2005, magibombd, magibomb, magibombd, skilldrp, astoneage_state, init_magibombd, ROT0, "Astro Corp.", "Magic Bomb (Ver. AA.72D, 14/11/05)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -GAME( 2006, winbingo, 0, magibombd, skilldrp, astoneage_state, init_winbingo, ROT0, "Astro Corp.", "Win Win Bingo (set 1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 15:47:48 Feb 23 2006 -GAME( 2006, winbingoa, winbingo, magibombd, skilldrp, astoneage_state, init_winbingo, ROT0, "Astro Corp.", "Win Win Bingo (set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 11:02:07 May 11 2006 -GAME( 2005, hacher, winbingo, magibombd, skilldrp, astoneage_state, init_winbingo, ROT0, "bootleg (Gametron)", "Hacher (hack of Win Win Bingo)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 14:25:46 Mar 10 2005 -GAME( 2004, zulu, 0, magibombd, skilldrp, astoneage_state, init_zulu, ROT0, "Astro Corp.", "Zulu (Ver. ZO.02.D)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // 10:53:44 Aug 27 2004 -GAME( 2007?, westvent, 0, skilldrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Western Venture (Ver. AA.02.D)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAMEL( 2004, zoo, 0, zoo, magibombd, zoo_state, init_zoo, ROT0, "Astro Corp.", "Zoo (Ver. ZO.02.D, Aug 27 2004)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_zoo ) // 10:53:44 Aug 27 2004 +GAMEL( 2005, dinodino, 0, dinodino, dinodino, zoo_state, init_dinodino, ROT0, "Astro Corp.", "Dino Dino (Ver. A1.1, 01/13/2005)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_dinodino ) // 13/01.2005 10:59 +GAMEL( 2005, astoneag, 0, astoneag, astoneag, astoneag_state, init_astoneag, ROT0, "Astro Corp.", "Stone Age (Astro, Ver. EN.03.A, 2005/02/21)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_astoneag ) +GAMEL( 2005, magibombd, magibomb, magibombd, magibombd, zoo_state, init_magibombd, ROT0, "Astro Corp.", "Magic Bomb (Ver. AA.72.D, 14/11/05)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_magibombb ) // 15/11/05 09:31. Undumped sprite ROM +GAMEL( 2006, winbingo, 0, winbingo, winbingo, zoo_state, init_winbingo, ROT0, "Astro Corp.", "Win Win Bingo (Ver. GM.03.3, Feb 23 2006)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION, layout_winbingo ) // 15:47:48 Feb 23 2006 +GAMEL( 2006, winbingoa, winbingo, winbingo, winbingo, zoo_state, init_winbingoa, ROT0, "Astro Corp.", "Win Win Bingo (Ver. GM.05.1, May 11 2006)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING, layout_winbingo ) // 11:02:07 May 11 2006. Undumped sprite ROMs +GAMEL( 2005, hacher, winbingo, hacher, winbingo, zoo_state, init_hacher, ROT0, "bootleg (Gametron)", "Hacher (hack of Win Win Bingo EN.01.6)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_GRAPHICS, layout_winbingo ) // 14:25:46 Mar 10 2005. One bad sprite ROM +GAME ( 2007?, westvent, 0, skilldrp, skilldrp, astrocorp_state, empty_init, ROT0, "Astro Corp.", "Western Venture (Ver. AA.02.D)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // One bad program ROM -- cgit v1.2.3