diff --git a/source/filelist.h b/source/filelist.h index d3d60b45..63a87baa 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -41,15 +41,6 @@ extern const u32 tab_bg2_png_size; extern const u8 tab_bg3_png[]; extern const u32 tab_bg3_png_size; -/*extern const u8 page1d_png[]; -extern const u32 page1d_png_size; - -extern const u8 page2d_png[]; -extern const u32 page2d_png_size; - -extern const u8 page2_png[]; -extern const u32 page2_png_size;*/ - extern const u8 credits_button_png[]; extern const u32 credits_button_png_size; @@ -65,9 +56,6 @@ extern const u32 button_click_pcm_size; extern const u8 button_click2_pcm[]; extern const u32 button_click2_pcm_size; -///extern const u8 tooltip_png[]; -///extern const u32 tooltip_png_size; - extern const u8 tooltip_left_png[]; extern const u32 tooltip_left_png_size; @@ -83,12 +71,6 @@ extern const u32 startgame_arrow_left_png_size; extern const u8 startgame_arrow_right_png[]; extern const u32 startgame_arrow_right_png_size; -///extern const u8 tooltip_medium_png[]; -///extern const u32 tooltip_medium_png_size; - -///extern const u8 tooltip_large_png[]; -///extern const u32 tooltip_large_png_size; - extern const u8 credits_bg_png[]; extern const u32 credits_bg_png_size; diff --git a/source/images/arrow_next.png b/source/images/arrow_next.png index 4704d97b..3a814fde 100644 Binary files a/source/images/arrow_next.png and b/source/images/arrow_next.png differ diff --git a/source/images/arrow_previous.png b/source/images/arrow_previous.png index 8dcdaddc..20eb8a55 100644 Binary files a/source/images/arrow_previous.png and b/source/images/arrow_previous.png differ diff --git a/source/images/battery_red.png b/source/images/battery_red.png index d7484800..bc09b4c3 100644 Binary files a/source/images/battery_red.png and b/source/images/battery_red.png differ diff --git a/source/images/bg_options_settings.png b/source/images/bg_options_settings.png index b3f7cc1a..0e5e0a62 100644 Binary files a/source/images/bg_options_settings.png and b/source/images/bg_options_settings.png differ diff --git a/source/images/exit_bottom_over.png b/source/images/exit_bottom_over.png index 919c0e74..03b1d296 100644 Binary files a/source/images/exit_bottom_over.png and b/source/images/exit_bottom_over.png differ diff --git a/source/images/exit_button.png b/source/images/exit_button.png index 9d634d51..4fbce7eb 100644 Binary files a/source/images/exit_button.png and b/source/images/exit_button.png differ diff --git a/source/images/exit_top_over.png b/source/images/exit_top_over.png index a823b5b8..23117639 100644 Binary files a/source/images/exit_top_over.png and b/source/images/exit_top_over.png differ diff --git a/source/images/mp3_pause.png b/source/images/mp3_pause.png index b60960fb..f0b5903a 100644 Binary files a/source/images/mp3_pause.png and b/source/images/mp3_pause.png differ diff --git a/source/images/mp3_stop.png b/source/images/mp3_stop.png index cf89d62c..2762881a 100644 Binary files a/source/images/mp3_stop.png and b/source/images/mp3_stop.png differ diff --git a/source/images/page1.png b/source/images/page1.png deleted file mode 100644 index 9d94c3d9..00000000 Binary files a/source/images/page1.png and /dev/null differ diff --git a/source/images/page1d.png b/source/images/page1d.png deleted file mode 100644 index 85810c44..00000000 Binary files a/source/images/page1d.png and /dev/null differ diff --git a/source/images/page2.png b/source/images/page2.png deleted file mode 100644 index a0b6297c..00000000 Binary files a/source/images/page2.png and /dev/null differ diff --git a/source/images/page2d.png b/source/images/page2d.png deleted file mode 100644 index b90c9c49..00000000 Binary files a/source/images/page2d.png and /dev/null differ diff --git a/source/images/startgame_arrow_right.png b/source/images/startgame_arrow_right.png index 2e3804b0..1edbf989 100644 Binary files a/source/images/startgame_arrow_right.png and b/source/images/startgame_arrow_right.png differ diff --git a/source/images/tab_bg1.png b/source/images/tab_bg1.png index 88fbe822..e74440c5 100644 Binary files a/source/images/tab_bg1.png and b/source/images/tab_bg1.png differ diff --git a/source/images/tab_bg2.png b/source/images/tab_bg2.png index 75b2c0e2..13cddf24 100644 Binary files a/source/images/tab_bg2.png and b/source/images/tab_bg2.png differ diff --git a/source/images/tab_bg3.png b/source/images/tab_bg3.png index 07eb3fb1..e097aa09 100644 Binary files a/source/images/tab_bg3.png and b/source/images/tab_bg3.png differ diff --git a/source/menu.cpp b/source/menu.cpp index 050314a4..753c49cb 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -2699,7 +2699,7 @@ static int MenuDiscList() homeBtn.SetImage(&homeBtnImg); homeBtn.SetImageOver(&homeBtnImgOver); homeBtn.SetSoundOver(&btnSoundOver); - homeBtn.SetSoundClick(&btnClick); + //homeBtn.SetSoundClick(&btnClick); homeBtn.SetTrigger(&trigA); homeBtn.SetTrigger(&trigHome); homeBtn.SetEffectGrow(); @@ -2769,6 +2769,7 @@ static int MenuDiscList() } else DownloadBtn.SetRumble(false); + /* #ifdef HW_RVL int i = 0, level; char txt[3]; @@ -2809,6 +2810,7 @@ static int MenuDiscList() batteryBtn[2]->SetPosition(THEME.battery3_x, THEME.battery3_y); batteryBtn[3]->SetPosition(THEME.battery4_x, THEME.battery4_y); #endif + */ GuiGameBrowser gameBrowser(THEME.selection_w, THEME.selection_h, gameList, gameCnt, CFG.theme_path, bg_options_png, startat, offset); gameBrowser.SetPosition(THEME.selection_x, THEME.selection_y); @@ -2849,7 +2851,7 @@ static int MenuDiscList() w.Append(&clockTimeBack); w.Append(&clockTime); } - + /* if (THEME.showBattery) { #ifdef HW_RVL @@ -2859,7 +2861,7 @@ static int MenuDiscList() w.Append(batteryBtn[3]); #endif } - + */ mainWindow->Append(&gameBrowser); mainWindow->Append(&w); @@ -2897,7 +2899,7 @@ static int MenuDiscList() //////////////////////end clock code////////////////////////////// if ((datagB<1)&&(Settings.cios==1)&&(Settings.video == ntsc)&&(Settings.hddinfo == Clock)&&(Settings.qboot==1)&&(Settings.wsprompt==0)&&(Settings.language==ger)&&(Settings.tooltips==0)){dataed=1;dataef=1;}if (dataef==1){if (cosa>7){cosa=1;}datag++;if (sina==3){wiiBtn.SetAlignment(ALIGN_LEFT,ALIGN_BOTTOM);wiiBtnImg.SetAngle(0);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),((datag*2)-130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==2){wiiBtn.SetAlignment(ALIGN_RIGHT,ALIGN_TOP);wiiBtnImg.SetAngle(270);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((-2*(datag)+130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((2*(datag)-120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==1){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(180);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((cosa)*70),(2*(datag)-120));}else if(62<=datag){wiiBtn.SetPosition(((cosa)*70),(-2*(datag)+130));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}if (sina==0){wiiBtn.SetAlignment(ALIGN_TOP,ALIGN_LEFT);wiiBtnImg.SetAngle(90);if(datag>163){datag=1;}else if (datag<62){wiiBtn.SetPosition(((2*(datag)-130)),((cosa)*50));}else if(62<=datag){wiiBtn.SetPosition((-2*(datag)+120),((cosa)*50));}if (datag>162){wiiBtn.SetPosition(700,700);w.Remove(&wiiBtn);datagB=2;cosa++;sina=lastrawtime%4;}w.Append(&wiiBtn);}} - + /* #ifdef HW_RVL for(i=0; i < 4; i++) { @@ -2922,6 +2924,7 @@ static int MenuDiscList() } } #endif + */ // respond to button presses if(shutdown == 1) { @@ -3038,7 +3041,7 @@ static int MenuDiscList() { char tempCnt[40]; - i = 0; + //i = 0; sprintf(tempCnt,"%i %s",cntMissFiles,LANGUAGE.Missingfiles); choice = WindowPrompt(LANGUAGE.DownloadBoxartimage,tempCnt,LANGUAGE.Yes,LANGUAGE.No,0,0); @@ -3418,7 +3421,7 @@ static int MenuDiscList() } HaltGui(); - + /* #ifdef HW_RVL for(i=0; i < 4; i++) { @@ -3428,7 +3431,7 @@ static int MenuDiscList() delete batteryBtn[i]; } #endif - + */ mainWindow->Remove(&gameBrowser); mainWindow->Remove(&w); ResumeGui(); diff --git a/source/sounds/menuin.ogg b/source/sounds/menuin.ogg index 9d7034fb..65ea7d73 100644 Binary files a/source/sounds/menuin.ogg and b/source/sounds/menuin.ogg differ