-added per game option to set no dvd patch, because not

all games work fine with it in the current state
-fixed problem that nmm sometimes was always enabled
-updated english.ini
-updated german.ini

source/gc/gc.c

@@ -114,7 +114,7 @@ bool GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgame
 	return false;
 }
 
-void DML_New_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool debugger, u8 NMM, bool cheats, bool nodisc)
+void DML_New_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc)
 {
 	gprintf("Wiiflow DML: Launch game 'sd:/games/%s/game.iso' through memory (new method)\n", GamePath);
 
@@ -150,7 +150,7 @@ void DML_New_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, boo
 		DMLCfg->Config |= DML_CFG_NMM;
 	if(NMM > 1)
 		DMLCfg->Config |= DML_CFG_NMM_DEBUG;
-	if(nodisc)
+	if(nodisc > 0)
 		DMLCfg->Config |= DML_CFG_NODISC;
 
 	//Write options into memory

source/gc/gc.h

@@ -45,7 +45,7 @@ enum dmlvideomode
 void GC_SetVideoMode(int i);
 void GC_SetLanguage(u8 lang);
 bool GC_GameIsInstalled(char *discid, const char* partition, const char* dmlgamedir);
-void DML_New_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool debugger, u8 NMM, bool cheats, bool nodisc);
+void DML_New_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc);
 void DML_Old_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats);
 #endif //GC_H_
 

source/menu/menu.hpp

@@ -450,6 +450,11 @@ private:
 	u32 m_gameSettingsBtnNMM_P;
 	u32 m_gameSettingsBtnNMM_M;
 
+	u32 m_gameSettingsLblNoDVD;
+	u32 m_gameSettingsLblNoDVD_Val;
+	u32 m_gameSettingsBtnNoDVD_P;
+	u32 m_gameSettingsBtnNoDVD_M;
+
 	u32 m_gameSettingsLblCustom;
 	u32 m_gameSettingsBtnCustom;
 
@@ -978,6 +983,7 @@ private:
 	static const SOption _GlobalSaveEmu[4];
 	static const SOption _AspectRatio[3];
 	static const SOption _NMM[4];
+	static const SOption _NoDVD[3];
 	static const SOption _vidModePatch[4];
 	static const SOption _hooktype[8];
 	static const SOption _exitTo[6];

source/menu/menu_config_game.cpp

@@ -48,6 +48,10 @@ void CMenu::_hideGameSettings(bool instant)
 	m_btnMgr.hide(m_gameSettingsLblNMM_Val, instant);
 	m_btnMgr.hide(m_gameSettingsBtnNMM_P, instant);
 	m_btnMgr.hide(m_gameSettingsBtnNMM_M, instant);
+	m_btnMgr.hide(m_gameSettingsLblNoDVD, instant);
+	m_btnMgr.hide(m_gameSettingsLblNoDVD_Val, instant);
+	m_btnMgr.hide(m_gameSettingsBtnNoDVD_P, instant);
+	m_btnMgr.hide(m_gameSettingsBtnNoDVD_M, instant);
 	m_btnMgr.hide(m_gameSettingsLblIOSreloadBlock, instant);
 	m_btnMgr.hide(m_gameSettingsBtnIOSreloadBlock, instant);
 	m_btnMgr.hide(m_gameSettingsLblCustom, instant);
@@ -123,7 +127,12 @@ void CMenu::_showGameSettings(void)
 	if(m_cf.getHdr()->hdr.gc_magic != 0xc2339f3d)
 		g_numGCfPages = 4;
 	else
-		g_numGCfPages = 3;
+	{
+		if(m_new_dml)
+			g_numGCfPages = 3;
+		else
+			g_numGCfPages = 2;
+	}
 
 	if (m_gameSettingsPage == 1)
 	{
@@ -261,6 +270,11 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.show(m_gameSettingsLblNMM_Val);
 			m_btnMgr.show(m_gameSettingsBtnNMM_P);
 			m_btnMgr.show(m_gameSettingsBtnNMM_M);
+			
+			m_btnMgr.show(m_gameSettingsLblNoDVD);
+			m_btnMgr.show(m_gameSettingsLblNoDVD_Val);
+			m_btnMgr.show(m_gameSettingsBtnNoDVD_P);
+			m_btnMgr.show(m_gameSettingsBtnNoDVD_M);
 		}
 	}
 	else
