-added new DIOS-MIOS widescreen patch

-updated english.ini
-updated german.ini

source/gc/gc.c

@@ -19,7 +19,7 @@
 // DIOS-MIOS
 DML_CFG *DMLCfg = NULL;
 
-void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, u8 videoSetting, bool new_dm_cfg)
+void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, u8 videoSetting, bool widescreen, bool new_dm_cfg)
 {
 	gprintf("Wiiflow GC: Launch game '%s' through memory (new method)\n", GamePath);
 
@@ -73,7 +73,14 @@ void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPat
 	if(NMM > 1)
 		DMLCfg->Config |= DML_CFG_NMM_DEBUG;
 	if(nodisc > 0)
-		DMLCfg->Config |= DML_CFG_NODISC;
+	{
+		if(new_dm_cfg)
+			DMLCfg->Config |= DML_CFG_NODISC_CFG2;
+		else
+			DMLCfg->Config |= DML_CFG_NODISC_CFG1;
+	}
+	if(widescreen && new_dm_cfg)
+		DMLCfg->Config |= DML_CFG_FORCE_WIDE;
 
 	if(DMLvideoMode > 3)
 		DMLCfg->VideoMode |= DML_VID_PROG_PATCH;

source/gc/gc.h

@@ -28,9 +28,12 @@ enum dmlconfig
 	DML_CFG_CHEAT_PATH	= (1<<6),
 	DML_CFG_ACTIVITY_LED= (1<<7),
 	DML_CFG_PADHOOK		= (1<<8),
-	DML_CFG_NODISC		= (1<<9),
+	DML_CFG_NODISC_CFG1	= (1<<9),
+	DML_CFG_FORCE_WIDE	= (1<<9), //v2
 	DML_CFG_BOOT_DISC	= (1<<10),
-	DML_CFG_BOOT_DOL	= (1<<11),
+	DML_CFG_BOOT_DOL	= (1<<11), //v1
+	DML_CFG_BOOT_DISC2	= (1<<11), //v2
+	DML_CFG_NODISC_CFG2	= (1<<12),
 };
 
 enum dmlvideomode
@@ -46,7 +49,7 @@ enum dmlvideomode
 	DML_VID_PROG_PATCH	= (1<<4),
 };
 
-void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, u8 videoSetting, bool new_dm_cfg);
+void DML_New_SetOptions(const char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats, bool debugger, u8 NMM, u8 nodisc, u8 DMLvideoMode, u8 videoSetting, bool widescreen, bool new_dm_cfg);
 void DML_Old_SetOptions(char *GamePath, char *CheatPath, char *NewCheatPath, bool cheats);
 void DML_New_SetBootDiscOption(bool new_dm_cfg);
 void DML_New_WriteOptions();

source/main.cpp

@@ -114,7 +114,7 @@ int main(int argc, char **argv)
 
 		if(!iosOK)
 		{
-			mainMenu->terror("errboot1", L"d2x cIOSs rev6 or later are required!\ncIOSs 249 base 56 and 250 base 57 are enough for all your games.\nMore cIOSs could make wiiflow unstable!");
+			mainMenu->terror("errboot1", L"No cIOS found!\ncIOS d2x 249 base 56 and 250 base 57 are enough for all your games.");
 			break;
 		}
 		else if(!deviceAvailable)

source/menu/menu.hpp

@@ -467,6 +467,9 @@ private:
 	u16 m_gameSettingsLblDevoMemcardEmu;
 	u16 m_gameSettingsBtnDevoMemcardEmu;
 
+	u16 m_gameSettingsLblDM_Widescreen;
+	u16 m_gameSettingsBtnDM_Widescreen;
+
 	u16 m_gameSettingsLblGCLoader;
 	u16 m_gameSettingsLblGCLoader_Val;
 	u16 m_gameSettingsBtnGCLoader_P;

source/menu/menu_config_game.cpp

@@ -52,6 +52,8 @@ void CMenu::_hideGameSettings(bool instant)
 	m_btnMgr.hide(m_gameSettingsBtnNoDVD_M, instant);
 	m_btnMgr.hide(m_gameSettingsLblDevoMemcardEmu, instant);
 	m_btnMgr.hide(m_gameSettingsBtnDevoMemcardEmu, instant);
