From e542a8ec7278272ae06117cc09f9352dcff49de9 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 24 Nov 2011 05:17:27 +0000
Subject: First steps to make a memory card manager for Mac.

Currently it only allows to to wipe a memory card and see what's saved on it.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72586 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/ConfigurationController.h        |    5 +
 macosx/ConfigurationController.m        |   12 +
 macosx/English.lproj/Configuration.xib  |  156 +++-
 macosx/English.lproj/MemCardManager.xib | 1297 +++++++++++++++++++++++++++++++
 macosx/Pcsxr.xcodeproj/project.pbxproj  |   24 +
 macosx/PcsxrMemCardController.h         |   27 +
 macosx/PcsxrMemCardController.m         |  185 +++++
 macosx/PcsxrMemoryObject.h              |   25 +
 macosx/PcsxrMemoryObject.m              |   25 +
 9 files changed, 1727 insertions(+), 29 deletions(-)
 create mode 100644 macosx/English.lproj/MemCardManager.xib
 create mode 100644 macosx/PcsxrMemCardController.h
 create mode 100644 macosx/PcsxrMemCardController.m
 create mode 100644 macosx/PcsxrMemoryObject.h
 create mode 100644 macosx/PcsxrMemoryObject.m

diff --git a/macosx/ConfigurationController.h b/macosx/ConfigurationController.h
index ef8e4447..068941e7 100644
--- a/macosx/ConfigurationController.h
+++ b/macosx/ConfigurationController.h
@@ -4,6 +4,8 @@
 #import "PluginController.h"
 #import "PluginList.h"
 
+@class PcsxrMemCardController;
+
 @interface ConfigurationController : NSWindowController
 {
     IBOutlet PluginController *cdromPlugin;
@@ -30,6 +32,8 @@
 	IBOutlet NSTextField *mcd1Label;
 	IBOutlet NSTextField *mcd2Label;
 
+	PcsxrMemCardController *memCardEdit;
+	
 	NSMutableDictionary *checkBoxDefaults;
 }
 - (IBAction)setCheckbox:(id)sender;
@@ -37,6 +41,7 @@
 - (IBAction)setVideoType:(id)sender;
 - (IBAction)mcdChangeClicked:(id)sender;
 - (IBAction)mcdNewClicked:(id)sender;
+- (IBAction)mcdEditClicked:(id)sender;
 
 - (NSString *)keyForSender:(id)sender;
 
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 7b0782e0..d7f4cc76 100644
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -2,6 +2,7 @@
 #import "PcsxrController.h"
 #import "PluginList.h"
 #import "PcsxrPlugin.h"
+#import "PcsxrMemCardController.h"
 #include "psxcommon.h"
 #include "plugins.h"
 
@@ -195,6 +196,9 @@
 - (void)dealloc
 {
 	[checkBoxDefaults release];
+	if (memCardEdit) {
+		[memCardEdit release];
+	}
 	[super dealloc];
 }
 
@@ -211,4 +215,12 @@
 	return nil;
 }
 
+- (IBAction)mcdEditClicked:(id)sender
+{
+	if (!memCardEdit) {
+		memCardEdit = [[PcsxrMemCardController alloc] init];
+	}
+	[memCardEdit showWindow:nil];
+}
+
 @end
diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib
index 9a3022ff..3b3afa29 100644
--- a/macosx/English.lproj/Configuration.xib
+++ b/macosx/English.lproj/Configuration.xib
@@ -67,14 +67,13 @@
 							<string key="NSFrame">{{13, 10}, {526, 344}}</string>
 							<reference key="NSSuperview" ref="644483536"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="309207255"/>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="150404821">
 									<object class="NSMutableString" key="NSIdentifier">
 										<characters key="NS.bytes">1</characters>
 									</object>
 									<object class="NSView" key="NSView" id="309207255">
-										<reference key="NSNextResponder" ref="145760790"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSBox" id="324328678">
@@ -90,7 +89,6 @@
 																<int key="NSvFlags">274</int>
 																<string key="NSFrame">{{18, 51}, {135, 106}}</string>
 																<reference key="NSSuperview" ref="501435377"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="197815183"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">5</int>
@@ -295,7 +293,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{17, 16}, {137, 26}}</string>
 																<reference key="NSSuperview" ref="501435377"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="715888890"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSPopUpButtonCell" key="NSCell" id="27092767">
@@ -404,13 +401,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {175, 167}}</string>
 														<reference key="NSSuperview" ref="324328678"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="260387224"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{17, 108}, {179, 184}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="501435377"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -455,7 +450,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">306</int>
 																<string key="NSFrame">{{18, 16}, {238, 40}}</string>
 																<reference key="NSSuperview" ref="593482660"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="776429699"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">2</int>
@@ -522,13 +516,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
 														<reference key="NSSuperview" ref="715888890"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="263292685"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{212, 201}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="593482660"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -561,8 +553,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{18, 16}, {232, 40}}</string>
 																<reference key="NSSuperview" ref="584348218"/>
-																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">2</int>
 																<int key="NSNumCols">1</int>
@@ -663,13 +653,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
 														<reference key="NSSuperview" ref="776429699"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="874213588"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{212, 108}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="584348218"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -691,8 +679,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
-										<reference key="NSSuperview" ref="145760790"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="324328678"/>
 									</object>
 									<string key="NSLabel">Emulation</string>
@@ -1430,7 +1416,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<object class="NSTabViewItem" id="683723192">
 									<string key="NSIdentifier">3</string>
 									<object class="NSView" key="NSView" id="782866499">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="145760790"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSBox" id="834173564">
