diff --git a/UWUVCI AIO WPF/Classes/GameConfig.cs b/UWUVCI AIO WPF/Classes/GameConfig.cs index 7072e7a..6214121 100644 --- a/UWUVCI AIO WPF/Classes/GameConfig.cs +++ b/UWUVCI AIO WPF/Classes/GameConfig.cs @@ -30,7 +30,8 @@ namespace UWUVCI_AIO_WPF public bool disgamepad = false; public bool donttrim = false; public bool lr = false; - + public bool motepass = false; + public bool jppatch = false; public bool pokepatch = false; public bool tgcd = false; @@ -40,6 +41,15 @@ namespace UWUVCI_AIO_WPF public bool pixelperfect = false; public string GameName { get; set; } + public bool vm = false; + public bool vmtopal = false; + + + public bool rf = false; + public bool rfus = false; + public bool rfjp = false; + + public PNGTGA TGAIco { get; set; } = new PNGTGA(); diff --git a/UWUVCI AIO WPF/Classes/Injection.cs b/UWUVCI AIO WPF/Classes/Injection.cs index b09eec2..0f31880 100644 --- a/UWUVCI AIO WPF/Classes/Injection.cs +++ b/UWUVCI AIO WPF/Classes/Injection.cs @@ -1858,14 +1858,14 @@ namespace UWUVCI_AIO_WPF doc.SelectSingleNode("menu/longname_zht").InnerText = gameName.Replace(",", ""); } - if(code != null) + /* if(code != null) { doc.SelectSingleNode("menu/product_code").InnerText = $"WUP-N-{code}"; } else - { + {*/ doc.SelectSingleNode("menu/product_code").InnerText = $"WUP-N-{ID2}"; - } + //} if (index > 0) { doc.SelectSingleNode("menu/drc_use").InnerText = "65537"; diff --git a/UWUVCI AIO WPF/Models/MainViewModel.cs b/UWUVCI AIO WPF/Models/MainViewModel.cs index a513090..86f9b19 100644 --- a/UWUVCI AIO WPF/Models/MainViewModel.cs +++ b/UWUVCI AIO WPF/Models/MainViewModel.cs @@ -30,6 +30,7 @@ using System.Timers; using NAudio.Utils; using System.Runtime.InteropServices.WindowsRuntime; using System.Security.Cryptography; +using System.Drawing; namespace UWUVCI_AIO_WPF { @@ -656,6 +657,13 @@ namespace UWUVCI_AIO_WPF GameConfiguration.pokepatch = PokePatch; GameConfiguration.tgcd = cd; GameConfiguration.donttrim = donttrim; + GameConfiguration.motepass = passtrough; + GameConfiguration.jppatch = jppatch; + GameConfiguration.vm = Patch; + GameConfiguration.vmtopal = toPal; + GameConfiguration.rf = regionfrii; + GameConfiguration.rfjp = regionfriijp; + GameConfiguration.rfus = regionfriius; if(Index != -1) { GameConfiguration.disgamepad = false; @@ -761,6 +769,13 @@ namespace UWUVCI_AIO_WPF LR = GameConfiguration.lr; cd = GameConfiguration.tgcd; PokePatch = GameConfiguration.pokepatch; + passtrough = GameConfiguration.motepass; + jppatch = GameConfiguration.jppatch; + Patch = GameConfiguration.vm ; + toPal = GameConfiguration.vmtopal; + regionfrii = GameConfiguration.rf; + regionfriijp = GameConfiguration.rfjp; + regionfriius = GameConfiguration.rfus; } if(GameConfiguration.Console == GameConsoles.N64) { diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml.cs index c68b16b..4218773 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/N64Config.xaml.cs @@ -617,7 +617,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void gn_TextChanged(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } } } } diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren (2).xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren (2).xaml.cs index 57fe9dc..3a44b05 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren (2).xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren (2).xaml.cs @@ -671,7 +671,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void gn_TextChanged(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } } } } diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren.xaml.cs index 08b9ef6..dba1d7d 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren - Kopieren.xaml.cs @@ -771,7 +771,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void gn_TextChanged(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } } } } diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren.xaml.cs index 70cd314..550df96 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs - Kopieren.xaml.cs @@ -647,7 +647,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void gn_TextChanged(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } } } } diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs.xaml.cs index 1c5c1c9..b55ad72 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/OtherConfigs.xaml.cs @@ -625,7 +625,15 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void gn_TextChanged(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } + } } } diff --git a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs index 6a78185..4fb7bf1 100644 --- a/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs +++ b/UWUVCI AIO WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs @@ -525,6 +525,70 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations mvm.BootSound = sound.Text; sound_TextChanged(null, null); } + LR.IsChecked = mvm.LR; + if (mvm.GameConfiguration.donttrim) + { + trimn.IsChecked = true; + } + else + { + trimn.IsChecked = false; + } + jppatch.IsChecked = mvm.jppatch; + motepass.IsChecked = mvm.passtrough; + if (mvm.Patch) + { + if (mvm.toPal) + { + vmcsmoll.IsChecked = false; + pal.IsChecked = false; + ntsc.IsChecked = true; + } + else + { + vmcsmoll.IsChecked = false; + ntsc.IsChecked = false; + pal.IsChecked = true; + } + } + else + { + vmcsmoll.IsChecked = true; + pal.IsChecked = false; + ntsc.IsChecked = false; + } + + if (mvm.regionfrii) + { + if (mvm.regionfriijp) + { + RF_n.IsChecked = false; + RF_tj.IsChecked = true; + RF_tn.IsChecked = false; + RF_tp.IsChecked = false; + } + else if (mvm.regionfriius) + { + RF_n.IsChecked = false; + RF_tj.IsChecked = false; + RF_tn.IsChecked = true; + RF_tp.IsChecked = false; + } + else + { + RF_n.IsChecked = false; + RF_tj.IsChecked = false; + RF_tn.IsChecked = false; + RF_tp.IsChecked =true; + } + } + else + { + RF_n.IsChecked = true; + RF_tj.IsChecked = false; + RF_tn.IsChecked = false; + RF_tp.IsChecked = false; + } } private bool CheckIfNull(string s) { @@ -941,7 +1005,14 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations private void log_TextChanged_1(object sender, TextChangedEventArgs e) { - mvm.GameConfiguration.GameName = gn.Text; + try + { + mvm.GameConfiguration.GameName = gn.Text; + } + catch (Exception) + { + + } } } }