update images

source/ngc/fceugx.cpp

@@ -233,6 +233,8 @@ int main(int argc, char *argv[])
 
 	MountAllFAT(); // Initialize libFAT for SD and USB
 
+	DefaultSettings(); // Set defaults
+
 	// Audio
 	InitialiseAudio();
 
@@ -243,8 +245,6 @@ int main(int argc, char *argv[])
 
 	InitGUIThreads();
 
-	DefaultSettings(); // Set defaults
-
 	// allocate memory to store rom
 	nesrom = (unsigned char *)memalign(32,1024*1024*3); // 3 MB should be plenty
 

source/ngc/filelist.h

@@ -41,12 +41,60 @@ extern const u32	icon_settings_png_size;
 extern const u8		icon_home_png[];
 extern const u32	icon_home_png_size;
 
+extern const u8		icon_game_cheats_png[];
+extern const u32	icon_game_cheats_png_size;
+extern const u8		icon_game_controllers_png[];
+extern const u32	icon_game_controllers_png_size;
+extern const u8		icon_game_load_png[];
+extern const u32	icon_game_load_png_size;
+extern const u8		icon_game_save_png[];
+extern const u32	icon_game_save_png_size;
+extern const u8		icon_game_reset_png[];
+extern const u32	icon_game_reset_png_size;
+
+extern const u8		icon_settings_wiimote_png[];
+extern const u32	icon_settings_wiimote_png_size;
+extern const u8		icon_settings_classic_png[];
+extern const u32	icon_settings_classic_png_size;
+extern const u8		icon_settings_gamecube_png[];
+extern const u32	icon_settings_gamecube_png_size;
+extern const u8		icon_settings_nunchuk_png[];
+extern const u32	icon_settings_nunchuk_png_size;
+
+extern const u8		icon_settings_nescontroller_png[];
+extern const u32	icon_settings_nescontroller_png_size;
+extern const u8		icon_settings_zapper_png[];
+extern const u32	icon_settings_zapper_png_size;
+
+extern const u8		icon_settings_file_png[];
+extern const u32	icon_settings_file_png_size;
+extern const u8		icon_settings_mappings_png[];
+extern const u32	icon_settings_mappings_png_size;
+extern const u8		icon_settings_menu_png[];
+extern const u32	icon_settings_menu_png_size;
+extern const u8		icon_settings_network_png[];
+extern const u32	icon_settings_network_png_size;
+extern const u8		icon_settings_video_png[];
+extern const u32	icon_settings_video_png_size;
+
 extern const u8		button_png[];
 extern const u32	button_png_size;
 
 extern const u8		button_over_png[];
 extern const u32	button_over_png_size;
 
+extern const u8		button_small_png[];
+extern const u32	button_small_png_size;
+
+extern const u8		button_small_over_png[];
+extern const u32	button_small_over_png_size;
+
+extern const u8		button_large_png[];
+extern const u32	button_large_png_size;
+
+extern const u8		button_large_over_png[];
+extern const u32	button_large_over_png_size;
+
 extern const u8		button_arrow_left_png[];
 extern const u32	button_arrow_left_png_size;
 
@@ -71,18 +119,6 @@ extern const u32	button_arrow_up_over_png_size;
 extern const u8		button_arrow_down_over_png[];
 extern const u32	button_arrow_down_over_png_size;
 
-extern const u8		button_close_png[];
-extern const u32	button_close_png_size;
-
-extern const u8		button_close_over_png[];
-extern const u32	button_close_over_png_size;
-
-extern const u8		button_large_png[];
-extern const u32	button_large_png_size;
-
-extern const u8		button_large_over_png[];
-extern const u32	button_large_over_png_size;
-
 extern const u8		button_gamesave_png[];
 extern const u32	button_gamesave_png_size;
 

source/ngc/fileop.cpp

@@ -80,8 +80,8 @@ devicecallback (void *arg)
 			}
 		}
 