@@ -1446,6 +1432,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{13, 50}, {454, 17}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="617854318"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1473,6 +1460,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{123, 2}, {100, 32}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="36812309"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1499,6 +1487,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{231, 2}, {125, 32}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="278956568"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1523,11 +1512,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {480, 82}}</string>
 														<reference key="NSSuperview" ref="834173564"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="368748693"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{8, 199}, {484, 99}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="126676794"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1560,6 +1551,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{13, 47}, {454, 17}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="280316263"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1579,6 +1571,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{123, 3}, {100, 32}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="194441705"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1605,7 +1598,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{232, 3}, {125, 32}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
-																<reference key="NSNextKeyView" ref="145760790"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="753962594"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSButtonCell" key="NSCell" id="405315818">
@@ -1629,11 +1623,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {480, 79}}</string>
 														<reference key="NSSuperview" ref="278956568"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="207334049"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{8, 99}, {484, 96}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="902969450"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1653,8 +1649,33 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSTitlePosition">2</int>
 												<bool key="NSTransparent">NO</bool>
 											</object>
+											<object class="NSButton" id="753962594">
+												<reference key="NSNextResponder" ref="782866499"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{191, 55}, {118, 32}}</string>
+												<reference key="NSSuperview" ref="782866499"/>
+												<reference key="NSWindow"/>
+												<string key="NSReuseIdentifierKey">_NS:687</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="679395404">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Edit Cards…</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:687</string>
+													<reference key="NSControlView" ref="753962594"/>
+													<int key="NSButtonFlags">-2038284033</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
+										<reference key="NSSuperview" ref="145760790"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="834173564"/>
 									</object>
 									<string key="NSLabel">Memory Cards</string>
@@ -1662,13 +1683,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									<reference key="NSTabView" ref="145760790"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="150404821"/>
+							<reference key="NSSelectedTabViewItem" ref="683723192"/>
 							<reference key="NSFont" ref="113129670"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="309207255"/>
+								<reference ref="782866499"/>
 							</array>
 						</object>
 					</array>
@@ -1932,6 +1953,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">641</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">mcdEditClicked:</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="753962594"/>
+					</object>
+					<int key="connectionID">644</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -2313,6 +2342,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<array class="NSMutableArray" key="children">
 							<reference ref="834173564"/>
 							<reference ref="278956568"/>
+							<reference ref="753962594"/>
 						</array>
 						<reference key="parent" ref="683723192"/>
 					</object>
@@ -2921,6 +2951,19 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="322742106"/>
 						<reference key="parent" ref="260387224"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">642</int>
+						<reference key="object" ref="753962594"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="679395404"/>
+						</array>
+						<reference key="parent" ref="782866499"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">643</int>
+						<reference key="object" ref="679395404"/>
+						<reference key="parent" ref="753962594"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3075,12 +3118,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="642.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="643.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">641</int>
+			<int key="maxID">644</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3089,6 +3134,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string key="superclassName">NSWindowController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="mcdChangeClicked:">id</string>
+						<string key="mcdEditClicked:">id</string>
 						<string key="mcdNewClicked:">id</string>
 						<string key="setCheckbox:">id</string>
 						<string key="setCheckboxInverse:">id</string>
@@ -3099,6 +3145,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">mcdChangeClicked:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="mcdEditClicked:">
+							<string key="name">mcdEditClicked:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="mcdNewClicked:">
 							<string key="name">mcdNewClicked:</string>
 							<string key="candidateClassName">id</string>
@@ -3230,32 +3280,48 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<string key="minorKey">./Classes/ConfigurationController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NetSfPeopsSPUPluginNamedSlider</string>
+					<string key="superclassName">NSSlider</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetSfPeopsSPUPluginNamedSlider.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PluginController</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="doAbout:">id</string>
-						<string key="doConfigure:">id</string>
-						<string key="selectPlugin:">id</string>
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="reset:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="doAbout:">
-							<string key="name">doAbout:</string>
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="doConfigure:">
-							<string key="name">doConfigure:</string>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="selectPlugin:">
-							<string key="name">selectPlugin:</string>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="aboutButton">NSButton</string>
 						<string key="configureButton">NSButton</string>
+						<string key="hiCompBox">NSControl</string>
+						<string key="interpolValue">NetSfPeopsSPUPluginNamedSlider</string>
+						<string key="irqWaitBox">NSControl</string>
+						<string key="monoSoundBox">NSControl</string>
 						<string key="pluginMenu">NSPopUpButton</string>
+						<string key="reverbValue">NetSfPeopsSPUPluginNamedSlider</string>
+						<string key="volumeValue">NetSfPeopsSPUPluginNamedSlider</string>
+						<string key="xaEnableBox">NSControl</string>
+						<string key="xaSpeedBox">NSControl</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="aboutButton">
@@ -3266,10 +3332,42 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">configureButton</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="hiCompBox">
+							<string key="name">hiCompBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="interpolValue">
+							<string key="name">interpolValue</string>
+							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="irqWaitBox">
+							<string key="name">irqWaitBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="monoSoundBox">
+							<string key="name">monoSoundBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="pluginMenu">
 							<string key="name">pluginMenu</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="reverbValue">
+							<string key="name">reverbValue</string>
+							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="volumeValue">
+							<string key="name">volumeValue</string>
+							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="xaEnableBox">
+							<string key="name">xaEnableBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="xaSpeedBox">
+							<string key="name">xaSpeedBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
diff --git a/macosx/English.lproj/MemCardManager.xib b/macosx/English.lproj/MemCardManager.xib
new file mode 100644
index 00000000..7693b376
--- /dev/null
+++ b/macosx/English.lproj/MemCardManager.xib
@@ -0,0 +1,1297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1938</string>
+		</object>
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>NSScroller</string>
+			<string>NSArrayController</string>
+			<string>NSButton</string>
+			<string>NSScrollView</string>
+			<string>NSButtonCell</string>
+			<string>NSImageView</string>
+			<string>NSBox</string>
+			<string>NSImageCell</string>
+			<string>NSCollectionViewItem</string>
+			<string>NSTextFieldCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCollectionView</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTextField</string>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">PcsxrMemCardController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {469, 329}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Memory Card Manager</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{469, 329}</string>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSButton" id="146799775">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{203, 228}, {63, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="589069415"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="786361046">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">&lt;-</string>
+								<object class="NSFont" key="NSSupport" id="172555512">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="146799775"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="589069415">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{203, 94}, {63, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="3271293"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="55938044">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">-&gt;</string>
+								<reference key="NSSupport" ref="172555512"/>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="589069415"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="3271293">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSClipView" id="461514026">
+									<reference key="NSNextResponder" ref="3271293"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSCollectionView" id="810056114">
+											<reference key="NSNextResponder" ref="461514026"/>
+											<int key="NSvFlags">274</int>
+											<string key="NSFrameSize">{179, 246}</string>
+											<reference key="NSSuperview" ref="461514026"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="250504439"/>
+											<string key="NSReuseIdentifierKey">_NS:3367</string>
+											<string key="NSMinGridSize">{0, 0}</string>
+											<string key="NSMaxGridSize">{0, 0}</string>
+											<int key="NSMaxNumberOfGridRows">0</int>
+											<int key="NSMaxNumberOfGridColumns">0</int>
+											<object class="NSArray" key="NSBackgroundColors">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSColor" id="550790222">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlBackgroundColor</string>
+													<object class="NSColor" key="NSColor" id="403191047">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+													</object>
+												</object>
+											</object>
+											<bool key="NSSelectable">YES</bool>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 1}, {179, 246}}</string>
+									<reference key="NSSuperview" ref="3271293"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="810056114"/>
+									<string key="NSReuseIdentifierKey">_NS:3365</string>
+									<reference key="NSDocView" ref="810056114"/>
+									<object class="NSColor" key="NSBGColor" id="97894706">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlColor</string>
+										<reference key="NSColor" ref="403191047"/>
+									</object>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="250504439">
+									<reference key="NSNextResponder" ref="3271293"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{234, 1}, {15, 143}}</string>
+									<reference key="NSSuperview" ref="3271293"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="94339054"/>
+									<string key="NSReuseIdentifierKey">_NS:3372</string>
+									<reference key="NSTarget" ref="3271293"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.89655172824859619</double>
+								</object>
+								<object class="NSScroller" id="94339054">
+									<reference key="NSNextResponder" ref="3271293"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 144}, {233, 15}}</string>
+									<reference key="NSSuperview" ref="3271293"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="585997809"/>
+									<string key="NSReuseIdentifierKey">_NS:3374</string>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="3271293"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.63157892227172852</double>
+								</object>
+							</object>
+							<string key="NSFrame">{{268, 61}, {181, 248}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="461514026"/>
+							<string key="NSReuseIdentifierKey">_NS:3363</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="250504439"/>
+							<reference key="NSHScroller" ref="94339054"/>
+							<reference key="NSContentView" ref="461514026"/>
+						</object>
+						<object class="NSScrollView" id="61726387">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSClipView" id="959059855">
+									<reference key="NSNextResponder" ref="61726387"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSCollectionView" id="311112059">
+											<reference key="NSNextResponder" ref="959059855"/>
+											<int key="NSvFlags">274</int>
+											<string key="NSFrameSize">{179, 246}</string>
+											<reference key="NSSuperview" ref="959059855"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="340725522"/>
+											<string key="NSReuseIdentifierKey">_NS:3367</string>
+											<string key="NSMinGridSize">{0, 0}</string>
+											<string key="NSMaxGridSize">{0, 0}</string>
+											<int key="NSMaxNumberOfGridRows">0</int>
+											<int key="NSMaxNumberOfGridColumns">0</int>
+											<object class="NSArray" key="NSBackgroundColors">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<reference ref="550790222"/>
+											</object>
+											<bool key="NSSelectable">YES</bool>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 1}, {179, 246}}</string>
+									<reference key="NSSuperview" ref="61726387"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="311112059"/>
+									<string key="NSReuseIdentifierKey">_NS:3365</string>
+									<reference key="NSDocView" ref="311112059"/>
+									<reference key="NSBGColor" ref="97894706"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="340725522">
+									<reference key="NSNextResponder" ref="61726387"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{234, 1}, {15, 143}}</string>
+									<reference key="NSSuperview" ref="61726387"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="483720157"/>
+									<string key="NSReuseIdentifierKey">_NS:3372</string>
+									<reference key="NSTarget" ref="61726387"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.89655172824859619</double>
+								</object>
+								<object class="NSScroller" id="483720157">
+									<reference key="NSNextResponder" ref="61726387"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 144}, {233, 15}}</string>
+									<reference key="NSSuperview" ref="61726387"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="146799775"/>
+									<string key="NSReuseIdentifierKey">_NS:3374</string>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="61726387"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.63157892227172852</double>
+								</object>
+							</object>
+							<string key="NSFrame">{{20, 61}, {181, 248}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="959059855"/>
+							<string key="NSReuseIdentifierKey">_NS:3363</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="340725522"/>
+							<reference key="NSHScroller" ref="483720157"/>
+							<reference key="NSContentView" ref="959059855"/>
+						</object>
+						<object class="NSButton" id="487496353">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{261, 25}, {85, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="740252127"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<int key="NSTag">2</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="970637097">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Format</string>
+								<reference key="NSSupport" ref="172555512"/>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="487496353"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="585997809">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{13, 25}, {85, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="19827681"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="34929321">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Format</string>
+								<reference key="NSSupport" ref="172555512"/>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="585997809"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="19827681">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{127, 25}, {80, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="487496353"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<int key="NSTag">1</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="520851481">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Delete</string>
+								<reference key="NSSupport" ref="172555512"/>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="19827681"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="740252127">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{374, 25}, {80, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<string key="NSReuseIdentifierKey">_NS:687</string>
+							<int key="NSTag">2</int>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="855953129">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Delete</string>
+								<reference key="NSSupport" ref="172555512"/>
+								<string key="NSCellIdentifier">_NS:687</string>
+								<reference key="NSControlView" ref="740252127"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{469, 329}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="61726387"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{469, 351}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCollectionViewItem" id="613808531"/>
+			<object class="NSView" id="31895823">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">256</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSBox" id="1010857926">
+						<reference key="NSNextResponder" ref="31895823"/>
+						<int key="NSvFlags">36</int>
+						<object class="NSMutableArray" key="NSSubviews">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSView" id="729211047">
+								<reference key="NSNextResponder" ref="1010857926"/>
+								<int key="NSvFlags">274</int>
+								<object class="NSMutableArray" key="NSSubviews">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<object class="NSImageView" id="521369065">
+										<reference key="NSNextResponder" ref="729211047"/>
+										<int key="NSvFlags">269</int>
+										<object class="NSMutableSet" key="NSDragTypes">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSArray" key="set.sortedObjects">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<string>Apple PDF pasteboard type</string>
+												<string>Apple PICT pasteboard type</string>
+												<string>Apple PNG pasteboard type</string>
+												<string>NSFilenamesPboardType</string>
+												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+												<string>NeXT TIFF v4.0 pasteboard type</string>
+											</object>
+										</object>
+										<string key="NSFrame">{{55, 63}, {32, 32}}</string>
+										<reference key="NSSuperview" ref="729211047"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="953575115"/>
+										<string key="NSReuseIdentifierKey">_NS:2141</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSImageCell" key="NSCell" id="876299043">
+											<int key="NSCellFlags">130560</int>
+											<int key="NSCellFlags2">33554432</int>
+											<string key="NSCellIdentifier">_NS:2141</string>
+											<int key="NSAlign">0</int>
+											<int key="NSScale">0</int>
+											<int key="NSStyle">0</int>
+											<bool key="NSAnimates">NO</bool>
+										</object>
+										<bool key="NSEditable">YES</bool>
+									</object>
+									<object class="NSTextField" id="953575115">
+										<reference key="NSNextResponder" ref="729211047"/>
+										<int key="NSvFlags">266</int>
+										<string key="NSFrame">{{15, 38}, {115, 17}}</string>
+										<reference key="NSSuperview" ref="729211047"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="923740855"/>
+										<string key="NSReuseIdentifierKey">_NS:3944</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSTextFieldCell" key="NSCell" id="522673337">
+											<int key="NSCellFlags">68288064</int>
+											<int key="NSCellFlags2">138413056</int>
+											<string key="NSContents">English name</string>
+											<reference key="NSSupport" ref="172555512"/>
+											<string key="NSCellIdentifier">_NS:3944</string>
+											<reference key="NSControlView" ref="953575115"/>
+											<reference key="NSBackgroundColor" ref="97894706"/>
+											<object class="NSColor" key="NSTextColor" id="24740116">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">controlTextColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MAA</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<object class="NSTextField" id="923740855">
+										<reference key="NSNextResponder" ref="729211047"/>
+										<int key="NSvFlags">266</int>
+										<string key="NSFrame">{{15, 16}, {115, 17}}</string>
+										<reference key="NSSuperview" ref="729211047"/>
+										<reference key="NSWindow"/>
+										<string key="NSReuseIdentifierKey">_NS:3944</string>
+										<bool key="NSEnabled">YES</bool>
+										<object class="NSTextFieldCell" key="NSCell" id="459126093">
+											<int key="NSCellFlags">68288064</int>
+											<int key="NSCellFlags2">138413056</int>
+											<string key="NSContents">SJIS name</string>
+											<reference key="NSSupport" ref="172555512"/>
+											<string key="NSCellIdentifier">_NS:3944</string>
+											<reference key="NSControlView" ref="923740855"/>
+											<reference key="NSBackgroundColor" ref="97894706"/>
+											<reference key="NSTextColor" ref="24740116"/>
+										</object>
+									</object>
+								</object>
+								<string key="NSFrameSize">{143, 108}</string>
+								<reference key="NSSuperview" ref="1010857926"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="521369065"/>
+								<string key="NSReuseIdentifierKey">_NS:11</string>
+							</object>
+						</object>
+						<string key="NSFrame">{{1, 0}, {143, 108}}</string>
+						<reference key="NSSuperview" ref="31895823"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="729211047"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<string key="NSOffsets">{0, 0}</string>
+						<object class="NSTextFieldCell" key="NSTitleCell">
+							<int key="NSCellFlags">67239424</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Box</string>
+							<object class="NSFont" key="NSSupport">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">11</double>
+								<int key="NSfFlags">3100</int>
+							</object>
+							<object class="NSColor" key="NSBackgroundColor">
+								<int key="NSColorSpace">6</int>
+								<string key="NSCatalogName">System</string>
+								<string key="NSColorName">textBackgroundColor</string>
+								<object class="NSColor" key="NSColor" id="622525311">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+							</object>
+							<object class="NSColor" key="NSTextColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+							</object>
+						</object>
+						<reference key="NSContentView" ref="729211047"/>
+						<int key="NSBorderType">0</int>
+						<int key="NSBoxType">4</int>
+						<int key="NSTitlePosition">2</int>
+						<bool key="NSTransparent">NO</bool>
+						<object class="NSColor" key="NSFillColor2">
+							<int key="NSColorSpace">6</int>
+							<string key="NSCatalogName">System</string>
+							<string key="NSColorName">selectedControlColor</string>
+							<reference key="NSColor" ref="622525311"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{144, 108}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="1010857926"/>
+			</object>
+			<object class="NSArrayController" id="625795604">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>englishName</string>
+					<string>sjisName</string>
+					<string>memImage</string>
+				</object>
+				<string key="NSObjectClassName">PcsxrMemoryObject</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+			<object class="NSArrayController" id="668165842">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>englishName</string>
+					<string>sjisName</string>
+					<string>memImage</string>
+				</object>
+				<string key="NSObjectClassName">PcsxrMemoryObject</string>
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveToLeft:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="146799775"/>
+					</object>
+					<int key="connectionID">11</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveToRight:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="589069415"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">leftMove</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="146799775"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">rightMove</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="589069415"/>
+					</object>
+					<int key="connectionID">14</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard1view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="311112059"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">memCard2view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="810056114"/>
+					</object>
+					<int key="connectionID">40</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">41</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">formatCard:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="487496353"/>
+					</object>
+					<int key="connectionID">70</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">formatCard:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="585997809"/>
+					</object>
+					<int key="connectionID">71</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteMemoryObject:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="19827681"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">deleteMemoryObject:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="740252127"/>
+					</object>
+					<int key="connectionID">73</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">itemPrototype</string>
+						<reference key="source" ref="810056114"/>
+						<reference key="destination" ref="613808531"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="810056114"/>
+						<reference key="destination" ref="668165842"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="810056114"/>
+							<reference key="NSDestination" ref="668165842"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">51</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="613808531"/>
+						<reference key="destination" ref="31895823"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">itemPrototype</string>
+						<reference key="source" ref="311112059"/>
+						<reference key="destination" ref="613808531"/>
+					</object>
+					<int key="connectionID">27</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">content: arrangedObjects</string>
+						<reference key="source" ref="311112059"/>
+						<reference key="destination" ref="625795604"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="311112059"/>
+							<reference key="NSDestination" ref="625795604"/>
+							<string key="NSLabel">content: arrangedObjects</string>
+							<string key="NSBinding">content</string>
+							<string key="NSKeyPath">arrangedObjects</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">49</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.memImage</string>
+						<reference key="source" ref="521369065"/>
+						<reference key="destination" ref="613808531"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="521369065"/>
+							<reference key="NSDestination" ref="613808531"/>
+							<string key="NSLabel">value: representedObject.memImage</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.memImage</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.englishName</string>
+						<reference key="source" ref="953575115"/>
+						<reference key="destination" ref="613808531"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="953575115"/>
+							<reference key="NSDestination" ref="613808531"/>
+							<string key="NSLabel">value: representedObject.englishName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.englishName</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">57</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: representedObject.sjisName</string>
+						<reference key="source" ref="923740855"/>
+						<reference key="destination" ref="613808531"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="923740855"/>
+							<reference key="NSDestination" ref="613808531"/>
+							<string key="NSLabel">value: representedObject.sjisName</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">representedObject.sjisName</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">59</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: memCard1Array</string>
+						<reference key="source" ref="625795604"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="625795604"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: memCard1Array</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">memCard1Array</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">47</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: memCard2Array</string>
+						<reference key="source" ref="668165842"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="668165842"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">contentArray: memCard2Array</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">memCard2Array</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">45</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<object class="NSArray" key="object" id="1002">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1006"/>
+						</object>
+						<reference key="parent" ref="1002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="146799775"/>
+							<reference ref="589069415"/>
+							<reference ref="3271293"/>
+							<reference ref="61726387"/>
+							<reference ref="487496353"/>
+							<reference ref="585997809"/>
+							<reference ref="740252127"/>
+							<reference ref="19827681"/>
+						</object>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="146799775"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="786361046"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="786361046"/>
+						<reference key="parent" ref="146799775"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="589069415"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="55938044"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="55938044"/>
+						<reference key="parent" ref="589069415"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="3271293"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="810056114"/>
+							<reference ref="94339054"/>
+							<reference ref="250504439"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="810056114"/>
+						<reference key="parent" ref="3271293"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="94339054"/>
+						<reference key="parent" ref="3271293"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="250504439"/>
+						<reference key="parent" ref="3271293"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="613808531"/>
+						<reference key="parent" ref="1002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="31895823"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1010857926"/>
+						</object>
+						<reference key="parent" ref="1002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="61726387"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="340725522"/>
+							<reference ref="483720157"/>
+							<reference ref="311112059"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="340725522"/>
+						<reference key="parent" ref="61726387"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="483720157"/>
+						<reference key="parent" ref="61726387"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="311112059"/>
+						<reference key="parent" ref="61726387"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">36</int>
+						<reference key="object" ref="625795604"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">MemCard1</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">37</int>
+						<reference key="object" ref="668165842"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">MemCard2</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="1010857926"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="923740855"/>
+							<reference ref="953575115"/>
+							<reference ref="521369065"/>
+						</object>
+						<reference key="parent" ref="31895823"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="521369065"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="876299043"/>
+						</object>
+						<reference key="parent" ref="1010857926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="876299043"/>
+						<reference key="parent" ref="521369065"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="953575115"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="522673337"/>
+						</object>
+						<reference key="parent" ref="1010857926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">33</int>
+						<reference key="object" ref="522673337"/>
+						<reference key="parent" ref="953575115"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">34</int>
+						<reference key="object" ref="923740855"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="459126093"/>
+						</object>
+						<reference key="parent" ref="1010857926"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">35</int>
+						<reference key="object" ref="459126093"/>
+						<reference key="parent" ref="923740855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">62</int>
+						<reference key="object" ref="487496353"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="970637097"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="970637097"/>
+						<reference key="parent" ref="487496353"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">64</int>
+						<reference key="object" ref="585997809"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="34929321"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">65</int>
+						<reference key="object" ref="34929321"/>
+						<reference key="parent" ref="585997809"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">66</int>
+						<reference key="object" ref="19827681"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="520851481"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">67</int>
+						<reference key="object" ref="520851481"/>
+						<reference key="parent" ref="19827681"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">68</int>
+						<reference key="object" ref="740252127"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="855953129"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">69</int>
+						<reference key="object" ref="855953129"/>
+						<reference key="parent" ref="740252127"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>1.IBPluginDependency</string>
+					<string>1.IBWindowTemplateEditedContentRect</string>
+					<string>1.NSWindowTemplate.visibleAtLaunch</string>
+					<string>10.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>16.IBPluginDependency</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
+					<string>2.IBPluginDependency</string>
+					<string>20.IBPluginDependency</string>
+					<string>23.IBPluginDependency</string>
+					<string>24.IBPluginDependency</string>
+					<string>25.IBPluginDependency</string>
+					<string>26.IBPluginDependency</string>
+					<string>30.IBPluginDependency</string>
+					<string>31.IBPluginDependency</string>
+					<string>32.IBPluginDependency</string>
+					<string>33.IBPluginDependency</string>
+					<string>34.IBPluginDependency</string>
+					<string>35.IBPluginDependency</string>
+					<string>36.IBPluginDependency</string>
+					<string>37.IBPluginDependency</string>
+					<string>61.IBPluginDependency</string>
+					<string>62.IBPluginDependency</string>
+					<string>63.IBPluginDependency</string>
+					<string>64.IBPluginDependency</string>
+					<string>65.IBPluginDependency</string>
+					<string>66.IBPluginDependency</string>
+					<string>67.IBPluginDependency</string>
+					<string>68.IBPluginDependency</string>
+					<string>69.IBPluginDependency</string>
+					<string>7.IBPluginDependency</string>
+					<string>8.IBPluginDependency</string>
+					<string>9.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{357, 418}, {480, 270}}</string>
+					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="1002"/>
+				<reference key="dict.values" ref="1002"/>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="1002"/>
+				<reference key="dict.values" ref="1002"/>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">73</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">PcsxrMemCardController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>deleteMemoryObject:</string>
+							<string>formatCard:</string>
+							<string>moveToLeft:</string>
+							<string>moveToRight:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>deleteMemoryObject:</string>
+							<string>formatCard:</string>
+							<string>moveToLeft:</string>
+							<string>moveToRight:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">deleteMemoryObject:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">formatCard:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moveToLeft:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moveToRight:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>leftMove</string>
+							<string>memCard1view</string>
+							<string>memCard2view</string>
+							<string>rightMove</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
+							<string>NSCollectionView</string>
+							<string>NSCollectionView</string>
+							<string>NSButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>leftMove</string>
+							<string>memCard1view</string>
+							<string>memCard2view</string>
+							<string>rightMove</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">leftMove</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">memCard1view</string>
+								<string key="candidateClassName">NSCollectionView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">memCard2view</string>
+								<string key="candidateClassName">NSCollectionView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">rightMove</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PcsxrMemCardController.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index affd7768..e46858a5 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -43,6 +43,9 @@
 		559DAC47146BA61F00C5DF71 /* PeopsAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 28B467F11463D0020083F129 /* PeopsAL.psxplugin */; };
 		559DACBB146C68C500C5DF71 /* DFNet.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 559DACAE146C647E00C5DF71 /* DFNet.psxplugin */; };
 		559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 559DACEC146C72FF00C5DF71 /* Localizable.strings */; };
+		55A90220147D7C380037E18F /* PcsxrMemCardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55A9021F147D7C380037E18F /* PcsxrMemCardController.m */; };
+		55A90223147D7C7A0037E18F /* MemCardManager.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55A90221147D7C7A0037E18F /* MemCardManager.xib */; };
+		55A90229147D89380037E18F /* PcsxrMemoryObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 55A90228147D89380037E18F /* PcsxrMemoryObject.m */; };
 		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
 		712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
 		713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
