Unverified Commit a5fe20d9 authored by piratesephiroth's avatar piratesephiroth Committed by GitHub
Browse files

Merge pull request #33 from V10lator/main (fixes required)

Add interlaced option for GCN
parents e81049ec 85276f5f
......@@ -97,6 +97,7 @@
this.MainDolSourceButton = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.Force43NINTENDONT = new System.Windows.Forms.CheckBox();
this.ForceInterlacedNINTENDONT = new System.Windows.Forms.CheckBox();
this.sign_c2w_patcher_link = new System.Windows.Forms.LinkLabel();
this.AdvancedLabel2 = new System.Windows.Forms.Label();
this.C2WPatchFlag = new System.Windows.Forms.CheckBox();
......@@ -804,6 +805,7 @@
this.AdvancedTab.Controls.Add(this.MainDolSourceButton);
this.AdvancedTab.Controls.Add(this.label1);
this.AdvancedTab.Controls.Add(this.Force43NINTENDONT);
this.AdvancedTab.Controls.Add(this.ForceInterlacedNINTENDONT);
this.AdvancedTab.Controls.Add(this.sign_c2w_patcher_link);
this.AdvancedTab.Controls.Add(this.AdvancedLabel2);
this.AdvancedTab.Controls.Add(this.C2WPatchFlag);
......@@ -969,10 +971,20 @@
this.Force43NINTENDONT.Name = "Force43NINTENDONT";
this.Force43NINTENDONT.Size = new System.Drawing.Size(441, 17);
this.Force43NINTENDONT.TabIndex = 14;
this.Force43NINTENDONT.Text = "Force 4:3 for Nintendont - (Disables \"Force Widescreen\" and \"WiiU Widescreen\" Fla" +
"gs)";
this.Force43NINTENDONT.Text = "Force 4:3 for Nintendont - (Disables \"Force Widescreen\" and \"WiiU Widescreen\" Flags)";
this.Force43NINTENDONT.UseVisualStyleBackColor = true;
this.Force43NINTENDONT.CheckedChanged += new System.EventHandler(this.Force43NINTENDONT_CheckedChanged);
//
// ForceInterlacedNINTENDONT
//
this.ForceInterlacedNINTENDONT.AutoSize = true;
this.ForceInterlacedNINTENDONT.Location = new System.Drawing.Point(10, 24);
this.ForceInterlacedNINTENDONT.Name = "ForceInterlacedNINTENDONT";
this.ForceInterlacedNINTENDONT.Size = new System.Drawing.Size(441, 17);
this.ForceInterlacedNINTENDONT.TabIndex = 14;
this.ForceInterlacedNINTENDONT.Text = "Force interlaced for Nintendont - (Disables \"Force Progressive\" Flag)";
this.ForceInterlacedNINTENDONT.UseVisualStyleBackColor = true;
this.ForceInterlacedNINTENDONT.CheckedChanged += new System.EventHandler(this.ForceInterlacedNINTENDONT_CheckedChanged);
//
// sign_c2w_patcher_link
//
......@@ -1382,6 +1394,7 @@
private System.Windows.Forms.TextBox WiiUCommonKey;
private System.Windows.Forms.TabPage SourceFilesTab2;
private System.Windows.Forms.CheckBox Force43NINTENDONT;
rivate System.Windows.Forms.CheckBox ForceInterlacedNINTENDONT;
private System.Windows.Forms.CheckBox Force43NAND;
private System.Windows.Forms.CheckBox DisablePassthrough;
private System.Windows.Forms.Label MainDolLabel;
......
......@@ -287,6 +287,8 @@ namespace TeconMoon_s_WiiVC_Injector
}
Force43NINTENDONT.Checked = false;
Force43NINTENDONT.Enabled = false;
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
CustomMainDol.Checked = false;
CustomMainDol.Enabled = false;
DisableNintendontAutoboot.Checked = false;
......@@ -343,6 +345,8 @@ namespace TeconMoon_s_WiiVC_Injector
LRPatch.Enabled = false;
Force43NINTENDONT.Checked = false;
Force43NINTENDONT.Enabled = false;
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
CustomMainDol.Checked = false;
CustomMainDol.Enabled = false;
DisableNintendontAutoboot.Checked = false;
......@@ -383,6 +387,8 @@ namespace TeconMoon_s_WiiVC_Injector
FlagGC2Specified = false;
Force43NINTENDONT.Checked = false;
Force43NINTENDONT.Enabled = false;
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
CustomMainDol.Checked = false;
CustomMainDol.Enabled = false;
DisableNintendontAutoboot.Checked = false;
......@@ -481,6 +487,7 @@ namespace TeconMoon_s_WiiVC_Injector
LRPatch.Checked = false;
LRPatch.Enabled = false;
Force43NINTENDONT.Enabled = true;
ForceInterlacedNINTENDONT.Enabled = false;
CustomMainDol.Enabled = true;
DisableNintendontAutoboot.Enabled = true;
DisablePassthrough.Checked = false;
......@@ -1306,6 +1313,23 @@ namespace TeconMoon_s_WiiVC_Injector
DisableNintendontAutoboot.Enabled = true;
}
}
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
private void ForceInterlacedNINTENDONT_CheckedChanged(object sender, EventArgs e)
{
if (ForceInterlacedNINTENDONT.Checked)
{
CustomMainDol.Checked = false;
CustomMainDol.Enabled = false;
DisableNintendontAutoboot.Checked = false;
DisableNintendontAutoboot.Enabled = false;
}
else
{
CustomMainDol.Enabled = true;
DisableInterlacedNINTENDONT.Enabled = true;
}
}
private void CustomMainDol_CheckedChanged(object sender, EventArgs e)
{
if (CustomMainDol.Checked)
......@@ -1313,6 +1337,8 @@ namespace TeconMoon_s_WiiVC_Injector
MainDolSourceButton.Enabled = true;
Force43NINTENDONT.Checked = false;
Force43NINTENDONT.Enabled = false;
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
DisableNintendontAutoboot.Checked = false;
DisableNintendontAutoboot.Enabled = false;
......@@ -1322,6 +1348,7 @@ namespace TeconMoon_s_WiiVC_Injector
MainDolSourceButton.Enabled = false;
MainDolLabel.Text = "<- Specify custom main.dol file";
Force43NINTENDONT.Enabled = true;
ForceInterlacedNINTENDONT.Enabled = true;
DisableNintendontAutoboot.Enabled = true;
OpenMainDol.FileName = null;
}
......@@ -1332,12 +1359,15 @@ namespace TeconMoon_s_WiiVC_Injector
{
Force43NINTENDONT.Checked = false;
Force43NINTENDONT.Enabled = false;
ForceInterlacedNINTENDONT.Checked = false;
ForceInterlacedNINTENDONT.Enabled = false;
CustomMainDol.Checked = false;
CustomMainDol.Enabled = false;
}
else
{
Force43NINTENDONT.Enabled = true;
ForceInterlacedNINTENDONT.Enabled = true;
CustomMainDol.Enabled = true;
}
}
......@@ -2055,7 +2085,19 @@ namespace TeconMoon_s_WiiVC_Injector
FileSystem.CopyDirectory(TempToolsPath + "BASE", TempSourcePath + "TEMPISOBASE");
if (Force43NINTENDONT.Checked)
{
File.Copy(TempToolsPath + "DOL\\FIX94_nintendont_force43_autoboot.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
if (ForceInterlacedNINTENDONT.Checked)
{
File.Copy(TempToolsPath + "DOL\\nintendont_force_43_interlaced_autobooter.dol, TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
}
else
{
File.Copy(TempToolsPath + "DOL\\nintendont_force_4_by_3_autobooter.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
}
}
}
else if (ForceInterlacedNINTENDONT.Checked)
{
File.Copy(TempToolsPath + "DOL\\nintendont_force_interlaced_autobooter.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
}
else if (CustomMainDol.Checked)
{
......@@ -2063,11 +2105,11 @@ namespace TeconMoon_s_WiiVC_Injector
}
else if (DisableNintendontAutoboot.Checked)
{
File.Copy(TempToolsPath + "DOL\\FIX94_nintendont_forwarder.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
File.Copy(TempToolsPath + "DOL\\nintendont_forwarder.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
}
else
{
File.Copy(TempToolsPath + "DOL\\FIX94_nintendont_default_autoboot.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
File.Copy(TempToolsPath + "DOL\\nintendont_default_autobooter.dol", TempSourcePath + "TEMPISOBASE\\sys\\main.dol");
}
if (FlagNKIT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment