diff --git a/source/ngc/gamesettings.cpp b/source/ngc/gamesettings.cpp
new file mode 100644
index 0000000..91bf3b1
--- /dev/null
+++ b/source/ngc/gamesettings.cpp
@@ -0,0 +1,848 @@
+/****************************************************************************
+ * Visual Boy Advance GX
+ *
+ * Tantric October 2008
+ *
+ * gamesettings.cpp
+ *
+ * Game specific settings, pulled from vba-over.ini
+ ***************************************************************************/
+
+#include "gamesettings.h"
+
+int gameSettingsCount = 104;
+
+gameSetting gameSettings[104] = {
+	{
+	"Dragon Ball Z - The Legacy of Goku II (Europe)(En,Fr,De,Es,It)",
+	"ALFP",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Dragon Ball Z - The Legacy of Goku (Europe)(En,Fr,De,Es,It)",
+	"ALGP",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Rocky (Europe)(En,Fr,De,Es,It)",
+	"AROP",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Rocky (USA)(En,Fr,De,Es,It)",
+	"AR8e",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Pokemon - Ruby Version (USA, Europe)",
+	"AXVE",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Sapphire Version (USA, Europe)",
+	"AXPE",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Super Mario Advance 4 - Super Mario Bros. 3 (Europe)(En,Fr,De,Es,It)",
+	"AX4P",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Top Gun - Combat Zones (USA)(En,Fr,De,Es,It)",
+	"A2YE",
+	5,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Dragon Ball Z - Taiketsu (Europe)(En,Fr,De,Es,It)",
+	"BDBP",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Mario vs. Donkey Kong (Europe)",
+	"BM5P",
+	3,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Pokemon - Emerald Version (USA, Europe)",
+	"BPEE",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Yu-Gi-Oh! - Ultimate Masters - World Championship Tournament 2006 (Europe)(En,Jp,Fr,De,Es,It)",
+	"BY6P",
+	2,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Pokemon Mystery Dungeon - Red Rescue Team (USA, Australia)",
+	"B24E",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Classic NES Series - Castlevania (USA, Europe)",
+	"FADE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Bomberman (USA, Europe)",
+	"FBME",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Donkey Kong (USA, Europe)",
+	"FDKE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Dr. Mario (USA, Europe)",
+	"FDME",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Excitebike (USA, Europe)",
+	"FEBE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Ice Climber (USA, Europe)",
+	"FICE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Zelda II - The Adventure of Link (USA, Europe)",
+	"FLBE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Metroid (USA, Europe)",
+	"FMRE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Pac-Man (USA, Europe)",
+	"FP7E",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Super Mario Bros. (USA, Europe)",
+	"FSME",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Xevious (USA, Europe)",
+	"FXVE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Classic NES Series - Legend of Zelda (USA, Europe)",
+	"FZLE",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Yoshi's Universal Gravitation (Europe)(En,Fr,De,Es,It)",
+	"KYGP",
+	4,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Boktai - The Sun Is in Your Hand (Europe)(En,Fr,De,Es,It)",
+	"U3IP",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Boktai 2 - Solar Boy Django (Europe)(En,Fr,De,Es,It)",
+	"U32P",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Golden Sun - The Lost Age (USA)",
+	"AGFE",
+	-1,
+	1,
+	0x10000,
+	-1
+	},
+	{
+	"Golden Sun (USA)",
+	"AGSE",
+	-1,
+	1,
+	0x10000,
+	-1
+	},
+	{
+	"Dragon Ball Z - The Legacy of Goku II (USA)",
+	"ALFE",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Dragon Ball Z - The Legacy of Goku (USA)",
+	"ALGE",
+	1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Super Mario Advance 4 - Super Mario Bros 3 - Super Mario Advance 4 v1.1 (USA)",
+	"AX4E",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Dragon Ball Z - Taiketsu (USA)",
+	"BDBE",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Dragon Ball Z - Buu's Fury (USA)",
+	"BG3E",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"2 Games in 1 - Dragon Ball Z - The Legacy of Goku I & II (USA)",
+	"BLFE",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Pokemon - Fire Red Version (USA, Europe)",
+	"BPRE",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Leaf Green Version (USA, Europe)",
+	"BPGE",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Dragon Ball GT - Transformation (USA)",
+	"BT4E",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"2 Games in 1 - Dragon Ball Z - Buu's Fury + Dragon Ball GT - Transformation (USA)",
+	"BUFE",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"useBios=1",
+	"BYGE",
+	2,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Yoshi - Topsy-Turvy (USA)",
+	"KYGE",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"e-Reader (USA)",
+	"PSAE",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Boktai - The Sun Is in Your Hand (USA)",
+	"U3IE",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Boktai 2 - Solar Boy Django (USA)",
+	"U32E",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Dragon Ball Z - The Legacy of Goku II International (Japan)",
+	"ALFJ",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Pocket Monsters - Sapphire (Japan)",
+	"AXPJ",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pocket Monsters - Ruby (Japan)",
+	"AXVJ",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Super Mario Advance 4 (Japan)",
+	"AX4J",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"F-Zero - Climax (Japan)",
+	"BFTJ",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Game Boy Wars Advance 1+2 (Japan)",
+	"BGWJ",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Sennen Kazoku (Japan)",
+	"BKAJ",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pocket Monsters - Emerald (Japan)",
+	"BPEJ",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pocket Monsters - Leaf Green (Japan)",
+	"BPGJ",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pocket Monsters - Fire Red (Japan)",
+	"BPRJ",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Digi Communication 2 - Datou! Black Gemagema Dan (Japan)",
+	"BDKJ",
+	1,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Rockman EXE 4.5 - Real Operation (Japan)",
+	"BR4J",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Famicom Mini Vol. 01 - Super Mario Bros. (Japan)",
+	"FMBJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 12 - Clu Clu Land (Japan)",
+	"FCLJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 13 - Balloon Fight (Japan)",
+	"FBFJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 14 - Wrecking Crew (Japan)",
+	"FWCJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 15 - Dr. Mario (Japan)",
+	"FDMJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 16 - Dig Dug (Japan)",
+	"FDDJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 17 - Takahashi Meijin no Boukenjima (Japan)",
+	"FTBJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 18 - Makaimura (Japan)",
+	"FMKJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 19 - Twin Bee (Japan)",
+	"FTWJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 20 - Ganbare Goemon! Karakuri Douchuu (Japan)",
+	"FGGJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 21 - Super Mario Bros. 2 (Japan)",
+	"FM2J",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 22 - Nazo no Murasame Jou (Japan)",
+	"FNMJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 23 - Metroid (Japan)",
+	"FMRJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 24 - Hikari Shinwa - Palthena no Kagami (Japan)",
+	"FPTJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 25 - The Legend of Zelda 2 - Link no Bouken (Japan)",
+	"FLBJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 26 - Famicom Mukashi Banashi - Shin Onigashima - Zen Kou Hen (Japan)",
+	"FFMJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 27 - Famicom Tantei Club - Kieta Koukeisha - Zen Kou Hen (Japan)",
+	"FTKJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 28 - Famicom Tantei Club Part II - Ushiro ni Tatsu Shoujo - Zen Kou Hen (Japan)",
+	"FTUJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 29 - Akumajou Dracula (Japan)",
+	"FADJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Famicom Mini Vol. 30 - SD Gundam World - Gachapon Senshi Scramble Wars (Japan)",
+	"FSDJ",
+	1,
+	-1,
+	-1,
+	1
+	},
+	{
+	"Koro Koro Puzzle - Happy Panechu! (Japan)",
+	"KHPJ",
+	4,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Yoshi no Banyuuinryoku (Japan)",
+	"KYGJ",
+	4,
+	-1,
+	-1,
+	-1
+	},
+	{
+	"Card e-Reader+ (Japan)",
+	"PSAJ",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Bokura no Taiyou - Taiyou Action RPG (Japan)",
+	"U3IJ",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Zoku Bokura no Taiyou - Taiyou Shounen Django (Japan)",
+	"U32J",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Shin Bokura no Taiyou - Gyakushuu no Sabata (Japan)",
+	"U33J",
+	-1,
+	1,
+	-1,
+	-1
+	},
+	{
+	"Mother 3 (Japan)",
+	"A3UJ",
+	-1,
+	-1,
+	65536,
+	-1
+	},
+	{
+	"Pokemon - Version Saphir (France)",
+	"AXPF",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Version Rubis (France)",
+	"AXVF",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Version Emeraude (France)",
+	"BPEF",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Version Vert Feuille (France)",
+	"BPGF",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Version Rouge Feu (France)",
+	"BPRF",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Versione Zaffiro (Italy)",
+	"AXPI",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Versione Rubino (Italy)",
+	"AXVI",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Versione Smeraldo (Italy)",
+	"BPEI",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Versione Verde Foglia (Italy)",
+	"BPGI",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Versione Rosso Fuoco (Italy)",
+	"BPRI",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Saphir-Edition (Germany)",
+	"AXPD",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Rubin-Edition (Germany)",
+	"AXVD",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Smaragd-Edition (Germany)",
+	"BPED",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Blattgruene Edition (Germany)",
+	"BPGD",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Feuerrote Edition (Germany)",
+	"BPRD",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Edicion Zafiro (Spain)",
+	"AXPS",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Edicion Rubi (Spain)",
+	"AXVS",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Edicion Esmeralda (Spain)",
+	"BPES",
+	-1,
+	1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Edicion Verde Hoja (Spain)",
+	"BPGS",
+	-1,
+	-1,
+	131072,
+	-1
+	},
+	{
+	"Pokemon - Edicion Rojo Fuego (Spain)",
+	"BPRS",
+	1,
+	-1,
+	131072,
+	-1
+	}
+};
diff --git a/source/ngc/gamesettings.h b/source/ngc/gamesettings.h
new file mode 100644
index 0000000..cab1db2
--- /dev/null
+++ b/source/ngc/gamesettings.h
@@ -0,0 +1,26 @@
+/****************************************************************************
+ * Visual Boy Advance GX
+ *
+ * Tantric October 2008
+ *
+ * gamesettings.h
+ *
+ * VBA support code
+ ***************************************************************************/
+
+#ifndef GAMESETTINGS_H
+#define GAMESETTINGS_H
+
+typedef struct gameSetting {
+	char gameName[100];
+	char gameID[5];
+	int saveType;
+	int rtcEnabled;
+	int flashSize;
+	int mirroringEnabled;
+};
+
+extern gameSetting gameSettings[];
+extern int gameSettingsCount;
+
+#endif
diff --git a/source/ngc/input.cpp b/source/ngc/input.cpp
index db44626..17e1c45 100644
--- a/source/ngc/input.cpp
+++ b/source/ngc/input.cpp
@@ -19,9 +19,7 @@
 #include <wiiuse/wpad.h>
 
 #include "vba.h"