@@ -274,6 +277,11 @@
 		559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
 		559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFNet.xcodeproj; path = plugins/DFNet/DFNet.xcodeproj; sourceTree = "<group>"; };
 		559DACED146C72FF00C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = Localizable.strings; sourceTree = "<group>"; };
+		55A9021E147D7C380037E18F /* PcsxrMemCardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardController.h; sourceTree = "<group>"; };
+		55A9021F147D7C380037E18F /* PcsxrMemCardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardController.m; sourceTree = "<group>"; };
+		55A90222147D7C7A0037E18F /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MemCardManager.xib; sourceTree = "<group>"; };
+		55A90227147D89380037E18F /* PcsxrMemoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemoryObject.h; sourceTree = "<group>"; };
+		55A90228147D89380037E18F /* PcsxrMemoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemoryObject.m; sourceTree = "<group>"; };
 		712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
 		712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
 		712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = "<group>"; };
@@ -417,6 +425,7 @@
 				559DACEC146C72FF00C5DF71 /* Localizable.strings */,
 				28F0C3C7146521B000A90285 /* PCSXR.xib */,
 				28F0C3CA146521B700A90285 /* AddPluginSheet.xib */,
+				55A90221147D7C7A0037E18F /* MemCardManager.xib */,
 			);
 			name = Resources;
 			path = English.lproj;
