From 73e3c6076207f1cb0577fb7e6350454b0911e618 Mon Sep 17 00:00:00 2001
From: dborth <dborth@0aaa047c-bd49-0410-9b25-49477284f1fd>
Date: Wed, 19 Nov 2008 07:11:06 +0000
Subject: [PATCH] finalize 2.0.7

---
 readme.txt               | 13 ++++++++-----
 source/ngc/fceugx.c      |  4 ++++
 source/ngc/fceugx.h      |  4 ++--
 source/ngc/menu.c        |  6 +++---
 source/ngc/menudraw.c    |  2 +-
 source/ngc/preferences.c |  4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/readme.txt b/readme.txt
index 59613af..7bf58a5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -33,7 +33,7 @@ SNES9x GX project.
 |0Oื๘oท                         UPDATE HISTORY                        ทo๘ืO0|
 `จ•จจจจจ จจจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจจจจจจ จจจจจจจจจจจจจ'
 
-[What's New 2.0.7]
+[What's New 2.0.7 - November 18, 2008]
 * Special thanks to eke-eke & KruLLo for contributions, bugfixes, and tips
 * Video code rewritten - now has original, unfiltered, filtered modes
 * Zoom option
@@ -45,8 +45,12 @@ SNES9x GX project.
 * Turbo option
 * Video cropping (overscan hiding) option (thanks yxkalle!)
 * Palette changing fixed
-* Fix audio 'popping' issue
-* Add DVD motor off option for GameCube users
+* Fixed audio 'popping' issue
+* Wii - Added console/remote power button support
+* Wii - Added reset button support (resets game)
+* Wii - Settings file is now named settings.xml and is stored in the same
+  folder as the DOL (eg: apps/fceugx/settings.xml)
+* GameCube - Added DVD motor off option
 
 [What's New 2.0.6 - October 21, 2008]
 * Right audio channel corruption fixed (thanks cyberdog!)
@@ -125,8 +129,7 @@ Unzip the archive. You will find the following folders inside:
 apps			Contains Homebrew Channel ready files
 				(see Homebrew Channel instructions below)
 				
-executables		Contains Gamecube / Wii DOL files
-				(for loading from other methods)
+gamecube		Contains GameCube DOL file (not required for Wii)
 				
 fceugx			Contains the directory structure required for storing
 				roms and saves (see below)
diff --git a/source/ngc/fceugx.c b/source/ngc/fceugx.c
index 44bc60f..a64ef62 100644
--- a/source/ngc/fceugx.c
+++ b/source/ngc/fceugx.c
@@ -299,6 +299,10 @@ int main(int argc, char *argv[])
 					SaveRAM(GCSettings.SaveMethod, SILENT);
 					SaveState(GCSettings.SaveMethod, SILENT);
 				}
+
+				// save zoom level
+				SavePrefs(GCSettings.SaveMethod, SILENT);
+
 				ConfigRequested = 0;
 				break; // leave emulation loop
 			}
diff --git a/source/ngc/fceugx.h b/source/ngc/fceugx.h
index b23cae4..8a32cb8 100644
--- a/source/ngc/fceugx.h
+++ b/source/ngc/fceugx.h
@@ -12,8 +12,8 @@
 #ifndef _FCEUGX_H_
 #define _FCEUGX_H_
 
-#define VERSIONNUM "2.0.6"
-#define VERSIONSTR "FCE Ultra GX 2.0.6"
+#define VERSIONNUM "2.0.7"
+#define VERSIONSTR "FCE Ultra GX 2.0.7"
 #define PREF_FILE_NAME "settings.xml"
 
 #define NOTSILENT 0
diff --git a/source/ngc/menu.c b/source/ngc/menu.c
index ef0cd4e..226b1e0 100644
--- a/source/ngc/menu.c
+++ b/source/ngc/menu.c
@@ -74,13 +74,13 @@ static char videomenu[][50] = {
 
 	"Video Rendering",
 	"Video Scaling",
-	"Video Cropping"
+	"Video Cropping",
 	"Palette",
 	"Enable Zooming",
 	"Timing",
 	"8 Sprite Limit",
-
 	"Back to Preferences Menu"
+
 };
 
 void
@@ -612,7 +612,7 @@ ConfigureButtons (u16 ctrlr_type)
 
 		}
 
-		ret = RunMenu (cfg_btns_menu, cfg_btns_count, menu_title, 16, -1);
+		ret = RunMenu (cfg_btns_menu, cfg_btns_count, menu_title, 14, -1);
 
 		switch (ret)
 		{
diff --git a/source/ngc/menudraw.c b/source/ngc/menudraw.c
index f3fd2f3..1d48d90 100644
--- a/source/ngc/menudraw.c
+++ b/source/ngc/menudraw.c
@@ -406,7 +406,7 @@ DrawMenu (char items[][50], char *title, int maxitems, int selected, int fontsiz
 	int n = 1;
 	int line_height;
 
-	ypos = 140;
+	ypos = 130;
 
 	if (screenheight == 480)
 		ypos += 20;
diff --git a/source/ngc/preferences.c b/source/ngc/preferences.c
index 514befd..54b81e8 100644
--- a/source/ngc/preferences.c
+++ b/source/ngc/preferences.c
@@ -267,9 +267,9 @@ decodePrefsData (int method)
 	char verMinor = version[15];
 	char verPoint = version[17];
 
-	if(verMajor == '2' && verPoint < '3') // less than version 2.0.3
+	if(verMajor == '2' && verPoint < '7') // less than version 2.0.7
 		return false; // reset settings
-	else if(verMajor > '2' || verMinor > '0' || verPoint > '6') // some future version
+	else if(verMajor > '2' || verMinor > '0' || verPoint > '7') // some future version
 		return false; // reset settings
 
 	// File Settings