From fcbefda1f5a618a1684aa3d853084b028b2d5d5b Mon Sep 17 00:00:00 2001
From: dborth <dborth@ab33defa-829a-11dd-99d6-6900107db72b>
Date: Thu, 2 Oct 2008 21:07:38 +0000
Subject: [PATCH] minor changes

---
 source/ngc/filesel.h      |  3 +--
 source/ngc/smbop.cpp      |  3 +--
 source/ngc/vbasupport.cpp |  5 +----
 source/ngc/vmmem.cpp      | 11 -----------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/source/ngc/filesel.h b/source/ngc/filesel.h
index f27640e..047a678 100644
--- a/source/ngc/filesel.h
+++ b/source/ngc/filesel.h
@@ -33,8 +33,7 @@ extern int offset;
 extern int selection;
 extern char currentdir[MAXPATHLEN];
 extern int maxfiles;
-
-extern char ROMFilename[512];
+extern char romFilename[512];
 
 void AllocSaveBuffer();
 void FreeSaveBuffer();
diff --git a/source/ngc/smbop.cpp b/source/ngc/smbop.cpp
index 3d30650..bcde360 100644
--- a/source/ngc/smbop.cpp
+++ b/source/ngc/smbop.cpp
@@ -85,7 +85,7 @@ ConnectShare (bool silent)
 		strlen(GCSettings.smbip) == 0)
 	{
 		if(!silent)
-			WaitPrompt((char*) "Invalid network settings. Check SNES9xGX.xml.");
+			WaitPrompt((char*) "Invalid network settings. Check VBAGX.xml.");
 		return false;
 	}
 
@@ -319,7 +319,6 @@ LoadBufferFromSMB (char * sbuffer, char *filepath, int length, bool silent)
 
 		if (IsZipFile (sbuffer))
 		{
-			WaitPrompt("In a ZIP");
 			boffset = UnZipFile ((unsigned char *)sbuffer, smbfile); // unzip from SMB
 		}
 		else
diff --git a/source/ngc/vbasupport.cpp b/source/ngc/vbasupport.cpp
index 6fb4951..a8fce21 100644
--- a/source/ngc/vbasupport.cpp
+++ b/source/ngc/vbasupport.cpp
@@ -81,7 +81,7 @@ int systemColorDepth = 0;
 u16 systemGbPalette[24];
 u16 systemColorMap16[0x10000];
 //u32 systemColorMap32[0x10000];
-u32 *systemColorMap32 = (u32 *)&systemColorMap16;
+u32 *systemColorMap32 = NULL;
 
 struct EmulatedSystem emulator =
 {
@@ -509,9 +509,6 @@ bool LoadGBROM(int method)
 
 	systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
 
-	if(method == METHOD_AUTO)
-		method = autoLoadMethod();
-
 	switch (method)
 	{
 		case METHOD_SD:
diff --git a/source/ngc/vmmem.cpp b/source/ngc/vmmem.cpp
index c404256..59e97ac 100644
--- a/source/ngc/vmmem.cpp
+++ b/source/ngc/vmmem.cpp
@@ -107,9 +107,6 @@ bool VMCPULoadROM(int method)
 	GBAROMSize = 0;
 	rom = (u8 *)MEM2Storage;
 
-	if(method == METHOD_AUTO)
-		method = autoLoadMethod();
-
 	switch (method)
 	{
 		case METHOD_SD:
@@ -385,18 +382,10 @@ int VMCPULoadROM(int method)
 
 	loadtimeradjust = useVM = GBAROMSize = 0;
 
-	if(method == METHOD_AUTO)
-		method = autoLoadMethod();
-
 	switch (method)
 	{
 		case METHOD_SD:
 		case METHOD_USB:
-			if(!ChangeFATInterface(method, NOTSILENT))
-			{
-				VMClose();
-				return 0;
-			}
 		break;
 
 		case METHOD_DVD: