diff --git a/hash/gameboy.xml b/hash/gameboy.xml index 5a54a727212..934c60a4541 100644 --- a/hash/gameboy.xml +++ b/hash/gameboy.xml @@ -11923,7 +11923,7 @@ Mani - + diff --git a/src/devices/bus/gameboy/gb_slot.cpp b/src/devices/bus/gameboy/gb_slot.cpp index d617143196a..0cc3832aa14 100644 --- a/src/devices/bus/gameboy/gb_slot.cpp +++ b/src/devices/bus/gameboy/gb_slot.cpp @@ -209,7 +209,7 @@ static const gb_slot slot_list[] = { GB_MBC_MBC7, "rom_mbc7" }, { GB_MBC_TAMA5, "rom_tama5" }, { GB_MBC_MMM01, "rom_mmm01" }, - { GB_MBC_M161, "rom_m161_m12" }, + { GB_MBC_M161, "rom_m161" }, { GB_MBC_MBC3, "rom_huc1" }, // for now treat this as alias for MBC3 { GB_MBC_MBC3, "rom_huc3" }, // for now treat this as alias for MBC3 { GB_MBC_SACHEN1, "rom_sachen1" }, diff --git a/src/devices/bus/gameboy/mbc.cpp b/src/devices/bus/gameboy/mbc.cpp index cfac868834f..1f0b137be9f 100644 --- a/src/devices/bus/gameboy/mbc.cpp +++ b/src/devices/bus/gameboy/mbc.cpp @@ -24,7 +24,7 @@ const device_type GB_ROM_MBC3 = &device_creator; const device_type GB_ROM_MBC5 = &device_creator; const device_type GB_ROM_MBC6 = &device_creator; const device_type GB_ROM_MBC7 = &device_creator; -const device_type GB_ROM_M161_M12 = &device_creator; +const device_type GB_ROM_M161 = &device_creator; const device_type GB_ROM_MMM01 = &device_creator; const device_type GB_ROM_SACHEN1 = &device_creator; const device_type GB_ROM_SACHEN2 = &device_creator; @@ -88,7 +88,7 @@ gb_rom_mbc7_device::gb_rom_mbc7_device(const machine_config &mconfig, const char } gb_rom_m161_device::gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) - : gb_rom_mbc_device(mconfig, GB_ROM_M161_M12, "GB M161-M12 Carts", tag, owner, clock, "gb_rom_m161m12", __FILE__), m_base_bank(0) + : gb_rom_mbc_device(mconfig, GB_ROM_M161, "GB M161 Carts", tag, owner, clock, "gb_rom_m161", __FILE__), m_base_bank(0) { } @@ -664,7 +664,7 @@ WRITE8_MEMBER(gb_rom_mbc7_device::write_ram) } -// M161-M12 +// M161 READ8_MEMBER(gb_rom_m161_device::read_rom) { diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h index f1041e4541f..13f10cef3ed 100644 --- a/src/devices/bus/gameboy/mbc.h +++ b/src/devices/bus/gameboy/mbc.h @@ -378,7 +378,7 @@ extern const device_type GB_ROM_MBC4; extern const device_type GB_ROM_MBC5; extern const device_type GB_ROM_MBC6; extern const device_type GB_ROM_MBC7; -extern const device_type GB_ROM_M161_M12; +extern const device_type GB_ROM_M161; extern const device_type GB_ROM_MMM01; extern const device_type GB_ROM_SACHEN1; extern const device_type GB_ROM_SACHEN2; diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index d5f7331e43b..cdc7a820415 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -650,7 +650,7 @@ static SLOT_INTERFACE_START(gb_cart) SLOT_INTERFACE_INTERNAL("rom_mbc7", GB_ROM_MBC7) SLOT_INTERFACE_INTERNAL("rom_tama5", GB_ROM_TAMA5) SLOT_INTERFACE_INTERNAL("rom_mmm01", GB_ROM_MMM01) - SLOT_INTERFACE_INTERNAL("rom_m161_m12",GB_ROM_M161_M12) + SLOT_INTERFACE_INTERNAL("rom_m161", GB_ROM_M161) SLOT_INTERFACE_INTERNAL("rom_sachen1", GB_ROM_SACHEN1) SLOT_INTERFACE_INTERNAL("rom_sachen2", GB_ROM_SACHEN2) SLOT_INTERFACE_INTERNAL("rom_wisdom", GB_ROM_WISDOM)