From 0d9055b121f617664e238a9935691baf4b6d0d5b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 10 Apr 2015 00:30:59 +0000
Subject: [PATCH] Apple II - remove another hard coded path

---
 .../Computers/AppleII/AppleII.cs              |  2 +-
 .../Computers/AppleII/Virtu/Machine.cs        |  6 ++--
 .../Computers/AppleII/Virtu/Memory.cs         | 31 +++++++++++++------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
index 8a4f81548e..e536417e25 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/AppleII.cs
@@ -29,7 +29,7 @@ namespace BizHawk.Emulation.Cores.Computers.AppleII
 			_diskIIRom = comm.CoreFileProvider.GetFirmware(
 				SystemId, "DiskII", true, "The DiskII firmware is required");
 
-			_machine = new Machine(_diskIIRom);
+			_machine = new Machine(_appleIIRom, _diskIIRom);
 			
 			var vidService = new BizVideoService(_machine);
 			_soundService = new BizAudioService(_machine);
diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
index 1404d4f6c5..73d6041efb 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Machine.cs
@@ -64,15 +64,13 @@ namespace Jellyfish.Virtu
 
     public sealed class Machine : IDisposable
     {
-        public Machine(byte[] diskIIRom)
+        public Machine(byte[] appleIIe, byte[] diskIIRom)
         {
-            
-
 			Events = new MachineEvents();
             Services = new MachineServices();
 
             Cpu = new Cpu(this);
-            Memory = new Memory(this);
+            Memory = new Memory(this, appleIIe);
             Keyboard = new Keyboard(this);
             GamePort = new GamePort(this);
             Cassette = new Cassette(this);
diff --git a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs
index 6b1498fac0..991a8335c4 100644
--- a/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs
+++ b/BizHawk.Emulation.Cores/Computers/AppleII/Virtu/Memory.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
@@ -12,10 +13,11 @@ namespace Jellyfish.Virtu
 
     public sealed partial class Memory : MachineComponent
     {
-        public Memory(Machine machine) : 
+        public Memory(Machine machine, byte[] appleIIe) : 
             base(machine)
         {
-            WriteRamModeBankRegion = new Action<int, byte>[Video.ModeCount][][];
+			_appleIIe = appleIIe;
+			WriteRamModeBankRegion = new Action<int, byte>[Video.ModeCount][][];
             for (int mode = 0; mode < Video.ModeCount; mode++)
             {
                 WriteRamModeBankRegion[mode] = new Action<int, byte>[BankCount][]
@@ -87,6 +89,8 @@ namespace Jellyfish.Virtu
             _writeRomRegionD0FF = WriteRomRegionD0FF;
         }
 
+		private readonly byte[] _appleIIe;
+
         public override void Initialize()
         {
             _keyboard = Machine.Keyboard;
@@ -96,14 +100,21 @@ namespace Jellyfish.Virtu
             _video = Machine.Video;
             _noSlotClock = Machine.NoSlotClock;
 
-					//TODO lol!!
-            StorageService.LoadResource("c:\\apple\\AppleIIe.rom", stream =>
-            {
-                stream.SkipBlock(0x0100);
-                stream.ReadBlock(_romInternalRegionC1CF);
-                stream.ReadBlock(_romRegionD0DF);
-                stream.ReadBlock(_romRegionE0FF);
-            });
+			// TODO: this is a lazy and more compicated way to do this
+			_romInternalRegionC1CF = _appleIIe
+				.Skip(0x100)
+				.Take(_romInternalRegionC1CF.Length)
+				.ToArray();
+
+			_romRegionD0DF = _appleIIe
+				.Skip(0x100 + _romInternalRegionC1CF.Length)
+				.Take(_romRegionD0DF.Length)
+				.ToArray();
+
+			_romRegionE0FF = _appleIIe
+				.Skip(0x100 + _romInternalRegionC1CF.Length + _romRegionD0DF.Length)
+				.Take(_romRegionE0FF.Length)
+				.ToArray();
 
             if ((ReadRomRegionE0FF(0xFBB3) == 0x06) && (ReadRomRegionE0FF(0xFBBF) == 0xC1))
             {