+	m_btnMgr.hide(m_gameSettingsLblDM_Widescreen, instant);
+	m_btnMgr.hide(m_gameSettingsBtnDM_Widescreen, instant);
 	m_btnMgr.hide(m_gameSettingsLblGCLoader, instant);
 	m_btnMgr.hide(m_gameSettingsLblGCLoader_Val, instant);
 	m_btnMgr.hide(m_gameSettingsBtnGCLoader_P, instant);
@@ -158,6 +160,11 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.show(m_gameSettingsLblGClanguageVal);
 			m_btnMgr.show(m_gameSettingsBtnGClanguageP);
 			m_btnMgr.show(m_gameSettingsBtnGClanguageM);
+
+			m_btnMgr.show(m_gameSettingsLblGCLoader);
+			m_btnMgr.show(m_gameSettingsLblGCLoader_Val);
+			m_btnMgr.show(m_gameSettingsBtnGCLoader_P);
+			m_btnMgr.show(m_gameSettingsBtnGCLoader_M);
 		}
 		else
 		{
@@ -190,6 +197,11 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.hide(m_gameSettingsLblDMLVideo);
 			m_btnMgr.hide(m_gameSettingsBtnDMLVideoP);
 			m_btnMgr.hide(m_gameSettingsBtnDMLVideoM);
+
+			m_btnMgr.hide(m_gameSettingsLblGCLoader);
+			m_btnMgr.hide(m_gameSettingsLblGCLoader_Val);
+			m_btnMgr.hide(m_gameSettingsBtnGCLoader_P);
+			m_btnMgr.hide(m_gameSettingsBtnGCLoader_M);
 		}
 		else
 		{
@@ -286,10 +298,8 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.show(m_gameSettingsLblDevoMemcardEmu);
 			m_btnMgr.show(m_gameSettingsBtnDevoMemcardEmu);
 
-			m_btnMgr.show(m_gameSettingsLblGCLoader);
+			m_btnMgr.show(m_gameSettingsLblDM_Widescreen);
-			m_btnMgr.show(m_gameSettingsLblGCLoader_Val);
+			m_btnMgr.show(m_gameSettingsBtnDM_Widescreen);
-			m_btnMgr.show(m_gameSettingsBtnGCLoader_P);
-			m_btnMgr.show(m_gameSettingsBtnGCLoader_M);
 		}
 	}
 	else
@@ -327,10 +337,8 @@ void CMenu::_showGameSettings(void)
 			m_btnMgr.hide(m_gameSettingsLblDevoMemcardEmu);
 			m_btnMgr.hide(m_gameSettingsBtnDevoMemcardEmu);
 
-			m_btnMgr.hide(m_gameSettingsLblGCLoader);
+			m_btnMgr.hide(m_gameSettingsLblDM_Widescreen);
-			m_btnMgr.hide(m_gameSettingsLblGCLoader_Val);
+			m_btnMgr.hide(m_gameSettingsBtnDM_Widescreen);
-			m_btnMgr.hide(m_gameSettingsBtnGCLoader_P);
-			m_btnMgr.hide(m_gameSettingsBtnGCLoader_M);
 		}
 	}
 	if (m_gameSettingsPage == 4)