@@ -458,6 +467,10 @@
 				2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */,
 				2B3E356A06937D1C00763C7D /* PcsxrPluginDocument.h */,
 				2B3E356B06937D1C00763C7D /* PcsxrPluginDocument.m */,
+				55A9021E147D7C380037E18F /* PcsxrMemCardController.h */,
+				55A9021F147D7C380037E18F /* PcsxrMemCardController.m */,
+				55A90227147D89380037E18F /* PcsxrMemoryObject.h */,
+				55A90228147D89380037E18F /* PcsxrMemoryObject.m */,
 			);
 			name = MacOSX;
 			sourceTree = "<group>";
@@ -767,6 +780,7 @@
 				28F0C3C9146521B000A90285 /* PCSXR.xib in Resources */,
 				28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */,
 				559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */,
+				55A90223147D7C7A0037E18F /* MemCardManager.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -822,6 +836,8 @@
 				556A148412B6DE1A007DE998 /* ppc.c in Sources */,
 				556A148512B6DE1A007DE998 /* pR3000A.c in Sources */,
 				556A148612B6DE1A007DE998 /* reguse.c in Sources */,
+				55A90220147D7C380037E18F /* PcsxrMemCardController.m in Sources */,
+				55A90229147D89380037E18F /* PcsxrMemoryObject.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -914,6 +930,14 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		55A90221147D7C7A0037E18F /* MemCardManager.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				55A90222147D7C7A0037E18F /* English */,
+			);
+			name = MemCardManager.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/macosx/PcsxrMemCardController.h b/macosx/PcsxrMemCardController.h
new file mode 100644
index 00000000..61019d82
--- /dev/null
+++ b/macosx/PcsxrMemCardController.h
@@ -0,0 +1,27 @@
+//
+//  PcsxrMemCardManager.h
+//  Pcsxr
+//
+//  Created by Charles Betts on 11/23/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface PcsxrMemCardController : NSWindowController
+{
+	IBOutlet NSCollectionView *memCard1view;
+	IBOutlet NSCollectionView *memCard2view;
+	IBOutlet NSButton *leftMove;
+	IBOutlet NSButton *rightMove;
+	NSMutableArray *memCard1Array;
+	NSMutableArray *memCard2Array;
+}
+
+- (IBAction)moveToLeft:(id)sender;
+- (IBAction)moveToRight:(id)sender;
+- (IBAction)formatCard:(id)sender;
+- (IBAction)deleteMemoryObject:(id)sender;
+- (void)loadMemoryCardInfoForCard:(int)theCard;
+@end
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
new file mode 100644
index 00000000..454da1d3
--- /dev/null
+++ b/macosx/PcsxrMemCardController.m
@@ -0,0 +1,185 @@
+//
+//  PcsxrMemCardManager.m
+//  Pcsxr
+//
+//  Created by Charles Betts on 11/23/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrMemCardController.h"
+#import "PcsxrMemoryObject.h"
+#include "sio.h"
+
+#define MAX_MEMCARD_BLOCKS 15
+
+static inline NSImage *imageFromMcd(short * icon)
+{
+	NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
+	//[imageRep setSize:NSMakeSize(32, 32)];
+	//[imageRep setBitsPerSample:32];
+	
+#if 0
+	int x, y, c;
+	for (y = 0; y < 32; y++) {
+		for (x = 0; x < 32; x++) {
+			c = icon[(y>>1) * 16 + (x>>1)];
+			c = ((c & 0x001f) << 10) | ((c & 0x7c00) >> 10) | (c & 0x03e0);
+			c = ((c & 0x001f) << 3) | ((c & 0x03e0) << 6) | ((c & 0x7c00) << 9);
+			
+			NSUInteger NSc = c;
+			
+			[imageRep setPixel:&NSc atX:x y:y];
+		}
+	}
+#else
+	int x, y, c, i, r, g, b;
+	for (i = 0; i < 256; i++) {
+		x = (i % 16);
+		y = (i / 16);
+		c = icon[i];
+		r = (c & 0x001f) << 3;
+		g = ((c & 0x03e0) >> 5) << 3;
+		b = ((c & 0x7c00) >> 10) << 3;
+		[imageRep setColor:[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] atX:x y:y];
+	}
+#endif
+	NSImage *theImage = [[NSImage alloc] init];
+	[theImage addRepresentation:imageRep];
+	[imageRep release];
+	return [theImage autorelease];
+}
+
+@implementation PcsxrMemCardController
+
+//memCard1Array KVO functions
+
+-(void)insertObject:(PcsxrMemoryObject *)p inMemCard1ArrayAtIndex:(NSUInteger)index {
+    [memCard1Array insertObject:p atIndex:index];
+}
+
+-(void)removeObjectFromMemCard1ArrayAtIndex:(NSUInteger)index {
+    [memCard1Array removeObjectAtIndex:index];
+}
+
+- (void)setMemCard1Array:(NSMutableArray *)a
+{
+	if (memCard1Array != a) {
+		[memCard1Array release];
+		memCard1Array = [[NSMutableArray alloc] initWithArray:a];
+	}
+}
+
+- (NSArray *)memCard1Array
+{
+	return memCard1Array;
+}
+
+//memCard2Array KVO functions
+
+-(void)insertObject:(PcsxrMemoryObject *)p inMemCard2ArrayAtIndex:(NSUInteger)index {
+    [memCard2Array insertObject:p atIndex:index];
+}
+
+-(void)removeObjectFromMemCard2ArrayAtIndex:(NSUInteger)index {
+    [memCard2Array removeObjectAtIndex:index];
+}
+
+- (void)setMemCard2Array:(NSMutableArray *)a
+{
+	if (memCard2Array != a) {
+		[memCard2Array release];
+		memCard2Array = [[NSMutableArray alloc] initWithArray:a];
+	}
+}
+
+- (NSArray *)memCard2Array
+{
+	return memCard2Array;
+}
+
+
+- (id)init
+{
+	self = [self initWithWindowNibName:@"MemCardManager"];
+	return self;
+}
+
+- (id)initWithWindow:(NSWindow *)window
+{
+    self = [super initWithWindow:window];
+    if (self) {
+        LoadMcds(Config.Mcd1, Config.Mcd2);
+		[self setMemCard1Array:[[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS]];
+		[self setMemCard2Array:[[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS]];
+    }
+    
+    return self;
+}
+
+- (void)loadMemoryCardInfoForCard:(int)theCard
+{
+	NSInteger i;
+	McdBlock info;
+	NSMutableArray *newArray = [[NSMutableArray alloc] initWithCapacity:MAX_MEMCARD_BLOCKS];
+	
+	for (i = 0; i < MAX_MEMCARD_BLOCKS; i++) {
+		GetMcdBlockInfo(theCard, i, &info);
+		PcsxrMemoryObject *ob = [[PcsxrMemoryObject alloc] init];
+		NSString *engDes = nil, *japDes = nil;
+		ob.englishName = [NSString stringWithCString:info.Title encoding:NSASCIIStringEncoding];
+		ob.sjisName = [NSString stringWithCString:info.sTitle encoding:NSShiftJISStringEncoding];
+		ob.memImage = imageFromMcd(info.Icon);
+		ob.memNumber = i;
+		[newArray insertObject:ob atIndex:i];
+		[ob release];
+	}
+	if (theCard == 1) {
+		[self setMemCard1Array:newArray];
+	} else {
+		[self setMemCard2Array:newArray];
+	}
+	[newArray release];
+}
+
+- (void)windowDidLoad
+{
+    [super windowDidLoad];
+    
+    // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
+	[self loadMemoryCardInfoForCard:1];
+	[self loadMemoryCardInfoForCard:2];
+}
+
+- (IBAction)moveToLeft:(id)sender
+{
+	
+}
+
+- (IBAction)moveToRight:(id)sender
+{
+	
+}
+
+- (IBAction)formatCard:(id)sender
+{
+	NSInteger memCardSelect = [sender tag];
+	if (memCardSelect == 1) {
+		CreateMcd(Config.Mcd1);
+		[self loadMemoryCardInfoForCard:1];
+	} else {
+		CreateMcd(Config.Mcd2);
+		[self loadMemoryCardInfoForCard:2];
+	}
+}
+
+- (IBAction)deleteMemoryObject:(id)sender {
+	NSInteger memCardSelect = [sender tag];
+	if (memCardSelect == 1) {
+		
+		[self loadMemoryCardInfoForCard:1];
+	} else {
+		
+		[self loadMemoryCardInfoForCard:2];
+	}
+}
+@end
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
new file mode 100644
index 00000000..6db851ae
--- /dev/null
+++ b/macosx/PcsxrMemoryObject.h
@@ -0,0 +1,25 @@
+//
+//  PcsxrMemoryObject.h
+//  Pcsxr
+//
+//  Created by Charles Betts on 11/23/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+
+@interface PcsxrMemoryObject : NSObject
+{
+	NSString *englishName;
+	NSString *sjisName;
+	NSImage *memImage;
+	short memNumber;
+}
+
+@property(copy, readwrite) NSString * englishName;
+@property(copy, readwrite) NSString * sjisName;
+@property(retain, readwrite) NSImage * memImage;
+@property(readwrite) short memNumber;
+
+
+@end
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m
new file mode 100644
index 00000000..6d7263c1
--- /dev/null
+++ b/macosx/PcsxrMemoryObject.m
@@ -0,0 +1,25 @@
+//
+//  PcsxrMemoryObject.m
+//  Pcsxr
+//
+//  Created by Charles Betts on 11/23/11.
+//  Copyright (c) 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "PcsxrMemoryObject.h"
+
+@implementation PcsxrMemoryObject
+
+@synthesize englishName;
+@synthesize sjisName;
+@synthesize memImage;
+@synthesize memNumber;
+
+- (void)dealloc
+{
+	[englishName release];
+	[sjisName release];
+	[memImage release];
+}
+
+@end
-- 
cgit v1.2.3