From 512fed32db8561515f29f33c95e5f64cabe87b8e Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 20 Feb 2020 15:57:38 -0600 Subject: [PATCH] seimplify oddessey default mapper a bit --- .../Odyssey2/Mappers/Mapper_Default.cs | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs index 845dbb7895..cd46153515 100644 --- a/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs +++ b/BizHawk.Emulation.Cores/Consoles/Magnavox/Odyssey2/Mappers/Mapper_Default.cs @@ -16,17 +16,13 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { return Core._rom[addr & (Core._rom.Length - 1)]; } - else + + if (Core.cart_RAM != null) { - if (Core.cart_RAM != null) - { - return Core.cart_RAM[addr - 0xA000]; - } - else - { - return 0; - } + return Core.cart_RAM[addr - 0xA000]; } + + return 0; } public override void MapCDL(ushort addr, I8048.eCDLogMemFlags flags) @@ -41,17 +37,10 @@ namespace BizHawk.Emulation.Cores.Consoles.O2Hawk { SetCDLRAM(flags, addr - 0xA000); } - else - { - return; - } } } - public override byte PeekMemory(ushort addr) - { - return ReadMemory(addr); - } + public override byte PeekMemory(ushort addr) => ReadMemory(addr); public override void WriteMemory(ushort addr, byte value) {