@@ -403,6 +411,7 @@ void CMenu::_showGameSettings(void)
 	m_btnMgr.setText(m_gameSettingsBtnOcarina, _optBoolToString(m_gcfg2.getOptBool(id, "cheat")));
 	if(m_cf.getHdr()->type == TYPE_GC_GAME)
 	{
+		m_btnMgr.setText(m_gameSettingsBtnDM_Widescreen, _optBoolToString(m_gcfg2.getOptBool(id, "dm_widescreen", 0)));
 		m_btnMgr.setText(m_gameSettingsBtnDevoMemcardEmu, _optBoolToString(m_gcfg2.getOptBool(id, "devo_memcard_emu", 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));
@@ -558,6 +567,15 @@ void CMenu::_gameSettings(void)
 					m_gcfg2.setBool(id, "devo_memcard_emu", true);
 				_showGameSettings();
 			}
+			else if(m_btnMgr.selected(m_gameSettingsBtnDM_Widescreen))
+			{
+				bool booloption = m_gcfg2.getBool(id, "dm_widescreen");
+				if(booloption != false)
+					m_gcfg2.remove(id, "dm_widescreen");
+				else
+					m_gcfg2.setBool(id, "dm_widescreen", true);
+				_showGameSettings();
+			}
 			else if (m_btnMgr.selected(m_gameSettingsBtnLanguageP) || m_btnMgr.selected(m_gameSettingsBtnLanguageM))
 			{
 				s8 direction = m_btnMgr.selected(m_gameSettingsBtnLanguageP) ? 1 : -1;
@@ -797,6 +815,9 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	m_gameSettingsBtnGCLoader_M = _addPicButton(theme, "GAME_SETTINGS/GC_LOADER_MINUS", theme.btnTexMinus, theme.btnTexMinusS, 330, 310, 56, 56);
 	m_gameSettingsBtnGCLoader_P = _addPicButton(theme, "GAME_SETTINGS/GC_LOADER_PLUS", theme.btnTexPlus, theme.btnTexPlusS, 544, 310, 56, 56);
 
+	m_gameSettingsLblDM_Widescreen = _addLabel(theme, "GAME_SETTINGS/DM_WIDESCREEN", theme.lblFont, L"", 40, 310, 290, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
+	m_gameSettingsBtnDM_Widescreen = _addButton(theme, "GAME_SETTINGS/DM_WIDESCREEN_BTN", theme.btnFont, L"", 330, 310, 270, 56, theme.btnFontColor);
+
 	//Page 4
  	m_gameSettingsLblCustom = _addLabel(theme, "GAME_SETTINGS/CUSTOM", theme.lblFont, L"", 40, 130, 340, 56, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
 	m_gameSettingsBtnCustom =  _addButton(theme, "GAME_SETTINGS/CUSTOM_BTN", theme.btnFont, L"", 330, 130, 240, 56, theme.btnFontColor);
@@ -884,6 +905,8 @@ void CMenu::_initGameSettingsMenu(CMenu::SThemeData &theme)
 	_setHideAnim(m_gameSettingsBtnNoDVD_M, "GAME_SETTINGS/NO_DVD_PATCH_MINUS", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblDevoMemcardEmu, "GAME_SETTINGS/DEVO_MEMCARD_EMU", -200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnDevoMemcardEmu, "GAME_SETTINGS/DEVO_MEMCARD_EMU_BTN", 200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsLblDM_Widescreen, "GAME_SETTINGS/DM_WIDESCREEN", -200, 0, 1.f, 0.f);
+	_setHideAnim(m_gameSettingsBtnDM_Widescreen, "GAME_SETTINGS/DM_WIDESCREEN_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblGCLoader, "GAME_SETTINGS/GC_LOADER", -200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsLblGCLoader_Val, "GAME_SETTINGS/GC_LOADER_BTN", 200, 0, 1.f, 0.f);
 	_setHideAnim(m_gameSettingsBtnGCLoader_P, "GAME_SETTINGS/GC_LOADER_PLUS", 200, 0, 1.f, 0.f);
@@ -945,4 +968,5 @@ void CMenu::_textGameSettings(void)
 	m_btnMgr.setText(m_gameSettingsBtnFlashSave, _t("cfgg33", L"Flash"));
 	m_btnMgr.setText(m_gameSettingsLblDevoMemcardEmu, _t("cfgg34", L"Devolution Memcard Emulator"));
 	m_btnMgr.setText(m_gameSettingsLblGCLoader, _t("cfgg35", L"GameCube Loader"));
+	m_btnMgr.setText(m_gameSettingsLblDM_Widescreen, _t("cfgg36", L"DM Widescreen Patch"));
 }

source/menu/menu_game.cpp

@@ -832,6 +832,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool disc)
 		nodisc = (nodisc == 0) ? m_cfg.getInt("DML", "no_disc_patch", 0) : nodisc-1;
 		bool cheats = m_gcfg2.testOptBool(id, "cheat", m_cfg.getBool("DML", "cheat", false));
 		bool DML_debug = m_gcfg2.getBool(id, "debugger", false);
+		bool DM_Widescreen = m_gcfg2.getBool(id, "dm_widescreen", false);
 		if(cheats)
 		{
 			snprintf(CheatPath, sizeof(CheatPath), "%s/%s", m_cheatDir.c_str(), fmt("%s.gct", id.c_str()));
@@ -846,7 +847,7 @@ void CMenu::_launchGC(dir_discHdr *hdr, bool disc)
 		else
 			newPath = &path[path.find_first_of(":/")+1];
 		if(m_new_dml)
-			DML_New_SetOptions(newPath.c_str(), CheatPath, NewCheatPath, cheats, DML_debug, NMM, nodisc, videoMode, videoSetting, m_new_dm_cfg);
+			DML_New_SetOptions(newPath.c_str(), CheatPath, NewCheatPath, cheats, DML_debug, NMM, nodisc, videoMode, videoSetting, DM_Widescreen, m_new_dm_cfg);
 		else
 			DML_Old_SetOptions((char*)path.c_str(), CheatPath, NewCheatPath, cheats);
 
@@ -950,7 +951,7 @@ int CMenu::_loadIOS(u8 gameIOS, int userIOS, string id)
 	{
 		if(_installed_cios.size() <= 0)
 		{
-			error(sfmt("errgame2", L"No cios found!"));
+			error(sfmt("errgame2", L"No cIOS found!"));
 			Sys_LoadMenu();
 		}
 		u8 IOS[3];
@@ -975,11 +976,8 @@ int CMenu::_loadIOS(u8 gameIOS, int userIOS, string id)
 			}
 		}
 		if(!found)
-		{
-			error(sfmt("errgame3", L"Couldn't find a cIOS using base %i, or 56/57", IOS[0]));
 			return LOAD_IOS_FAILED;
 	}
-	}
 
 	if(gameIOS != mainIOS)
 	{

wii/wiiflow/Languages/english.ini

@@ -80,6 +80,7 @@ cfgg32=Flash Save to NAND
 cfgg33=Flash
 cfgg34=Devolution Memcard Emulator
 cfgg35=GameCube Loader
+cfgg36=DM Widescreen Patch
 cfgg4=Patch country strings
 cfgg5=Ocarina
 cfgg7=Vipatch
@@ -184,12 +185,11 @@ DMLpal=PAL 576i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
-errboot1=d2x cIOSs rev6 or later are required!\ncIOSs 249 base 56 and 250 base 57 are enough for all your games.\nMore cIOSs could make wiiflow unstable!
+errboot1=No cIOS found!\ncIOS d2x 249 base 56 and 250 base 57 are enough for all your games.
 errboot2=Could not find a device to save configuration files on!
 errboot3=Could not initialize the DIP module!
 errgame1=Cannot find the game with ID: %s
-errgame2=No cios found!
+errgame2=No cIOS found!
-errgame3=Couldn't find a cIOS using base %i, or 56/57
 errgame4=Couldn't load IOS %i
 errgame5=Enabling emu failed!
 errgame6=Enabling emu after reload failed!

wii/wiiflow/Languages/german.ini

@@ -73,13 +73,14 @@ cfgg26=IOS Reload Block deaktivieren
 cfgg27=Seitenverhältnis erzwingen
 cfgg28=NMM
 cfgg29=Keine DVD Patch
+cfgg3=Sprache
 cfgg30=Entpacke Speicherstand
 cfgg31=Entpacken
 cfgg32=Installiere Speicherstand
 cfgg33=Installieren
 cfgg34=Devolution Memcard Emulator
 cfgg35=GameCube Loader
-cfgg3=Sprache
+cfgg36=DM Breitbild Patch
 cfgg4=Länder-Strings patchen
 cfgg5=Ocarina
 cfgg7=Video patchen
@@ -184,6 +185,18 @@ DMLntsc=NTSC 480i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
+errboot1=Kein cIOS gefunden!\ncIOS d2x 249 Basis 56 und 250 Basis 57 genügen für die meisten Spiele.
+errboot2=Kein Speichermedium zum Speichern der Konfiguration gefunden!
+errboot3=Konnte DIP Modul nicht initialisieren!
+errgame1=Konnte folgendes Spiel mit dieser ID nicht finden: %s
+errgame2=Kein cIOS gefunden!
+errgame4=Konnte IOS %i nicht laden!
+errgame5=Emulator konnte nicht aktiviert werden!
+errgame6=Emulator konnte nicht nach IOS Reload aktiviert werden!
+errgame7=WDVDGetCoverStatus fehlgeschlagen!
+errgame8=Bitte lege eine Spiel Disk ein.
+errgame9=Dies is keine Wii oder GameCube Disk.
+errgame10=Set USB fehlgeschlagen: %d
 exit_to=Zurück zu
 gameinfo1=Entwickler: %s
 gameinfo2=Herausgeber: %s