-#include "vbasupport.h"
 #include "button_mapping.h"
-#include "menu.h"
 #include "video.h"
 #include "input.h"
 #include "tbtime.h"
@@ -300,19 +298,6 @@ u32 GetJoy(int pad)
     #endif
     )
 	{
-    	if (GCSettings.AutoSave == 1)
-    	{
-    		SaveBatteryOrState(GCSettings.SaveMethod, 0, SILENT); // save battery
-    	}
-    	else if (GCSettings.AutoSave == 2)
-    	{
-			SaveBatteryOrState(GCSettings.SaveMethod, 1, SILENT); // save state
-    	}
-    	else if(GCSettings.AutoSave == 3)
-    	{
-    		SaveBatteryOrState(GCSettings.SaveMethod, 0, SILENT); // save battery
-    		SaveBatteryOrState(GCSettings.SaveMethod, 1, SILENT); // save state
-    	}
     	ConfigRequested = 1;
     	return 0;
 	}
diff --git a/source/ngc/vba.cpp b/source/ngc/vba.cpp
index 885a02b..96e20ad 100644
--- a/source/ngc/vba.cpp
+++ b/source/ngc/vba.cpp
@@ -27,6 +27,7 @@ extern "C" {
 }
 #endif
 
+#include "vba.h"
 #include "vbasupport.h"
 #include "preferences.h"
 #include "audio.h"
