From d3296a60b3087e7cd611d3d4c140cb3a0e267454 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 19 Nov 2020 14:07:43 +1100 Subject: tmnt.cpp: Make tmnt2 ROM access work more like it did before --- src/mame/drivers/spectrum.cpp | 4 +--- src/mame/drivers/tmnt.cpp | 2 +- src/mame/includes/tmnt.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp index e28d688fcb0..339c73d5dae 100644 --- a/src/mame/drivers/spectrum.cpp +++ b/src/mame/drivers/spectrum.cpp @@ -722,11 +722,9 @@ void spectrum_state::init_spectrum() { case 48*1024: m_specmem->space(AS_PROGRAM).install_ram(0x8000, 0xffff, m_ram->pointer() + 0x4000); - m_specmem->space(AS_PROGRAM).install_ram(0x5b00, 0x7fff, m_ram->pointer() + 0x1b00); - break; + [[fallthrough]]; case 16*1024: m_specmem->space(AS_PROGRAM).install_ram(0x5b00, 0x7fff, m_ram->pointer() + 0x1b00); - break; } } diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index 9caf8b42801..b020c236603 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -681,7 +681,7 @@ void prmrsocr_state::prmrsocr_main_map(address_map &map) inline uint32_t tmnt_state::tmnt2_get_word( uint32_t addr ) { if (addr <= 0x07ffff / 2) - return(m_tmnt2_rom->as_u32(addr)); + return(m_tmnt2_rom[addr]); else if (addr >= 0x104000 / 2 && addr <= 0x107fff / 2) return(m_sunset_104000[addr - 0x104000 / 2]); else if (addr >= 0x180000 / 2 && addr <= 0x183fff / 2) diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index 5b734d7c3cb..6eb7a278d7f 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -71,7 +71,7 @@ protected: /* memory pointers */ optional_shared_ptr m_spriteram; - required_memory_region m_tmnt2_rom; + required_region_ptr m_tmnt2_rom; optional_shared_ptr m_sunset_104000; optional_shared_ptr m_tmnt2_1c0800; -- cgit v1.2.3