-		InitializeNetwork(SILENT);
-		UpdateCheck();
+		//InitializeNetwork(SILENT);
+		//UpdateCheck();
 #else
 		if(isMounted[METHOD_SD_SLOTA])
 		{

source/ngc/gcvideo.cpp

@@ -265,7 +265,7 @@ InitVideoThread ()
 	LWP_InitQueue (&videoblankqueue);
 
 	/*** Create the thread on this queue ***/
-	LWP_CreateThread (&vbthread, vbgetback, NULL, vbstack, TSTACK, 150);
+	LWP_CreateThread (&vbthread, vbgetback, NULL, vbstack, TSTACK, 77);
 }
 
 /****************************************************************************
@@ -566,7 +566,6 @@ InitGCVideo ()
 	copynow = GX_FALSE;
 
 	StartGX ();
-	draw_init ();
 	InitVideoThread ();
 	// Finally, the video is up and ready for use :)
 }
@@ -663,6 +662,7 @@ ResetVideo_Emu ()
 
 	// set aspect ratio
 	updateScaling = 5;
+	draw_init ();
 }
 
 /****************************************************************************

source/ngc/menu.cpp

@@ -107,7 +107,7 @@ WindowPrompt(const char *title, const char *msg, const char *btn1Label, const ch
 	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 
-	GuiText titleTxt(title, 26, (GXColor){255, 255, 255, 255});
+	GuiText titleTxt(title, 26, (GXColor){70, 70, 10, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,14);
 	GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255});
@@ -309,7 +309,7 @@ ProgressWindow(char *title, char *msg)
 	throbberImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	throbberImg.SetPosition(0, 40);
 
-	GuiText titleTxt(title, 26, (GXColor){255, 255, 255, 255});
+	GuiText titleTxt(title, 26, (GXColor){70, 70, 10, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,14);
 	GuiText msgTxt(msg, 26, (GXColor){0, 0, 0, 255});
@@ -575,7 +575,7 @@ SettingWindow(const char * title, GuiWindow * w)
 	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 
-	GuiText titleTxt(title, 26, (GXColor){255, 255, 255, 255});
+	GuiText titleTxt(title, 26, (GXColor){70, 70, 10, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,14);
 
@@ -663,7 +663,7 @@ static void WindowCredits(void * ptr)
 	creditsBoxImg.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	creditsWindowBox.Append(&creditsBoxImg);
 
-	int numEntries = 23;
+	int numEntries = 24;
 	GuiText * txt[numEntries];
 
 	txt[i] = new GuiText("Credits", 30, (GXColor){0, 0, 0, 255});
@@ -686,6 +686,10 @@ static void WindowCredits(void * ptr)
 	txt[i] = new GuiText("Menu sound");
 	txt[i]->SetPosition(50,y); i++;
 	txt[i] = new GuiText("Peter de Man");
+	txt[i]->SetPosition(320,y); i++; y+=24;
+	txt[i] = new GuiText("Logo");
+	txt[i]->SetPosition(50,y); i++;
+	txt[i] = new GuiText("mvit");
 	txt[i]->SetPosition(320,y); i++; y+=48;
 
 	txt[i] = new GuiText("FCE Ultra GX GameCube");
@@ -856,7 +860,7 @@ static int MenuGameSelection()
 
 	HaltGui();
 	btnLogo->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
-	btnLogo->SetPosition(-30, 30);
+	btnLogo->SetPosition(-30, 24);
 	mainWindow->Append(&titleTxt);
 	mainWindow->Append(&gameBrowser);
 	mainWindow->Append(&buttonWindow);
@@ -1013,10 +1017,16 @@ static int MenuGame()
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
 	GuiImageData btnOutline(button_png);
 	GuiImageData btnOutlineOver(button_over_png);
-	GuiImageData btnCloseOutline(button_close_png);
-	GuiImageData btnCloseOutlineOver(button_close_over_png);
+	GuiImageData btnCloseOutline(button_small_png);
+	GuiImageData btnCloseOutlineOver(button_small_over_png);
 	GuiImageData btnLargeOutline(button_large_png);
 	GuiImageData btnLargeOutlineOver(button_large_over_png);
+	GuiImageData iconCheats(icon_game_cheats_png);
+	GuiImageData iconController(icon_game_controllers_png);
+	GuiImageData iconLoad(icon_game_load_png);
+	GuiImageData iconSave(icon_game_save_png);
+	GuiImageData iconReset(icon_game_reset_png);
+
 	GuiImageData battery(battery_png);
 	GuiImageData batteryRed(battery_red_png);
 	GuiImageData batteryBar(battery_bar_png);
@@ -1033,12 +1043,14 @@ static int MenuGame()
 	GuiText saveBtnTxt("Save", 24, (GXColor){0, 0, 0, 255});
 	GuiImage saveBtnImg(&btnLargeOutline);
 	GuiImage saveBtnImgOver(&btnLargeOutlineOver);
+	GuiImage saveBtnIcon(&iconSave);
 	GuiButton saveBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	saveBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	saveBtn.SetPosition(-125, 120);
 	saveBtn.SetLabel(&saveBtnTxt);
 	saveBtn.SetImage(&saveBtnImg);
 	saveBtn.SetImageOver(&saveBtnImgOver);
+	saveBtn.SetIcon(&saveBtnIcon);
 	saveBtn.SetSoundOver(&btnSoundOver);
 	saveBtn.SetTrigger(&trigA);
 	saveBtn.SetEffectGrow();
@@ -1046,12 +1058,14 @@ static int MenuGame()
 	GuiText loadBtnTxt("Load", 24, (GXColor){0, 0, 0, 255});
 	GuiImage loadBtnImg(&btnLargeOutline);
 	GuiImage loadBtnImgOver(&btnLargeOutlineOver);
+	GuiImage loadBtnIcon(&iconLoad);
 	GuiButton loadBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	loadBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	loadBtn.SetPosition(125, 120);
 	loadBtn.SetLabel(&loadBtnTxt);
 	loadBtn.SetImage(&loadBtnImg);
 	loadBtn.SetImageOver(&loadBtnImgOver);
+	loadBtn.SetIcon(&loadBtnIcon);
 	loadBtn.SetSoundOver(&btnSoundOver);
 	loadBtn.SetTrigger(&trigA);
 	loadBtn.SetEffectGrow();
@@ -1059,12 +1073,14 @@ static int MenuGame()
 	GuiText resetBtnTxt("Reset", 24, (GXColor){0, 0, 0, 255});
 	GuiImage resetBtnImg(&btnLargeOutline);
 	GuiImage resetBtnImgOver(&btnLargeOutlineOver);
+	GuiImage resetBtnIcon(&iconReset);
 	GuiButton resetBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	resetBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	resetBtn.SetPosition(-125, 250);
 	resetBtn.SetLabel(&resetBtnTxt);
 	resetBtn.SetImage(&resetBtnImg);
 	resetBtn.SetImageOver(&resetBtnImgOver);
+	resetBtn.SetIcon(&resetBtnIcon);
 	resetBtn.SetSoundOver(&btnSoundOver);
 	resetBtn.SetTrigger(&trigA);
 	resetBtn.SetEffectGrow();
@@ -1072,12 +1088,14 @@ static int MenuGame()
 	GuiText controllerBtnTxt("Controller", 24, (GXColor){0, 0, 0, 255});
 	GuiImage controllerBtnImg(&btnLargeOutline);
 	GuiImage controllerBtnImgOver(&btnLargeOutlineOver);
+	GuiImage controllerBtnIcon(&iconController);
 	GuiButton controllerBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	controllerBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	controllerBtn.SetPosition(125, 250);
 	controllerBtn.SetLabel(&controllerBtnTxt);
 	controllerBtn.SetImage(&controllerBtnImg);
 	controllerBtn.SetImageOver(&controllerBtnImgOver);
+	controllerBtn.SetIcon(&controllerBtnIcon);
 	controllerBtn.SetSoundOver(&btnSoundOver);
 	controllerBtn.SetTrigger(&trigA);
 	controllerBtn.SetEffectGrow();
@@ -1085,12 +1103,14 @@ static int MenuGame()
 	/*GuiText cheatsBtnTxt("Cheats", 24, (GXColor){0, 0, 0, 255});
 	GuiImage cheatsBtnImg(&btnLargeOutline);
 	GuiImage cheatsBtnImgOver(&btnLargeOutlineOver);
+	GuiImage cheatsBtnIcon(&iconCheats);
 	GuiButton cheatsBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	cheatsBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	cheatsBtn.SetPosition(125, 250);
 	cheatsBtn.SetLabel(&cheatsBtnTxt);
 	cheatsBtn.SetImage(&cheatsBtnImg);
 	cheatsBtn.SetImageOver(&cheatsBtnImgOver);
+	cheatsBtn.SetIcon(&cheatsBtnIcon);
 	cheatsBtn.SetSoundOver(&btnSoundOver);
 	cheatsBtn.SetTrigger(&trigA);
 	cheatsBtn.SetEffectGrow();*/