@@ -112,6 +113,19 @@ int main()
 
 			if(ConfigRequested)
 			{
+				if (GCSettings.AutoSave == 1)
+				{
+					SaveBatteryOrState(GCSettings.SaveMethod, 0, SILENT); // save battery
+				}
+				else if (GCSettings.AutoSave == 2)
+				{
+					SaveBatteryOrState(GCSettings.SaveMethod, 1, SILENT); // save state
+				}
+				else if(GCSettings.AutoSave == 3)
+				{
+					SaveBatteryOrState(GCSettings.SaveMethod, 0, SILENT); // save battery
+					SaveBatteryOrState(GCSettings.SaveMethod, 1, SILENT); // save state
+				}
 				ConfigRequested = 0;
 				break;
 			}
diff --git a/source/ngc/vbasupport.cpp b/source/ngc/vbasupport.cpp
index aaf86b9..3bc9146 100644
--- a/source/ngc/vbasupport.cpp
+++ b/source/ngc/vbasupport.cpp
@@ -38,6 +38,7 @@
 #include "video.h"
 #include "menudraw.h"
 #include "gcunzip.h"
+#include "gamesettings.h"
 #include "images/saveicon.h"
 
 extern "C"
@@ -550,7 +551,44 @@ void systemDrawScreen()
 	GX_Render( srcWidth, srcHeight, pix, srcPitch );
 }
 
