diff --git a/hash/nes.xml b/hash/nes.xml
index 49b3c361030..86069d8d37d 100644
--- a/hash/nes.xml
+++ b/hash/nes.xml
@@ -51730,9 +51730,9 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
- Time Diver Eon Man (USA, Prototype)
- 19??
- <unknown>
+ Time Diver Eon Man (USA, prototype)
+ 1993
+ Taito
@@ -57252,14 +57252,14 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
-
-
-
+
+
+
-
+
San Xia Wu Yi (Chi, Decrypted WXN)
19??
Waixing
@@ -57274,14 +57274,14 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
-
-
-
+
+
+
-
+
San Xia Wu Yi (Chi, Alt?)
19??
Waixing
@@ -57296,6 +57296,10 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
+
+
+
+
@@ -57760,7 +57764,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
-
+
Zhēntián Shí Yǒngshì (China)
2005
Waixing
@@ -61151,6 +61155,23 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
+
+ Miss Peach World 1 - Super L.A. Cop (Japan)
+ 1991
+ Hacker International
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -65652,23 +65673,6 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
-
- Miss Peach World 1 - Super L.A. Cop (Japan)
- 1991
- Hacker International
-
-
-
-
-
-
-
-
-
-
-
-
-
Mo Li Zhan Shi (Chi)
19??
diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h
index 9c0390593db..9427a7fca8e 100644
--- a/src/devices/bus/nes/bandai.h
+++ b/src/devices/bus/nes/bandai.h
@@ -74,7 +74,6 @@ public:
// construction/destruction
nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override { fcg_write(offset, data); }
protected:
diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h
index 949899ac634..c3f959145db 100644
--- a/src/devices/bus/nes/bootleg.h
+++ b/src/devices/bus/nes/bootleg.h
@@ -400,6 +400,7 @@ class nes_whirlwind_device : public nes_nrom_device
{
public:
virtual u8 read_m(offs_t offset) override;
+
virtual void pcb_reset() override;
protected:
diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h
index 4a47bf63fa6..8f2c0419ff1 100644
--- a/src/devices/bus/nes/legacy.h
+++ b/src/devices/bus/nes/legacy.h
@@ -64,7 +64,6 @@ public:
// construction/destruction
nes_ffe8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_l(offs_t offset, uint8_t data) override;
virtual void write_h(offs_t offset, uint8_t data) override {}
diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h
index 9f4d100d2f6..1a6c8963826 100644
--- a/src/devices/bus/nes/mmc2.h
+++ b/src/devices/bus/nes/mmc2.h
@@ -41,7 +41,6 @@ public:
// construction/destruction
nes_fxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override;
virtual void pcb_reset() override;
diff --git a/src/devices/bus/nes/mmc3_clones.cpp b/src/devices/bus/nes/mmc3_clones.cpp
index fdf22c76a37..f04318537a5 100644
--- a/src/devices/bus/nes/mmc3_clones.cpp
+++ b/src/devices/bus/nes/mmc3_clones.cpp
@@ -158,7 +158,7 @@ ioport_constructor nes_bmc_kc885_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nes_nitra_device::nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_NITRA, tag, owner, clock)
{
}
@@ -168,17 +168,17 @@ nes_bmw8544_device::nes_bmw8544_device(const machine_config &mconfig, const char
{
}
-nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nes_fs6_device::nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_FS6, tag, owner, clock)
{
}
-nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nes_sbros11_device::nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_SBROS11, tag, owner, clock)
{
}
-nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nes_malisb_device::nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_txrom_device(mconfig, NES_MALISB, tag, owner, clock)
{
}
@@ -1128,10 +1128,10 @@ void nes_smd133_device::pcb_reset()
Bootleg Board by Nitra
- Games: Time Diver Avenger
+ Games: Queen Bee, Time Diver Avenger
- This acts basically like a MMC3 with different use of write
- address.
+ MMC3 clone with A10 tied to what is normally A0 and
+ data instead coming from the lower address lines.
iNES: mapper 250
@@ -1234,6 +1234,8 @@ void nes_sbros11_device::write_h(offs_t offset, u8 data)
This is very similar to mapper 196, but with additional
data bit swap.
+ NES 2.0: mapper 325
+
In MAME: Supported.
-------------------------------------------------*/
@@ -1254,10 +1256,8 @@ void nes_malisb_device::write_h(offs_t offset, u8 data)
{
LOG_MMC(("malisb write_h, offset: %04x, data: %02x\n", offset, data));
- if (offset > 0x4000)
- txrom_write((offset & 0xfffe) | BIT(offset, 2) | BIT(offset, 3), data);
- else
- txrom_write((offset & 0xfffe) | BIT(offset, 3), data);
+ offset = (offset & 0x6000) | BIT(offset, 3) | (BIT(offset, 14) & BIT(offset, 2));
+ txrom_write(offset, data);
}
/*-------------------------------------------------
diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h
index b4a4d8d43a7..b6d65994393 100644
--- a/src/devices/bus/nes/mmc3_clones.h
+++ b/src/devices/bus/nes/mmc3_clones.h
@@ -14,10 +14,9 @@ class nes_nitra_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nes_nitra_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- // device-level overrides
- virtual void write_h(offs_t offset, uint8_t data) override;
+ virtual void write_h(offs_t offset, u8 data) override;
};
@@ -51,10 +50,9 @@ class nes_fs6_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nes_fs6_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- // device-level overrides
- virtual void write_h(offs_t offset, uint8_t data) override;
+ virtual void write_h(offs_t offset, u8 data) override;
};
@@ -64,10 +62,9 @@ class nes_sbros11_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nes_sbros11_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- // device-level overrides
- virtual void write_h(offs_t offset, uint8_t data) override;
+ virtual void write_h(offs_t offset, u8 data) override;
};
@@ -77,10 +74,9 @@ class nes_malisb_device : public nes_txrom_device
{
public:
// construction/destruction
- nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nes_malisb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- // device-level overrides
- virtual void write_h(offs_t offset, uint8_t data) override;
+ virtual void write_h(offs_t offset, u8 data) override;
virtual void prg_cb(int start, int bank) override;
virtual void chr_cb(int start, int bank, int source) override;
};
@@ -332,7 +328,6 @@ public:
// construction/destruction
nes_txc_tw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_l(offs_t offset, uint8_t data) override;
virtual void write_m(offs_t offset, uint8_t data) override { write_l(offset & 0xff, data); } // offset does not really count for this mapper }
virtual void prg_cb(int start, int bank) override;
@@ -347,7 +342,6 @@ public:
// construction/destruction
nes_kof97_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override;
};
@@ -384,7 +378,6 @@ public:
// construction/destruction
nes_sf3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override;
protected:
@@ -691,6 +684,7 @@ public:
virtual void pcb_reset() override;
protected:
+ // device-level overrides
virtual ioport_constructor device_input_ports() const override;
private:
@@ -720,7 +714,6 @@ public:
// construction/destruction
nes_bmc_15in1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- // device-level overrides
virtual void write_m(offs_t offset, u8 data) override;
virtual void pcb_reset() override;
@@ -738,7 +731,6 @@ public:
// construction/destruction
nes_bmc_sbig7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override;
virtual void pcb_reset() override;
diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h
index afe4aeaa274..7150c9657b0 100644
--- a/src/devices/bus/nes/nxrom.h
+++ b/src/devices/bus/nes/nxrom.h
@@ -178,7 +178,6 @@ public:
// construction/destruction
nes_nochr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual uint8_t chr_r(offs_t offset) override;
virtual void chr_w(offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h
index a5ba8c6d7b0..f3d0ee1e5cd 100644
--- a/src/devices/bus/nes/sachen.h
+++ b/src/devices/bus/nes/sachen.h
@@ -184,7 +184,6 @@ public:
// construction/destruction
nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual uint8_t read_l(offs_t offset) override { return 0xff; } // no read_l here
virtual void write_l(offs_t offset, uint8_t data) override;
};
diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h
index 2cf64caa902..af8bdc3bc5c 100644
--- a/src/devices/bus/nes/txc.h
+++ b/src/devices/bus/nes/txc.h
@@ -40,7 +40,6 @@ public:
// construction/destruction
nes_txc_dumarc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual void write_h(offs_t offset, uint8_t data) override;
};
@@ -53,7 +52,6 @@ public:
// construction/destruction
nes_txc_mjblock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- // device-level overrides
virtual uint8_t read_l(offs_t offset) override;
};