@@ -1359,8 +1379,8 @@ static int MenuGameSaves(int action)
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
 	GuiImageData btnOutline(button_png);
 	GuiImageData btnOutlineOver(button_over_png);
-	GuiImageData btnCloseOutline(button_close_png);
-	GuiImageData btnCloseOutlineOver(button_close_over_png);
+	GuiImageData btnCloseOutline(button_small_png);
+	GuiImageData btnCloseOutlineOver(button_small_over_png);
 
 	GuiTrigger trigA;
 	if(GCSettings.WiimoteOrientation)
@@ -1621,8 +1641,8 @@ static int MenuGameCheats()
 	GuiSound btnSoundOver(button_over_pcm, button_over_pcm_size, SOUND_PCM);
 	GuiImageData btnOutline(button_png);
 	GuiImageData btnOutlineOver(button_over_png);
-	GuiImageData btnCloseOutline(button_close_png);
-	GuiImageData btnCloseOutlineOver(button_close_over_png);
+	GuiImageData btnCloseOutline(button_small_png);
+	GuiImageData btnCloseOutlineOver(button_small_over_png);
 
 	GuiTrigger trigA;
 	if(GCSettings.WiimoteOrientation)
@@ -1717,7 +1737,6 @@ static int MenuGameCheats()
 /****************************************************************************
  * MenuSettings
  ***************************************************************************/
-
 static int MenuSettings()
 {
 	int menu = MENU_NONE;
@@ -1731,6 +1750,11 @@ static int MenuSettings()
 	GuiImageData btnOutlineOver(button_over_png);
 	GuiImageData btnLargeOutline(button_large_png);
 	GuiImageData btnLargeOutlineOver(button_large_over_png);
+	GuiImageData iconFile(icon_settings_file_png);
+	GuiImageData iconMappings(icon_settings_mappings_png);
+	GuiImageData iconMenu(icon_settings_menu_png);
+	GuiImageData iconNetwork(icon_settings_network_png);
+	GuiImageData iconVideo(icon_settings_video_png);
 
 	GuiTrigger trigA;
 	if(GCSettings.WiimoteOrientation)
@@ -1742,12 +1766,14 @@ static int MenuSettings()
 	mappingBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage mappingBtnImg(&btnLargeOutline);
 	GuiImage mappingBtnImgOver(&btnLargeOutlineOver);
+	GuiImage mappingBtnIcon(&iconMappings);
 	GuiButton mappingBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	mappingBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	mappingBtn.SetPosition(50, 120);
 	mappingBtn.SetLabel(&mappingBtnTxt);
 	mappingBtn.SetImage(&mappingBtnImg);
 	mappingBtn.SetImageOver(&mappingBtnImgOver);
+	mappingBtn.SetIcon(&mappingBtnIcon);
 	mappingBtn.SetSoundOver(&btnSoundOver);
 	mappingBtn.SetTrigger(&trigA);
 	mappingBtn.SetEffectGrow();
@@ -1756,12 +1782,14 @@ static int MenuSettings()
 	videoBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage videoBtnImg(&btnLargeOutline);
 	GuiImage videoBtnImgOver(&btnLargeOutlineOver);
+	GuiImage videoBtnIcon(&iconVideo);
 	GuiButton videoBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	videoBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	videoBtn.SetPosition(0, 120);
 	videoBtn.SetLabel(&videoBtnTxt);
 	videoBtn.SetImage(&videoBtnImg);
 	videoBtn.SetImageOver(&videoBtnImgOver);
+	videoBtn.SetIcon(&videoBtnIcon);
 	videoBtn.SetSoundOver(&btnSoundOver);
 	videoBtn.SetTrigger(&trigA);
 	videoBtn.SetEffectGrow();
@@ -1773,6 +1801,7 @@ static int MenuSettings()
 	savingBtnTxt3.SetPosition(0, +20);
 	GuiImage savingBtnImg(&btnLargeOutline);
 	GuiImage savingBtnImgOver(&btnLargeOutlineOver);
+	GuiImage fileBtnIcon(&iconFile);
 	GuiButton savingBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	savingBtn.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
 	savingBtn.SetPosition(-50, 120);
@@ -1781,6 +1810,7 @@ static int MenuSettings()
 	savingBtn.SetLabel(&savingBtnTxt3, 2);
 	savingBtn.SetImage(&savingBtnImg);
 	savingBtn.SetImageOver(&savingBtnImgOver);
+	savingBtn.SetIcon(&fileBtnIcon);
 	savingBtn.SetSoundOver(&btnSoundOver);
 	savingBtn.SetTrigger(&trigA);
 	savingBtn.SetEffectGrow();
@@ -1789,12 +1819,14 @@ static int MenuSettings()
 	menuBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage menuBtnImg(&btnLargeOutline);
 	GuiImage menuBtnImgOver(&btnLargeOutlineOver);
+	GuiImage menuBtnIcon(&iconMenu);
 	GuiButton menuBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	menuBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	menuBtn.SetPosition(-125, 250);
 	menuBtn.SetLabel(&menuBtnTxt);
 	menuBtn.SetImage(&menuBtnImg);
 	menuBtn.SetImageOver(&menuBtnImgOver);
+	menuBtn.SetIcon(&menuBtnIcon);
 	menuBtn.SetSoundOver(&btnSoundOver);
 	menuBtn.SetTrigger(&trigA);
 	menuBtn.SetEffectGrow();
@@ -1803,12 +1835,14 @@ static int MenuSettings()
 	networkBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage networkBtnImg(&btnLargeOutline);
 	GuiImage networkBtnImgOver(&btnLargeOutlineOver);
+	GuiImage networkBtnIcon(&iconNetwork);
 	GuiButton networkBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	networkBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	networkBtn.SetPosition(125, 250);
 	networkBtn.SetLabel(&networkBtnTxt);
 	networkBtn.SetImage(&networkBtnImg);
 	networkBtn.SetImageOver(&networkBtnImgOver);
+	networkBtn.SetIcon(&networkBtnIcon);
 	networkBtn.SetSoundOver(&btnSoundOver);
 	networkBtn.SetTrigger(&trigA);
 	networkBtn.SetEffectGrow();
@@ -1926,6 +1960,8 @@ static int MenuSettingsMappings()
 	GuiImageData btnOutlineOver(button_over_png);
 	GuiImageData btnLargeOutline(button_large_png);
 	GuiImageData btnLargeOutlineOver(button_large_over_png);
+	GuiImageData iconNESController(icon_settings_nescontroller_png);
+	GuiImageData iconZapper(icon_settings_zapper_png);
 
 	GuiTrigger trigA;
 	if(GCSettings.WiimoteOrientation)
@@ -1937,12 +1973,14 @@ static int MenuSettingsMappings()
 	nesBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage nesBtnImg(&btnLargeOutline);
 	GuiImage nesBtnImgOver(&btnLargeOutlineOver);
+	GuiImage nesBtnIcon(&iconNESController);
 	GuiButton nesBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	nesBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	nesBtn.SetPosition(-125, 120);
 	nesBtn.SetLabel(&nesBtnTxt);
 	nesBtn.SetImage(&nesBtnImg);
 	nesBtn.SetImageOver(&nesBtnImgOver);
+	nesBtn.SetIcon(&nesBtnIcon);
 	nesBtn.SetSoundOver(&btnSoundOver);
 	nesBtn.SetTrigger(&trigA);
 	nesBtn.SetEffectGrow();
@@ -1951,12 +1989,14 @@ static int MenuSettingsMappings()
 	zapperBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage zapperBtnImg(&btnLargeOutline);
 	GuiImage zapperBtnImgOver(&btnLargeOutlineOver);
+	GuiImage zapperBtnIcon(&iconZapper);
 	GuiButton zapperBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	zapperBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	zapperBtn.SetPosition(125, 120);
 	zapperBtn.SetLabel(&zapperBtnTxt);
 	zapperBtn.SetImage(&zapperBtnImg);
 	zapperBtn.SetImageOver(&zapperBtnImgOver);
+	zapperBtn.SetIcon(&zapperBtnIcon);
 	zapperBtn.SetSoundOver(&btnSoundOver);
 	zapperBtn.SetTrigger(&trigA);
 	zapperBtn.SetEffectGrow();
@@ -2031,6 +2071,10 @@ static int MenuSettingsMappingsController()
 	GuiImageData btnOutlineOver(button_over_png);
 	GuiImageData btnLargeOutline(button_large_png);
 	GuiImageData btnLargeOutlineOver(button_large_over_png);
+	GuiImageData iconWiimote(icon_settings_wiimote_png);
+	GuiImageData iconClassic(icon_settings_classic_png);
+	GuiImageData iconGamecube(icon_settings_gamecube_png);
+	GuiImageData iconNunchuk(icon_settings_nunchuk_png);
 
 	GuiTrigger trigA;
 	if(GCSettings.WiimoteOrientation)
@@ -2042,12 +2086,14 @@ static int MenuSettingsMappingsController()
 	gamecubeBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage gamecubeBtnImg(&btnLargeOutline);
 	GuiImage gamecubeBtnImgOver(&btnLargeOutlineOver);
+	GuiImage gamecubeBtnIcon(&iconGamecube);
 	GuiButton gamecubeBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	gamecubeBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	gamecubeBtn.SetPosition(-125, 120);
 	gamecubeBtn.SetLabel(&gamecubeBtnTxt);
 	gamecubeBtn.SetImage(&gamecubeBtnImg);
 	gamecubeBtn.SetImageOver(&gamecubeBtnImgOver);
+	gamecubeBtn.SetIcon(&gamecubeBtnIcon);
 	gamecubeBtn.SetSoundOver(&btnSoundOver);
 	gamecubeBtn.SetTrigger(&trigA);
 	gamecubeBtn.SetEffectGrow();
@@ -2055,12 +2101,14 @@ static int MenuSettingsMappingsController()
 	GuiText wiimoteBtnTxt("Wiimote", 24, (GXColor){0, 0, 0, 255});
 	GuiImage wiimoteBtnImg(&btnLargeOutline);
 	GuiImage wiimoteBtnImgOver(&btnLargeOutlineOver);
+	GuiImage wiimoteBtnIcon(&iconWiimote);
 	GuiButton wiimoteBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	wiimoteBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	wiimoteBtn.SetPosition(125, 120);
 	wiimoteBtn.SetLabel(&wiimoteBtnTxt);
 	wiimoteBtn.SetImage(&wiimoteBtnImg);
 	wiimoteBtn.SetImageOver(&wiimoteBtnImgOver);
+	wiimoteBtn.SetIcon(&wiimoteBtnIcon);
 	wiimoteBtn.SetSoundOver(&btnSoundOver);
 	wiimoteBtn.SetTrigger(&trigA);
 	wiimoteBtn.SetEffectGrow();
@@ -2069,26 +2117,35 @@ static int MenuSettingsMappingsController()
 	classicBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
 	GuiImage classicBtnImg(&btnLargeOutline);
 	GuiImage classicBtnImgOver(&btnLargeOutlineOver);
+	GuiImage classicBtnIcon(&iconClassic);
 	GuiButton classicBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	classicBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	classicBtn.SetPosition(-125, 250);
 	classicBtn.SetLabel(&classicBtnTxt);
 	classicBtn.SetImage(&classicBtnImg);
 	classicBtn.SetImageOver(&classicBtnImgOver);
+	classicBtn.SetIcon(&classicBtnIcon);
 	classicBtn.SetSoundOver(&btnSoundOver);
 	classicBtn.SetTrigger(&trigA);
 	classicBtn.SetEffectGrow();
 
-	GuiText nunchukBtnTxt("Wiimote Nunchuk", 24, (GXColor){0, 0, 0, 255});
-	nunchukBtnTxt.SetMaxWidth(btnLargeOutline.GetWidth()-30);
+	GuiText nunchukBtnTxt1("Wiimote", 24, (GXColor){0, 0, 0, 255});
+	GuiText nunchukBtnTxt2("&", 18, (GXColor){0, 0, 0, 255});
+	GuiText nunchukBtnTxt3("Nunchuk", 24, (GXColor){0, 0, 0, 255});
+	nunchukBtnTxt1.SetPosition(0, -20);
+	nunchukBtnTxt3.SetPosition(0, +20);
 	GuiImage nunchukBtnImg(&btnLargeOutline);
 	GuiImage nunchukBtnImgOver(&btnLargeOutlineOver);
+	GuiImage nunchukBtnIcon(&iconNunchuk);
 	GuiButton nunchukBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
 	nunchukBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	nunchukBtn.SetPosition(125, 250);
-	nunchukBtn.SetLabel(&nunchukBtnTxt);
+	nunchukBtn.SetLabel(&nunchukBtnTxt1, 0);
+	nunchukBtn.SetLabel(&nunchukBtnTxt2, 1);
+	nunchukBtn.SetLabel(&nunchukBtnTxt3, 2);
 	nunchukBtn.SetImage(&nunchukBtnImg);
 	nunchukBtn.SetImageOver(&nunchukBtnImgOver);
+	nunchukBtn.SetIcon(&nunchukBtnIcon);
 	nunchukBtn.SetSoundOver(&btnSoundOver);
 	nunchukBtn.SetTrigger(&trigA);
 	nunchukBtn.SetEffectGrow();
@@ -2183,7 +2240,7 @@ ButtonMappingWindow()
 	GuiImageData dialogBox(dialogue_box_png);
 	GuiImage dialogBoxImg(&dialogBox);
 
-	GuiText titleTxt("Button Mapping", 26, (GXColor){255, 255, 255, 255});
+	GuiText titleTxt("Button Mapping", 26, (GXColor){70, 70, 10, 255});
 	titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
 	titleTxt.SetPosition(0,14);
 
@@ -2693,16 +2750,16 @@ static int MenuSettingsVideo()
 
 		switch(GCSettings.hideoverscan)
 		{
-			case 0: sprintf (options.value[2], "Video Cropping Off"); break;
-			case 1: sprintf (options.value[2], "Video Cropping Vertical"); break;
-			case 2: sprintf (options.value[2], "Video Cropping Horizontal"); break;
-			case 3: sprintf (options.value[2], "Video Cropping Both"); break;
+			case 0: sprintf (options.value[2], "Off"); break;
+			case 1: sprintf (options.value[2], "Vertical"); break;
+			case 2: sprintf (options.value[2], "Horizontal"); break;
+			case 3: sprintf (options.value[2], "Both"); break;
 		}
 
 		sprintf (options.value[3], "%s",
 			GCSettings.currpal ? palettes[GCSettings.currpal-1].name : "Default");
 
-		sprintf (options.value[4], "%s", GCSettings.timing == true ? " PAL" : "NTSC");
+		sprintf (options.value[4], "%s", GCSettings.timing == true ? "PAL" : "NTSC");
 		sprintf (options.value[5], "%.2f%%", GCSettings.ZoomLevel*100);
 		sprintf (options.value[6], "%d, %d", GCSettings.xshift, GCSettings.yshift);
 
@@ -3190,7 +3247,7 @@ MainMenu (int menu)
 
 	mainWindow = new GuiWindow(screenwidth, screenheight);
 
-	bgImg = new GuiImage(screenwidth, screenheight, (GXColor){175, 200, 215, 255});
+	bgImg = new GuiImage(screenwidth, screenheight, (GXColor){240, 225, 230, 255});
 	bgImg->ColorStripe(10);
 	mainWindow->Append(bgImg);
 
@@ -3220,10 +3277,10 @@ MainMenu (int menu)
 	GuiImageData logoOver(logo_over_png);
 	GuiImage logoImgOver(&logoOver);
 	GuiText logoTxt(APPVERSION, 18, (GXColor){255, 255, 255, 255});
-	logoTxt.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
+	logoTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	btnLogo = new GuiButton(logoImg.GetWidth(), logoImg.GetHeight());
 	btnLogo->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
-	btnLogo->SetPosition(-30, 30);
+	btnLogo->SetPosition(-30, 24);
 	btnLogo->SetImage(&logoImg);
 	btnLogo->SetImageOver(&logoImgOver);
 	btnLogo->SetLabel(&logoTxt);

source/ngc/networkop.cpp

@@ -9,6 +9,8 @@
  * Network and SMB support routines
  ****************************************************************************/
 
+#ifdef HW_RVL
+
 #include <network.h>
 #include <smb.h>
 #include <mxml.h>
@@ -22,6 +24,7 @@
 #include "fileop.h"
 #include "http.h"
 
+static bool inNetworkInit = false;
 static bool networkInit = false;
 static bool autoNetworkInit = true;
 static bool networkShareInit = false;
@@ -64,31 +67,34 @@ void UpdateCheck()
 				item = mxmlFindElement(xml, xml, "app", "version", NULL, MXML_DESCEND);
 				if(item) // a version entry exists
 				{
-					const char * version = (char *)mxmlElementGetAttr(item, "version");
+					const char * version = mxmlElementGetAttr(item, "version");
 
-					int verMajor = version[0] - '0';
-					int verMinor = version[2] - '0';
-					int verPoint = version[4] - '0';
-					int curMajor = APPVERSION[0] - '0';
-					int curMinor = APPVERSION[2] - '0';
-					int curPoint = APPVERSION[4] - '0';
-
-					// check that the versioning is valid and is a newer version
-					if((verMajor >= 0 && verMajor <= 9 &&
-						verMinor >= 0 && verMinor <= 9 &&
-						verPoint >= 0 && verPoint <= 9) &&
-						(verMajor > curMajor ||
-						verMinor > curMinor ||
-						verPoint > curPoint))
+					if(version && strlen(version) == 5)
 					{
-						item = mxmlFindElement(xml, xml, "file", NULL, NULL, MXML_DESCEND);
-						if(item)
+						int verMajor = version[0] - '0';
+						int verMinor = version[2] - '0';
+						int verPoint = version[4] - '0';
+						int curMajor = APPVERSION[0] - '0';
+						int curMinor = APPVERSION[2] - '0';
+						int curPoint = APPVERSION[4] - '0';
+
+						// check that the versioning is valid and is a newer version
+						if((verMajor >= 0 && verMajor <= 9 &&
+							verMinor >= 0 && verMinor <= 9 &&
+							verPoint >= 0 && verPoint <= 9) &&
+							(verMajor > curMajor ||
+							verMinor > curMinor ||
+							verPoint > curPoint))
 						{
-							const char * tmp = mxmlElementGetAttr(item, "url");
-							if(tmp)
+							item = mxmlFindElement(xml, xml, "file", NULL, NULL, MXML_DESCEND);
+							if(item)
 							{
-								snprintf(updateURL, 128, "%s", tmp);
-								updateFound = true;
+								const char * tmp = mxmlElementGetAttr(item, "url");
+								if(tmp)
+								{
+									snprintf(updateURL, 128, "%s", tmp);
+									updateFound = true;
+								}
 							}
 						}
 					}
@@ -151,7 +157,7 @@ bool DownloadUpdate()
 		else
 		{
 			result = false;
-			InfoPrompt("Update failed!");
+			ErrorPrompt("Update failed!");
 		}
 
 		updateFound = false; // updating is finished (successful or not!)
@@ -177,6 +183,14 @@ void InitializeNetwork(bool silent)
 	if(!silent)
 		ShowAction ("Initializing network...");
 
+	while(inNetworkInit) // a network init is already in progress!
+		usleep(50);
+
+	if(networkInit) // check again if the network was inited
+		return;
+
+	inNetworkInit = true;
+
 	char ip[16];
 	s32 initResult = if_config(ip, NULL, NULL, true);
 
@@ -196,6 +210,9 @@ void InitializeNetwork(bool silent)
 			ErrorPrompt(msg);
 		}
 	}
+	if(!silent)
+		CancelAction();
+	inNetworkInit = false;
 }
 
 void CloseShare()
@@ -265,11 +282,15 @@ ConnectShare (bool silent)
 			{
 				networkShareInit = true;
 			}
+			if(!silent)
+				CancelAction();
 		}
 
 		if(!networkShareInit && !silent)
-			ErrorPrompt ("Failed to connect to network share.");
+			ErrorPrompt("Failed to connect to network share.");
 	}
 
 	return networkShareInit;
 }
+
+#endif