+/****************************************************************************
+ * ApplyPerImagePreferences
+ * Apply game specific settings, originally from vba-over.ini
+ ***************************************************************************/
+
+static void ApplyPerImagePreferences()
+{
+	// look for matching game setting
+	int snum = -1;
+
+	for(int i=0; i < gameSettingsCount; i++)
+	{
+		if(gameSettings[i].gameID[0] == rom[0xac] &&
+			gameSettings[i].gameID[1] == rom[0xad] &&
+			gameSettings[i].gameID[2] == rom[0xae] &&
+			gameSettings[i].gameID[3] == rom[0xaf])
+		{
+			snum = i;
+			break;
+		}
+	}
+
+	// match found!
+	if(snum >= 0)
+	{
+		if(gameSettings[snum].rtcEnabled >= 0)
+			rtcEnable(gameSettings[snum].rtcEnabled);
+		if(gameSettings[snum].flashSize > 0)
+			flashSetSize(gameSettings[snum].flashSize);
+		if(gameSettings[snum].saveType >= 0)
+			cpuSaveType = gameSettings[snum].saveType;
+		if(gameSettings[snum].mirroringEnabled >= 0)
+			mirroringEnable = gameSettings[snum].mirroringEnabled;
+	}
+}
+
 extern bool gbUpdateSizes();
+
 bool LoadGBROM(int method)
 {
 	gbRom = (u8 *)malloc(1024*1024*4); // allocate 4 MB to GB ROM
@@ -678,11 +716,6 @@ bool LoadVBAROM(int method)
 	}
 	else
 	{
-		// Set defaults
-		flashSetSize(0x20000); // 128K saves
-		rtcEnable(true);
-		agbPrintEnable(false);
-
 		// Setup GX
 		GX_Render_Init( srcWidth, srcHeight, hAspect, vAspect );
 
@@ -694,6 +727,8 @@ bool LoadVBAROM(int method)
 			//if (gbHardware & 5)
 			//gbCPUInit(gbBiosFileName, useBios);
 
+			//applyPatch(patch, &gbRom, &size);
+
 			gbSoundReset();
 			gbSoundSetQuality(soundQuality);
 			gbSoundSetDeclicking(true);
@@ -701,9 +736,21 @@ bool LoadVBAROM(int method)
 		}
 		else
 		{
+			// Set defaults
+			cpuSaveType = 0; // automatic
+			flashSetSize(0x10000); // 64K saves
+			rtcEnable(false);
+			agbPrintEnable(false);
+			mirroringEnable = false;
+
+			// Apply preferences specific to this game
+			ApplyPerImagePreferences();
+			doMirroring(mirroringEnable);
+
 			soundReset();
 			soundSetQuality(soundQuality);
-			CPUInit("/VBA/BIOS/BIOS.GBA", 1);
+			CPUInit("BIOS.GBA", 1);
+			//applyPatch(patch, &gbRom, &size);
 			CPUReset();
 		}