@@ -289,6 +303,11 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.hide(m_gameSettingsLblNMM_Val);
 			m_btnMgr.hide(m_gameSettingsBtnNMM_P);
 			m_btnMgr.hide(m_gameSettingsBtnNMM_M);
+			
+			m_btnMgr.hide(m_gameSettingsLblNoDVD);
+			m_btnMgr.hide(m_gameSettingsLblNoDVD_Val);
+			m_btnMgr.hide(m_gameSettingsBtnNoDVD_P);
+			m_btnMgr.hide(m_gameSettingsBtnNoDVD_M);
 		}
 	}
 	if (m_gameSettingsPage == 4)
@@ -333,8 +352,6 @@ void CMenu::_showGameSettings(void)
 		m_btnMgr.hide(m_gameSettingsBtnCustom);
 	}
 
-
-	
 	u32 i = 0;
 	
 	//Categories Pages
@@ -401,23 +418,30 @@ void CMenu::_showGameSettings(void)
 
 	m_btnMgr.setText(m_gameSettingsLblPage, wfmt(L"%i / %i", page, maxpage));
 	m_btnMgr.setText(m_gameSettingsBtnOcarina, _optBoolToString(m_gcfg2.getOptBool(id, "cheat")));
-	m_btnMgr.setText(m_gameSettingsBtnVipatch, _optBoolToString(m_gcfg2.getOptBool(id, "vipatch", 0)));
+	if(m_cf.getHdr()->hdr.gc_magic != 0xc2339f3d)
-	m_btnMgr.setText(m_gameSettingsBtnCountryPatch, _optBoolToString(m_gcfg2.getOptBool(id, "country_patch", 0)));
+	{
-	m_btnMgr.setText(m_gameSettingsBtnIOSreloadBlock, _optBoolToString(m_gcfg2.getOptBool(id, "reload_block", 0)));
+		m_btnMgr.setText(m_gameSettingsBtnVipatch, _optBoolToString(m_gcfg2.getOptBool(id, "vipatch", 0)));
-	i = min((u32)m_gcfg2.getInt(id, "video_mode", 0), ARRAY_SIZE(CMenu::_videoModes) - 1u);
+		m_btnMgr.setText(m_gameSettingsBtnCountryPatch, _optBoolToString(m_gcfg2.getOptBool(id, "country_patch", 0)));
-	m_btnMgr.setText(m_gameSettingsLblVideo, _t(CMenu::_videoModes[i].id, CMenu::_videoModes[i].text));
+		m_btnMgr.setText(m_gameSettingsBtnIOSreloadBlock, _optBoolToString(m_gcfg2.getOptBool(id, "reload_block", 0)));
-	i = min((u32)m_gcfg2.getInt(id, "dml_video_mode", 0), ARRAY_SIZE(CMenu::_DMLvideoModes) - 1u);
+		i = min((u32)m_gcfg2.getInt(id, "video_mode", 0), ARRAY_SIZE(CMenu::_videoModes) - 1u);
-	m_btnMgr.setText(m_gameSettingsLblDMLVideo, _t(CMenu::_DMLvideoModes[i].id, CMenu::_DMLvideoModes[i].text));
+		m_btnMgr.setText(m_gameSettingsLblVideo, _t(CMenu::_videoModes[i].id, CMenu::_videoModes[i].text));
-	i = min((u32)m_gcfg2.getInt(id, "gc_language", 0), ARRAY_SIZE(CMenu::_GClanguages) - 1u);
+		i = min((u32)m_gcfg2.getInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u);
-	m_btnMgr.setText(m_gameSettingsLblGClanguageVal, _t(CMenu::_GClanguages[i].id, CMenu::_GClanguages[i].text));
+		m_btnMgr.setText(m_gameSettingsLblLanguage, _t(CMenu::_languages[i].id, CMenu::_languages[i].text));
-	i = min((u32)m_gcfg2.getInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u);
+		i = min((u32)m_gcfg2.getInt(id, "aspect_ratio", 0), ARRAY_SIZE(CMenu::_AspectRatio) - 1u);
-	m_btnMgr.setText(m_gameSettingsLblLanguage, _t(CMenu::_languages[i].id, CMenu::_languages[i].text));
+		m_btnMgr.setText(m_gameSettingsLblAspectRatioVal, _t(CMenu::_AspectRatio[i].id, CMenu::_AspectRatio[i].text));
-	i = min((u32)m_gcfg2.getInt(id, "aspect_ratio", 0), ARRAY_SIZE(CMenu::_AspectRatio) - 1u);
+		m_btnMgr.setText(m_gameSettingsBtnCustom, _optBoolToString(m_gcfg2.getOptBool(id, "custom", 0)));
-	m_btnMgr.setText(m_gameSettingsLblAspectRatioVal, _t(CMenu::_AspectRatio[i].id, CMenu::_AspectRatio[i].text));
+	}
-	i = min((u32)m_gcfg2.getInt(id, "dml_nmm", 0), ARRAY_SIZE(CMenu::_NMM) - 1u);
+	else
-	m_btnMgr.setText(m_gameSettingsLblNMM_Val, _t(CMenu::_NMM[i].id, CMenu::_NMM[i].text));
+	{
-	m_btnMgr.setText(m_gameSettingsBtnCustom, _optBoolToString(m_gcfg2.getOptBool(id, "custom", 0)));
+		i = min((u32)m_gcfg2.getInt(id, "dml_video_mode", 0), ARRAY_SIZE(CMenu::_DMLvideoModes) - 1u);
-
+		m_btnMgr.setText(m_gameSettingsLblDMLVideo, _t(CMenu::_DMLvideoModes[i].id, CMenu::_DMLvideoModes[i].text));
+		i = min((u32)m_gcfg2.getInt(id, "gc_language", 0), ARRAY_SIZE(CMenu::_GClanguages) - 1u);
+		m_btnMgr.setText(m_gameSettingsLblGClanguageVal, _t(CMenu::_GClanguages[i].id, CMenu::_GClanguages[i].text));
+		i = min((u32)m_gcfg2.getInt(id, "dml_nmm", 0), ARRAY_SIZE(CMenu::_NMM) - 1u);
+		m_btnMgr.setText(m_gameSettingsLblNMM_Val, _t(CMenu::_NMM[i].id, CMenu::_NMM[i].text));
+		i = min((u32)m_gcfg2.getInt(id, "no_disc_patch", 0), ARRAY_SIZE(CMenu::_NoDVD) - 1u);
+		m_btnMgr.setText(m_gameSettingsLblNoDVD_Val, _t(CMenu::_NoDVD[i].id, CMenu::_NoDVD[i].text));
+	}
 	int j = 0;
 	if (m_gcfg2.getInt(id, "ios", &j) && _installed_cios.size() > 0)
 	{
@@ -578,6 +602,12 @@ void CMenu::_gameSettings(void)
 				m_gcfg2.setInt(id, "dml_nmm", (int)loopNum((u32)m_gcfg2.getInt(id, "dml_nmm", 0) + direction, ARRAY_SIZE(CMenu::_NMM)));
 				_showGameSettings();
 			}
