Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 08:18:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bus/nes: Minor fixes and simplifications for several bootlegs. (#9618)

Browse Source
This commit is contained in:
0kmg 2022-04-24 19:03:19 -08:00 committed by GitHub
parent 9d8919786d
commit fd500d142b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hash/nes.xml
View File

@ -64614,7 +64614,7 @@ preliminary proto for the PAL version, still running on NTSC systems) or the gfx
</software> </software>
<!-- nointro --> <!-- nointro -->
<software name="decathln"> <software name="decathln" supported="partial"> <!-- major graphics glitches in javelin and 1500m -->
<description>Decathlon (Tw)</description> <description>Decathlon (Tw)</description>
<year>1992</year> <year>1992</year>
<publisher>Computer &amp; Entertainment</publisher> <publisher>Computer &amp; Entertainment</publisher>
@ -69425,10 +69425,11 @@ Also notice that VRAM & WRAM are probably incorrect for some of these sets, at t
<software name="fuunsfds"> <software name="fuunsfds">
<description>Fuuun Shaolin Kyo (Asia, FDS conversion)</description> <description>Fuuun Shaolin Kyo (Asia, FDS conversion)</description>
<year>19??</year> <year>19??</year>
<publisher>Kaiser</publisher> <publisher>Whirlwind Manu</publisher>
<part name="cart" interface="nes_cart"> <part name="cart" interface="nes_cart">
<feature name="slot" value="unl_lh10" /> <feature name="slot" value="unl_lh10" />
<feature name="pcb" value="UNL-LH10" /> <feature name="pcb" value="UNL-LH10" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="131072"> <dataarea name="prg" size="131072">
<rom name="fuuun shaolin kyo (fds conversion) (unl).prg" size="131072" crc="120d5a6c" sha1="4c499a857087e6c121522435786792a2e4105ac1" offset="00000" status="baddump" /> <rom name="fuuun shaolin kyo (fds conversion) (unl).prg" size="131072" crc="120d5a6c" sha1="4c499a857087e6c121522435786792a2e4105ac1" offset="00000" status="baddump" />
</dataarea> </dataarea>

78
src/devices/bus/nes/bootleg.cpp
View File

