From a00104784f42c2ffda4914ea77640bdd1b62ddff Mon Sep 17 00:00:00 2001
From: "ardi@ist-einmalig.de" <ardi@ist-einmalig.de>
Date: Mon, 4 May 2009 21:50:46 +0000
Subject: [PATCH] Added a special font for the clock

---
 source/cfg.c                  | 2116 +++++++++++++++++----------------
 source/cfg.h                  |  138 +--
 source/filelist.h             |    3 +
 source/fonts/clock.ttf        |  Bin 0 -> 4436 bytes
 source/libwiigui/gui.h        |    2 +
 source/libwiigui/gui_text.cpp |   17 +-
 source/main.cpp               |    7 +-
 source/menu.cpp               |    5 +-
 8 files changed, 1158 insertions(+), 1130 deletions(-)
 create mode 100644 source/fonts/clock.ttf

diff --git a/source/cfg.c b/source/cfg.c
index f563e0ee..79523894 100644
--- a/source/cfg.c
+++ b/source/cfg.c
@@ -1,1061 +1,1069 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <ogcsys.h>
-#include "cfg.h"
-
-struct SSettings Settings;
-//struct SSettings2 Settings2;
-
-
-char *cfg_path = "SD:/apps/usbloader/";
-//char *setting_path = "SD:/apps/usbloader/settings.cfg";
-char current_path[100];
-
-/* configurable fields */
-
-/* default */
-//int ENTRIES_PER_PAGE = 12;
-//int MAX_CHARACTERS   = 37;
-//int CONSOLE_XCOORD   = 260;
-//int CONSOLE_YCOORD   = 30;
-//int CONSOLE_WIDTH    = 340;
-//int CONSOLE_HEIGHT   = 290;
-//int CONSOLE_FG_COLOR = 15;
-//int CONSOLE_BG_COLOR = 0;
-//int COVER_XCOORD     = 28;
-//int COVER_YCOORD     = 105;
-
-//define variables
-
-struct CFG CFG;
-struct THEME THEME;
-u8 ocarinaChoice = 0;
-u8 videoChoice = 0;
-u8 languageChoice = 0;
-u8 viChoice = 0;
-u8 iosChoice = 0;
-u8 parentalcontrolChoice = 0;
-
-#define TITLE_MAX 65
-
-struct ID_Title
-{
-	u8 id[5];
-	char title[TITLE_MAX];
-	u8 block;
-};
-
-// renamed titles
-int num_title = 0; //number of titles
-struct ID_Title *cfg_title = NULL;
-
-#define MAX_SAVED_GAMES 1000
-int num_saved_games = 0;
-struct Game_CFG cfg_game[MAX_SAVED_GAMES];
-
-
-/* For Mapping */
-
-static char *cfg_name, *cfg_val;
-
-struct TextMap
-{
-	char *name;
-	int id;
-};
-
-struct TextMap map_video[] =
-{
-	{ "system", CFG_VIDEO_SYS },
-	{ "game",   CFG_VIDEO_GAME },
-	{ "patch",  CFG_VIDEO_PATCH },
-	{ "pal50", CFG_VIDEO_PAL50 },
-	{ "pal60", CFG_VIDEO_PAL60 },
-	{ "ntsc", CFG_VIDEO_NTSC },
-	{ NULL, -1 }
-};
-
-struct TextMap map_language[] =
-{
-	{ "console",   CFG_LANG_CONSOLE },
-	{ "japanese",  CFG_LANG_JAPANESE },
-	{ "english",   CFG_LANG_ENGLISH },
-	{ "german",    CFG_LANG_GERMAN },
-	{ "french",    CFG_LANG_FRENCH },
-	{ "spanish",   CFG_LANG_SPANISH },
-	{ "italian",   CFG_LANG_ITALIAN },
-	{ "dutch",     CFG_LANG_DUTCH },
-	{ "s.chinese", CFG_LANG_S_CHINESE },
-	{ "t.chinese", CFG_LANG_T_CHINESE },
-	{ "korean",    CFG_LANG_KOREAN },
-	{ NULL, -1 }
-};
-
-
-struct TextMap map_alignment[] =
-{
-	{ "left",   CFG_ALIGN_LEFT },
-	{ "right",  CFG_ALIGN_RIGHT },
-	{ "center",   CFG_ALIGN_CENTRE },
-	{ "top",    CFG_ALIGN_TOP },
-	{ "bottom",    CFG_ALIGN_BOTTOM },
-	{ "middle",   CFG_ALIGN_MIDDLE },
-	{ NULL, -1 }
-};
-
-int map_get_id(struct TextMap *map, char *name)
-{
-	int i;
-	for (i=0; map[i].name != NULL; i++)	{
-		if (strcmp(name, map[i].name) == 0) return map[i].id;
-	}
-	return -1;
-}
-
-char* map_get_name(struct TextMap *map, short id)
-{
-	int i;
-	for (i=0; map[i].name != NULL; i++)	{
-		if (id == map[i].id) return map[i].name;
-	}
-	return NULL;
-}
-
-bool map_auto(char *name, char *name2, char *val, struct TextMap *map, short *var)
-{
-	if (strcmp(name, name2) != 0) return false;
- 	int id = map_get_id(map, val);
-	if (id == -1) {
-		//printf("MAP FAIL: %s=%s : %d\n", name, val, id); sleep(1);
-		return false;
-	}
-	*var = id;
-	//printf("MAP AUTO: %s=%s : %d\n", name, val, id); sleep(1);
-	return true;
-}
-
-bool cfg_map_auto(char *name, struct TextMap *map, short *var)
-{
-	return map_auto(name, cfg_name, cfg_val, map, var);
-}
-
-bool cfg_map(char *name, char *val, short *var, short id)
-{
-	if (strcmp(name, cfg_name)==0 && strcmpi(val, cfg_val)==0)
-	{
-		*var = id;
-		return true;
-	}
-	return false;
-}
-
-bool cfg_bool(char *name, short *var)
-{
-	return (cfg_map(name, "0", var, 0) || cfg_map(name, "1", var, 1));
-}
-
-void cfg_int(char *name, short *var, int count)
-{
-	char tmp[5];
-	short i;
-
-	if (count > 10) //avoid overflow
-		return;
-
-	for (i = 0; i < count; i++)
-	{
-		sprintf(tmp, "%d", i);
-		cfg_map(name, tmp, var, i);
-	}
-}
-
-/* Mapping */
-
-//static char bg_path[100];
-
-void CFG_Default()
-{
-	CFG.widescreen = CONF_GetAspectRatio();
-
-	if (CFG.widescreen) {
-		snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/wtheme/");
-	}
-	else
-	{
-		snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/theme/");
-	}
-
-	snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/images/"); //default image path 
-	snprintf(CFG.disc_path, sizeof(CFG.disc_path), "SD:/images/disc/");//default path for disc images
-	snprintf(CFG.unlockCode, sizeof(CFG.unlockCode), "ab121b");		// default passwore
-
-	CFG.parentalcontrol = 0;
-	CFG.maxcharacters = 38;
-	CFG.godmode = 0;
-	
-	//all alignments are left top here
-	THEME.selection_x = 200;
-	THEME.selection_y = 40;
-	THEME.selection_w = 396;
-	THEME.selection_h = 280;
-	THEME.cover_x = 26;
-	THEME.cover_y = 55;
-	THEME.showID = 1;
-	THEME.id_x = 68;
-	THEME.id_y = 305;
-	THEME.region_x = 68;
-	THEME.region_y = 30;
-	THEME.power_x = 576;
-	THEME.power_y = 355;
-	THEME.home_x = 485;//215;
-	THEME.home_y = 367;
-	THEME.setting_x = 60;//-210
-	THEME.setting_y = 367;
-	THEME.showHDD = -1; //default, non-force mode
-	THEME.showGameCnt = -1; //default, non-force mode
-	THEME.showToolTip = 1; //1 means use settings, 0 means force turn off
-	THEME.install_x = 16;//-280
-	THEME.install_y = 355;
-	THEME.showBattery = 1;
-	THEME.showRegion = 1;
-	THEME.hddInfo_x = 0;
-	THEME.hddInfo_y = 330;
-	THEME.hddInfoAlign = CFG_ALIGN_CENTRE;
-	THEME.gameCnt_x = 0;
-	THEME.gameCnt_y = 350;
-	THEME.gameCntAlign = CFG_ALIGN_CENTRE;
-	THEME.battery1_x = 245;
-	THEME.battery1_y = 400;
-	THEME.battery2_x = 335;
-	THEME.battery2_y = 400;
-	THEME.battery3_x = 245;
-	THEME.battery3_y = 425;
-	THEME.battery4_x = 335;
-	THEME.battery4_y = 425;
-	THEME.info_r = 63;
-	THEME.info_g = 154;
-	THEME.info_b = 192;
-	THEME.clock_x = 0;
-	THEME.clock_y = -120;
-	THEME.clockAlign = CFG_ALIGN_CENTRE;
-	THEME.sdcard_x = 160;
-	THEME.sdcard_y = 390;
-}
-
-
-char* strcopy(char *dest, char *src, int size)
-{
-	strncpy(dest,src,size);
-	dest[size-1] = 0;
-	return dest;
-}
-
-char *cfg_get_title(u8 *id)
-{
-	int i;
-	for (i=0; i<num_title; i++) {
-		if (memcmp(id, cfg_title[i].id, 4) == 0) {
-			return cfg_title[i].title;
-		}
-	}
-	return NULL;
-}
-
-char *get_title(struct discHdr *header)
-{
-	char *title = cfg_get_title(header->id);
-	if (title) return title;
-	return header->title;
-}
-
-void title_set(char *id, char *title, u8 block)
-{
-	char *idt = cfg_get_title((u8*)id);
-	if (idt) {
-		// replace
-		strcopy(idt, title, TITLE_MAX);
-	} else {
-		cfg_title = realloc(cfg_title, (num_title+1) * sizeof(struct ID_Title));
-		if (!cfg_title) {
-			// error
-			num_title = 0;
-			return;
-		}
-		// add
-		memcpy(cfg_title[num_title].id, id, 4);
-		cfg_title[num_title].id[4] = 0;
-		cfg_title[num_title].block = block;
-		strcopy(cfg_title[num_title].title, title, TITLE_MAX);
-		num_title++;
-	}
-}
-
-u8 cfg_get_block(u8 *id)
-{
-	int i;
-	for (i=0; i<num_title; i++) {
-		if (memcmp(id, cfg_title[i].id, 4) == 0) {
-			return cfg_title[i].block;
-		}
-	}
-	return 0;
-}
-
-u8 get_block(struct discHdr *header)
-{
-	return cfg_get_block(header->id);
-}
-
-// trim leading and trailing whitespace
-// copy at max n or at max size-1
-char* trim_n_copy(char *dest, char *src, int n, int size)
-{
-	int len;
-	// trim leading white space
-	while (isspace(*src)) { src++; n--; }
-	len = strlen(src);
-	if (len > n) len = n;
-	// trim trailing white space
-	while (len > 0 && isspace(src[len-1])) len--;
-	if (len >= size) len = size-1;
-	strncpy(dest, src, len);
-	dest[len] = 0;
-	//printf("trim_copy: '%s' %d\n", dest, len); //sleep(1);
-	return dest;
-}
-
-char* trimcopy(char *dest, char *src, int size)
-{
-	int len;
-	while (*src == ' ') src++;
-	len = strlen(src);
-	// trim trailing " \r\n"
-	while (len > 0 && strchr(" \r\n", src[len-1])) len--;
-	if (len >= size) len = size-1;
-	strncpy(dest, src, len);
-	dest[len] = 0;
-	return dest;
-}
-
-void widescreen_set(char *name, char *val)
-{
-	cfg_name = name;
-	cfg_val = val;
-
-	if (cfg_bool("widescreen", &CFG.widescreen)) //reset default
-	{
-		if (CFG.widescreen) {
-//			snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/wimages/");
-			snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/wtheme/");
-		}
-		else
-		{
-//			snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/images/");
-			snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/theme/");
-		}
-	}
-}
-
-
-
-void cfg_set(char *name, char *val)
-{
-	cfg_name = name;
-	cfg_val = val;
-/*
-	if (!CFG.widescreen &&(strcmp(name, "images_path") == 0)) {
-		strcopy(CFG.images_path, val, sizeof(CFG.images_path));
-		snprintf(bg_path, sizeof(bg_path), "%sbg.png", CFG.images_path); //reset path
-		return;
-	}
-
-	if (CFG.widescreen && strcmp(name, "wimages_path") == 0) {
-		strcopy(CFG.images_path, val, sizeof(CFG.images_path));
-		snprintf(bg_path, sizeof(bg_path), "%swbg.png", CFG.images_path); //reset path
-		return;
-	}
-
-	if (cfg_map_auto("video", map_video, &CFG.video))
-		return;
-
-	if (cfg_map_auto("language", map_language, &CFG.language))
-		return;
-
-	if (cfg_map_auto("layout", map_layout, &CFG.layout)) {
-		cfg_layout();
-	}
-
-	cfg_bool("ocarina", &CFG.ocarina);
-	cfg_bool("covers", &CFG.covers);
-	cfg_bool("download",  &CFG.download);
-	cfg_bool("savesettings", &CFG.savesettings);
-	cfg_bool("installdownload", &CFG.installdownload);
-	cfg_bool("hidesettingmenu", &CFG.hidesettingmenu);
-	cfg_map("home", "exit",   &CFG.home, CFG_HOME_EXIT);
-	cfg_map("home", "reboot", &CFG.home, CFG_HOME_REBOOT);
-	cfg_int("simple", &CFG.simple, 3);
-*/
-		
-	// if these are defined in txt file, use them.  otherwise use defaults
-
-	if (!CFG.widescreen &&(strcmp(name, "theme_path") == 0)) {// if in 4:3
-		strcopy(CFG.theme_path, val, sizeof(CFG.theme_path));
-		return;
-	}
-
-	if (CFG.widescreen && strcmp(name, "wtheme_path") == 0) { // if in 16:9
-		strcopy(CFG.theme_path, val, sizeof(CFG.theme_path));
-		return;
-	}
-
-	if (strcmp(name, "cover_path") == 0) {
-		strcopy(CFG.covers_path, val, sizeof(CFG.covers_path));
-		return;
-	}
-
-	if (strcmp(name, "disc_path") == 0) {
-		strcopy(CFG.disc_path, val, sizeof(CFG.disc_path));
-		return;
-	}
-
-	cfg_int("parentalcontrol", &CFG.parentalcontrol, 4);
-	cfg_bool("godmode", &CFG.godmode);
-
-	if (strcmp(name, "unlock_code") == 0) {
-		strcopy(CFG.unlockCode, val, sizeof(CFG.unlockCode));
-		return;
-	}
-}
-
-void theme_set(char *name, char *val)
-{
-	cfg_name = name;
-	cfg_val = val;
-
-	if(strcmp(cfg_name, "gamelist_coords") == 0) {
-		int x,y,w,h;
-		if (sscanf(val, "%d,%d,%d,%d", &x, &y, &w, &h) == 4) {
-			THEME.selection_x = x - (x % 4);
-			THEME.selection_y = y;
-			THEME.selection_w = w;
-			THEME.selection_h = h;
-		}
-	}
-
-	else if (strcmp(cfg_name, "covers_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.cover_x = x - (x % 4);
-			THEME.cover_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "id_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.id_x = x - (x % 4);
-			THEME.id_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "hddinfo_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.hddInfo_x = x - (x % 4);
-			THEME.hddInfo_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "gamecount_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.gameCnt_x = x - (x % 4);
-			THEME.gameCnt_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "region_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.region_x = x - (x % 4);
-			THEME.region_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "power_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.power_x = x - (x % 4);
-			THEME.power_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "home_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.home_x = x - (x % 4);
-			THEME.home_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "setting_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.setting_x = x - (x % 4);
-			THEME.setting_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "install_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.install_x = x - (x % 4);
-			THEME.install_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "battery1_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.battery1_x = x - (x % 4);
-			THEME.battery1_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "battery2_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.battery2_x = x - (x % 4);
-			THEME.battery2_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "battery3_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.battery3_x = x - (x % 4);
-			THEME.battery3_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "battery4_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.battery4_x = x - (x % 4);
-			THEME.battery4_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "clock_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.clock_x = x - (x % 4);
-			THEME.clock_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "sdcard_coords") == 0) {
-		short x,y;
-		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
-			THEME.sdcard_x = x - (x % 4);
-			THEME.sdcard_y = y;
-		}
-	}
-
-	else if (strcmp(cfg_name, "info_color") == 0) {
-		short x,y,z;
-		if (sscanf(val, "%hd,%hd, %hd", &x, &y, &z) == 3) {
-			THEME.info_r = x;
-			THEME.info_g = y;
-			THEME.info_b = z;
-		}
-	}
-
-	cfg_bool("show_id", &THEME.showID);
-	cfg_bool("show_tooltip", &THEME.showToolTip);
-	cfg_bool("show_hddinfo", &THEME.showHDD);
-	cfg_bool("show_gamecount", &THEME.showGameCnt);
-	cfg_bool("show_region", &THEME.showRegion);
-	cfg_bool("show_battery", &THEME.showBattery);
-	cfg_map_auto("hddinfo_align", map_alignment, &THEME.hddInfoAlign);
-	cfg_map_auto("gamecount_align", map_alignment, &THEME.gameCntAlign);
-	cfg_map_auto("clock_align", map_alignment, &THEME.clockAlign);
-
-	/*
-	else if (strcmp(cfg_name, "entry_lines") == 0) {
-		int x;
-		if (sscanf(val, "%d", &x) == 1) {
-			ENTRIES_PER_PAGE = x;
-		}
-	}
-
-	else if (strcmp(cfg_name, "max_characters") == 0) {
-		int x;
-		if (sscanf(val, "%d", &x) == 1) {
-			MAX_CHARACTERS = x;
-		}
-	}*/
-}
-
-void global_cfg_set(char *name, char *val)
-{
-	cfg_name = name;
-	cfg_val = val;
-
-	if (strcmp(name, "video") == 0) {
-	        int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.video = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "vpatch") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.vpatch =i;
-		}
-		return;
-	}
-
-	else if (strcmp(name, "language") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.language = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "ocarina") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.ocarina = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "hddinfo") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.hddinfo = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "sinfo") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.sinfo = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "rumble") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.rumble = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "volume") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.volume = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "tooltips") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.tooltips = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "password") == 0) {
-		strcopy(Settings.unlockCode, val, sizeof(Settings.unlockCode));
-		return;
-	}
-	else if (strcmp(name, "parentalcontrol") == 0) {
-		int i;
-		if (sscanf(val, "%d", &i) == 1) {
-			Settings.parentalcontrol = i;
-		}
-		return;
-	}
-	else if (strcmp(name, "cios") == 0) {
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <ogcsys.h>
+#include "cfg.h"
+
+struct SSettings Settings;
+//struct SSettings2 Settings2;
+
+
+char *cfg_path = "SD:/apps/usbloader/";
+//char *setting_path = "SD:/apps/usbloader/settings.cfg";
+char current_path[100];
+
+/* configurable fields */
+
+/* default */
+//int ENTRIES_PER_PAGE = 12;
+//int MAX_CHARACTERS   = 37;
+//int CONSOLE_XCOORD   = 260;
+//int CONSOLE_YCOORD   = 30;
+//int CONSOLE_WIDTH    = 340;
+//int CONSOLE_HEIGHT   = 290;
+//int CONSOLE_FG_COLOR = 15;
+//int CONSOLE_BG_COLOR = 0;
+//int COVER_XCOORD     = 28;
+//int COVER_YCOORD     = 105;
+
+//define variables
+
+struct CFG CFG;
+struct THEME THEME;
+u8 ocarinaChoice = 0;
+u8 videoChoice = 0;
+u8 languageChoice = 0;
+u8 viChoice = 0;
+u8 iosChoice = 0;
+u8 parentalcontrolChoice = 0;
+
+#define TITLE_MAX 65
+
+struct ID_Title
+{
+	u8 id[5];
+	char title[TITLE_MAX];
+	u8 block;
+};
+
+// renamed titles
+int num_title = 0; //number of titles
+struct ID_Title *cfg_title = NULL;
+
+#define MAX_SAVED_GAMES 1000
+int num_saved_games = 0;
+struct Game_CFG cfg_game[MAX_SAVED_GAMES];
+
+
+/* For Mapping */
+
+static char *cfg_name, *cfg_val;
+
+struct TextMap
+{
+	char *name;
+	int id;
+};
+
+struct TextMap map_video[] =
+{
+	{ "system", CFG_VIDEO_SYS },
+	{ "game",   CFG_VIDEO_GAME },
+	{ "patch",  CFG_VIDEO_PATCH },
+	{ "pal50", CFG_VIDEO_PAL50 },
+	{ "pal60", CFG_VIDEO_PAL60 },
+	{ "ntsc", CFG_VIDEO_NTSC },
+	{ NULL, -1 }
+};
+
+struct TextMap map_language[] =
+{
+	{ "console",   CFG_LANG_CONSOLE },
+	{ "japanese",  CFG_LANG_JAPANESE },
+	{ "english",   CFG_LANG_ENGLISH },
+	{ "german",    CFG_LANG_GERMAN },
+	{ "french",    CFG_LANG_FRENCH },
+	{ "spanish",   CFG_LANG_SPANISH },
+	{ "italian",   CFG_LANG_ITALIAN },
+	{ "dutch",     CFG_LANG_DUTCH },
+	{ "s.chinese", CFG_LANG_S_CHINESE },
+	{ "t.chinese", CFG_LANG_T_CHINESE },
+	{ "korean",    CFG_LANG_KOREAN },
+	{ NULL, -1 }
+};
+
+
+struct TextMap map_alignment[] =
+{
+	{ "left",   CFG_ALIGN_LEFT },
+	{ "right",  CFG_ALIGN_RIGHT },
+	{ "center",   CFG_ALIGN_CENTRE },
+	{ "top",    CFG_ALIGN_TOP },
+	{ "bottom",    CFG_ALIGN_BOTTOM },
+	{ "middle",   CFG_ALIGN_MIDDLE },
+	{ NULL, -1 }
+};
+
+int map_get_id(struct TextMap *map, char *name)
+{
+	int i;
+	for (i=0; map[i].name != NULL; i++)	{
+		if (strcmp(name, map[i].name) == 0) return map[i].id;
+	}
+	return -1;
+}
+
+char* map_get_name(struct TextMap *map, short id)
+{
+	int i;
+	for (i=0; map[i].name != NULL; i++)	{
+		if (id == map[i].id) return map[i].name;
+	}
+	return NULL;
+}
+
+bool map_auto(char *name, char *name2, char *val, struct TextMap *map, short *var)
+{
+	if (strcmp(name, name2) != 0) return false;
+ 	int id = map_get_id(map, val);
+	if (id == -1) {
+		//printf("MAP FAIL: %s=%s : %d\n", name, val, id); sleep(1);
+		return false;
+	}
+	*var = id;
+	//printf("MAP AUTO: %s=%s : %d\n", name, val, id); sleep(1);
+	return true;
+}
+
+bool cfg_map_auto(char *name, struct TextMap *map, short *var)
+{
+	return map_auto(name, cfg_name, cfg_val, map, var);
+}
+
+bool cfg_map(char *name, char *val, short *var, short id)
+{
+	if (strcmp(name, cfg_name)==0 && strcmpi(val, cfg_val)==0)
+	{
+		*var = id;
+		return true;
+	}
+	return false;
+}
+
+bool cfg_bool(char *name, short *var)
+{
+	return (cfg_map(name, "0", var, 0) || cfg_map(name, "1", var, 1));
+}
+
+void cfg_int(char *name, short *var, int count)
+{
+	char tmp[5];
+	short i;
+
+	if (count > 10) //avoid overflow
+		return;
+
+	for (i = 0; i < count; i++)
+	{
+		sprintf(tmp, "%d", i);
+		cfg_map(name, tmp, var, i);
+	}
+}
+
+/* Mapping */
+
+//static char bg_path[100];
+
+void CFG_Default(int widescreen) // -1 = non forced Mode
+{
+	if(widescreen == -1)
+		CFG.widescreen = CONF_GetAspectRatio();
+	else
+		CFG.widescreen = widescreen;
+
+	if (CFG.widescreen) {
+		snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/wtheme/");
+	}
+	else
+	{
+		snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/theme/");
+	}
+
+	snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/images/"); //default image path 
+	snprintf(CFG.disc_path, sizeof(CFG.disc_path), "SD:/images/disc/");//default path for disc images
+	snprintf(CFG.unlockCode, sizeof(CFG.unlockCode), "ab121b");		// default passwore
+
+	CFG.parentalcontrol = 0;
+	CFG.maxcharacters = 38;
+	CFG.godmode = 0;
+	
+	//all alignments are left top here
+	THEME.selection_x = 200;
+	THEME.selection_y = 40;
+	THEME.selection_w = 396;
+	THEME.selection_h = 280;
+	THEME.cover_x = 26;
+	THEME.cover_y = 55;
+	THEME.showID = 1;
+	THEME.id_x = 68;
+	THEME.id_y = 305;
+	THEME.region_x = 68;
+	THEME.region_y = 30;
+	THEME.power_x = 576;
+	THEME.power_y = 355;
+	THEME.home_x = 485;//215;
+	THEME.home_y = 367;
+	THEME.setting_x = 60;//-210
+	THEME.setting_y = 367;
+	THEME.showHDD = -1; //default, non-force mode
+	THEME.showGameCnt = -1; //default, non-force mode
+	THEME.showToolTip = 1; //1 means use settings, 0 means force turn off
+	THEME.install_x = 16;//-280
+	THEME.install_y = 355;
+	THEME.showBattery = 1;
+	THEME.showRegion = 1;
+	THEME.hddInfo_x = 0;
+	THEME.hddInfo_y = 330;
+	THEME.hddInfoAlign = CFG_ALIGN_CENTRE;
+	THEME.gameCnt_x = 0;
+	THEME.gameCnt_y = 350;
+	THEME.gameCntAlign = CFG_ALIGN_CENTRE;
+	THEME.battery1_x = 245;
+	THEME.battery1_y = 400;
+	THEME.battery2_x = 335;
+	THEME.battery2_y = 400;
+	THEME.battery3_x = 245;
+	THEME.battery3_y = 425;
+	THEME.battery4_x = 335;
+	THEME.battery4_y = 425;
+	THEME.info_r = 63;
+	THEME.info_g = 154;
+	THEME.info_b = 192;
+	THEME.clock_x = 0;
+	THEME.clock_y = -120;
+	THEME.clockAlign = CFG_ALIGN_CENTRE;
+	THEME.sdcard_x = 160;
+	THEME.sdcard_y = 390;
+}
+
+
+char* strcopy(char *dest, char *src, int size)
+{
+	strncpy(dest,src,size);
+	dest[size-1] = 0;
+	return dest;
+}
+
+char *cfg_get_title(u8 *id)
+{
+	int i;
+	for (i=0; i<num_title; i++) {
+		if (memcmp(id, cfg_title[i].id, 4) == 0) {
+			return cfg_title[i].title;
+		}
+	}
+	return NULL;
+}
+
+char *get_title(struct discHdr *header)
+{
+	char *title = cfg_get_title(header->id);
+	if (title) return title;
+	return header->title;
+}
+
+void title_set(char *id, char *title, u8 block)
+{
+	char *idt = cfg_get_title((u8*)id);
+	if (idt) {
+		// replace
+		strcopy(idt, title, TITLE_MAX);
+	} else {
+		cfg_title = realloc(cfg_title, (num_title+1) * sizeof(struct ID_Title));
+		if (!cfg_title) {
+			// error
+			num_title = 0;
+			return;
+		}
+		// add
+		memcpy(cfg_title[num_title].id, id, 4);
+		cfg_title[num_title].id[4] = 0;
+		cfg_title[num_title].block = block;
+		strcopy(cfg_title[num_title].title, title, TITLE_MAX);
+		num_title++;
+	}
+}
+
+u8 cfg_get_block(u8 *id)
+{
+	int i;
+	for (i=0; i<num_title; i++) {
+		if (memcmp(id, cfg_title[i].id, 4) == 0) {
+			return cfg_title[i].block;
+		}
+	}
+	return 0;
+}
+
+u8 get_block(struct discHdr *header)
+{
+	return cfg_get_block(header->id);
+}
+
+// trim leading and trailing whitespace
+// copy at max n or at max size-1
+char* trim_n_copy(char *dest, char *src, int n, int size)
+{
+	int len;
+	// trim leading white space
+	while (isspace(*src)) { src++; n--; }
+	len = strlen(src);
+	if (len > n) len = n;
+	// trim trailing white space
+	while (len > 0 && isspace(src[len-1])) len--;
+	if (len >= size) len = size-1;
+	strncpy(dest, src, len);
+	dest[len] = 0;
+	//printf("trim_copy: '%s' %d\n", dest, len); //sleep(1);
+	return dest;
+}
+
+char* trimcopy(char *dest, char *src, int size)
+{
+	int len;
+	while (*src == ' ') src++;
+	len = strlen(src);
+	// trim trailing " \r\n"
+	while (len > 0 && strchr(" \r\n", src[len-1])) len--;
+	if (len >= size) len = size-1;
+	strncpy(dest, src, len);
+	dest[len] = 0;
+	return dest;
+}
+
+void widescreen_set(char *name, char *val)
+{
+	cfg_name = name;
+	cfg_val = val;
+
+	short widescreen;
+	if (cfg_bool("widescreen", &widescreen) && CFG.widescreen != widescreen)
+		CFG_Default(widescreen); //reset default when forced an other Screenmode
+/*
+	if (cfg_bool("widescreen", &CFG.widescreen)) //reset default
+	{
+		if (CFG.widescreen) {
+//			snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/wimages/");
+			snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/wtheme/");
+		}
+		else
+		{
+//			snprintf(CFG.covers_path, sizeof(CFG.covers_path), "SD:/images/");
+			snprintf(CFG.theme_path, sizeof(CFG.theme_path), "SD:/theme/");
+		}
+	}
+*/
+}
+
+
+
+void cfg_set(char *name, char *val)
+{
+	cfg_name = name;
+	cfg_val = val;
+/*
+	if (!CFG.widescreen &&(strcmp(name, "images_path") == 0)) {
+		strcopy(CFG.images_path, val, sizeof(CFG.images_path));
+		snprintf(bg_path, sizeof(bg_path), "%sbg.png", CFG.images_path); //reset path
+		return;
+	}
+
+	if (CFG.widescreen && strcmp(name, "wimages_path") == 0) {
+		strcopy(CFG.images_path, val, sizeof(CFG.images_path));
+		snprintf(bg_path, sizeof(bg_path), "%swbg.png", CFG.images_path); //reset path
+		return;
+	}
+
+	if (cfg_map_auto("video", map_video, &CFG.video))
+		return;
+
+	if (cfg_map_auto("language", map_language, &CFG.language))
+		return;
+
+	if (cfg_map_auto("layout", map_layout, &CFG.layout)) {
+		cfg_layout();
+	}
+
+	cfg_bool("ocarina", &CFG.ocarina);
+	cfg_bool("covers", &CFG.covers);
+	cfg_bool("download",  &CFG.download);
+	cfg_bool("savesettings", &CFG.savesettings);
+	cfg_bool("installdownload", &CFG.installdownload);
+	cfg_bool("hidesettingmenu", &CFG.hidesettingmenu);
+	cfg_map("home", "exit",   &CFG.home, CFG_HOME_EXIT);
+	cfg_map("home", "reboot", &CFG.home, CFG_HOME_REBOOT);
+	cfg_int("simple", &CFG.simple, 3);
+*/
+		
+	// if these are defined in txt file, use them.  otherwise use defaults
+
+	if (!CFG.widescreen &&(strcmp(name, "theme_path") == 0)) {// if in 4:3
+		strcopy(CFG.theme_path, val, sizeof(CFG.theme_path));
+		return;
+	}
+
+	if (CFG.widescreen && strcmp(name, "wtheme_path") == 0) { // if in 16:9
+		strcopy(CFG.theme_path, val, sizeof(CFG.theme_path));
+		return;
+	}
+
+	if (strcmp(name, "cover_path") == 0) {
+		strcopy(CFG.covers_path, val, sizeof(CFG.covers_path));
+		return;
+	}
+
+	if (strcmp(name, "disc_path") == 0) {
+		strcopy(CFG.disc_path, val, sizeof(CFG.disc_path));
+		return;
+	}
+
+	cfg_int("parentalcontrol", &CFG.parentalcontrol, 4);
+	cfg_bool("godmode", &CFG.godmode);
+
+	if (strcmp(name, "unlock_code") == 0) {
+		strcopy(CFG.unlockCode, val, sizeof(CFG.unlockCode));
+		return;
+	}
+}
+
+void theme_set(char *name, char *val)
+{
+	cfg_name = name;
+	cfg_val = val;
+
+	if(strcmp(cfg_name, "gamelist_coords") == 0) {
+		int x,y,w,h;
+		if (sscanf(val, "%d,%d,%d,%d", &x, &y, &w, &h) == 4) {
+			THEME.selection_x = x - (x % 4);
+			THEME.selection_y = y;
+			THEME.selection_w = w;
+			THEME.selection_h = h;
+		}
+	}
+
+	else if (strcmp(cfg_name, "covers_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.cover_x = x - (x % 4);
+			THEME.cover_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "id_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.id_x = x - (x % 4);
+			THEME.id_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "hddinfo_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.hddInfo_x = x - (x % 4);
+			THEME.hddInfo_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "gamecount_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.gameCnt_x = x - (x % 4);
+			THEME.gameCnt_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "region_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.region_x = x - (x % 4);
+			THEME.region_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "power_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.power_x = x - (x % 4);
+			THEME.power_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "home_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.home_x = x - (x % 4);
+			THEME.home_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "setting_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.setting_x = x - (x % 4);
+			THEME.setting_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "install_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.install_x = x - (x % 4);
+			THEME.install_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "battery1_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.battery1_x = x - (x % 4);
+			THEME.battery1_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "battery2_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.battery2_x = x - (x % 4);
+			THEME.battery2_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "battery3_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.battery3_x = x - (x % 4);
+			THEME.battery3_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "battery4_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.battery4_x = x - (x % 4);
+			THEME.battery4_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "clock_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.clock_x = x - (x % 4);
+			THEME.clock_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "sdcard_coords") == 0) {
+		short x,y;
+		if (sscanf(val, "%hd,%hd", &x, &y) == 2) {
+			THEME.sdcard_x = x - (x % 4);
+			THEME.sdcard_y = y;
+		}
+	}
+
+	else if (strcmp(cfg_name, "info_color") == 0) {
+		short x,y,z;
+		if (sscanf(val, "%hd,%hd, %hd", &x, &y, &z) == 3) {
+			THEME.info_r = x;
+			THEME.info_g = y;
+			THEME.info_b = z;
+		}
+	}
+
+	cfg_bool("show_id", &THEME.showID);
+	cfg_bool("show_tooltip", &THEME.showToolTip);
+	cfg_bool("show_hddinfo", &THEME.showHDD);
+	cfg_bool("show_gamecount", &THEME.showGameCnt);
+	cfg_bool("show_region", &THEME.showRegion);
+	cfg_bool("show_battery", &THEME.showBattery);
+	cfg_map_auto("hddinfo_align", map_alignment, &THEME.hddInfoAlign);
+	cfg_map_auto("gamecount_align", map_alignment, &THEME.gameCntAlign);
+	cfg_map_auto("clock_align", map_alignment, &THEME.clockAlign);
+
+	/*
+	else if (strcmp(cfg_name, "entry_lines") == 0) {
+		int x;
+		if (sscanf(val, "%d", &x) == 1) {
+			ENTRIES_PER_PAGE = x;
+		}
+	}
+
+	else if (strcmp(cfg_name, "max_characters") == 0) {
+		int x;
+		if (sscanf(val, "%d", &x) == 1) {
+			MAX_CHARACTERS = x;
+		}
+	}*/
+}
+
+void global_cfg_set(char *name, char *val)
+{
+	cfg_name = name;
+	cfg_val = val;
+
+	if (strcmp(name, "video") == 0) {
+	        int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.video = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "vpatch") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.vpatch =i;
+		}
+		return;
+	}
+
+	else if (strcmp(name, "language") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.language = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "ocarina") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.ocarina = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "hddinfo") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.hddinfo = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "sinfo") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.sinfo = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "rumble") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.rumble = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "volume") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.volume = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "tooltips") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.tooltips = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "password") == 0) {
+		strcopy(Settings.unlockCode, val, sizeof(Settings.unlockCode));
+		return;
+	}
+	else if (strcmp(name, "parentalcontrol") == 0) {
+		int i;
+		if (sscanf(val, "%d", &i) == 1) {
+			Settings.parentalcontrol = i;
+		}
+		return;
+	}
+	else if (strcmp(name, "cios") == 0) {
 		int i;
 		if (sscanf(val, "%d", &i) == 1) {
             Settings.cios = i;
-			}
-		return;
-	}
-}
-
-// split line to part1 delimiter part2
-bool trimsplit(char *line, char *part1, char *part2, char delim, int size)
-{
-	char *eq = strchr(line, delim);
-	if (!eq) return false;
-	trim_n_copy(part1, line, eq-line, size);
-	trimcopy(part2, eq+1, size);
-	return true;
-}
-void cfg_parseline(char *line, void (*set_func)(char*, char*))
-{
-	// split name = value
-	char tmp[200], name[100], val[100];
-	strcopy(tmp, line, sizeof(tmp));
-	char *eq = strchr(tmp, '=');
-	if (!eq) return;
-	*eq = 0;
-	trimcopy(name, tmp, sizeof(name));
-	trimcopy(val, eq+1, sizeof(val));
-	//printf("CFG: %s = %s\n", name, val);
-	set_func(name, val);
-}
-
-void cfg_parsetitleline(char *line, void (*set_func)(char*, char*, u8))
-{
-	// split name = value
-	char tmp[200], name[100], val[100];
-	int block = 0;
-	strcopy(tmp, line, sizeof(tmp));
-	char *eq = strchr(tmp, '=');
-	if (!eq) return;
-	*eq = 0;
-	trimcopy(name, tmp, sizeof(name));
-
-	char *blockpos = strrchr(eq+1, '=');
-
-	if (!blockpos)
-		trimcopy(val, eq+1, sizeof(val));
-
-	else
-	{
-		*blockpos = 0;
-		trimcopy(val, eq+1, sizeof(val));
-		if (sscanf(blockpos+1, "%d", &block) != 1)
-		{
-			block = 0;
-		}
-	}
-	set_func(name, val, block);
-}
-
-bool cfg_parsefile(char *fname, void (*set_func)(char*, char*))
-{
-	FILE *f;
-	char line[200];
-
-	//printf("opening(%s)\n", fname);
-	f = fopen(fname, "rb");
-	if (!f) {
-		//printf("error opening(%s)\n", fname);
-		return false;
-	}
-
-	while (fgets(line, sizeof(line), f)) {
-		// lines starting with # are comments
-		if (line[0] == '#') continue;
-		cfg_parseline(line, set_func);
-	}
-	return true;
-}
-
-bool cfg_parsetitlefile(char *fname, void (*set_func)(char*, char*, u8))
-{
-	FILE *f;
-	char line[200];
-
-	//printf("opening(%s)\n", fname);
-	f = fopen(fname, "rb");
-	if (!f) {
-		//printf("error opening(%s)\n", fname);
-		return false;
-	}
-
-	while (fgets(line, sizeof(line), f)) {
-		// lines starting with # are comments
-		if (line[0] == '#') continue;
-		cfg_parsetitleline(line, set_func);
-	}
-	return true;
-}
-
-/*
-void cfg_parsearg(int argc, char **argv)
-{
-	int i;
-	char *eq;
-	char pathname[200];
-	for (i=1; i<argc; i++) {
-		//printf("arg[%d]: %s\n", i, argv[i]);
-		eq = strchr(argv[i], '=');
-		if (eq) {
-			cfg_parseline(argv[i], &cfg_set);
-		} else {
-			snprintf(pathname, sizeof(pathname), "%s%s", cfg_path, argv[i]);
-			cfg_parsefile(pathname, &cfg_set);
-		}
-	}
-}
-*/
-
-// PER-GAME SETTINGS
-
-
-// return existing or new
-struct Game_CFG* cfg_get_game(u8 *id)
-{
-	struct Game_CFG *game = CFG_get_game_opt(id);
-	if (game) return game;
-	if (num_saved_games >= MAX_SAVED_GAMES) return NULL;
-	game = &cfg_game[num_saved_games];
-	num_saved_games++;
-	return game;
-}
-
-// current options to game
-void cfg_set_game_opt(struct Game_CFG *game, u8 *id)
-{
-	strncpy((char*)game->id, (char*)id, 6);
-	game->id[6] = 0;
-	game->video = videoChoice;
-	game->language = languageChoice;
-	game->ocarina = ocarinaChoice;
-	game->vipatch = viChoice;
-	game->ios = iosChoice;
-	game->parentalcontrol = parentalcontrolChoice;
-}
-
-bool cfg_save_global()// save global settings
-{
-    struct stat st;
-    if(stat("SD:/config/", &st) != 0) {
-        mkdir("SD:/config", 0777);
-    }
-    FILE *f;
-	f = fopen("SD:/config/global_settings.cfg", "wb");
-	if (!f) {
-		printf("Error saving %s\n", "global_settings.cfg");
-		sleep(1);
-		return false;
-	}
-	fprintf(f, "# USB Loader global settings file\n");
-	fprintf(f, "# Note: This file is automatically generated\n");
-	fprintf(f, "video = %d\n ", Settings.video);
-	fprintf(f, "vpatch = %d\n ", Settings.vpatch);
-	fprintf(f, "language = %d\n ", Settings.language);
-	fprintf(f, "ocarina = %d\n ", Settings.ocarina);
-	fprintf(f, "hddinfo = %d\n ", Settings.hddinfo);
-	fprintf(f, "sinfo = %d\n ", Settings.sinfo);
-	fprintf(f, "rumble = %d\n ", Settings.rumble);
-	fprintf(f, "volume = %d\n ", Settings.volume);
-	fprintf(f, "tooltips = %d\n ", Settings.tooltips);
-	fprintf(f, "password = %s\n ", Settings.unlockCode);
-	fprintf(f, "cios = %d\n ", Settings.cios);
-	fclose(f);
-	return true;
-}
-
-void game_set(char *name, char *val)
-{
-	// sample line:
-	// game:RTNP41 = video:game; language:english; ocarina:0;
-	// game:RYWP01 = video:patch; language:console; ocarina:1;
-	//printf("GAME: '%s=%s'\n", name, val);
-	u8 id[8];
-	struct Game_CFG *game;
-	if (strncmp(name, "game:", 5) != 0) return;
-	trimcopy((char*)id, name+5, sizeof(id));
-	game = cfg_get_game(id);
-	// set id and current options as default
-	cfg_set_game_opt(game, id);
-	//printf("GAME(%s) '%s'\n", id, val); sleep(1);
-
-	// parse val
-	// first split options by ;
-	char opt[100], *p, *np;
-	p = val;
-
-	while(p) {
-		np = strchr(p, ';');
-		if (np) trim_n_copy(opt, p, np-p, sizeof(opt));
-		else trimcopy(opt, p, sizeof(opt));
-		//printf("GAME(%s) (%s)\n", id, opt); sleep(1);
-		// parse opt 'language:english'
-		char opt_name[100], opt_val[100];
-		if (trimsplit(opt, opt_name, opt_val, ':', sizeof(opt_name))){
-			//printf("GAME(%s) (%s=%s)\n", id, opt_name, opt_val); sleep(1);
-			short opt_v, opt_l, opt_c;
-			if (map_auto("video", opt_name, opt_val, map_video, &opt_v)) {
-				// valid option, assign
-				game->video = opt_v;
-			}
-			if (map_auto("language", opt_name, opt_val, map_language, &opt_l)) {
-				// valid option, assign
-				game->language = opt_l;
-			}
-			if (strcmp("ocarina", opt_name) == 0) {
-				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
-					game->ocarina = opt_c;
-				}
-			}
-			if (strcmp("vipatch", opt_name) == 0) {
-				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
-					game->vipatch = opt_c;
-				}
-			}
-			if (strcmp("ios", opt_name) == 0) {
-				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
-					game->ios = opt_c;
-				}
-			}
-			if (strcmp("pctrl", opt_name) == 0) {
-				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
-					game->parentalcontrol = opt_c;
-				}
-			}
-		}
-		// next opt
-		if (np) p = np + 1; else p = NULL;
-	}
-}
-
-bool cfg_load_games()
-{
-	return cfg_parsefile("SD:/config/settings.cfg", &game_set);
-}
-
-bool cfg_save_games()// save per game setings
-{
-	FILE *f;
-	int i;
-	mkdir("SD:/config/", 0777);
-	f = fopen("SD:/config/settings.cfg", "wb");
-	if (!f) {
-		printf("Error saving %s\n", "settings.cfg");
-		sleep(1);
-		return false;
-	}
-	fprintf(f, "# USB Loader settings file\n");
-	fprintf(f, "# note: this file is automatically generated\n");
-	fprintf(f, "# Num Games: %d\n", num_saved_games);
-	for (i=0; i<num_saved_games; i++) {
-		char *s;
-		fprintf(f, "game:%s = ", cfg_game[i].id);
-		s = map_get_name(map_video, cfg_game[i].video);
-		if (s) fprintf(f, "video:%s; ", s);
-		s = map_get_name(map_language, cfg_game[i].language);
-		if (s) fprintf(f, "language:%s; ", s);
-		fprintf(f, "ocarina:%d; ", cfg_game[i].ocarina);
-		fprintf(f, "vipatch:%d; ", cfg_game[i].vipatch);
-		fprintf(f, "ios:%d;", cfg_game[i].ios);
-		fprintf(f, "pctrl:%d;\n", cfg_game[i].parentalcontrol);
-	}
-	fprintf(f, "# END\n");
-	fclose(f);
-	return true;
-}
-
-bool cfg_load_global()
-{
-	//Default values defined by dev team
-	Settings.video = discdefault;
-	Settings.vpatch = off;
-	Settings.language = ConsoleLangDefault;
-	Settings.ocarina = off;
-	Settings.hddinfo = HDDInfo;
-	Settings.sinfo = ((THEME.showID) ? GameID : Neither);
-	Settings.rumble = RumbleOn;
-	if (THEME.showRegion)
-	{
-		Settings.sinfo = ((Settings.sinfo == GameID) ? Both : GameRegion);
-	}
-	Settings.volume = v80;
-
-	return cfg_parsefile("SD:/config/global_settings.cfg", &global_cfg_set);
-}
-
-
-
-struct Game_CFG* CFG_get_game_opt(u8 *id)
-{
-	int i;
-	for (i=0; i<num_saved_games; i++) {
-		if (memcmp(id, cfg_game[i].id, 6) == 0) {
-			return &cfg_game[i];
-		}
-	}
-	return NULL;
-}
-
-bool CFG_save_game_opt(u8 *id)
-{
-	struct Game_CFG *game = cfg_get_game(id);
-	if (!game) return false;
-	cfg_set_game_opt(game, id);
-	return cfg_save_games();
-}
-
-bool CFG_forget_game_opt(u8 *id)
-{
-	struct Game_CFG *game = CFG_get_game_opt(id);
-	int i;
-	if (!game) return true;
-	// move entries down
-	num_saved_games--;
-	for (i=game-cfg_game; i<num_saved_games; i++) {
-		cfg_game[i] = cfg_game[i+1];
-	}
-	memset(&cfg_game[num_saved_games], 0, sizeof(struct Game_CFG));
-	return cfg_save_games();
-}
-
-void CFG_Load(int argc, char **argv)
-{
-	char pathname[200];
-//	bool ret = false;
-
-	//set app path
-//	chdir_app(argv[0]);
-
-	CFG_Default();
-
-	snprintf(pathname, sizeof(pathname), "SD:/config/config.txt");
-
-	cfg_parsefile(pathname, &widescreen_set); //first set widescreen
-	cfg_parsefile(pathname, &cfg_set); //then set config and layout options
-
-	snprintf(pathname, sizeof(pathname), "%stheme.txt", CFG.theme_path);
-	cfg_parsefile(pathname, &theme_set); //finally set console information
-
-//	if (!ret)
-//	{
-//		cfg_parsefile("SD:/config.txt", &widescreen_set);
-//		cfg_parsefile("SD:/config.txt", &cfg_set);
-//		cfg_parsefile("SD:/config.txt", &console_set);
-//	}
-
-	snprintf(pathname, sizeof(pathname), "SD:/config/titles.txt");
-	cfg_parsetitlefile(pathname, &title_set);
-
-	// load per-game settings
-	cfg_load_games();
-
-
-//	cfg_parsearg(argc, argv);
-}
+			}
+		return;
+	}
+}
+
+// split line to part1 delimiter part2
+bool trimsplit(char *line, char *part1, char *part2, char delim, int size)
+{
+	char *eq = strchr(line, delim);
+	if (!eq) return false;
+	trim_n_copy(part1, line, eq-line, size);
+	trimcopy(part2, eq+1, size);
+	return true;
+}
+void cfg_parseline(char *line, void (*set_func)(char*, char*))
+{
+	// split name = value
+	char tmp[200], name[100], val[100];
+	strcopy(tmp, line, sizeof(tmp));
+	char *eq = strchr(tmp, '=');
+	if (!eq) return;
+	*eq = 0;
+	trimcopy(name, tmp, sizeof(name));
+	trimcopy(val, eq+1, sizeof(val));
+	//printf("CFG: %s = %s\n", name, val);
+	set_func(name, val);
+}
+
+void cfg_parsetitleline(char *line, void (*set_func)(char*, char*, u8))
+{
+	// split name = value
+	char tmp[200], name[100], val[100];
+	int block = 0;
+	strcopy(tmp, line, sizeof(tmp));
+	char *eq = strchr(tmp, '=');
+	if (!eq) return;
+	*eq = 0;
+	trimcopy(name, tmp, sizeof(name));
+
+	char *blockpos = strrchr(eq+1, '=');
+
+	if (!blockpos)
+		trimcopy(val, eq+1, sizeof(val));
+
+	else
+	{
+		*blockpos = 0;
+		trimcopy(val, eq+1, sizeof(val));
+		if (sscanf(blockpos+1, "%d", &block) != 1)
+		{
+			block = 0;
+		}
+	}
+	set_func(name, val, block);
+}
+
+bool cfg_parsefile(char *fname, void (*set_func)(char*, char*))
+{
+	FILE *f;
+	char line[200];
+
+	//printf("opening(%s)\n", fname);
+	f = fopen(fname, "rb");
+	if (!f) {
+		//printf("error opening(%s)\n", fname);
+		return false;
+	}
+
+	while (fgets(line, sizeof(line), f)) {
+		// lines starting with # are comments
+		if (line[0] == '#') continue;
+		cfg_parseline(line, set_func);
+	}
+	return true;
+}
+
+bool cfg_parsetitlefile(char *fname, void (*set_func)(char*, char*, u8))
+{
+	FILE *f;
+	char line[200];
+
+	//printf("opening(%s)\n", fname);
+	f = fopen(fname, "rb");
+	if (!f) {
+		//printf("error opening(%s)\n", fname);
+		return false;
+	}
+
+	while (fgets(line, sizeof(line), f)) {
+		// lines starting with # are comments
+		if (line[0] == '#') continue;
+		cfg_parsetitleline(line, set_func);
+	}
+	return true;
+}
+
+/*
+void cfg_parsearg(int argc, char **argv)
+{
+	int i;
+	char *eq;
+	char pathname[200];
+	for (i=1; i<argc; i++) {
+		//printf("arg[%d]: %s\n", i, argv[i]);
+		eq = strchr(argv[i], '=');
+		if (eq) {
+			cfg_parseline(argv[i], &cfg_set);
+		} else {
+			snprintf(pathname, sizeof(pathname), "%s%s", cfg_path, argv[i]);
+			cfg_parsefile(pathname, &cfg_set);
+		}
+	}
+}
+*/
+
+// PER-GAME SETTINGS
+
+
+// return existing or new
+struct Game_CFG* cfg_get_game(u8 *id)
+{
+	struct Game_CFG *game = CFG_get_game_opt(id);
+	if (game) return game;
+	if (num_saved_games >= MAX_SAVED_GAMES) return NULL;
+	game = &cfg_game[num_saved_games];
+	num_saved_games++;
+	return game;
+}
+
+// current options to game
+void cfg_set_game_opt(struct Game_CFG *game, u8 *id)
+{
+	strncpy((char*)game->id, (char*)id, 6);
+	game->id[6] = 0;
+	game->video = videoChoice;
+	game->language = languageChoice;
+	game->ocarina = ocarinaChoice;
+	game->vipatch = viChoice;
+	game->ios = iosChoice;
+	game->parentalcontrol = parentalcontrolChoice;
+}
+
+bool cfg_save_global()// save global settings
+{
+    struct stat st;
+    if(stat("SD:/config/", &st) != 0) {
+        mkdir("SD:/config", 0777);
+    }
+    FILE *f;
+	f = fopen("SD:/config/global_settings.cfg", "wb");
+	if (!f) {
+		printf("Error saving %s\n", "global_settings.cfg");
+		sleep(1);
+		return false;
+	}
+	fprintf(f, "# USB Loader global settings file\n");
+	fprintf(f, "# Note: This file is automatically generated\n");
+	fprintf(f, "video = %d\n ", Settings.video);
+	fprintf(f, "vpatch = %d\n ", Settings.vpatch);
+	fprintf(f, "language = %d\n ", Settings.language);
+	fprintf(f, "ocarina = %d\n ", Settings.ocarina);
+	fprintf(f, "hddinfo = %d\n ", Settings.hddinfo);
+	fprintf(f, "sinfo = %d\n ", Settings.sinfo);
+	fprintf(f, "rumble = %d\n ", Settings.rumble);
+	fprintf(f, "volume = %d\n ", Settings.volume);
+	fprintf(f, "tooltips = %d\n ", Settings.tooltips);
+	fprintf(f, "password = %s\n ", Settings.unlockCode);
+	fprintf(f, "cios = %d\n ", Settings.cios);
+	fclose(f);
+	return true;
+}
+
+void game_set(char *name, char *val)
+{
+	// sample line:
+	// game:RTNP41 = video:game; language:english; ocarina:0;
+	// game:RYWP01 = video:patch; language:console; ocarina:1;
+	//printf("GAME: '%s=%s'\n", name, val);
+	u8 id[8];
+	struct Game_CFG *game;
+	if (strncmp(name, "game:", 5) != 0) return;
+	trimcopy((char*)id, name+5, sizeof(id));
+	game = cfg_get_game(id);
+	// set id and current options as default
+	cfg_set_game_opt(game, id);
+	//printf("GAME(%s) '%s'\n", id, val); sleep(1);
+
+	// parse val
+	// first split options by ;
+	char opt[100], *p, *np;
+	p = val;
+
+	while(p) {
+		np = strchr(p, ';');
+		if (np) trim_n_copy(opt, p, np-p, sizeof(opt));
+		else trimcopy(opt, p, sizeof(opt));
+		//printf("GAME(%s) (%s)\n", id, opt); sleep(1);
+		// parse opt 'language:english'
+		char opt_name[100], opt_val[100];
+		if (trimsplit(opt, opt_name, opt_val, ':', sizeof(opt_name))){
+			//printf("GAME(%s) (%s=%s)\n", id, opt_name, opt_val); sleep(1);
+			short opt_v, opt_l, opt_c;
+			if (map_auto("video", opt_name, opt_val, map_video, &opt_v)) {
+				// valid option, assign
+				game->video = opt_v;
+			}
+			if (map_auto("language", opt_name, opt_val, map_language, &opt_l)) {
+				// valid option, assign
+				game->language = opt_l;
+			}
+			if (strcmp("ocarina", opt_name) == 0) {
+				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
+					game->ocarina = opt_c;
+				}
+			}
+			if (strcmp("vipatch", opt_name) == 0) {
+				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
+					game->vipatch = opt_c;
+				}
+			}
+			if (strcmp("ios", opt_name) == 0) {
+				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
+					game->ios = opt_c;
+				}
+			}
+			if (strcmp("pctrl", opt_name) == 0) {
+				if (sscanf(opt_val, "%hd", &opt_c) == 1) {
+					game->parentalcontrol = opt_c;
+				}
+			}
+		}
+		// next opt
+		if (np) p = np + 1; else p = NULL;
+	}
+}
+
+bool cfg_load_games()
+{
+	return cfg_parsefile("SD:/config/settings.cfg", &game_set);
+}
+
+bool cfg_save_games()// save per game setings
+{
+	FILE *f;
+	int i;
+	mkdir("SD:/config/", 0777);
+	f = fopen("SD:/config/settings.cfg", "wb");
+	if (!f) {
+		printf("Error saving %s\n", "settings.cfg");
+		sleep(1);
+		return false;
+	}
+	fprintf(f, "# USB Loader settings file\n");
+	fprintf(f, "# note: this file is automatically generated\n");
+	fprintf(f, "# Num Games: %d\n", num_saved_games);
+	for (i=0; i<num_saved_games; i++) {
+		char *s;
+		fprintf(f, "game:%s = ", cfg_game[i].id);
+		s = map_get_name(map_video, cfg_game[i].video);
+		if (s) fprintf(f, "video:%s; ", s);
+		s = map_get_name(map_language, cfg_game[i].language);
+		if (s) fprintf(f, "language:%s; ", s);
+		fprintf(f, "ocarina:%d; ", cfg_game[i].ocarina);
+		fprintf(f, "vipatch:%d; ", cfg_game[i].vipatch);
+		fprintf(f, "ios:%d;", cfg_game[i].ios);
+		fprintf(f, "pctrl:%d;\n", cfg_game[i].parentalcontrol);
+	}
+	fprintf(f, "# END\n");
+	fclose(f);
+	return true;
+}
+
+bool cfg_load_global()
+{
+	//Default values defined by dev team
+	Settings.video = discdefault;
+	Settings.vpatch = off;
+	Settings.language = ConsoleLangDefault;
+	Settings.ocarina = off;
+	Settings.hddinfo = HDDInfo;
+	Settings.sinfo = ((THEME.showID) ? GameID : Neither);
+	Settings.rumble = RumbleOn;
+	if (THEME.showRegion)
+	{
+		Settings.sinfo = ((Settings.sinfo == GameID) ? Both : GameRegion);
+	}
+	Settings.volume = v80;
+
+	return cfg_parsefile("SD:/config/global_settings.cfg", &global_cfg_set);
+}
+
+
+
+struct Game_CFG* CFG_get_game_opt(u8 *id)
+{
+	int i;
+	for (i=0; i<num_saved_games; i++) {
+		if (memcmp(id, cfg_game[i].id, 6) == 0) {
+			return &cfg_game[i];
+		}
+	}
+	return NULL;
+}
+
+bool CFG_save_game_opt(u8 *id)
+{
+	struct Game_CFG *game = cfg_get_game(id);
+	if (!game) return false;
+	cfg_set_game_opt(game, id);
+	return cfg_save_games();
+}
+
+bool CFG_forget_game_opt(u8 *id)
+{
+	struct Game_CFG *game = CFG_get_game_opt(id);
+	int i;
+	if (!game) return true;
+	// move entries down
+	num_saved_games--;
+	for (i=game-cfg_game; i<num_saved_games; i++) {
+		cfg_game[i] = cfg_game[i+1];
+	}
+	memset(&cfg_game[num_saved_games], 0, sizeof(struct Game_CFG));
+	return cfg_save_games();
+}
+
+void CFG_Load(int argc, char **argv)
+{
+	char pathname[200];
+//	bool ret = false;
+
+	//set app path
+//	chdir_app(argv[0]);
+
+	CFG_Default(-1); // set defaults non forced
+
+	snprintf(pathname, sizeof(pathname), "SD:/config/config.txt");
+
+	cfg_parsefile(pathname, &widescreen_set); //first set widescreen
+	cfg_parsefile(pathname, &cfg_set); //then set config and layout options
+
+	snprintf(pathname, sizeof(pathname), "%stheme.txt", CFG.theme_path);
+	cfg_parsefile(pathname, &theme_set); //finally set console information
+
+//	if (!ret)
+//	{
+//		cfg_parsefile("SD:/config.txt", &widescreen_set);
+//		cfg_parsefile("SD:/config.txt", &cfg_set);
+//		cfg_parsefile("SD:/config.txt", &console_set);
+//	}
+
+	snprintf(pathname, sizeof(pathname), "SD:/config/titles.txt");
+	cfg_parsetitlefile(pathname, &title_set);
+
+	// load per-game settings
+	cfg_load_games();
+
+
+//	cfg_parsearg(argc, argv);
+}
 
 void CFG_LoadGlobal(void)
 {
 	cfg_parsefile("SD:/config/global_settings.cfg", &global_cfg_set);
-}
-
-void CFG_Cleanup(void)
-{
-	if (cfg_title)
-	{
-		free(cfg_title);
-		cfg_title = NULL;
-	}
-}
+}
+
+void CFG_Cleanup(void)
+{
+	if (cfg_title)
+	{
+		free(cfg_title);
+		cfg_title = NULL;
+	}
+}
diff --git a/source/cfg.h b/source/cfg.h
index f15dba56..e6144fe7 100644
--- a/source/cfg.h
+++ b/source/cfg.h
@@ -142,85 +142,85 @@ struct Game_CFG
 };
 
 
-void CFG_Default();
+void CFG_Default(int widescreen); // -1 = non forced mode
 void CFG_Load(int argc, char **argv);
 struct Game_CFG* CFG_get_game_opt(u8 *id);
 bool CFG_save_game_opt(u8 *id);
-bool CFG_forget_game_opt(u8 *id);
+bool CFG_forget_game_opt(u8 *id);
 
 //Astidof - Begin of modification
-enum {
-	ConsoleLangDefault,
-	jap,
-	eng,
-	ger,
-	fren,
-	esp,
-	it,
-	dut,
+enum {
+	ConsoleLangDefault,
+	jap,
+	eng,
+	ger,
+	fren,
+	esp,
+	it,
+	dut,
 	schin,
 	tchin,
 	kor
 };
 
-enum {
+enum {
     systemdefault,
-    discdefault,
+    discdefault,
 	patch,
 	pal50,
 	pal60,
-	ntsc
-};
+	ntsc
+};
 
 enum {
     off,
 	on,
-};
-
-enum {
-    GameID,
-	GameRegion,
-	Both,
-	Neither,
-};
-
-enum {
-	i249,
-	i222,
+};
+
+enum {
+    GameID,
+	GameRegion,
+	Both,
+	Neither,
+};
+
+enum {
+	i249,
+	i222,
 };
 
 enum {
 	ios249,
 	ios222,
 };
-
-enum {
-	HDDInfo,
-	Clock,
-};
-
-enum {
-	RumbleOff,
-	RumbleOn,
-};
-
-enum {
-	TooltipsOff,
-	TooltipsOn,
-};
-
-enum {
-	v10,
-	v20,
-	v30,
-	v40,
-	v50,
-	v60,
-	v70,
-	v80,
-	v90,
-	v100,
-	v0,
+
+enum {
+	HDDInfo,
+	Clock,
+};
+
+enum {
+	RumbleOff,
+	RumbleOn,
+};
+
+enum {
+	TooltipsOff,
+	TooltipsOn,
+};
+
+enum {
+	v10,
+	v20,
+	v30,
+	v40,
+	v50,
+	v60,
+	v70,
+	v80,
+	v90,
+	v100,
+	v0,
 };
 
 enum {
@@ -228,24 +228,24 @@ enum {
 	ParentalControlLevel1,
 	ParentalControlLevel2,
 	ParentalControlLevel3
-};
-
-struct SSettings {
-    int		video;
-    int		language;
-    int     ocarina;
+};
+
+struct SSettings {
+    int		video;
+    int		language;
+    int     ocarina;
     int     vpatch;
-    int     ios;
-	int		sinfo;
-	int		hddinfo;
-	int		rumble;
-	int		volume;
+    int     ios;
+	int		sinfo;
+	int		hddinfo;
+	int		rumble;
+	int		volume;
 	int     tooltips;
 	char 	unlockCode[20];
 	int		parentalcontrol;
-	int     cios;
-};
-
+	int     cios;
+};
+
 void CFG_LoadGlobal(void);
 bool cfg_save_global(void);
 //Astidof - End of modification
diff --git a/source/filelist.h b/source/filelist.h
index 6c72c440..46048103 100644
--- a/source/filelist.h
+++ b/source/filelist.h
@@ -14,6 +14,9 @@
 extern const u8		font_ttf[];
 extern const u32	font_ttf_size;
 
+extern const u8		clock_ttf[];
+extern const u32	clock_ttf_size;
+
 extern const u8		sdcard_png[];
 extern const u32	sdcard_png_size;
 
diff --git a/source/fonts/clock.ttf b/source/fonts/clock.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d3c73b1df00c128702c455b1a679fb888c0409a5
GIT binary patch
literal 4436
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
JKYUm|<e%wZ<Cp*d

literal 0
HcmV?d00001

diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h
index 64f1f6d0..0be8f325 100644
--- a/source/libwiigui/gui.h
+++ b/source/libwiigui/gui.h
@@ -622,6 +622,7 @@ class GuiText : public GuiElement
 		//!\param hor Horizontal alignment (ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTRE)
 		//!\param vert Vertical alignment (ALIGN_TOP, ALIGN_BOTTOM, ALIGN_MIDDLE)
 		void SetAlignment(int hor, int vert);
+		void SetFont(FreeTypeGX *f);
 		//!Constantly called to draw the text
 		void Draw();
 	protected:
@@ -630,6 +631,7 @@ class GuiText : public GuiElement
 		int maxWidth; //!< Maximum width of the generated text object (for text wrapping)
 		u16 style; //!< FreeTypeGX style attributes
 		GXColor color; //!< Font color
+		FreeTypeGX *font;
 };
 
 //!Display, manage, and manipulate buttons in the GUI. Buttons can have images, icons, text, and sound set (all of which are optional)
diff --git a/source/libwiigui/gui_text.cpp b/source/libwiigui/gui_text.cpp
index f3254a36..10012510 100644
--- a/source/libwiigui/gui_text.cpp
+++ b/source/libwiigui/gui_text.cpp
@@ -29,6 +29,7 @@ GuiText::GuiText(const char * t, int s, GXColor c)
 	alpha = c.a;
 	style = FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE;
 	maxWidth = 0;
+	font = 0;
 
 	alignmentHor = ALIGN_CENTRE;
 	alignmentVert = ALIGN_MIDDLE;
@@ -142,7 +143,13 @@ void GuiText::SetAlignment(int hor, int vert)
 	alignmentHor = hor;
 	alignmentVert = vert;
 }
-
+/**
+ * Set the Font
+ */
+void GuiText::SetFont(FreeTypeGX *f)
+{
+	font = f;
+}
 /**
  * Draw the text on screen
  */
@@ -161,7 +168,7 @@ void GuiText::Draw()
 
 	if(newSize != currentSize)
 	{
-		fontSystem->changeSize(newSize);
+		(font ? font : fontSystem)->changeSize(newSize);
 		currentSize = newSize;
 	}
 
@@ -191,7 +198,7 @@ void GuiText::Draw()
 
 			if(text[ch] == ' ' || ch == strlen-1)
 			{
-				if(fontSystem->getWidth(tmptext[linenum]) >= maxWidth)
+				if((font ? font : fontSystem)->getWidth(tmptext[linenum]) >= maxWidth)
 				{
 					if(lastSpace >= 0)
 					{
@@ -222,13 +229,13 @@ void GuiText::Draw()
 
 		for(i=0; i < linenum; i++)
 		{
-			fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
+			(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style);
 			delete tmptext[i];
 		}
 	}
 	else
 	{
-		fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
+		(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style);
 	}
 	this->UpdateEffects();
 }
diff --git a/source/main.cpp b/source/main.cpp
index c3c171cb..706b77da 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -41,7 +41,8 @@
 #define CONSOLE_WIDTH		340
 #define CONSOLE_HEIGHT		218
 
-FreeTypeGX *fontSystem;
+FreeTypeGX *fontSystem=0;
+FreeTypeGX *fontClock=0;
 int ExitRequested = 0;
 bool netcheck = false;
 
@@ -146,6 +147,10 @@ main(int argc, char *argv[])
 	fontSystem->loadFont(font_ttf, font_ttf_size, 0);
 	fontSystem->setCompatibilityMode(FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE);
 
+	fontClock = new FreeTypeGX();
+	fontClock->loadFont(clock_ttf, clock_ttf_size, 0);
+	fontClock->setCompatibilityMode(FTGX_COMPATIBILITY_DEFAULT_TEVOP_GX_PASSCLR | FTGX_COMPATIBILITY_DEFAULT_VTXDESC_GX_NONE);
+
 	InitGUIThreads();
 	MainMenu(MENU_CHECK);
 	return 0;
diff --git a/source/menu.cpp b/source/menu.cpp
index dd4c7acd..f90f5d50 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -42,6 +42,8 @@
 
 #define MAX_CHARACTERS		38
 
+extern FreeTypeGX *fontClock; //CLOCK
+
 static GuiImage * coverImg = NULL;
 static GuiImageData * cover = NULL;
 
@@ -2381,6 +2383,7 @@ static int MenuDiscList()
     GuiText clockTime(theTime, 30, (GXColor){138, 138, 138, 255});
     clockTime.SetAlignment(THEME.clockAlign, ALIGN_BOTTOM);
     clockTime.SetPosition(THEME.clock_x, THEME.clock_y);
+	clockTime.SetFont(fontClock);
 
     HaltGui();
 	GuiWindow w(screenwidth, screenheight);
@@ -2609,7 +2612,7 @@ static int MenuDiscList()
 				snprintf (ID,sizeof(ID),"%c%c%c", header->id[0], header->id[1], header->id[2]);
 				snprintf (IDfull,sizeof(IDfull),"%c%c%c%c%c%c", header->id[0], header->id[1], header->id[2],header->id[3], header->id[4], header->id[5]);
 				w.Remove(&DownloadBtn);
-				w.Remove(coverImg);
+//				w.Remove(coverImg);
 
 				if (GameIDTxt)
 				{