+			else if (m_btnMgr.selected(m_gameSettingsBtnNoDVD_P) || m_btnMgr.selected(m_gameSettingsBtnNoDVD_M))
+			{
+				s8 direction = m_btnMgr.selected(m_gameSettingsBtnNoDVD_P) ? 1 : -1;
+				m_gcfg2.setInt(id, "no_disc_patch", (int)loopNum((u32)m_gcfg2.getInt(id, "no_disc_patch", 0) + direction, ARRAY_SIZE(CMenu::_NoDVD)));
+				_showGameSettings();
+			}
 			else if (m_btnMgr.selected(m_gameSettingsBtnIOSM) || m_btnMgr.selected(m_gameSettingsBtnIOSP))
 			{
 				if( _installed_cios.size() > 0)
@@ -718,12 +748,15 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	m_gameSettingsLblDebuggerV = _addLabel(theme, "GAME_SETTINGS/GAME_DEBUGGER_BTN", theme.btnFont, L"", 386, 130, 158, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
 	m_gameSettingsBtnDebuggerM = _addPicButton(theme, "GAME_SETTINGS/GAME_DEBUGGER_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 330, 130, 56, 56);
 	m_gameSettingsBtnDebuggerP = _addPicButton(theme, "GAME_SETTINGS/GAME_DEBUGGER_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 130, 56, 56);
+
 	m_gameSettingsLblHooktype = _addLabel(theme, "GAME_SETTINGS/HOOKTYPE", theme.lblFont, L"", 40, 190, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsLblHooktypeVal = _addLabel(theme, "GAME_SETTINGS/HOOKTYPE_BTN", theme.btnFont, L"", 386, 190, 158, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
 	m_gameSettingsBtnHooktypeM = _addPicButton(theme, "GAME_SETTINGS/HOOKTYPE_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 330, 190, 56, 56);
 	m_gameSettingsBtnHooktypeP = _addPicButton(theme, "GAME_SETTINGS/HOOKTYPE_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 190, 56, 56);
+
 	m_gameSettingsLblOcarina = _addLabel(theme, "GAME_SETTINGS/OCARINA", theme.lblFont, L"", 40, 250, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsBtnOcarina = _addButton(theme, "GAME_SETTINGS/OCARINA_BTN", theme.btnFont, L"", 330, 250, 270, 56, theme.btnFontColor);
+
 	m_gameSettingsLblCheat = _addLabel(theme, "GAME_SETTINGS/CHEAT", theme.lblFont, L"", 40, 310, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsBtnCheat = _addButton(theme, "GAME_SETTINGS/CHEAT_BTN", theme.btnFont, L"", 330, 310, 270, 56, theme.btnFontColor);
 	
@@ -750,14 +783,19 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	m_gameSettingsBtnNMM_M = _addPicButton(theme, "GAME_SETTINGS/DML_NMM_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 330, 130, 56, 56);
 	m_gameSettingsBtnNMM_P = _addPicButton(theme, "GAME_SETTINGS/DML_NMM_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 130, 56, 56);
 
+	m_gameSettingsLblNoDVD = _addLabel(theme, "GAME_SETTINGS/NO_DVD_PATCH", theme.lblFont, L"", 40, 190, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
+	m_gameSettingsLblNoDVD_Val = _addLabel(theme, "GAME_SETTINGS/NO_DVD_PATCH_BTN", theme.btnFont, L"", 386, 190, 158, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
+	m_gameSettingsBtnNoDVD_M = _addPicButton(theme, "GAME_SETTINGS/NO_DVD_PATCH_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 330, 190, 56, 56);
+	m_gameSettingsBtnNoDVD_P = _addPicButton(theme, "GAME_SETTINGS/NO_DVD_PATCH_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 190, 56, 56);
+
 	//Page 4
  	m_gameSettingsLblGameIOS = _addLabel(theme, "GAME_SETTINGS/IOS", theme.lblFont, L"", 40, 130, 340, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
  	m_gameSettingsLblIOS = _addLabel(theme, "GAME_SETTINGS/IOS_BTN", theme.btnFont, L"", 406, 130, 138, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
  	m_gameSettingsBtnIOSM = _addPicButton(theme, "GAME_SETTINGS/IOS_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 350, 130, 56, 56);
  	m_gameSettingsBtnIOSP = _addPicButton(theme, "GAME_SETTINGS/IOS_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 130, 56, 56);
 
-	m_gameSettingsLblIOSreloadBlock = _addLabel(theme, "GAME_SETTINGS/IOS_RELOAD_BLOCK", theme.lblFont, L"", 40, 190, 340, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
+	m_gameSettingsLblIOSreloadBlock = _addLabel(theme, "GAME_SETTINGS/IOS_RELOAD_BLOCK", theme.lblFont, L"", 40, 190, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
-	m_gameSettingsBtnIOSreloadBlock =  _addButton(theme, "GAME_SETTINGS/IOS_RELOAD_BLOCK_BTN", theme.btnFont, L"", 350, 190, 240, 56, theme.btnFontColor);
+	m_gameSettingsBtnIOSreloadBlock =  _addButton(theme, "GAME_SETTINGS/IOS_RELOAD_BLOCK_BTN", theme.btnFont, L"", 330, 190, 270, 56, theme.btnFontColor);
 
 	m_gameSettingsLblAspectRatio = _addLabel(theme, "GAME_SETTINGS/ASPECT_RATIO", theme.lblFont, L"", 40, 250, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsLblAspectRatioVal = _addLabel(theme, "GAME_SETTINGS/ASPECT_RATIO_BTN", theme.btnFont, L"", 402, 250, 146, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
@@ -854,6 +892,10 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	_setHideAnim(m_gameSettingsLblNMM_Val, "GAME_SETTINGS/DML_NMM_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnNMM_P, "GAME_SETTINGS/DML_NMM_PLUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnNMM_M, "GAME_SETTINGS/DML_NMM_MINUS", 200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsLblNoDVD, "GAME_SETTINGS/NO_DVD_PATCH", -200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsLblNoDVD_Val, "GAME_SETTINGS/NO_DVD_PATCH_BTN", 200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsBtnNoDVD_P, "GAME_SETTINGS/NO_DVD_PATCH_PLUS", 200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsBtnNoDVD_M, "GAME_SETTINGS/NO_DVD_PATCH_MINUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblHooktype, "GAME_SETTINGS/HOOKTYPE", -200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblHooktypeVal, "GAME_SETTINGS/HOOKTYPE_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnHooktypeM, "GAME_SETTINGS/HOOKTYPE_MINUS", 200, 0, 1.f, 0.f);
@@ -905,6 +947,7 @@ void CMenu::_textGameSettings(void)
 	m_btnMgr.setText(m_gameSettingsLblIOSreloadBlock, _t("cfgg26", L"Disable IOS Reload block"));
 	m_btnMgr.setText(m_gameSettingsLblAspectRatio, _t("cfgg27", L"Aspect Ratio"));
 	m_btnMgr.setText(m_gameSettingsLblNMM, _t("cfgg28", L"NMM"));
+	m_btnMgr.setText(m_gameSettingsLblNoDVD, _t("cfgg29", L"No DVD Patch"));
 	m_btnMgr.setText(m_gameSettingsLblCustom, _t("custom", L"Custom"));
 	for (int i = 1; i < 12; ++i)
 		m_btnMgr.setText(m_gameSettingsLblCategory[i], m_cat.getWString("GENERAL", fmt("cat%d",i), wfmt(L"Category %i",i).c_str()));

source/menu/menu_game.cpp

@@ -172,6 +172,12 @@ const CMenu::SOption CMenu::_NMM[4] = {
 	{ "NMMdebug", L"Debug" },
 };
 
+const CMenu::SOption CMenu::_NoDVD[3] = {
+	{ "NoDVDDef", L"Default" },
+	{ "NoDVDOff", L"Disabled" },
+	{ "NoDVDon", L"Enabled" },
+};
+
 const CMenu::SOption CMenu::_vidModePatch[4] = {
 	{ "vmpnone", L"None" },
 	{ "vmpnormal", L"Normal" },
@@ -648,12 +654,16 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool DML)
 		char NewCheatPath[255];
 		u8 NMM = min((u32)m_gcfg2.getInt(id, "dml_nmm", 0), ARRAY_SIZE(CMenu::_NMM) - 1u);
 		if(NMM == 0)
-			NMM = min((u32)m_cfg.getInt("DML", "dml_nmm", 0), ARRAY_SIZE(CMenu::_NMM) - 1u);
+			NMM = m_cfg.getInt("DML", "dml_nmm", 0);
 		else
 			NMM--;
+		u8 nodisc = min((u32)m_gcfg2.getInt(id, "no_disc_patch", 0), ARRAY_SIZE(CMenu::_NoDVD) - 1u);
+		if(nodisc == 0)
+			nodisc = m_cfg.getInt("DML", "no_disc_patch", 0);
+		else
+			nodisc--;
 		bool cheats = m_gcfg2.testOptBool(id, "cheat", m_cfg.getBool("DML", "cheat", false));
 		bool DML_debug = m_gcfg2.getBool(id, "debugger", false);
-		bool nodisc = m_cfg.getBool("DML", "no_disc_patch", true);
 
 		if(cheats)
 		{
@@ -662,7 +672,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool DML)
 		}
 
 		if(m_new_dml)
-			DML_New_SetOptions(hdr->path, CheatPath, NewCheatPath, DML_debug, NMM, cheats, nodisc);
+			DML_New_SetOptions(hdr->path, CheatPath, NewCheatPath, cheats, DML_debug, NMM, nodisc);
 		else
 			DML_Old_SetOptions(hdr->path, CheatPath, NewCheatPath, cheats);
 		DMLvideoMode = min((u32)m_gcfg2.getInt(id, "dml_video_mode", 0), ARRAY_SIZE(CMenu::_DMLvideoModes) - 1u);

wii/wiiflow/Languages/english.ini

@@ -1,4 +1,4 @@
-
+
 [ENGLISH]
 about1=Original Loader By:\n%s
 about2=Original GUI By:\n%s
@@ -67,6 +67,7 @@ cfgg25=Password incorrect
 cfgg26=Disable IOS Reload block
 cfgg27=Aspect Ratio
 cfgg28=NMM
+cfgg29=No DVD Patch
 cfgg3=Language
 cfgg4=Patch country strings
 cfgg5=Ocarina
@@ -183,6 +184,9 @@ NMMDef=Default
 NMMOff=Disabled
 NMMon=Enabled
 NMMdebug=Debug
+NoDVDDef=Default
+NoDVDOff=Disabled
+NoDVDon=Enabled
 off=Off
 on=On
 players= Players

wii/wiiflow/Languages/german.ini

@@ -1,4 +1,4 @@
-
+
 [GERMAN]
 about1=Originaler Loader von:\n%s
 about2=Originales GUI von:\n%s
@@ -62,11 +62,12 @@ cfgg2=Videomodus
 cfgg21=Zu Kanal zurückkehren
 cfgg22=Debugger
 cfgg23=Cheatdatei wird heruntergeladen...
-cfgg24=Speicherstand Emulation
+cfgg24=NAND Emulation
 cfgg25=Falsches Passwort
 cfgg26=IOS Reload Block deaktivieren
-cfgg27=Seitenverhältnis
+cfgg27=Seitenverhältnis erzwingen
 cfgg28=NMM
+cfgg29=Keine DVD Patch
 cfgg3=Sprache
 cfgg4=Länder-Strings patchen
 cfgg5=Ocarina
@@ -120,7 +121,7 @@ dlmsg18=Es wurde keine boot.dol im Standardpfad gefunden.
 dlmsg19=Neue Version verfügbar!
 dlmsg2=Netzwerkinitialisierung fehlgeschlagen.
 dlmsg20=Keine Informationen über diese Version gefunden.
-dlmsg21=WiiFlow wird sich jetzt beenden, damit die Änderungen Wirkung zeigen.
+dlmsg21=Beende WiiFlow, damit die Änderungen Wirkung zeigen.
 dlmsg22=Aktualisiere Anwendungsverzeichnis...
 dlmsg23=Aktualisiere Datenverzeichnis...
 dlmsg24=Entpacke...
@@ -183,6 +184,9 @@ NMMDef=Standard
 NMMOff=Deaktiviert
 NMMon=Aktiviert
 NMMdebug=Debug
+NoDVDDef=Standard
+NoDVDOff=Deaktiviert
+NoDVDon=Aktiviert
 off=Aus
 on=An
 players= Spieler
@@ -194,6 +198,8 @@ SaveOff=Aus
 SaveOffG=Aus
 SavePart=Partiell
 SavePartG=Partiell
+SaveReg=Regionswitch
+SaveRegG=Regionswitch
 snes=Super Nintendo
 sys1=WiiFlow Update
 sys2=WiiFlow Version:
@@ -244,7 +250,7 @@ wbfsop8=Das Spiel wurde erfolgreich installiert.
 wbfsop9=Ein Fehler ist aufgetreten.
 wbfsoperr1=Disc_Wait fehlgeschlagen
 wbfsoperr2=Disc_Open fehlgeschlagen
-wbfsoperr3=Das ist keine Wii Disc!
+wbfsoperr3=Das ist keine Wii Disk.
 wbfsoperr4=Dieses Spiel ist bereits installiert.
 wbfsprogress=%i%%
 wbfsremdlg=Um das Spiel %s dauerhaft zu löschen, auf Start klicken.