diff --git a/out/boot.dol b/out/boot.dol index b50f2a38..8e6f0ffd 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index ea12ec1d..c0cba2db 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -1829,7 +1829,7 @@ void CMenu::_mainLoopCommon(bool withCF, bool adjusting) // set song title and display it if music info is allowed if(MusicPlayer.SongChanged() && m_music_info) { - m_btnMgr.setText(m_mainLblCurMusic, MusicPlayer.GetFileName(), false);// false for word wrap + m_btnMgr.setText(m_mainLblCurMusic, MusicPlayer.GetFileName()); m_btnMgr.show(m_mainLblCurMusic); MusicPlayer.DisplayTime = time(NULL); } @@ -1859,8 +1859,8 @@ void CMenu::_mainLoopCommon(bool withCF, bool adjusting) if(show_mem) { - m_btnMgr.setText(m_mem1FreeSize, wfmt(L"Mem1 lo Free:%u, Mem1 Free:%u", MEM1_lo_freesize(), MEM1_freesize()), true); - m_btnMgr.setText(m_mem2FreeSize, wfmt(L"Mem2 Free:%u", MEM2_freesize()), true); + m_btnMgr.setText(m_mem1FreeSize, wfmt(L"Mem1 lo Free:%u, Mem1 Free:%u", MEM1_lo_freesize(), MEM1_freesize()), true);// true = dont wrap text + m_btnMgr.setText(m_mem2FreeSize, wfmt(L"Mem2 Free:%u", MEM2_freesize()), true);// true = dont wrap text } #ifdef SHOWMEMGECKO @@ -2026,9 +2026,10 @@ void CMenu::_initCF(void) // filter list based on categories, favorites, and adult only for(vector::iterator hdr = m_gameList.begin(); hdr != m_gameList.end(); ++hdr) { - if(m_sourceflow && !m_source.getBool(sfmt("button_%i", hdr->settings[0]), "hidden", false)) + if(m_sourceflow) { - CoverFlow.addItem(&(*hdr), 0, 0);// no filtering for sourceflow + if(!m_source.getBool(sfmt("button_%i", hdr->settings[0]), "hidden", false)) + CoverFlow.addItem(&(*hdr), 0, 0);// no filtering for sourceflow continue; } diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp index 30c93392..be79a2ee 100644 --- a/source/menu/menu.hpp +++ b/source/menu/menu.hpp @@ -970,6 +970,7 @@ private: void _getSFlowBgTex(); // misc functions + void _resetGCSettings(const string &id); void RemoveCover(const char *id); void _setPartition(s8 direction = 0, u8 partition = 0, u8 coverflow = 0); int _sfCacheCoversNeeded(); diff --git a/source/menu/menu_config_boot.cpp b/source/menu/menu_config_boot.cpp index fa4a14aa..ce31d4be 100644 --- a/source/menu/menu_config_boot.cpp +++ b/source/menu/menu_config_boot.cpp @@ -39,7 +39,7 @@ void CMenu::_showBoot() if(cur_ios > 0) m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", cur_ios)); else - m_btnMgr.setText(m_configLbl2Val, L"AUTO");// cIOS 249 unless the user changed it via the meta.xml + m_btnMgr.setText(m_configLbl2Val, _t("GC_Auto", L"AUTO"));// cIOS 249 unless the user changed it via the meta.xml m_btnMgr.setText(m_configBtn3, wfmt(L"%i", set_port)); m_btnMgr.setText(m_configBtn4, m_cfg.getBool("GENERAL", "sd_only") ? _t("yes", L"Yes") : _t("no", L"No")); diff --git a/source/menu/menu_config_game.cpp b/source/menu/menu_config_game.cpp index ed84c7f5..6645761a 100644 --- a/source/menu/menu_config_game.cpp +++ b/source/menu/menu_config_game.cpp @@ -229,7 +229,7 @@ void CMenu::_showConfigGame() } _hideConfigButtons(); - m_configGameMaxPgs = IsOnWiiU() ? 6 : 5; + m_configGameMaxPgs = 6; m_btnMgr.setText(m_gameSettingsLblPage, wfmt(L"%i / %i", m_configGamePage, m_configGameMaxPgs)); m_btnMgr.show(m_gameSettingsLblPage); @@ -429,13 +429,21 @@ void CMenu::_showConfigGame() } else if(m_configGamePage == 6) { - m_btnMgr.setText(m_configLbl1, _t("cfgg46", L"WiiU Widescreen")); - i = min(m_gcfg2.getUInt(id, "widescreen_wiiu", 0), ARRAY_SIZE(CMenu::_WidescreenWiiu) - 1u); - m_btnMgr.setText(m_configLbl1Val, _t(CMenu::_WidescreenWiiu[i].id, CMenu::_WidescreenWiiu[i].text)); + m_btnMgr.setText(m_configLbl1, _t("cfgg64", L"Reset Settings to Defaults")); + m_btnMgr.setText(m_configBtn1, _t("yes", L"Yes")); m_btnMgr.show(m_configLbl1); - m_btnMgr.show(m_configLbl1Val); - m_btnMgr.show(m_configBtn1P); - m_btnMgr.show(m_configBtn1M); + m_btnMgr.show(m_configBtn1); + + if(IsOnWiiU()) + { + m_btnMgr.setText(m_configLbl2, _t("cfgg46", L"WiiU Widescreen")); + i = min(m_gcfg2.getUInt(id, "widescreen_wiiu", 0), ARRAY_SIZE(CMenu::_WidescreenWiiu) - 1u); + m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_WidescreenWiiu[i].id, CMenu::_WidescreenWiiu[i].text)); + m_btnMgr.show(m_configLbl2); + m_btnMgr.show(m_configLbl2Val); + m_btnMgr.show(m_configBtn2P); + m_btnMgr.show(m_configBtn2M); + } } } @@ -763,12 +771,39 @@ void CMenu::_configGame(const dir_discHdr *hdr, bool disc) } else if(m_configGamePage == 6) { - if(m_btnMgr.selected(m_configBtn1P) || m_btnMgr.selected(m_configBtn1M)) + if(m_btnMgr.selected(m_configBtn1)) { - s8 direction = m_btnMgr.selected(m_configBtn1P) ? 1 : -1; + m_gcfg2.setUInt(id, "ios", 0); + m_gcfg2.setUInt(id, "language", 0); + m_gcfg2.setUInt(id, "video_mode", 0); + m_gcfg2.setUInt(id, "debugger", 0); + m_gcfg2.setOptBool(id, "cheat", 0); + m_gcfg2.setUInt(id, "patch_video_modes", 0); + m_gcfg2.setOptBool(id, "vipatch", 0); + m_gcfg2.setOptBool(id, "country_patch", 0); + m_gcfg2.setUInt(id, "aspect_ratio", 0); + m_gcfg2.setOptBool(id, "led", 0); + m_gcfg2.setUInt(id, "private_server", 0); + m_gcfg2.setOptBool(id, "fix480p", 2);// default + m_gcfg2.setUInt(id, "deflicker_wii", 0); + m_gcfg2.setUInt(id, "widescreen_wiiu", 0); + if(GameHdr->type == TYPE_WII_GAME) + m_gcfg2.setUInt(id, "emulate_save", 0); + else // channel + { + m_gcfg2.setOptBool(id, "custom", 0); + m_gcfg2.setOptBool(id, "apploader", 0); + m_gcfg2.setOptBool(id, "useneek", 0); + } + _error(_t("dlmsg14", L"Done.")); + _showConfigGame(); + } + else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M)) + { + s8 direction = m_btnMgr.selected(m_configBtn2P) ? 1 : -1; i = loopNum(m_gcfg2.getUInt(id, "widescreen_wiiu", 0) + direction, ARRAY_SIZE(CMenu::_WidescreenWiiu)); m_gcfg2.setInt(id, "widescreen_wiiu", i); - m_btnMgr.setText(m_configLbl1Val, _t(CMenu::_WidescreenWiiu[i].id, CMenu::_WidescreenWiiu[i].text)); + m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_WidescreenWiiu[i].id, CMenu::_WidescreenWiiu[i].text)); } } } diff --git a/source/menu/menu_config_gc_game.cpp b/source/menu/menu_config_gc_game.cpp index 0c83d994..95fd91c4 100644 --- a/source/menu/menu_config_gc_game.cpp +++ b/source/menu/menu_config_gc_game.cpp @@ -72,6 +72,29 @@ template static inline T loopNum(T i, T s) return (i + s) % s; } +void CMenu::_resetGCSettings(const string &id) +{ + m_gcfg2.setUInt(id, "language", 0); + m_gcfg2.setUInt(id, "video_mode", 0); + m_gcfg2.setOptBool(id, "led", 0); + m_gcfg2.setOptBool(id, "devo_memcard_emu", 2);// default + m_gcfg2.setOptBool(id, "widescreen", 0); + m_gcfg2.setUInt(id, "debugger", 0); + m_gcfg2.setOptBool(id, "deflicker", 0); + m_gcfg2.setOptBool(id, "cheat", 0); + m_gcfg2.setOptBool(id, "wiiu_widescreen", 0); + m_gcfg2.setUInt(id, "emu_memcard", 0); + m_gcfg2.setOptBool(id, "cc_rumble", 2);// default + m_gcfg2.setOptBool(id, "native_ctl", 2);// default + m_gcfg2.setOptBool(id, "triforce_arcade", 0); + m_gcfg2.setOptBool(id, "skip_ipl", 0); + m_gcfg2.setOptBool(id, "patch_pal50", 0); + m_gcfg2.setOptBool(id, "bba_emu", 0); + m_gcfg2.setUInt(id, "net_profile", 0); + m_gcfg2.setInt(id, "nin_width", 127); + m_gcfg2.setInt(id, "nin_pos", 127); +} + void CMenu::_hideConfigGCGame(bool instant) { m_btnMgr.hide(m_gameSettingsLblTitle, instant); @@ -106,7 +129,7 @@ void CMenu::_showConfigGCGame() GCLoader = min(m_gcfg2.getUInt(id, "gc_loader", 0), ARRAY_SIZE(CMenu::_GCLoader) - 1u); GCLoader = (GCLoader == 0) ? min(m_cfg.getUInt(GC_DOMAIN, "default_loader", 1), ARRAY_SIZE(CMenu::_GlobalGCLoaders) - 1u) : GCLoader-1; if(GCLoader == DEVOLUTION) - m_configGCGameMaxPgs = 2; + m_configGCGameMaxPgs = 3; else m_configGCGameMaxPgs = 6; @@ -119,8 +142,8 @@ void CMenu::_showConfigGCGame() { m_btnMgr.setText(m_configLbl1, _t("cfgg58", L"Adult only")); m_btnMgr.setText(m_configLbl2, _t("cfgg35", L"GameCube Loader")); - m_btnMgr.setText(m_configLbl3, _t("cfgg2", L"Video mode")); - m_btnMgr.setText(m_configLbl4, _t("cfgg3", L"Language")); + m_btnMgr.setText(m_configLbl3, _t("cfgg3", L"Language")); + m_btnMgr.setText(m_configLbl4, _t("cfgg2", L"Video mode")); m_btnMgr.setText(m_configBtn1, m_gcfg1.getBool("ADULTONLY", id, false) ? _t("yes", L"Yes") : _t("no", L"No")); @@ -213,33 +236,43 @@ void CMenu::_showConfigGCGame() } else if(m_configGCGamePage == 3) { - m_btnMgr.setText(m_configLbl1, _t("cfgg46", L"WiiU Widescreen")); - m_btnMgr.setText(m_configLbl2, _t("cfgg47", L"Emulated MemCard")); - m_btnMgr.setText(m_configLbl3, _t("cfgg36", L"Widescreen Patch")); - m_btnMgr.setText(m_configLbl4, _t("cfgg40", L"Manage Cover and Banner")); - - m_btnMgr.setText(m_configBtn1, _optBoolToString(m_gcfg2.getOptBool(id, "wiiu_widescreen", 0))); - - i = min(m_gcfg2.getUInt(id, "emu_memcard", 0), ARRAY_SIZE(CMenu::_NinEmuCard) - 1u); - m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_NinEmuCard[i].id, CMenu::_NinEmuCard[i].text)); - - m_btnMgr.setText(m_configBtn3, _optBoolToString(m_gcfg2.getOptBool(id, "widescreen", 0))); - - m_btnMgr.setText(m_configBtn4, _t("cfgg41", L"Manage")); - - m_btnMgr.show(m_configLbl1); - m_btnMgr.show(m_configBtn1); + if(GCLoader == DEVOLUTION) + { + m_btnMgr.setText(m_configLbl1, _t("cfgg64", L"Reset Settings to Defaults")); + m_btnMgr.setText(m_configBtn1, _t("yes", L"Yes")); + m_btnMgr.show(m_configLbl1); + m_btnMgr.show(m_configBtn1); + } + else + { + m_btnMgr.setText(m_configLbl1, _t("cfgg46", L"WiiU Widescreen")); + m_btnMgr.setText(m_configLbl2, _t("cfgg47", L"Emulated MemCard")); + m_btnMgr.setText(m_configLbl3, _t("cfgg36", L"Widescreen Patch")); + m_btnMgr.setText(m_configLbl4, _t("cfgg40", L"Manage Cover and Banner")); + + m_btnMgr.setText(m_configBtn1, _optBoolToString(m_gcfg2.getOptBool(id, "wiiu_widescreen", 0))); + + i = min(m_gcfg2.getUInt(id, "emu_memcard", 0), ARRAY_SIZE(CMenu::_NinEmuCard) - 1u); + m_btnMgr.setText(m_configLbl2Val, _t(CMenu::_NinEmuCard[i].id, CMenu::_NinEmuCard[i].text)); + + m_btnMgr.setText(m_configBtn3, _optBoolToString(m_gcfg2.getOptBool(id, "widescreen", 0))); + + m_btnMgr.setText(m_configBtn4, _t("cfgg41", L"Manage")); + + m_btnMgr.show(m_configLbl1); + m_btnMgr.show(m_configBtn1); - m_btnMgr.show(m_configLbl2); - m_btnMgr.show(m_configLbl2Val); - m_btnMgr.show(m_configBtn2P); - m_btnMgr.show(m_configBtn2M); + m_btnMgr.show(m_configLbl2); + m_btnMgr.show(m_configLbl2Val); + m_btnMgr.show(m_configBtn2P); + m_btnMgr.show(m_configBtn2M); - m_btnMgr.show(m_configLbl3); - m_btnMgr.show(m_configBtn3); + m_btnMgr.show(m_configLbl3); + m_btnMgr.show(m_configBtn3); - m_btnMgr.show(m_configLbl4); - m_btnMgr.show(m_configBtn4); + m_btnMgr.show(m_configLbl4); + m_btnMgr.show(m_configBtn4); + } } else if(m_configGCGamePage == 4) { @@ -311,6 +344,7 @@ void CMenu::_showConfigGCGame() { m_btnMgr.setText(m_configLbl1, _t("cfgg59", L"BBA Emulation")); m_btnMgr.setText(m_configLbl2, _t("cfgg60", L"BBA Net Profile")); + m_btnMgr.setText(m_configLbl3, _t("cfgg64", L"Reset Settings to Defaults")); m_btnMgr.setText(m_configBtn1, _optBoolToString(m_gcfg2.getOptBool(id, "bba_emu", 0))); @@ -327,6 +361,10 @@ void CMenu::_showConfigGCGame() m_btnMgr.show(m_configLbl2Val); m_btnMgr.show(m_configBtn2P); m_btnMgr.show(m_configBtn2M); + + m_btnMgr.setText(m_configBtn3, _t("yes", L"Yes")); + m_btnMgr.show(m_configLbl3); + m_btnMgr.show(m_configBtn3); } } @@ -490,8 +528,36 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc) //Manage Cover and Banner if(m_btnMgr.selected(m_configBtn1)) { - m_gcfg2.setBool(id, "wiiu_widescreen", !m_gcfg2.getBool(id, "wiiu_widescreen", 0)); - m_btnMgr.setText(m_configBtn1, _optBoolToString(m_gcfg2.getOptBool(id, "wiiu_widescreen", 0))); + if(GCLoader == DEVOLUTION) + { + /*m_gcfg2.setUInt(id, "language", 0); + m_gcfg2.setUInt(id, "video_mode", 0); + m_gcfg2.setOptBool(id, "led", 0); + m_gcfg2.setOptBool(id, "devo_memcard_emu", 2);// default + m_gcfg2.setOptBool(id, "widescreen", 0); + m_gcfg2.setUInt(id, "debugger", 0); + m_gcfg2.setOptBool(id, "deflicker", 0); + m_gcfg2.setOptBool(id, "cheat", 0); + m_gcfg2.setOptBool(id, "wiiu_widescreen", 0); + m_gcfg2.setUInt(id, "emu_memcard", 0); + m_gcfg2.setOptBool(id, "cc_rumble", 2);// default + m_gcfg2.setOptBool(id, "native_ctl", 2);// default + m_gcfg2.setOptBool(id, "triforce_arcade", 0); + m_gcfg2.setOptBool(id, "skip_ipl", 0); + m_gcfg2.setOptBool(id, "patch_pal50", 0); + m_gcfg2.setOptBool(id, "bba_emu", 0); + m_gcfg2.setUInt(id, "net_profile", 0); + m_gcfg2.setInt(id, "nin_width", 127); + m_gcfg2.setInt(id, "nin_pos", 127);*/ + _resetGCSettings(id); + _error(_t("dlmsg14", L"Done.")); + _showConfigGCGame(); + } + else + { + m_gcfg2.setBool(id, "wiiu_widescreen", !m_gcfg2.getBool(id, "wiiu_widescreen", 0)); + m_btnMgr.setText(m_configBtn1, _optBoolToString(m_gcfg2.getOptBool(id, "wiiu_widescreen", 0))); + } } else if(m_btnMgr.selected(m_configBtn2P) || m_btnMgr.selected(m_configBtn2M)) { @@ -632,6 +698,31 @@ void CMenu::_configGCGame(const dir_discHdr *hdr, bool disc) else m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", netprofile)); } + else if(m_btnMgr.selected(m_configBtn3)) + { + /*m_gcfg2.setUInt(id, "language", 0); + m_gcfg2.setUInt(id, "video_mode", 0); + m_gcfg2.setOptBool(id, "led", 0); + m_gcfg2.setOptBool(id, "devo_memcard_emu", 2);// default + m_gcfg2.setOptBool(id, "widescreen", 0); + m_gcfg2.setUInt(id, "debugger", 0); + m_gcfg2.setOptBool(id, "deflicker", 0); + m_gcfg2.setOptBool(id, "cheat", 0); + m_gcfg2.setOptBool(id, "wiiu_widescreen", 0); + m_gcfg2.setUInt(id, "emu_memcard", 0); + m_gcfg2.setOptBool(id, "cc_rumble", 2);// default + m_gcfg2.setOptBool(id, "native_ctl", 2);// default + m_gcfg2.setOptBool(id, "triforce_arcade", 0); + m_gcfg2.setOptBool(id, "skip_ipl", 0); + m_gcfg2.setOptBool(id, "patch_pal50", 0); + m_gcfg2.setOptBool(id, "bba_emu", 0); + m_gcfg2.setUInt(id, "net_profile", 0); + m_gcfg2.setInt(id, "nin_width", 127); + m_gcfg2.setInt(id, "nin_pos", 127);*/ + _resetGCSettings(id); + _error(_t("dlmsg14", L"Done.")); + _showConfigGCGame(); + } } } } diff --git a/source/menu/menu_error.cpp b/source/menu/menu_error.cpp index 6e2f93c3..635db263 100644 --- a/source/menu/menu_error.cpp +++ b/source/menu/menu_error.cpp @@ -41,7 +41,7 @@ void CMenu::_error(const wstringEx &msg) _hideGameInfo(); _hideConfigGame(); _hideWaitMessage(); - m_btnMgr.setText(m_errorLblMessage, msg, true); + m_btnMgr.setText(m_errorLblMessage, msg); _showError(); gprintf("error msg: %s\n", msg.toUTF8().c_str()); diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp index db29ffb0..b554e67f 100644 --- a/source/menu/menu_game.cpp +++ b/source/menu/menu_game.cpp @@ -430,6 +430,12 @@ void CMenu::_game(bool launch) _configGame(hdr); m_banner.ToggleGameSettings();//reset brightness m_banner.ToggleZoom();//de zoom to small + /*if(m_newGame) + { + m_newGame = false; + startGameSound = 1; + _playGameSound(); + }*/ } _showGame(); } diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini index 9b7d493b..f662afec 100644 --- a/wii/wiiflow/Languages/english.ini +++ b/wii/wiiflow/Languages/english.ini @@ -168,6 +168,7 @@ cfgg60=BBA Net Profile cfgg61=Deflicker Filter cfgg62=Reload cached cover cfgg63=Converting cover please wait... +cfgg64=Reset Settings to Defaults cfgg4=Patch country strings cfgg5=Ocarina cfgg6=