@ -197,7 +197,7 @@ nes_lg25_device::nes_lg25_device(const machine_config &mconfig, const char *tag,
{ {
} }
nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) nes_lh10_device::nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: nes_nrom_device(mconfig, NES_LH10, tag, owner, clock), m_latch(0) : nes_nrom_device(mconfig, NES_LH10, tag, owner, clock), m_latch(0)
{ {
} }
@ -558,7 +558,6 @@ void nes_lh42_device::pcb_reset()
{ {
prg16_89ab(0); prg16_89ab(0);
prg16_cdef(m_prg_chunks - 1); // Last 16K is fixed prg16_cdef(m_prg_chunks - 1); // Last 16K is fixed
chr8(0, CHRRAM);
m_latch = 0; m_latch = 0;
} }
@ -573,7 +572,6 @@ void nes_lg25_device::pcb_reset()
{ {
prg16_89ab(0); prg16_89ab(0);
prg16_cdef(m_prg_chunks - 1); // Last 16K is fixed prg16_cdef(m_prg_chunks - 1); // Last 16K is fixed
chr8(0, CHRRAM);
m_latch = 0; m_latch = 0;
} }
@ -582,7 +580,6 @@ void nes_lh10_device::device_start()
{ {
common_start(); common_start();
save_item(NAME(m_latch)); save_item(NAME(m_latch));
save_item(NAME(m_reg));
} }
void nes_lh10_device::pcb_reset() void nes_lh10_device::pcb_reset()
@ -591,17 +588,13 @@ void nes_lh10_device::pcb_reset()
prg8_ab(0); prg8_ab(0);
// 0xc000-0xdfff reads/writes WRAM // 0xc000-0xdfff reads/writes WRAM
prg8_ef((m_prg_chunks << 1) - 1); prg8_ef((m_prg_chunks << 1) - 1);
chr8(0, CHRRAM);
set_nt_mirroring(PPU_MIRROR_VERT);
m_latch = 0; m_latch = 0;
std::fill(std::begin(m_reg), std::end(m_reg), 0x00);
} }
void nes_lh51_device::pcb_reset() void nes_lh51_device::pcb_reset()
{ {
prg32((m_prg_chunks >> 1) - 1); // first 8K is switchable, the rest fixed prg32((m_prg_chunks >> 1) - 1); // first 8K is switchable, the rest fixed
chr8(0, CHRRAM);
} }
void nes_lh53_device::device_start() void nes_lh53_device::device_start()
@ -1707,10 +1700,7 @@ void nes_lh32_device::write_h(offs_t offset, uint8_t data)
NES 2.0: mapper 418 NES 2.0: mapper 418
In MAME: Preliminary supported. In MAME: Supported.
TODO: Investigate garbage tiles on bottom half of
course map screens. This should be car dashboard?
-------------------------------------------------*/ -------------------------------------------------*/
@ -1718,21 +1708,24 @@ void nes_lh42_device::write_h(offs_t offset, u8 data)
{ {
LOG_MMC(("lh42 write_h, offset: %04x, data: %02x\n", offset, data)); LOG_MMC(("lh42 write_h, offset: %04x, data: %02x\n", offset, data));
if (BIT(offset, 0)) switch (offset & 0x6001)
{ {
case 0x0000:
m_latch = data & 0x07;
break;
case 0x0001:
switch (m_latch) switch (m_latch)
{ {
case 1: case 5:
set_nt_mirroring(BIT(data, 0) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); set_nt_mirroring(BIT(data, 0) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
break; break;
case 2: case 6:
case 3: case 7:
prg8_x(m_latch & 1, data & 0x0f); prg8_x(m_latch & 1, data & 0x0f);
break; break;
} }
break;
} }
else
m_latch = data & 0x03;
} }
/*------------------------------------------------- /*-------------------------------------------------
@ -1754,21 +1747,24 @@ void nes_lg25_device::write_h(offs_t offset, u8 data)
{ {
LOG_MMC(("lg25 write_h, offset: %04x, data: %02x\n", offset, data)); LOG_MMC(("lg25 write_h, offset: %04x, data: %02x\n", offset, data));
if (BIT(offset, 0)) switch (offset & 0x6001)
{ {
case 0x0000:
m_latch = data & 0x07;
break;
case 0x0001:
switch (m_latch) switch (m_latch)
{ {
case 1: case 5:
set_nt_mirroring(BIT(data, 2) ? PPU_MIRROR_VERT : PPU_MIRROR_HORZ); set_nt_mirroring(BIT(data, 5) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
break; break;
case 2: case 6:
case 3: case 7:
prg8_x(m_latch & 1, data & 0x0f); prg8_x(m_latch & 1, data & 0x0f);
break; break;
} }
break;
} }
else
m_latch = data & 0x03;
} }
/*------------------------------------------------- /*-------------------------------------------------
@ -1786,19 +1782,13 @@ void nes_lg25_device::write_h(offs_t offset, u8 data)
-------------------------------------------------*/ -------------------------------------------------*/
void nes_lh10_device::update_prg() u8 nes_lh10_device::read_m(offs_t offset)
{
prg8_89(m_reg[6]);
prg8_ab(m_reg[7]);
}
uint8_t nes_lh10_device::read_m(offs_t offset)
{ {
LOG_MMC(("lh10 read_m, offset: %04x\n", offset)); LOG_MMC(("lh10 read_m, offset: %04x\n", offset));
return m_prg[(0x0e * 0x2000) + (offset & 0x1fff)]; return m_prg[(0x0e * 0x2000 + offset) & (m_prg_size - 1)];
} }
uint8_t nes_lh10_device::read_h(offs_t offset) u8 nes_lh10_device::read_h(offs_t offset)
{ {
// LOG_MMC(("lh10 read_h, offset: %04x\n", offset)); // LOG_MMC(("lh10 read_h, offset: %04x\n", offset));
@ -1808,24 +1798,28 @@ uint8_t nes_lh10_device::read_h(offs_t offset)
return hi_access_rom(offset); return hi_access_rom(offset);
} }
void nes_lh10_device::write_h(offs_t offset, uint8_t data) void nes_lh10_device::write_h(offs_t offset, u8 data)
{ {
LOG_MMC(("lh10 write_h, offset: %04x, data: %02x\n", offset, data)); LOG_MMC(("lh10 write_h, offset: %04x, data: %02x\n", offset, data));
if (offset >= 0x4000 && offset < 0x6000)
m_prgram[offset & 0x1fff] = data;
else
{
switch (offset & 0x6001) switch (offset & 0x6001)
{ {
case 0x0000: case 0x0000:
m_latch = data & 7; m_latch = data & 7;
break; break;
case 0x0001: case 0x0001:
m_reg[m_latch] = data; switch (m_latch)
update_prg(); {
case 6:
case 7:
prg8_x(m_latch & 1, data & 0x0f);
break; break;
} }
break;
case 0x4000:
case 0x4001:
m_prgram[offset & 0x1fff] = data;
break;
} }
} }
@ -1853,11 +1847,9 @@ void nes_lh51_device::write_h(offs_t offset, u8 data)
switch (offset & 0x6000) switch (offset & 0x6000)
{ {
case 0x0000: case 0x0000:
case 0x1000:
prg8_89(data & 0x0f); prg8_89(data & 0x0f);
break; break;
case 0x6000: case 0x6000:
case 0x7000:
set_nt_mirroring(BIT(data, 3) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); set_nt_mirroring(BIT(data, 3) ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
break; break;
} }

12
src/devices/bus/nes/bootleg.h
View File

@ -534,11 +534,11 @@ class nes_lh10_device : public nes_nrom_device
{ {
public: public:
// construction/destruction // construction/destruction
nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
virtual uint8_t read_h(offs_t offset) override; virtual u8 read_h(offs_t offset) override;
virtual uint8_t read_m(offs_t offset) override; virtual u8 read_m(offs_t offset) override;
virtual void write_h(offs_t offset, uint8_t data) override; virtual void write_h(offs_t offset, u8 data) override;
virtual void pcb_reset() override; virtual void pcb_reset() override;
@ -547,9 +547,7 @@ protected:
virtual void device_start() override; virtual void device_start() override;
private: private:
void update_prg(); u8 m_latch;
uint8_t m_latch;
uint8_t m_reg[8];
}; };